diff --git a/.gitignore b/ModelWeb/.gitignore similarity index 91% rename from .gitignore rename to ModelWeb/.gitignore index 6bfb3800f..d052193ef 100644 --- a/.gitignore +++ b/ModelWeb/.gitignore @@ -1,10 +1,10 @@ -/.classpath -/.project -/.settings -/target -/settings.xml -/dist -/.factorypath -/*.BASE.xml -/*.LOCAL.xml -/*.REMOTE.xml +/.classpath +/.project +/.settings +/target +/settings.xml +/dist +/.factorypath +/*.BASE.xml +/*.LOCAL.xml +/*.REMOTE.xml diff --git a/pom.xml b/ModelWeb/pom.xml similarity index 96% rename from pom.xml rename to ModelWeb/pom.xml index 1908e8328..0ee038d28 100644 --- a/pom.xml +++ b/ModelWeb/pom.xml @@ -1,235 +1,235 @@ - - 4.0.0 - br.com.rjconsultores - ModelWeb - 1.122.1 - - - - rj-releases - http://52.5.53.15:8081/nexus/content/repositories/releases/ - - - - - UTF-8 - UTF-8 - - - - src - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - - - - br.com.rjconsultores - brazilutils - 0.1.1 - - - - commons-lang - commons-lang - 2.2 - - - - org.springframework - spring-orm - 3.0.6.RELEASE - - - - org.springframework - spring-web - 3.0.6.RELEASE - - - - org.springframework.security - spring-security-core - 3.0.7.RELEASE - - - - org.springframework.security - spring-security-web - 3.0.7.RELEASE - - - - org.springframework.security - spring-security-config - 3.0.7.RELEASE - - - - org.zkoss.zk - zkplus - 5.0.9 - - - - org.zkoss.zk - zul - 5.0.9 - - - - net.sf.jasperreports - jasperreports - 6.0.0 - - - - com.lowagie - itext - 2.1.7 - - - - commons-dbutils - commons-dbutils - 1.6 - - - - com.google.code.gson - gson - 2.8.9 - - - - commons-collections - commons-collections - 3.2.1 - - - - org.apache.poi - poi-ooxml - 3.8 - - - stax - stax-api - - - - - - org.json - json - 20140107 - - - - org.jboss.resteasy - resteasy-jaxrs - 3.14.0.Final - provided - - - - org.apache.httpcomponents - httpcore - 4.4.14 - provided - - - - org.apache.httpcomponents - httpclient - 4.5.13 - provided - - - - org.codehaus.jettison - jettison - 1.0.1 - - - stax - stax-api - - - - - - com.sun.mail - javax.mail - 1.4.4 - - - - br.com.rjconsultores - GeneradorBoletosCNAB - 1.8.0 - - - log4j - log4j - - - - - - br.com.rjconsultores - WSTotvs - 1.3.1 - - - - br.com.rjconsultores - WSAG - 1.3.1 - - - - br.com.rjconsultores - Auditador - 1.1.1 - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - - com.nimbusds - nimbus-jose-jwt - jdk16 - 4.11.2 - - - - org.projectlombok - lombok - 1.18.32 - - - - com.mashape.unirest - unirest-java - 1.4.9 - - - - - - + + 4.0.0 + br.com.rjconsultores + ModelWeb + 1.122.1 + + + + rj-releases + http://52.5.53.15:8081/nexus/content/repositories/releases/ + + + + + UTF-8 + UTF-8 + + + + src + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + + + + + br.com.rjconsultores + brazilutils + 0.1.1 + + + + commons-lang + commons-lang + 2.2 + + + + org.springframework + spring-orm + 3.0.6.RELEASE + + + + org.springframework + spring-web + 3.0.6.RELEASE + + + + org.springframework.security + spring-security-core + 3.0.7.RELEASE + + + + org.springframework.security + spring-security-web + 3.0.7.RELEASE + + + + org.springframework.security + spring-security-config + 3.0.7.RELEASE + + + + org.zkoss.zk + zkplus + 5.0.9 + + + + org.zkoss.zk + zul + 5.0.9 + + + + net.sf.jasperreports + jasperreports + 6.0.0 + + + + com.lowagie + itext + 2.1.7 + + + + commons-dbutils + commons-dbutils + 1.6 + + + + com.google.code.gson + gson + 2.8.9 + + + + commons-collections + commons-collections + 3.2.1 + + + + org.apache.poi + poi-ooxml + 3.8 + + + stax + stax-api + + + + + + org.json + json + 20140107 + + + + org.jboss.resteasy + resteasy-jaxrs + 3.14.0.Final + provided + + + + org.apache.httpcomponents + httpcore + 4.4.14 + provided + + + + org.apache.httpcomponents + httpclient + 4.5.13 + provided + + + + org.codehaus.jettison + jettison + 1.0.1 + + + stax + stax-api + + + + + + com.sun.mail + javax.mail + 1.4.4 + + + + br.com.rjconsultores + GeneradorBoletosCNAB + 1.8.0 + + + log4j + log4j + + + + + + br.com.rjconsultores + WSTotvs + 1.3.1 + + + + br.com.rjconsultores + WSAG + 1.3.1 + + + + br.com.rjconsultores + Auditador + 1.1.1 + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + com.nimbusds + nimbus-jose-jwt + jdk16 + 4.11.2 + + + + org.projectlombok + lombok + 1.18.32 + + + + com.mashape.unirest + unirest-java + 1.4.9 + + + + + + diff --git a/src/META-INF/MANIFEST.MF b/ModelWeb/src/META-INF/MANIFEST.MF similarity index 53% rename from src/META-INF/MANIFEST.MF rename to ModelWeb/src/META-INF/MANIFEST.MF index 864a540e9..b9f956e28 100644 --- a/src/META-INF/MANIFEST.MF +++ b/ModelWeb/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.8.3 +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.8.3 Created-By: 1.7.0-b147 (Oracle Corporation) \ No newline at end of file diff --git a/src/br/inf/portalfiscal/bpe/EvNaoEmbBPe.java b/ModelWeb/src/br/inf/portalfiscal/bpe/EvNaoEmbBPe.java similarity index 100% rename from src/br/inf/portalfiscal/bpe/EvNaoEmbBPe.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/EvNaoEmbBPe.java diff --git a/src/br/inf/portalfiscal/bpe/ObjectFactory.java b/ModelWeb/src/br/inf/portalfiscal/bpe/ObjectFactory.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/ObjectFactory.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/ObjectFactory.java index e730517db..264c5cd67 100644 --- a/src/br/inf/portalfiscal/bpe/ObjectFactory.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/ObjectFactory.java @@ -1,316 +1,316 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the br.inf.portalfiscal.bpe package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _RetBPe_QNAME = new QName("http://www.portalfiscal.inf.br/bpe", "retBPe"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: br.inf.portalfiscal.bpe - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link TImp } - * - */ - public TImp createTImp() { - return new TImp(); - } - - /** - * Create an instance of {@link TProtBPe } - * - */ - public TProtBPe createTProtBPe() { - return new TProtBPe(); - } - - /** - * Create an instance of {@link TBPe } - * - */ - public TBPe createTBPe() { - return new TBPe(); - } - - /** - * Create an instance of {@link TBPe.InfBPe } - * - */ - public TBPe.InfBPe createTBPeInfBPe() { - return new TBPe.InfBPe(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Pag } - * - */ - public TBPe.InfBPe.Pag createTBPeInfBPePag() { - return new TBPe.InfBPe.Pag(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Imp } - * - */ - public TBPe.InfBPe.Imp createTBPeInfBPeImp() { - return new TBPe.InfBPe.Imp(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfValorBPe } - * - */ - public TBPe.InfBPe.InfValorBPe createTBPeInfBPeInfValorBPe() { - return new TBPe.InfBPe.InfValorBPe(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfViagem } - * - */ - public TBPe.InfBPe.InfViagem createTBPeInfBPeInfViagem() { - return new TBPe.InfBPe.InfViagem(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfPassagem } - * - */ - public TBPe.InfBPe.InfPassagem createTBPeInfBPeInfPassagem() { - return new TBPe.InfBPe.InfPassagem(); - } - - /** - * Create an instance of {@link TRetBPe } - * - */ - public TRetBPe createTRetBPe() { - return new TRetBPe(); - } - - /** - * Create an instance of {@link TEnviBPe } - * - */ - public TEnviBPe createTEnviBPe() { - return new TEnviBPe(); - } - - /** - * Create an instance of {@link TEndereco } - * - */ - public TEndereco createTEndereco() { - return new TEndereco(); - } - - /** - * Create an instance of {@link TEndeEmi } - * - */ - public TEndeEmi createTEndeEmi() { - return new TEndeEmi(); - } - - /** - * Create an instance of {@link TImp.ICMS00 } - * - */ - public TImp.ICMS00 createTImpICMS00() { - return new TImp.ICMS00(); - } - - /** - * Create an instance of {@link TImp.ICMS20 } - * - */ - public TImp.ICMS20 createTImpICMS20() { - return new TImp.ICMS20(); - } - - /** - * Create an instance of {@link TImp.ICMS45 } - * - */ - public TImp.ICMS45 createTImpICMS45() { - return new TImp.ICMS45(); - } - - /** - * Create an instance of {@link TImp.ICMS90 } - * - */ - public TImp.ICMS90 createTImpICMS90() { - return new TImp.ICMS90(); - } - - /** - * Create an instance of {@link TImp.ICMSOutraUF } - * - */ - public TImp.ICMSOutraUF createTImpICMSOutraUF() { - return new TImp.ICMSOutraUF(); - } - - /** - * Create an instance of {@link TImp.ICMSSN } - * - */ - public TImp.ICMSSN createTImpICMSSN() { - return new TImp.ICMSSN(); - } - - /** - * Create an instance of {@link TProtBPe.InfProt } - * - */ - public TProtBPe.InfProt createTProtBPeInfProt() { - return new TProtBPe.InfProt(); - } - - /** - * Create an instance of {@link TBPe.InfBPeSupl } - * - */ - public TBPe.InfBPeSupl createTBPeInfBPeSupl() { - return new TBPe.InfBPeSupl(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Ide } - * - */ - public TBPe.InfBPe.Ide createTBPeInfBPeIde() { - return new TBPe.InfBPe.Ide(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Emit } - * - */ - public TBPe.InfBPe.Emit createTBPeInfBPeEmit() { - return new TBPe.InfBPe.Emit(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Comp } - * - */ - public TBPe.InfBPe.Comp createTBPeInfBPeComp() { - return new TBPe.InfBPe.Comp(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Agencia } - * - */ - public TBPe.InfBPe.Agencia createTBPeInfBPeAgencia() { - return new TBPe.InfBPe.Agencia(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfBPeSub } - * - */ - public TBPe.InfBPe.InfBPeSub createTBPeInfBPeInfBPeSub() { - return new TBPe.InfBPe.InfBPeSub(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.AutXML } - * - */ - public TBPe.InfBPe.AutXML createTBPeInfBPeAutXML() { - return new TBPe.InfBPe.AutXML(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfAdic } - * - */ - public TBPe.InfBPe.InfAdic createTBPeInfBPeInfAdic() { - return new TBPe.InfBPe.InfAdic(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Pag.Card } - * - */ - public TBPe.InfBPe.Pag.Card createTBPeInfBPePagCard() { - return new TBPe.InfBPe.Pag.Card(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.Imp.ICMSUFFim } - * - */ - public TBPe.InfBPe.Imp.ICMSUFFim createTBPeInfBPeImpICMSUFFim() { - return new TBPe.InfBPe.Imp.ICMSUFFim(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfValorBPe.Comp } - * - */ - public TBPe.InfBPe.InfValorBPe.Comp createTBPeInfBPeInfValorBPeComp() { - return new TBPe.InfBPe.InfValorBPe.Comp(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfViagem.InfTravessia } - * - */ - public TBPe.InfBPe.InfViagem.InfTravessia createTBPeInfBPeInfViagemInfTravessia() { - return new TBPe.InfBPe.InfViagem.InfTravessia(); - } - - /** - * Create an instance of {@link TBPe.InfBPe.InfPassagem.InfPassageiro } - * - */ - public TBPe.InfBPe.InfPassagem.InfPassageiro createTBPeInfBPeInfPassagemInfPassageiro() { - return new TBPe.InfBPe.InfPassagem.InfPassageiro(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TRetBPe }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.portalfiscal.inf.br/bpe", name = "retBPe") - public JAXBElement createRetBPe(TRetBPe value) { - return new JAXBElement(_RetBPe_QNAME, TRetBPe.class, null, value); - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the br.inf.portalfiscal.bpe package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _RetBPe_QNAME = new QName("http://www.portalfiscal.inf.br/bpe", "retBPe"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: br.inf.portalfiscal.bpe + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link TImp } + * + */ + public TImp createTImp() { + return new TImp(); + } + + /** + * Create an instance of {@link TProtBPe } + * + */ + public TProtBPe createTProtBPe() { + return new TProtBPe(); + } + + /** + * Create an instance of {@link TBPe } + * + */ + public TBPe createTBPe() { + return new TBPe(); + } + + /** + * Create an instance of {@link TBPe.InfBPe } + * + */ + public TBPe.InfBPe createTBPeInfBPe() { + return new TBPe.InfBPe(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Pag } + * + */ + public TBPe.InfBPe.Pag createTBPeInfBPePag() { + return new TBPe.InfBPe.Pag(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Imp } + * + */ + public TBPe.InfBPe.Imp createTBPeInfBPeImp() { + return new TBPe.InfBPe.Imp(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfValorBPe } + * + */ + public TBPe.InfBPe.InfValorBPe createTBPeInfBPeInfValorBPe() { + return new TBPe.InfBPe.InfValorBPe(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfViagem } + * + */ + public TBPe.InfBPe.InfViagem createTBPeInfBPeInfViagem() { + return new TBPe.InfBPe.InfViagem(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfPassagem } + * + */ + public TBPe.InfBPe.InfPassagem createTBPeInfBPeInfPassagem() { + return new TBPe.InfBPe.InfPassagem(); + } + + /** + * Create an instance of {@link TRetBPe } + * + */ + public TRetBPe createTRetBPe() { + return new TRetBPe(); + } + + /** + * Create an instance of {@link TEnviBPe } + * + */ + public TEnviBPe createTEnviBPe() { + return new TEnviBPe(); + } + + /** + * Create an instance of {@link TEndereco } + * + */ + public TEndereco createTEndereco() { + return new TEndereco(); + } + + /** + * Create an instance of {@link TEndeEmi } + * + */ + public TEndeEmi createTEndeEmi() { + return new TEndeEmi(); + } + + /** + * Create an instance of {@link TImp.ICMS00 } + * + */ + public TImp.ICMS00 createTImpICMS00() { + return new TImp.ICMS00(); + } + + /** + * Create an instance of {@link TImp.ICMS20 } + * + */ + public TImp.ICMS20 createTImpICMS20() { + return new TImp.ICMS20(); + } + + /** + * Create an instance of {@link TImp.ICMS45 } + * + */ + public TImp.ICMS45 createTImpICMS45() { + return new TImp.ICMS45(); + } + + /** + * Create an instance of {@link TImp.ICMS90 } + * + */ + public TImp.ICMS90 createTImpICMS90() { + return new TImp.ICMS90(); + } + + /** + * Create an instance of {@link TImp.ICMSOutraUF } + * + */ + public TImp.ICMSOutraUF createTImpICMSOutraUF() { + return new TImp.ICMSOutraUF(); + } + + /** + * Create an instance of {@link TImp.ICMSSN } + * + */ + public TImp.ICMSSN createTImpICMSSN() { + return new TImp.ICMSSN(); + } + + /** + * Create an instance of {@link TProtBPe.InfProt } + * + */ + public TProtBPe.InfProt createTProtBPeInfProt() { + return new TProtBPe.InfProt(); + } + + /** + * Create an instance of {@link TBPe.InfBPeSupl } + * + */ + public TBPe.InfBPeSupl createTBPeInfBPeSupl() { + return new TBPe.InfBPeSupl(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Ide } + * + */ + public TBPe.InfBPe.Ide createTBPeInfBPeIde() { + return new TBPe.InfBPe.Ide(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Emit } + * + */ + public TBPe.InfBPe.Emit createTBPeInfBPeEmit() { + return new TBPe.InfBPe.Emit(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Comp } + * + */ + public TBPe.InfBPe.Comp createTBPeInfBPeComp() { + return new TBPe.InfBPe.Comp(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Agencia } + * + */ + public TBPe.InfBPe.Agencia createTBPeInfBPeAgencia() { + return new TBPe.InfBPe.Agencia(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfBPeSub } + * + */ + public TBPe.InfBPe.InfBPeSub createTBPeInfBPeInfBPeSub() { + return new TBPe.InfBPe.InfBPeSub(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.AutXML } + * + */ + public TBPe.InfBPe.AutXML createTBPeInfBPeAutXML() { + return new TBPe.InfBPe.AutXML(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfAdic } + * + */ + public TBPe.InfBPe.InfAdic createTBPeInfBPeInfAdic() { + return new TBPe.InfBPe.InfAdic(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Pag.Card } + * + */ + public TBPe.InfBPe.Pag.Card createTBPeInfBPePagCard() { + return new TBPe.InfBPe.Pag.Card(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.Imp.ICMSUFFim } + * + */ + public TBPe.InfBPe.Imp.ICMSUFFim createTBPeInfBPeImpICMSUFFim() { + return new TBPe.InfBPe.Imp.ICMSUFFim(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfValorBPe.Comp } + * + */ + public TBPe.InfBPe.InfValorBPe.Comp createTBPeInfBPeInfValorBPeComp() { + return new TBPe.InfBPe.InfValorBPe.Comp(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfViagem.InfTravessia } + * + */ + public TBPe.InfBPe.InfViagem.InfTravessia createTBPeInfBPeInfViagemInfTravessia() { + return new TBPe.InfBPe.InfViagem.InfTravessia(); + } + + /** + * Create an instance of {@link TBPe.InfBPe.InfPassagem.InfPassageiro } + * + */ + public TBPe.InfBPe.InfPassagem.InfPassageiro createTBPeInfBPeInfPassagemInfPassageiro() { + return new TBPe.InfBPe.InfPassagem.InfPassageiro(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TRetBPe }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.portalfiscal.inf.br/bpe", name = "retBPe") + public JAXBElement createRetBPe(TRetBPe value) { + return new JAXBElement(_RetBPe_QNAME, TRetBPe.class, null, value); + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TBPe.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TBPe.java similarity index 97% rename from src/br/inf/portalfiscal/bpe/TBPe.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TBPe.java index bb4cde719..5e7693bf3 100644 --- a/src/br/inf/portalfiscal/bpe/TBPe.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TBPe.java @@ -1,6042 +1,6042 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.10.23 às 04:19:56 PM BRST -// - - -package br.inf.portalfiscal.bpe; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - * Tipo Bilhete de Passagem Eletrônico - * - *

Classe Java de TBPe complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TBPe">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="infBPe">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="ide">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
- *                             <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *                             <element name="mod" type="{http://www.portalfiscal.inf.br/bpe}TModBPe"/>
- *                             <element name="serie">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TSerie">
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="nBP" type="{http://www.portalfiscal.inf.br/bpe}TNF"/>
- *                             <element name="cBP">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <pattern value="[0-9]{8}"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="cDV">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <pattern value="[0-9]{1}"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="modal">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TModal">
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="dhEmi" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                             <element name="tpEmis">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="1"/>
- *                                   <enumeration value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="verProc">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <minLength value="1"/>
- *                                   <maxLength value="20"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="tpBPe">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TTipoBPe">
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="indPres" type="{http://www.portalfiscal.inf.br/bpe}TIndPres"/>
- *                             <element name="UFIni" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
- *                             <element name="cMunIni" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
- *                             <element name="UFFim" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
- *                             <element name="cMunFim" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
- *                             <sequence minOccurs="0">
- *                               <element name="dhCont" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                               <element name="xJust">
- *                                 <simpleType>
- *                                   <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                     <minLength value="15"/>
- *                                     <maxLength value="256"/>
- *                                   </restriction>
- *                                 </simpleType>
- *                               </element>
- *                             </sequence>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="emit">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
- *                             <element name="IE">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="IEST" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="xNome">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="60"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="xFant" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="60"/>
- *                                   <minLength value="1"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <sequence minOccurs="0">
- *                               <element name="IM">
- *                                 <simpleType>
- *                                   <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                     <minLength value="1"/>
- *                                     <maxLength value="15"/>
- *                                   </restriction>
- *                                 </simpleType>
- *                               </element>
- *                               <element name="CNAE">
- *                                 <simpleType>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                     <whiteSpace value="preserve"/>
- *                                     <pattern value="[0-9]{7}"/>
- *                                   </restriction>
- *                                 </simpleType>
- *                               </element>
- *                             </sequence>
- *                             <element name="CRT">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="1"/>
- *                                   <enumeration value="2"/>
- *                                   <enumeration value="3"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="enderEmit" type="{http://www.portalfiscal.inf.br/bpe}TEndeEmi"/>
- *                             <element name="TAR" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <minLength value="1"/>
- *                                   <maxLength value="20"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="comp" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="xNome">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="60"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <choice>
- *                               <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
- *                               <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
- *                               <element name="idEstrangeiro">
- *                                 <simpleType>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                     <whiteSpace value="preserve"/>
- *                                     <pattern value="([!-�]{0}|[!-�]{5,20})?"/>
- *                                   </restriction>
- *                                 </simpleType>
- *                               </element>
- *                             </choice>
- *                             <element name="IE" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TIeDest">
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="enderComp" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="agencia" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="xNome">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="60"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
- *                             <element name="enderAgencia" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="infBPeSub" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
- *                             <element name="tpSub" type="{http://www.portalfiscal.inf.br/bpe}TTipoSubstituicao"/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="infPassagem">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="cLocOrig">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <minLength value="1"/>
- *                                   <maxLength value="7"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="xLocOrig">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="60"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="cLocDest">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <minLength value="1"/>
- *                                   <maxLength value="7"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="xLocDest">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="60"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="dhEmb" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                             <element name="infPassageiro" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <sequence>
- *                                       <element name="xNome">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                             <maxLength value="60"/>
- *                                             <minLength value="2"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
- *                                       <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
- *                                       <element name="nDoc">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                             <minLength value="2"/>
- *                                             <maxLength value="20"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="dNasc" minOccurs="0">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="fone" minOccurs="0">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                             <whiteSpace value="preserve"/>
- *                                             <pattern value="[0-9]{7,12}"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
- *                                     </sequence>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="infViagem" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="cPercurso">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <minLength value="1"/>
- *                                   <maxLength value="20"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="xPercurso">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="100"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="tpViagem">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="00"/>
- *                                   <enumeration value="01"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="tpServ">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="1"/>
- *                                   <enumeration value="2"/>
- *                                   <enumeration value="3"/>
- *                                   <enumeration value="4"/>
- *                                   <enumeration value="5"/>
- *                                   <enumeration value="6"/>
- *                                   <enumeration value="7"/>
- *                                   <enumeration value="8"/>
- *                                   <enumeration value="9"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="tpAcomodacao">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="1"/>
- *                                   <enumeration value="2"/>
- *                                   <enumeration value="3"/>
- *                                   <enumeration value="4"/>
- *                                   <enumeration value="5"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="tpTrecho">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="1"/>
- *                                   <enumeration value="2"/>
- *                                   <enumeration value="3"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="dhViagem" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                             <element name="dhConexao" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
- *                             <element name="prefixo" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <minLength value="1"/>
- *                                   <maxLength value="20"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="poltrona" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <minLength value="1"/>
- *                                   <maxLength value="3"/>
- *                                   <pattern value="0|[1-9]{1}[0-9]{0,2}"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="plataforma" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="10"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="infTravessia" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <sequence>
- *                                       <element name="tpVeiculo">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                             <whiteSpace value="preserve"/>
- *                                             <enumeration value="01"/>
- *                                             <enumeration value="02"/>
- *                                             <enumeration value="03"/>
- *                                             <enumeration value="04"/>
- *                                             <enumeration value="05"/>
- *                                             <enumeration value="06"/>
- *                                             <enumeration value="07"/>
- *                                             <enumeration value="08"/>
- *                                             <enumeration value="09"/>
- *                                             <enumeration value="10"/>
- *                                             <enumeration value="11"/>
- *                                             <enumeration value="12"/>
- *                                             <enumeration value="13"/>
- *                                             <enumeration value="14"/>
- *                                             <enumeration value="15"/>
- *                                             <enumeration value="16"/>
- *                                             <enumeration value="17"/>
- *                                             <enumeration value="18"/>
- *                                             <enumeration value="19"/>
- *                                             <enumeration value="20"/>
- *                                             <enumeration value="21"/>
- *                                             <enumeration value="22"/>
- *                                             <enumeration value="23"/>
- *                                             <enumeration value="24"/>
- *                                             <enumeration value="25"/>
- *                                             <enumeration value="26"/>
- *                                             <enumeration value="27"/>
- *                                             <enumeration value="28"/>
- *                                             <enumeration value="29"/>
- *                                             <enumeration value="99"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="sitVeiculo">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                             <whiteSpace value="preserve"/>
- *                                             <enumeration value="1"/>
- *                                             <enumeration value="2"/>
- *                                             <enumeration value="3"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                     </sequence>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="infValorBPe">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="vBP" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                             <element name="vDesconto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                             <element name="vPgto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                             <element name="vTroco" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                             <element name="tpDesconto" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="01"/>
- *                                   <enumeration value="02"/>
- *                                   <enumeration value="03"/>
- *                                   <enumeration value="04"/>
- *                                   <enumeration value="05"/>
- *                                   <enumeration value="06"/>
- *                                   <enumeration value="07"/>
- *                                   <enumeration value="08"/>
- *                                   <enumeration value="09"/>
- *                                   <enumeration value="10"/>
- *                                   <enumeration value="99"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="xDesconto" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="100"/>
- *                                   <minLength value="2"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="Comp" maxOccurs="unbounded">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <sequence>
- *                                       <element name="tpComp">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                             <whiteSpace value="preserve"/>
- *                                             <enumeration value="01"/>
- *                                             <enumeration value="02"/>
- *                                             <enumeration value="03"/>
- *                                             <enumeration value="04"/>
- *                                             <enumeration value="05"/>
- *                                             <enumeration value="06"/>
- *                                             <enumeration value="99"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                                     </sequence>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="imp">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="ICMS" type="{http://www.portalfiscal.inf.br/bpe}TImp"/>
- *                             <element name="vTotTrib" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
- *                             <element name="infAdFisco" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="2000"/>
- *                                   <minLength value="1"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="ICMSUFFim" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <sequence>
- *                                       <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                                       <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                                       <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                                       <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                                       <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                                       <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                                       <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                                       <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                                     </sequence>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="pag" maxOccurs="10">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="tPag">
- *                               <simpleType>
- *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                   <whiteSpace value="preserve"/>
- *                                   <enumeration value="01"/>
- *                                   <enumeration value="02"/>
- *                                   <enumeration value="03"/>
- *                                   <enumeration value="04"/>
- *                                   <enumeration value="05"/>
- *                                   <enumeration value="99"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="vPag" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                             <element name="card" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <sequence>
- *                                       <element name="tpIntegra">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                             <whiteSpace value="preserve"/>
- *                                             <enumeration value="1"/>
- *                                             <enumeration value="2"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
- *                                       <element name="tBand" minOccurs="0">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                             <whiteSpace value="preserve"/>
- *                                             <enumeration value="01"/>
- *                                             <enumeration value="02"/>
- *                                             <enumeration value="03"/>
- *                                             <enumeration value="04"/>
- *                                             <enumeration value="05"/>
- *                                             <enumeration value="99"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                       <element name="cAut" minOccurs="0">
- *                                         <simpleType>
- *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                             <minLength value="1"/>
- *                                             <maxLength value="20"/>
- *                                           </restriction>
- *                                         </simpleType>
- *                                       </element>
- *                                     </sequence>
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="autXML" maxOccurs="10" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <choice>
- *                               <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
- *                               <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
- *                             </choice>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="infAdic" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="infAdFisco" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <maxLength value="2000"/>
- *                                   <minLength value="1"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                             <element name="infCpl" minOccurs="0">
- *                               <simpleType>
- *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                                   <minLength value="1"/>
- *                                   <maxLength value="5000"/>
- *                                 </restriction>
- *                               </simpleType>
- *                             </element>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
- *                 <attribute name="Id" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
- *                       <pattern value="BPe[0-9]{44}"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="infBPeSupl">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="qrCodBPe">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <minLength value="50"/>
- *                         <maxLength value="1000"/>
- *                         <pattern value="((HTTPS?|https?)://.*\?chBPe=[0-9]{44}&tpAmb=[1-2](&sign=[!-�]{1}[ -�]{0,}[!-�]{1}|[!-�]{1})?)"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="boardPassBPe" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                         <minLength value="50"/>
- *                         <maxLength value="1000"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ - -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TBPe", propOrder = { - "infBPe", - "infBPeSupl" -// "signature" -}) -@XmlRootElement(name = "BPe") -public class TBPe { - - @XmlElement(required = true) - protected TBPe.InfBPe infBPe; - @XmlElement(required = true) - protected TBPe.InfBPeSupl infBPeSupl; -// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#", required = true) -// protected SignatureType signature; - - /** - * Obtém o valor da propriedade infBPe. - * - * @return - * possible object is - * {@link TBPe.InfBPe } - * - */ - public TBPe.InfBPe getInfBPe() { - return infBPe; - } - - /** - * Define o valor da propriedade infBPe. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe } - * - */ - public void setInfBPe(TBPe.InfBPe value) { - this.infBPe = value; - } - - /** - * Obtém o valor da propriedade infBPeSupl. - * - * @return - * possible object is - * {@link TBPe.InfBPeSupl } - * - */ - public TBPe.InfBPeSupl getInfBPeSupl() { - return infBPeSupl; - } - - /** - * Define o valor da propriedade infBPeSupl. - * - * @param value - * allowed object is - * {@link TBPe.InfBPeSupl } - * - */ - public void setInfBPeSupl(TBPe.InfBPeSupl value) { - this.infBPeSupl = value; - } - - /** - * Obtém o valor da propriedade signature. - * - * @return - * possible object is - * {@link SignatureType } - * - */ -// public SignatureType getSignature() { -// return signature; -// } - - /** - * Define o valor da propriedade signature. - * - * @param value - * allowed object is - * {@link SignatureType } - * - */ -// public void setSignature(SignatureType value) { -// this.signature = value; -// } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="ide">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
-     *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-     *                   <element name="mod" type="{http://www.portalfiscal.inf.br/bpe}TModBPe"/>
-     *                   <element name="serie">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TSerie">
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="nBP" type="{http://www.portalfiscal.inf.br/bpe}TNF"/>
-     *                   <element name="cBP">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <pattern value="[0-9]{8}"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="cDV">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <pattern value="[0-9]{1}"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="modal">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TModal">
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="dhEmi" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *                   <element name="tpEmis">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="1"/>
-     *                         <enumeration value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="verProc">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <minLength value="1"/>
-     *                         <maxLength value="20"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="tpBPe">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TTipoBPe">
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="indPres" type="{http://www.portalfiscal.inf.br/bpe}TIndPres"/>
-     *                   <element name="UFIni" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
-     *                   <element name="cMunIni" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
-     *                   <element name="UFFim" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
-     *                   <element name="cMunFim" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
-     *                   <sequence minOccurs="0">
-     *                     <element name="dhCont" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *                     <element name="xJust">
-     *                       <simpleType>
-     *                         <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                           <minLength value="15"/>
-     *                           <maxLength value="256"/>
-     *                         </restriction>
-     *                       </simpleType>
-     *                     </element>
-     *                   </sequence>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="emit">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
-     *                   <element name="IE">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="IEST" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="xNome">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="60"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="xFant" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="60"/>
-     *                         <minLength value="1"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <sequence minOccurs="0">
-     *                     <element name="IM">
-     *                       <simpleType>
-     *                         <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                           <minLength value="1"/>
-     *                           <maxLength value="15"/>
-     *                         </restriction>
-     *                       </simpleType>
-     *                     </element>
-     *                     <element name="CNAE">
-     *                       <simpleType>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                           <whiteSpace value="preserve"/>
-     *                           <pattern value="[0-9]{7}"/>
-     *                         </restriction>
-     *                       </simpleType>
-     *                     </element>
-     *                   </sequence>
-     *                   <element name="CRT">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="1"/>
-     *                         <enumeration value="2"/>
-     *                         <enumeration value="3"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="enderEmit" type="{http://www.portalfiscal.inf.br/bpe}TEndeEmi"/>
-     *                   <element name="TAR" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <minLength value="1"/>
-     *                         <maxLength value="20"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="comp" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="xNome">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="60"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <choice>
-     *                     <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
-     *                     <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
-     *                     <element name="idEstrangeiro">
-     *                       <simpleType>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                           <whiteSpace value="preserve"/>
-     *                           <pattern value="([!-�]{0}|[!-�]{5,20})?"/>
-     *                         </restriction>
-     *                       </simpleType>
-     *                     </element>
-     *                   </choice>
-     *                   <element name="IE" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TIeDest">
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="enderComp" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="agencia" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="xNome">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="60"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
-     *                   <element name="enderAgencia" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="infBPeSub" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
-     *                   <element name="tpSub" type="{http://www.portalfiscal.inf.br/bpe}TTipoSubstituicao"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="infPassagem">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="cLocOrig">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <minLength value="1"/>
-     *                         <maxLength value="7"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="xLocOrig">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="60"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="cLocDest">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <minLength value="1"/>
-     *                         <maxLength value="7"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="xLocDest">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="60"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="dhEmb" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *                   <element name="infPassageiro" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="xNome">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                                   <maxLength value="60"/>
-     *                                   <minLength value="2"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
-     *                             <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
-     *                             <element name="nDoc">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                                   <minLength value="2"/>
-     *                                   <maxLength value="20"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="dNasc" minOccurs="0">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="fone" minOccurs="0">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                                   <whiteSpace value="preserve"/>
-     *                                   <pattern value="[0-9]{7,12}"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="infViagem" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="cPercurso">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <minLength value="1"/>
-     *                         <maxLength value="20"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="xPercurso">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="100"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="tpViagem">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="00"/>
-     *                         <enumeration value="01"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="tpServ">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="1"/>
-     *                         <enumeration value="2"/>
-     *                         <enumeration value="3"/>
-     *                         <enumeration value="4"/>
-     *                         <enumeration value="5"/>
-     *                         <enumeration value="6"/>
-     *                         <enumeration value="7"/>
-     *                         <enumeration value="8"/>
-     *                         <enumeration value="9"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="tpAcomodacao">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="1"/>
-     *                         <enumeration value="2"/>
-     *                         <enumeration value="3"/>
-     *                         <enumeration value="4"/>
-     *                         <enumeration value="5"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="tpTrecho">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="1"/>
-     *                         <enumeration value="2"/>
-     *                         <enumeration value="3"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="dhViagem" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *                   <element name="dhConexao" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
-     *                   <element name="prefixo" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <minLength value="1"/>
-     *                         <maxLength value="20"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="poltrona" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <minLength value="1"/>
-     *                         <maxLength value="3"/>
-     *                         <pattern value="0|[1-9]{1}[0-9]{0,2}"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="plataforma" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="10"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="infTravessia" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="tpVeiculo">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                                   <whiteSpace value="preserve"/>
-     *                                   <enumeration value="01"/>
-     *                                   <enumeration value="02"/>
-     *                                   <enumeration value="03"/>
-     *                                   <enumeration value="04"/>
-     *                                   <enumeration value="05"/>
-     *                                   <enumeration value="06"/>
-     *                                   <enumeration value="07"/>
-     *                                   <enumeration value="08"/>
-     *                                   <enumeration value="09"/>
-     *                                   <enumeration value="10"/>
-     *                                   <enumeration value="11"/>
-     *                                   <enumeration value="12"/>
-     *                                   <enumeration value="13"/>
-     *                                   <enumeration value="14"/>
-     *                                   <enumeration value="15"/>
-     *                                   <enumeration value="16"/>
-     *                                   <enumeration value="17"/>
-     *                                   <enumeration value="18"/>
-     *                                   <enumeration value="19"/>
-     *                                   <enumeration value="20"/>
-     *                                   <enumeration value="21"/>
-     *                                   <enumeration value="22"/>
-     *                                   <enumeration value="23"/>
-     *                                   <enumeration value="24"/>
-     *                                   <enumeration value="25"/>
-     *                                   <enumeration value="26"/>
-     *                                   <enumeration value="27"/>
-     *                                   <enumeration value="28"/>
-     *                                   <enumeration value="29"/>
-     *                                   <enumeration value="99"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="sitVeiculo">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                                   <whiteSpace value="preserve"/>
-     *                                   <enumeration value="1"/>
-     *                                   <enumeration value="2"/>
-     *                                   <enumeration value="3"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="infValorBPe">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="vBP" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                   <element name="vDesconto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                   <element name="vPgto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                   <element name="vTroco" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                   <element name="tpDesconto" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="01"/>
-     *                         <enumeration value="02"/>
-     *                         <enumeration value="03"/>
-     *                         <enumeration value="04"/>
-     *                         <enumeration value="05"/>
-     *                         <enumeration value="06"/>
-     *                         <enumeration value="07"/>
-     *                         <enumeration value="08"/>
-     *                         <enumeration value="09"/>
-     *                         <enumeration value="10"/>
-     *                         <enumeration value="99"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="xDesconto" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="100"/>
-     *                         <minLength value="2"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="Comp" maxOccurs="unbounded">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="tpComp">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                                   <whiteSpace value="preserve"/>
-     *                                   <enumeration value="01"/>
-     *                                   <enumeration value="02"/>
-     *                                   <enumeration value="03"/>
-     *                                   <enumeration value="04"/>
-     *                                   <enumeration value="05"/>
-     *                                   <enumeration value="06"/>
-     *                                   <enumeration value="99"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="imp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="ICMS" type="{http://www.portalfiscal.inf.br/bpe}TImp"/>
-     *                   <element name="vTotTrib" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
-     *                   <element name="infAdFisco" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="2000"/>
-     *                         <minLength value="1"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="ICMSUFFim" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                             <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *                             <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *                             <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *                             <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *                             <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                             <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                             <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="pag" maxOccurs="10">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="tPag">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <whiteSpace value="preserve"/>
-     *                         <enumeration value="01"/>
-     *                         <enumeration value="02"/>
-     *                         <enumeration value="03"/>
-     *                         <enumeration value="04"/>
-     *                         <enumeration value="05"/>
-     *                         <enumeration value="99"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="vPag" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *                   <element name="card" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="tpIntegra">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                                   <whiteSpace value="preserve"/>
-     *                                   <enumeration value="1"/>
-     *                                   <enumeration value="2"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
-     *                             <element name="tBand" minOccurs="0">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                                   <whiteSpace value="preserve"/>
-     *                                   <enumeration value="01"/>
-     *                                   <enumeration value="02"/>
-     *                                   <enumeration value="03"/>
-     *                                   <enumeration value="04"/>
-     *                                   <enumeration value="05"/>
-     *                                   <enumeration value="99"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                             <element name="cAut" minOccurs="0">
-     *                               <simpleType>
-     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                                   <minLength value="1"/>
-     *                                   <maxLength value="20"/>
-     *                                 </restriction>
-     *                               </simpleType>
-     *                             </element>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="autXML" maxOccurs="10" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <choice>
-     *                     <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
-     *                     <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
-     *                   </choice>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="infAdic" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="infAdFisco" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <maxLength value="2000"/>
-     *                         <minLength value="1"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                   <element name="infCpl" minOccurs="0">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *                         <minLength value="1"/>
-     *                         <maxLength value="5000"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
-     *       <attribute name="Id" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
-     *             <pattern value="BPe[0-9]{44}"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "ide", - "emit", - "comp", - "agencia", - "infBPeSub", - "infPassagem", - "infViagem", - "infValorBPe", - "imp", - "pag", - "autXML", - "infAdic" - }) - public static class InfBPe { - - @XmlElement(required = true) - protected TBPe.InfBPe.Ide ide; - @XmlElement(required = true) - protected TBPe.InfBPe.Emit emit; - protected TBPe.InfBPe.Comp comp; - protected TBPe.InfBPe.Agencia agencia; - protected TBPe.InfBPe.InfBPeSub infBPeSub; - @XmlElement(required = true) - protected TBPe.InfBPe.InfPassagem infPassagem; - @XmlElement(required = true) - protected List infViagem; - @XmlElement(required = true) - protected TBPe.InfBPe.InfValorBPe infValorBPe; - @XmlElement(required = true) - protected TBPe.InfBPe.Imp imp; - @XmlElement(required = true) - protected List pag; - protected List autXML; - protected TBPe.InfBPe.InfAdic infAdic; - @XmlAttribute(name = "versao", required = true) - protected String versao; - @XmlAttribute(name = "Id", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - protected String id; - - /** - * Obtém o valor da propriedade ide. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Ide } - * - */ - public TBPe.InfBPe.Ide getIde() { - return ide; - } - - /** - * Define o valor da propriedade ide. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Ide } - * - */ - public void setIde(TBPe.InfBPe.Ide value) { - this.ide = value; - } - - /** - * Obtém o valor da propriedade emit. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Emit } - * - */ - public TBPe.InfBPe.Emit getEmit() { - return emit; - } - - /** - * Define o valor da propriedade emit. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Emit } - * - */ - public void setEmit(TBPe.InfBPe.Emit value) { - this.emit = value; - } - - /** - * Obtém o valor da propriedade comp. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Comp } - * - */ - public TBPe.InfBPe.Comp getComp() { - return comp; - } - - /** - * Define o valor da propriedade comp. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Comp } - * - */ - public void setComp(TBPe.InfBPe.Comp value) { - this.comp = value; - } - - /** - * Obtém o valor da propriedade agencia. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Agencia } - * - */ - public TBPe.InfBPe.Agencia getAgencia() { - return agencia; - } - - /** - * Define o valor da propriedade agencia. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Agencia } - * - */ - public void setAgencia(TBPe.InfBPe.Agencia value) { - this.agencia = value; - } - - /** - * Obtém o valor da propriedade infBPeSub. - * - * @return - * possible object is - * {@link TBPe.InfBPe.InfBPeSub } - * - */ - public TBPe.InfBPe.InfBPeSub getInfBPeSub() { - return infBPeSub; - } - - /** - * Define o valor da propriedade infBPeSub. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.InfBPeSub } - * - */ - public void setInfBPeSub(TBPe.InfBPe.InfBPeSub value) { - this.infBPeSub = value; - } - - /** - * Obtém o valor da propriedade infPassagem. - * - * @return - * possible object is - * {@link TBPe.InfBPe.InfPassagem } - * - */ - public TBPe.InfBPe.InfPassagem getInfPassagem() { - return infPassagem; - } - - /** - * Define o valor da propriedade infPassagem. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.InfPassagem } - * - */ - public void setInfPassagem(TBPe.InfBPe.InfPassagem value) { - this.infPassagem = value; - } - - /** - * Gets the value of the infViagem property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the infViagem property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getInfViagem().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link TBPe.InfBPe.InfViagem } - * - * - */ - public List getInfViagem() { - if (infViagem == null) { - infViagem = new ArrayList(); - } - return this.infViagem; - } - - /** - * Obtém o valor da propriedade infValorBPe. - * - * @return - * possible object is - * {@link TBPe.InfBPe.InfValorBPe } - * - */ - public TBPe.InfBPe.InfValorBPe getInfValorBPe() { - return infValorBPe; - } - - /** - * Define o valor da propriedade infValorBPe. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.InfValorBPe } - * - */ - public void setInfValorBPe(TBPe.InfBPe.InfValorBPe value) { - this.infValorBPe = value; - } - - /** - * Obtém o valor da propriedade imp. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Imp } - * - */ - public TBPe.InfBPe.Imp getImp() { - return imp; - } - - /** - * Define o valor da propriedade imp. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Imp } - * - */ - public void setImp(TBPe.InfBPe.Imp value) { - this.imp = value; - } - - /** - * Gets the value of the pag property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the pag property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getPag().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link TBPe.InfBPe.Pag } - * - * - */ - public List getPag() { - if (pag == null) { - pag = new ArrayList(); - } - return this.pag; - } - - /** - * Gets the value of the autXML property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the autXML property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getAutXML().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link TBPe.InfBPe.AutXML } - * - * - */ - public List getAutXML() { - if (autXML == null) { - autXML = new ArrayList(); - } - return this.autXML; - } - - /** - * Obtém o valor da propriedade infAdic. - * - * @return - * possible object is - * {@link TBPe.InfBPe.InfAdic } - * - */ - public TBPe.InfBPe.InfAdic getInfAdic() { - return infAdic; - } - - /** - * Define o valor da propriedade infAdic. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.InfAdic } - * - */ - public void setInfAdic(TBPe.InfBPe.InfAdic value) { - this.infAdic = value; - } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="xNome">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="60"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
-         *         <element name="enderAgencia" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "xNome", - "cnpj", - "enderAgencia" - }) - public static class Agencia { - - @XmlElement(required = true) - protected String xNome; - @XmlElement(name = "CNPJ", required = true) - protected String cnpj; - @XmlElement(required = true) - protected TEndereco enderAgencia; - - /** - * Obtém o valor da propriedade xNome. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXNome() { - return xNome; - } - - /** - * Define o valor da propriedade xNome. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXNome(String value) { - this.xNome = value; - } - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade enderAgencia. - * - * @return - * possible object is - * {@link TEndereco } - * - */ - public TEndereco getEnderAgencia() { - return enderAgencia; - } - - /** - * Define o valor da propriedade enderAgencia. - * - * @param value - * allowed object is - * {@link TEndereco } - * - */ - public void setEnderAgencia(TEndereco value) { - this.enderAgencia = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <choice>
-         *           <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
-         *           <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
-         *         </choice>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cnpj", - "cpf" - }) - public static class AutXML { - - @XmlElement(name = "CNPJ") - protected String cnpj; - @XmlElement(name = "CPF") - protected String cpf; - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade cpf. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCPF() { - return cpf; - } - - /** - * Define o valor da propriedade cpf. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCPF(String value) { - this.cpf = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="xNome">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="60"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <choice>
-         *           <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
-         *           <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
-         *           <element name="idEstrangeiro">
-         *             <simpleType>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                 <whiteSpace value="preserve"/>
-         *                 <pattern value="([!-�]{0}|[!-�]{5,20})?"/>
-         *               </restriction>
-         *             </simpleType>
-         *           </element>
-         *         </choice>
-         *         <element name="IE" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TIeDest">
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="enderComp" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "xNome", - "cnpj", - "cpf", - "idEstrangeiro", - "ie", - "enderComp" - }) - public static class Comp { - - @XmlElement(required = true) - protected String xNome; - @XmlElement(name = "CNPJ") - protected String cnpj; - @XmlElement(name = "CPF") - protected String cpf; - protected String idEstrangeiro; - @XmlElement(name = "IE") - protected String ie; - @XmlElement(required = true) - protected TEndereco enderComp; - - /** - * Obtém o valor da propriedade xNome. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXNome() { - return xNome; - } - - /** - * Define o valor da propriedade xNome. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXNome(String value) { - this.xNome = value; - } - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade cpf. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCPF() { - return cpf; - } - - /** - * Define o valor da propriedade cpf. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCPF(String value) { - this.cpf = value; - } - - /** - * Obtém o valor da propriedade idEstrangeiro. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIdEstrangeiro() { - return idEstrangeiro; - } - - /** - * Define o valor da propriedade idEstrangeiro. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIdEstrangeiro(String value) { - this.idEstrangeiro = value; - } - - /** - * Obtém o valor da propriedade ie. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIE() { - return ie; - } - - /** - * Define o valor da propriedade ie. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIE(String value) { - this.ie = value; - } - - /** - * Obtém o valor da propriedade enderComp. - * - * @return - * possible object is - * {@link TEndereco } - * - */ - public TEndereco getEnderComp() { - return enderComp; - } - - /** - * Define o valor da propriedade enderComp. - * - * @param value - * allowed object is - * {@link TEndereco } - * - */ - public void setEnderComp(TEndereco value) { - this.enderComp = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
-         *         <element name="IE">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="IEST" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="xNome">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="60"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="xFant" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="60"/>
-         *               <minLength value="1"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <sequence minOccurs="0">
-         *           <element name="IM">
-         *             <simpleType>
-         *               <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *                 <minLength value="1"/>
-         *                 <maxLength value="15"/>
-         *               </restriction>
-         *             </simpleType>
-         *           </element>
-         *           <element name="CNAE">
-         *             <simpleType>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                 <whiteSpace value="preserve"/>
-         *                 <pattern value="[0-9]{7}"/>
-         *               </restriction>
-         *             </simpleType>
-         *           </element>
-         *         </sequence>
-         *         <element name="CRT">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="1"/>
-         *               <enumeration value="2"/>
-         *               <enumeration value="3"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="enderEmit" type="{http://www.portalfiscal.inf.br/bpe}TEndeEmi"/>
-         *         <element name="TAR" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <minLength value="1"/>
-         *               <maxLength value="20"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cnpj", - "ie", - "iest", - "xNome", - "xFant", - "im", - "cnae", - "crt", - "enderEmit", - "tar" - }) - public static class Emit { - - @XmlElement(name = "CNPJ", required = true) - protected String cnpj; - @XmlElement(name = "IE", required = true) - protected String ie; - @XmlElement(name = "IEST") - protected String iest; - @XmlElement(required = true) - protected String xNome; - protected String xFant; - @XmlElement(name = "IM") - protected String im; - @XmlElement(name = "CNAE") - protected String cnae; - @XmlElement(name = "CRT", required = true) - protected String crt; - @XmlElement(required = true) - protected TEndeEmi enderEmit; - @XmlElement(name = "TAR") - protected String tar; - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade ie. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIE() { - return ie; - } - - /** - * Define o valor da propriedade ie. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIE(String value) { - this.ie = value; - } - - /** - * Obtém o valor da propriedade iest. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIEST() { - return iest; - } - - /** - * Define o valor da propriedade iest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIEST(String value) { - this.iest = value; - } - - /** - * Obtém o valor da propriedade xNome. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXNome() { - return xNome; - } - - /** - * Define o valor da propriedade xNome. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXNome(String value) { - this.xNome = value; - } - - /** - * Obtém o valor da propriedade xFant. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXFant() { - return xFant; - } - - /** - * Define o valor da propriedade xFant. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXFant(String value) { - this.xFant = value; - } - - /** - * Obtém o valor da propriedade im. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIM() { - return im; - } - - /** - * Define o valor da propriedade im. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIM(String value) { - this.im = value; - } - - /** - * Obtém o valor da propriedade cnae. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNAE() { - return cnae; - } - - /** - * Define o valor da propriedade cnae. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNAE(String value) { - this.cnae = value; - } - - /** - * Obtém o valor da propriedade crt. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCRT() { - return crt; - } - - /** - * Define o valor da propriedade crt. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCRT(String value) { - this.crt = value; - } - - /** - * Obtém o valor da propriedade enderEmit. - * - * @return - * possible object is - * {@link TEndeEmi } - * - */ - public TEndeEmi getEnderEmit() { - return enderEmit; - } - - /** - * Define o valor da propriedade enderEmit. - * - * @param value - * allowed object is - * {@link TEndeEmi } - * - */ - public void setEnderEmit(TEndeEmi value) { - this.enderEmit = value; - } - - /** - * Obtém o valor da propriedade tar. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTAR() { - return tar; - } - - /** - * Define o valor da propriedade tar. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTAR(String value) { - this.tar = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
-         *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-         *         <element name="mod" type="{http://www.portalfiscal.inf.br/bpe}TModBPe"/>
-         *         <element name="serie">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TSerie">
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="nBP" type="{http://www.portalfiscal.inf.br/bpe}TNF"/>
-         *         <element name="cBP">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <pattern value="[0-9]{8}"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="cDV">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <pattern value="[0-9]{1}"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="modal">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TModal">
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="dhEmi" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-         *         <element name="tpEmis">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="1"/>
-         *               <enumeration value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="verProc">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <minLength value="1"/>
-         *               <maxLength value="20"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="tpBPe">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TTipoBPe">
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="indPres" type="{http://www.portalfiscal.inf.br/bpe}TIndPres"/>
-         *         <element name="UFIni" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
-         *         <element name="cMunIni" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
-         *         <element name="UFFim" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
-         *         <element name="cMunFim" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
-         *         <sequence minOccurs="0">
-         *           <element name="dhCont" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-         *           <element name="xJust">
-         *             <simpleType>
-         *               <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *                 <minLength value="15"/>
-         *                 <maxLength value="256"/>
-         *               </restriction>
-         *             </simpleType>
-         *           </element>
-         *         </sequence>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cuf", - "tpAmb", - "mod", - "serie", - "nbp", - "cbp", - "cdv", - "modal", - "dhEmi", - "tpEmis", - "verProc", - "tpBPe", - "indPres", - "ufIni", - "cMunIni", - "ufFim", - "cMunFim", - "dhCont", - "xJust" - }) - public static class Ide { - - @XmlElement(name = "cUF", required = true) - protected String cuf; - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(required = true) - protected String mod; - @XmlElement(required = true) - protected String serie; - @XmlElement(name = "nBP", required = true) - protected String nbp; - @XmlElement(name = "cBP", required = true) - protected String cbp; - @XmlElement(name = "cDV", required = true) - protected String cdv; - @XmlElement(required = true) - protected String modal; - @XmlElement(required = true) - protected String dhEmi; - @XmlElement(required = true) - protected String tpEmis; - @XmlElement(required = true) - protected String verProc; - @XmlElement(required = true) - protected String tpBPe; - @XmlElement(required = true) - protected String indPres; - @XmlElement(name = "UFIni", required = true) - @XmlSchemaType(name = "string") - protected TUfSemEX ufIni; - @XmlElement(required = true) - protected String cMunIni; - @XmlElement(name = "UFFim", required = true) - @XmlSchemaType(name = "string") - protected TUf ufFim; - @XmlElement(required = true) - protected String cMunFim; - protected String dhCont; - protected String xJust; - - /** - * Obtém o valor da propriedade cuf. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCUF() { - return cuf; - } - - /** - * Define o valor da propriedade cuf. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCUF(String value) { - this.cuf = value; - } - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade mod. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMod() { - return mod; - } - - /** - * Define o valor da propriedade mod. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMod(String value) { - this.mod = value; - } - - /** - * Obtém o valor da propriedade serie. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSerie() { - return serie; - } - - /** - * Define o valor da propriedade serie. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSerie(String value) { - this.serie = value; - } - - /** - * Obtém o valor da propriedade nbp. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNBP() { - return nbp; - } - - /** - * Define o valor da propriedade nbp. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNBP(String value) { - this.nbp = value; - } - - /** - * Obtém o valor da propriedade cbp. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCBP() { - return cbp; - } - - /** - * Define o valor da propriedade cbp. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCBP(String value) { - this.cbp = value; - } - - /** - * Obtém o valor da propriedade cdv. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCDV() { - return cdv; - } - - /** - * Define o valor da propriedade cdv. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCDV(String value) { - this.cdv = value; - } - - /** - * Obtém o valor da propriedade modal. - * - * @return - * possible object is - * {@link String } - * - */ - public String getModal() { - return modal; - } - - /** - * Define o valor da propriedade modal. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setModal(String value) { - this.modal = value; - } - - /** - * Obtém o valor da propriedade dhEmi. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhEmi() { - return dhEmi; - } - - /** - * Define o valor da propriedade dhEmi. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhEmi(String value) { - this.dhEmi = value; - } - - /** - * Obtém o valor da propriedade tpEmis. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpEmis() { - return tpEmis; - } - - /** - * Define o valor da propriedade tpEmis. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpEmis(String value) { - this.tpEmis = value; - } - - /** - * Obtém o valor da propriedade verProc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVerProc() { - return verProc; - } - - /** - * Define o valor da propriedade verProc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVerProc(String value) { - this.verProc = value; - } - - /** - * Obtém o valor da propriedade tpBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpBPe() { - return tpBPe; - } - - /** - * Define o valor da propriedade tpBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpBPe(String value) { - this.tpBPe = value; - } - - /** - * Obtém o valor da propriedade indPres. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIndPres() { - return indPres; - } - - /** - * Define o valor da propriedade indPres. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIndPres(String value) { - this.indPres = value; - } - - /** - * Obtém o valor da propriedade ufIni. - * - * @return - * possible object is - * {@link TUfSemEX } - * - */ - public TUfSemEX getUFIni() { - return ufIni; - } - - /** - * Define o valor da propriedade ufIni. - * - * @param value - * allowed object is - * {@link TUfSemEX } - * - */ - public void setUFIni(TUfSemEX value) { - this.ufIni = value; - } - - /** - * Obtém o valor da propriedade cMunIni. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCMunIni() { - return cMunIni; - } - - /** - * Define o valor da propriedade cMunIni. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCMunIni(String value) { - this.cMunIni = value; - } - - /** - * Obtém o valor da propriedade ufFim. - * - * @return - * possible object is - * {@link TUf } - * - */ - public TUf getUFFim() { - return ufFim; - } - - /** - * Define o valor da propriedade ufFim. - * - * @param value - * allowed object is - * {@link TUf } - * - */ - public void setUFFim(TUf value) { - this.ufFim = value; - } - - /** - * Obtém o valor da propriedade cMunFim. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCMunFim() { - return cMunFim; - } - - /** - * Define o valor da propriedade cMunFim. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCMunFim(String value) { - this.cMunFim = value; - } - - /** - * Obtém o valor da propriedade dhCont. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhCont() { - return dhCont; - } - - /** - * Define o valor da propriedade dhCont. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhCont(String value) { - this.dhCont = value; - } - - /** - * Obtém o valor da propriedade xJust. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXJust() { - return xJust; - } - - /** - * Define o valor da propriedade xJust. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXJust(String value) { - this.xJust = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="ICMS" type="{http://www.portalfiscal.inf.br/bpe}TImp"/>
-         *         <element name="vTotTrib" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
-         *         <element name="infAdFisco" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="2000"/>
-         *               <minLength value="1"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="ICMSUFFim" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *                   <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-         *                   <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-         *                   <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-         *                   <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-         *                   <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *                   <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *                   <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "icms", - "vTotTrib", - "infAdFisco", - "icmsufFim" - }) - public static class Imp { - - @XmlElement(name = "ICMS", required = true) - protected TImp icms; - protected String vTotTrib; - protected String infAdFisco; - @XmlElement(name = "ICMSUFFim") - protected TBPe.InfBPe.Imp.ICMSUFFim icmsufFim; - - /** - * Obtém o valor da propriedade icms. - * - * @return - * possible object is - * {@link TImp } - * - */ - public TImp getICMS() { - return icms; - } - - /** - * Define o valor da propriedade icms. - * - * @param value - * allowed object is - * {@link TImp } - * - */ - public void setICMS(TImp value) { - this.icms = value; - } - - /** - * Obtém o valor da propriedade vTotTrib. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVTotTrib() { - return vTotTrib; - } - - /** - * Define o valor da propriedade vTotTrib. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVTotTrib(String value) { - this.vTotTrib = value; - } - - /** - * Obtém o valor da propriedade infAdFisco. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInfAdFisco() { - return infAdFisco; - } - - /** - * Define o valor da propriedade infAdFisco. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInfAdFisco(String value) { - this.infAdFisco = value; - } - - /** - * Obtém o valor da propriedade icmsufFim. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Imp.ICMSUFFim } - * - */ - public TBPe.InfBPe.Imp.ICMSUFFim getICMSUFFim() { - return icmsufFim; - } - - /** - * Define o valor da propriedade icmsufFim. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Imp.ICMSUFFim } - * - */ - public void setICMSUFFim(TBPe.InfBPe.Imp.ICMSUFFim value) { - this.icmsufFim = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-             *         <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-             *         <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-             *         <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-             *         <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-             *         <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-             *         <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-             *         <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "vbcufFim", - "pfcpufFim", - "picmsufFim", - "picmsInter", - "picmsInterPart", - "vfcpufFim", - "vicmsufFim", - "vicmsufIni" - }) - public static class ICMSUFFim { - - @XmlElement(name = "vBCUFFim", required = true) - protected String vbcufFim; - @XmlElement(name = "pFCPUFFim", required = true) - protected String pfcpufFim; - @XmlElement(name = "pICMSUFFim", required = true) - protected String picmsufFim; - @XmlElement(name = "pICMSInter", required = true) - protected String picmsInter; - @XmlElement(name = "pICMSInterPart", required = true) - protected String picmsInterPart; - @XmlElement(name = "vFCPUFFim", required = true) - protected String vfcpufFim; - @XmlElement(name = "vICMSUFFim", required = true) - protected String vicmsufFim; - @XmlElement(name = "vICMSUFIni", required = true) - protected String vicmsufIni; - - /** - * Obtém o valor da propriedade vbcufFim. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVBCUFFim() { - return vbcufFim; - } - - /** - * Define o valor da propriedade vbcufFim. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVBCUFFim(String value) { - this.vbcufFim = value; - } - - /** - * Obtém o valor da propriedade pfcpufFim. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPFCPUFFim() { - return pfcpufFim; - } - - /** - * Define o valor da propriedade pfcpufFim. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPFCPUFFim(String value) { - this.pfcpufFim = value; - } - - /** - * Obtém o valor da propriedade picmsufFim. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMSUFFim() { - return picmsufFim; - } - - /** - * Define o valor da propriedade picmsufFim. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMSUFFim(String value) { - this.picmsufFim = value; - } - - /** - * Obtém o valor da propriedade picmsInter. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMSInter() { - return picmsInter; - } - - /** - * Define o valor da propriedade picmsInter. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMSInter(String value) { - this.picmsInter = value; - } - - /** - * Obtém o valor da propriedade picmsInterPart. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMSInterPart() { - return picmsInterPart; - } - - /** - * Define o valor da propriedade picmsInterPart. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMSInterPart(String value) { - this.picmsInterPart = value; - } - - /** - * Obtém o valor da propriedade vfcpufFim. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVFCPUFFim() { - return vfcpufFim; - } - - /** - * Define o valor da propriedade vfcpufFim. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVFCPUFFim(String value) { - this.vfcpufFim = value; - } - - /** - * Obtém o valor da propriedade vicmsufFim. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVICMSUFFim() { - return vicmsufFim; - } - - /** - * Define o valor da propriedade vicmsufFim. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVICMSUFFim(String value) { - this.vicmsufFim = value; - } - - /** - * Obtém o valor da propriedade vicmsufIni. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVICMSUFIni() { - return vicmsufIni; - } - - /** - * Define o valor da propriedade vicmsufIni. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVICMSUFIni(String value) { - this.vicmsufIni = value; - } - - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="infAdFisco" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="2000"/>
-         *               <minLength value="1"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="infCpl" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <minLength value="1"/>
-         *               <maxLength value="5000"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "infAdFisco", - "infCpl" - }) - public static class InfAdic { - - protected String infAdFisco; - protected String infCpl; - - /** - * Obtém o valor da propriedade infAdFisco. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInfAdFisco() { - return infAdFisco; - } - - /** - * Define o valor da propriedade infAdFisco. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInfAdFisco(String value) { - this.infAdFisco = value; - } - - /** - * Obtém o valor da propriedade infCpl. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInfCpl() { - return infCpl; - } - - /** - * Define o valor da propriedade infCpl. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInfCpl(String value) { - this.infCpl = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
-         *         <element name="tpSub" type="{http://www.portalfiscal.inf.br/bpe}TTipoSubstituicao"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "chBPe", - "tpSub" - }) - public static class InfBPeSub { - - @XmlElement(required = true) - protected String chBPe; - @XmlElement(required = true) - protected String tpSub; - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade tpSub. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpSub() { - return tpSub; - } - - /** - * Define o valor da propriedade tpSub. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpSub(String value) { - this.tpSub = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="cLocOrig">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <minLength value="1"/>
-         *               <maxLength value="7"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="xLocOrig">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="60"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="cLocDest">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <minLength value="1"/>
-         *               <maxLength value="7"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="xLocDest">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="60"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="dhEmb" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-         *         <element name="infPassageiro" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="xNome">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *                         <maxLength value="60"/>
-         *                         <minLength value="2"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
-         *                   <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
-         *                   <element name="nDoc">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *                         <minLength value="2"/>
-         *                         <maxLength value="20"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="dNasc" minOccurs="0">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="fone" minOccurs="0">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                         <whiteSpace value="preserve"/>
-         *                         <pattern value="[0-9]{7,12}"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cLocOrig", - "xLocOrig", - "cLocDest", - "xLocDest", - "dhEmb", - "dhValidade", - "infPassageiro" - }) - public static class InfPassagem { - - @XmlElement(required = true) - protected String cLocOrig; - @XmlElement(required = true) - protected String xLocOrig; - @XmlElement(required = true) - protected String cLocDest; - @XmlElement(required = true) - protected String xLocDest; - @XmlElement(required = true) - protected String dhEmb; - protected String dhValidade; - protected TBPe.InfBPe.InfPassagem.InfPassageiro infPassageiro; - - /** - * Obtém o valor da propriedade cLocOrig. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCLocOrig() { - return cLocOrig; - } - - /** - * Define o valor da propriedade cLocOrig. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCLocOrig(String value) { - this.cLocOrig = value; - } - - /** - * Obtém o valor da propriedade xLocOrig. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXLocOrig() { - return xLocOrig; - } - - /** - * Define o valor da propriedade xLocOrig. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXLocOrig(String value) { - this.xLocOrig = value; - } - - /** - * Obtém o valor da propriedade cLocDest. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCLocDest() { - return cLocDest; - } - - /** - * Define o valor da propriedade cLocDest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCLocDest(String value) { - this.cLocDest = value; - } - - /** - * Obtém o valor da propriedade xLocDest. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXLocDest() { - return xLocDest; - } - - /** - * Define o valor da propriedade xLocDest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXLocDest(String value) { - this.xLocDest = value; - } - - /** - * Obtém o valor da propriedade dhEmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhEmb() { - return dhEmb; - } - - /** - * Define o valor da propriedade dhEmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhEmb(String value) { - this.dhEmb = value; - } - - /** - * Obtém o valor da propriedade dhValidade. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhValidade() { - return dhValidade; - } - - /** - * Define o valor da propriedade dhValidade. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhValidade(String value) { - this.dhValidade = value; - } - - /** - * Obtém o valor da propriedade infPassageiro. - * - * @return - * possible object is - * {@link TBPe.InfBPe.InfPassagem.InfPassageiro } - * - */ - public TBPe.InfBPe.InfPassagem.InfPassageiro getInfPassageiro() { - return infPassageiro; - } - - /** - * Define o valor da propriedade infPassageiro. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.InfPassagem.InfPassageiro } - * - */ - public void setInfPassageiro(TBPe.InfBPe.InfPassagem.InfPassageiro value) { - this.infPassageiro = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="xNome">
-             *           <simpleType>
-             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-             *               <maxLength value="60"/>
-             *               <minLength value="2"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
-             *         <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
-             *         <element name="nDoc">
-             *           <simpleType>
-             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-             *               <minLength value="2"/>
-             *               <maxLength value="20"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="dNasc" minOccurs="0">
-             *           <simpleType>
-             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="fone" minOccurs="0">
-             *           <simpleType>
-             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *               <whiteSpace value="preserve"/>
-             *               <pattern value="[0-9]{7,12}"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "xNome", - "cpf", - "tpDoc", - "nDoc", - "dNasc", - "fone", - "email" - }) - public static class InfPassageiro { - - @XmlElement(required = true) - protected String xNome; - @XmlElement(name = "CPF") - protected String cpf; - @XmlElement(required = true) - protected String tpDoc; - @XmlElement(required = true) - protected String nDoc; - protected String dNasc; - protected String fone; - protected String email; - - /** - * Obtém o valor da propriedade xNome. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXNome() { - return xNome; - } - - /** - * Define o valor da propriedade xNome. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXNome(String value) { - this.xNome = value; - } - - /** - * Obtém o valor da propriedade cpf. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCPF() { - return cpf; - } - - /** - * Define o valor da propriedade cpf. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCPF(String value) { - this.cpf = value; - } - - /** - * Obtém o valor da propriedade tpDoc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpDoc() { - return tpDoc; - } - - /** - * Define o valor da propriedade tpDoc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpDoc(String value) { - this.tpDoc = value; - } - - /** - * Obtém o valor da propriedade nDoc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNDoc() { - return nDoc; - } - - /** - * Define o valor da propriedade nDoc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNDoc(String value) { - this.nDoc = value; - } - - /** - * Obtém o valor da propriedade dNasc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDNasc() { - return dNasc; - } - - /** - * Define o valor da propriedade dNasc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDNasc(String value) { - this.dNasc = value; - } - - /** - * Obtém o valor da propriedade fone. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFone() { - return fone; - } - - /** - * Define o valor da propriedade fone. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFone(String value) { - this.fone = value; - } - - /** - * Obtém o valor da propriedade email. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEmail() { - return email; - } - - /** - * Define o valor da propriedade email. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEmail(String value) { - this.email = value; - } - - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="vBP" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *         <element name="vDesconto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *         <element name="vPgto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *         <element name="vTroco" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *         <element name="tpDesconto" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="01"/>
-         *               <enumeration value="02"/>
-         *               <enumeration value="03"/>
-         *               <enumeration value="04"/>
-         *               <enumeration value="05"/>
-         *               <enumeration value="06"/>
-         *               <enumeration value="07"/>
-         *               <enumeration value="08"/>
-         *               <enumeration value="09"/>
-         *               <enumeration value="10"/>
-         *               <enumeration value="99"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="xDesconto" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="100"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="Comp" maxOccurs="unbounded">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="tpComp">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                         <whiteSpace value="preserve"/>
-         *                         <enumeration value="01"/>
-         *                         <enumeration value="02"/>
-         *                         <enumeration value="03"/>
-         *                         <enumeration value="04"/>
-         *                         <enumeration value="05"/>
-         *                         <enumeration value="06"/>
-         *                         <enumeration value="99"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "vbp", - "vDesconto", - "vPgto", - "vTroco", - "tpDesconto", - "xDesconto", - "comp" - }) - public static class InfValorBPe { - - @XmlElement(name = "vBP", required = true) - protected String vbp; - @XmlElement(required = true) - protected String vDesconto; - @XmlElement(required = true) - protected String vPgto; - @XmlElement(required = true) - protected String vTroco; - protected String tpDesconto; - protected String xDesconto; - @XmlElement(name = "Comp", required = true) - protected List comp; - - /** - * Obtém o valor da propriedade vbp. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVBP() { - return vbp; - } - - /** - * Define o valor da propriedade vbp. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVBP(String value) { - this.vbp = value; - } - - /** - * Obtém o valor da propriedade vDesconto. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVDesconto() { - return vDesconto; - } - - /** - * Define o valor da propriedade vDesconto. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVDesconto(String value) { - this.vDesconto = value; - } - - /** - * Obtém o valor da propriedade vPgto. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVPgto() { - return vPgto; - } - - /** - * Define o valor da propriedade vPgto. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVPgto(String value) { - this.vPgto = value; - } - - /** - * Obtém o valor da propriedade vTroco. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVTroco() { - return vTroco; - } - - /** - * Define o valor da propriedade vTroco. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVTroco(String value) { - this.vTroco = value; - } - - /** - * Obtém o valor da propriedade tpDesconto. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpDesconto() { - return tpDesconto; - } - - /** - * Define o valor da propriedade tpDesconto. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpDesconto(String value) { - this.tpDesconto = value; - } - - /** - * Obtém o valor da propriedade xDesconto. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXDesconto() { - return xDesconto; - } - - /** - * Define o valor da propriedade xDesconto. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXDesconto(String value) { - this.xDesconto = value; - } - - /** - * Gets the value of the comp property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the comp property. - * - *

- * For example, to add a new item, do as follows: - *

-             *    getComp().add(newItem);
-             * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link TBPe.InfBPe.InfValorBPe.Comp } - * - * - */ - public List getComp() { - if (comp == null) { - comp = new ArrayList(); - } - return this.comp; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="tpComp">
-             *           <simpleType>
-             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *               <whiteSpace value="preserve"/>
-             *               <enumeration value="01"/>
-             *               <enumeration value="02"/>
-             *               <enumeration value="03"/>
-             *               <enumeration value="04"/>
-             *               <enumeration value="05"/>
-             *               <enumeration value="06"/>
-             *               <enumeration value="99"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "tpComp", - "vComp" - }) - public static class Comp { - - @XmlElement(required = true) - protected String tpComp; - @XmlElement(required = true) - protected String vComp; - - /** - * Obtém o valor da propriedade tpComp. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpComp() { - return tpComp; - } - - /** - * Define o valor da propriedade tpComp. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpComp(String value) { - this.tpComp = value; - } - - /** - * Obtém o valor da propriedade vComp. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVComp() { - return vComp; - } - - /** - * Define o valor da propriedade vComp. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVComp(String value) { - this.vComp = value; - } - - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="cPercurso">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <minLength value="1"/>
-         *               <maxLength value="20"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="xPercurso">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="100"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="tpViagem">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="00"/>
-         *               <enumeration value="01"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="tpServ">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="1"/>
-         *               <enumeration value="2"/>
-         *               <enumeration value="3"/>
-         *               <enumeration value="4"/>
-         *               <enumeration value="5"/>
-         *               <enumeration value="6"/>
-         *               <enumeration value="7"/>
-         *               <enumeration value="8"/>
-         *               <enumeration value="9"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="tpAcomodacao">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="1"/>
-         *               <enumeration value="2"/>
-         *               <enumeration value="3"/>
-         *               <enumeration value="4"/>
-         *               <enumeration value="5"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="tpTrecho">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="1"/>
-         *               <enumeration value="2"/>
-         *               <enumeration value="3"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="dhViagem" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-         *         <element name="dhConexao" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
-         *         <element name="prefixo" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <minLength value="1"/>
-         *               <maxLength value="20"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="poltrona" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <minLength value="1"/>
-         *               <maxLength value="3"/>
-         *               <pattern value="0|[1-9]{1}[0-9]{0,2}"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="plataforma" minOccurs="0">
-         *           <simpleType>
-         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *               <maxLength value="10"/>
-         *               <minLength value="2"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="infTravessia" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="tpVeiculo">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                         <whiteSpace value="preserve"/>
-         *                         <enumeration value="01"/>
-         *                         <enumeration value="02"/>
-         *                         <enumeration value="03"/>
-         *                         <enumeration value="04"/>
-         *                         <enumeration value="05"/>
-         *                         <enumeration value="06"/>
-         *                         <enumeration value="07"/>
-         *                         <enumeration value="08"/>
-         *                         <enumeration value="09"/>
-         *                         <enumeration value="10"/>
-         *                         <enumeration value="11"/>
-         *                         <enumeration value="12"/>
-         *                         <enumeration value="13"/>
-         *                         <enumeration value="14"/>
-         *                         <enumeration value="15"/>
-         *                         <enumeration value="16"/>
-         *                         <enumeration value="17"/>
-         *                         <enumeration value="18"/>
-         *                         <enumeration value="19"/>
-         *                         <enumeration value="20"/>
-         *                         <enumeration value="21"/>
-         *                         <enumeration value="22"/>
-         *                         <enumeration value="23"/>
-         *                         <enumeration value="24"/>
-         *                         <enumeration value="25"/>
-         *                         <enumeration value="26"/>
-         *                         <enumeration value="27"/>
-         *                         <enumeration value="28"/>
-         *                         <enumeration value="29"/>
-         *                         <enumeration value="99"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="sitVeiculo">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                         <whiteSpace value="preserve"/>
-         *                         <enumeration value="1"/>
-         *                         <enumeration value="2"/>
-         *                         <enumeration value="3"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cPercurso", - "xPercurso", - "tpViagem", - "tpServ", - "tpAcomodacao", - "tpTrecho", - "dhViagem", - "dhConexao", - "prefixo", - "poltrona", - "plataforma", - "infTravessia" - }) - public static class InfViagem { - - @XmlElement(required = true) - protected String cPercurso; - @XmlElement(required = true) - protected String xPercurso; - @XmlElement(required = true) - protected String tpViagem; - @XmlElement(required = true) - protected String tpServ; - @XmlElement(required = true) - protected String tpAcomodacao; - @XmlElement(required = true) - protected String tpTrecho; - @XmlElement(required = true) - protected String dhViagem; - protected String dhConexao; - protected String prefixo; - protected String poltrona; - protected String plataforma; - protected TBPe.InfBPe.InfViagem.InfTravessia infTravessia; - - /** - * Obtém o valor da propriedade cPercurso. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCPercurso() { - return cPercurso; - } - - /** - * Define o valor da propriedade cPercurso. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCPercurso(String value) { - this.cPercurso = value; - } - - /** - * Obtém o valor da propriedade xPercurso. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXPercurso() { - return xPercurso; - } - - /** - * Define o valor da propriedade xPercurso. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXPercurso(String value) { - this.xPercurso = value; - } - - /** - * Obtém o valor da propriedade tpViagem. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpViagem() { - return tpViagem; - } - - /** - * Define o valor da propriedade tpViagem. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpViagem(String value) { - this.tpViagem = value; - } - - /** - * Obtém o valor da propriedade tpServ. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpServ() { - return tpServ; - } - - /** - * Define o valor da propriedade tpServ. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpServ(String value) { - this.tpServ = value; - } - - /** - * Obtém o valor da propriedade tpAcomodacao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAcomodacao() { - return tpAcomodacao; - } - - /** - * Define o valor da propriedade tpAcomodacao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAcomodacao(String value) { - this.tpAcomodacao = value; - } - - /** - * Obtém o valor da propriedade tpTrecho. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpTrecho() { - return tpTrecho; - } - - /** - * Define o valor da propriedade tpTrecho. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpTrecho(String value) { - this.tpTrecho = value; - } - - /** - * Obtém o valor da propriedade dhViagem. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhViagem() { - return dhViagem; - } - - /** - * Define o valor da propriedade dhViagem. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhViagem(String value) { - this.dhViagem = value; - } - - /** - * Obtém o valor da propriedade dhConexao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhConexao() { - return dhConexao; - } - - /** - * Define o valor da propriedade dhConexao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhConexao(String value) { - this.dhConexao = value; - } - - /** - * Obtém o valor da propriedade prefixo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPrefixo() { - return prefixo; - } - - /** - * Define o valor da propriedade prefixo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPrefixo(String value) { - this.prefixo = value; - } - - /** - * Obtém o valor da propriedade poltrona. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPoltrona() { - return poltrona; - } - - /** - * Define o valor da propriedade poltrona. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPoltrona(String value) { - this.poltrona = value; - } - - /** - * Obtém o valor da propriedade plataforma. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPlataforma() { - return plataforma; - } - - /** - * Define o valor da propriedade plataforma. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPlataforma(String value) { - this.plataforma = value; - } - - /** - * Obtém o valor da propriedade infTravessia. - * - * @return - * possible object is - * {@link TBPe.InfBPe.InfViagem.InfTravessia } - * - */ - public TBPe.InfBPe.InfViagem.InfTravessia getInfTravessia() { - return infTravessia; - } - - /** - * Define o valor da propriedade infTravessia. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.InfViagem.InfTravessia } - * - */ - public void setInfTravessia(TBPe.InfBPe.InfViagem.InfTravessia value) { - this.infTravessia = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="tpVeiculo">
-             *           <simpleType>
-             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *               <whiteSpace value="preserve"/>
-             *               <enumeration value="01"/>
-             *               <enumeration value="02"/>
-             *               <enumeration value="03"/>
-             *               <enumeration value="04"/>
-             *               <enumeration value="05"/>
-             *               <enumeration value="06"/>
-             *               <enumeration value="07"/>
-             *               <enumeration value="08"/>
-             *               <enumeration value="09"/>
-             *               <enumeration value="10"/>
-             *               <enumeration value="11"/>
-             *               <enumeration value="12"/>
-             *               <enumeration value="13"/>
-             *               <enumeration value="14"/>
-             *               <enumeration value="15"/>
-             *               <enumeration value="16"/>
-             *               <enumeration value="17"/>
-             *               <enumeration value="18"/>
-             *               <enumeration value="19"/>
-             *               <enumeration value="20"/>
-             *               <enumeration value="21"/>
-             *               <enumeration value="22"/>
-             *               <enumeration value="23"/>
-             *               <enumeration value="24"/>
-             *               <enumeration value="25"/>
-             *               <enumeration value="26"/>
-             *               <enumeration value="27"/>
-             *               <enumeration value="28"/>
-             *               <enumeration value="29"/>
-             *               <enumeration value="99"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="sitVeiculo">
-             *           <simpleType>
-             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *               <whiteSpace value="preserve"/>
-             *               <enumeration value="1"/>
-             *               <enumeration value="2"/>
-             *               <enumeration value="3"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "tpVeiculo", - "sitVeiculo" - }) - public static class InfTravessia { - - @XmlElement(required = true) - protected String tpVeiculo; - @XmlElement(required = true) - protected String sitVeiculo; - - /** - * Obtém o valor da propriedade tpVeiculo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpVeiculo() { - return tpVeiculo; - } - - /** - * Define o valor da propriedade tpVeiculo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpVeiculo(String value) { - this.tpVeiculo = value; - } - - /** - * Obtém o valor da propriedade sitVeiculo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSitVeiculo() { - return sitVeiculo; - } - - /** - * Define o valor da propriedade sitVeiculo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSitVeiculo(String value) { - this.sitVeiculo = value; - } - - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="tPag">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <whiteSpace value="preserve"/>
-         *               <enumeration value="01"/>
-         *               <enumeration value="02"/>
-         *               <enumeration value="03"/>
-         *               <enumeration value="04"/>
-         *               <enumeration value="05"/>
-         *               <enumeration value="99"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *         <element name="vPag" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-         *         <element name="card" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="tpIntegra">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                         <whiteSpace value="preserve"/>
-         *                         <enumeration value="1"/>
-         *                         <enumeration value="2"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
-         *                   <element name="tBand" minOccurs="0">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *                         <whiteSpace value="preserve"/>
-         *                         <enumeration value="01"/>
-         *                         <enumeration value="02"/>
-         *                         <enumeration value="03"/>
-         *                         <enumeration value="04"/>
-         *                         <enumeration value="05"/>
-         *                         <enumeration value="99"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                   <element name="cAut" minOccurs="0">
-         *                     <simpleType>
-         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-         *                         <minLength value="1"/>
-         *                         <maxLength value="20"/>
-         *                       </restriction>
-         *                     </simpleType>
-         *                   </element>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "tPag", - "vPag", - "card", - "xPag" - }) - public static class Pag { - - @XmlElement(required = true) - protected String tPag; - @XmlElement(required = true) - protected String vPag; - protected String xPag; - protected TBPe.InfBPe.Pag.Card card; - - /** - * Obtém o valor da propriedade tPag. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTPag() { - return tPag; - } - - /** - * Define o valor da propriedade tPag. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTPag(String value) { - this.tPag = value; - } - - /** - * Obtém o valor da propriedade vPag. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVPag() { - return vPag; - } - - /** - * Define o valor da propriedade vPag. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVPag(String value) { - this.vPag = value; - } - - /** - * Obtém o valor da propriedade xPag. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXPag() { - return xPag; - } - - /** - * Define o valor da propriedade xPag. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXPag(String value) { - this.xPag = value; - } - - /** - * Obtém o valor da propriedade card. - * - * @return - * possible object is - * {@link TBPe.InfBPe.Pag.Card } - * - */ - public TBPe.InfBPe.Pag.Card getCard() { - return card; - } - - /** - * Define o valor da propriedade card. - * - * @param value - * allowed object is - * {@link TBPe.InfBPe.Pag.Card } - * - */ - public void setCard(TBPe.InfBPe.Pag.Card value) { - this.card = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="tpIntegra">
-             *           <simpleType>
-             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *               <whiteSpace value="preserve"/>
-             *               <enumeration value="1"/>
-             *               <enumeration value="2"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
-             *         <element name="tBand" minOccurs="0">
-             *           <simpleType>
-             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *               <whiteSpace value="preserve"/>
-             *               <enumeration value="01"/>
-             *               <enumeration value="02"/>
-             *               <enumeration value="03"/>
-             *               <enumeration value="04"/>
-             *               <enumeration value="05"/>
-             *               <enumeration value="99"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *         <element name="cAut" minOccurs="0">
-             *           <simpleType>
-             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-             *               <minLength value="1"/>
-             *               <maxLength value="20"/>
-             *             </restriction>
-             *           </simpleType>
-             *         </element>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "tpIntegra", - "cnpj", - "tBand", - "cAut", - "xBand", - "nsuTrans", - "nsuHost", - "nParcelas" - }) - public static class Card { - - @XmlElement(required = true) - protected String tpIntegra; - @XmlElement(name = "CNPJ") - protected String cnpj; - protected String tBand; - protected String cAut; - protected String xBand; - protected String nsuTrans; - protected String nsuHost; - protected String nParcelas; - - /** - * Obtém o valor da propriedade tpIntegra. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpIntegra() { - return tpIntegra; - } - - /** - * Define o valor da propriedade tpIntegra. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpIntegra(String value) { - this.tpIntegra = value; - } - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade tBand. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTBand() { - return tBand; - } - - /** - * Define o valor da propriedade tBand. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTBand(String value) { - this.tBand = value; - } - - /** - * Obtém o valor da propriedade xBand. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXBand() { - return xBand; - } - - /** - * Define o valor da propriedade xBand. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXBand(String value) { - this.xBand = value; - } - - /** - * Obtém o valor da propriedade nsuTrans. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNsuTrans() { - return nsuTrans; - } - - /** - * Define o valor da propriedade nsuTrans. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNsuTrans(String value) { - this.xBand = value; - } - - /** - * Obtém o valor da propriedade nsuHost. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNsuHost() { - return nsuHost; - } - - /** - * Define o valor da propriedade nsuHost. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNsuHost(String value) { - this.nsuHost = value; - } - - /** - * Obtém o valor da propriedade nParcelas. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNParcelas() { - return nParcelas; - } - - /** - * Define o valor da propriedade nParcelas. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNParcelas(String value) { - this.nParcelas = value; - } - - /** - * Obtém o valor da propriedade cAut. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCAut() { - return cAut; - } - - /** - * Define o valor da propriedade cAut. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCAut(String value) { - this.cAut = value; - } - - } - - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="qrCodBPe">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <minLength value="50"/>
-     *               <maxLength value="1000"/>
-     *               <pattern value="((HTTPS?|https?)://.*\?chBPe=[0-9]{44}&tpAmb=[1-2](&sign=[!-�]{1}[ -�]{0,}[!-�]{1}|[!-�]{1})?)"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="boardPassBPe" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *               <minLength value="50"/>
-     *               <maxLength value="1000"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "qrCodBPe", - "boardPassBPe" - }) - public static class InfBPeSupl { - - @XmlElement(required = true) - protected String qrCodBPe; - protected String boardPassBPe; - - /** - * Obtém o valor da propriedade qrCodBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQrCodBPe() { - return qrCodBPe; - } - - /** - * Define o valor da propriedade qrCodBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQrCodBPe(String value) { - this.qrCodBPe = value; - } - - /** - * Obtém o valor da propriedade boardPassBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBoardPassBPe() { - return boardPassBPe; - } - - /** - * Define o valor da propriedade boardPassBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBoardPassBPe(String value) { - this.boardPassBPe = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.10.23 às 04:19:56 PM BRST +// + + +package br.inf.portalfiscal.bpe; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * Tipo Bilhete de Passagem Eletrônico + * + *

Classe Java de TBPe complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TBPe">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="infBPe">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="ide">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
+ *                             <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *                             <element name="mod" type="{http://www.portalfiscal.inf.br/bpe}TModBPe"/>
+ *                             <element name="serie">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TSerie">
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="nBP" type="{http://www.portalfiscal.inf.br/bpe}TNF"/>
+ *                             <element name="cBP">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <pattern value="[0-9]{8}"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="cDV">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <pattern value="[0-9]{1}"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="modal">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TModal">
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="dhEmi" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                             <element name="tpEmis">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="1"/>
+ *                                   <enumeration value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="verProc">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="20"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="tpBPe">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TTipoBPe">
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="indPres" type="{http://www.portalfiscal.inf.br/bpe}TIndPres"/>
+ *                             <element name="UFIni" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
+ *                             <element name="cMunIni" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+ *                             <element name="UFFim" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
+ *                             <element name="cMunFim" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+ *                             <sequence minOccurs="0">
+ *                               <element name="dhCont" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                               <element name="xJust">
+ *                                 <simpleType>
+ *                                   <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                     <minLength value="15"/>
+ *                                     <maxLength value="256"/>
+ *                                   </restriction>
+ *                                 </simpleType>
+ *                               </element>
+ *                             </sequence>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="emit">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+ *                             <element name="IE">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="IEST" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="xNome">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="60"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="xFant" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="60"/>
+ *                                   <minLength value="1"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <sequence minOccurs="0">
+ *                               <element name="IM">
+ *                                 <simpleType>
+ *                                   <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                     <minLength value="1"/>
+ *                                     <maxLength value="15"/>
+ *                                   </restriction>
+ *                                 </simpleType>
+ *                               </element>
+ *                               <element name="CNAE">
+ *                                 <simpleType>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                     <whiteSpace value="preserve"/>
+ *                                     <pattern value="[0-9]{7}"/>
+ *                                   </restriction>
+ *                                 </simpleType>
+ *                               </element>
+ *                             </sequence>
+ *                             <element name="CRT">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="1"/>
+ *                                   <enumeration value="2"/>
+ *                                   <enumeration value="3"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="enderEmit" type="{http://www.portalfiscal.inf.br/bpe}TEndeEmi"/>
+ *                             <element name="TAR" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="20"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="comp" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="xNome">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="60"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <choice>
+ *                               <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
+ *                               <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
+ *                               <element name="idEstrangeiro">
+ *                                 <simpleType>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                     <whiteSpace value="preserve"/>
+ *                                     <pattern value="([!-�]{0}|[!-�]{5,20})?"/>
+ *                                   </restriction>
+ *                                 </simpleType>
+ *                               </element>
+ *                             </choice>
+ *                             <element name="IE" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TIeDest">
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="enderComp" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="agencia" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="xNome">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="60"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
+ *                             <element name="enderAgencia" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="infBPeSub" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+ *                             <element name="tpSub" type="{http://www.portalfiscal.inf.br/bpe}TTipoSubstituicao"/>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="infPassagem">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="cLocOrig">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="7"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="xLocOrig">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="60"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="cLocDest">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="7"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="xLocDest">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="60"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="dhEmb" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                             <element name="infPassageiro" minOccurs="0">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <sequence>
+ *                                       <element name="xNome">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                             <maxLength value="60"/>
+ *                                             <minLength value="2"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
+ *                                       <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
+ *                                       <element name="nDoc">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                             <minLength value="2"/>
+ *                                             <maxLength value="20"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="dNasc" minOccurs="0">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="fone" minOccurs="0">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                             <whiteSpace value="preserve"/>
+ *                                             <pattern value="[0-9]{7,12}"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
+ *                                     </sequence>
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="infViagem" maxOccurs="unbounded">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="cPercurso">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="20"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="xPercurso">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="100"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="tpViagem">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="00"/>
+ *                                   <enumeration value="01"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="tpServ">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="1"/>
+ *                                   <enumeration value="2"/>
+ *                                   <enumeration value="3"/>
+ *                                   <enumeration value="4"/>
+ *                                   <enumeration value="5"/>
+ *                                   <enumeration value="6"/>
+ *                                   <enumeration value="7"/>
+ *                                   <enumeration value="8"/>
+ *                                   <enumeration value="9"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="tpAcomodacao">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="1"/>
+ *                                   <enumeration value="2"/>
+ *                                   <enumeration value="3"/>
+ *                                   <enumeration value="4"/>
+ *                                   <enumeration value="5"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="tpTrecho">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="1"/>
+ *                                   <enumeration value="2"/>
+ *                                   <enumeration value="3"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="dhViagem" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                             <element name="dhConexao" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+ *                             <element name="prefixo" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="20"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="poltrona" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="3"/>
+ *                                   <pattern value="0|[1-9]{1}[0-9]{0,2}"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="plataforma" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="10"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="infTravessia" minOccurs="0">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <sequence>
+ *                                       <element name="tpVeiculo">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                             <whiteSpace value="preserve"/>
+ *                                             <enumeration value="01"/>
+ *                                             <enumeration value="02"/>
+ *                                             <enumeration value="03"/>
+ *                                             <enumeration value="04"/>
+ *                                             <enumeration value="05"/>
+ *                                             <enumeration value="06"/>
+ *                                             <enumeration value="07"/>
+ *                                             <enumeration value="08"/>
+ *                                             <enumeration value="09"/>
+ *                                             <enumeration value="10"/>
+ *                                             <enumeration value="11"/>
+ *                                             <enumeration value="12"/>
+ *                                             <enumeration value="13"/>
+ *                                             <enumeration value="14"/>
+ *                                             <enumeration value="15"/>
+ *                                             <enumeration value="16"/>
+ *                                             <enumeration value="17"/>
+ *                                             <enumeration value="18"/>
+ *                                             <enumeration value="19"/>
+ *                                             <enumeration value="20"/>
+ *                                             <enumeration value="21"/>
+ *                                             <enumeration value="22"/>
+ *                                             <enumeration value="23"/>
+ *                                             <enumeration value="24"/>
+ *                                             <enumeration value="25"/>
+ *                                             <enumeration value="26"/>
+ *                                             <enumeration value="27"/>
+ *                                             <enumeration value="28"/>
+ *                                             <enumeration value="29"/>
+ *                                             <enumeration value="99"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="sitVeiculo">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                             <whiteSpace value="preserve"/>
+ *                                             <enumeration value="1"/>
+ *                                             <enumeration value="2"/>
+ *                                             <enumeration value="3"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                     </sequence>
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="infValorBPe">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="vBP" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                             <element name="vDesconto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                             <element name="vPgto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                             <element name="vTroco" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                             <element name="tpDesconto" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="01"/>
+ *                                   <enumeration value="02"/>
+ *                                   <enumeration value="03"/>
+ *                                   <enumeration value="04"/>
+ *                                   <enumeration value="05"/>
+ *                                   <enumeration value="06"/>
+ *                                   <enumeration value="07"/>
+ *                                   <enumeration value="08"/>
+ *                                   <enumeration value="09"/>
+ *                                   <enumeration value="10"/>
+ *                                   <enumeration value="99"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="xDesconto" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="100"/>
+ *                                   <minLength value="2"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="Comp" maxOccurs="unbounded">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <sequence>
+ *                                       <element name="tpComp">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                             <whiteSpace value="preserve"/>
+ *                                             <enumeration value="01"/>
+ *                                             <enumeration value="02"/>
+ *                                             <enumeration value="03"/>
+ *                                             <enumeration value="04"/>
+ *                                             <enumeration value="05"/>
+ *                                             <enumeration value="06"/>
+ *                                             <enumeration value="99"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                                     </sequence>
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="imp">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="ICMS" type="{http://www.portalfiscal.inf.br/bpe}TImp"/>
+ *                             <element name="vTotTrib" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
+ *                             <element name="infAdFisco" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="2000"/>
+ *                                   <minLength value="1"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="ICMSUFFim" minOccurs="0">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <sequence>
+ *                                       <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                                       <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                                       <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                                       <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                                       <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                                       <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                                       <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                                       <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                                     </sequence>
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="pag" maxOccurs="10">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="tPag">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                   <whiteSpace value="preserve"/>
+ *                                   <enumeration value="01"/>
+ *                                   <enumeration value="02"/>
+ *                                   <enumeration value="03"/>
+ *                                   <enumeration value="04"/>
+ *                                   <enumeration value="05"/>
+ *                                   <enumeration value="99"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="vPag" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                             <element name="card" minOccurs="0">
+ *                               <complexType>
+ *                                 <complexContent>
+ *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     <sequence>
+ *                                       <element name="tpIntegra">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                             <whiteSpace value="preserve"/>
+ *                                             <enumeration value="1"/>
+ *                                             <enumeration value="2"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
+ *                                       <element name="tBand" minOccurs="0">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                             <whiteSpace value="preserve"/>
+ *                                             <enumeration value="01"/>
+ *                                             <enumeration value="02"/>
+ *                                             <enumeration value="03"/>
+ *                                             <enumeration value="04"/>
+ *                                             <enumeration value="05"/>
+ *                                             <enumeration value="99"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                       <element name="cAut" minOccurs="0">
+ *                                         <simpleType>
+ *                                           <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                             <minLength value="1"/>
+ *                                             <maxLength value="20"/>
+ *                                           </restriction>
+ *                                         </simpleType>
+ *                                       </element>
+ *                                     </sequence>
+ *                                   </restriction>
+ *                                 </complexContent>
+ *                               </complexType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="autXML" maxOccurs="10" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <choice>
+ *                               <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+ *                               <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
+ *                             </choice>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="infAdic" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="infAdFisco" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <maxLength value="2000"/>
+ *                                   <minLength value="1"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                             <element name="infCpl" minOccurs="0">
+ *                               <simpleType>
+ *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                                   <minLength value="1"/>
+ *                                   <maxLength value="5000"/>
+ *                                 </restriction>
+ *                               </simpleType>
+ *                             </element>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
+ *                 <attribute name="Id" use="required">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+ *                       <pattern value="BPe[0-9]{44}"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="infBPeSupl">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="qrCodBPe">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <minLength value="50"/>
+ *                         <maxLength value="1000"/>
+ *                         <pattern value="((HTTPS?|https?)://.*\?chBPe=[0-9]{44}&tpAmb=[1-2](&sign=[!-�]{1}[ -�]{0,}[!-�]{1}|[!-�]{1})?)"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="boardPassBPe" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                         <minLength value="50"/>
+ *                         <maxLength value="1000"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TBPe", propOrder = { + "infBPe", + "infBPeSupl" +// "signature" +}) +@XmlRootElement(name = "BPe") +public class TBPe { + + @XmlElement(required = true) + protected TBPe.InfBPe infBPe; + @XmlElement(required = true) + protected TBPe.InfBPeSupl infBPeSupl; +// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#", required = true) +// protected SignatureType signature; + + /** + * Obtém o valor da propriedade infBPe. + * + * @return + * possible object is + * {@link TBPe.InfBPe } + * + */ + public TBPe.InfBPe getInfBPe() { + return infBPe; + } + + /** + * Define o valor da propriedade infBPe. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe } + * + */ + public void setInfBPe(TBPe.InfBPe value) { + this.infBPe = value; + } + + /** + * Obtém o valor da propriedade infBPeSupl. + * + * @return + * possible object is + * {@link TBPe.InfBPeSupl } + * + */ + public TBPe.InfBPeSupl getInfBPeSupl() { + return infBPeSupl; + } + + /** + * Define o valor da propriedade infBPeSupl. + * + * @param value + * allowed object is + * {@link TBPe.InfBPeSupl } + * + */ + public void setInfBPeSupl(TBPe.InfBPeSupl value) { + this.infBPeSupl = value; + } + + /** + * Obtém o valor da propriedade signature. + * + * @return + * possible object is + * {@link SignatureType } + * + */ +// public SignatureType getSignature() { +// return signature; +// } + + /** + * Define o valor da propriedade signature. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ +// public void setSignature(SignatureType value) { +// this.signature = value; +// } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="ide">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
+     *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+     *                   <element name="mod" type="{http://www.portalfiscal.inf.br/bpe}TModBPe"/>
+     *                   <element name="serie">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TSerie">
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="nBP" type="{http://www.portalfiscal.inf.br/bpe}TNF"/>
+     *                   <element name="cBP">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <pattern value="[0-9]{8}"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="cDV">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <pattern value="[0-9]{1}"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="modal">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TModal">
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="dhEmi" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *                   <element name="tpEmis">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="1"/>
+     *                         <enumeration value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="verProc">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <minLength value="1"/>
+     *                         <maxLength value="20"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="tpBPe">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TTipoBPe">
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="indPres" type="{http://www.portalfiscal.inf.br/bpe}TIndPres"/>
+     *                   <element name="UFIni" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
+     *                   <element name="cMunIni" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+     *                   <element name="UFFim" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
+     *                   <element name="cMunFim" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+     *                   <sequence minOccurs="0">
+     *                     <element name="dhCont" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *                     <element name="xJust">
+     *                       <simpleType>
+     *                         <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                           <minLength value="15"/>
+     *                           <maxLength value="256"/>
+     *                         </restriction>
+     *                       </simpleType>
+     *                     </element>
+     *                   </sequence>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="emit">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+     *                   <element name="IE">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="IEST" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="xNome">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="60"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="xFant" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="60"/>
+     *                         <minLength value="1"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <sequence minOccurs="0">
+     *                     <element name="IM">
+     *                       <simpleType>
+     *                         <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                           <minLength value="1"/>
+     *                           <maxLength value="15"/>
+     *                         </restriction>
+     *                       </simpleType>
+     *                     </element>
+     *                     <element name="CNAE">
+     *                       <simpleType>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                           <whiteSpace value="preserve"/>
+     *                           <pattern value="[0-9]{7}"/>
+     *                         </restriction>
+     *                       </simpleType>
+     *                     </element>
+     *                   </sequence>
+     *                   <element name="CRT">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="1"/>
+     *                         <enumeration value="2"/>
+     *                         <enumeration value="3"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="enderEmit" type="{http://www.portalfiscal.inf.br/bpe}TEndeEmi"/>
+     *                   <element name="TAR" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <minLength value="1"/>
+     *                         <maxLength value="20"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="comp" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="xNome">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="60"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <choice>
+     *                     <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
+     *                     <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
+     *                     <element name="idEstrangeiro">
+     *                       <simpleType>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                           <whiteSpace value="preserve"/>
+     *                           <pattern value="([!-�]{0}|[!-�]{5,20})?"/>
+     *                         </restriction>
+     *                       </simpleType>
+     *                     </element>
+     *                   </choice>
+     *                   <element name="IE" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TIeDest">
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="enderComp" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="agencia" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="xNome">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="60"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
+     *                   <element name="enderAgencia" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="infBPeSub" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+     *                   <element name="tpSub" type="{http://www.portalfiscal.inf.br/bpe}TTipoSubstituicao"/>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="infPassagem">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="cLocOrig">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <minLength value="1"/>
+     *                         <maxLength value="7"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="xLocOrig">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="60"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="cLocDest">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <minLength value="1"/>
+     *                         <maxLength value="7"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="xLocDest">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="60"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="dhEmb" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *                   <element name="infPassageiro" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="xNome">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                                   <maxLength value="60"/>
+     *                                   <minLength value="2"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
+     *                             <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
+     *                             <element name="nDoc">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                                   <minLength value="2"/>
+     *                                   <maxLength value="20"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="dNasc" minOccurs="0">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="fone" minOccurs="0">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                                   <whiteSpace value="preserve"/>
+     *                                   <pattern value="[0-9]{7,12}"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="infViagem" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="cPercurso">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <minLength value="1"/>
+     *                         <maxLength value="20"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="xPercurso">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="100"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="tpViagem">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="00"/>
+     *                         <enumeration value="01"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="tpServ">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="1"/>
+     *                         <enumeration value="2"/>
+     *                         <enumeration value="3"/>
+     *                         <enumeration value="4"/>
+     *                         <enumeration value="5"/>
+     *                         <enumeration value="6"/>
+     *                         <enumeration value="7"/>
+     *                         <enumeration value="8"/>
+     *                         <enumeration value="9"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="tpAcomodacao">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="1"/>
+     *                         <enumeration value="2"/>
+     *                         <enumeration value="3"/>
+     *                         <enumeration value="4"/>
+     *                         <enumeration value="5"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="tpTrecho">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="1"/>
+     *                         <enumeration value="2"/>
+     *                         <enumeration value="3"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="dhViagem" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *                   <element name="dhConexao" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+     *                   <element name="prefixo" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <minLength value="1"/>
+     *                         <maxLength value="20"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="poltrona" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <minLength value="1"/>
+     *                         <maxLength value="3"/>
+     *                         <pattern value="0|[1-9]{1}[0-9]{0,2}"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="plataforma" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="10"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="infTravessia" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="tpVeiculo">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                                   <whiteSpace value="preserve"/>
+     *                                   <enumeration value="01"/>
+     *                                   <enumeration value="02"/>
+     *                                   <enumeration value="03"/>
+     *                                   <enumeration value="04"/>
+     *                                   <enumeration value="05"/>
+     *                                   <enumeration value="06"/>
+     *                                   <enumeration value="07"/>
+     *                                   <enumeration value="08"/>
+     *                                   <enumeration value="09"/>
+     *                                   <enumeration value="10"/>
+     *                                   <enumeration value="11"/>
+     *                                   <enumeration value="12"/>
+     *                                   <enumeration value="13"/>
+     *                                   <enumeration value="14"/>
+     *                                   <enumeration value="15"/>
+     *                                   <enumeration value="16"/>
+     *                                   <enumeration value="17"/>
+     *                                   <enumeration value="18"/>
+     *                                   <enumeration value="19"/>
+     *                                   <enumeration value="20"/>
+     *                                   <enumeration value="21"/>
+     *                                   <enumeration value="22"/>
+     *                                   <enumeration value="23"/>
+     *                                   <enumeration value="24"/>
+     *                                   <enumeration value="25"/>
+     *                                   <enumeration value="26"/>
+     *                                   <enumeration value="27"/>
+     *                                   <enumeration value="28"/>
+     *                                   <enumeration value="29"/>
+     *                                   <enumeration value="99"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="sitVeiculo">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                                   <whiteSpace value="preserve"/>
+     *                                   <enumeration value="1"/>
+     *                                   <enumeration value="2"/>
+     *                                   <enumeration value="3"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="infValorBPe">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="vBP" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                   <element name="vDesconto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                   <element name="vPgto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                   <element name="vTroco" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                   <element name="tpDesconto" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="01"/>
+     *                         <enumeration value="02"/>
+     *                         <enumeration value="03"/>
+     *                         <enumeration value="04"/>
+     *                         <enumeration value="05"/>
+     *                         <enumeration value="06"/>
+     *                         <enumeration value="07"/>
+     *                         <enumeration value="08"/>
+     *                         <enumeration value="09"/>
+     *                         <enumeration value="10"/>
+     *                         <enumeration value="99"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="xDesconto" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="100"/>
+     *                         <minLength value="2"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="Comp" maxOccurs="unbounded">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="tpComp">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                                   <whiteSpace value="preserve"/>
+     *                                   <enumeration value="01"/>
+     *                                   <enumeration value="02"/>
+     *                                   <enumeration value="03"/>
+     *                                   <enumeration value="04"/>
+     *                                   <enumeration value="05"/>
+     *                                   <enumeration value="06"/>
+     *                                   <enumeration value="99"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="imp">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="ICMS" type="{http://www.portalfiscal.inf.br/bpe}TImp"/>
+     *                   <element name="vTotTrib" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
+     *                   <element name="infAdFisco" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="2000"/>
+     *                         <minLength value="1"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="ICMSUFFim" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                             <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *                             <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *                             <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *                             <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *                             <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                             <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                             <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="pag" maxOccurs="10">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="tPag">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                         <whiteSpace value="preserve"/>
+     *                         <enumeration value="01"/>
+     *                         <enumeration value="02"/>
+     *                         <enumeration value="03"/>
+     *                         <enumeration value="04"/>
+     *                         <enumeration value="05"/>
+     *                         <enumeration value="99"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="vPag" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *                   <element name="card" minOccurs="0">
+     *                     <complexType>
+     *                       <complexContent>
+     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                           <sequence>
+     *                             <element name="tpIntegra">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                                   <whiteSpace value="preserve"/>
+     *                                   <enumeration value="1"/>
+     *                                   <enumeration value="2"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
+     *                             <element name="tBand" minOccurs="0">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                                   <whiteSpace value="preserve"/>
+     *                                   <enumeration value="01"/>
+     *                                   <enumeration value="02"/>
+     *                                   <enumeration value="03"/>
+     *                                   <enumeration value="04"/>
+     *                                   <enumeration value="05"/>
+     *                                   <enumeration value="99"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                             <element name="cAut" minOccurs="0">
+     *                               <simpleType>
+     *                                 <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                                   <minLength value="1"/>
+     *                                   <maxLength value="20"/>
+     *                                 </restriction>
+     *                               </simpleType>
+     *                             </element>
+     *                           </sequence>
+     *                         </restriction>
+     *                       </complexContent>
+     *                     </complexType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="autXML" maxOccurs="10" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <choice>
+     *                     <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+     *                     <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
+     *                   </choice>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="infAdic" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="infAdFisco" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <maxLength value="2000"/>
+     *                         <minLength value="1"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                   <element name="infCpl" minOccurs="0">
+     *                     <simpleType>
+     *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *                         <minLength value="1"/>
+     *                         <maxLength value="5000"/>
+     *                       </restriction>
+     *                     </simpleType>
+     *                   </element>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
+     *       <attribute name="Id" use="required">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+     *             <pattern value="BPe[0-9]{44}"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "ide", + "emit", + "comp", + "agencia", + "infBPeSub", + "infPassagem", + "infViagem", + "infValorBPe", + "imp", + "pag", + "autXML", + "infAdic" + }) + public static class InfBPe { + + @XmlElement(required = true) + protected TBPe.InfBPe.Ide ide; + @XmlElement(required = true) + protected TBPe.InfBPe.Emit emit; + protected TBPe.InfBPe.Comp comp; + protected TBPe.InfBPe.Agencia agencia; + protected TBPe.InfBPe.InfBPeSub infBPeSub; + @XmlElement(required = true) + protected TBPe.InfBPe.InfPassagem infPassagem; + @XmlElement(required = true) + protected List infViagem; + @XmlElement(required = true) + protected TBPe.InfBPe.InfValorBPe infValorBPe; + @XmlElement(required = true) + protected TBPe.InfBPe.Imp imp; + @XmlElement(required = true) + protected List pag; + protected List autXML; + protected TBPe.InfBPe.InfAdic infAdic; + @XmlAttribute(name = "versao", required = true) + protected String versao; + @XmlAttribute(name = "Id", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + protected String id; + + /** + * Obtém o valor da propriedade ide. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Ide } + * + */ + public TBPe.InfBPe.Ide getIde() { + return ide; + } + + /** + * Define o valor da propriedade ide. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Ide } + * + */ + public void setIde(TBPe.InfBPe.Ide value) { + this.ide = value; + } + + /** + * Obtém o valor da propriedade emit. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Emit } + * + */ + public TBPe.InfBPe.Emit getEmit() { + return emit; + } + + /** + * Define o valor da propriedade emit. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Emit } + * + */ + public void setEmit(TBPe.InfBPe.Emit value) { + this.emit = value; + } + + /** + * Obtém o valor da propriedade comp. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Comp } + * + */ + public TBPe.InfBPe.Comp getComp() { + return comp; + } + + /** + * Define o valor da propriedade comp. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Comp } + * + */ + public void setComp(TBPe.InfBPe.Comp value) { + this.comp = value; + } + + /** + * Obtém o valor da propriedade agencia. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Agencia } + * + */ + public TBPe.InfBPe.Agencia getAgencia() { + return agencia; + } + + /** + * Define o valor da propriedade agencia. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Agencia } + * + */ + public void setAgencia(TBPe.InfBPe.Agencia value) { + this.agencia = value; + } + + /** + * Obtém o valor da propriedade infBPeSub. + * + * @return + * possible object is + * {@link TBPe.InfBPe.InfBPeSub } + * + */ + public TBPe.InfBPe.InfBPeSub getInfBPeSub() { + return infBPeSub; + } + + /** + * Define o valor da propriedade infBPeSub. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.InfBPeSub } + * + */ + public void setInfBPeSub(TBPe.InfBPe.InfBPeSub value) { + this.infBPeSub = value; + } + + /** + * Obtém o valor da propriedade infPassagem. + * + * @return + * possible object is + * {@link TBPe.InfBPe.InfPassagem } + * + */ + public TBPe.InfBPe.InfPassagem getInfPassagem() { + return infPassagem; + } + + /** + * Define o valor da propriedade infPassagem. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.InfPassagem } + * + */ + public void setInfPassagem(TBPe.InfBPe.InfPassagem value) { + this.infPassagem = value; + } + + /** + * Gets the value of the infViagem property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the infViagem property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getInfViagem().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link TBPe.InfBPe.InfViagem } + * + * + */ + public List getInfViagem() { + if (infViagem == null) { + infViagem = new ArrayList(); + } + return this.infViagem; + } + + /** + * Obtém o valor da propriedade infValorBPe. + * + * @return + * possible object is + * {@link TBPe.InfBPe.InfValorBPe } + * + */ + public TBPe.InfBPe.InfValorBPe getInfValorBPe() { + return infValorBPe; + } + + /** + * Define o valor da propriedade infValorBPe. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.InfValorBPe } + * + */ + public void setInfValorBPe(TBPe.InfBPe.InfValorBPe value) { + this.infValorBPe = value; + } + + /** + * Obtém o valor da propriedade imp. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Imp } + * + */ + public TBPe.InfBPe.Imp getImp() { + return imp; + } + + /** + * Define o valor da propriedade imp. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Imp } + * + */ + public void setImp(TBPe.InfBPe.Imp value) { + this.imp = value; + } + + /** + * Gets the value of the pag property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the pag property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getPag().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link TBPe.InfBPe.Pag } + * + * + */ + public List getPag() { + if (pag == null) { + pag = new ArrayList(); + } + return this.pag; + } + + /** + * Gets the value of the autXML property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the autXML property. + * + *

+ * For example, to add a new item, do as follows: + *

+         *    getAutXML().add(newItem);
+         * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link TBPe.InfBPe.AutXML } + * + * + */ + public List getAutXML() { + if (autXML == null) { + autXML = new ArrayList(); + } + return this.autXML; + } + + /** + * Obtém o valor da propriedade infAdic. + * + * @return + * possible object is + * {@link TBPe.InfBPe.InfAdic } + * + */ + public TBPe.InfBPe.InfAdic getInfAdic() { + return infAdic; + } + + /** + * Define o valor da propriedade infAdic. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.InfAdic } + * + */ + public void setInfAdic(TBPe.InfBPe.InfAdic value) { + this.infAdic = value; + } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="xNome">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="60"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
+         *         <element name="enderAgencia" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "xNome", + "cnpj", + "enderAgencia" + }) + public static class Agencia { + + @XmlElement(required = true) + protected String xNome; + @XmlElement(name = "CNPJ", required = true) + protected String cnpj; + @XmlElement(required = true) + protected TEndereco enderAgencia; + + /** + * Obtém o valor da propriedade xNome. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXNome() { + return xNome; + } + + /** + * Define o valor da propriedade xNome. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXNome(String value) { + this.xNome = value; + } + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade enderAgencia. + * + * @return + * possible object is + * {@link TEndereco } + * + */ + public TEndereco getEnderAgencia() { + return enderAgencia; + } + + /** + * Define o valor da propriedade enderAgencia. + * + * @param value + * allowed object is + * {@link TEndereco } + * + */ + public void setEnderAgencia(TEndereco value) { + this.enderAgencia = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <choice>
+         *           <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+         *           <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
+         *         </choice>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cnpj", + "cpf" + }) + public static class AutXML { + + @XmlElement(name = "CNPJ") + protected String cnpj; + @XmlElement(name = "CPF") + protected String cpf; + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade cpf. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCPF() { + return cpf; + } + + /** + * Define o valor da propriedade cpf. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCPF(String value) { + this.cpf = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="xNome">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="60"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <choice>
+         *           <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpjOpc"/>
+         *           <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf"/>
+         *           <element name="idEstrangeiro">
+         *             <simpleType>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                 <whiteSpace value="preserve"/>
+         *                 <pattern value="([!-�]{0}|[!-�]{5,20})?"/>
+         *               </restriction>
+         *             </simpleType>
+         *           </element>
+         *         </choice>
+         *         <element name="IE" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TIeDest">
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="enderComp" type="{http://www.portalfiscal.inf.br/bpe}TEndereco"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "xNome", + "cnpj", + "cpf", + "idEstrangeiro", + "ie", + "enderComp" + }) + public static class Comp { + + @XmlElement(required = true) + protected String xNome; + @XmlElement(name = "CNPJ") + protected String cnpj; + @XmlElement(name = "CPF") + protected String cpf; + protected String idEstrangeiro; + @XmlElement(name = "IE") + protected String ie; + @XmlElement(required = true) + protected TEndereco enderComp; + + /** + * Obtém o valor da propriedade xNome. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXNome() { + return xNome; + } + + /** + * Define o valor da propriedade xNome. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXNome(String value) { + this.xNome = value; + } + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade cpf. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCPF() { + return cpf; + } + + /** + * Define o valor da propriedade cpf. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCPF(String value) { + this.cpf = value; + } + + /** + * Obtém o valor da propriedade idEstrangeiro. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdEstrangeiro() { + return idEstrangeiro; + } + + /** + * Define o valor da propriedade idEstrangeiro. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdEstrangeiro(String value) { + this.idEstrangeiro = value; + } + + /** + * Obtém o valor da propriedade ie. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIE() { + return ie; + } + + /** + * Define o valor da propriedade ie. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIE(String value) { + this.ie = value; + } + + /** + * Obtém o valor da propriedade enderComp. + * + * @return + * possible object is + * {@link TEndereco } + * + */ + public TEndereco getEnderComp() { + return enderComp; + } + + /** + * Define o valor da propriedade enderComp. + * + * @param value + * allowed object is + * {@link TEndereco } + * + */ + public void setEnderComp(TEndereco value) { + this.enderComp = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+         *         <element name="IE">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="IEST" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TIe">
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="xNome">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="60"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="xFant" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="60"/>
+         *               <minLength value="1"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <sequence minOccurs="0">
+         *           <element name="IM">
+         *             <simpleType>
+         *               <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *                 <minLength value="1"/>
+         *                 <maxLength value="15"/>
+         *               </restriction>
+         *             </simpleType>
+         *           </element>
+         *           <element name="CNAE">
+         *             <simpleType>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                 <whiteSpace value="preserve"/>
+         *                 <pattern value="[0-9]{7}"/>
+         *               </restriction>
+         *             </simpleType>
+         *           </element>
+         *         </sequence>
+         *         <element name="CRT">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="1"/>
+         *               <enumeration value="2"/>
+         *               <enumeration value="3"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="enderEmit" type="{http://www.portalfiscal.inf.br/bpe}TEndeEmi"/>
+         *         <element name="TAR" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <minLength value="1"/>
+         *               <maxLength value="20"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cnpj", + "ie", + "iest", + "xNome", + "xFant", + "im", + "cnae", + "crt", + "enderEmit", + "tar" + }) + public static class Emit { + + @XmlElement(name = "CNPJ", required = true) + protected String cnpj; + @XmlElement(name = "IE", required = true) + protected String ie; + @XmlElement(name = "IEST") + protected String iest; + @XmlElement(required = true) + protected String xNome; + protected String xFant; + @XmlElement(name = "IM") + protected String im; + @XmlElement(name = "CNAE") + protected String cnae; + @XmlElement(name = "CRT", required = true) + protected String crt; + @XmlElement(required = true) + protected TEndeEmi enderEmit; + @XmlElement(name = "TAR") + protected String tar; + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade ie. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIE() { + return ie; + } + + /** + * Define o valor da propriedade ie. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIE(String value) { + this.ie = value; + } + + /** + * Obtém o valor da propriedade iest. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIEST() { + return iest; + } + + /** + * Define o valor da propriedade iest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIEST(String value) { + this.iest = value; + } + + /** + * Obtém o valor da propriedade xNome. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXNome() { + return xNome; + } + + /** + * Define o valor da propriedade xNome. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXNome(String value) { + this.xNome = value; + } + + /** + * Obtém o valor da propriedade xFant. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXFant() { + return xFant; + } + + /** + * Define o valor da propriedade xFant. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXFant(String value) { + this.xFant = value; + } + + /** + * Obtém o valor da propriedade im. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIM() { + return im; + } + + /** + * Define o valor da propriedade im. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIM(String value) { + this.im = value; + } + + /** + * Obtém o valor da propriedade cnae. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNAE() { + return cnae; + } + + /** + * Define o valor da propriedade cnae. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNAE(String value) { + this.cnae = value; + } + + /** + * Obtém o valor da propriedade crt. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCRT() { + return crt; + } + + /** + * Define o valor da propriedade crt. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCRT(String value) { + this.crt = value; + } + + /** + * Obtém o valor da propriedade enderEmit. + * + * @return + * possible object is + * {@link TEndeEmi } + * + */ + public TEndeEmi getEnderEmit() { + return enderEmit; + } + + /** + * Define o valor da propriedade enderEmit. + * + * @param value + * allowed object is + * {@link TEndeEmi } + * + */ + public void setEnderEmit(TEndeEmi value) { + this.enderEmit = value; + } + + /** + * Obtém o valor da propriedade tar. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTAR() { + return tar; + } + + /** + * Define o valor da propriedade tar. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTAR(String value) { + this.tar = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
+         *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+         *         <element name="mod" type="{http://www.portalfiscal.inf.br/bpe}TModBPe"/>
+         *         <element name="serie">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TSerie">
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="nBP" type="{http://www.portalfiscal.inf.br/bpe}TNF"/>
+         *         <element name="cBP">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <pattern value="[0-9]{8}"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="cDV">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <pattern value="[0-9]{1}"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="modal">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TModal">
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="dhEmi" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+         *         <element name="tpEmis">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="1"/>
+         *               <enumeration value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="verProc">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <minLength value="1"/>
+         *               <maxLength value="20"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="tpBPe">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TTipoBPe">
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="indPres" type="{http://www.portalfiscal.inf.br/bpe}TIndPres"/>
+         *         <element name="UFIni" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
+         *         <element name="cMunIni" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+         *         <element name="UFFim" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
+         *         <element name="cMunFim" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+         *         <sequence minOccurs="0">
+         *           <element name="dhCont" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+         *           <element name="xJust">
+         *             <simpleType>
+         *               <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *                 <minLength value="15"/>
+         *                 <maxLength value="256"/>
+         *               </restriction>
+         *             </simpleType>
+         *           </element>
+         *         </sequence>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cuf", + "tpAmb", + "mod", + "serie", + "nbp", + "cbp", + "cdv", + "modal", + "dhEmi", + "tpEmis", + "verProc", + "tpBPe", + "indPres", + "ufIni", + "cMunIni", + "ufFim", + "cMunFim", + "dhCont", + "xJust" + }) + public static class Ide { + + @XmlElement(name = "cUF", required = true) + protected String cuf; + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(required = true) + protected String mod; + @XmlElement(required = true) + protected String serie; + @XmlElement(name = "nBP", required = true) + protected String nbp; + @XmlElement(name = "cBP", required = true) + protected String cbp; + @XmlElement(name = "cDV", required = true) + protected String cdv; + @XmlElement(required = true) + protected String modal; + @XmlElement(required = true) + protected String dhEmi; + @XmlElement(required = true) + protected String tpEmis; + @XmlElement(required = true) + protected String verProc; + @XmlElement(required = true) + protected String tpBPe; + @XmlElement(required = true) + protected String indPres; + @XmlElement(name = "UFIni", required = true) + @XmlSchemaType(name = "string") + protected TUfSemEX ufIni; + @XmlElement(required = true) + protected String cMunIni; + @XmlElement(name = "UFFim", required = true) + @XmlSchemaType(name = "string") + protected TUf ufFim; + @XmlElement(required = true) + protected String cMunFim; + protected String dhCont; + protected String xJust; + + /** + * Obtém o valor da propriedade cuf. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCUF() { + return cuf; + } + + /** + * Define o valor da propriedade cuf. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCUF(String value) { + this.cuf = value; + } + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade mod. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMod() { + return mod; + } + + /** + * Define o valor da propriedade mod. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMod(String value) { + this.mod = value; + } + + /** + * Obtém o valor da propriedade serie. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSerie() { + return serie; + } + + /** + * Define o valor da propriedade serie. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSerie(String value) { + this.serie = value; + } + + /** + * Obtém o valor da propriedade nbp. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNBP() { + return nbp; + } + + /** + * Define o valor da propriedade nbp. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNBP(String value) { + this.nbp = value; + } + + /** + * Obtém o valor da propriedade cbp. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCBP() { + return cbp; + } + + /** + * Define o valor da propriedade cbp. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCBP(String value) { + this.cbp = value; + } + + /** + * Obtém o valor da propriedade cdv. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCDV() { + return cdv; + } + + /** + * Define o valor da propriedade cdv. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCDV(String value) { + this.cdv = value; + } + + /** + * Obtém o valor da propriedade modal. + * + * @return + * possible object is + * {@link String } + * + */ + public String getModal() { + return modal; + } + + /** + * Define o valor da propriedade modal. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setModal(String value) { + this.modal = value; + } + + /** + * Obtém o valor da propriedade dhEmi. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhEmi() { + return dhEmi; + } + + /** + * Define o valor da propriedade dhEmi. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhEmi(String value) { + this.dhEmi = value; + } + + /** + * Obtém o valor da propriedade tpEmis. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpEmis() { + return tpEmis; + } + + /** + * Define o valor da propriedade tpEmis. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpEmis(String value) { + this.tpEmis = value; + } + + /** + * Obtém o valor da propriedade verProc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVerProc() { + return verProc; + } + + /** + * Define o valor da propriedade verProc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVerProc(String value) { + this.verProc = value; + } + + /** + * Obtém o valor da propriedade tpBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpBPe() { + return tpBPe; + } + + /** + * Define o valor da propriedade tpBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpBPe(String value) { + this.tpBPe = value; + } + + /** + * Obtém o valor da propriedade indPres. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIndPres() { + return indPres; + } + + /** + * Define o valor da propriedade indPres. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIndPres(String value) { + this.indPres = value; + } + + /** + * Obtém o valor da propriedade ufIni. + * + * @return + * possible object is + * {@link TUfSemEX } + * + */ + public TUfSemEX getUFIni() { + return ufIni; + } + + /** + * Define o valor da propriedade ufIni. + * + * @param value + * allowed object is + * {@link TUfSemEX } + * + */ + public void setUFIni(TUfSemEX value) { + this.ufIni = value; + } + + /** + * Obtém o valor da propriedade cMunIni. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCMunIni() { + return cMunIni; + } + + /** + * Define o valor da propriedade cMunIni. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCMunIni(String value) { + this.cMunIni = value; + } + + /** + * Obtém o valor da propriedade ufFim. + * + * @return + * possible object is + * {@link TUf } + * + */ + public TUf getUFFim() { + return ufFim; + } + + /** + * Define o valor da propriedade ufFim. + * + * @param value + * allowed object is + * {@link TUf } + * + */ + public void setUFFim(TUf value) { + this.ufFim = value; + } + + /** + * Obtém o valor da propriedade cMunFim. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCMunFim() { + return cMunFim; + } + + /** + * Define o valor da propriedade cMunFim. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCMunFim(String value) { + this.cMunFim = value; + } + + /** + * Obtém o valor da propriedade dhCont. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhCont() { + return dhCont; + } + + /** + * Define o valor da propriedade dhCont. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhCont(String value) { + this.dhCont = value; + } + + /** + * Obtém o valor da propriedade xJust. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXJust() { + return xJust; + } + + /** + * Define o valor da propriedade xJust. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXJust(String value) { + this.xJust = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="ICMS" type="{http://www.portalfiscal.inf.br/bpe}TImp"/>
+         *         <element name="vTotTrib" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
+         *         <element name="infAdFisco" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="2000"/>
+         *               <minLength value="1"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="ICMSUFFim" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *                   <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+         *                   <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+         *                   <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+         *                   <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+         *                   <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *                   <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *                   <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "icms", + "vTotTrib", + "infAdFisco", + "icmsufFim" + }) + public static class Imp { + + @XmlElement(name = "ICMS", required = true) + protected TImp icms; + protected String vTotTrib; + protected String infAdFisco; + @XmlElement(name = "ICMSUFFim") + protected TBPe.InfBPe.Imp.ICMSUFFim icmsufFim; + + /** + * Obtém o valor da propriedade icms. + * + * @return + * possible object is + * {@link TImp } + * + */ + public TImp getICMS() { + return icms; + } + + /** + * Define o valor da propriedade icms. + * + * @param value + * allowed object is + * {@link TImp } + * + */ + public void setICMS(TImp value) { + this.icms = value; + } + + /** + * Obtém o valor da propriedade vTotTrib. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVTotTrib() { + return vTotTrib; + } + + /** + * Define o valor da propriedade vTotTrib. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVTotTrib(String value) { + this.vTotTrib = value; + } + + /** + * Obtém o valor da propriedade infAdFisco. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInfAdFisco() { + return infAdFisco; + } + + /** + * Define o valor da propriedade infAdFisco. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInfAdFisco(String value) { + this.infAdFisco = value; + } + + /** + * Obtém o valor da propriedade icmsufFim. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Imp.ICMSUFFim } + * + */ + public TBPe.InfBPe.Imp.ICMSUFFim getICMSUFFim() { + return icmsufFim; + } + + /** + * Define o valor da propriedade icmsufFim. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Imp.ICMSUFFim } + * + */ + public void setICMSUFFim(TBPe.InfBPe.Imp.ICMSUFFim value) { + this.icmsufFim = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="vBCUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+             *         <element name="pFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+             *         <element name="pICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+             *         <element name="pICMSInter" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+             *         <element name="pICMSInterPart" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+             *         <element name="vFCPUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+             *         <element name="vICMSUFFim" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+             *         <element name="vICMSUFIni" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "vbcufFim", + "pfcpufFim", + "picmsufFim", + "picmsInter", + "picmsInterPart", + "vfcpufFim", + "vicmsufFim", + "vicmsufIni" + }) + public static class ICMSUFFim { + + @XmlElement(name = "vBCUFFim", required = true) + protected String vbcufFim; + @XmlElement(name = "pFCPUFFim", required = true) + protected String pfcpufFim; + @XmlElement(name = "pICMSUFFim", required = true) + protected String picmsufFim; + @XmlElement(name = "pICMSInter", required = true) + protected String picmsInter; + @XmlElement(name = "pICMSInterPart", required = true) + protected String picmsInterPart; + @XmlElement(name = "vFCPUFFim", required = true) + protected String vfcpufFim; + @XmlElement(name = "vICMSUFFim", required = true) + protected String vicmsufFim; + @XmlElement(name = "vICMSUFIni", required = true) + protected String vicmsufIni; + + /** + * Obtém o valor da propriedade vbcufFim. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVBCUFFim() { + return vbcufFim; + } + + /** + * Define o valor da propriedade vbcufFim. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVBCUFFim(String value) { + this.vbcufFim = value; + } + + /** + * Obtém o valor da propriedade pfcpufFim. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPFCPUFFim() { + return pfcpufFim; + } + + /** + * Define o valor da propriedade pfcpufFim. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPFCPUFFim(String value) { + this.pfcpufFim = value; + } + + /** + * Obtém o valor da propriedade picmsufFim. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMSUFFim() { + return picmsufFim; + } + + /** + * Define o valor da propriedade picmsufFim. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMSUFFim(String value) { + this.picmsufFim = value; + } + + /** + * Obtém o valor da propriedade picmsInter. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMSInter() { + return picmsInter; + } + + /** + * Define o valor da propriedade picmsInter. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMSInter(String value) { + this.picmsInter = value; + } + + /** + * Obtém o valor da propriedade picmsInterPart. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMSInterPart() { + return picmsInterPart; + } + + /** + * Define o valor da propriedade picmsInterPart. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMSInterPart(String value) { + this.picmsInterPart = value; + } + + /** + * Obtém o valor da propriedade vfcpufFim. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVFCPUFFim() { + return vfcpufFim; + } + + /** + * Define o valor da propriedade vfcpufFim. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVFCPUFFim(String value) { + this.vfcpufFim = value; + } + + /** + * Obtém o valor da propriedade vicmsufFim. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVICMSUFFim() { + return vicmsufFim; + } + + /** + * Define o valor da propriedade vicmsufFim. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVICMSUFFim(String value) { + this.vicmsufFim = value; + } + + /** + * Obtém o valor da propriedade vicmsufIni. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVICMSUFIni() { + return vicmsufIni; + } + + /** + * Define o valor da propriedade vicmsufIni. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVICMSUFIni(String value) { + this.vicmsufIni = value; + } + + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="infAdFisco" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="2000"/>
+         *               <minLength value="1"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="infCpl" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <minLength value="1"/>
+         *               <maxLength value="5000"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "infAdFisco", + "infCpl" + }) + public static class InfAdic { + + protected String infAdFisco; + protected String infCpl; + + /** + * Obtém o valor da propriedade infAdFisco. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInfAdFisco() { + return infAdFisco; + } + + /** + * Define o valor da propriedade infAdFisco. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInfAdFisco(String value) { + this.infAdFisco = value; + } + + /** + * Obtém o valor da propriedade infCpl. + * + * @return + * possible object is + * {@link String } + * + */ + public String getInfCpl() { + return infCpl; + } + + /** + * Define o valor da propriedade infCpl. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setInfCpl(String value) { + this.infCpl = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+         *         <element name="tpSub" type="{http://www.portalfiscal.inf.br/bpe}TTipoSubstituicao"/>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "chBPe", + "tpSub" + }) + public static class InfBPeSub { + + @XmlElement(required = true) + protected String chBPe; + @XmlElement(required = true) + protected String tpSub; + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade tpSub. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpSub() { + return tpSub; + } + + /** + * Define o valor da propriedade tpSub. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpSub(String value) { + this.tpSub = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="cLocOrig">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <minLength value="1"/>
+         *               <maxLength value="7"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="xLocOrig">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="60"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="cLocDest">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <minLength value="1"/>
+         *               <maxLength value="7"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="xLocDest">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="60"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="dhEmb" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+         *         <element name="infPassageiro" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="xNome">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *                         <maxLength value="60"/>
+         *                         <minLength value="2"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
+         *                   <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
+         *                   <element name="nDoc">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *                         <minLength value="2"/>
+         *                         <maxLength value="20"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="dNasc" minOccurs="0">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="fone" minOccurs="0">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                         <whiteSpace value="preserve"/>
+         *                         <pattern value="[0-9]{7,12}"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cLocOrig", + "xLocOrig", + "cLocDest", + "xLocDest", + "dhEmb", + "dhValidade", + "infPassageiro" + }) + public static class InfPassagem { + + @XmlElement(required = true) + protected String cLocOrig; + @XmlElement(required = true) + protected String xLocOrig; + @XmlElement(required = true) + protected String cLocDest; + @XmlElement(required = true) + protected String xLocDest; + @XmlElement(required = true) + protected String dhEmb; + protected String dhValidade; + protected TBPe.InfBPe.InfPassagem.InfPassageiro infPassageiro; + + /** + * Obtém o valor da propriedade cLocOrig. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCLocOrig() { + return cLocOrig; + } + + /** + * Define o valor da propriedade cLocOrig. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCLocOrig(String value) { + this.cLocOrig = value; + } + + /** + * Obtém o valor da propriedade xLocOrig. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXLocOrig() { + return xLocOrig; + } + + /** + * Define o valor da propriedade xLocOrig. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXLocOrig(String value) { + this.xLocOrig = value; + } + + /** + * Obtém o valor da propriedade cLocDest. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCLocDest() { + return cLocDest; + } + + /** + * Define o valor da propriedade cLocDest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCLocDest(String value) { + this.cLocDest = value; + } + + /** + * Obtém o valor da propriedade xLocDest. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXLocDest() { + return xLocDest; + } + + /** + * Define o valor da propriedade xLocDest. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXLocDest(String value) { + this.xLocDest = value; + } + + /** + * Obtém o valor da propriedade dhEmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhEmb() { + return dhEmb; + } + + /** + * Define o valor da propriedade dhEmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhEmb(String value) { + this.dhEmb = value; + } + + /** + * Obtém o valor da propriedade dhValidade. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhValidade() { + return dhValidade; + } + + /** + * Define o valor da propriedade dhValidade. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhValidade(String value) { + this.dhValidade = value; + } + + /** + * Obtém o valor da propriedade infPassageiro. + * + * @return + * possible object is + * {@link TBPe.InfBPe.InfPassagem.InfPassageiro } + * + */ + public TBPe.InfBPe.InfPassagem.InfPassageiro getInfPassageiro() { + return infPassageiro; + } + + /** + * Define o valor da propriedade infPassageiro. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.InfPassagem.InfPassageiro } + * + */ + public void setInfPassageiro(TBPe.InfBPe.InfPassagem.InfPassageiro value) { + this.infPassageiro = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="xNome">
+             *           <simpleType>
+             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+             *               <maxLength value="60"/>
+             *               <minLength value="2"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="CPF" type="{http://www.portalfiscal.inf.br/bpe}TCpf" minOccurs="0"/>
+             *         <element name="tpDoc" type="{http://www.portalfiscal.inf.br/bpe}TDoc"/>
+             *         <element name="nDoc">
+             *           <simpleType>
+             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+             *               <minLength value="2"/>
+             *               <maxLength value="20"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="dNasc" minOccurs="0">
+             *           <simpleType>
+             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TData">
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="fone" minOccurs="0">
+             *           <simpleType>
+             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *               <whiteSpace value="preserve"/>
+             *               <pattern value="[0-9]{7,12}"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "xNome", + "cpf", + "tpDoc", + "nDoc", + "dNasc", + "fone", + "email" + }) + public static class InfPassageiro { + + @XmlElement(required = true) + protected String xNome; + @XmlElement(name = "CPF") + protected String cpf; + @XmlElement(required = true) + protected String tpDoc; + @XmlElement(required = true) + protected String nDoc; + protected String dNasc; + protected String fone; + protected String email; + + /** + * Obtém o valor da propriedade xNome. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXNome() { + return xNome; + } + + /** + * Define o valor da propriedade xNome. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXNome(String value) { + this.xNome = value; + } + + /** + * Obtém o valor da propriedade cpf. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCPF() { + return cpf; + } + + /** + * Define o valor da propriedade cpf. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCPF(String value) { + this.cpf = value; + } + + /** + * Obtém o valor da propriedade tpDoc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpDoc() { + return tpDoc; + } + + /** + * Define o valor da propriedade tpDoc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpDoc(String value) { + this.tpDoc = value; + } + + /** + * Obtém o valor da propriedade nDoc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNDoc() { + return nDoc; + } + + /** + * Define o valor da propriedade nDoc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNDoc(String value) { + this.nDoc = value; + } + + /** + * Obtém o valor da propriedade dNasc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDNasc() { + return dNasc; + } + + /** + * Define o valor da propriedade dNasc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDNasc(String value) { + this.dNasc = value; + } + + /** + * Obtém o valor da propriedade fone. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFone() { + return fone; + } + + /** + * Define o valor da propriedade fone. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFone(String value) { + this.fone = value; + } + + /** + * Obtém o valor da propriedade email. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEmail() { + return email; + } + + /** + * Define o valor da propriedade email. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEmail(String value) { + this.email = value; + } + + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="vBP" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *         <element name="vDesconto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *         <element name="vPgto" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *         <element name="vTroco" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *         <element name="tpDesconto" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="01"/>
+         *               <enumeration value="02"/>
+         *               <enumeration value="03"/>
+         *               <enumeration value="04"/>
+         *               <enumeration value="05"/>
+         *               <enumeration value="06"/>
+         *               <enumeration value="07"/>
+         *               <enumeration value="08"/>
+         *               <enumeration value="09"/>
+         *               <enumeration value="10"/>
+         *               <enumeration value="99"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="xDesconto" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="100"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="Comp" maxOccurs="unbounded">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="tpComp">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                         <whiteSpace value="preserve"/>
+         *                         <enumeration value="01"/>
+         *                         <enumeration value="02"/>
+         *                         <enumeration value="03"/>
+         *                         <enumeration value="04"/>
+         *                         <enumeration value="05"/>
+         *                         <enumeration value="06"/>
+         *                         <enumeration value="99"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "vbp", + "vDesconto", + "vPgto", + "vTroco", + "tpDesconto", + "xDesconto", + "comp" + }) + public static class InfValorBPe { + + @XmlElement(name = "vBP", required = true) + protected String vbp; + @XmlElement(required = true) + protected String vDesconto; + @XmlElement(required = true) + protected String vPgto; + @XmlElement(required = true) + protected String vTroco; + protected String tpDesconto; + protected String xDesconto; + @XmlElement(name = "Comp", required = true) + protected List comp; + + /** + * Obtém o valor da propriedade vbp. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVBP() { + return vbp; + } + + /** + * Define o valor da propriedade vbp. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVBP(String value) { + this.vbp = value; + } + + /** + * Obtém o valor da propriedade vDesconto. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVDesconto() { + return vDesconto; + } + + /** + * Define o valor da propriedade vDesconto. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVDesconto(String value) { + this.vDesconto = value; + } + + /** + * Obtém o valor da propriedade vPgto. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVPgto() { + return vPgto; + } + + /** + * Define o valor da propriedade vPgto. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVPgto(String value) { + this.vPgto = value; + } + + /** + * Obtém o valor da propriedade vTroco. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVTroco() { + return vTroco; + } + + /** + * Define o valor da propriedade vTroco. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVTroco(String value) { + this.vTroco = value; + } + + /** + * Obtém o valor da propriedade tpDesconto. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpDesconto() { + return tpDesconto; + } + + /** + * Define o valor da propriedade tpDesconto. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpDesconto(String value) { + this.tpDesconto = value; + } + + /** + * Obtém o valor da propriedade xDesconto. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXDesconto() { + return xDesconto; + } + + /** + * Define o valor da propriedade xDesconto. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXDesconto(String value) { + this.xDesconto = value; + } + + /** + * Gets the value of the comp property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the comp property. + * + *

+ * For example, to add a new item, do as follows: + *

+             *    getComp().add(newItem);
+             * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link TBPe.InfBPe.InfValorBPe.Comp } + * + * + */ + public List getComp() { + if (comp == null) { + comp = new ArrayList(); + } + return this.comp; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="tpComp">
+             *           <simpleType>
+             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *               <whiteSpace value="preserve"/>
+             *               <enumeration value="01"/>
+             *               <enumeration value="02"/>
+             *               <enumeration value="03"/>
+             *               <enumeration value="04"/>
+             *               <enumeration value="05"/>
+             *               <enumeration value="06"/>
+             *               <enumeration value="99"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="vComp" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "tpComp", + "vComp" + }) + public static class Comp { + + @XmlElement(required = true) + protected String tpComp; + @XmlElement(required = true) + protected String vComp; + + /** + * Obtém o valor da propriedade tpComp. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpComp() { + return tpComp; + } + + /** + * Define o valor da propriedade tpComp. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpComp(String value) { + this.tpComp = value; + } + + /** + * Obtém o valor da propriedade vComp. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVComp() { + return vComp; + } + + /** + * Define o valor da propriedade vComp. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVComp(String value) { + this.vComp = value; + } + + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="cPercurso">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <minLength value="1"/>
+         *               <maxLength value="20"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="xPercurso">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="100"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="tpViagem">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="00"/>
+         *               <enumeration value="01"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="tpServ">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="1"/>
+         *               <enumeration value="2"/>
+         *               <enumeration value="3"/>
+         *               <enumeration value="4"/>
+         *               <enumeration value="5"/>
+         *               <enumeration value="6"/>
+         *               <enumeration value="7"/>
+         *               <enumeration value="8"/>
+         *               <enumeration value="9"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="tpAcomodacao">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="1"/>
+         *               <enumeration value="2"/>
+         *               <enumeration value="3"/>
+         *               <enumeration value="4"/>
+         *               <enumeration value="5"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="tpTrecho">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="1"/>
+         *               <enumeration value="2"/>
+         *               <enumeration value="3"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="dhViagem" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+         *         <element name="dhConexao" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+         *         <element name="prefixo" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <minLength value="1"/>
+         *               <maxLength value="20"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="poltrona" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <minLength value="1"/>
+         *               <maxLength value="3"/>
+         *               <pattern value="0|[1-9]{1}[0-9]{0,2}"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="plataforma" minOccurs="0">
+         *           <simpleType>
+         *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *               <maxLength value="10"/>
+         *               <minLength value="2"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="infTravessia" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="tpVeiculo">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                         <whiteSpace value="preserve"/>
+         *                         <enumeration value="01"/>
+         *                         <enumeration value="02"/>
+         *                         <enumeration value="03"/>
+         *                         <enumeration value="04"/>
+         *                         <enumeration value="05"/>
+         *                         <enumeration value="06"/>
+         *                         <enumeration value="07"/>
+         *                         <enumeration value="08"/>
+         *                         <enumeration value="09"/>
+         *                         <enumeration value="10"/>
+         *                         <enumeration value="11"/>
+         *                         <enumeration value="12"/>
+         *                         <enumeration value="13"/>
+         *                         <enumeration value="14"/>
+         *                         <enumeration value="15"/>
+         *                         <enumeration value="16"/>
+         *                         <enumeration value="17"/>
+         *                         <enumeration value="18"/>
+         *                         <enumeration value="19"/>
+         *                         <enumeration value="20"/>
+         *                         <enumeration value="21"/>
+         *                         <enumeration value="22"/>
+         *                         <enumeration value="23"/>
+         *                         <enumeration value="24"/>
+         *                         <enumeration value="25"/>
+         *                         <enumeration value="26"/>
+         *                         <enumeration value="27"/>
+         *                         <enumeration value="28"/>
+         *                         <enumeration value="29"/>
+         *                         <enumeration value="99"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="sitVeiculo">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                         <whiteSpace value="preserve"/>
+         *                         <enumeration value="1"/>
+         *                         <enumeration value="2"/>
+         *                         <enumeration value="3"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cPercurso", + "xPercurso", + "tpViagem", + "tpServ", + "tpAcomodacao", + "tpTrecho", + "dhViagem", + "dhConexao", + "prefixo", + "poltrona", + "plataforma", + "infTravessia" + }) + public static class InfViagem { + + @XmlElement(required = true) + protected String cPercurso; + @XmlElement(required = true) + protected String xPercurso; + @XmlElement(required = true) + protected String tpViagem; + @XmlElement(required = true) + protected String tpServ; + @XmlElement(required = true) + protected String tpAcomodacao; + @XmlElement(required = true) + protected String tpTrecho; + @XmlElement(required = true) + protected String dhViagem; + protected String dhConexao; + protected String prefixo; + protected String poltrona; + protected String plataforma; + protected TBPe.InfBPe.InfViagem.InfTravessia infTravessia; + + /** + * Obtém o valor da propriedade cPercurso. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCPercurso() { + return cPercurso; + } + + /** + * Define o valor da propriedade cPercurso. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCPercurso(String value) { + this.cPercurso = value; + } + + /** + * Obtém o valor da propriedade xPercurso. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXPercurso() { + return xPercurso; + } + + /** + * Define o valor da propriedade xPercurso. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXPercurso(String value) { + this.xPercurso = value; + } + + /** + * Obtém o valor da propriedade tpViagem. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpViagem() { + return tpViagem; + } + + /** + * Define o valor da propriedade tpViagem. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpViagem(String value) { + this.tpViagem = value; + } + + /** + * Obtém o valor da propriedade tpServ. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpServ() { + return tpServ; + } + + /** + * Define o valor da propriedade tpServ. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpServ(String value) { + this.tpServ = value; + } + + /** + * Obtém o valor da propriedade tpAcomodacao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAcomodacao() { + return tpAcomodacao; + } + + /** + * Define o valor da propriedade tpAcomodacao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAcomodacao(String value) { + this.tpAcomodacao = value; + } + + /** + * Obtém o valor da propriedade tpTrecho. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpTrecho() { + return tpTrecho; + } + + /** + * Define o valor da propriedade tpTrecho. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpTrecho(String value) { + this.tpTrecho = value; + } + + /** + * Obtém o valor da propriedade dhViagem. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhViagem() { + return dhViagem; + } + + /** + * Define o valor da propriedade dhViagem. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhViagem(String value) { + this.dhViagem = value; + } + + /** + * Obtém o valor da propriedade dhConexao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhConexao() { + return dhConexao; + } + + /** + * Define o valor da propriedade dhConexao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhConexao(String value) { + this.dhConexao = value; + } + + /** + * Obtém o valor da propriedade prefixo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrefixo() { + return prefixo; + } + + /** + * Define o valor da propriedade prefixo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrefixo(String value) { + this.prefixo = value; + } + + /** + * Obtém o valor da propriedade poltrona. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoltrona() { + return poltrona; + } + + /** + * Define o valor da propriedade poltrona. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoltrona(String value) { + this.poltrona = value; + } + + /** + * Obtém o valor da propriedade plataforma. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPlataforma() { + return plataforma; + } + + /** + * Define o valor da propriedade plataforma. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPlataforma(String value) { + this.plataforma = value; + } + + /** + * Obtém o valor da propriedade infTravessia. + * + * @return + * possible object is + * {@link TBPe.InfBPe.InfViagem.InfTravessia } + * + */ + public TBPe.InfBPe.InfViagem.InfTravessia getInfTravessia() { + return infTravessia; + } + + /** + * Define o valor da propriedade infTravessia. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.InfViagem.InfTravessia } + * + */ + public void setInfTravessia(TBPe.InfBPe.InfViagem.InfTravessia value) { + this.infTravessia = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="tpVeiculo">
+             *           <simpleType>
+             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *               <whiteSpace value="preserve"/>
+             *               <enumeration value="01"/>
+             *               <enumeration value="02"/>
+             *               <enumeration value="03"/>
+             *               <enumeration value="04"/>
+             *               <enumeration value="05"/>
+             *               <enumeration value="06"/>
+             *               <enumeration value="07"/>
+             *               <enumeration value="08"/>
+             *               <enumeration value="09"/>
+             *               <enumeration value="10"/>
+             *               <enumeration value="11"/>
+             *               <enumeration value="12"/>
+             *               <enumeration value="13"/>
+             *               <enumeration value="14"/>
+             *               <enumeration value="15"/>
+             *               <enumeration value="16"/>
+             *               <enumeration value="17"/>
+             *               <enumeration value="18"/>
+             *               <enumeration value="19"/>
+             *               <enumeration value="20"/>
+             *               <enumeration value="21"/>
+             *               <enumeration value="22"/>
+             *               <enumeration value="23"/>
+             *               <enumeration value="24"/>
+             *               <enumeration value="25"/>
+             *               <enumeration value="26"/>
+             *               <enumeration value="27"/>
+             *               <enumeration value="28"/>
+             *               <enumeration value="29"/>
+             *               <enumeration value="99"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="sitVeiculo">
+             *           <simpleType>
+             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *               <whiteSpace value="preserve"/>
+             *               <enumeration value="1"/>
+             *               <enumeration value="2"/>
+             *               <enumeration value="3"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "tpVeiculo", + "sitVeiculo" + }) + public static class InfTravessia { + + @XmlElement(required = true) + protected String tpVeiculo; + @XmlElement(required = true) + protected String sitVeiculo; + + /** + * Obtém o valor da propriedade tpVeiculo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpVeiculo() { + return tpVeiculo; + } + + /** + * Define o valor da propriedade tpVeiculo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpVeiculo(String value) { + this.tpVeiculo = value; + } + + /** + * Obtém o valor da propriedade sitVeiculo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSitVeiculo() { + return sitVeiculo; + } + + /** + * Define o valor da propriedade sitVeiculo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSitVeiculo(String value) { + this.sitVeiculo = value; + } + + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="tPag">
+         *           <simpleType>
+         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *               <whiteSpace value="preserve"/>
+         *               <enumeration value="01"/>
+         *               <enumeration value="02"/>
+         *               <enumeration value="03"/>
+         *               <enumeration value="04"/>
+         *               <enumeration value="05"/>
+         *               <enumeration value="99"/>
+         *             </restriction>
+         *           </simpleType>
+         *         </element>
+         *         <element name="vPag" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+         *         <element name="card" minOccurs="0">
+         *           <complexType>
+         *             <complexContent>
+         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *                 <sequence>
+         *                   <element name="tpIntegra">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                         <whiteSpace value="preserve"/>
+         *                         <enumeration value="1"/>
+         *                         <enumeration value="2"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
+         *                   <element name="tBand" minOccurs="0">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *                         <whiteSpace value="preserve"/>
+         *                         <enumeration value="01"/>
+         *                         <enumeration value="02"/>
+         *                         <enumeration value="03"/>
+         *                         <enumeration value="04"/>
+         *                         <enumeration value="05"/>
+         *                         <enumeration value="99"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                   <element name="cAut" minOccurs="0">
+         *                     <simpleType>
+         *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+         *                         <minLength value="1"/>
+         *                         <maxLength value="20"/>
+         *                       </restriction>
+         *                     </simpleType>
+         *                   </element>
+         *                 </sequence>
+         *               </restriction>
+         *             </complexContent>
+         *           </complexType>
+         *         </element>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "tPag", + "vPag", + "card", + "xPag" + }) + public static class Pag { + + @XmlElement(required = true) + protected String tPag; + @XmlElement(required = true) + protected String vPag; + protected String xPag; + protected TBPe.InfBPe.Pag.Card card; + + /** + * Obtém o valor da propriedade tPag. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTPag() { + return tPag; + } + + /** + * Define o valor da propriedade tPag. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTPag(String value) { + this.tPag = value; + } + + /** + * Obtém o valor da propriedade vPag. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVPag() { + return vPag; + } + + /** + * Define o valor da propriedade vPag. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVPag(String value) { + this.vPag = value; + } + + /** + * Obtém o valor da propriedade xPag. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXPag() { + return xPag; + } + + /** + * Define o valor da propriedade xPag. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXPag(String value) { + this.xPag = value; + } + + /** + * Obtém o valor da propriedade card. + * + * @return + * possible object is + * {@link TBPe.InfBPe.Pag.Card } + * + */ + public TBPe.InfBPe.Pag.Card getCard() { + return card; + } + + /** + * Define o valor da propriedade card. + * + * @param value + * allowed object is + * {@link TBPe.InfBPe.Pag.Card } + * + */ + public void setCard(TBPe.InfBPe.Pag.Card value) { + this.card = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+             * <complexType>
+             *   <complexContent>
+             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+             *       <sequence>
+             *         <element name="tpIntegra">
+             *           <simpleType>
+             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *               <whiteSpace value="preserve"/>
+             *               <enumeration value="1"/>
+             *               <enumeration value="2"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj" minOccurs="0"/>
+             *         <element name="tBand" minOccurs="0">
+             *           <simpleType>
+             *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+             *               <whiteSpace value="preserve"/>
+             *               <enumeration value="01"/>
+             *               <enumeration value="02"/>
+             *               <enumeration value="03"/>
+             *               <enumeration value="04"/>
+             *               <enumeration value="05"/>
+             *               <enumeration value="99"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *         <element name="cAut" minOccurs="0">
+             *           <simpleType>
+             *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+             *               <minLength value="1"/>
+             *               <maxLength value="20"/>
+             *             </restriction>
+             *           </simpleType>
+             *         </element>
+             *       </sequence>
+             *     </restriction>
+             *   </complexContent>
+             * </complexType>
+             * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "tpIntegra", + "cnpj", + "tBand", + "cAut", + "xBand", + "nsuTrans", + "nsuHost", + "nParcelas" + }) + public static class Card { + + @XmlElement(required = true) + protected String tpIntegra; + @XmlElement(name = "CNPJ") + protected String cnpj; + protected String tBand; + protected String cAut; + protected String xBand; + protected String nsuTrans; + protected String nsuHost; + protected String nParcelas; + + /** + * Obtém o valor da propriedade tpIntegra. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpIntegra() { + return tpIntegra; + } + + /** + * Define o valor da propriedade tpIntegra. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpIntegra(String value) { + this.tpIntegra = value; + } + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade tBand. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTBand() { + return tBand; + } + + /** + * Define o valor da propriedade tBand. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTBand(String value) { + this.tBand = value; + } + + /** + * Obtém o valor da propriedade xBand. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXBand() { + return xBand; + } + + /** + * Define o valor da propriedade xBand. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXBand(String value) { + this.xBand = value; + } + + /** + * Obtém o valor da propriedade nsuTrans. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNsuTrans() { + return nsuTrans; + } + + /** + * Define o valor da propriedade nsuTrans. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNsuTrans(String value) { + this.xBand = value; + } + + /** + * Obtém o valor da propriedade nsuHost. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNsuHost() { + return nsuHost; + } + + /** + * Define o valor da propriedade nsuHost. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNsuHost(String value) { + this.nsuHost = value; + } + + /** + * Obtém o valor da propriedade nParcelas. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNParcelas() { + return nParcelas; + } + + /** + * Define o valor da propriedade nParcelas. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNParcelas(String value) { + this.nParcelas = value; + } + + /** + * Obtém o valor da propriedade cAut. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCAut() { + return cAut; + } + + /** + * Define o valor da propriedade cAut. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCAut(String value) { + this.cAut = value; + } + + } + + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="qrCodBPe">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <minLength value="50"/>
+     *               <maxLength value="1000"/>
+     *               <pattern value="((HTTPS?|https?)://.*\?chBPe=[0-9]{44}&tpAmb=[1-2](&sign=[!-�]{1}[ -�]{0,}[!-�]{1}|[!-�]{1})?)"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="boardPassBPe" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *               <minLength value="50"/>
+     *               <maxLength value="1000"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "qrCodBPe", + "boardPassBPe" + }) + public static class InfBPeSupl { + + @XmlElement(required = true) + protected String qrCodBPe; + protected String boardPassBPe; + + /** + * Obtém o valor da propriedade qrCodBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQrCodBPe() { + return qrCodBPe; + } + + /** + * Define o valor da propriedade qrCodBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQrCodBPe(String value) { + this.qrCodBPe = value; + } + + /** + * Obtém o valor da propriedade boardPassBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBoardPassBPe() { + return boardPassBPe; + } + + /** + * Define o valor da propriedade boardPassBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBoardPassBPe(String value) { + this.boardPassBPe = value; + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TConsSitBPe.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TConsSitBPe.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TConsSitBPe.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TConsSitBPe.java index cf08f8c1f..1c9136879 100644 --- a/src/br/inf/portalfiscal/bpe/TConsSitBPe.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TConsSitBPe.java @@ -1,155 +1,155 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.10.24 às 07:38:45 PM BRST -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Pedido de Consulta da Situação Atual do Bilhete de Passagem Eletrônico - * - *

Classe Java de TConsSitBPe complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TConsSitBPe">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *         <element name="xServ" type="{http://www.portalfiscal.inf.br/bpe}TServ"/>
- *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerConsSitBPe" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TConsSitBPe", propOrder = { - "tpAmb", - "xServ", - "chBPe" -}) -public class TConsSitBPe { - - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(required = true) - protected String xServ; - @XmlElement(required = true) - protected String chBPe; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade xServ. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXServ() { - return xServ; - } - - /** - * Define o valor da propriedade xServ. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXServ(String value) { - this.xServ = value; - } - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.10.24 às 07:38:45 PM BRST +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Pedido de Consulta da Situação Atual do Bilhete de Passagem Eletrônico + * + *

Classe Java de TConsSitBPe complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TConsSitBPe">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *         <element name="xServ" type="{http://www.portalfiscal.inf.br/bpe}TServ"/>
+ *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerConsSitBPe" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TConsSitBPe", propOrder = { + "tpAmb", + "xServ", + "chBPe" +}) +public class TConsSitBPe { + + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(required = true) + protected String xServ; + @XmlElement(required = true) + protected String chBPe; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade xServ. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXServ() { + return xServ; + } + + /** + * Define o valor da propriedade xServ. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXServ(String value) { + this.xServ = value; + } + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TEndeEmi.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TEndeEmi.java similarity index 95% rename from src/br/inf/portalfiscal/bpe/TEndeEmi.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TEndeEmi.java index ac2e9f4c0..60035ea9d 100644 --- a/src/br/inf/portalfiscal/bpe/TEndeEmi.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TEndeEmi.java @@ -1,371 +1,371 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Dados do Endereço - * - *

Classe Java de TEndeEmi complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TEndeEmi">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="xLgr">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="2"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="nro">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="xCpl" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="xBairro">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="2"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="cMun" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
- *         <element name="xMun">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="2"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="CEP" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <whiteSpace value="preserve"/>
- *               <pattern value="[0-9]{8}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="UF" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
- *         <element name="fone" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <whiteSpace value="preserve"/>
- *               <pattern value="[0-9]{7,12}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TEndeEmi", propOrder = { - "xLgr", - "nro", - "xCpl", - "xBairro", - "cMun", - "xMun", - "cep", - "uf", - "fone", - "email" -}) -public class TEndeEmi { - - @XmlElement(required = true) - protected String xLgr; - @XmlElement(required = true) - protected String nro; - protected String xCpl; - @XmlElement(required = true) - protected String xBairro; - @XmlElement(required = true) - protected String cMun; - @XmlElement(required = true) - protected String xMun; - @XmlElement(name = "CEP") - protected String cep; - @XmlElement(name = "UF", required = true) - @XmlSchemaType(name = "string") - protected TUfSemEX uf; - protected String fone; - protected String email; - - /** - * Obtém o valor da propriedade xLgr. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXLgr() { - return xLgr; - } - - /** - * Define o valor da propriedade xLgr. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXLgr(String value) { - this.xLgr = value; - } - - /** - * Obtém o valor da propriedade nro. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNro() { - return nro; - } - - /** - * Define o valor da propriedade nro. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNro(String value) { - this.nro = value; - } - - /** - * Obtém o valor da propriedade xCpl. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXCpl() { - return xCpl; - } - - /** - * Define o valor da propriedade xCpl. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXCpl(String value) { - this.xCpl = value; - } - - /** - * Obtém o valor da propriedade xBairro. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXBairro() { - return xBairro; - } - - /** - * Define o valor da propriedade xBairro. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXBairro(String value) { - this.xBairro = value; - } - - /** - * Obtém o valor da propriedade cMun. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCMun() { - return cMun; - } - - /** - * Define o valor da propriedade cMun. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCMun(String value) { - this.cMun = value; - } - - /** - * Obtém o valor da propriedade xMun. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMun() { - return xMun; - } - - /** - * Define o valor da propriedade xMun. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMun(String value) { - this.xMun = value; - } - - /** - * Obtém o valor da propriedade cep. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCEP() { - return cep; - } - - /** - * Define o valor da propriedade cep. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCEP(String value) { - this.cep = value; - } - - /** - * Obtém o valor da propriedade uf. - * - * @return - * possible object is - * {@link TUfSemEX } - * - */ - public TUfSemEX getUF() { - return uf; - } - - /** - * Define o valor da propriedade uf. - * - * @param value - * allowed object is - * {@link TUfSemEX } - * - */ - public void setUF(TUfSemEX value) { - this.uf = value; - } - - /** - * Obtém o valor da propriedade fone. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFone() { - return fone; - } - - /** - * Define o valor da propriedade fone. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFone(String value) { - this.fone = value; - } - - /** - * Obtém o valor da propriedade email. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEmail() { - return email; - } - - /** - * Define o valor da propriedade email. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEmail(String value) { - this.email = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Dados do Endereço + * + *

Classe Java de TEndeEmi complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TEndeEmi">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="xLgr">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="2"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="nro">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="xCpl" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="xBairro">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="2"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="cMun" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+ *         <element name="xMun">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="2"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="CEP" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <whiteSpace value="preserve"/>
+ *               <pattern value="[0-9]{8}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="UF" type="{http://www.portalfiscal.inf.br/bpe}TUf_sem_EX"/>
+ *         <element name="fone" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <whiteSpace value="preserve"/>
+ *               <pattern value="[0-9]{7,12}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TEndeEmi", propOrder = { + "xLgr", + "nro", + "xCpl", + "xBairro", + "cMun", + "xMun", + "cep", + "uf", + "fone", + "email" +}) +public class TEndeEmi { + + @XmlElement(required = true) + protected String xLgr; + @XmlElement(required = true) + protected String nro; + protected String xCpl; + @XmlElement(required = true) + protected String xBairro; + @XmlElement(required = true) + protected String cMun; + @XmlElement(required = true) + protected String xMun; + @XmlElement(name = "CEP") + protected String cep; + @XmlElement(name = "UF", required = true) + @XmlSchemaType(name = "string") + protected TUfSemEX uf; + protected String fone; + protected String email; + + /** + * Obtém o valor da propriedade xLgr. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXLgr() { + return xLgr; + } + + /** + * Define o valor da propriedade xLgr. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXLgr(String value) { + this.xLgr = value; + } + + /** + * Obtém o valor da propriedade nro. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNro() { + return nro; + } + + /** + * Define o valor da propriedade nro. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNro(String value) { + this.nro = value; + } + + /** + * Obtém o valor da propriedade xCpl. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXCpl() { + return xCpl; + } + + /** + * Define o valor da propriedade xCpl. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXCpl(String value) { + this.xCpl = value; + } + + /** + * Obtém o valor da propriedade xBairro. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXBairro() { + return xBairro; + } + + /** + * Define o valor da propriedade xBairro. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXBairro(String value) { + this.xBairro = value; + } + + /** + * Obtém o valor da propriedade cMun. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCMun() { + return cMun; + } + + /** + * Define o valor da propriedade cMun. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCMun(String value) { + this.cMun = value; + } + + /** + * Obtém o valor da propriedade xMun. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMun() { + return xMun; + } + + /** + * Define o valor da propriedade xMun. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMun(String value) { + this.xMun = value; + } + + /** + * Obtém o valor da propriedade cep. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCEP() { + return cep; + } + + /** + * Define o valor da propriedade cep. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCEP(String value) { + this.cep = value; + } + + /** + * Obtém o valor da propriedade uf. + * + * @return + * possible object is + * {@link TUfSemEX } + * + */ + public TUfSemEX getUF() { + return uf; + } + + /** + * Define o valor da propriedade uf. + * + * @param value + * allowed object is + * {@link TUfSemEX } + * + */ + public void setUF(TUfSemEX value) { + this.uf = value; + } + + /** + * Obtém o valor da propriedade fone. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFone() { + return fone; + } + + /** + * Define o valor da propriedade fone. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFone(String value) { + this.fone = value; + } + + /** + * Obtém o valor da propriedade email. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEmail() { + return email; + } + + /** + * Define o valor da propriedade email. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEmail(String value) { + this.email = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TEndereco.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TEndereco.java similarity index 95% rename from src/br/inf/portalfiscal/bpe/TEndereco.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TEndereco.java index 0fb28f2ea..1cf91ea05 100644 --- a/src/br/inf/portalfiscal/bpe/TEndereco.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TEndereco.java @@ -1,439 +1,439 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Dados do Endereço - * - *

Classe Java de TEndereco complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TEndereco">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="xLgr">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="255"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="nro">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="xCpl" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="xBairro">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="cMun" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
- *         <element name="xMun">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="CEP" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <whiteSpace value="preserve"/>
- *               <pattern value="[0-9]{8}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="UF" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
- *         <element name="cPais" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <whiteSpace value="preserve"/>
- *               <pattern value="[0-9]{1,4}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="xPais" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *               <maxLength value="60"/>
- *               <minLength value="1"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="fone" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <whiteSpace value="preserve"/>
- *               <pattern value="[0-9]{7,12}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TEndereco", propOrder = { - "xLgr", - "nro", - "xCpl", - "xBairro", - "cMun", - "xMun", - "cep", - "uf", - "cPais", - "xPais", - "fone", - "email" -}) -public class TEndereco { - - @XmlElement(required = true) - protected String xLgr; - @XmlElement(required = true) - protected String nro; - protected String xCpl; - @XmlElement(required = true) - protected String xBairro; - @XmlElement(required = true) - protected String cMun; - @XmlElement(required = true) - protected String xMun; - @XmlElement(name = "CEP") - protected String cep; - @XmlElement(name = "UF", required = true) - @XmlSchemaType(name = "string") - protected TUf uf; - protected String cPais; - protected String xPais; - protected String fone; - protected String email; - - /** - * Obtém o valor da propriedade xLgr. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXLgr() { - return xLgr; - } - - /** - * Define o valor da propriedade xLgr. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXLgr(String value) { - this.xLgr = value; - } - - /** - * Obtém o valor da propriedade nro. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNro() { - return nro; - } - - /** - * Define o valor da propriedade nro. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNro(String value) { - this.nro = value; - } - - /** - * Obtém o valor da propriedade xCpl. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXCpl() { - return xCpl; - } - - /** - * Define o valor da propriedade xCpl. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXCpl(String value) { - this.xCpl = value; - } - - /** - * Obtém o valor da propriedade xBairro. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXBairro() { - return xBairro; - } - - /** - * Define o valor da propriedade xBairro. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXBairro(String value) { - this.xBairro = value; - } - - /** - * Obtém o valor da propriedade cMun. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCMun() { - return cMun; - } - - /** - * Define o valor da propriedade cMun. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCMun(String value) { - this.cMun = value; - } - - /** - * Obtém o valor da propriedade xMun. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMun() { - return xMun; - } - - /** - * Define o valor da propriedade xMun. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMun(String value) { - this.xMun = value; - } - - /** - * Obtém o valor da propriedade cep. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCEP() { - return cep; - } - - /** - * Define o valor da propriedade cep. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCEP(String value) { - this.cep = value; - } - - /** - * Obtém o valor da propriedade uf. - * - * @return - * possible object is - * {@link TUf } - * - */ - public TUf getUF() { - return uf; - } - - /** - * Define o valor da propriedade uf. - * - * @param value - * allowed object is - * {@link TUf } - * - */ - public void setUF(TUf value) { - this.uf = value; - } - - /** - * Obtém o valor da propriedade cPais. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCPais() { - return cPais; - } - - /** - * Define o valor da propriedade cPais. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCPais(String value) { - this.cPais = value; - } - - /** - * Obtém o valor da propriedade xPais. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXPais() { - return xPais; - } - - /** - * Define o valor da propriedade xPais. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXPais(String value) { - this.xPais = value; - } - - /** - * Obtém o valor da propriedade fone. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFone() { - return fone; - } - - /** - * Define o valor da propriedade fone. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFone(String value) { - this.fone = value; - } - - /** - * Obtém o valor da propriedade email. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEmail() { - return email; - } - - /** - * Define o valor da propriedade email. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEmail(String value) { - this.email = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Dados do Endereço + * + *

Classe Java de TEndereco complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TEndereco">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="xLgr">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="255"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="nro">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="xCpl" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="xBairro">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="cMun" type="{http://www.portalfiscal.inf.br/bpe}TCodMunIBGE"/>
+ *         <element name="xMun">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="CEP" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <whiteSpace value="preserve"/>
+ *               <pattern value="[0-9]{8}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="UF" type="{http://www.portalfiscal.inf.br/bpe}TUf"/>
+ *         <element name="cPais" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <whiteSpace value="preserve"/>
+ *               <pattern value="[0-9]{1,4}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="xPais" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *               <maxLength value="60"/>
+ *               <minLength value="1"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="fone" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <whiteSpace value="preserve"/>
+ *               <pattern value="[0-9]{7,12}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="email" type="{http://www.portalfiscal.inf.br/bpe}TEmail" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TEndereco", propOrder = { + "xLgr", + "nro", + "xCpl", + "xBairro", + "cMun", + "xMun", + "cep", + "uf", + "cPais", + "xPais", + "fone", + "email" +}) +public class TEndereco { + + @XmlElement(required = true) + protected String xLgr; + @XmlElement(required = true) + protected String nro; + protected String xCpl; + @XmlElement(required = true) + protected String xBairro; + @XmlElement(required = true) + protected String cMun; + @XmlElement(required = true) + protected String xMun; + @XmlElement(name = "CEP") + protected String cep; + @XmlElement(name = "UF", required = true) + @XmlSchemaType(name = "string") + protected TUf uf; + protected String cPais; + protected String xPais; + protected String fone; + protected String email; + + /** + * Obtém o valor da propriedade xLgr. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXLgr() { + return xLgr; + } + + /** + * Define o valor da propriedade xLgr. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXLgr(String value) { + this.xLgr = value; + } + + /** + * Obtém o valor da propriedade nro. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNro() { + return nro; + } + + /** + * Define o valor da propriedade nro. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNro(String value) { + this.nro = value; + } + + /** + * Obtém o valor da propriedade xCpl. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXCpl() { + return xCpl; + } + + /** + * Define o valor da propriedade xCpl. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXCpl(String value) { + this.xCpl = value; + } + + /** + * Obtém o valor da propriedade xBairro. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXBairro() { + return xBairro; + } + + /** + * Define o valor da propriedade xBairro. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXBairro(String value) { + this.xBairro = value; + } + + /** + * Obtém o valor da propriedade cMun. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCMun() { + return cMun; + } + + /** + * Define o valor da propriedade cMun. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCMun(String value) { + this.cMun = value; + } + + /** + * Obtém o valor da propriedade xMun. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMun() { + return xMun; + } + + /** + * Define o valor da propriedade xMun. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMun(String value) { + this.xMun = value; + } + + /** + * Obtém o valor da propriedade cep. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCEP() { + return cep; + } + + /** + * Define o valor da propriedade cep. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCEP(String value) { + this.cep = value; + } + + /** + * Obtém o valor da propriedade uf. + * + * @return + * possible object is + * {@link TUf } + * + */ + public TUf getUF() { + return uf; + } + + /** + * Define o valor da propriedade uf. + * + * @param value + * allowed object is + * {@link TUf } + * + */ + public void setUF(TUf value) { + this.uf = value; + } + + /** + * Obtém o valor da propriedade cPais. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCPais() { + return cPais; + } + + /** + * Define o valor da propriedade cPais. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCPais(String value) { + this.cPais = value; + } + + /** + * Obtém o valor da propriedade xPais. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXPais() { + return xPais; + } + + /** + * Define o valor da propriedade xPais. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXPais(String value) { + this.xPais = value; + } + + /** + * Obtém o valor da propriedade fone. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFone() { + return fone; + } + + /** + * Define o valor da propriedade fone. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFone(String value) { + this.fone = value; + } + + /** + * Obtém o valor da propriedade email. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEmail() { + return email; + } + + /** + * Define o valor da propriedade email. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEmail(String value) { + this.email = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TEnviBPe.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TEnviBPe.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TEnviBPe.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TEnviBPe.java index a478916b1..a0212990f 100644 --- a/src/br/inf/portalfiscal/bpe/TEnviBPe.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TEnviBPe.java @@ -1,127 +1,127 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Pedido de concessão de autorização de BP-e - * - *

Classe Java de TEnviBPe complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TEnviBPe">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="idLote" type="{http://www.portalfiscal.inf.br/bpe}TIdLote"/>
- *         <element name="BPe" type="{http://www.portalfiscal.inf.br/bpe}TBPe"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TEnviBPe", propOrder = { - "idLote", - "bPe" -}) -public class TEnviBPe { - - @XmlElement(required = true) - protected String idLote; - @XmlElement(name = "BPe", required = true) - protected TBPe bPe; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade idLote. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIdLote() { - return idLote; - } - - /** - * Define o valor da propriedade idLote. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIdLote(String value) { - this.idLote = value; - } - - /** - * Obtém o valor da propriedade bPe. - * - * @return - * possible object is - * {@link TBPe } - * - */ - public TBPe getBPe() { - return bPe; - } - - /** - * Define o valor da propriedade bPe. - * - * @param value - * allowed object is - * {@link TBPe } - * - */ - public void setBPe(TBPe value) { - this.bPe = value; - } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Pedido de concessão de autorização de BP-e + * + *

Classe Java de TEnviBPe complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TEnviBPe">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="idLote" type="{http://www.portalfiscal.inf.br/bpe}TIdLote"/>
+ *         <element name="BPe" type="{http://www.portalfiscal.inf.br/bpe}TBPe"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TEnviBPe", propOrder = { + "idLote", + "bPe" +}) +public class TEnviBPe { + + @XmlElement(required = true) + protected String idLote; + @XmlElement(name = "BPe", required = true) + protected TBPe bPe; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade idLote. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdLote() { + return idLote; + } + + /** + * Define o valor da propriedade idLote. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdLote(String value) { + this.idLote = value; + } + + /** + * Obtém o valor da propriedade bPe. + * + * @return + * possible object is + * {@link TBPe } + * + */ + public TBPe getBPe() { + return bPe; + } + + /** + * Define o valor da propriedade bPe. + * + * @param value + * allowed object is + * {@link TBPe } + * + */ + public void setBPe(TBPe value) { + this.bPe = value; + } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TEvento.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TEvento.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TEvento.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TEvento.java index 590c2d8f7..260a7d305 100644 --- a/src/br/inf/portalfiscal/bpe/TEvento.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TEvento.java @@ -1,599 +1,599 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.29 às 06:11:44 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.w3c.dom.Element; - - -/** - * Tipo Evento - * - *

Classe Java de TEvento complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TEvento">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="infEvento">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
- *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
- *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
- *                   <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                   <element name="tpEvento">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[0-9]{6}"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="nSeqEvento">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="detEvento">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <any processContents='skip'/>
- *                           </sequence>
- *                           <attribute name="versaoEvento" use="required">
- *                             <simpleType>
- *                               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                 <whiteSpace value="preserve"/>
- *                                 <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
- *                               </restriction>
- *                             </simpleType>
- *                           </attribute>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="Id" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
- *                       <pattern value="ID[0-9]{52}"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerEvento" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TEvento", propOrder = { - "infEvento", -// "signature" -}) -@XmlRootElement(name = "eventoBPe") -public class TEvento { - - @XmlElement(required = true) - protected TEvento.InfEvento infEvento; -// @XmlElement(name = "Signature" required = true) -// protected SignatureType signature; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade infEvento. - * - * @return - * possible object is - * {@link TEvento.InfEvento } - * - */ - public TEvento.InfEvento getInfEvento() { - return infEvento; - } - - /** - * Define o valor da propriedade infEvento. - * - * @param value - * allowed object is - * {@link TEvento.InfEvento } - * - */ - public void setInfEvento(TEvento.InfEvento value) { - this.infEvento = value; - } - - /** - * Obtém o valor da propriedade signature. - * - * @return - * possible object is - * {@link SignatureType } - * - */ -// public SignatureType getSignature() { -// return signature; -// } - - /** - * Define o valor da propriedade signature. - * - * @param value - * allowed object is - * {@link SignatureType } - * - */ -// public void setSignature(SignatureType value) { -// this.signature = value; -// } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
-     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-     *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
-     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
-     *         <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *         <element name="tpEvento">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[0-9]{6}"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="nSeqEvento">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="detEvento">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <any processContents='skip'/>
-     *                 </sequence>
-     *                 <attribute name="versaoEvento" use="required">
-     *                   <simpleType>
-     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                       <whiteSpace value="preserve"/>
-     *                       <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
-     *                     </restriction>
-     *                   </simpleType>
-     *                 </attribute>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="Id" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
-     *             <pattern value="ID[0-9]{52}"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cOrgao", - "tpAmb", - "cnpj", - "chBPe", - "dhEvento", - "tpEvento", - "nSeqEvento", - "detEvento" - }) - public static class InfEvento { - - @XmlElement(required = true) - protected String cOrgao; - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(name = "CNPJ", required = true) - protected String cnpj; - @XmlElement(required = true) - protected String chBPe; - @XmlElement(required = true) - protected String dhEvento; - @XmlElement(required = true) - protected String tpEvento; - @XmlElement(required = true) - protected String nSeqEvento; - @XmlElement(required = true) - protected TEvento.InfEvento.DetEvento detEvento; - @XmlAttribute(name = "Id", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - protected String id; - - /** - * Obtém o valor da propriedade cOrgao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCOrgao() { - return cOrgao; - } - - /** - * Define o valor da propriedade cOrgao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCOrgao(String value) { - this.cOrgao = value; - } - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade dhEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhEvento() { - return dhEvento; - } - - /** - * Define o valor da propriedade dhEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhEvento(String value) { - this.dhEvento = value; - } - - /** - * Obtém o valor da propriedade tpEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpEvento() { - return tpEvento; - } - - /** - * Define o valor da propriedade tpEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpEvento(String value) { - this.tpEvento = value; - } - - /** - * Obtém o valor da propriedade nSeqEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSeqEvento() { - return nSeqEvento; - } - - /** - * Define o valor da propriedade nSeqEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSeqEvento(String value) { - this.nSeqEvento = value; - } - - /** - * Obtém o valor da propriedade detEvento. - * - * @return - * possible object is - * {@link TEvento.InfEvento.DetEvento } - * - */ - public TEvento.InfEvento.DetEvento getDetEvento() { - return detEvento; - } - - /** - * Define o valor da propriedade detEvento. - * - * @param value - * allowed object is - * {@link TEvento.InfEvento.DetEvento } - * - */ - public void setDetEvento(TEvento.InfEvento.DetEvento value) { - this.detEvento = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <any processContents='skip'/>
-         *       </sequence>
-         *       <attribute name="versaoEvento" use="required">
-         *         <simpleType>
-         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *             <whiteSpace value="preserve"/>
-         *             <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
-         *           </restriction>
-         *         </simpleType>
-         *       </attribute>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "any" - }) - public static class DetEvento { - - @XmlAnyElement - protected Element any; - @XmlAttribute(name = "versaoEvento", required = true) - protected String versaoEvento; - - - /** - * Obtém o valor da propriedade any. - * - * @return - * possible object is - * {@link Element } - * - */ - public Element getAny() { - return any; - } - - /** - * Define o valor da propriedade any. - * - * @param value - * allowed object is - * {@link Element } - * - */ - public void setAny(Element value) { - this.any = value; - } - - /** - * Obtém o valor da propriedade versaoEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersaoEvento() { - return versaoEvento; - } - - /** - * Define o valor da propriedade versaoEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersaoEvento(String value) { - this.versaoEvento = value; - } - - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.29 às 06:11:44 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import org.w3c.dom.Element; + + +/** + * Tipo Evento + * + *

Classe Java de TEvento complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TEvento">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="infEvento">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+ *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+ *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+ *                   <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                   <element name="tpEvento">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[0-9]{6}"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="nSeqEvento">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="detEvento">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <any processContents='skip'/>
+ *                           </sequence>
+ *                           <attribute name="versaoEvento" use="required">
+ *                             <simpleType>
+ *                               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                 <whiteSpace value="preserve"/>
+ *                                 <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
+ *                               </restriction>
+ *                             </simpleType>
+ *                           </attribute>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="Id" use="required">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+ *                       <pattern value="ID[0-9]{52}"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerEvento" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TEvento", propOrder = { + "infEvento", +// "signature" +}) +@XmlRootElement(name = "eventoBPe") +public class TEvento { + + @XmlElement(required = true) + protected TEvento.InfEvento infEvento; +// @XmlElement(name = "Signature" required = true) +// protected SignatureType signature; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade infEvento. + * + * @return + * possible object is + * {@link TEvento.InfEvento } + * + */ + public TEvento.InfEvento getInfEvento() { + return infEvento; + } + + /** + * Define o valor da propriedade infEvento. + * + * @param value + * allowed object is + * {@link TEvento.InfEvento } + * + */ + public void setInfEvento(TEvento.InfEvento value) { + this.infEvento = value; + } + + /** + * Obtém o valor da propriedade signature. + * + * @return + * possible object is + * {@link SignatureType } + * + */ +// public SignatureType getSignature() { +// return signature; +// } + + /** + * Define o valor da propriedade signature. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ +// public void setSignature(SignatureType value) { +// this.signature = value; +// } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+     *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+     *         <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *         <element name="tpEvento">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[0-9]{6}"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="nSeqEvento">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="detEvento">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <any processContents='skip'/>
+     *                 </sequence>
+     *                 <attribute name="versaoEvento" use="required">
+     *                   <simpleType>
+     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                       <whiteSpace value="preserve"/>
+     *                       <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
+     *                     </restriction>
+     *                   </simpleType>
+     *                 </attribute>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="Id" use="required">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+     *             <pattern value="ID[0-9]{52}"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cOrgao", + "tpAmb", + "cnpj", + "chBPe", + "dhEvento", + "tpEvento", + "nSeqEvento", + "detEvento" + }) + public static class InfEvento { + + @XmlElement(required = true) + protected String cOrgao; + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(name = "CNPJ", required = true) + protected String cnpj; + @XmlElement(required = true) + protected String chBPe; + @XmlElement(required = true) + protected String dhEvento; + @XmlElement(required = true) + protected String tpEvento; + @XmlElement(required = true) + protected String nSeqEvento; + @XmlElement(required = true) + protected TEvento.InfEvento.DetEvento detEvento; + @XmlAttribute(name = "Id", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + protected String id; + + /** + * Obtém o valor da propriedade cOrgao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCOrgao() { + return cOrgao; + } + + /** + * Define o valor da propriedade cOrgao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCOrgao(String value) { + this.cOrgao = value; + } + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade dhEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhEvento() { + return dhEvento; + } + + /** + * Define o valor da propriedade dhEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhEvento(String value) { + this.dhEvento = value; + } + + /** + * Obtém o valor da propriedade tpEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpEvento() { + return tpEvento; + } + + /** + * Define o valor da propriedade tpEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpEvento(String value) { + this.tpEvento = value; + } + + /** + * Obtém o valor da propriedade nSeqEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSeqEvento() { + return nSeqEvento; + } + + /** + * Define o valor da propriedade nSeqEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSeqEvento(String value) { + this.nSeqEvento = value; + } + + /** + * Obtém o valor da propriedade detEvento. + * + * @return + * possible object is + * {@link TEvento.InfEvento.DetEvento } + * + */ + public TEvento.InfEvento.DetEvento getDetEvento() { + return detEvento; + } + + /** + * Define o valor da propriedade detEvento. + * + * @param value + * allowed object is + * {@link TEvento.InfEvento.DetEvento } + * + */ + public void setDetEvento(TEvento.InfEvento.DetEvento value) { + this.detEvento = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <any processContents='skip'/>
+         *       </sequence>
+         *       <attribute name="versaoEvento" use="required">
+         *         <simpleType>
+         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *             <whiteSpace value="preserve"/>
+         *             <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
+         *           </restriction>
+         *         </simpleType>
+         *       </attribute>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "any" + }) + public static class DetEvento { + + @XmlAnyElement + protected Element any; + @XmlAttribute(name = "versaoEvento", required = true) + protected String versaoEvento; + + + /** + * Obtém o valor da propriedade any. + * + * @return + * possible object is + * {@link Element } + * + */ + public Element getAny() { + return any; + } + + /** + * Define o valor da propriedade any. + * + * @param value + * allowed object is + * {@link Element } + * + */ + public void setAny(Element value) { + this.any = value; + } + + /** + * Obtém o valor da propriedade versaoEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersaoEvento() { + return versaoEvento; + } + + /** + * Define o valor da propriedade versaoEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersaoEvento(String value) { + this.versaoEvento = value; + } + + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TImp.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TImp.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TImp.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TImp.java index 614ce35d7..b376ce74f 100644 --- a/src/br/inf/portalfiscal/bpe/TImp.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TImp.java @@ -1,1193 +1,1193 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Dados do Imposto BP-e - * - *

Classe Java de TImp complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TImp">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="ICMS00">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CST">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="00"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                   <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                   <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ICMS20">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CST">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="20"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc"/>
- *                   <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                   <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                   <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ICMS45">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CST">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="40"/>
- *                         <enumeration value="41"/>
- *                         <enumeration value="51"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ICMS90">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CST">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="90"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
- *                   <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                   <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                   <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                   <element name="vCred" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ICMSOutraUF">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CST">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="90"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="pRedBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
- *                   <element name="vBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                   <element name="pICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
- *                   <element name="vICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ICMSSN">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="CST">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="90"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="indSN">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <enumeration value="1"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TImp", propOrder = { - "icms00", - "icms20", - "icms45", - "icms90", - "icmsOutraUF", - "icmssn" -}) -public class TImp { - - @XmlElement(name = "ICMS00") - protected TImp.ICMS00 icms00; - @XmlElement(name = "ICMS20") - protected TImp.ICMS20 icms20; - @XmlElement(name = "ICMS45") - protected TImp.ICMS45 icms45; - @XmlElement(name = "ICMS90") - protected TImp.ICMS90 icms90; - @XmlElement(name = "ICMSOutraUF") - protected TImp.ICMSOutraUF icmsOutraUF; - @XmlElement(name = "ICMSSN") - protected TImp.ICMSSN icmssn; - - /** - * Obtém o valor da propriedade icms00. - * - * @return - * possible object is - * {@link TImp.ICMS00 } - * - */ - public TImp.ICMS00 getICMS00() { - return icms00; - } - - /** - * Define o valor da propriedade icms00. - * - * @param value - * allowed object is - * {@link TImp.ICMS00 } - * - */ - public void setICMS00(TImp.ICMS00 value) { - this.icms00 = value; - } - - /** - * Obtém o valor da propriedade icms20. - * - * @return - * possible object is - * {@link TImp.ICMS20 } - * - */ - public TImp.ICMS20 getICMS20() { - return icms20; - } - - /** - * Define o valor da propriedade icms20. - * - * @param value - * allowed object is - * {@link TImp.ICMS20 } - * - */ - public void setICMS20(TImp.ICMS20 value) { - this.icms20 = value; - } - - /** - * Obtém o valor da propriedade icms45. - * - * @return - * possible object is - * {@link TImp.ICMS45 } - * - */ - public TImp.ICMS45 getICMS45() { - return icms45; - } - - /** - * Define o valor da propriedade icms45. - * - * @param value - * allowed object is - * {@link TImp.ICMS45 } - * - */ - public void setICMS45(TImp.ICMS45 value) { - this.icms45 = value; - } - - /** - * Obtém o valor da propriedade icms90. - * - * @return - * possible object is - * {@link TImp.ICMS90 } - * - */ - public TImp.ICMS90 getICMS90() { - return icms90; - } - - /** - * Define o valor da propriedade icms90. - * - * @param value - * allowed object is - * {@link TImp.ICMS90 } - * - */ - public void setICMS90(TImp.ICMS90 value) { - this.icms90 = value; - } - - /** - * Obtém o valor da propriedade icmsOutraUF. - * - * @return - * possible object is - * {@link TImp.ICMSOutraUF } - * - */ - public TImp.ICMSOutraUF getICMSOutraUF() { - return icmsOutraUF; - } - - /** - * Define o valor da propriedade icmsOutraUF. - * - * @param value - * allowed object is - * {@link TImp.ICMSOutraUF } - * - */ - public void setICMSOutraUF(TImp.ICMSOutraUF value) { - this.icmsOutraUF = value; - } - - /** - * Obtém o valor da propriedade icmssn. - * - * @return - * possible object is - * {@link TImp.ICMSSN } - * - */ - public TImp.ICMSSN getICMSSN() { - return icmssn; - } - - /** - * Define o valor da propriedade icmssn. - * - * @param value - * allowed object is - * {@link TImp.ICMSSN } - * - */ - public void setICMSSN(TImp.ICMSSN value) { - this.icmssn = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CST">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="00"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *         <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *         <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cst", - "vbc", - "picms", - "vicms" - }) - public static class ICMS00 { - - @XmlElement(name = "CST", required = true) - protected String cst; - @XmlElement(name = "vBC", required = true) - protected String vbc; - @XmlElement(name = "pICMS", required = true) - protected String picms; - @XmlElement(name = "vICMS", required = true) - protected String vicms; - - /** - * Obtém o valor da propriedade cst. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCST() { - return cst; - } - - /** - * Define o valor da propriedade cst. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCST(String value) { - this.cst = value; - } - - /** - * Obtém o valor da propriedade vbc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVBC() { - return vbc; - } - - /** - * Define o valor da propriedade vbc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVBC(String value) { - this.vbc = value; - } - - /** - * Obtém o valor da propriedade picms. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMS() { - return picms; - } - - /** - * Define o valor da propriedade picms. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMS(String value) { - this.picms = value; - } - - /** - * Obtém o valor da propriedade vicms. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVICMS() { - return vicms; - } - - /** - * Define o valor da propriedade vicms. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVICMS(String value) { - this.vicms = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CST">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="20"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc"/>
-     *         <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *         <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *         <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cst", - "pRedBC", - "vbc", - "picms", - "vicms" - }) - public static class ICMS20 { - - @XmlElement(name = "CST", required = true) - protected String cst; - @XmlElement(required = true) - protected String pRedBC; - @XmlElement(name = "vBC", required = true) - protected String vbc; - @XmlElement(name = "pICMS", required = true) - protected String picms; - @XmlElement(name = "vICMS", required = true) - protected String vicms; - - /** - * Obtém o valor da propriedade cst. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCST() { - return cst; - } - - /** - * Define o valor da propriedade cst. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCST(String value) { - this.cst = value; - } - - /** - * Obtém o valor da propriedade pRedBC. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPRedBC() { - return pRedBC; - } - - /** - * Define o valor da propriedade pRedBC. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPRedBC(String value) { - this.pRedBC = value; - } - - /** - * Obtém o valor da propriedade vbc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVBC() { - return vbc; - } - - /** - * Define o valor da propriedade vbc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVBC(String value) { - this.vbc = value; - } - - /** - * Obtém o valor da propriedade picms. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMS() { - return picms; - } - - /** - * Define o valor da propriedade picms. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMS(String value) { - this.picms = value; - } - - /** - * Obtém o valor da propriedade vicms. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVICMS() { - return vicms; - } - - /** - * Define o valor da propriedade vicms. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVICMS(String value) { - this.vicms = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CST">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="40"/>
-     *               <enumeration value="41"/>
-     *               <enumeration value="51"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cst" - }) - public static class ICMS45 { - - @XmlElement(name = "CST", required = true) - protected String cst; - - /** - * Obtém o valor da propriedade cst. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCST() { - return cst; - } - - /** - * Define o valor da propriedade cst. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCST(String value) { - this.cst = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CST">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="90"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
-     *         <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *         <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *         <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *         <element name="vCred" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cst", - "pRedBC", - "vbc", - "picms", - "vicms", - "vCred" - }) - public static class ICMS90 { - - @XmlElement(name = "CST", required = true) - protected String cst; - protected String pRedBC; - @XmlElement(name = "vBC", required = true) - protected String vbc; - @XmlElement(name = "pICMS", required = true) - protected String picms; - @XmlElement(name = "vICMS", required = true) - protected String vicms; - protected String vCred; - - /** - * Obtém o valor da propriedade cst. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCST() { - return cst; - } - - /** - * Define o valor da propriedade cst. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCST(String value) { - this.cst = value; - } - - /** - * Obtém o valor da propriedade pRedBC. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPRedBC() { - return pRedBC; - } - - /** - * Define o valor da propriedade pRedBC. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPRedBC(String value) { - this.pRedBC = value; - } - - /** - * Obtém o valor da propriedade vbc. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVBC() { - return vbc; - } - - /** - * Define o valor da propriedade vbc. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVBC(String value) { - this.vbc = value; - } - - /** - * Obtém o valor da propriedade picms. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMS() { - return picms; - } - - /** - * Define o valor da propriedade picms. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMS(String value) { - this.picms = value; - } - - /** - * Obtém o valor da propriedade vicms. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVICMS() { - return vicms; - } - - /** - * Define o valor da propriedade vicms. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVICMS(String value) { - this.vicms = value; - } - - /** - * Obtém o valor da propriedade vCred. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVCred() { - return vCred; - } - - /** - * Define o valor da propriedade vCred. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVCred(String value) { - this.vCred = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CST">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="90"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="pRedBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
-     *         <element name="vBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *         <element name="pICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
-     *         <element name="vICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cst", - "pRedBCOutraUF", - "vbcOutraUF", - "picmsOutraUF", - "vicmsOutraUF" - }) - public static class ICMSOutraUF { - - @XmlElement(name = "CST", required = true) - protected String cst; - protected String pRedBCOutraUF; - @XmlElement(name = "vBCOutraUF", required = true) - protected String vbcOutraUF; - @XmlElement(name = "pICMSOutraUF", required = true) - protected String picmsOutraUF; - @XmlElement(name = "vICMSOutraUF", required = true) - protected String vicmsOutraUF; - - /** - * Obtém o valor da propriedade cst. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCST() { - return cst; - } - - /** - * Define o valor da propriedade cst. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCST(String value) { - this.cst = value; - } - - /** - * Obtém o valor da propriedade pRedBCOutraUF. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPRedBCOutraUF() { - return pRedBCOutraUF; - } - - /** - * Define o valor da propriedade pRedBCOutraUF. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPRedBCOutraUF(String value) { - this.pRedBCOutraUF = value; - } - - /** - * Obtém o valor da propriedade vbcOutraUF. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVBCOutraUF() { - return vbcOutraUF; - } - - /** - * Define o valor da propriedade vbcOutraUF. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVBCOutraUF(String value) { - this.vbcOutraUF = value; - } - - /** - * Obtém o valor da propriedade picmsOutraUF. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPICMSOutraUF() { - return picmsOutraUF; - } - - /** - * Define o valor da propriedade picmsOutraUF. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPICMSOutraUF(String value) { - this.picmsOutraUF = value; - } - - /** - * Obtém o valor da propriedade vicmsOutraUF. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVICMSOutraUF() { - return vicmsOutraUF; - } - - /** - * Define o valor da propriedade vicmsOutraUF. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVICMSOutraUF(String value) { - this.vicmsOutraUF = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="CST">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="90"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="indSN">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <enumeration value="1"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cst", - "indSN" - }) - public static class ICMSSN { - - @XmlElement(name = "CST", required = true) - protected String cst; - @XmlElement(required = true) - protected String indSN; - - /** - * Obtém o valor da propriedade cst. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCST() { - return cst; - } - - /** - * Define o valor da propriedade cst. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCST(String value) { - this.cst = value; - } - - /** - * Obtém o valor da propriedade indSN. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIndSN() { - return indSN; - } - - /** - * Define o valor da propriedade indSN. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIndSN(String value) { - this.indSN = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Dados do Imposto BP-e + * + *

Classe Java de TImp complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TImp">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="ICMS00">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="CST">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="00"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                   <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                   <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ICMS20">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="CST">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="20"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc"/>
+ *                   <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                   <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                   <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ICMS45">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="CST">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="40"/>
+ *                         <enumeration value="41"/>
+ *                         <enumeration value="51"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ICMS90">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="CST">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="90"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
+ *                   <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                   <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                   <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                   <element name="vCred" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ICMSOutraUF">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="CST">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="90"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="pRedBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
+ *                   <element name="vBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                   <element name="pICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+ *                   <element name="vICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ICMSSN">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="CST">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="90"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="indSN">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <enumeration value="1"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TImp", propOrder = { + "icms00", + "icms20", + "icms45", + "icms90", + "icmsOutraUF", + "icmssn" +}) +public class TImp { + + @XmlElement(name = "ICMS00") + protected TImp.ICMS00 icms00; + @XmlElement(name = "ICMS20") + protected TImp.ICMS20 icms20; + @XmlElement(name = "ICMS45") + protected TImp.ICMS45 icms45; + @XmlElement(name = "ICMS90") + protected TImp.ICMS90 icms90; + @XmlElement(name = "ICMSOutraUF") + protected TImp.ICMSOutraUF icmsOutraUF; + @XmlElement(name = "ICMSSN") + protected TImp.ICMSSN icmssn; + + /** + * Obtém o valor da propriedade icms00. + * + * @return + * possible object is + * {@link TImp.ICMS00 } + * + */ + public TImp.ICMS00 getICMS00() { + return icms00; + } + + /** + * Define o valor da propriedade icms00. + * + * @param value + * allowed object is + * {@link TImp.ICMS00 } + * + */ + public void setICMS00(TImp.ICMS00 value) { + this.icms00 = value; + } + + /** + * Obtém o valor da propriedade icms20. + * + * @return + * possible object is + * {@link TImp.ICMS20 } + * + */ + public TImp.ICMS20 getICMS20() { + return icms20; + } + + /** + * Define o valor da propriedade icms20. + * + * @param value + * allowed object is + * {@link TImp.ICMS20 } + * + */ + public void setICMS20(TImp.ICMS20 value) { + this.icms20 = value; + } + + /** + * Obtém o valor da propriedade icms45. + * + * @return + * possible object is + * {@link TImp.ICMS45 } + * + */ + public TImp.ICMS45 getICMS45() { + return icms45; + } + + /** + * Define o valor da propriedade icms45. + * + * @param value + * allowed object is + * {@link TImp.ICMS45 } + * + */ + public void setICMS45(TImp.ICMS45 value) { + this.icms45 = value; + } + + /** + * Obtém o valor da propriedade icms90. + * + * @return + * possible object is + * {@link TImp.ICMS90 } + * + */ + public TImp.ICMS90 getICMS90() { + return icms90; + } + + /** + * Define o valor da propriedade icms90. + * + * @param value + * allowed object is + * {@link TImp.ICMS90 } + * + */ + public void setICMS90(TImp.ICMS90 value) { + this.icms90 = value; + } + + /** + * Obtém o valor da propriedade icmsOutraUF. + * + * @return + * possible object is + * {@link TImp.ICMSOutraUF } + * + */ + public TImp.ICMSOutraUF getICMSOutraUF() { + return icmsOutraUF; + } + + /** + * Define o valor da propriedade icmsOutraUF. + * + * @param value + * allowed object is + * {@link TImp.ICMSOutraUF } + * + */ + public void setICMSOutraUF(TImp.ICMSOutraUF value) { + this.icmsOutraUF = value; + } + + /** + * Obtém o valor da propriedade icmssn. + * + * @return + * possible object is + * {@link TImp.ICMSSN } + * + */ + public TImp.ICMSSN getICMSSN() { + return icmssn; + } + + /** + * Define o valor da propriedade icmssn. + * + * @param value + * allowed object is + * {@link TImp.ICMSSN } + * + */ + public void setICMSSN(TImp.ICMSSN value) { + this.icmssn = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="CST">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="00"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *         <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *         <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cst", + "vbc", + "picms", + "vicms" + }) + public static class ICMS00 { + + @XmlElement(name = "CST", required = true) + protected String cst; + @XmlElement(name = "vBC", required = true) + protected String vbc; + @XmlElement(name = "pICMS", required = true) + protected String picms; + @XmlElement(name = "vICMS", required = true) + protected String vicms; + + /** + * Obtém o valor da propriedade cst. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCST() { + return cst; + } + + /** + * Define o valor da propriedade cst. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCST(String value) { + this.cst = value; + } + + /** + * Obtém o valor da propriedade vbc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVBC() { + return vbc; + } + + /** + * Define o valor da propriedade vbc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVBC(String value) { + this.vbc = value; + } + + /** + * Obtém o valor da propriedade picms. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMS() { + return picms; + } + + /** + * Define o valor da propriedade picms. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMS(String value) { + this.picms = value; + } + + /** + * Obtém o valor da propriedade vicms. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVICMS() { + return vicms; + } + + /** + * Define o valor da propriedade vicms. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVICMS(String value) { + this.vicms = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="CST">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="20"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc"/>
+     *         <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *         <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *         <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cst", + "pRedBC", + "vbc", + "picms", + "vicms" + }) + public static class ICMS20 { + + @XmlElement(name = "CST", required = true) + protected String cst; + @XmlElement(required = true) + protected String pRedBC; + @XmlElement(name = "vBC", required = true) + protected String vbc; + @XmlElement(name = "pICMS", required = true) + protected String picms; + @XmlElement(name = "vICMS", required = true) + protected String vicms; + + /** + * Obtém o valor da propriedade cst. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCST() { + return cst; + } + + /** + * Define o valor da propriedade cst. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCST(String value) { + this.cst = value; + } + + /** + * Obtém o valor da propriedade pRedBC. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPRedBC() { + return pRedBC; + } + + /** + * Define o valor da propriedade pRedBC. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPRedBC(String value) { + this.pRedBC = value; + } + + /** + * Obtém o valor da propriedade vbc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVBC() { + return vbc; + } + + /** + * Define o valor da propriedade vbc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVBC(String value) { + this.vbc = value; + } + + /** + * Obtém o valor da propriedade picms. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMS() { + return picms; + } + + /** + * Define o valor da propriedade picms. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMS(String value) { + this.picms = value; + } + + /** + * Obtém o valor da propriedade vicms. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVICMS() { + return vicms; + } + + /** + * Define o valor da propriedade vicms. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVICMS(String value) { + this.vicms = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="CST">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="40"/>
+     *               <enumeration value="41"/>
+     *               <enumeration value="51"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cst" + }) + public static class ICMS45 { + + @XmlElement(name = "CST", required = true) + protected String cst; + + /** + * Obtém o valor da propriedade cst. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCST() { + return cst; + } + + /** + * Define o valor da propriedade cst. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCST(String value) { + this.cst = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="CST">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="90"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="pRedBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
+     *         <element name="vBC" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *         <element name="pICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *         <element name="vICMS" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *         <element name="vCred" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302" minOccurs="0"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cst", + "pRedBC", + "vbc", + "picms", + "vicms", + "vCred" + }) + public static class ICMS90 { + + @XmlElement(name = "CST", required = true) + protected String cst; + protected String pRedBC; + @XmlElement(name = "vBC", required = true) + protected String vbc; + @XmlElement(name = "pICMS", required = true) + protected String picms; + @XmlElement(name = "vICMS", required = true) + protected String vicms; + protected String vCred; + + /** + * Obtém o valor da propriedade cst. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCST() { + return cst; + } + + /** + * Define o valor da propriedade cst. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCST(String value) { + this.cst = value; + } + + /** + * Obtém o valor da propriedade pRedBC. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPRedBC() { + return pRedBC; + } + + /** + * Define o valor da propriedade pRedBC. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPRedBC(String value) { + this.pRedBC = value; + } + + /** + * Obtém o valor da propriedade vbc. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVBC() { + return vbc; + } + + /** + * Define o valor da propriedade vbc. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVBC(String value) { + this.vbc = value; + } + + /** + * Obtém o valor da propriedade picms. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMS() { + return picms; + } + + /** + * Define o valor da propriedade picms. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMS(String value) { + this.picms = value; + } + + /** + * Obtém o valor da propriedade vicms. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVICMS() { + return vicms; + } + + /** + * Define o valor da propriedade vicms. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVICMS(String value) { + this.vicms = value; + } + + /** + * Obtém o valor da propriedade vCred. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVCred() { + return vCred; + } + + /** + * Define o valor da propriedade vCred. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVCred(String value) { + this.vCred = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="CST">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="90"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="pRedBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302Opc" minOccurs="0"/>
+     *         <element name="vBCOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *         <element name="pICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_0302"/>
+     *         <element name="vICMSOutraUF" type="{http://www.portalfiscal.inf.br/bpe}TDec_1302"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cst", + "pRedBCOutraUF", + "vbcOutraUF", + "picmsOutraUF", + "vicmsOutraUF" + }) + public static class ICMSOutraUF { + + @XmlElement(name = "CST", required = true) + protected String cst; + protected String pRedBCOutraUF; + @XmlElement(name = "vBCOutraUF", required = true) + protected String vbcOutraUF; + @XmlElement(name = "pICMSOutraUF", required = true) + protected String picmsOutraUF; + @XmlElement(name = "vICMSOutraUF", required = true) + protected String vicmsOutraUF; + + /** + * Obtém o valor da propriedade cst. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCST() { + return cst; + } + + /** + * Define o valor da propriedade cst. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCST(String value) { + this.cst = value; + } + + /** + * Obtém o valor da propriedade pRedBCOutraUF. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPRedBCOutraUF() { + return pRedBCOutraUF; + } + + /** + * Define o valor da propriedade pRedBCOutraUF. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPRedBCOutraUF(String value) { + this.pRedBCOutraUF = value; + } + + /** + * Obtém o valor da propriedade vbcOutraUF. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVBCOutraUF() { + return vbcOutraUF; + } + + /** + * Define o valor da propriedade vbcOutraUF. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVBCOutraUF(String value) { + this.vbcOutraUF = value; + } + + /** + * Obtém o valor da propriedade picmsOutraUF. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPICMSOutraUF() { + return picmsOutraUF; + } + + /** + * Define o valor da propriedade picmsOutraUF. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPICMSOutraUF(String value) { + this.picmsOutraUF = value; + } + + /** + * Obtém o valor da propriedade vicmsOutraUF. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVICMSOutraUF() { + return vicmsOutraUF; + } + + /** + * Define o valor da propriedade vicmsOutraUF. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVICMSOutraUF(String value) { + this.vicmsOutraUF = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="CST">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="90"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="indSN">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <enumeration value="1"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cst", + "indSN" + }) + public static class ICMSSN { + + @XmlElement(name = "CST", required = true) + protected String cst; + @XmlElement(required = true) + protected String indSN; + + /** + * Obtém o valor da propriedade cst. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCST() { + return cst; + } + + /** + * Define o valor da propriedade cst. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCST(String value) { + this.cst = value; + } + + /** + * Obtém o valor da propriedade indSN. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIndSN() { + return indSN; + } + + /** + * Define o valor da propriedade indSN. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIndSN(String value) { + this.indSN = value; + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TProcEvento.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TProcEvento.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TProcEvento.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TProcEvento.java index 2a7969847..c6487c9ad 100644 --- a/src/br/inf/portalfiscal/bpe/TProcEvento.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TProcEvento.java @@ -1,154 +1,154 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.29 às 06:11:44 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo procEvento - * - *

Classe Java de TProcEvento complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TProcEvento">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="eventoBPe" type="{http://www.portalfiscal.inf.br/bpe}TEvento"/>
- *         <element name="retEventoBPe" type="{http://www.portalfiscal.inf.br/bpe}TRetEvento"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerEvento" />
- *       <attribute name="ipTransmissor" type="{http://www.portalfiscal.inf.br/bpe}TIPv4" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TProcEvento", propOrder = { - "eventoBPe", - "retEventoBPe" -}) -public class TProcEvento { - - @XmlElement(required = true) - protected TEvento eventoBPe; - @XmlElement(required = true) - protected TRetEvento retEventoBPe; - @XmlAttribute(name = "versao", required = true) - protected String versao; - @XmlAttribute(name = "ipTransmissor") - protected String ipTransmissor; - - /** - * Obtém o valor da propriedade eventoBPe. - * - * @return - * possible object is - * {@link TEvento } - * - */ - public TEvento getEventoBPe() { - return eventoBPe; - } - - /** - * Define o valor da propriedade eventoBPe. - * - * @param value - * allowed object is - * {@link TEvento } - * - */ - public void setEventoBPe(TEvento value) { - this.eventoBPe = value; - } - - /** - * Obtém o valor da propriedade retEventoBPe. - * - * @return - * possible object is - * {@link TRetEvento } - * - */ - public TRetEvento getRetEventoBPe() { - return retEventoBPe; - } - - /** - * Define o valor da propriedade retEventoBPe. - * - * @param value - * allowed object is - * {@link TRetEvento } - * - */ - public void setRetEventoBPe(TRetEvento value) { - this.retEventoBPe = value; - } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - /** - * Obtém o valor da propriedade ipTransmissor. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIpTransmissor() { - return ipTransmissor; - } - - /** - * Define o valor da propriedade ipTransmissor. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIpTransmissor(String value) { - this.ipTransmissor = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.29 às 06:11:44 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo procEvento + * + *

Classe Java de TProcEvento complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TProcEvento">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="eventoBPe" type="{http://www.portalfiscal.inf.br/bpe}TEvento"/>
+ *         <element name="retEventoBPe" type="{http://www.portalfiscal.inf.br/bpe}TRetEvento"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerEvento" />
+ *       <attribute name="ipTransmissor" type="{http://www.portalfiscal.inf.br/bpe}TIPv4" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TProcEvento", propOrder = { + "eventoBPe", + "retEventoBPe" +}) +public class TProcEvento { + + @XmlElement(required = true) + protected TEvento eventoBPe; + @XmlElement(required = true) + protected TRetEvento retEventoBPe; + @XmlAttribute(name = "versao", required = true) + protected String versao; + @XmlAttribute(name = "ipTransmissor") + protected String ipTransmissor; + + /** + * Obtém o valor da propriedade eventoBPe. + * + * @return + * possible object is + * {@link TEvento } + * + */ + public TEvento getEventoBPe() { + return eventoBPe; + } + + /** + * Define o valor da propriedade eventoBPe. + * + * @param value + * allowed object is + * {@link TEvento } + * + */ + public void setEventoBPe(TEvento value) { + this.eventoBPe = value; + } + + /** + * Obtém o valor da propriedade retEventoBPe. + * + * @return + * possible object is + * {@link TRetEvento } + * + */ + public TRetEvento getRetEventoBPe() { + return retEventoBPe; + } + + /** + * Define o valor da propriedade retEventoBPe. + * + * @param value + * allowed object is + * {@link TRetEvento } + * + */ + public void setRetEventoBPe(TRetEvento value) { + this.retEventoBPe = value; + } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + /** + * Obtém o valor da propriedade ipTransmissor. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIpTransmissor() { + return ipTransmissor; + } + + /** + * Define o valor da propriedade ipTransmissor. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIpTransmissor(String value) { + this.ipTransmissor = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TProtBPe.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TProtBPe.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TProtBPe.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TProtBPe.java index d99066470..76c410164 100644 --- a/src/br/inf/portalfiscal/bpe/TProtBPe.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TProtBPe.java @@ -1,436 +1,436 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - * Tipo Protocolo de status resultado do processamento do BP-e (Modelo 63) - * - *

Classe Java de TProtBPe complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TProtBPe">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="infProt">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *                   <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
- *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
- *                   <element name="dhRecbto" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                   <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
- *                   <element name="digVal" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType" minOccurs="0"/>
- *                   <element name="cStat">
- *                     <simpleType>
- *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TStat">
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
- *                 </sequence>
- *                 <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TProtBPe", propOrder = { - "infProt", -// "signature" -}) -public class TProtBPe { - - @XmlElement(required = true) - protected TProtBPe.InfProt infProt; -// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") -// protected SignatureType signature; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade infProt. - * - * @return - * possible object is - * {@link TProtBPe.InfProt } - * - */ - public TProtBPe.InfProt getInfProt() { - return infProt; - } - - /** - * Define o valor da propriedade infProt. - * - * @param value - * allowed object is - * {@link TProtBPe.InfProt } - * - */ - public void setInfProt(TProtBPe.InfProt value) { - this.infProt = value; - } - - /** - * Obtém o valor da propriedade signature. - * - * @return - * possible object is - * {@link SignatureType } - * - */ -// public SignatureType getSignature() { -// return signature; -// } - - /** - * Define o valor da propriedade signature. - * - * @param value - * allowed object is - * {@link SignatureType } - * -// */ -// public void setSignature(SignatureType value) { -// this.signature = value; -// } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-     *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
-     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
-     *         <element name="dhRecbto" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *         <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
-     *         <element name="digVal" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType" minOccurs="0"/>
-     *         <element name="cStat">
-     *           <simpleType>
-     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TStat">
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
-     *       </sequence>
-     *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "tpAmb", - "verAplic", - "chBPe", - "dhRecbto", - "nProt", - /*"digVal",*/ - "cStat", - "xMotivo" - }) - public static class InfProt { - - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(required = true) - protected String verAplic; - @XmlElement(required = true) - protected String chBPe; - @XmlElement(required = true) - protected String dhRecbto; - protected String nProt; -// protected byte[] digVal; - @XmlElement(required = true) - protected String cStat; - @XmlElement(required = true) - protected String xMotivo; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade verAplic. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVerAplic() { - return verAplic; - } - - /** - * Define o valor da propriedade verAplic. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVerAplic(String value) { - this.verAplic = value; - } - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade dhRecbto. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhRecbto() { - return dhRecbto; - } - - /** - * Define o valor da propriedade dhRecbto. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhRecbto(String value) { - this.dhRecbto = value; - } - - /** - * Obtém o valor da propriedade nProt. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNProt() { - return nProt; - } - - /** - * Define o valor da propriedade nProt. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNProt(String value) { - this.nProt = value; - } - -// /** -// * Obtém o valor da propriedade digVal. -// * -// * @return -// * possible object is -// * byte[] -// */ -// public byte[] getDigVal() { -// return digVal; -// } -// -// /** -// * Define o valor da propriedade digVal. -// * -// * @param value -// * allowed object is -// * byte[] -// */ -// public void setDigVal(byte[] value) { -// this.digVal = value; -// } - - /** - * Obtém o valor da propriedade cStat. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCStat() { - return cStat; - } - - /** - * Define o valor da propriedade cStat. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCStat(String value) { - this.cStat = value; - } - - /** - * Obtém o valor da propriedade xMotivo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMotivo() { - return xMotivo; - } - - /** - * Define o valor da propriedade xMotivo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMotivo(String value) { - this.xMotivo = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * Tipo Protocolo de status resultado do processamento do BP-e (Modelo 63) + * + *

Classe Java de TProtBPe complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TProtBPe">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="infProt">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *                   <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+ *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+ *                   <element name="dhRecbto" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                   <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
+ *                   <element name="digVal" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType" minOccurs="0"/>
+ *                   <element name="cStat">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TStat">
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+ *                 </sequence>
+ *                 <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TProtBPe", propOrder = { + "infProt", +// "signature" +}) +public class TProtBPe { + + @XmlElement(required = true) + protected TProtBPe.InfProt infProt; +// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") +// protected SignatureType signature; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade infProt. + * + * @return + * possible object is + * {@link TProtBPe.InfProt } + * + */ + public TProtBPe.InfProt getInfProt() { + return infProt; + } + + /** + * Define o valor da propriedade infProt. + * + * @param value + * allowed object is + * {@link TProtBPe.InfProt } + * + */ + public void setInfProt(TProtBPe.InfProt value) { + this.infProt = value; + } + + /** + * Obtém o valor da propriedade signature. + * + * @return + * possible object is + * {@link SignatureType } + * + */ +// public SignatureType getSignature() { +// return signature; +// } + + /** + * Define o valor da propriedade signature. + * + * @param value + * allowed object is + * {@link SignatureType } + * +// */ +// public void setSignature(SignatureType value) { +// this.signature = value; +// } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+     *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+     *         <element name="dhRecbto" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *         <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
+     *         <element name="digVal" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType" minOccurs="0"/>
+     *         <element name="cStat">
+     *           <simpleType>
+     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TStat">
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+     *       </sequence>
+     *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "tpAmb", + "verAplic", + "chBPe", + "dhRecbto", + "nProt", + /*"digVal",*/ + "cStat", + "xMotivo" + }) + public static class InfProt { + + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(required = true) + protected String verAplic; + @XmlElement(required = true) + protected String chBPe; + @XmlElement(required = true) + protected String dhRecbto; + protected String nProt; +// protected byte[] digVal; + @XmlElement(required = true) + protected String cStat; + @XmlElement(required = true) + protected String xMotivo; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade verAplic. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVerAplic() { + return verAplic; + } + + /** + * Define o valor da propriedade verAplic. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVerAplic(String value) { + this.verAplic = value; + } + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade dhRecbto. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhRecbto() { + return dhRecbto; + } + + /** + * Define o valor da propriedade dhRecbto. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhRecbto(String value) { + this.dhRecbto = value; + } + + /** + * Obtém o valor da propriedade nProt. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNProt() { + return nProt; + } + + /** + * Define o valor da propriedade nProt. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNProt(String value) { + this.nProt = value; + } + +// /** +// * Obtém o valor da propriedade digVal. +// * +// * @return +// * possible object is +// * byte[] +// */ +// public byte[] getDigVal() { +// return digVal; +// } +// +// /** +// * Define o valor da propriedade digVal. +// * +// * @param value +// * allowed object is +// * byte[] +// */ +// public void setDigVal(byte[] value) { +// this.digVal = value; +// } + + /** + * Obtém o valor da propriedade cStat. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCStat() { + return cStat; + } + + /** + * Define o valor da propriedade cStat. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCStat(String value) { + this.cStat = value; + } + + /** + * Obtém o valor da propriedade xMotivo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMotivo() { + return xMotivo; + } + + /** + * Define o valor da propriedade xMotivo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMotivo(String value) { + this.xMotivo = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TRetBPe.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TRetBPe.java similarity index 95% rename from src/br/inf/portalfiscal/bpe/TRetBPe.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TRetBPe.java index 839512066..8bfd3fde2 100644 --- a/src/br/inf/portalfiscal/bpe/TRetBPe.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TRetBPe.java @@ -1,240 +1,240 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Retorno do Pedido de autorização de BP-e (Modelo 63) - * - *

Classe Java de TRetBPe complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TRetBPe">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *         <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
- *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
- *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
- *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
- *         <element name="protBPe" type="{http://www.portalfiscal.inf.br/bpe}TProtBPe" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlRootElement(name = "retBPe") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "retBPe", propOrder = { - "tpAmb", - "cuf", - "verAplic", - "cStat", - "xMotivo", - "protBPe" -}) -public class TRetBPe { - - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(name = "cUF", required = true) - protected String cuf; - @XmlElement(required = true) - protected String verAplic; - @XmlElement(required = true) - protected String cStat; - @XmlElement(required = true) - protected String xMotivo; - protected TProtBPe protBPe; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade cuf. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCUF() { - return cuf; - } - - /** - * Define o valor da propriedade cuf. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCUF(String value) { - this.cuf = value; - } - - /** - * Obtém o valor da propriedade verAplic. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVerAplic() { - return verAplic; - } - - /** - * Define o valor da propriedade verAplic. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVerAplic(String value) { - this.verAplic = value; - } - - /** - * Obtém o valor da propriedade cStat. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCStat() { - return cStat; - } - - /** - * Define o valor da propriedade cStat. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCStat(String value) { - this.cStat = value; - } - - /** - * Obtém o valor da propriedade xMotivo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMotivo() { - return xMotivo; - } - - /** - * Define o valor da propriedade xMotivo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMotivo(String value) { - this.xMotivo = value; - } - - /** - * Obtém o valor da propriedade protBPe. - * - * @return - * possible object is - * {@link TProtBPe } - * - */ - public TProtBPe getProtBPe() { - return protBPe; - } - - /** - * Define o valor da propriedade protBPe. - * - * @param value - * allowed object is - * {@link TProtBPe } - * - */ - public void setProtBPe(TProtBPe value) { - this.protBPe = value; - } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Retorno do Pedido de autorização de BP-e (Modelo 63) + * + *

Classe Java de TRetBPe complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TRetBPe">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *         <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
+ *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+ *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
+ *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+ *         <element name="protBPe" type="{http://www.portalfiscal.inf.br/bpe}TProtBPe" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerBPe" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlRootElement(name = "retBPe") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "retBPe", propOrder = { + "tpAmb", + "cuf", + "verAplic", + "cStat", + "xMotivo", + "protBPe" +}) +public class TRetBPe { + + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(name = "cUF", required = true) + protected String cuf; + @XmlElement(required = true) + protected String verAplic; + @XmlElement(required = true) + protected String cStat; + @XmlElement(required = true) + protected String xMotivo; + protected TProtBPe protBPe; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade cuf. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCUF() { + return cuf; + } + + /** + * Define o valor da propriedade cuf. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCUF(String value) { + this.cuf = value; + } + + /** + * Obtém o valor da propriedade verAplic. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVerAplic() { + return verAplic; + } + + /** + * Define o valor da propriedade verAplic. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVerAplic(String value) { + this.verAplic = value; + } + + /** + * Obtém o valor da propriedade cStat. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCStat() { + return cStat; + } + + /** + * Define o valor da propriedade cStat. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCStat(String value) { + this.cStat = value; + } + + /** + * Obtém o valor da propriedade xMotivo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMotivo() { + return xMotivo; + } + + /** + * Define o valor da propriedade xMotivo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMotivo(String value) { + this.xMotivo = value; + } + + /** + * Obtém o valor da propriedade protBPe. + * + * @return + * possible object is + * {@link TProtBPe } + * + */ + public TProtBPe getProtBPe() { + return protBPe; + } + + /** + * Define o valor da propriedade protBPe. + * + * @param value + * allowed object is + * {@link TProtBPe } + * + */ + public void setProtBPe(TProtBPe value) { + this.protBPe = value; + } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TRetConsStatServ.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TRetConsStatServ.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TRetConsStatServ.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TRetConsStatServ.java index ead47d12c..ecc198b55 100644 --- a/src/br/inf/portalfiscal/bpe/TRetConsStatServ.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TRetConsStatServ.java @@ -1,343 +1,343 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.07 às 09:45:52 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * Tipo Resultado da Consulta do Status do Serviço BP-e - * - *

Classe Java de TRetConsStatServ complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TRetConsStatServ">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *         <element name="verAplic">
- *           <simpleType>
- *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TVerAplic">
- *               <whiteSpace value="collapse"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
- *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
- *         <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
- *         <element name="dhRecbto" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *         <element name="tMed" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}integer">
- *               <pattern value="[0-9]{1,4}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="dhRetorno" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
- *         <element name="xObs" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <minLength value="1"/>
- *               <maxLength value="255"/>
- *               <whiteSpace value="collapse"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerConsStat" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlRootElement(name = "retConsStatServBPe") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "retConsStatServBPe", propOrder = { - "tpAmb", - "verAplic", - "cStat", - "xMotivo", - "cuf", - "dhRecbto", - "tMed", - "dhRetorno", - "xObs" -}) -public class TRetConsStatServ { - - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(required = true) - protected String verAplic; - @XmlElement(required = true) - protected String cStat; - @XmlElement(required = true) - protected String xMotivo; - @XmlElement(name = "cUF", required = true) - protected String cuf; - @XmlElement(required = true) - protected String dhRecbto; - protected BigInteger tMed; - protected String dhRetorno; - protected String xObs; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade verAplic. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVerAplic() { - return verAplic; - } - - /** - * Define o valor da propriedade verAplic. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVerAplic(String value) { - this.verAplic = value; - } - - /** - * Obtém o valor da propriedade cStat. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCStat() { - return cStat; - } - - /** - * Define o valor da propriedade cStat. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCStat(String value) { - this.cStat = value; - } - - /** - * Obtém o valor da propriedade xMotivo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMotivo() { - return xMotivo; - } - - /** - * Define o valor da propriedade xMotivo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMotivo(String value) { - this.xMotivo = value; - } - - /** - * Obtém o valor da propriedade cuf. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCUF() { - return cuf; - } - - /** - * Define o valor da propriedade cuf. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCUF(String value) { - this.cuf = value; - } - - /** - * Obtém o valor da propriedade dhRecbto. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhRecbto() { - return dhRecbto; - } - - /** - * Define o valor da propriedade dhRecbto. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhRecbto(String value) { - this.dhRecbto = value; - } - - /** - * Obtém o valor da propriedade tMed. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getTMed() { - return tMed; - } - - /** - * Define o valor da propriedade tMed. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setTMed(BigInteger value) { - this.tMed = value; - } - - /** - * Obtém o valor da propriedade dhRetorno. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhRetorno() { - return dhRetorno; - } - - /** - * Define o valor da propriedade dhRetorno. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhRetorno(String value) { - this.dhRetorno = value; - } - - /** - * Obtém o valor da propriedade xObs. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXObs() { - return xObs; - } - - /** - * Define o valor da propriedade xObs. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXObs(String value) { - this.xObs = value; - } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.07 às 09:45:52 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Tipo Resultado da Consulta do Status do Serviço BP-e + * + *

Classe Java de TRetConsStatServ complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TRetConsStatServ">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *         <element name="verAplic">
+ *           <simpleType>
+ *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TVerAplic">
+ *               <whiteSpace value="collapse"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
+ *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+ *         <element name="cUF" type="{http://www.portalfiscal.inf.br/bpe}TCodUfIBGE"/>
+ *         <element name="dhRecbto" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *         <element name="tMed" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}integer">
+ *               <pattern value="[0-9]{1,4}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="dhRetorno" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+ *         <element name="xObs" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <minLength value="1"/>
+ *               <maxLength value="255"/>
+ *               <whiteSpace value="collapse"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerConsStat" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlRootElement(name = "retConsStatServBPe") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "retConsStatServBPe", propOrder = { + "tpAmb", + "verAplic", + "cStat", + "xMotivo", + "cuf", + "dhRecbto", + "tMed", + "dhRetorno", + "xObs" +}) +public class TRetConsStatServ { + + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(required = true) + protected String verAplic; + @XmlElement(required = true) + protected String cStat; + @XmlElement(required = true) + protected String xMotivo; + @XmlElement(name = "cUF", required = true) + protected String cuf; + @XmlElement(required = true) + protected String dhRecbto; + protected BigInteger tMed; + protected String dhRetorno; + protected String xObs; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade verAplic. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVerAplic() { + return verAplic; + } + + /** + * Define o valor da propriedade verAplic. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVerAplic(String value) { + this.verAplic = value; + } + + /** + * Obtém o valor da propriedade cStat. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCStat() { + return cStat; + } + + /** + * Define o valor da propriedade cStat. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCStat(String value) { + this.cStat = value; + } + + /** + * Obtém o valor da propriedade xMotivo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMotivo() { + return xMotivo; + } + + /** + * Define o valor da propriedade xMotivo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMotivo(String value) { + this.xMotivo = value; + } + + /** + * Obtém o valor da propriedade cuf. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCUF() { + return cuf; + } + + /** + * Define o valor da propriedade cuf. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCUF(String value) { + this.cuf = value; + } + + /** + * Obtém o valor da propriedade dhRecbto. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhRecbto() { + return dhRecbto; + } + + /** + * Define o valor da propriedade dhRecbto. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhRecbto(String value) { + this.dhRecbto = value; + } + + /** + * Obtém o valor da propriedade tMed. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getTMed() { + return tMed; + } + + /** + * Define o valor da propriedade tMed. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setTMed(BigInteger value) { + this.tMed = value; + } + + /** + * Obtém o valor da propriedade dhRetorno. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhRetorno() { + return dhRetorno; + } + + /** + * Define o valor da propriedade dhRetorno. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhRetorno(String value) { + this.dhRetorno = value; + } + + /** + * Obtém o valor da propriedade xObs. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXObs() { + return xObs; + } + + /** + * Define o valor da propriedade xObs. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXObs(String value) { + this.xObs = value; + } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TRetEvento.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TRetEvento.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/TRetEvento.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TRetEvento.java index a926e9903..54294d30e 100644 --- a/src/br/inf/portalfiscal/bpe/TRetEvento.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TRetEvento.java @@ -1,571 +1,571 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.29 às 06:11:44 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.w3._2000._09.xmldsig_.SignatureType; - - -/** - * Tipo retorno do Evento - * - *

Classe Java de TRetEvento complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TRetEvento">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="infEvento">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *                   <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
- *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
- *                   <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
- *                   <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
- *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
- *                   <element name="tpEvento" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[0-9]{6}"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="xEvento" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                         <minLength value="4"/>
- *                         <maxLength value="60"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="nSeqEvento" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
- *                   <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
- *                 </sequence>
- *                 <attribute name="Id">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
- *                       <pattern value="ID[0-9]{15}"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="versao" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.portalfiscal.inf.br/bpe}TVerEvento">
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlRootElement(name = "retEventoBPe") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "retEventoBPe", propOrder = { - "infEvento", -// "signature" -}) -public class TRetEvento { - - @XmlElement(required = true) - protected TRetEvento.InfEvento infEvento; -// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") -// protected SignatureType signature; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade infEvento. - * - * @return - * possible object is - * {@link TRetEvento.InfEvento } - * - */ - public TRetEvento.InfEvento getInfEvento() { - return infEvento; - } - - /** - * Define o valor da propriedade infEvento. - * - * @param value - * allowed object is - * {@link TRetEvento.InfEvento } - * - */ - public void setInfEvento(TRetEvento.InfEvento value) { - this.infEvento = value; - } - - /** - * Obtém o valor da propriedade signature. - * - * @return - * possible object is - * {@link SignatureType } - * - */ -// public SignatureType getSignature() { -// return signature; -// } - - /** - * Define o valor da propriedade signature. - * - * @param value - * allowed object is - * {@link SignatureType } - * - */ -// public void setSignature(SignatureType value) { -// this.signature = value; -// } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-     *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
-     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
-     *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
-     *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
-     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
-     *         <element name="tpEvento" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[0-9]{6}"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="xEvento" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *               <minLength value="4"/>
-     *               <maxLength value="60"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="nSeqEvento" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
-     *         <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
-     *       </sequence>
-     *       <attribute name="Id">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
-     *             <pattern value="ID[0-9]{15}"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "tpAmb", - "verAplic", - "cOrgao", - "cStat", - "xMotivo", - "chBPe", - "tpEvento", - "xEvento", - "nSeqEvento", - "dhRegEvento", - "nProt" - }) - public static class InfEvento { - - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(required = true) - protected String verAplic; - @XmlElement(required = true) - protected String cOrgao; - @XmlElement(required = true) - protected String cStat; - @XmlElement(required = true) - protected String xMotivo; - protected String chBPe; - protected String tpEvento; - protected String xEvento; - protected String nSeqEvento; - protected String dhRegEvento; - protected String nProt; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - protected String id; - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade verAplic. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVerAplic() { - return verAplic; - } - - /** - * Define o valor da propriedade verAplic. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVerAplic(String value) { - this.verAplic = value; - } - - /** - * Obtém o valor da propriedade cOrgao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCOrgao() { - return cOrgao; - } - - /** - * Define o valor da propriedade cOrgao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCOrgao(String value) { - this.cOrgao = value; - } - - /** - * Obtém o valor da propriedade cStat. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCStat() { - return cStat; - } - - /** - * Define o valor da propriedade cStat. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCStat(String value) { - this.cStat = value; - } - - /** - * Obtém o valor da propriedade xMotivo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMotivo() { - return xMotivo; - } - - /** - * Define o valor da propriedade xMotivo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMotivo(String value) { - this.xMotivo = value; - } - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade tpEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpEvento() { - return tpEvento; - } - - /** - * Define o valor da propriedade tpEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpEvento(String value) { - this.tpEvento = value; - } - - /** - * Obtém o valor da propriedade xEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXEvento() { - return xEvento; - } - - /** - * Define o valor da propriedade xEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXEvento(String value) { - this.xEvento = value; - } - - /** - * Obtém o valor da propriedade nSeqEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSeqEvento() { - return nSeqEvento; - } - - /** - * Define o valor da propriedade nSeqEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSeqEvento(String value) { - this.nSeqEvento = value; - } - - /** - * Obtém o valor da propriedade dhRegEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhRegEvento() { - return dhRegEvento; - } - - /** - * Define o valor da propriedade dhRegEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhRegEvento(String value) { - this.dhRegEvento = value; - } - - /** - * Obtém o valor da propriedade nProt. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNProt() { - return nProt; - } - - /** - * Define o valor da propriedade nProt. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNProt(String value) { - this.nProt = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.29 às 06:11:44 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.w3._2000._09.xmldsig_.SignatureType; + + +/** + * Tipo retorno do Evento + * + *

Classe Java de TRetEvento complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TRetEvento">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="infEvento">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *                   <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+ *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+ *                   <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
+ *                   <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+ *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
+ *                   <element name="tpEvento" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[0-9]{6}"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="xEvento" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                         <minLength value="4"/>
+ *                         <maxLength value="60"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="nSeqEvento" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+ *                   <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
+ *                 </sequence>
+ *                 <attribute name="Id">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+ *                       <pattern value="ID[0-9]{15}"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.portalfiscal.inf.br/bpe}TVerEvento">
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlRootElement(name = "retEventoBPe") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "retEventoBPe", propOrder = { + "infEvento", +// "signature" +}) +public class TRetEvento { + + @XmlElement(required = true) + protected TRetEvento.InfEvento infEvento; +// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") +// protected SignatureType signature; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade infEvento. + * + * @return + * possible object is + * {@link TRetEvento.InfEvento } + * + */ + public TRetEvento.InfEvento getInfEvento() { + return infEvento; + } + + /** + * Define o valor da propriedade infEvento. + * + * @param value + * allowed object is + * {@link TRetEvento.InfEvento } + * + */ + public void setInfEvento(TRetEvento.InfEvento value) { + this.infEvento = value; + } + + /** + * Obtém o valor da propriedade signature. + * + * @return + * possible object is + * {@link SignatureType } + * + */ +// public SignatureType getSignature() { +// return signature; +// } + + /** + * Define o valor da propriedade signature. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ +// public void setSignature(SignatureType value) { +// this.signature = value; +// } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+     *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+     *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
+     *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
+     *         <element name="tpEvento" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[0-9]{6}"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="xEvento" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *               <minLength value="4"/>
+     *               <maxLength value="60"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="nSeqEvento" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+     *         <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
+     *       </sequence>
+     *       <attribute name="Id">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+     *             <pattern value="ID[0-9]{15}"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "tpAmb", + "verAplic", + "cOrgao", + "cStat", + "xMotivo", + "chBPe", + "tpEvento", + "xEvento", + "nSeqEvento", + "dhRegEvento", + "nProt" + }) + public static class InfEvento { + + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(required = true) + protected String verAplic; + @XmlElement(required = true) + protected String cOrgao; + @XmlElement(required = true) + protected String cStat; + @XmlElement(required = true) + protected String xMotivo; + protected String chBPe; + protected String tpEvento; + protected String xEvento; + protected String nSeqEvento; + protected String dhRegEvento; + protected String nProt; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + protected String id; + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade verAplic. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVerAplic() { + return verAplic; + } + + /** + * Define o valor da propriedade verAplic. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVerAplic(String value) { + this.verAplic = value; + } + + /** + * Obtém o valor da propriedade cOrgao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCOrgao() { + return cOrgao; + } + + /** + * Define o valor da propriedade cOrgao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCOrgao(String value) { + this.cOrgao = value; + } + + /** + * Obtém o valor da propriedade cStat. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCStat() { + return cStat; + } + + /** + * Define o valor da propriedade cStat. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCStat(String value) { + this.cStat = value; + } + + /** + * Obtém o valor da propriedade xMotivo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMotivo() { + return xMotivo; + } + + /** + * Define o valor da propriedade xMotivo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMotivo(String value) { + this.xMotivo = value; + } + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade tpEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpEvento() { + return tpEvento; + } + + /** + * Define o valor da propriedade tpEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpEvento(String value) { + this.tpEvento = value; + } + + /** + * Obtém o valor da propriedade xEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXEvento() { + return xEvento; + } + + /** + * Define o valor da propriedade xEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXEvento(String value) { + this.xEvento = value; + } + + /** + * Obtém o valor da propriedade nSeqEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSeqEvento() { + return nSeqEvento; + } + + /** + * Define o valor da propriedade nSeqEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSeqEvento(String value) { + this.nSeqEvento = value; + } + + /** + * Obtém o valor da propriedade dhRegEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhRegEvento() { + return dhRegEvento; + } + + /** + * Define o valor da propriedade dhRegEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhRegEvento(String value) { + this.dhRegEvento = value; + } + + /** + * Obtém o valor da propriedade nProt. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNProt() { + return nProt; + } + + /** + * Define o valor da propriedade nProt. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNProt(String value) { + this.nProt = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TUf.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TUf.java similarity index 95% rename from src/br/inf/portalfiscal/bpe/TUf.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TUf.java index 0a6df4593..d0099be44 100644 --- a/src/br/inf/portalfiscal/bpe/TUf.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TUf.java @@ -1,98 +1,98 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Classe Java de TUf. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - *

- *

- * <simpleType name="TUf">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <whiteSpace value="preserve"/>
- *     <enumeration value="AC"/>
- *     <enumeration value="AL"/>
- *     <enumeration value="AM"/>
- *     <enumeration value="AP"/>
- *     <enumeration value="BA"/>
- *     <enumeration value="CE"/>
- *     <enumeration value="DF"/>
- *     <enumeration value="ES"/>
- *     <enumeration value="GO"/>
- *     <enumeration value="MA"/>
- *     <enumeration value="MG"/>
- *     <enumeration value="MS"/>
- *     <enumeration value="MT"/>
- *     <enumeration value="PA"/>
- *     <enumeration value="PB"/>
- *     <enumeration value="PE"/>
- *     <enumeration value="PI"/>
- *     <enumeration value="PR"/>
- *     <enumeration value="RJ"/>
- *     <enumeration value="RN"/>
- *     <enumeration value="RO"/>
- *     <enumeration value="RR"/>
- *     <enumeration value="RS"/>
- *     <enumeration value="SC"/>
- *     <enumeration value="SE"/>
- *     <enumeration value="SP"/>
- *     <enumeration value="TO"/>
- *     <enumeration value="EX"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlType(name = "TUf") -@XmlEnum -public enum TUf { - - AC, - AL, - AM, - AP, - BA, - CE, - DF, - ES, - GO, - MA, - MG, - MS, - MT, - PA, - PB, - PE, - PI, - PR, - RJ, - RN, - RO, - RR, - RS, - SC, - SE, - SP, - TO, - EX; - - public String value() { - return name(); - } - - public static TUf fromValue(String v) { - return valueOf(v); - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Classe Java de TUf. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + *

+ *

+ * <simpleType name="TUf">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <whiteSpace value="preserve"/>
+ *     <enumeration value="AC"/>
+ *     <enumeration value="AL"/>
+ *     <enumeration value="AM"/>
+ *     <enumeration value="AP"/>
+ *     <enumeration value="BA"/>
+ *     <enumeration value="CE"/>
+ *     <enumeration value="DF"/>
+ *     <enumeration value="ES"/>
+ *     <enumeration value="GO"/>
+ *     <enumeration value="MA"/>
+ *     <enumeration value="MG"/>
+ *     <enumeration value="MS"/>
+ *     <enumeration value="MT"/>
+ *     <enumeration value="PA"/>
+ *     <enumeration value="PB"/>
+ *     <enumeration value="PE"/>
+ *     <enumeration value="PI"/>
+ *     <enumeration value="PR"/>
+ *     <enumeration value="RJ"/>
+ *     <enumeration value="RN"/>
+ *     <enumeration value="RO"/>
+ *     <enumeration value="RR"/>
+ *     <enumeration value="RS"/>
+ *     <enumeration value="SC"/>
+ *     <enumeration value="SE"/>
+ *     <enumeration value="SP"/>
+ *     <enumeration value="TO"/>
+ *     <enumeration value="EX"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlType(name = "TUf") +@XmlEnum +public enum TUf { + + AC, + AL, + AM, + AP, + BA, + CE, + DF, + ES, + GO, + MA, + MG, + MS, + MT, + PA, + PB, + PE, + PI, + PR, + RJ, + RN, + RO, + RR, + RS, + SC, + SE, + SP, + TO, + EX; + + public String value() { + return name(); + } + + public static TUf fromValue(String v) { + return valueOf(v); + } + +} diff --git a/src/br/inf/portalfiscal/bpe/TUfSemEX.java b/ModelWeb/src/br/inf/portalfiscal/bpe/TUfSemEX.java similarity index 95% rename from src/br/inf/portalfiscal/bpe/TUfSemEX.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/TUfSemEX.java index b74b2a49d..6ca4dd80b 100644 --- a/src/br/inf/portalfiscal/bpe/TUfSemEX.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/TUfSemEX.java @@ -1,96 +1,96 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Classe Java de TUf_sem_EX. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - *

- *

- * <simpleType name="TUf_sem_EX">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <whiteSpace value="preserve"/>
- *     <enumeration value="AC"/>
- *     <enumeration value="AL"/>
- *     <enumeration value="AM"/>
- *     <enumeration value="AP"/>
- *     <enumeration value="BA"/>
- *     <enumeration value="CE"/>
- *     <enumeration value="DF"/>
- *     <enumeration value="ES"/>
- *     <enumeration value="GO"/>
- *     <enumeration value="MA"/>
- *     <enumeration value="MG"/>
- *     <enumeration value="MS"/>
- *     <enumeration value="MT"/>
- *     <enumeration value="PA"/>
- *     <enumeration value="PB"/>
- *     <enumeration value="PE"/>
- *     <enumeration value="PI"/>
- *     <enumeration value="PR"/>
- *     <enumeration value="RJ"/>
- *     <enumeration value="RN"/>
- *     <enumeration value="RO"/>
- *     <enumeration value="RR"/>
- *     <enumeration value="RS"/>
- *     <enumeration value="SC"/>
- *     <enumeration value="SE"/>
- *     <enumeration value="SP"/>
- *     <enumeration value="TO"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlType(name = "TUf_sem_EX") -@XmlEnum -public enum TUfSemEX { - - AC, - AL, - AM, - AP, - BA, - CE, - DF, - ES, - GO, - MA, - MG, - MS, - MT, - PA, - PB, - PE, - PI, - PR, - RJ, - RN, - RO, - RR, - RS, - SC, - SE, - SP, - TO; - - public String value() { - return name(); - } - - public static TUfSemEX fromValue(String v) { - return valueOf(v); - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Classe Java de TUf_sem_EX. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + *

+ *

+ * <simpleType name="TUf_sem_EX">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <whiteSpace value="preserve"/>
+ *     <enumeration value="AC"/>
+ *     <enumeration value="AL"/>
+ *     <enumeration value="AM"/>
+ *     <enumeration value="AP"/>
+ *     <enumeration value="BA"/>
+ *     <enumeration value="CE"/>
+ *     <enumeration value="DF"/>
+ *     <enumeration value="ES"/>
+ *     <enumeration value="GO"/>
+ *     <enumeration value="MA"/>
+ *     <enumeration value="MG"/>
+ *     <enumeration value="MS"/>
+ *     <enumeration value="MT"/>
+ *     <enumeration value="PA"/>
+ *     <enumeration value="PB"/>
+ *     <enumeration value="PE"/>
+ *     <enumeration value="PI"/>
+ *     <enumeration value="PR"/>
+ *     <enumeration value="RJ"/>
+ *     <enumeration value="RN"/>
+ *     <enumeration value="RO"/>
+ *     <enumeration value="RR"/>
+ *     <enumeration value="RS"/>
+ *     <enumeration value="SC"/>
+ *     <enumeration value="SE"/>
+ *     <enumeration value="SP"/>
+ *     <enumeration value="TO"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlType(name = "TUf_sem_EX") +@XmlEnum +public enum TUfSemEX { + + AC, + AL, + AM, + AP, + BA, + CE, + DF, + ES, + GO, + MA, + MG, + MS, + MT, + PA, + PB, + PE, + PI, + PR, + RJ, + RN, + RO, + RR, + RS, + SC, + SE, + SP, + TO; + + public String value() { + return name(); + } + + public static TUfSemEX fromValue(String v) { + return valueOf(v); + } + +} diff --git a/src/br/inf/portalfiscal/bpe/evento/TEvento.java b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/TEvento.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/evento/TEvento.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/evento/TEvento.java index 2456d4c73..98e29ef77 100644 --- a/src/br/inf/portalfiscal/bpe/evento/TEvento.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/TEvento.java @@ -1,599 +1,599 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.29 às 06:11:44 PM BRT -// - - -package br.inf.portalfiscal.bpe.evento; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.w3c.dom.Element; - - -/** - * Tipo Evento - * - *

Classe Java de TEvento complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TEvento">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="infEvento">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
- *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
- *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
- *                   <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
- *                   <element name="tpEvento">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[0-9]{6}"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="nSeqEvento">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="detEvento">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <any processContents='skip'/>
- *                           </sequence>
- *                           <attribute name="versaoEvento" use="required">
- *                             <simpleType>
- *                               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                                 <whiteSpace value="preserve"/>
- *                                 <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
- *                               </restriction>
- *                             </simpleType>
- *                           </attribute>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="Id" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
- *                       <pattern value="ID[0-9]{52}"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
- *       </sequence>
- *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerEvento" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TEvento", propOrder = { - "infEvento", -// "signature" -}) -@XmlRootElement(name = "eventoBPe") -public class TEvento { - - @XmlElement(required = true) - protected TEvento.InfEvento infEvento; -// @XmlElement(name = "Signature" required = true) -// protected SignatureType signature; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade infEvento. - * - * @return - * possible object is - * {@link TEvento.InfEvento } - * - */ - public TEvento.InfEvento getInfEvento() { - return infEvento; - } - - /** - * Define o valor da propriedade infEvento. - * - * @param value - * allowed object is - * {@link TEvento.InfEvento } - * - */ - public void setInfEvento(TEvento.InfEvento value) { - this.infEvento = value; - } - - /** - * Obtém o valor da propriedade signature. - * - * @return - * possible object is - * {@link SignatureType } - * - */ -// public SignatureType getSignature() { -// return signature; -// } - - /** - * Define o valor da propriedade signature. - * - * @param value - * allowed object is - * {@link SignatureType } - * - */ -// public void setSignature(SignatureType value) { -// this.signature = value; -// } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
-     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-     *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
-     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
-     *         <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
-     *         <element name="tpEvento">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[0-9]{6}"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="nSeqEvento">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="detEvento">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <any processContents='skip'/>
-     *                 </sequence>
-     *                 <attribute name="versaoEvento" use="required">
-     *                   <simpleType>
-     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                       <whiteSpace value="preserve"/>
-     *                       <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
-     *                     </restriction>
-     *                   </simpleType>
-     *                 </attribute>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="Id" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
-     *             <pattern value="ID[0-9]{52}"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "cOrgao", - "tpAmb", - "cnpj", - "chBPe", - "dhEvento", - "tpEvento", - "nSeqEvento", - "detEvento" - }) - public static class InfEvento { - - @XmlElement(required = true) - protected String cOrgao; - @XmlElement(required = true) - protected String tpAmb; - @XmlElement(name = "CNPJ", required = true) - protected String cnpj; - @XmlElement(required = true) - protected String chBPe; - @XmlElement(required = true) - protected String dhEvento; - @XmlElement(required = true) - protected String tpEvento; - @XmlElement(required = true) - protected String nSeqEvento; - @XmlElement(required = true) - protected TEvento.InfEvento.DetEvento detEvento; - @XmlAttribute(name = "Id", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - protected String id; - - /** - * Obtém o valor da propriedade cOrgao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCOrgao() { - return cOrgao; - } - - /** - * Define o valor da propriedade cOrgao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCOrgao(String value) { - this.cOrgao = value; - } - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade cnpj. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCNPJ() { - return cnpj; - } - - /** - * Define o valor da propriedade cnpj. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCNPJ(String value) { - this.cnpj = value; - } - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade dhEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhEvento() { - return dhEvento; - } - - /** - * Define o valor da propriedade dhEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhEvento(String value) { - this.dhEvento = value; - } - - /** - * Obtém o valor da propriedade tpEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpEvento() { - return tpEvento; - } - - /** - * Define o valor da propriedade tpEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpEvento(String value) { - this.tpEvento = value; - } - - /** - * Obtém o valor da propriedade nSeqEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSeqEvento() { - return nSeqEvento; - } - - /** - * Define o valor da propriedade nSeqEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSeqEvento(String value) { - this.nSeqEvento = value; - } - - /** - * Obtém o valor da propriedade detEvento. - * - * @return - * possible object is - * {@link TEvento.InfEvento.DetEvento } - * - */ - public TEvento.InfEvento.DetEvento getDetEvento() { - return detEvento; - } - - /** - * Define o valor da propriedade detEvento. - * - * @param value - * allowed object is - * {@link TEvento.InfEvento.DetEvento } - * - */ - public void setDetEvento(TEvento.InfEvento.DetEvento value) { - this.detEvento = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <any processContents='skip'/>
-         *       </sequence>
-         *       <attribute name="versaoEvento" use="required">
-         *         <simpleType>
-         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *             <whiteSpace value="preserve"/>
-         *             <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
-         *           </restriction>
-         *         </simpleType>
-         *       </attribute>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "any" - }) - public static class DetEvento { - - @XmlAnyElement - protected Element any; - @XmlAttribute(name = "versaoEvento", required = true) - protected String versaoEvento; - - - /** - * Obtém o valor da propriedade any. - * - * @return - * possible object is - * {@link Element } - * - */ - public Element getAny() { - return any; - } - - /** - * Define o valor da propriedade any. - * - * @param value - * allowed object is - * {@link Element } - * - */ - public void setAny(Element value) { - this.any = value; - } - - /** - * Obtém o valor da propriedade versaoEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersaoEvento() { - return versaoEvento; - } - - /** - * Define o valor da propriedade versaoEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersaoEvento(String value) { - this.versaoEvento = value; - } - - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.29 às 06:11:44 PM BRT +// + + +package br.inf.portalfiscal.bpe.evento; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import org.w3c.dom.Element; + + +/** + * Tipo Evento + * + *

Classe Java de TEvento complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TEvento">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="infEvento">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+ *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *                   <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+ *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+ *                   <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+ *                   <element name="tpEvento">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[0-9]{6}"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="nSeqEvento">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="detEvento">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <any processContents='skip'/>
+ *                           </sequence>
+ *                           <attribute name="versaoEvento" use="required">
+ *                             <simpleType>
+ *                               <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                                 <whiteSpace value="preserve"/>
+ *                                 <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
+ *                               </restriction>
+ *                             </simpleType>
+ *                           </attribute>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="Id" use="required">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+ *                       <pattern value="ID[0-9]{52}"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required" type="{http://www.portalfiscal.inf.br/bpe}TVerEvento" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TEvento", propOrder = { + "infEvento", +// "signature" +}) +@XmlRootElement(name = "eventoBPe") +public class TEvento { + + @XmlElement(required = true) + protected TEvento.InfEvento infEvento; +// @XmlElement(name = "Signature" required = true) +// protected SignatureType signature; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade infEvento. + * + * @return + * possible object is + * {@link TEvento.InfEvento } + * + */ + public TEvento.InfEvento getInfEvento() { + return infEvento; + } + + /** + * Define o valor da propriedade infEvento. + * + * @param value + * allowed object is + * {@link TEvento.InfEvento } + * + */ + public void setInfEvento(TEvento.InfEvento value) { + this.infEvento = value; + } + + /** + * Obtém o valor da propriedade signature. + * + * @return + * possible object is + * {@link SignatureType } + * + */ +// public SignatureType getSignature() { +// return signature; +// } + + /** + * Define o valor da propriedade signature. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ +// public void setSignature(SignatureType value) { +// this.signature = value; +// } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+     *         <element name="CNPJ" type="{http://www.portalfiscal.inf.br/bpe}TCnpj"/>
+     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe"/>
+     *         <element name="dhEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC"/>
+     *         <element name="tpEvento">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[0-9]{6}"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="nSeqEvento">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="detEvento">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <any processContents='skip'/>
+     *                 </sequence>
+     *                 <attribute name="versaoEvento" use="required">
+     *                   <simpleType>
+     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *                       <whiteSpace value="preserve"/>
+     *                       <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
+     *                     </restriction>
+     *                   </simpleType>
+     *                 </attribute>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="Id" use="required">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+     *             <pattern value="ID[0-9]{52}"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "cOrgao", + "tpAmb", + "cnpj", + "chBPe", + "dhEvento", + "tpEvento", + "nSeqEvento", + "detEvento" + }) + public static class InfEvento { + + @XmlElement(required = true) + protected String cOrgao; + @XmlElement(required = true) + protected String tpAmb; + @XmlElement(name = "CNPJ", required = true) + protected String cnpj; + @XmlElement(required = true) + protected String chBPe; + @XmlElement(required = true) + protected String dhEvento; + @XmlElement(required = true) + protected String tpEvento; + @XmlElement(required = true) + protected String nSeqEvento; + @XmlElement(required = true) + protected TEvento.InfEvento.DetEvento detEvento; + @XmlAttribute(name = "Id", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + protected String id; + + /** + * Obtém o valor da propriedade cOrgao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCOrgao() { + return cOrgao; + } + + /** + * Define o valor da propriedade cOrgao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCOrgao(String value) { + this.cOrgao = value; + } + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade cnpj. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCNPJ() { + return cnpj; + } + + /** + * Define o valor da propriedade cnpj. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCNPJ(String value) { + this.cnpj = value; + } + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade dhEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhEvento() { + return dhEvento; + } + + /** + * Define o valor da propriedade dhEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhEvento(String value) { + this.dhEvento = value; + } + + /** + * Obtém o valor da propriedade tpEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpEvento() { + return tpEvento; + } + + /** + * Define o valor da propriedade tpEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpEvento(String value) { + this.tpEvento = value; + } + + /** + * Obtém o valor da propriedade nSeqEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSeqEvento() { + return nSeqEvento; + } + + /** + * Define o valor da propriedade nSeqEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSeqEvento(String value) { + this.nSeqEvento = value; + } + + /** + * Obtém o valor da propriedade detEvento. + * + * @return + * possible object is + * {@link TEvento.InfEvento.DetEvento } + * + */ + public TEvento.InfEvento.DetEvento getDetEvento() { + return detEvento; + } + + /** + * Define o valor da propriedade detEvento. + * + * @param value + * allowed object is + * {@link TEvento.InfEvento.DetEvento } + * + */ + public void setDetEvento(TEvento.InfEvento.DetEvento value) { + this.detEvento = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <any processContents='skip'/>
+         *       </sequence>
+         *       <attribute name="versaoEvento" use="required">
+         *         <simpleType>
+         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+         *             <whiteSpace value="preserve"/>
+         *             <pattern value="1\.(0[0-9]|[1-9][0-9])"/>
+         *           </restriction>
+         *         </simpleType>
+         *       </attribute>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
+         * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "any" + }) + public static class DetEvento { + + @XmlAnyElement + protected Element any; + @XmlAttribute(name = "versaoEvento", required = true) + protected String versaoEvento; + + + /** + * Obtém o valor da propriedade any. + * + * @return + * possible object is + * {@link Element } + * + */ + public Element getAny() { + return any; + } + + /** + * Define o valor da propriedade any. + * + * @param value + * allowed object is + * {@link Element } + * + */ + public void setAny(Element value) { + this.any = value; + } + + /** + * Obtém o valor da propriedade versaoEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersaoEvento() { + return versaoEvento; + } + + /** + * Define o valor da propriedade versaoEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersaoEvento(String value) { + this.versaoEvento = value; + } + + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/evento/TEventoMsg.java b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/TEventoMsg.java similarity index 95% rename from src/br/inf/portalfiscal/bpe/evento/TEventoMsg.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/evento/TEventoMsg.java index 524557f4a..ef789d388 100644 --- a/src/br/inf/portalfiscal/bpe/evento/TEventoMsg.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/TEventoMsg.java @@ -1,47 +1,47 @@ -package br.inf.portalfiscal.bpe.evento; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TEventoMsg", propOrder = { - "eventoBPe", - "xmlns" -}) -@XmlRootElement(name = "bpeDadosMsg") -public class TEventoMsg { - @XmlElement(required = true) - protected TEvento eventoBPe; - - @XmlAttribute(name = "xmlns", required = true) - protected String xmlns; - - public TEventoMsg() { - super(); - } - - public TEventoMsg(TEvento eventoBPe) { - super(); - this.eventoBPe = eventoBPe; - } - - public TEvento getEventoBPe() { - return eventoBPe; - } - - public void setEventoBPe(TEvento eventoBPe) { - this.eventoBPe = eventoBPe; - } - - public String getXmlns() { - return xmlns; - } - - public void setXmlns(String xmlns) { - this.xmlns = xmlns; - } -} +package br.inf.portalfiscal.bpe.evento; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TEventoMsg", propOrder = { + "eventoBPe", + "xmlns" +}) +@XmlRootElement(name = "bpeDadosMsg") +public class TEventoMsg { + @XmlElement(required = true) + protected TEvento eventoBPe; + + @XmlAttribute(name = "xmlns", required = true) + protected String xmlns; + + public TEventoMsg() { + super(); + } + + public TEventoMsg(TEvento eventoBPe) { + super(); + this.eventoBPe = eventoBPe; + } + + public TEvento getEventoBPe() { + return eventoBPe; + } + + public void setEventoBPe(TEvento eventoBPe) { + this.eventoBPe = eventoBPe; + } + + public String getXmlns() { + return xmlns; + } + + public void setXmlns(String xmlns) { + this.xmlns = xmlns; + } +} diff --git a/src/br/inf/portalfiscal/bpe/evento/TRetEvento.java b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/TRetEvento.java similarity index 96% rename from src/br/inf/portalfiscal/bpe/evento/TRetEvento.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/evento/TRetEvento.java index a97e3712e..3cfceb482 100644 --- a/src/br/inf/portalfiscal/bpe/evento/TRetEvento.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/TRetEvento.java @@ -1,568 +1,568 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.29 às 06:11:44 PM BRT -// - - -package br.inf.portalfiscal.bpe.evento; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - * Tipo retorno do Evento - * - *

Classe Java de TRetEvento complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TRetEvento">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="infEvento">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
- *                   <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
- *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
- *                   <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
- *                   <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
- *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
- *                   <element name="tpEvento" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[0-9]{6}"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="xEvento" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
- *                         <minLength value="4"/>
- *                         <maxLength value="60"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="nSeqEvento" minOccurs="0">
- *                     <simpleType>
- *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                         <whiteSpace value="preserve"/>
- *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
- *                       </restriction>
- *                     </simpleType>
- *                   </element>
- *                   <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
- *                   <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
- *                 </sequence>
- *                 <attribute name="Id">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
- *                       <pattern value="ID[0-9]{15}"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="versao" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.portalfiscal.inf.br/bpe}TVerEvento">
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TRetEvento", propOrder = { - "infEvento", -// "signature" -}) -public class TRetEvento { - - @XmlElement(name = "infEvento", required = true) - protected TRetEvento.InfEvento infEvento; -// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") -// protected SignatureType signature; - @XmlAttribute(name = "versao", required = true) - protected String versao; - - /** - * Obtém o valor da propriedade infEvento. - * - * @return - * possible object is - * {@link TRetEvento.InfEvento } - * - */ - public TRetEvento.InfEvento getInfEvento() { - return infEvento; - } - - /** - * Define o valor da propriedade infEvento. - * - * @param value - * allowed object is - * {@link TRetEvento.InfEvento } - * - */ - public void setInfEvento(TRetEvento.InfEvento value) { - this.infEvento = value; - } - - /** - * Obtém o valor da propriedade signature. - * - * @return - * possible object is - * {@link SignatureType } - * - */ -// public SignatureType getSignature() { -// return signature; -// } - - /** - * Define o valor da propriedade signature. - * - * @param value - * allowed object is - * {@link SignatureType } - * - */ -// public void setSignature(SignatureType value) { -// this.signature = value; -// } - - /** - * Obtém o valor da propriedade versao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersao() { - return versao; - } - - /** - * Define o valor da propriedade versao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersao(String value) { - this.versao = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
-     *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
-     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
-     *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
-     *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
-     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
-     *         <element name="tpEvento" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[0-9]{6}"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="xEvento" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
-     *               <minLength value="4"/>
-     *               <maxLength value="60"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="nSeqEvento" minOccurs="0">
-     *           <simpleType>
-     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *               <whiteSpace value="preserve"/>
-     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
-     *             </restriction>
-     *           </simpleType>
-     *         </element>
-     *         <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
-     *         <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
-     *       </sequence>
-     *       <attribute name="Id">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
-     *             <pattern value="ID[0-9]{15}"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "InfEvento", propOrder = { - "tpAmb", - "verAplic", - "cOrgao", - "cStat", - "xMotivo", - "chBPe", - "tpEvento", - "xEvento", - "nSeqEvento", - "dhRegEvento", - "nProt" - }) - public static class InfEvento { - - @XmlElement(name = "tpAmb", required = true) - protected String tpAmb; - @XmlElement(required = true) - protected String verAplic; - @XmlElement(required = true) - protected String cOrgao; - @XmlElement(name = "cStat", required = true) - protected String cStat; - @XmlElement(name = "xMotivo", required = true) - protected String xMotivo; - protected String chBPe; - protected String tpEvento; - protected String xEvento; - protected String nSeqEvento; - protected String dhRegEvento; - protected String nProt; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - protected String id; - - /** - * Obtém o valor da propriedade tpAmb. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpAmb() { - return tpAmb; - } - - /** - * Define o valor da propriedade tpAmb. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpAmb(String value) { - this.tpAmb = value; - } - - /** - * Obtém o valor da propriedade verAplic. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVerAplic() { - return verAplic; - } - - /** - * Define o valor da propriedade verAplic. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVerAplic(String value) { - this.verAplic = value; - } - - /** - * Obtém o valor da propriedade cOrgao. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCOrgao() { - return cOrgao; - } - - /** - * Define o valor da propriedade cOrgao. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCOrgao(String value) { - this.cOrgao = value; - } - - /** - * Obtém o valor da propriedade cStat. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCStat() { - return cStat; - } - - /** - * Define o valor da propriedade cStat. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCStat(String value) { - this.cStat = value; - } - - /** - * Obtém o valor da propriedade xMotivo. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXMotivo() { - return xMotivo; - } - - /** - * Define o valor da propriedade xMotivo. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXMotivo(String value) { - this.xMotivo = value; - } - - /** - * Obtém o valor da propriedade chBPe. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChBPe() { - return chBPe; - } - - /** - * Define o valor da propriedade chBPe. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChBPe(String value) { - this.chBPe = value; - } - - /** - * Obtém o valor da propriedade tpEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTpEvento() { - return tpEvento; - } - - /** - * Define o valor da propriedade tpEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTpEvento(String value) { - this.tpEvento = value; - } - - /** - * Obtém o valor da propriedade xEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getXEvento() { - return xEvento; - } - - /** - * Define o valor da propriedade xEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setXEvento(String value) { - this.xEvento = value; - } - - /** - * Obtém o valor da propriedade nSeqEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSeqEvento() { - return nSeqEvento; - } - - /** - * Define o valor da propriedade nSeqEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSeqEvento(String value) { - this.nSeqEvento = value; - } - - /** - * Obtém o valor da propriedade dhRegEvento. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDhRegEvento() { - return dhRegEvento; - } - - /** - * Define o valor da propriedade dhRegEvento. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDhRegEvento(String value) { - this.dhRegEvento = value; - } - - /** - * Obtém o valor da propriedade nProt. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNProt() { - return nProt; - } - - /** - * Define o valor da propriedade nProt. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNProt(String value) { - this.nProt = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.29 às 06:11:44 PM BRT +// + + +package br.inf.portalfiscal.bpe.evento; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * Tipo retorno do Evento + * + *

Classe Java de TRetEvento complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TRetEvento">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="infEvento">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+ *                   <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+ *                   <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+ *                   <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
+ *                   <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+ *                   <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
+ *                   <element name="tpEvento" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[0-9]{6}"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="xEvento" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+ *                         <minLength value="4"/>
+ *                         <maxLength value="60"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="nSeqEvento" minOccurs="0">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <whiteSpace value="preserve"/>
+ *                         <pattern value="[1-9][0-9]|0?[1-9]"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </element>
+ *                   <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+ *                   <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
+ *                 </sequence>
+ *                 <attribute name="Id">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+ *                       <pattern value="ID[0-9]{15}"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="versao" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.portalfiscal.inf.br/bpe}TVerEvento">
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TRetEvento", propOrder = { + "infEvento", +// "signature" +}) +public class TRetEvento { + + @XmlElement(name = "infEvento", required = true) + protected TRetEvento.InfEvento infEvento; +// @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") +// protected SignatureType signature; + @XmlAttribute(name = "versao", required = true) + protected String versao; + + /** + * Obtém o valor da propriedade infEvento. + * + * @return + * possible object is + * {@link TRetEvento.InfEvento } + * + */ + public TRetEvento.InfEvento getInfEvento() { + return infEvento; + } + + /** + * Define o valor da propriedade infEvento. + * + * @param value + * allowed object is + * {@link TRetEvento.InfEvento } + * + */ + public void setInfEvento(TRetEvento.InfEvento value) { + this.infEvento = value; + } + + /** + * Obtém o valor da propriedade signature. + * + * @return + * possible object is + * {@link SignatureType } + * + */ +// public SignatureType getSignature() { +// return signature; +// } + + /** + * Define o valor da propriedade signature. + * + * @param value + * allowed object is + * {@link SignatureType } + * + */ +// public void setSignature(SignatureType value) { +// this.signature = value; +// } + + /** + * Obtém o valor da propriedade versao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersao() { + return versao; + } + + /** + * Define o valor da propriedade versao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersao(String value) { + this.versao = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="tpAmb" type="{http://www.portalfiscal.inf.br/bpe}TAmb"/>
+     *         <element name="verAplic" type="{http://www.portalfiscal.inf.br/bpe}TVerAplic"/>
+     *         <element name="cOrgao" type="{http://www.portalfiscal.inf.br/bpe}TCOrgaoIBGE"/>
+     *         <element name="cStat" type="{http://www.portalfiscal.inf.br/bpe}TStat"/>
+     *         <element name="xMotivo" type="{http://www.portalfiscal.inf.br/bpe}TMotivo"/>
+     *         <element name="chBPe" type="{http://www.portalfiscal.inf.br/bpe}TChDFe" minOccurs="0"/>
+     *         <element name="tpEvento" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[0-9]{6}"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="xEvento" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.portalfiscal.inf.br/bpe}TString">
+     *               <minLength value="4"/>
+     *               <maxLength value="60"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="nSeqEvento" minOccurs="0">
+     *           <simpleType>
+     *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *               <whiteSpace value="preserve"/>
+     *               <pattern value="[1-9][0-9]|0?[1-9]"/>
+     *             </restriction>
+     *           </simpleType>
+     *         </element>
+     *         <element name="dhRegEvento" type="{http://www.portalfiscal.inf.br/bpe}TDateTimeUTC" minOccurs="0"/>
+     *         <element name="nProt" type="{http://www.portalfiscal.inf.br/bpe}TProt" minOccurs="0"/>
+     *       </sequence>
+     *       <attribute name="Id">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}ID">
+     *             <pattern value="ID[0-9]{15}"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "InfEvento", propOrder = { + "tpAmb", + "verAplic", + "cOrgao", + "cStat", + "xMotivo", + "chBPe", + "tpEvento", + "xEvento", + "nSeqEvento", + "dhRegEvento", + "nProt" + }) + public static class InfEvento { + + @XmlElement(name = "tpAmb", required = true) + protected String tpAmb; + @XmlElement(required = true) + protected String verAplic; + @XmlElement(required = true) + protected String cOrgao; + @XmlElement(name = "cStat", required = true) + protected String cStat; + @XmlElement(name = "xMotivo", required = true) + protected String xMotivo; + protected String chBPe; + protected String tpEvento; + protected String xEvento; + protected String nSeqEvento; + protected String dhRegEvento; + protected String nProt; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + protected String id; + + /** + * Obtém o valor da propriedade tpAmb. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpAmb() { + return tpAmb; + } + + /** + * Define o valor da propriedade tpAmb. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpAmb(String value) { + this.tpAmb = value; + } + + /** + * Obtém o valor da propriedade verAplic. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVerAplic() { + return verAplic; + } + + /** + * Define o valor da propriedade verAplic. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVerAplic(String value) { + this.verAplic = value; + } + + /** + * Obtém o valor da propriedade cOrgao. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCOrgao() { + return cOrgao; + } + + /** + * Define o valor da propriedade cOrgao. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCOrgao(String value) { + this.cOrgao = value; + } + + /** + * Obtém o valor da propriedade cStat. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCStat() { + return cStat; + } + + /** + * Define o valor da propriedade cStat. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCStat(String value) { + this.cStat = value; + } + + /** + * Obtém o valor da propriedade xMotivo. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXMotivo() { + return xMotivo; + } + + /** + * Define o valor da propriedade xMotivo. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXMotivo(String value) { + this.xMotivo = value; + } + + /** + * Obtém o valor da propriedade chBPe. + * + * @return + * possible object is + * {@link String } + * + */ + public String getChBPe() { + return chBPe; + } + + /** + * Define o valor da propriedade chBPe. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setChBPe(String value) { + this.chBPe = value; + } + + /** + * Obtém o valor da propriedade tpEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTpEvento() { + return tpEvento; + } + + /** + * Define o valor da propriedade tpEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTpEvento(String value) { + this.tpEvento = value; + } + + /** + * Obtém o valor da propriedade xEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getXEvento() { + return xEvento; + } + + /** + * Define o valor da propriedade xEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setXEvento(String value) { + this.xEvento = value; + } + + /** + * Obtém o valor da propriedade nSeqEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSeqEvento() { + return nSeqEvento; + } + + /** + * Define o valor da propriedade nSeqEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSeqEvento(String value) { + this.nSeqEvento = value; + } + + /** + * Obtém o valor da propriedade dhRegEvento. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDhRegEvento() { + return dhRegEvento; + } + + /** + * Define o valor da propriedade dhRegEvento. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDhRegEvento(String value) { + this.dhRegEvento = value; + } + + /** + * Obtém o valor da propriedade nProt. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNProt() { + return nProt; + } + + /** + * Define o valor da propriedade nProt. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNProt(String value) { + this.nProt = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + } + +} diff --git a/src/br/inf/portalfiscal/bpe/evento/package-info.java b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/package-info.java similarity index 97% rename from src/br/inf/portalfiscal/bpe/evento/package-info.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/evento/package-info.java index 19e9483b8..8c592cce1 100644 --- a/src/br/inf/portalfiscal/bpe/evento/package-info.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/evento/package-info.java @@ -1 +1 @@ -package br.inf.portalfiscal.bpe.evento; +package br.inf.portalfiscal.bpe.evento; diff --git a/src/br/inf/portalfiscal/bpe/package-info.java b/ModelWeb/src/br/inf/portalfiscal/bpe/package-info.java similarity index 98% rename from src/br/inf/portalfiscal/bpe/package-info.java rename to ModelWeb/src/br/inf/portalfiscal/bpe/package-info.java index d33a8da63..c2eebede5 100644 --- a/src/br/inf/portalfiscal/bpe/package-info.java +++ b/ModelWeb/src/br/inf/portalfiscal/bpe/package-info.java @@ -1,23 +1,23 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.23 às 03:05:57 PM BRT -// -//@XmlSchema( -// namespace="", -// // If qualified namespace will be added to all elements -// elementFormDefault = XmlNsForm.QUALIFIED, -// // If qualifies namespace will be added to all attributes -// attributeFormDefault = XmlNsForm.UNQUALIFIED, -// xmlns = { -// @XmlNs(prefix = "bpe", namespaceURI = "http://www.portalfiscal.inf.br/bpe"), -//// @XmlNs(prefix = "xsi", namespaceURI = "http://www.portalfiscal.inf.br/bpe"), -// } -//) -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.portalfiscal.inf.br/bpe", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package br.inf.portalfiscal.bpe; - -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.23 às 03:05:57 PM BRT +// +//@XmlSchema( +// namespace="", +// // If qualified namespace will be added to all elements +// elementFormDefault = XmlNsForm.QUALIFIED, +// // If qualifies namespace will be added to all attributes +// attributeFormDefault = XmlNsForm.UNQUALIFIED, +// xmlns = { +// @XmlNs(prefix = "bpe", namespaceURI = "http://www.portalfiscal.inf.br/bpe"), +//// @XmlNs(prefix = "xsi", namespaceURI = "http://www.portalfiscal.inf.br/bpe"), +// } +//) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.portalfiscal.inf.br/bpe", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package br.inf.portalfiscal.bpe; + +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; diff --git a/src/com/rjconsultores/hstcajservice/ws/BilheteService.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BilheteService.java similarity index 97% rename from src/com/rjconsultores/hstcajservice/ws/BilheteService.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BilheteService.java index 87a662553..88534c411 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BilheteService.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BilheteService.java @@ -1,261 +1,261 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.List; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1 - * - */ -@WebService(name = "BilheteService", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/") -@XmlSeeAlso({ - ObjectFactory.class -}) -public interface BilheteService { - - - /** - * - * @param dataFim - * @param codEmpresaGrupo - * @param agenciaInicio - * @param fiscal - * @param dataInicio - * @param codEmpresa - * @param agenciaFim - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "buscarBilhetes", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetes") - @ResponseWrapper(localName = "buscarBilhetesResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetesResponse") - public List buscarBilhetes( - @WebParam(name = "dataInicio", targetNamespace = "") - String dataInicio, - @WebParam(name = "dataFim", targetNamespace = "") - String dataFim, - @WebParam(name = "agenciaInicio", targetNamespace = "") - String agenciaInicio, - @WebParam(name = "agenciaFim", targetNamespace = "") - String agenciaFim, - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo, - @WebParam(name = "codEmpresa", targetNamespace = "") - String codEmpresa, - @WebParam(name = "fiscal", targetNamespace = "") - String fiscal); - - /** - * - * @param dataFim - * @param codEmpresaGrupo - * @param agenciaInicio - * @param fiscal - * @param dataInicio - * @param codEmpresa - * @param agenciaFim - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "buscarBilhetesInconsistente", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetesInconsistente") - @ResponseWrapper(localName = "buscarBilhetesInconsistenteResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetesInconsistenteResponse") - public List buscarBilhetesInconsistente( - @WebParam(name = "dataInicio", targetNamespace = "") - String dataInicio, - @WebParam(name = "dataFim", targetNamespace = "") - String dataFim, - @WebParam(name = "agenciaInicio", targetNamespace = "") - String agenciaInicio, - @WebParam(name = "agenciaFim", targetNamespace = "") - String agenciaFim, - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo, - @WebParam(name = "codEmpresa", targetNamespace = "") - String codEmpresa, - @WebParam(name = "fiscal", targetNamespace = "") - String fiscal); - - /** - * - * @param codEmpresaGrupo - * @param agenciaInicio - * @param codEmpresa - * @param agenciaFim - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadBilheteiro", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBilheteiro") - @ResponseWrapper(localName = "cadBilheteiroResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBilheteiroResponse") - public List cadBilheteiro( - @WebParam(name = "agenciaInicio", targetNamespace = "") - String agenciaInicio, - @WebParam(name = "agenciaFim", targetNamespace = "") - String agenciaFim, - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo, - @WebParam(name = "codEmpresa", targetNamespace = "") - String codEmpresa); - - /** - * - * @param codEmpresaGrupo - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadEstado", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadEstado") - @ResponseWrapper(localName = "cadEstadoResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadEstadoResponse") - public List cadEstado( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo); - - /** - * - * @param codEmpresaGrupo - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadCliente", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadCliente") - @ResponseWrapper(localName = "cadClienteResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadClienteResponse") - public List cadCliente( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo); - - /** - * - * @param codEmpresaGrupo - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadLocalidade", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLocalidade") - @ResponseWrapper(localName = "cadLocalidadeResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLocalidadeResponse") - public List cadLocalidade( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo); - - /** - * - * @param codEmpresaGrupo - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadFormaPagamento", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadFormaPagamento") - @ResponseWrapper(localName = "cadFormaPagamentoResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadFormaPagamentoResponse") - public List cadFormaPagamento( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo); - - /** - * - * @param codEmpresaGrupo - * @param codEmpresa - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadLinha", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLinha") - @ResponseWrapper(localName = "cadLinhaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLinhaResponse") - public List cadLinha( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo, - @WebParam(name = "codEmpresa", targetNamespace = "") - String codEmpresa); - - /** - * - * @param codEmpresaGrupo - * @param codEmpresa - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadBeneficio", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBeneficio") - @ResponseWrapper(localName = "cadBeneficioResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBeneficioResponse") - public List cadBeneficio( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo, - @WebParam(name = "codEmpresa", targetNamespace = "") - String codEmpresa); - - /** - * - * @param codEmpresaGrupo - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadReceitaDespesa", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadReceitaDespesa") - @ResponseWrapper(localName = "cadReceitaDespesaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadReceitaDespesaResponse") - public List cadReceitaDespesa( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo); - - /** - * - * @param codEmpresaGrupo - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "cadAgencia", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadAgencia") - @ResponseWrapper(localName = "cadAgenciaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadAgenciaResponse") - public List cadAgencia( - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo); - - /** - * - * @param dataFim - * @param codEmpresaGrupo - * @param agenciaInicio - * @param dataInicio - * @param codEmpresa - * @param agenciaFim - * @return - * returns java.util.List - */ - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "buscarReceitaDespesa", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarReceitaDespesa") - @ResponseWrapper(localName = "buscarReceitaDespesaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarReceitaDespesaResponse") - public List buscarReceitaDespesa( - @WebParam(name = "dataInicio", targetNamespace = "") - String dataInicio, - @WebParam(name = "dataFim", targetNamespace = "") - String dataFim, - @WebParam(name = "agenciaInicio", targetNamespace = "") - String agenciaInicio, - @WebParam(name = "agenciaFim", targetNamespace = "") - String agenciaFim, - @WebParam(name = "codEmpresaGrupo", targetNamespace = "") - Integer codEmpresaGrupo, - @WebParam(name = "codEmpresa", targetNamespace = "") - String codEmpresa); - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.List; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.6 in JDK 6 + * Generated source version: 2.1 + * + */ +@WebService(name = "BilheteService", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/") +@XmlSeeAlso({ + ObjectFactory.class +}) +public interface BilheteService { + + + /** + * + * @param dataFim + * @param codEmpresaGrupo + * @param agenciaInicio + * @param fiscal + * @param dataInicio + * @param codEmpresa + * @param agenciaFim + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "buscarBilhetes", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetes") + @ResponseWrapper(localName = "buscarBilhetesResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetesResponse") + public List buscarBilhetes( + @WebParam(name = "dataInicio", targetNamespace = "") + String dataInicio, + @WebParam(name = "dataFim", targetNamespace = "") + String dataFim, + @WebParam(name = "agenciaInicio", targetNamespace = "") + String agenciaInicio, + @WebParam(name = "agenciaFim", targetNamespace = "") + String agenciaFim, + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo, + @WebParam(name = "codEmpresa", targetNamespace = "") + String codEmpresa, + @WebParam(name = "fiscal", targetNamespace = "") + String fiscal); + + /** + * + * @param dataFim + * @param codEmpresaGrupo + * @param agenciaInicio + * @param fiscal + * @param dataInicio + * @param codEmpresa + * @param agenciaFim + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "buscarBilhetesInconsistente", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetesInconsistente") + @ResponseWrapper(localName = "buscarBilhetesInconsistenteResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarBilhetesInconsistenteResponse") + public List buscarBilhetesInconsistente( + @WebParam(name = "dataInicio", targetNamespace = "") + String dataInicio, + @WebParam(name = "dataFim", targetNamespace = "") + String dataFim, + @WebParam(name = "agenciaInicio", targetNamespace = "") + String agenciaInicio, + @WebParam(name = "agenciaFim", targetNamespace = "") + String agenciaFim, + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo, + @WebParam(name = "codEmpresa", targetNamespace = "") + String codEmpresa, + @WebParam(name = "fiscal", targetNamespace = "") + String fiscal); + + /** + * + * @param codEmpresaGrupo + * @param agenciaInicio + * @param codEmpresa + * @param agenciaFim + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadBilheteiro", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBilheteiro") + @ResponseWrapper(localName = "cadBilheteiroResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBilheteiroResponse") + public List cadBilheteiro( + @WebParam(name = "agenciaInicio", targetNamespace = "") + String agenciaInicio, + @WebParam(name = "agenciaFim", targetNamespace = "") + String agenciaFim, + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo, + @WebParam(name = "codEmpresa", targetNamespace = "") + String codEmpresa); + + /** + * + * @param codEmpresaGrupo + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadEstado", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadEstado") + @ResponseWrapper(localName = "cadEstadoResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadEstadoResponse") + public List cadEstado( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo); + + /** + * + * @param codEmpresaGrupo + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadCliente", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadCliente") + @ResponseWrapper(localName = "cadClienteResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadClienteResponse") + public List cadCliente( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo); + + /** + * + * @param codEmpresaGrupo + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadLocalidade", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLocalidade") + @ResponseWrapper(localName = "cadLocalidadeResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLocalidadeResponse") + public List cadLocalidade( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo); + + /** + * + * @param codEmpresaGrupo + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadFormaPagamento", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadFormaPagamento") + @ResponseWrapper(localName = "cadFormaPagamentoResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadFormaPagamentoResponse") + public List cadFormaPagamento( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo); + + /** + * + * @param codEmpresaGrupo + * @param codEmpresa + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadLinha", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLinha") + @ResponseWrapper(localName = "cadLinhaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadLinhaResponse") + public List cadLinha( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo, + @WebParam(name = "codEmpresa", targetNamespace = "") + String codEmpresa); + + /** + * + * @param codEmpresaGrupo + * @param codEmpresa + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadBeneficio", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBeneficio") + @ResponseWrapper(localName = "cadBeneficioResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadBeneficioResponse") + public List cadBeneficio( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo, + @WebParam(name = "codEmpresa", targetNamespace = "") + String codEmpresa); + + /** + * + * @param codEmpresaGrupo + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadReceitaDespesa", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadReceitaDespesa") + @ResponseWrapper(localName = "cadReceitaDespesaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadReceitaDespesaResponse") + public List cadReceitaDespesa( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo); + + /** + * + * @param codEmpresaGrupo + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "cadAgencia", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadAgencia") + @ResponseWrapper(localName = "cadAgenciaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.CadAgenciaResponse") + public List cadAgencia( + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo); + + /** + * + * @param dataFim + * @param codEmpresaGrupo + * @param agenciaInicio + * @param dataInicio + * @param codEmpresa + * @param agenciaFim + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "buscarReceitaDespesa", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarReceitaDespesa") + @ResponseWrapper(localName = "buscarReceitaDespesaResponse", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", className = "com.rjconsultores.hstcajservice.ws.BuscarReceitaDespesaResponse") + public List buscarReceitaDespesa( + @WebParam(name = "dataInicio", targetNamespace = "") + String dataInicio, + @WebParam(name = "dataFim", targetNamespace = "") + String dataFim, + @WebParam(name = "agenciaInicio", targetNamespace = "") + String agenciaInicio, + @WebParam(name = "agenciaFim", targetNamespace = "") + String agenciaFim, + @WebParam(name = "codEmpresaGrupo", targetNamespace = "") + Integer codEmpresaGrupo, + @WebParam(name = "codEmpresa", targetNamespace = "") + String codEmpresa); + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BilheteServiceService.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BilheteServiceService.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/BilheteServiceService.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BilheteServiceService.java index 1f1ac2dd7..9fb0a6180 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BilheteServiceService.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BilheteServiceService.java @@ -1,57 +1,57 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1 - * - */ -@WebServiceClient(name = "BilheteServiceService", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", wsdlLocation = "http://52.72.4.158:8280/WSIntegracao/BilheteService?wsdl") -public class BilheteServiceService - extends Service -{ - - - private final static Logger logger = LogManager.getLogger(com.rjconsultores.hstcajservice.ws.BilheteServiceService.class); - - - public BilheteServiceService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - /** - * - * @return - * returns BilheteService - */ - @WebEndpoint(name = "BilheteServicePort") - public BilheteService getBilheteServicePort() { - return super.getPort(new QName("http://ws.hstcajservice.rjconsultores.com/", "BilheteServicePort"), BilheteService.class); - } - - /** - * - * @param features - * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. - * @return - * returns BilheteService - */ - @WebEndpoint(name = "BilheteServicePort") - public BilheteService getBilheteServicePort(WebServiceFeature... features) { - return super.getPort(new QName("http://ws.hstcajservice.rjconsultores.com/", "BilheteServicePort"), BilheteService.class, features); - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.6 in JDK 6 + * Generated source version: 2.1 + * + */ +@WebServiceClient(name = "BilheteServiceService", targetNamespace = "http://ws.hstcajservice.rjconsultores.com/", wsdlLocation = "http://52.72.4.158:8280/WSIntegracao/BilheteService?wsdl") +public class BilheteServiceService + extends Service +{ + + + private final static Logger logger = LogManager.getLogger(com.rjconsultores.hstcajservice.ws.BilheteServiceService.class); + + + public BilheteServiceService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + /** + * + * @return + * returns BilheteService + */ + @WebEndpoint(name = "BilheteServicePort") + public BilheteService getBilheteServicePort() { + return super.getPort(new QName("http://ws.hstcajservice.rjconsultores.com/", "BilheteServicePort"), BilheteService.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns BilheteService + */ + @WebEndpoint(name = "BilheteServicePort") + public BilheteService getBilheteServicePort(WebServiceFeature... features) { + return super.getPort(new QName("http://ws.hstcajservice.rjconsultores.com/", "BilheteServicePort"), BilheteService.class, features); + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/Bilhetes.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/Bilhetes.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/Bilhetes.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/Bilhetes.java index 5aa96c2f5..49a57ed71 100644 --- a/src/com/rjconsultores/hstcajservice/ws/Bilhetes.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/Bilhetes.java @@ -1,25 +1,25 @@ -package com.rjconsultores.hstcajservice.ws; - -import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -import com.rjconsultores.hstcajservice.ws.ExportaIntegracaoWS; -@XmlRootElement(name = "bilhetes") -@XmlAccessorType (XmlAccessType.FIELD) -public class Bilhetes { - @XmlElement(name = "bilhete") - private List bilhetes = null; - - public List getBilhete() { - return bilhetes; - } - - public void setBilhetes(List bilhete) { - this.bilhetes = bilhete; - } - -} +package com.rjconsultores.hstcajservice.ws; + +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import com.rjconsultores.hstcajservice.ws.ExportaIntegracaoWS; +@XmlRootElement(name = "bilhetes") +@XmlAccessorType (XmlAccessType.FIELD) +public class Bilhetes { + @XmlElement(name = "bilhete") + private List bilhetes = null; + + public List getBilhete() { + return bilhetes; + } + + public void setBilhetes(List bilhete) { + this.bilhetes = bilhete; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetes.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetes.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/BuscarBilhetes.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetes.java index 9a03f6ecf..b27aabff2 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetes.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetes.java @@ -1,222 +1,222 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for buscarBilhetes complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="buscarBilhetes">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="dataInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="fiscal" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "buscarBilhetes", propOrder = { - "dataInicio", - "dataFim", - "agenciaInicio", - "agenciaFim", - "codEmpresaGrupo", - "codEmpresa", - "fiscal" -}) -public class BuscarBilhetes { - - protected String dataInicio; - protected String dataFim; - protected String agenciaInicio; - protected String agenciaFim; - protected Integer codEmpresaGrupo; - protected String codEmpresa; - protected String fiscal; - - /** - * Gets the value of the dataInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataInicio() { - return dataInicio; - } - - /** - * Sets the value of the dataInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataInicio(String value) { - this.dataInicio = value; - } - - /** - * Gets the value of the dataFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataFim() { - return dataFim; - } - - /** - * Sets the value of the dataFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataFim(String value) { - this.dataFim = value; - } - - /** - * Gets the value of the agenciaInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaInicio() { - return agenciaInicio; - } - - /** - * Sets the value of the agenciaInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaInicio(String value) { - this.agenciaInicio = value; - } - - /** - * Gets the value of the agenciaFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaFim() { - return agenciaFim; - } - - /** - * Sets the value of the agenciaFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaFim(String value) { - this.agenciaFim = value; - } - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - - /** - * Gets the value of the fiscal property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFiscal() { - return fiscal; - } - - /** - * Sets the value of the fiscal property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFiscal(String value) { - this.fiscal = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for buscarBilhetes complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="buscarBilhetes">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="dataInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="fiscal" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "buscarBilhetes", propOrder = { + "dataInicio", + "dataFim", + "agenciaInicio", + "agenciaFim", + "codEmpresaGrupo", + "codEmpresa", + "fiscal" +}) +public class BuscarBilhetes { + + protected String dataInicio; + protected String dataFim; + protected String agenciaInicio; + protected String agenciaFim; + protected Integer codEmpresaGrupo; + protected String codEmpresa; + protected String fiscal; + + /** + * Gets the value of the dataInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataInicio() { + return dataInicio; + } + + /** + * Sets the value of the dataInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataInicio(String value) { + this.dataInicio = value; + } + + /** + * Gets the value of the dataFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataFim() { + return dataFim; + } + + /** + * Sets the value of the dataFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataFim(String value) { + this.dataFim = value; + } + + /** + * Gets the value of the agenciaInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaInicio() { + return agenciaInicio; + } + + /** + * Sets the value of the agenciaInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaInicio(String value) { + this.agenciaInicio = value; + } + + /** + * Gets the value of the agenciaFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaFim() { + return agenciaFim; + } + + /** + * Sets the value of the agenciaFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaFim(String value) { + this.agenciaFim = value; + } + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + + /** + * Gets the value of the fiscal property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFiscal() { + return fiscal; + } + + /** + * Sets the value of the fiscal property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFiscal(String value) { + this.fiscal = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistente.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistente.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistente.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistente.java index 17b9bdcf5..f89d7073d 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistente.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistente.java @@ -1,222 +1,222 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for buscarBilhetesInconsistente complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="buscarBilhetesInconsistente">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="dataInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="fiscal" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "buscarBilhetesInconsistente", propOrder = { - "dataInicio", - "dataFim", - "agenciaInicio", - "agenciaFim", - "codEmpresaGrupo", - "codEmpresa", - "fiscal" -}) -public class BuscarBilhetesInconsistente { - - protected String dataInicio; - protected String dataFim; - protected String agenciaInicio; - protected String agenciaFim; - protected Integer codEmpresaGrupo; - protected String codEmpresa; - protected String fiscal; - - /** - * Gets the value of the dataInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataInicio() { - return dataInicio; - } - - /** - * Sets the value of the dataInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataInicio(String value) { - this.dataInicio = value; - } - - /** - * Gets the value of the dataFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataFim() { - return dataFim; - } - - /** - * Sets the value of the dataFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataFim(String value) { - this.dataFim = value; - } - - /** - * Gets the value of the agenciaInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaInicio() { - return agenciaInicio; - } - - /** - * Sets the value of the agenciaInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaInicio(String value) { - this.agenciaInicio = value; - } - - /** - * Gets the value of the agenciaFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaFim() { - return agenciaFim; - } - - /** - * Sets the value of the agenciaFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaFim(String value) { - this.agenciaFim = value; - } - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - - /** - * Gets the value of the fiscal property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFiscal() { - return fiscal; - } - - /** - * Sets the value of the fiscal property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFiscal(String value) { - this.fiscal = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for buscarBilhetesInconsistente complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="buscarBilhetesInconsistente">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="dataInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="fiscal" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "buscarBilhetesInconsistente", propOrder = { + "dataInicio", + "dataFim", + "agenciaInicio", + "agenciaFim", + "codEmpresaGrupo", + "codEmpresa", + "fiscal" +}) +public class BuscarBilhetesInconsistente { + + protected String dataInicio; + protected String dataFim; + protected String agenciaInicio; + protected String agenciaFim; + protected Integer codEmpresaGrupo; + protected String codEmpresa; + protected String fiscal; + + /** + * Gets the value of the dataInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataInicio() { + return dataInicio; + } + + /** + * Sets the value of the dataInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataInicio(String value) { + this.dataInicio = value; + } + + /** + * Gets the value of the dataFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataFim() { + return dataFim; + } + + /** + * Sets the value of the dataFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataFim(String value) { + this.dataFim = value; + } + + /** + * Gets the value of the agenciaInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaInicio() { + return agenciaInicio; + } + + /** + * Sets the value of the agenciaInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaInicio(String value) { + this.agenciaInicio = value; + } + + /** + * Gets the value of the agenciaFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaFim() { + return agenciaFim; + } + + /** + * Sets the value of the agenciaFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaFim(String value) { + this.agenciaFim = value; + } + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + + /** + * Gets the value of the fiscal property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFiscal() { + return fiscal; + } + + /** + * Sets the value of the fiscal property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFiscal(String value) { + this.fiscal = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistenteResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistenteResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistenteResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistenteResponse.java index 2c386e362..21a76c475 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistenteResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesInconsistenteResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for buscarBilhetesInconsistenteResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="buscarBilhetesInconsistenteResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "buscarBilhetesInconsistenteResponse", propOrder = { - "_return" -}) -public class BuscarBilhetesInconsistenteResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for buscarBilhetesInconsistenteResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="buscarBilhetesInconsistenteResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "buscarBilhetesInconsistenteResponse", propOrder = { + "_return" +}) +public class BuscarBilhetesInconsistenteResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesResponse.java index d21b4d154..043ade7e9 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarBilhetesResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for buscarBilhetesResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="buscarBilhetesResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "buscarBilhetesResponse", propOrder = { - "_return" -}) -public class BuscarBilhetesResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for buscarBilhetesResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="buscarBilhetesResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "buscarBilhetesResponse", propOrder = { + "_return" +}) +public class BuscarBilhetesResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesa.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesa.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesa.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesa.java index adeee4d09..abc07ce07 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesa.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesa.java @@ -1,195 +1,195 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for buscarReceitaDespesa complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="buscarReceitaDespesa">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="dataInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "buscarReceitaDespesa", propOrder = { - "dataInicio", - "dataFim", - "agenciaInicio", - "agenciaFim", - "codEmpresaGrupo", - "codEmpresa" -}) -public class BuscarReceitaDespesa { - - protected String dataInicio; - protected String dataFim; - protected String agenciaInicio; - protected String agenciaFim; - protected Integer codEmpresaGrupo; - protected String codEmpresa; - - /** - * Gets the value of the dataInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataInicio() { - return dataInicio; - } - - /** - * Sets the value of the dataInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataInicio(String value) { - this.dataInicio = value; - } - - /** - * Gets the value of the dataFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataFim() { - return dataFim; - } - - /** - * Sets the value of the dataFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataFim(String value) { - this.dataFim = value; - } - - /** - * Gets the value of the agenciaInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaInicio() { - return agenciaInicio; - } - - /** - * Sets the value of the agenciaInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaInicio(String value) { - this.agenciaInicio = value; - } - - /** - * Gets the value of the agenciaFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaFim() { - return agenciaFim; - } - - /** - * Sets the value of the agenciaFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaFim(String value) { - this.agenciaFim = value; - } - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for buscarReceitaDespesa complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="buscarReceitaDespesa">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="dataInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "buscarReceitaDespesa", propOrder = { + "dataInicio", + "dataFim", + "agenciaInicio", + "agenciaFim", + "codEmpresaGrupo", + "codEmpresa" +}) +public class BuscarReceitaDespesa { + + protected String dataInicio; + protected String dataFim; + protected String agenciaInicio; + protected String agenciaFim; + protected Integer codEmpresaGrupo; + protected String codEmpresa; + + /** + * Gets the value of the dataInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataInicio() { + return dataInicio; + } + + /** + * Sets the value of the dataInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataInicio(String value) { + this.dataInicio = value; + } + + /** + * Gets the value of the dataFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataFim() { + return dataFim; + } + + /** + * Sets the value of the dataFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataFim(String value) { + this.dataFim = value; + } + + /** + * Gets the value of the agenciaInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaInicio() { + return agenciaInicio; + } + + /** + * Sets the value of the agenciaInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaInicio(String value) { + this.agenciaInicio = value; + } + + /** + * Gets the value of the agenciaFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaFim() { + return agenciaFim; + } + + /** + * Sets the value of the agenciaFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaFim(String value) { + this.agenciaFim = value; + } + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesaResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesaResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesaResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesaResponse.java index 3100ff126..e3c401f7c 100644 --- a/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesaResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/BuscarReceitaDespesaResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for buscarReceitaDespesaResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="buscarReceitaDespesaResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoReceitaDespesaWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "buscarReceitaDespesaResponse", propOrder = { - "_return" -}) -public class BuscarReceitaDespesaResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoReceitaDespesaWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for buscarReceitaDespesaResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="buscarReceitaDespesaResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoReceitaDespesaWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "buscarReceitaDespesaResponse", propOrder = { + "_return" +}) +public class BuscarReceitaDespesaResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoReceitaDespesaWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadAgencia.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadAgencia.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadAgencia.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadAgencia.java index 549038a8f..da374c214 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadAgencia.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadAgencia.java @@ -1,60 +1,60 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadAgencia complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadAgencia">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadAgencia", propOrder = { - "codEmpresaGrupo" -}) -public class CadAgencia { - - protected Integer codEmpresaGrupo; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadAgencia complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadAgencia">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadAgencia", propOrder = { + "codEmpresaGrupo" +}) +public class CadAgencia { + + protected Integer codEmpresaGrupo; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadAgenciaResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadAgenciaResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadAgenciaResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadAgenciaResponse.java index 1634a3112..f540ab136 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadAgenciaResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadAgenciaResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadAgenciaResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadAgenciaResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadAgenciaWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadAgenciaResponse", propOrder = { - "_return" -}) -public class CadAgenciaResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadAgenciaWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadAgenciaResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadAgenciaResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadAgenciaWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadAgenciaResponse", propOrder = { + "_return" +}) +public class CadAgenciaResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadAgenciaWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadBeneficio.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBeneficio.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadBeneficio.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBeneficio.java index ce149361e..8249ff8fb 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadBeneficio.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBeneficio.java @@ -1,87 +1,87 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadBeneficio complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadBeneficio">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadBeneficio", propOrder = { - "codEmpresaGrupo", - "codEmpresa" -}) -public class CadBeneficio { - - protected Integer codEmpresaGrupo; - protected String codEmpresa; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadBeneficio complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadBeneficio">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadBeneficio", propOrder = { + "codEmpresaGrupo", + "codEmpresa" +}) +public class CadBeneficio { + + protected Integer codEmpresaGrupo; + protected String codEmpresa; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadBeneficioResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBeneficioResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadBeneficioResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBeneficioResponse.java index 603ceb964..61eb19388 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadBeneficioResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBeneficioResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadBeneficioResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadBeneficioResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadBeneficioWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadBeneficioResponse", propOrder = { - "_return" -}) -public class CadBeneficioResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadBeneficioWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadBeneficioResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadBeneficioResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadBeneficioWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadBeneficioResponse", propOrder = { + "_return" +}) +public class CadBeneficioResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadBeneficioWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadBilheteiro.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBilheteiro.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadBilheteiro.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBilheteiro.java index 4083be991..b140b20a8 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadBilheteiro.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBilheteiro.java @@ -1,141 +1,141 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadBilheteiro complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadBilheteiro">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadBilheteiro", propOrder = { - "agenciaInicio", - "agenciaFim", - "codEmpresaGrupo", - "codEmpresa" -}) -public class CadBilheteiro { - - protected String agenciaInicio; - protected String agenciaFim; - protected Integer codEmpresaGrupo; - protected String codEmpresa; - - /** - * Gets the value of the agenciaInicio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaInicio() { - return agenciaInicio; - } - - /** - * Sets the value of the agenciaInicio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaInicio(String value) { - this.agenciaInicio = value; - } - - /** - * Gets the value of the agenciaFim property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaFim() { - return agenciaFim; - } - - /** - * Sets the value of the agenciaFim property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaFim(String value) { - this.agenciaFim = value; - } - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadBilheteiro complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadBilheteiro">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="agenciaInicio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaFim" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadBilheteiro", propOrder = { + "agenciaInicio", + "agenciaFim", + "codEmpresaGrupo", + "codEmpresa" +}) +public class CadBilheteiro { + + protected String agenciaInicio; + protected String agenciaFim; + protected Integer codEmpresaGrupo; + protected String codEmpresa; + + /** + * Gets the value of the agenciaInicio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaInicio() { + return agenciaInicio; + } + + /** + * Sets the value of the agenciaInicio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaInicio(String value) { + this.agenciaInicio = value; + } + + /** + * Gets the value of the agenciaFim property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaFim() { + return agenciaFim; + } + + /** + * Sets the value of the agenciaFim property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaFim(String value) { + this.agenciaFim = value; + } + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadBilheteiroResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBilheteiroResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadBilheteiroResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBilheteiroResponse.java index 4db9aa049..31935d78e 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadBilheteiroResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadBilheteiroResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadBilheteiroResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadBilheteiroResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadBilheteiroWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadBilheteiroResponse", propOrder = { - "_return" -}) -public class CadBilheteiroResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadBilheteiroWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadBilheteiroResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadBilheteiroResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadBilheteiroWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadBilheteiroResponse", propOrder = { + "_return" +}) +public class CadBilheteiroResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadBilheteiroWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadCliente.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadCliente.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadCliente.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadCliente.java index 3e996b6fa..fea3fa7e0 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadCliente.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadCliente.java @@ -1,60 +1,60 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadCliente complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadCliente">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadCliente", propOrder = { - "codEmpresaGrupo" -}) -public class CadCliente { - - protected Integer codEmpresaGrupo; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadCliente complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadCliente">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadCliente", propOrder = { + "codEmpresaGrupo" +}) +public class CadCliente { + + protected Integer codEmpresaGrupo; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadClienteResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadClienteResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadClienteResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadClienteResponse.java index fa2797705..d46d1adb6 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadClienteResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadClienteResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadClienteResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadClienteResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadClienteWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadClienteResponse", propOrder = { - "_return" -}) -public class CadClienteResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadClienteWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadClienteResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadClienteResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadClienteWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadClienteResponse", propOrder = { + "_return" +}) +public class CadClienteResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadClienteWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadEstado.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadEstado.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadEstado.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadEstado.java index a12018c32..9712ec7c2 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadEstado.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadEstado.java @@ -1,60 +1,60 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadEstado complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadEstado">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadEstado", propOrder = { - "codEmpresaGrupo" -}) -public class CadEstado { - - protected Integer codEmpresaGrupo; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadEstado complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadEstado">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadEstado", propOrder = { + "codEmpresaGrupo" +}) +public class CadEstado { + + protected Integer codEmpresaGrupo; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadEstadoResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadEstadoResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadEstadoResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadEstadoResponse.java index e71a7504a..7371c9327 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadEstadoResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadEstadoResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadEstadoResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadEstadoResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadEstadoWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadEstadoResponse", propOrder = { - "_return" -}) -public class CadEstadoResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadEstadoWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadEstadoResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadEstadoResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadEstadoWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadEstadoResponse", propOrder = { + "_return" +}) +public class CadEstadoResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadEstadoWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamento.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamento.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadFormaPagamento.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamento.java index 0faed4b46..b013d259d 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamento.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamento.java @@ -1,60 +1,60 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadFormaPagamento complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadFormaPagamento">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadFormaPagamento", propOrder = { - "codEmpresaGrupo" -}) -public class CadFormaPagamento { - - protected Integer codEmpresaGrupo; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadFormaPagamento complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadFormaPagamento">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadFormaPagamento", propOrder = { + "codEmpresaGrupo" +}) +public class CadFormaPagamento { + + protected Integer codEmpresaGrupo; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamentoResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamentoResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadFormaPagamentoResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamentoResponse.java index 3736a8a08..54a19a645 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamentoResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadFormaPagamentoResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadFormaPagamentoResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadFormaPagamentoResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadFormaPagamentoWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadFormaPagamentoResponse", propOrder = { - "_return" -}) -public class CadFormaPagamentoResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadFormaPagamentoWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadFormaPagamentoResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadFormaPagamentoResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadFormaPagamentoWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadFormaPagamentoResponse", propOrder = { + "_return" +}) +public class CadFormaPagamentoResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadFormaPagamentoWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadLinha.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLinha.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadLinha.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLinha.java index 3ea8d4c1f..e1c91d6fd 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadLinha.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLinha.java @@ -1,87 +1,87 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadLinha complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadLinha">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadLinha", propOrder = { - "codEmpresaGrupo", - "codEmpresa" -}) -public class CadLinha { - - protected Integer codEmpresaGrupo; - protected String codEmpresa; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadLinha complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadLinha">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadLinha", propOrder = { + "codEmpresaGrupo", + "codEmpresa" +}) +public class CadLinha { + + protected Integer codEmpresaGrupo; + protected String codEmpresa; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadLinhaResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLinhaResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadLinhaResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLinhaResponse.java index aa87c4d26..9a182542f 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadLinhaResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLinhaResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadLinhaResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadLinhaResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadLinhaWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadLinhaResponse", propOrder = { - "_return" -}) -public class CadLinhaResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadLinhaWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadLinhaResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadLinhaResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadLinhaWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadLinhaResponse", propOrder = { + "_return" +}) +public class CadLinhaResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadLinhaWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadLocalidade.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLocalidade.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/CadLocalidade.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLocalidade.java index c72a5a67f..298c27b6e 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadLocalidade.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLocalidade.java @@ -1,60 +1,60 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadLocalidade complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadLocalidade">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadLocalidade", propOrder = { - "codEmpresaGrupo" -}) -public class CadLocalidade { - - protected Integer codEmpresaGrupo; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadLocalidade complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadLocalidade">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadLocalidade", propOrder = { + "codEmpresaGrupo" +}) +public class CadLocalidade { + + protected Integer codEmpresaGrupo; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadLocalidadeResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLocalidadeResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadLocalidadeResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLocalidadeResponse.java index 54daf2a3a..783ee8e11 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadLocalidadeResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadLocalidadeResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadLocalidadeResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadLocalidadeResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadLocalidadeWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadLocalidadeResponse", propOrder = { - "_return" -}) -public class CadLocalidadeResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadLocalidadeWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadLocalidadeResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadLocalidadeResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadLocalidadeWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadLocalidadeResponse", propOrder = { + "_return" +}) +public class CadLocalidadeResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadLocalidadeWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesa.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesa.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesa.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesa.java index 3f52d095d..5224c6b96 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesa.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesa.java @@ -1,60 +1,60 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadReceitaDespesa complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadReceitaDespesa">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadReceitaDespesa", propOrder = { - "codEmpresaGrupo" -}) -public class CadReceitaDespesa { - - protected Integer codEmpresaGrupo; - - /** - * Gets the value of the codEmpresaGrupo property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getCodEmpresaGrupo() { - return codEmpresaGrupo; - } - - /** - * Sets the value of the codEmpresaGrupo property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setCodEmpresaGrupo(Integer value) { - this.codEmpresaGrupo = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadReceitaDespesa complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadReceitaDespesa">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEmpresaGrupo" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadReceitaDespesa", propOrder = { + "codEmpresaGrupo" +}) +public class CadReceitaDespesa { + + protected Integer codEmpresaGrupo; + + /** + * Gets the value of the codEmpresaGrupo property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getCodEmpresaGrupo() { + return codEmpresaGrupo; + } + + /** + * Sets the value of the codEmpresaGrupo property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setCodEmpresaGrupo(Integer value) { + this.codEmpresaGrupo = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesaResponse.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesaResponse.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesaResponse.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesaResponse.java index 17f03f10f..f59514450 100644 --- a/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesaResponse.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/CadReceitaDespesaResponse.java @@ -1,69 +1,69 @@ - -package com.rjconsultores.hstcajservice.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cadReceitaDespesaResponse complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cadReceitaDespesaResponse">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadReceitaDespesaWS" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cadReceitaDespesaResponse", propOrder = { - "_return" -}) -public class CadReceitaDespesaResponse { - - @XmlElement(name = "return") - protected List _return; - - /** - * Gets the value of the return property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the return property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getReturn().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ExportaIntegracaoCadReceitaDespesaWS } - * - * - */ - public List getReturn() { - if (_return == null) { - _return = new ArrayList(); - } - return this._return; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for cadReceitaDespesaResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="cadReceitaDespesaResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://ws.hstcajservice.rjconsultores.com/}exportaIntegracaoCadReceitaDespesaWS" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "cadReceitaDespesaResponse", propOrder = { + "_return" +}) +public class CadReceitaDespesaResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getReturn().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExportaIntegracaoCadReceitaDespesaWS } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadAgenciaWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadAgenciaWS.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadAgenciaWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadAgenciaWS.java index f303b0986..9a0db7df2 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadAgenciaWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadAgenciaWS.java @@ -1,114 +1,114 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadAgenciaWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadAgenciaWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ativo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codAgencia" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descAgencia" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadAgenciaWS", propOrder = { - "ativo", - "codAgencia", - "descAgencia" -}) -public class ExportaIntegracaoCadAgenciaWS { - - protected String ativo; - protected String codAgencia; - protected String descAgencia; - - /** - * Gets the value of the ativo property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAtivo() { - return ativo; - } - - /** - * Sets the value of the ativo property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAtivo(String value) { - this.ativo = value; - } - - /** - * Gets the value of the codAgencia property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodAgencia() { - return codAgencia; - } - - /** - * Sets the value of the codAgencia property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodAgencia(String value) { - this.codAgencia = value; - } - - /** - * Gets the value of the descAgencia property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescAgencia() { - return descAgencia; - } - - /** - * Sets the value of the descAgencia property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescAgencia(String value) { - this.descAgencia = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadAgenciaWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadAgenciaWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ativo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codAgencia" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descAgencia" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadAgenciaWS", propOrder = { + "ativo", + "codAgencia", + "descAgencia" +}) +public class ExportaIntegracaoCadAgenciaWS { + + protected String ativo; + protected String codAgencia; + protected String descAgencia; + + /** + * Gets the value of the ativo property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtivo() { + return ativo; + } + + /** + * Sets the value of the ativo property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtivo(String value) { + this.ativo = value; + } + + /** + * Gets the value of the codAgencia property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodAgencia() { + return codAgencia; + } + + /** + * Sets the value of the codAgencia property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodAgencia(String value) { + this.codAgencia = value; + } + + /** + * Gets the value of the descAgencia property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescAgencia() { + return descAgencia; + } + + /** + * Sets the value of the descAgencia property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescAgencia(String value) { + this.descAgencia = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBeneficioWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBeneficioWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBeneficioWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBeneficioWS.java index c85f2bd4a..1011c2d0a 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBeneficioWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBeneficioWS.java @@ -1,276 +1,276 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadBeneficioWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadBeneficioWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="classeBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descontoBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descricaoBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="empresaBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="linhaBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="orgConcedLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="temTaxaEmbarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="temTaxaSeguro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadBeneficioWS", propOrder = { - "classeBeneficio", - "codBeneficio", - "descontoBeneficio", - "descricaoBeneficio", - "empresaBeneficio", - "linhaBeneficio", - "orgConcedLinha", - "temTaxaEmbarque", - "temTaxaSeguro" -}) -public class ExportaIntegracaoCadBeneficioWS { - - protected String classeBeneficio; - protected String codBeneficio; - protected String descontoBeneficio; - protected String descricaoBeneficio; - protected String empresaBeneficio; - protected String linhaBeneficio; - protected String orgConcedLinha; - protected String temTaxaEmbarque; - protected String temTaxaSeguro; - - /** - * Gets the value of the classeBeneficio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getClasseBeneficio() { - return classeBeneficio; - } - - /** - * Sets the value of the classeBeneficio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setClasseBeneficio(String value) { - this.classeBeneficio = value; - } - - /** - * Gets the value of the codBeneficio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodBeneficio() { - return codBeneficio; - } - - /** - * Sets the value of the codBeneficio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodBeneficio(String value) { - this.codBeneficio = value; - } - - /** - * Gets the value of the descontoBeneficio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescontoBeneficio() { - return descontoBeneficio; - } - - /** - * Sets the value of the descontoBeneficio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescontoBeneficio(String value) { - this.descontoBeneficio = value; - } - - /** - * Gets the value of the descricaoBeneficio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescricaoBeneficio() { - return descricaoBeneficio; - } - - /** - * Sets the value of the descricaoBeneficio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescricaoBeneficio(String value) { - this.descricaoBeneficio = value; - } - - /** - * Gets the value of the empresaBeneficio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEmpresaBeneficio() { - return empresaBeneficio; - } - - /** - * Sets the value of the empresaBeneficio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEmpresaBeneficio(String value) { - this.empresaBeneficio = value; - } - - /** - * Gets the value of the linhaBeneficio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLinhaBeneficio() { - return linhaBeneficio; - } - - /** - * Sets the value of the linhaBeneficio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLinhaBeneficio(String value) { - this.linhaBeneficio = value; - } - - /** - * Gets the value of the orgConcedLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOrgConcedLinha() { - return orgConcedLinha; - } - - /** - * Sets the value of the orgConcedLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOrgConcedLinha(String value) { - this.orgConcedLinha = value; - } - - /** - * Gets the value of the temTaxaEmbarque property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTemTaxaEmbarque() { - return temTaxaEmbarque; - } - - /** - * Sets the value of the temTaxaEmbarque property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTemTaxaEmbarque(String value) { - this.temTaxaEmbarque = value; - } - - /** - * Gets the value of the temTaxaSeguro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTemTaxaSeguro() { - return temTaxaSeguro; - } - - /** - * Sets the value of the temTaxaSeguro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTemTaxaSeguro(String value) { - this.temTaxaSeguro = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadBeneficioWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadBeneficioWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="classeBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descontoBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descricaoBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="empresaBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="linhaBeneficio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="orgConcedLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="temTaxaEmbarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="temTaxaSeguro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadBeneficioWS", propOrder = { + "classeBeneficio", + "codBeneficio", + "descontoBeneficio", + "descricaoBeneficio", + "empresaBeneficio", + "linhaBeneficio", + "orgConcedLinha", + "temTaxaEmbarque", + "temTaxaSeguro" +}) +public class ExportaIntegracaoCadBeneficioWS { + + protected String classeBeneficio; + protected String codBeneficio; + protected String descontoBeneficio; + protected String descricaoBeneficio; + protected String empresaBeneficio; + protected String linhaBeneficio; + protected String orgConcedLinha; + protected String temTaxaEmbarque; + protected String temTaxaSeguro; + + /** + * Gets the value of the classeBeneficio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getClasseBeneficio() { + return classeBeneficio; + } + + /** + * Sets the value of the classeBeneficio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setClasseBeneficio(String value) { + this.classeBeneficio = value; + } + + /** + * Gets the value of the codBeneficio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodBeneficio() { + return codBeneficio; + } + + /** + * Sets the value of the codBeneficio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodBeneficio(String value) { + this.codBeneficio = value; + } + + /** + * Gets the value of the descontoBeneficio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescontoBeneficio() { + return descontoBeneficio; + } + + /** + * Sets the value of the descontoBeneficio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescontoBeneficio(String value) { + this.descontoBeneficio = value; + } + + /** + * Gets the value of the descricaoBeneficio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescricaoBeneficio() { + return descricaoBeneficio; + } + + /** + * Sets the value of the descricaoBeneficio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescricaoBeneficio(String value) { + this.descricaoBeneficio = value; + } + + /** + * Gets the value of the empresaBeneficio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEmpresaBeneficio() { + return empresaBeneficio; + } + + /** + * Sets the value of the empresaBeneficio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEmpresaBeneficio(String value) { + this.empresaBeneficio = value; + } + + /** + * Gets the value of the linhaBeneficio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLinhaBeneficio() { + return linhaBeneficio; + } + + /** + * Sets the value of the linhaBeneficio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLinhaBeneficio(String value) { + this.linhaBeneficio = value; + } + + /** + * Gets the value of the orgConcedLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrgConcedLinha() { + return orgConcedLinha; + } + + /** + * Sets the value of the orgConcedLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrgConcedLinha(String value) { + this.orgConcedLinha = value; + } + + /** + * Gets the value of the temTaxaEmbarque property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTemTaxaEmbarque() { + return temTaxaEmbarque; + } + + /** + * Sets the value of the temTaxaEmbarque property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTemTaxaEmbarque(String value) { + this.temTaxaEmbarque = value; + } + + /** + * Gets the value of the temTaxaSeguro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTemTaxaSeguro() { + return temTaxaSeguro; + } + + /** + * Sets the value of the temTaxaSeguro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTemTaxaSeguro(String value) { + this.temTaxaSeguro = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBilheteiroWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBilheteiroWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBilheteiroWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBilheteiroWS.java index 3df13824d..36ddf22ae 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBilheteiroWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadBilheteiroWS.java @@ -1,168 +1,168 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadBilheteiroWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadBilheteiroWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="agenciaBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ativo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="documentoBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="nomeBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadBilheteiroWS", propOrder = { - "agenciaBilheteiro", - "ativo", - "codBilheteiro", - "documentoBilheteiro", - "nomeBilheteiro" -}) -public class ExportaIntegracaoCadBilheteiroWS { - - protected String agenciaBilheteiro; - protected String ativo; - protected String codBilheteiro; - protected String documentoBilheteiro; - protected String nomeBilheteiro; - - /** - * Gets the value of the agenciaBilheteiro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaBilheteiro() { - return agenciaBilheteiro; - } - - /** - * Sets the value of the agenciaBilheteiro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaBilheteiro(String value) { - this.agenciaBilheteiro = value; - } - - /** - * Gets the value of the ativo property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAtivo() { - return ativo; - } - - /** - * Sets the value of the ativo property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAtivo(String value) { - this.ativo = value; - } - - /** - * Gets the value of the codBilheteiro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodBilheteiro() { - return codBilheteiro; - } - - /** - * Sets the value of the codBilheteiro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodBilheteiro(String value) { - this.codBilheteiro = value; - } - - /** - * Gets the value of the documentoBilheteiro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDocumentoBilheteiro() { - return documentoBilheteiro; - } - - /** - * Sets the value of the documentoBilheteiro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDocumentoBilheteiro(String value) { - this.documentoBilheteiro = value; - } - - /** - * Gets the value of the nomeBilheteiro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNomeBilheteiro() { - return nomeBilheteiro; - } - - /** - * Sets the value of the nomeBilheteiro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNomeBilheteiro(String value) { - this.nomeBilheteiro = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadBilheteiroWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadBilheteiroWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="agenciaBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="ativo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="documentoBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="nomeBilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadBilheteiroWS", propOrder = { + "agenciaBilheteiro", + "ativo", + "codBilheteiro", + "documentoBilheteiro", + "nomeBilheteiro" +}) +public class ExportaIntegracaoCadBilheteiroWS { + + protected String agenciaBilheteiro; + protected String ativo; + protected String codBilheteiro; + protected String documentoBilheteiro; + protected String nomeBilheteiro; + + /** + * Gets the value of the agenciaBilheteiro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaBilheteiro() { + return agenciaBilheteiro; + } + + /** + * Sets the value of the agenciaBilheteiro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaBilheteiro(String value) { + this.agenciaBilheteiro = value; + } + + /** + * Gets the value of the ativo property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAtivo() { + return ativo; + } + + /** + * Sets the value of the ativo property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAtivo(String value) { + this.ativo = value; + } + + /** + * Gets the value of the codBilheteiro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodBilheteiro() { + return codBilheteiro; + } + + /** + * Sets the value of the codBilheteiro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodBilheteiro(String value) { + this.codBilheteiro = value; + } + + /** + * Gets the value of the documentoBilheteiro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDocumentoBilheteiro() { + return documentoBilheteiro; + } + + /** + * Sets the value of the documentoBilheteiro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDocumentoBilheteiro(String value) { + this.documentoBilheteiro = value; + } + + /** + * Gets the value of the nomeBilheteiro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNomeBilheteiro() { + return nomeBilheteiro; + } + + /** + * Sets the value of the nomeBilheteiro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNomeBilheteiro(String value) { + this.nomeBilheteiro = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadClienteWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadClienteWS.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadClienteWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadClienteWS.java index 4af301985..4bd76f953 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadClienteWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadClienteWS.java @@ -1,330 +1,330 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadClienteWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadClienteWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="bairroCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="cepCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataNascCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="emailCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="nacioCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="nomeCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numDocCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ruaCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="telCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="tipoDocCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadClienteWS", propOrder = { - "bairroCli", - "cepCli", - "codCli", - "dataNascCli", - "emailCli", - "nacioCli", - "nomeCli", - "numDocCli", - "ruaCli", - "telCli", - "tipoDocCli" -}) -public class ExportaIntegracaoCadClienteWS { - - protected String bairroCli; - protected String cepCli; - protected String codCli; - protected String dataNascCli; - protected String emailCli; - protected String nacioCli; - protected String nomeCli; - protected String numDocCli; - protected String ruaCli; - protected String telCli; - protected String tipoDocCli; - - /** - * Gets the value of the bairroCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBairroCli() { - return bairroCli; - } - - /** - * Sets the value of the bairroCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBairroCli(String value) { - this.bairroCli = value; - } - - /** - * Gets the value of the cepCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCepCli() { - return cepCli; - } - - /** - * Sets the value of the cepCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCepCli(String value) { - this.cepCli = value; - } - - /** - * Gets the value of the codCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodCli() { - return codCli; - } - - /** - * Sets the value of the codCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodCli(String value) { - this.codCli = value; - } - - /** - * Gets the value of the dataNascCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataNascCli() { - return dataNascCli; - } - - /** - * Sets the value of the dataNascCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataNascCli(String value) { - this.dataNascCli = value; - } - - /** - * Gets the value of the emailCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEmailCli() { - return emailCli; - } - - /** - * Sets the value of the emailCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEmailCli(String value) { - this.emailCli = value; - } - - /** - * Gets the value of the nacioCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNacioCli() { - return nacioCli; - } - - /** - * Sets the value of the nacioCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNacioCli(String value) { - this.nacioCli = value; - } - - /** - * Gets the value of the nomeCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNomeCli() { - return nomeCli; - } - - /** - * Sets the value of the nomeCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNomeCli(String value) { - this.nomeCli = value; - } - - /** - * Gets the value of the numDocCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumDocCli() { - return numDocCli; - } - - /** - * Sets the value of the numDocCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumDocCli(String value) { - this.numDocCli = value; - } - - /** - * Gets the value of the ruaCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRuaCli() { - return ruaCli; - } - - /** - * Sets the value of the ruaCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRuaCli(String value) { - this.ruaCli = value; - } - - /** - * Gets the value of the telCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTelCli() { - return telCli; - } - - /** - * Sets the value of the telCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTelCli(String value) { - this.telCli = value; - } - - /** - * Gets the value of the tipoDocCli property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTipoDocCli() { - return tipoDocCli; - } - - /** - * Sets the value of the tipoDocCli property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTipoDocCli(String value) { - this.tipoDocCli = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadClienteWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadClienteWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="bairroCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="cepCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataNascCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="emailCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="nacioCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="nomeCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numDocCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="ruaCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="telCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="tipoDocCli" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadClienteWS", propOrder = { + "bairroCli", + "cepCli", + "codCli", + "dataNascCli", + "emailCli", + "nacioCli", + "nomeCli", + "numDocCli", + "ruaCli", + "telCli", + "tipoDocCli" +}) +public class ExportaIntegracaoCadClienteWS { + + protected String bairroCli; + protected String cepCli; + protected String codCli; + protected String dataNascCli; + protected String emailCli; + protected String nacioCli; + protected String nomeCli; + protected String numDocCli; + protected String ruaCli; + protected String telCli; + protected String tipoDocCli; + + /** + * Gets the value of the bairroCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBairroCli() { + return bairroCli; + } + + /** + * Sets the value of the bairroCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBairroCli(String value) { + this.bairroCli = value; + } + + /** + * Gets the value of the cepCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCepCli() { + return cepCli; + } + + /** + * Sets the value of the cepCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCepCli(String value) { + this.cepCli = value; + } + + /** + * Gets the value of the codCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodCli() { + return codCli; + } + + /** + * Sets the value of the codCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodCli(String value) { + this.codCli = value; + } + + /** + * Gets the value of the dataNascCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataNascCli() { + return dataNascCli; + } + + /** + * Sets the value of the dataNascCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataNascCli(String value) { + this.dataNascCli = value; + } + + /** + * Gets the value of the emailCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEmailCli() { + return emailCli; + } + + /** + * Sets the value of the emailCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEmailCli(String value) { + this.emailCli = value; + } + + /** + * Gets the value of the nacioCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNacioCli() { + return nacioCli; + } + + /** + * Sets the value of the nacioCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNacioCli(String value) { + this.nacioCli = value; + } + + /** + * Gets the value of the nomeCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNomeCli() { + return nomeCli; + } + + /** + * Sets the value of the nomeCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNomeCli(String value) { + this.nomeCli = value; + } + + /** + * Gets the value of the numDocCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumDocCli() { + return numDocCli; + } + + /** + * Sets the value of the numDocCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumDocCli(String value) { + this.numDocCli = value; + } + + /** + * Gets the value of the ruaCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRuaCli() { + return ruaCli; + } + + /** + * Sets the value of the ruaCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRuaCli(String value) { + this.ruaCli = value; + } + + /** + * Gets the value of the telCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTelCli() { + return telCli; + } + + /** + * Sets the value of the telCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTelCli(String value) { + this.telCli = value; + } + + /** + * Gets the value of the tipoDocCli property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTipoDocCli() { + return tipoDocCli; + } + + /** + * Sets the value of the tipoDocCli property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTipoDocCli(String value) { + this.tipoDocCli = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadEstadoWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadEstadoWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadEstadoWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadEstadoWS.java index f5d82311d..961f8c18b 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadEstadoWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadEstadoWS.java @@ -1,195 +1,195 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadEstadoWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadEstadoWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codServidorEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="siglaEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="taxaEmbarqueEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="valorICMSEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadEstadoWS", propOrder = { - "codEstado", - "codServidorEstado", - "descEstado", - "siglaEstado", - "taxaEmbarqueEstado", - "valorICMSEstado" -}) -public class ExportaIntegracaoCadEstadoWS { - - protected String codEstado; - protected String codServidorEstado; - protected String descEstado; - protected String siglaEstado; - protected String taxaEmbarqueEstado; - protected String valorICMSEstado; - - /** - * Gets the value of the codEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEstado() { - return codEstado; - } - - /** - * Sets the value of the codEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEstado(String value) { - this.codEstado = value; - } - - /** - * Gets the value of the codServidorEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodServidorEstado() { - return codServidorEstado; - } - - /** - * Sets the value of the codServidorEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodServidorEstado(String value) { - this.codServidorEstado = value; - } - - /** - * Gets the value of the descEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescEstado() { - return descEstado; - } - - /** - * Sets the value of the descEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescEstado(String value) { - this.descEstado = value; - } - - /** - * Gets the value of the siglaEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSiglaEstado() { - return siglaEstado; - } - - /** - * Sets the value of the siglaEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSiglaEstado(String value) { - this.siglaEstado = value; - } - - /** - * Gets the value of the taxaEmbarqueEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTaxaEmbarqueEstado() { - return taxaEmbarqueEstado; - } - - /** - * Sets the value of the taxaEmbarqueEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTaxaEmbarqueEstado(String value) { - this.taxaEmbarqueEstado = value; - } - - /** - * Gets the value of the valorICMSEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValorICMSEstado() { - return valorICMSEstado; - } - - /** - * Sets the value of the valorICMSEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValorICMSEstado(String value) { - this.valorICMSEstado = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadEstadoWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadEstadoWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codServidorEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="siglaEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="taxaEmbarqueEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="valorICMSEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadEstadoWS", propOrder = { + "codEstado", + "codServidorEstado", + "descEstado", + "siglaEstado", + "taxaEmbarqueEstado", + "valorICMSEstado" +}) +public class ExportaIntegracaoCadEstadoWS { + + protected String codEstado; + protected String codServidorEstado; + protected String descEstado; + protected String siglaEstado; + protected String taxaEmbarqueEstado; + protected String valorICMSEstado; + + /** + * Gets the value of the codEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEstado() { + return codEstado; + } + + /** + * Sets the value of the codEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEstado(String value) { + this.codEstado = value; + } + + /** + * Gets the value of the codServidorEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodServidorEstado() { + return codServidorEstado; + } + + /** + * Sets the value of the codServidorEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodServidorEstado(String value) { + this.codServidorEstado = value; + } + + /** + * Gets the value of the descEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescEstado() { + return descEstado; + } + + /** + * Sets the value of the descEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescEstado(String value) { + this.descEstado = value; + } + + /** + * Gets the value of the siglaEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSiglaEstado() { + return siglaEstado; + } + + /** + * Sets the value of the siglaEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSiglaEstado(String value) { + this.siglaEstado = value; + } + + /** + * Gets the value of the taxaEmbarqueEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTaxaEmbarqueEstado() { + return taxaEmbarqueEstado; + } + + /** + * Sets the value of the taxaEmbarqueEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTaxaEmbarqueEstado(String value) { + this.taxaEmbarqueEstado = value; + } + + /** + * Gets the value of the valorICMSEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValorICMSEstado() { + return valorICMSEstado; + } + + /** + * Sets the value of the valorICMSEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValorICMSEstado(String value) { + this.valorICMSEstado = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadFormaPagamentoWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadFormaPagamentoWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadFormaPagamentoWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadFormaPagamentoWS.java index 9de2c6d06..59fe8aa23 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadFormaPagamentoWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadFormaPagamentoWS.java @@ -1,87 +1,87 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadFormaPagamentoWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadFormaPagamentoWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codFormaPag" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descFormaPag" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadFormaPagamentoWS", propOrder = { - "codFormaPag", - "descFormaPag" -}) -public class ExportaIntegracaoCadFormaPagamentoWS { - - protected String codFormaPag; - protected String descFormaPag; - - /** - * Gets the value of the codFormaPag property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodFormaPag() { - return codFormaPag; - } - - /** - * Sets the value of the codFormaPag property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodFormaPag(String value) { - this.codFormaPag = value; - } - - /** - * Gets the value of the descFormaPag property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescFormaPag() { - return descFormaPag; - } - - /** - * Sets the value of the descFormaPag property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescFormaPag(String value) { - this.descFormaPag = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadFormaPagamentoWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadFormaPagamentoWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codFormaPag" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descFormaPag" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadFormaPagamentoWS", propOrder = { + "codFormaPag", + "descFormaPag" +}) +public class ExportaIntegracaoCadFormaPagamentoWS { + + protected String codFormaPag; + protected String descFormaPag; + + /** + * Gets the value of the codFormaPag property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodFormaPag() { + return codFormaPag; + } + + /** + * Sets the value of the codFormaPag property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodFormaPag(String value) { + this.codFormaPag = value; + } + + /** + * Gets the value of the descFormaPag property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescFormaPag() { + return descFormaPag; + } + + /** + * Sets the value of the descFormaPag property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescFormaPag(String value) { + this.descFormaPag = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLinhaWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLinhaWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLinhaWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLinhaWS.java index 5523ed2e5..ea467d34f 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLinhaWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLinhaWS.java @@ -1,222 +1,222 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadLinhaWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadLinhaWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="classeLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresaLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="detalheLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="orgConcedLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="prefixoLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadLinhaWS", propOrder = { - "classeLinha", - "codEmpresaLinha", - "codLinha", - "descLinha", - "detalheLinha", - "orgConcedLinha", - "prefixoLinha" -}) -public class ExportaIntegracaoCadLinhaWS { - - protected String classeLinha; - protected String codEmpresaLinha; - protected String codLinha; - protected String descLinha; - protected String detalheLinha; - protected String orgConcedLinha; - protected String prefixoLinha; - - /** - * Gets the value of the classeLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getClasseLinha() { - return classeLinha; - } - - /** - * Sets the value of the classeLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setClasseLinha(String value) { - this.classeLinha = value; - } - - /** - * Gets the value of the codEmpresaLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresaLinha() { - return codEmpresaLinha; - } - - /** - * Sets the value of the codEmpresaLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresaLinha(String value) { - this.codEmpresaLinha = value; - } - - /** - * Gets the value of the codLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodLinha() { - return codLinha; - } - - /** - * Sets the value of the codLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodLinha(String value) { - this.codLinha = value; - } - - /** - * Gets the value of the descLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescLinha() { - return descLinha; - } - - /** - * Sets the value of the descLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescLinha(String value) { - this.descLinha = value; - } - - /** - * Gets the value of the detalheLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDetalheLinha() { - return detalheLinha; - } - - /** - * Sets the value of the detalheLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDetalheLinha(String value) { - this.detalheLinha = value; - } - - /** - * Gets the value of the orgConcedLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOrgConcedLinha() { - return orgConcedLinha; - } - - /** - * Sets the value of the orgConcedLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOrgConcedLinha(String value) { - this.orgConcedLinha = value; - } - - /** - * Gets the value of the prefixoLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPrefixoLinha() { - return prefixoLinha; - } - - /** - * Sets the value of the prefixoLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPrefixoLinha(String value) { - this.prefixoLinha = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadLinhaWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadLinhaWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="classeLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresaLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="detalheLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="orgConcedLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="prefixoLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadLinhaWS", propOrder = { + "classeLinha", + "codEmpresaLinha", + "codLinha", + "descLinha", + "detalheLinha", + "orgConcedLinha", + "prefixoLinha" +}) +public class ExportaIntegracaoCadLinhaWS { + + protected String classeLinha; + protected String codEmpresaLinha; + protected String codLinha; + protected String descLinha; + protected String detalheLinha; + protected String orgConcedLinha; + protected String prefixoLinha; + + /** + * Gets the value of the classeLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getClasseLinha() { + return classeLinha; + } + + /** + * Sets the value of the classeLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setClasseLinha(String value) { + this.classeLinha = value; + } + + /** + * Gets the value of the codEmpresaLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresaLinha() { + return codEmpresaLinha; + } + + /** + * Sets the value of the codEmpresaLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresaLinha(String value) { + this.codEmpresaLinha = value; + } + + /** + * Gets the value of the codLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodLinha() { + return codLinha; + } + + /** + * Sets the value of the codLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodLinha(String value) { + this.codLinha = value; + } + + /** + * Gets the value of the descLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescLinha() { + return descLinha; + } + + /** + * Sets the value of the descLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescLinha(String value) { + this.descLinha = value; + } + + /** + * Gets the value of the detalheLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDetalheLinha() { + return detalheLinha; + } + + /** + * Sets the value of the detalheLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDetalheLinha(String value) { + this.detalheLinha = value; + } + + /** + * Gets the value of the orgConcedLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrgConcedLinha() { + return orgConcedLinha; + } + + /** + * Sets the value of the orgConcedLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrgConcedLinha(String value) { + this.orgConcedLinha = value; + } + + /** + * Gets the value of the prefixoLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrefixoLinha() { + return prefixoLinha; + } + + /** + * Sets the value of the prefixoLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrefixoLinha(String value) { + this.prefixoLinha = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLocalidadeWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLocalidadeWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLocalidadeWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLocalidadeWS.java index b621352dd..3a81786a0 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLocalidadeWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadLocalidadeWS.java @@ -1,168 +1,168 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadLocalidadeWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadLocalidadeWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codEstadoLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="siglaLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="taxaRodoviariaLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadLocalidadeWS", propOrder = { - "codEstadoLocalidade", - "codLocalidade", - "descLocalidade", - "siglaLocalidade", - "taxaRodoviariaLocalidade" -}) -public class ExportaIntegracaoCadLocalidadeWS { - - protected String codEstadoLocalidade; - protected String codLocalidade; - protected String descLocalidade; - protected String siglaLocalidade; - protected String taxaRodoviariaLocalidade; - - /** - * Gets the value of the codEstadoLocalidade property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEstadoLocalidade() { - return codEstadoLocalidade; - } - - /** - * Sets the value of the codEstadoLocalidade property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEstadoLocalidade(String value) { - this.codEstadoLocalidade = value; - } - - /** - * Gets the value of the codLocalidade property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodLocalidade() { - return codLocalidade; - } - - /** - * Sets the value of the codLocalidade property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodLocalidade(String value) { - this.codLocalidade = value; - } - - /** - * Gets the value of the descLocalidade property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescLocalidade() { - return descLocalidade; - } - - /** - * Sets the value of the descLocalidade property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescLocalidade(String value) { - this.descLocalidade = value; - } - - /** - * Gets the value of the siglaLocalidade property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSiglaLocalidade() { - return siglaLocalidade; - } - - /** - * Sets the value of the siglaLocalidade property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSiglaLocalidade(String value) { - this.siglaLocalidade = value; - } - - /** - * Gets the value of the taxaRodoviariaLocalidade property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTaxaRodoviariaLocalidade() { - return taxaRodoviariaLocalidade; - } - - /** - * Sets the value of the taxaRodoviariaLocalidade property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTaxaRodoviariaLocalidade(String value) { - this.taxaRodoviariaLocalidade = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadLocalidadeWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadLocalidadeWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codEstadoLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="siglaLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="taxaRodoviariaLocalidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadLocalidadeWS", propOrder = { + "codEstadoLocalidade", + "codLocalidade", + "descLocalidade", + "siglaLocalidade", + "taxaRodoviariaLocalidade" +}) +public class ExportaIntegracaoCadLocalidadeWS { + + protected String codEstadoLocalidade; + protected String codLocalidade; + protected String descLocalidade; + protected String siglaLocalidade; + protected String taxaRodoviariaLocalidade; + + /** + * Gets the value of the codEstadoLocalidade property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEstadoLocalidade() { + return codEstadoLocalidade; + } + + /** + * Sets the value of the codEstadoLocalidade property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEstadoLocalidade(String value) { + this.codEstadoLocalidade = value; + } + + /** + * Gets the value of the codLocalidade property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodLocalidade() { + return codLocalidade; + } + + /** + * Sets the value of the codLocalidade property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodLocalidade(String value) { + this.codLocalidade = value; + } + + /** + * Gets the value of the descLocalidade property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescLocalidade() { + return descLocalidade; + } + + /** + * Sets the value of the descLocalidade property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescLocalidade(String value) { + this.descLocalidade = value; + } + + /** + * Gets the value of the siglaLocalidade property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSiglaLocalidade() { + return siglaLocalidade; + } + + /** + * Sets the value of the siglaLocalidade property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSiglaLocalidade(String value) { + this.siglaLocalidade = value; + } + + /** + * Gets the value of the taxaRodoviariaLocalidade property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTaxaRodoviariaLocalidade() { + return taxaRodoviariaLocalidade; + } + + /** + * Sets the value of the taxaRodoviariaLocalidade property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTaxaRodoviariaLocalidade(String value) { + this.taxaRodoviariaLocalidade = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadReceitaDespesaWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadReceitaDespesaWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadReceitaDespesaWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadReceitaDespesaWS.java index e59ae77fa..cb1645865 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadReceitaDespesaWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoCadReceitaDespesaWS.java @@ -1,195 +1,195 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoCadReceitaDespesaWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoCadReceitaDespesaWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="codAgenciaReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresaReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="credDebitoReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="formaPagReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoCadReceitaDespesaWS", propOrder = { - "codAgenciaReceitaDespesa", - "codEmpresaReceitaDespesa", - "codReceitaDespesa", - "credDebitoReceitaDespesa", - "descReceitaDespesa", - "formaPagReceitaDespesa" -}) -public class ExportaIntegracaoCadReceitaDespesaWS { - - protected String codAgenciaReceitaDespesa; - protected String codEmpresaReceitaDespesa; - protected String codReceitaDespesa; - protected String credDebitoReceitaDespesa; - protected String descReceitaDespesa; - protected String formaPagReceitaDespesa; - - /** - * Gets the value of the codAgenciaReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodAgenciaReceitaDespesa() { - return codAgenciaReceitaDespesa; - } - - /** - * Sets the value of the codAgenciaReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodAgenciaReceitaDespesa(String value) { - this.codAgenciaReceitaDespesa = value; - } - - /** - * Gets the value of the codEmpresaReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresaReceitaDespesa() { - return codEmpresaReceitaDespesa; - } - - /** - * Sets the value of the codEmpresaReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresaReceitaDespesa(String value) { - this.codEmpresaReceitaDespesa = value; - } - - /** - * Gets the value of the codReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodReceitaDespesa() { - return codReceitaDespesa; - } - - /** - * Sets the value of the codReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodReceitaDespesa(String value) { - this.codReceitaDespesa = value; - } - - /** - * Gets the value of the credDebitoReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCredDebitoReceitaDespesa() { - return credDebitoReceitaDespesa; - } - - /** - * Sets the value of the credDebitoReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCredDebitoReceitaDespesa(String value) { - this.credDebitoReceitaDespesa = value; - } - - /** - * Gets the value of the descReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescReceitaDespesa() { - return descReceitaDespesa; - } - - /** - * Sets the value of the descReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescReceitaDespesa(String value) { - this.descReceitaDespesa = value; - } - - /** - * Gets the value of the formaPagReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFormaPagReceitaDespesa() { - return formaPagReceitaDespesa; - } - - /** - * Sets the value of the formaPagReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFormaPagReceitaDespesa(String value) { - this.formaPagReceitaDespesa = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoCadReceitaDespesaWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoCadReceitaDespesaWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="codAgenciaReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresaReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="credDebitoReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="formaPagReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoCadReceitaDespesaWS", propOrder = { + "codAgenciaReceitaDespesa", + "codEmpresaReceitaDespesa", + "codReceitaDespesa", + "credDebitoReceitaDespesa", + "descReceitaDespesa", + "formaPagReceitaDespesa" +}) +public class ExportaIntegracaoCadReceitaDespesaWS { + + protected String codAgenciaReceitaDespesa; + protected String codEmpresaReceitaDespesa; + protected String codReceitaDespesa; + protected String credDebitoReceitaDespesa; + protected String descReceitaDespesa; + protected String formaPagReceitaDespesa; + + /** + * Gets the value of the codAgenciaReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodAgenciaReceitaDespesa() { + return codAgenciaReceitaDespesa; + } + + /** + * Sets the value of the codAgenciaReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodAgenciaReceitaDespesa(String value) { + this.codAgenciaReceitaDespesa = value; + } + + /** + * Gets the value of the codEmpresaReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresaReceitaDespesa() { + return codEmpresaReceitaDespesa; + } + + /** + * Sets the value of the codEmpresaReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresaReceitaDespesa(String value) { + this.codEmpresaReceitaDespesa = value; + } + + /** + * Gets the value of the codReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodReceitaDespesa() { + return codReceitaDespesa; + } + + /** + * Sets the value of the codReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodReceitaDespesa(String value) { + this.codReceitaDespesa = value; + } + + /** + * Gets the value of the credDebitoReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCredDebitoReceitaDespesa() { + return credDebitoReceitaDespesa; + } + + /** + * Sets the value of the credDebitoReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCredDebitoReceitaDespesa(String value) { + this.credDebitoReceitaDespesa = value; + } + + /** + * Gets the value of the descReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescReceitaDespesa() { + return descReceitaDespesa; + } + + /** + * Sets the value of the descReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescReceitaDespesa(String value) { + this.descReceitaDespesa = value; + } + + /** + * Gets the value of the formaPagReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFormaPagReceitaDespesa() { + return formaPagReceitaDespesa; + } + + /** + * Sets the value of the formaPagReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFormaPagReceitaDespesa(String value) { + this.formaPagReceitaDespesa = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoReceitaDespesaWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoReceitaDespesaWS.java similarity index 95% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoReceitaDespesaWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoReceitaDespesaWS.java index ec63a71af..04705e5de 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoReceitaDespesaWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoReceitaDespesaWS.java @@ -1,303 +1,303 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoReceitaDespesaWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoReceitaDespesaWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="agencia" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codFilial" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataLancamento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataMovimento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="idReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="turno" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="usuario" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="valorLancamento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoReceitaDespesaWS", propOrder = { - "agencia", - "codEmpresa", - "codFilial", - "codReceitaDespesa", - "dataLancamento", - "dataMovimento", - "idReceitaDespesa", - "turno", - "usuario", - "valorLancamento" -}) -public class ExportaIntegracaoReceitaDespesaWS { - - protected String agencia; - protected String codEmpresa; - protected String codFilial; - protected String codReceitaDespesa; - protected String dataLancamento; - protected String dataMovimento; - protected String idReceitaDespesa; - protected String turno; - protected String usuario; - protected String valorLancamento; - - /** - * Gets the value of the agencia property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgencia() { - return agencia; - } - - /** - * Sets the value of the agencia property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgencia(String value) { - this.agencia = value; - } - - /** - * Gets the value of the codEmpresa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodEmpresa() { - return codEmpresa; - } - - /** - * Sets the value of the codEmpresa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodEmpresa(String value) { - this.codEmpresa = value; - } - - /** - * Gets the value of the codFilial property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodFilial() { - return codFilial; - } - - /** - * Sets the value of the codFilial property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodFilial(String value) { - this.codFilial = value; - } - - /** - * Gets the value of the codReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodReceitaDespesa() { - return codReceitaDespesa; - } - - /** - * Sets the value of the codReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodReceitaDespesa(String value) { - this.codReceitaDespesa = value; - } - - /** - * Gets the value of the dataLancamento property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataLancamento() { - return dataLancamento; - } - - /** - * Sets the value of the dataLancamento property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataLancamento(String value) { - this.dataLancamento = value; - } - - /** - * Gets the value of the dataMovimento property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataMovimento() { - return dataMovimento; - } - - /** - * Sets the value of the dataMovimento property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataMovimento(String value) { - this.dataMovimento = value; - } - - /** - * Gets the value of the idReceitaDespesa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIdReceitaDespesa() { - return idReceitaDespesa; - } - - /** - * Sets the value of the idReceitaDespesa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIdReceitaDespesa(String value) { - this.idReceitaDespesa = value; - } - - /** - * Gets the value of the turno property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTurno() { - return turno; - } - - /** - * Sets the value of the turno property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTurno(String value) { - this.turno = value; - } - - /** - * Gets the value of the usuario property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getUsuario() { - return usuario; - } - - /** - * Sets the value of the usuario property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setUsuario(String value) { - this.usuario = value; - } - - /** - * Gets the value of the valorLancamento property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValorLancamento() { - return valorLancamento; - } - - /** - * Sets the value of the valorLancamento property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValorLancamento(String value) { - this.valorLancamento = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoReceitaDespesaWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoReceitaDespesaWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="agencia" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codEmpresa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codFilial" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataLancamento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataMovimento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="idReceitaDespesa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="turno" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="usuario" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="valorLancamento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoReceitaDespesaWS", propOrder = { + "agencia", + "codEmpresa", + "codFilial", + "codReceitaDespesa", + "dataLancamento", + "dataMovimento", + "idReceitaDespesa", + "turno", + "usuario", + "valorLancamento" +}) +public class ExportaIntegracaoReceitaDespesaWS { + + protected String agencia; + protected String codEmpresa; + protected String codFilial; + protected String codReceitaDespesa; + protected String dataLancamento; + protected String dataMovimento; + protected String idReceitaDespesa; + protected String turno; + protected String usuario; + protected String valorLancamento; + + /** + * Gets the value of the agencia property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgencia() { + return agencia; + } + + /** + * Sets the value of the agencia property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgencia(String value) { + this.agencia = value; + } + + /** + * Gets the value of the codEmpresa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodEmpresa() { + return codEmpresa; + } + + /** + * Sets the value of the codEmpresa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodEmpresa(String value) { + this.codEmpresa = value; + } + + /** + * Gets the value of the codFilial property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodFilial() { + return codFilial; + } + + /** + * Sets the value of the codFilial property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodFilial(String value) { + this.codFilial = value; + } + + /** + * Gets the value of the codReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodReceitaDespesa() { + return codReceitaDespesa; + } + + /** + * Sets the value of the codReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodReceitaDespesa(String value) { + this.codReceitaDespesa = value; + } + + /** + * Gets the value of the dataLancamento property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataLancamento() { + return dataLancamento; + } + + /** + * Sets the value of the dataLancamento property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataLancamento(String value) { + this.dataLancamento = value; + } + + /** + * Gets the value of the dataMovimento property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataMovimento() { + return dataMovimento; + } + + /** + * Sets the value of the dataMovimento property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataMovimento(String value) { + this.dataMovimento = value; + } + + /** + * Gets the value of the idReceitaDespesa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdReceitaDespesa() { + return idReceitaDespesa; + } + + /** + * Sets the value of the idReceitaDespesa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdReceitaDespesa(String value) { + this.idReceitaDespesa = value; + } + + /** + * Gets the value of the turno property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTurno() { + return turno; + } + + /** + * Sets the value of the turno property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTurno(String value) { + this.turno = value; + } + + /** + * Gets the value of the usuario property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUsuario() { + return usuario; + } + + /** + * Sets the value of the usuario property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUsuario(String value) { + this.usuario = value; + } + + /** + * Gets the value of the valorLancamento property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValorLancamento() { + return valorLancamento; + } + + /** + * Sets the value of the valorLancamento property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValorLancamento(String value) { + this.valorLancamento = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoWS.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoWS.java similarity index 96% rename from src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoWS.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoWS.java index 54cc39ef9..240470a51 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoWS.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ExportaIntegracaoWS.java @@ -1,2747 +1,2747 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for exportaIntegracaoWS complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="exportaIntegracaoWS">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="AIDF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="acrescimoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaDesembarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaEmbarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaEmissaoCupomFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaMovimentacaoPassagen" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaPrestacaoConta" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="agenciaTMRRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="autorizacao0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="autorizacao1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="autorizacao2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="bilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="boletoId" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
- *         <element name="COOFinalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="COOInicialECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="CROECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="CRZECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="cancelamentoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codigoAnulacao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codigoClienteRequisicao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="codigoVenda" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataReducaoECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataServico" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataVenda" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="dataViagem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="desconto" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="descontoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="destino" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="devolucaoCupomFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="espaco1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="espaco2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="espaco3" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="espaco4" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="espaco5" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="estabelecimento0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="estabelecimento1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="estabelecimento2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="estado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="exclusivoBilheteriaGlobus" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="formaPagto0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="formaPagto1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="formaPagto2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="horaServico" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="horaVenda" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="horaViagem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="isentoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="linha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="modalidadeIPosterior" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="modeloBilheteFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="motorista1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="motorista2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NSU0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NSU1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NSU2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NSUHostTID0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NSUHostTID1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NSUHostTID2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="naoIncidenciaICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="nomePassageiroRequisicao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroCaixaFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroCupomFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroDVPRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroLojaFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroPreImpresso" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroRequisicao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroSerieImpressoraECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroSistemaEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="numeroVT" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="origem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="outros" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="pedagio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="poltrona" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="porcentagemFormaPagto0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="porcentagemFormaPagto1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="porcentagemFormaPagto2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="prefixoLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="qtdeParcela0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="qtdeParcela1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="qtdeParcela2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="qtdePassageiros" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="quantidadeCanceladoECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="registros" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <element name="SVIRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="seguro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="seriePassagens" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="servico" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="statusSVIRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="subseriePassagens" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="substituicaoTributariaICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="TMRRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="tarifa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="taxaEmbarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="tipoPassagem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="valorGrandeTotalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="valorMultaCancelamento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="valorVendaBrutaECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="veiculo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="vlrFormaPagto0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="vlrFormaPagto1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="vlrFormaPagto2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "exportaIntegracaoWS", propOrder = { - "aidf", - "acrescimoICMSECF", - "agenciaDesembarque", - "agenciaEmbarque", - "agenciaEmissaoCupomFiscalECF", - "agenciaMovimentacaoPassagen", - "agenciaPrestacaoConta", - "agenciaTMRRS", - "autorizacao0", - "autorizacao1", - "autorizacao2", - "bilheteiro", - "boletoId", - "cooFinalECF", - "cooInicialECF", - "croecf", - "crzecf", - "cancelamentoICMSECF", - "codigoAnulacao", - "codigoClienteRequisicao", - "codigoVenda", - "dataReducaoECF", - "dataServico", - "dataVenda", - "dataViagem", - "desconto", - "descontoICMSECF", - "destino", - "devolucaoCupomFiscalECF", - "espaco1", - "espaco2", - "espaco3", - "espaco4", - "espaco5", - "estabelecimento0", - "estabelecimento1", - "estabelecimento2", - "estado", - "exclusivoBilheteriaGlobus", - "formaPagto0", - "formaPagto1", - "formaPagto2", - "horaServico", - "horaVenda", - "horaViagem", - "isentoICMSECF", - "linha", - "modalidadeIPosterior", - "modeloBilheteFiscalECF", - "motorista1", - "motorista2", - "nsu0", - "nsu1", - "nsu2", - "nsuHostTID0", - "nsuHostTID1", - "nsuHostTID2", - "naoIncidenciaICMSECF", - "nomePassageiroRequisicao", - "numeroCaixaFiscalECF", - "numeroCupomFiscalECF", - "numeroDVPRS", - "numeroLojaFiscalECF", - "numeroPreImpresso", - "numeroRequisicao", - "numeroSerieImpressoraECF", - "numeroSistemaEstado", - "numeroVT", - "origem", - "outros", - "pedagio", - "poltrona", - "porcentagemFormaPagto0", - "porcentagemFormaPagto1", - "porcentagemFormaPagto2", - "prefixoLinha", - "qtdeParcela0", - "qtdeParcela1", - "qtdeParcela2", - "qtdePassageiros", - "quantidadeCanceladoECF", - "registros", - "svirs", - "seguro", - "seriePassagens", - "servico", - "statusSVIRS", - "subseriePassagens", - "substituicaoTributariaICMSECF", - "tmrrs", - "tarifa", - "taxaEmbarque", - "tipoPassagem", - "valorGrandeTotalECF", - "valorMultaCancelamento", - "valorVendaBrutaECF", - "veiculo", - "vlrFormaPagto0", - "vlrFormaPagto1", - "vlrFormaPagto2" -}) -public class ExportaIntegracaoWS { - - @XmlElement(name = "AIDF") - protected String aidf; - protected String acrescimoICMSECF; - protected String agenciaDesembarque; - protected String agenciaEmbarque; - protected String agenciaEmissaoCupomFiscalECF; - protected String agenciaMovimentacaoPassagen; - protected String agenciaPrestacaoConta; - protected String agenciaTMRRS; - protected String autorizacao0; - protected String autorizacao1; - protected String autorizacao2; - protected String bilheteiro; - protected Long boletoId; - @XmlElement(name = "COOFinalECF") - protected String cooFinalECF; - @XmlElement(name = "COOInicialECF") - protected String cooInicialECF; - @XmlElement(name = "CROECF") - protected String croecf; - @XmlElement(name = "CRZECF") - protected String crzecf; - protected String cancelamentoICMSECF; - protected String codigoAnulacao; - protected String codigoClienteRequisicao; - protected String codigoVenda; - protected String dataReducaoECF; - protected String dataServico; - protected String dataVenda; - protected String dataViagem; - protected String desconto; - protected String descontoICMSECF; - protected String destino; - protected String devolucaoCupomFiscalECF; - protected String espaco1; - protected String espaco2; - protected String espaco3; - protected String espaco4; - protected String espaco5; - protected String estabelecimento0; - protected String estabelecimento1; - protected String estabelecimento2; - protected String estado; - protected String exclusivoBilheteriaGlobus; - protected String formaPagto0; - protected String formaPagto1; - protected String formaPagto2; - protected String horaServico; - protected String horaVenda; - protected String horaViagem; - protected String isentoICMSECF; - protected String linha; - protected String modalidadeIPosterior; - protected String modeloBilheteFiscalECF; - protected String motorista1; - protected String motorista2; - @XmlElement(name = "NSU0") - protected String nsu0; - @XmlElement(name = "NSU1") - protected String nsu1; - @XmlElement(name = "NSU2") - protected String nsu2; - @XmlElement(name = "NSUHostTID0") - protected String nsuHostTID0; - @XmlElement(name = "NSUHostTID1") - protected String nsuHostTID1; - @XmlElement(name = "NSUHostTID2") - protected String nsuHostTID2; - protected String naoIncidenciaICMSECF; - protected String nomePassageiroRequisicao; - protected String numeroCaixaFiscalECF; - protected String numeroCupomFiscalECF; - protected String numeroDVPRS; - protected String numeroLojaFiscalECF; - protected String numeroPreImpresso; - protected String numeroRequisicao; - protected String numeroSerieImpressoraECF; - protected String numeroSistemaEstado; - protected String numeroVT; - protected String origem; - protected String outros; - protected String pedagio; - protected String poltrona; - protected String porcentagemFormaPagto0; - protected String porcentagemFormaPagto1; - protected String porcentagemFormaPagto2; - protected String prefixoLinha; - protected String qtdeParcela0; - protected String qtdeParcela1; - protected String qtdeParcela2; - protected String qtdePassageiros; - protected String quantidadeCanceladoECF; - protected Integer registros; - @XmlElement(name = "SVIRS") - protected String svirs; - protected String seguro; - protected String seriePassagens; - protected String servico; - protected String statusSVIRS; - protected String subseriePassagens; - protected String substituicaoTributariaICMSECF; - @XmlElement(name = "TMRRS") - protected String tmrrs; - protected String tarifa; - protected String taxaEmbarque; - protected String tipoPassagem; - protected String valorGrandeTotalECF; - protected String valorMultaCancelamento; - protected String valorVendaBrutaECF; - protected String veiculo; - protected String vlrFormaPagto0; - protected String vlrFormaPagto1; - protected String vlrFormaPagto2; - - /** - * Gets the value of the aidf property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAIDF() { - return aidf; - } - - /** - * Sets the value of the aidf property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAIDF(String value) { - this.aidf = value; - } - - /** - * Gets the value of the acrescimoICMSECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAcrescimoICMSECF() { - return acrescimoICMSECF; - } - - /** - * Sets the value of the acrescimoICMSECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAcrescimoICMSECF(String value) { - this.acrescimoICMSECF = value; - } - - /** - * Gets the value of the agenciaDesembarque property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaDesembarque() { - return agenciaDesembarque; - } - - /** - * Sets the value of the agenciaDesembarque property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaDesembarque(String value) { - this.agenciaDesembarque = value; - } - - /** - * Gets the value of the agenciaEmbarque property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaEmbarque() { - return agenciaEmbarque; - } - - /** - * Sets the value of the agenciaEmbarque property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaEmbarque(String value) { - this.agenciaEmbarque = value; - } - - /** - * Gets the value of the agenciaEmissaoCupomFiscalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaEmissaoCupomFiscalECF() { - return agenciaEmissaoCupomFiscalECF; - } - - /** - * Sets the value of the agenciaEmissaoCupomFiscalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaEmissaoCupomFiscalECF(String value) { - this.agenciaEmissaoCupomFiscalECF = value; - } - - /** - * Gets the value of the agenciaMovimentacaoPassagen property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaMovimentacaoPassagen() { - return agenciaMovimentacaoPassagen; - } - - /** - * Sets the value of the agenciaMovimentacaoPassagen property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaMovimentacaoPassagen(String value) { - this.agenciaMovimentacaoPassagen = value; - } - - /** - * Gets the value of the agenciaPrestacaoConta property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaPrestacaoConta() { - return agenciaPrestacaoConta; - } - - /** - * Sets the value of the agenciaPrestacaoConta property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaPrestacaoConta(String value) { - this.agenciaPrestacaoConta = value; - } - - /** - * Gets the value of the agenciaTMRRS property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAgenciaTMRRS() { - return agenciaTMRRS; - } - - /** - * Sets the value of the agenciaTMRRS property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAgenciaTMRRS(String value) { - this.agenciaTMRRS = value; - } - - /** - * Gets the value of the autorizacao0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAutorizacao0() { - return autorizacao0; - } - - /** - * Sets the value of the autorizacao0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAutorizacao0(String value) { - this.autorizacao0 = value; - } - - /** - * Gets the value of the autorizacao1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAutorizacao1() { - return autorizacao1; - } - - /** - * Sets the value of the autorizacao1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAutorizacao1(String value) { - this.autorizacao1 = value; - } - - /** - * Gets the value of the autorizacao2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAutorizacao2() { - return autorizacao2; - } - - /** - * Sets the value of the autorizacao2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAutorizacao2(String value) { - this.autorizacao2 = value; - } - - /** - * Gets the value of the bilheteiro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBilheteiro() { - return bilheteiro; - } - - /** - * Sets the value of the bilheteiro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBilheteiro(String value) { - this.bilheteiro = value; - } - - /** - * Gets the value of the boletoId property. - * - * @return - * possible object is - * {@link Long } - * - */ - public Long getBoletoId() { - return boletoId; - } - - /** - * Sets the value of the boletoId property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setBoletoId(Long value) { - this.boletoId = value; - } - - /** - * Gets the value of the cooFinalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCOOFinalECF() { - return cooFinalECF; - } - - /** - * Sets the value of the cooFinalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCOOFinalECF(String value) { - this.cooFinalECF = value; - } - - /** - * Gets the value of the cooInicialECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCOOInicialECF() { - return cooInicialECF; - } - - /** - * Sets the value of the cooInicialECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCOOInicialECF(String value) { - this.cooInicialECF = value; - } - - /** - * Gets the value of the croecf property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCROECF() { - return croecf; - } - - /** - * Sets the value of the croecf property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCROECF(String value) { - this.croecf = value; - } - - /** - * Gets the value of the crzecf property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCRZECF() { - return crzecf; - } - - /** - * Sets the value of the crzecf property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCRZECF(String value) { - this.crzecf = value; - } - - /** - * Gets the value of the cancelamentoICMSECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCancelamentoICMSECF() { - return cancelamentoICMSECF; - } - - /** - * Sets the value of the cancelamentoICMSECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCancelamentoICMSECF(String value) { - this.cancelamentoICMSECF = value; - } - - /** - * Gets the value of the codigoAnulacao property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodigoAnulacao() { - return codigoAnulacao; - } - - /** - * Sets the value of the codigoAnulacao property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodigoAnulacao(String value) { - this.codigoAnulacao = value; - } - - /** - * Gets the value of the codigoClienteRequisicao property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodigoClienteRequisicao() { - return codigoClienteRequisicao; - } - - /** - * Sets the value of the codigoClienteRequisicao property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodigoClienteRequisicao(String value) { - this.codigoClienteRequisicao = value; - } - - /** - * Gets the value of the codigoVenda property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCodigoVenda() { - return codigoVenda; - } - - /** - * Sets the value of the codigoVenda property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCodigoVenda(String value) { - this.codigoVenda = value; - } - - /** - * Gets the value of the dataReducaoECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataReducaoECF() { - return dataReducaoECF; - } - - /** - * Sets the value of the dataReducaoECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataReducaoECF(String value) { - this.dataReducaoECF = value; - } - - /** - * Gets the value of the dataServico property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataServico() { - return dataServico; - } - - /** - * Sets the value of the dataServico property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataServico(String value) { - this.dataServico = value; - } - - /** - * Gets the value of the dataVenda property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataVenda() { - return dataVenda; - } - - /** - * Sets the value of the dataVenda property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataVenda(String value) { - this.dataVenda = value; - } - - /** - * Gets the value of the dataViagem property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDataViagem() { - return dataViagem; - } - - /** - * Sets the value of the dataViagem property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDataViagem(String value) { - this.dataViagem = value; - } - - /** - * Gets the value of the desconto property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDesconto() { - return desconto; - } - - /** - * Sets the value of the desconto property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDesconto(String value) { - this.desconto = value; - } - - /** - * Gets the value of the descontoICMSECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDescontoICMSECF() { - return descontoICMSECF; - } - - /** - * Sets the value of the descontoICMSECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDescontoICMSECF(String value) { - this.descontoICMSECF = value; - } - - /** - * Gets the value of the destino property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDestino() { - return destino; - } - - /** - * Sets the value of the destino property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDestino(String value) { - this.destino = value; - } - - /** - * Gets the value of the devolucaoCupomFiscalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDevolucaoCupomFiscalECF() { - return devolucaoCupomFiscalECF; - } - - /** - * Sets the value of the devolucaoCupomFiscalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDevolucaoCupomFiscalECF(String value) { - this.devolucaoCupomFiscalECF = value; - } - - /** - * Gets the value of the espaco1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEspaco1() { - return espaco1; - } - - /** - * Sets the value of the espaco1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEspaco1(String value) { - this.espaco1 = value; - } - - /** - * Gets the value of the espaco2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEspaco2() { - return espaco2; - } - - /** - * Sets the value of the espaco2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEspaco2(String value) { - this.espaco2 = value; - } - - /** - * Gets the value of the espaco3 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEspaco3() { - return espaco3; - } - - /** - * Sets the value of the espaco3 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEspaco3(String value) { - this.espaco3 = value; - } - - /** - * Gets the value of the espaco4 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEspaco4() { - return espaco4; - } - - /** - * Sets the value of the espaco4 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEspaco4(String value) { - this.espaco4 = value; - } - - /** - * Gets the value of the espaco5 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEspaco5() { - return espaco5; - } - - /** - * Sets the value of the espaco5 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEspaco5(String value) { - this.espaco5 = value; - } - - /** - * Gets the value of the estabelecimento0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEstabelecimento0() { - return estabelecimento0; - } - - /** - * Sets the value of the estabelecimento0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEstabelecimento0(String value) { - this.estabelecimento0 = value; - } - - /** - * Gets the value of the estabelecimento1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEstabelecimento1() { - return estabelecimento1; - } - - /** - * Sets the value of the estabelecimento1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEstabelecimento1(String value) { - this.estabelecimento1 = value; - } - - /** - * Gets the value of the estabelecimento2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEstabelecimento2() { - return estabelecimento2; - } - - /** - * Sets the value of the estabelecimento2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEstabelecimento2(String value) { - this.estabelecimento2 = value; - } - - /** - * Gets the value of the estado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEstado() { - return estado; - } - - /** - * Sets the value of the estado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEstado(String value) { - this.estado = value; - } - - /** - * Gets the value of the exclusivoBilheteriaGlobus property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getExclusivoBilheteriaGlobus() { - return exclusivoBilheteriaGlobus; - } - - /** - * Sets the value of the exclusivoBilheteriaGlobus property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setExclusivoBilheteriaGlobus(String value) { - this.exclusivoBilheteriaGlobus = value; - } - - /** - * Gets the value of the formaPagto0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFormaPagto0() { - return formaPagto0; - } - - /** - * Sets the value of the formaPagto0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFormaPagto0(String value) { - this.formaPagto0 = value; - } - - /** - * Gets the value of the formaPagto1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFormaPagto1() { - return formaPagto1; - } - - /** - * Sets the value of the formaPagto1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFormaPagto1(String value) { - this.formaPagto1 = value; - } - - /** - * Gets the value of the formaPagto2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFormaPagto2() { - return formaPagto2; - } - - /** - * Sets the value of the formaPagto2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFormaPagto2(String value) { - this.formaPagto2 = value; - } - - /** - * Gets the value of the horaServico property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHoraServico() { - return horaServico; - } - - /** - * Sets the value of the horaServico property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHoraServico(String value) { - this.horaServico = value; - } - - /** - * Gets the value of the horaVenda property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHoraVenda() { - return horaVenda; - } - - /** - * Sets the value of the horaVenda property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHoraVenda(String value) { - this.horaVenda = value; - } - - /** - * Gets the value of the horaViagem property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHoraViagem() { - return horaViagem; - } - - /** - * Sets the value of the horaViagem property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHoraViagem(String value) { - this.horaViagem = value; - } - - /** - * Gets the value of the isentoICMSECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIsentoICMSECF() { - return isentoICMSECF; - } - - /** - * Sets the value of the isentoICMSECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIsentoICMSECF(String value) { - this.isentoICMSECF = value; - } - - /** - * Gets the value of the linha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLinha() { - return linha; - } - - /** - * Sets the value of the linha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLinha(String value) { - this.linha = value; - } - - /** - * Gets the value of the modalidadeIPosterior property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getModalidadeIPosterior() { - return modalidadeIPosterior; - } - - /** - * Sets the value of the modalidadeIPosterior property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setModalidadeIPosterior(String value) { - this.modalidadeIPosterior = value; - } - - /** - * Gets the value of the modeloBilheteFiscalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getModeloBilheteFiscalECF() { - return modeloBilheteFiscalECF; - } - - /** - * Sets the value of the modeloBilheteFiscalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setModeloBilheteFiscalECF(String value) { - this.modeloBilheteFiscalECF = value; - } - - /** - * Gets the value of the motorista1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMotorista1() { - return motorista1; - } - - /** - * Sets the value of the motorista1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMotorista1(String value) { - this.motorista1 = value; - } - - /** - * Gets the value of the motorista2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMotorista2() { - return motorista2; - } - - /** - * Sets the value of the motorista2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMotorista2(String value) { - this.motorista2 = value; - } - - /** - * Gets the value of the nsu0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSU0() { - return nsu0; - } - - /** - * Sets the value of the nsu0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSU0(String value) { - this.nsu0 = value; - } - - /** - * Gets the value of the nsu1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSU1() { - return nsu1; - } - - /** - * Sets the value of the nsu1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSU1(String value) { - this.nsu1 = value; - } - - /** - * Gets the value of the nsu2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSU2() { - return nsu2; - } - - /** - * Sets the value of the nsu2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSU2(String value) { - this.nsu2 = value; - } - - /** - * Gets the value of the nsuHostTID0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSUHostTID0() { - return nsuHostTID0; - } - - /** - * Sets the value of the nsuHostTID0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSUHostTID0(String value) { - this.nsuHostTID0 = value; - } - - /** - * Gets the value of the nsuHostTID1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSUHostTID1() { - return nsuHostTID1; - } - - /** - * Sets the value of the nsuHostTID1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSUHostTID1(String value) { - this.nsuHostTID1 = value; - } - - /** - * Gets the value of the nsuHostTID2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNSUHostTID2() { - return nsuHostTID2; - } - - /** - * Sets the value of the nsuHostTID2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNSUHostTID2(String value) { - this.nsuHostTID2 = value; - } - - /** - * Gets the value of the naoIncidenciaICMSECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNaoIncidenciaICMSECF() { - return naoIncidenciaICMSECF; - } - - /** - * Sets the value of the naoIncidenciaICMSECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNaoIncidenciaICMSECF(String value) { - this.naoIncidenciaICMSECF = value; - } - - /** - * Gets the value of the nomePassageiroRequisicao property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNomePassageiroRequisicao() { - return nomePassageiroRequisicao; - } - - /** - * Sets the value of the nomePassageiroRequisicao property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNomePassageiroRequisicao(String value) { - this.nomePassageiroRequisicao = value; - } - - /** - * Gets the value of the numeroCaixaFiscalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroCaixaFiscalECF() { - return numeroCaixaFiscalECF; - } - - /** - * Sets the value of the numeroCaixaFiscalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroCaixaFiscalECF(String value) { - this.numeroCaixaFiscalECF = value; - } - - /** - * Gets the value of the numeroCupomFiscalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroCupomFiscalECF() { - return numeroCupomFiscalECF; - } - - /** - * Sets the value of the numeroCupomFiscalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroCupomFiscalECF(String value) { - this.numeroCupomFiscalECF = value; - } - - /** - * Gets the value of the numeroDVPRS property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroDVPRS() { - return numeroDVPRS; - } - - /** - * Sets the value of the numeroDVPRS property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroDVPRS(String value) { - this.numeroDVPRS = value; - } - - /** - * Gets the value of the numeroLojaFiscalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroLojaFiscalECF() { - return numeroLojaFiscalECF; - } - - /** - * Sets the value of the numeroLojaFiscalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroLojaFiscalECF(String value) { - this.numeroLojaFiscalECF = value; - } - - /** - * Gets the value of the numeroPreImpresso property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroPreImpresso() { - return numeroPreImpresso; - } - - /** - * Sets the value of the numeroPreImpresso property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroPreImpresso(String value) { - this.numeroPreImpresso = value; - } - - /** - * Gets the value of the numeroRequisicao property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroRequisicao() { - return numeroRequisicao; - } - - /** - * Sets the value of the numeroRequisicao property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroRequisicao(String value) { - this.numeroRequisicao = value; - } - - /** - * Gets the value of the numeroSerieImpressoraECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroSerieImpressoraECF() { - return numeroSerieImpressoraECF; - } - - /** - * Sets the value of the numeroSerieImpressoraECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroSerieImpressoraECF(String value) { - this.numeroSerieImpressoraECF = value; - } - - /** - * Gets the value of the numeroSistemaEstado property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroSistemaEstado() { - return numeroSistemaEstado; - } - - /** - * Sets the value of the numeroSistemaEstado property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroSistemaEstado(String value) { - this.numeroSistemaEstado = value; - } - - /** - * Gets the value of the numeroVT property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNumeroVT() { - return numeroVT; - } - - /** - * Sets the value of the numeroVT property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNumeroVT(String value) { - this.numeroVT = value; - } - - /** - * Gets the value of the origem property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOrigem() { - return origem; - } - - /** - * Sets the value of the origem property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOrigem(String value) { - this.origem = value; - } - - /** - * Gets the value of the outros property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOutros() { - return outros; - } - - /** - * Sets the value of the outros property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOutros(String value) { - this.outros = value; - } - - /** - * Gets the value of the pedagio property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPedagio() { - return pedagio; - } - - /** - * Sets the value of the pedagio property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPedagio(String value) { - this.pedagio = value; - } - - /** - * Gets the value of the poltrona property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPoltrona() { - return poltrona; - } - - /** - * Sets the value of the poltrona property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPoltrona(String value) { - this.poltrona = value; - } - - /** - * Gets the value of the porcentagemFormaPagto0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPorcentagemFormaPagto0() { - return porcentagemFormaPagto0; - } - - /** - * Sets the value of the porcentagemFormaPagto0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPorcentagemFormaPagto0(String value) { - this.porcentagemFormaPagto0 = value; - } - - /** - * Gets the value of the porcentagemFormaPagto1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPorcentagemFormaPagto1() { - return porcentagemFormaPagto1; - } - - /** - * Sets the value of the porcentagemFormaPagto1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPorcentagemFormaPagto1(String value) { - this.porcentagemFormaPagto1 = value; - } - - /** - * Gets the value of the porcentagemFormaPagto2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPorcentagemFormaPagto2() { - return porcentagemFormaPagto2; - } - - /** - * Sets the value of the porcentagemFormaPagto2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPorcentagemFormaPagto2(String value) { - this.porcentagemFormaPagto2 = value; - } - - /** - * Gets the value of the prefixoLinha property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPrefixoLinha() { - return prefixoLinha; - } - - /** - * Sets the value of the prefixoLinha property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPrefixoLinha(String value) { - this.prefixoLinha = value; - } - - /** - * Gets the value of the qtdeParcela0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQtdeParcela0() { - return qtdeParcela0; - } - - /** - * Sets the value of the qtdeParcela0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQtdeParcela0(String value) { - this.qtdeParcela0 = value; - } - - /** - * Gets the value of the qtdeParcela1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQtdeParcela1() { - return qtdeParcela1; - } - - /** - * Sets the value of the qtdeParcela1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQtdeParcela1(String value) { - this.qtdeParcela1 = value; - } - - /** - * Gets the value of the qtdeParcela2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQtdeParcela2() { - return qtdeParcela2; - } - - /** - * Sets the value of the qtdeParcela2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQtdeParcela2(String value) { - this.qtdeParcela2 = value; - } - - /** - * Gets the value of the qtdePassageiros property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQtdePassageiros() { - return qtdePassageiros; - } - - /** - * Sets the value of the qtdePassageiros property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQtdePassageiros(String value) { - this.qtdePassageiros = value; - } - - /** - * Gets the value of the quantidadeCanceladoECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQuantidadeCanceladoECF() { - return quantidadeCanceladoECF; - } - - /** - * Sets the value of the quantidadeCanceladoECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQuantidadeCanceladoECF(String value) { - this.quantidadeCanceladoECF = value; - } - - /** - * Gets the value of the registros property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getRegistros() { - return registros; - } - - /** - * Sets the value of the registros property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setRegistros(Integer value) { - this.registros = value; - } - - /** - * Gets the value of the svirs property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSVIRS() { - return svirs; - } - - /** - * Sets the value of the svirs property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSVIRS(String value) { - this.svirs = value; - } - - /** - * Gets the value of the seguro property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeguro() { - return seguro; - } - - /** - * Sets the value of the seguro property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeguro(String value) { - this.seguro = value; - } - - /** - * Gets the value of the seriePassagens property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSeriePassagens() { - return seriePassagens; - } - - /** - * Sets the value of the seriePassagens property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSeriePassagens(String value) { - this.seriePassagens = value; - } - - /** - * Gets the value of the servico property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getServico() { - return servico; - } - - /** - * Sets the value of the servico property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setServico(String value) { - this.servico = value; - } - - /** - * Gets the value of the statusSVIRS property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStatusSVIRS() { - return statusSVIRS; - } - - /** - * Sets the value of the statusSVIRS property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStatusSVIRS(String value) { - this.statusSVIRS = value; - } - - /** - * Gets the value of the subseriePassagens property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSubseriePassagens() { - return subseriePassagens; - } - - /** - * Sets the value of the subseriePassagens property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSubseriePassagens(String value) { - this.subseriePassagens = value; - } - - /** - * Gets the value of the substituicaoTributariaICMSECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSubstituicaoTributariaICMSECF() { - return substituicaoTributariaICMSECF; - } - - /** - * Sets the value of the substituicaoTributariaICMSECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSubstituicaoTributariaICMSECF(String value) { - this.substituicaoTributariaICMSECF = value; - } - - /** - * Gets the value of the tmrrs property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTMRRS() { - return tmrrs; - } - - /** - * Sets the value of the tmrrs property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTMRRS(String value) { - this.tmrrs = value; - } - - /** - * Gets the value of the tarifa property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTarifa() { - return tarifa; - } - - /** - * Sets the value of the tarifa property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTarifa(String value) { - this.tarifa = value; - } - - /** - * Gets the value of the taxaEmbarque property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTaxaEmbarque() { - return taxaEmbarque; - } - - /** - * Sets the value of the taxaEmbarque property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTaxaEmbarque(String value) { - this.taxaEmbarque = value; - } - - /** - * Gets the value of the tipoPassagem property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTipoPassagem() { - return tipoPassagem; - } - - /** - * Sets the value of the tipoPassagem property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTipoPassagem(String value) { - this.tipoPassagem = value; - } - - /** - * Gets the value of the valorGrandeTotalECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValorGrandeTotalECF() { - return valorGrandeTotalECF; - } - - /** - * Sets the value of the valorGrandeTotalECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValorGrandeTotalECF(String value) { - this.valorGrandeTotalECF = value; - } - - /** - * Gets the value of the valorMultaCancelamento property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValorMultaCancelamento() { - return valorMultaCancelamento; - } - - /** - * Sets the value of the valorMultaCancelamento property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValorMultaCancelamento(String value) { - this.valorMultaCancelamento = value; - } - - /** - * Gets the value of the valorVendaBrutaECF property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValorVendaBrutaECF() { - return valorVendaBrutaECF; - } - - /** - * Sets the value of the valorVendaBrutaECF property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValorVendaBrutaECF(String value) { - this.valorVendaBrutaECF = value; - } - - /** - * Gets the value of the veiculo property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVeiculo() { - return veiculo; - } - - /** - * Sets the value of the veiculo property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVeiculo(String value) { - this.veiculo = value; - } - - /** - * Gets the value of the vlrFormaPagto0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVlrFormaPagto0() { - return vlrFormaPagto0; - } - - /** - * Sets the value of the vlrFormaPagto0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVlrFormaPagto0(String value) { - this.vlrFormaPagto0 = value; - } - - /** - * Gets the value of the vlrFormaPagto1 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVlrFormaPagto1() { - return vlrFormaPagto1; - } - - /** - * Sets the value of the vlrFormaPagto1 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVlrFormaPagto1(String value) { - this.vlrFormaPagto1 = value; - } - - /** - * Gets the value of the vlrFormaPagto2 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVlrFormaPagto2() { - return vlrFormaPagto2; - } - - /** - * Sets the value of the vlrFormaPagto2 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVlrFormaPagto2(String value) { - this.vlrFormaPagto2 = value; - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for exportaIntegracaoWS complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="exportaIntegracaoWS">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="AIDF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="acrescimoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaDesembarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaEmbarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaEmissaoCupomFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaMovimentacaoPassagen" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaPrestacaoConta" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="agenciaTMRRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="autorizacao0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="autorizacao1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="autorizacao2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="bilheteiro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="boletoId" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
+ *         <element name="COOFinalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="COOInicialECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="CROECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="CRZECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="cancelamentoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codigoAnulacao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codigoClienteRequisicao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="codigoVenda" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataReducaoECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataServico" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataVenda" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="dataViagem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="desconto" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="descontoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="destino" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="devolucaoCupomFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="espaco1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="espaco2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="espaco3" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="espaco4" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="espaco5" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="estabelecimento0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="estabelecimento1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="estabelecimento2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="estado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="exclusivoBilheteriaGlobus" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="formaPagto0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="formaPagto1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="formaPagto2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="horaServico" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="horaVenda" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="horaViagem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="isentoICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="linha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="modalidadeIPosterior" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="modeloBilheteFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="motorista1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="motorista2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NSU0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NSU1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NSU2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NSUHostTID0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NSUHostTID1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NSUHostTID2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="naoIncidenciaICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="nomePassageiroRequisicao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroCaixaFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroCupomFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroDVPRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroLojaFiscalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroPreImpresso" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroRequisicao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroSerieImpressoraECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroSistemaEstado" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="numeroVT" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="origem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="outros" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="pedagio" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="poltrona" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="porcentagemFormaPagto0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="porcentagemFormaPagto1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="porcentagemFormaPagto2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="prefixoLinha" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="qtdeParcela0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="qtdeParcela1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="qtdeParcela2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="qtdePassageiros" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="quantidadeCanceladoECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="registros" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="SVIRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="seguro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="seriePassagens" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="servico" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="statusSVIRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="subseriePassagens" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="substituicaoTributariaICMSECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="TMRRS" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="tarifa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="taxaEmbarque" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="tipoPassagem" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="valorGrandeTotalECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="valorMultaCancelamento" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="valorVendaBrutaECF" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="veiculo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="vlrFormaPagto0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="vlrFormaPagto1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="vlrFormaPagto2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "exportaIntegracaoWS", propOrder = { + "aidf", + "acrescimoICMSECF", + "agenciaDesembarque", + "agenciaEmbarque", + "agenciaEmissaoCupomFiscalECF", + "agenciaMovimentacaoPassagen", + "agenciaPrestacaoConta", + "agenciaTMRRS", + "autorizacao0", + "autorizacao1", + "autorizacao2", + "bilheteiro", + "boletoId", + "cooFinalECF", + "cooInicialECF", + "croecf", + "crzecf", + "cancelamentoICMSECF", + "codigoAnulacao", + "codigoClienteRequisicao", + "codigoVenda", + "dataReducaoECF", + "dataServico", + "dataVenda", + "dataViagem", + "desconto", + "descontoICMSECF", + "destino", + "devolucaoCupomFiscalECF", + "espaco1", + "espaco2", + "espaco3", + "espaco4", + "espaco5", + "estabelecimento0", + "estabelecimento1", + "estabelecimento2", + "estado", + "exclusivoBilheteriaGlobus", + "formaPagto0", + "formaPagto1", + "formaPagto2", + "horaServico", + "horaVenda", + "horaViagem", + "isentoICMSECF", + "linha", + "modalidadeIPosterior", + "modeloBilheteFiscalECF", + "motorista1", + "motorista2", + "nsu0", + "nsu1", + "nsu2", + "nsuHostTID0", + "nsuHostTID1", + "nsuHostTID2", + "naoIncidenciaICMSECF", + "nomePassageiroRequisicao", + "numeroCaixaFiscalECF", + "numeroCupomFiscalECF", + "numeroDVPRS", + "numeroLojaFiscalECF", + "numeroPreImpresso", + "numeroRequisicao", + "numeroSerieImpressoraECF", + "numeroSistemaEstado", + "numeroVT", + "origem", + "outros", + "pedagio", + "poltrona", + "porcentagemFormaPagto0", + "porcentagemFormaPagto1", + "porcentagemFormaPagto2", + "prefixoLinha", + "qtdeParcela0", + "qtdeParcela1", + "qtdeParcela2", + "qtdePassageiros", + "quantidadeCanceladoECF", + "registros", + "svirs", + "seguro", + "seriePassagens", + "servico", + "statusSVIRS", + "subseriePassagens", + "substituicaoTributariaICMSECF", + "tmrrs", + "tarifa", + "taxaEmbarque", + "tipoPassagem", + "valorGrandeTotalECF", + "valorMultaCancelamento", + "valorVendaBrutaECF", + "veiculo", + "vlrFormaPagto0", + "vlrFormaPagto1", + "vlrFormaPagto2" +}) +public class ExportaIntegracaoWS { + + @XmlElement(name = "AIDF") + protected String aidf; + protected String acrescimoICMSECF; + protected String agenciaDesembarque; + protected String agenciaEmbarque; + protected String agenciaEmissaoCupomFiscalECF; + protected String agenciaMovimentacaoPassagen; + protected String agenciaPrestacaoConta; + protected String agenciaTMRRS; + protected String autorizacao0; + protected String autorizacao1; + protected String autorizacao2; + protected String bilheteiro; + protected Long boletoId; + @XmlElement(name = "COOFinalECF") + protected String cooFinalECF; + @XmlElement(name = "COOInicialECF") + protected String cooInicialECF; + @XmlElement(name = "CROECF") + protected String croecf; + @XmlElement(name = "CRZECF") + protected String crzecf; + protected String cancelamentoICMSECF; + protected String codigoAnulacao; + protected String codigoClienteRequisicao; + protected String codigoVenda; + protected String dataReducaoECF; + protected String dataServico; + protected String dataVenda; + protected String dataViagem; + protected String desconto; + protected String descontoICMSECF; + protected String destino; + protected String devolucaoCupomFiscalECF; + protected String espaco1; + protected String espaco2; + protected String espaco3; + protected String espaco4; + protected String espaco5; + protected String estabelecimento0; + protected String estabelecimento1; + protected String estabelecimento2; + protected String estado; + protected String exclusivoBilheteriaGlobus; + protected String formaPagto0; + protected String formaPagto1; + protected String formaPagto2; + protected String horaServico; + protected String horaVenda; + protected String horaViagem; + protected String isentoICMSECF; + protected String linha; + protected String modalidadeIPosterior; + protected String modeloBilheteFiscalECF; + protected String motorista1; + protected String motorista2; + @XmlElement(name = "NSU0") + protected String nsu0; + @XmlElement(name = "NSU1") + protected String nsu1; + @XmlElement(name = "NSU2") + protected String nsu2; + @XmlElement(name = "NSUHostTID0") + protected String nsuHostTID0; + @XmlElement(name = "NSUHostTID1") + protected String nsuHostTID1; + @XmlElement(name = "NSUHostTID2") + protected String nsuHostTID2; + protected String naoIncidenciaICMSECF; + protected String nomePassageiroRequisicao; + protected String numeroCaixaFiscalECF; + protected String numeroCupomFiscalECF; + protected String numeroDVPRS; + protected String numeroLojaFiscalECF; + protected String numeroPreImpresso; + protected String numeroRequisicao; + protected String numeroSerieImpressoraECF; + protected String numeroSistemaEstado; + protected String numeroVT; + protected String origem; + protected String outros; + protected String pedagio; + protected String poltrona; + protected String porcentagemFormaPagto0; + protected String porcentagemFormaPagto1; + protected String porcentagemFormaPagto2; + protected String prefixoLinha; + protected String qtdeParcela0; + protected String qtdeParcela1; + protected String qtdeParcela2; + protected String qtdePassageiros; + protected String quantidadeCanceladoECF; + protected Integer registros; + @XmlElement(name = "SVIRS") + protected String svirs; + protected String seguro; + protected String seriePassagens; + protected String servico; + protected String statusSVIRS; + protected String subseriePassagens; + protected String substituicaoTributariaICMSECF; + @XmlElement(name = "TMRRS") + protected String tmrrs; + protected String tarifa; + protected String taxaEmbarque; + protected String tipoPassagem; + protected String valorGrandeTotalECF; + protected String valorMultaCancelamento; + protected String valorVendaBrutaECF; + protected String veiculo; + protected String vlrFormaPagto0; + protected String vlrFormaPagto1; + protected String vlrFormaPagto2; + + /** + * Gets the value of the aidf property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAIDF() { + return aidf; + } + + /** + * Sets the value of the aidf property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAIDF(String value) { + this.aidf = value; + } + + /** + * Gets the value of the acrescimoICMSECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAcrescimoICMSECF() { + return acrescimoICMSECF; + } + + /** + * Sets the value of the acrescimoICMSECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAcrescimoICMSECF(String value) { + this.acrescimoICMSECF = value; + } + + /** + * Gets the value of the agenciaDesembarque property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaDesembarque() { + return agenciaDesembarque; + } + + /** + * Sets the value of the agenciaDesembarque property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaDesembarque(String value) { + this.agenciaDesembarque = value; + } + + /** + * Gets the value of the agenciaEmbarque property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaEmbarque() { + return agenciaEmbarque; + } + + /** + * Sets the value of the agenciaEmbarque property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaEmbarque(String value) { + this.agenciaEmbarque = value; + } + + /** + * Gets the value of the agenciaEmissaoCupomFiscalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaEmissaoCupomFiscalECF() { + return agenciaEmissaoCupomFiscalECF; + } + + /** + * Sets the value of the agenciaEmissaoCupomFiscalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaEmissaoCupomFiscalECF(String value) { + this.agenciaEmissaoCupomFiscalECF = value; + } + + /** + * Gets the value of the agenciaMovimentacaoPassagen property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaMovimentacaoPassagen() { + return agenciaMovimentacaoPassagen; + } + + /** + * Sets the value of the agenciaMovimentacaoPassagen property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaMovimentacaoPassagen(String value) { + this.agenciaMovimentacaoPassagen = value; + } + + /** + * Gets the value of the agenciaPrestacaoConta property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaPrestacaoConta() { + return agenciaPrestacaoConta; + } + + /** + * Sets the value of the agenciaPrestacaoConta property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaPrestacaoConta(String value) { + this.agenciaPrestacaoConta = value; + } + + /** + * Gets the value of the agenciaTMRRS property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAgenciaTMRRS() { + return agenciaTMRRS; + } + + /** + * Sets the value of the agenciaTMRRS property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAgenciaTMRRS(String value) { + this.agenciaTMRRS = value; + } + + /** + * Gets the value of the autorizacao0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAutorizacao0() { + return autorizacao0; + } + + /** + * Sets the value of the autorizacao0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAutorizacao0(String value) { + this.autorizacao0 = value; + } + + /** + * Gets the value of the autorizacao1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAutorizacao1() { + return autorizacao1; + } + + /** + * Sets the value of the autorizacao1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAutorizacao1(String value) { + this.autorizacao1 = value; + } + + /** + * Gets the value of the autorizacao2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAutorizacao2() { + return autorizacao2; + } + + /** + * Sets the value of the autorizacao2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAutorizacao2(String value) { + this.autorizacao2 = value; + } + + /** + * Gets the value of the bilheteiro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getBilheteiro() { + return bilheteiro; + } + + /** + * Sets the value of the bilheteiro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setBilheteiro(String value) { + this.bilheteiro = value; + } + + /** + * Gets the value of the boletoId property. + * + * @return + * possible object is + * {@link Long } + * + */ + public Long getBoletoId() { + return boletoId; + } + + /** + * Sets the value of the boletoId property. + * + * @param value + * allowed object is + * {@link Long } + * + */ + public void setBoletoId(Long value) { + this.boletoId = value; + } + + /** + * Gets the value of the cooFinalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCOOFinalECF() { + return cooFinalECF; + } + + /** + * Sets the value of the cooFinalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCOOFinalECF(String value) { + this.cooFinalECF = value; + } + + /** + * Gets the value of the cooInicialECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCOOInicialECF() { + return cooInicialECF; + } + + /** + * Sets the value of the cooInicialECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCOOInicialECF(String value) { + this.cooInicialECF = value; + } + + /** + * Gets the value of the croecf property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCROECF() { + return croecf; + } + + /** + * Sets the value of the croecf property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCROECF(String value) { + this.croecf = value; + } + + /** + * Gets the value of the crzecf property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCRZECF() { + return crzecf; + } + + /** + * Sets the value of the crzecf property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCRZECF(String value) { + this.crzecf = value; + } + + /** + * Gets the value of the cancelamentoICMSECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCancelamentoICMSECF() { + return cancelamentoICMSECF; + } + + /** + * Sets the value of the cancelamentoICMSECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCancelamentoICMSECF(String value) { + this.cancelamentoICMSECF = value; + } + + /** + * Gets the value of the codigoAnulacao property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodigoAnulacao() { + return codigoAnulacao; + } + + /** + * Sets the value of the codigoAnulacao property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodigoAnulacao(String value) { + this.codigoAnulacao = value; + } + + /** + * Gets the value of the codigoClienteRequisicao property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodigoClienteRequisicao() { + return codigoClienteRequisicao; + } + + /** + * Sets the value of the codigoClienteRequisicao property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodigoClienteRequisicao(String value) { + this.codigoClienteRequisicao = value; + } + + /** + * Gets the value of the codigoVenda property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCodigoVenda() { + return codigoVenda; + } + + /** + * Sets the value of the codigoVenda property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCodigoVenda(String value) { + this.codigoVenda = value; + } + + /** + * Gets the value of the dataReducaoECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataReducaoECF() { + return dataReducaoECF; + } + + /** + * Sets the value of the dataReducaoECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataReducaoECF(String value) { + this.dataReducaoECF = value; + } + + /** + * Gets the value of the dataServico property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataServico() { + return dataServico; + } + + /** + * Sets the value of the dataServico property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataServico(String value) { + this.dataServico = value; + } + + /** + * Gets the value of the dataVenda property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataVenda() { + return dataVenda; + } + + /** + * Sets the value of the dataVenda property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataVenda(String value) { + this.dataVenda = value; + } + + /** + * Gets the value of the dataViagem property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataViagem() { + return dataViagem; + } + + /** + * Sets the value of the dataViagem property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataViagem(String value) { + this.dataViagem = value; + } + + /** + * Gets the value of the desconto property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDesconto() { + return desconto; + } + + /** + * Sets the value of the desconto property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDesconto(String value) { + this.desconto = value; + } + + /** + * Gets the value of the descontoICMSECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescontoICMSECF() { + return descontoICMSECF; + } + + /** + * Sets the value of the descontoICMSECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescontoICMSECF(String value) { + this.descontoICMSECF = value; + } + + /** + * Gets the value of the destino property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDestino() { + return destino; + } + + /** + * Sets the value of the destino property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDestino(String value) { + this.destino = value; + } + + /** + * Gets the value of the devolucaoCupomFiscalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDevolucaoCupomFiscalECF() { + return devolucaoCupomFiscalECF; + } + + /** + * Sets the value of the devolucaoCupomFiscalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDevolucaoCupomFiscalECF(String value) { + this.devolucaoCupomFiscalECF = value; + } + + /** + * Gets the value of the espaco1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEspaco1() { + return espaco1; + } + + /** + * Sets the value of the espaco1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEspaco1(String value) { + this.espaco1 = value; + } + + /** + * Gets the value of the espaco2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEspaco2() { + return espaco2; + } + + /** + * Sets the value of the espaco2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEspaco2(String value) { + this.espaco2 = value; + } + + /** + * Gets the value of the espaco3 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEspaco3() { + return espaco3; + } + + /** + * Sets the value of the espaco3 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEspaco3(String value) { + this.espaco3 = value; + } + + /** + * Gets the value of the espaco4 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEspaco4() { + return espaco4; + } + + /** + * Sets the value of the espaco4 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEspaco4(String value) { + this.espaco4 = value; + } + + /** + * Gets the value of the espaco5 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEspaco5() { + return espaco5; + } + + /** + * Sets the value of the espaco5 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEspaco5(String value) { + this.espaco5 = value; + } + + /** + * Gets the value of the estabelecimento0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEstabelecimento0() { + return estabelecimento0; + } + + /** + * Sets the value of the estabelecimento0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEstabelecimento0(String value) { + this.estabelecimento0 = value; + } + + /** + * Gets the value of the estabelecimento1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEstabelecimento1() { + return estabelecimento1; + } + + /** + * Sets the value of the estabelecimento1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEstabelecimento1(String value) { + this.estabelecimento1 = value; + } + + /** + * Gets the value of the estabelecimento2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEstabelecimento2() { + return estabelecimento2; + } + + /** + * Sets the value of the estabelecimento2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEstabelecimento2(String value) { + this.estabelecimento2 = value; + } + + /** + * Gets the value of the estado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEstado() { + return estado; + } + + /** + * Sets the value of the estado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEstado(String value) { + this.estado = value; + } + + /** + * Gets the value of the exclusivoBilheteriaGlobus property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getExclusivoBilheteriaGlobus() { + return exclusivoBilheteriaGlobus; + } + + /** + * Sets the value of the exclusivoBilheteriaGlobus property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setExclusivoBilheteriaGlobus(String value) { + this.exclusivoBilheteriaGlobus = value; + } + + /** + * Gets the value of the formaPagto0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFormaPagto0() { + return formaPagto0; + } + + /** + * Sets the value of the formaPagto0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFormaPagto0(String value) { + this.formaPagto0 = value; + } + + /** + * Gets the value of the formaPagto1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFormaPagto1() { + return formaPagto1; + } + + /** + * Sets the value of the formaPagto1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFormaPagto1(String value) { + this.formaPagto1 = value; + } + + /** + * Gets the value of the formaPagto2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFormaPagto2() { + return formaPagto2; + } + + /** + * Sets the value of the formaPagto2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFormaPagto2(String value) { + this.formaPagto2 = value; + } + + /** + * Gets the value of the horaServico property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHoraServico() { + return horaServico; + } + + /** + * Sets the value of the horaServico property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHoraServico(String value) { + this.horaServico = value; + } + + /** + * Gets the value of the horaVenda property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHoraVenda() { + return horaVenda; + } + + /** + * Sets the value of the horaVenda property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHoraVenda(String value) { + this.horaVenda = value; + } + + /** + * Gets the value of the horaViagem property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHoraViagem() { + return horaViagem; + } + + /** + * Sets the value of the horaViagem property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHoraViagem(String value) { + this.horaViagem = value; + } + + /** + * Gets the value of the isentoICMSECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIsentoICMSECF() { + return isentoICMSECF; + } + + /** + * Sets the value of the isentoICMSECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIsentoICMSECF(String value) { + this.isentoICMSECF = value; + } + + /** + * Gets the value of the linha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLinha() { + return linha; + } + + /** + * Sets the value of the linha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLinha(String value) { + this.linha = value; + } + + /** + * Gets the value of the modalidadeIPosterior property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getModalidadeIPosterior() { + return modalidadeIPosterior; + } + + /** + * Sets the value of the modalidadeIPosterior property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setModalidadeIPosterior(String value) { + this.modalidadeIPosterior = value; + } + + /** + * Gets the value of the modeloBilheteFiscalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getModeloBilheteFiscalECF() { + return modeloBilheteFiscalECF; + } + + /** + * Sets the value of the modeloBilheteFiscalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setModeloBilheteFiscalECF(String value) { + this.modeloBilheteFiscalECF = value; + } + + /** + * Gets the value of the motorista1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMotorista1() { + return motorista1; + } + + /** + * Sets the value of the motorista1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMotorista1(String value) { + this.motorista1 = value; + } + + /** + * Gets the value of the motorista2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMotorista2() { + return motorista2; + } + + /** + * Sets the value of the motorista2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMotorista2(String value) { + this.motorista2 = value; + } + + /** + * Gets the value of the nsu0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSU0() { + return nsu0; + } + + /** + * Sets the value of the nsu0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSU0(String value) { + this.nsu0 = value; + } + + /** + * Gets the value of the nsu1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSU1() { + return nsu1; + } + + /** + * Sets the value of the nsu1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSU1(String value) { + this.nsu1 = value; + } + + /** + * Gets the value of the nsu2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSU2() { + return nsu2; + } + + /** + * Sets the value of the nsu2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSU2(String value) { + this.nsu2 = value; + } + + /** + * Gets the value of the nsuHostTID0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSUHostTID0() { + return nsuHostTID0; + } + + /** + * Sets the value of the nsuHostTID0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSUHostTID0(String value) { + this.nsuHostTID0 = value; + } + + /** + * Gets the value of the nsuHostTID1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSUHostTID1() { + return nsuHostTID1; + } + + /** + * Sets the value of the nsuHostTID1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSUHostTID1(String value) { + this.nsuHostTID1 = value; + } + + /** + * Gets the value of the nsuHostTID2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNSUHostTID2() { + return nsuHostTID2; + } + + /** + * Sets the value of the nsuHostTID2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNSUHostTID2(String value) { + this.nsuHostTID2 = value; + } + + /** + * Gets the value of the naoIncidenciaICMSECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNaoIncidenciaICMSECF() { + return naoIncidenciaICMSECF; + } + + /** + * Sets the value of the naoIncidenciaICMSECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNaoIncidenciaICMSECF(String value) { + this.naoIncidenciaICMSECF = value; + } + + /** + * Gets the value of the nomePassageiroRequisicao property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNomePassageiroRequisicao() { + return nomePassageiroRequisicao; + } + + /** + * Sets the value of the nomePassageiroRequisicao property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNomePassageiroRequisicao(String value) { + this.nomePassageiroRequisicao = value; + } + + /** + * Gets the value of the numeroCaixaFiscalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroCaixaFiscalECF() { + return numeroCaixaFiscalECF; + } + + /** + * Sets the value of the numeroCaixaFiscalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroCaixaFiscalECF(String value) { + this.numeroCaixaFiscalECF = value; + } + + /** + * Gets the value of the numeroCupomFiscalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroCupomFiscalECF() { + return numeroCupomFiscalECF; + } + + /** + * Sets the value of the numeroCupomFiscalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroCupomFiscalECF(String value) { + this.numeroCupomFiscalECF = value; + } + + /** + * Gets the value of the numeroDVPRS property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroDVPRS() { + return numeroDVPRS; + } + + /** + * Sets the value of the numeroDVPRS property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroDVPRS(String value) { + this.numeroDVPRS = value; + } + + /** + * Gets the value of the numeroLojaFiscalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroLojaFiscalECF() { + return numeroLojaFiscalECF; + } + + /** + * Sets the value of the numeroLojaFiscalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroLojaFiscalECF(String value) { + this.numeroLojaFiscalECF = value; + } + + /** + * Gets the value of the numeroPreImpresso property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroPreImpresso() { + return numeroPreImpresso; + } + + /** + * Sets the value of the numeroPreImpresso property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroPreImpresso(String value) { + this.numeroPreImpresso = value; + } + + /** + * Gets the value of the numeroRequisicao property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroRequisicao() { + return numeroRequisicao; + } + + /** + * Sets the value of the numeroRequisicao property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroRequisicao(String value) { + this.numeroRequisicao = value; + } + + /** + * Gets the value of the numeroSerieImpressoraECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroSerieImpressoraECF() { + return numeroSerieImpressoraECF; + } + + /** + * Sets the value of the numeroSerieImpressoraECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroSerieImpressoraECF(String value) { + this.numeroSerieImpressoraECF = value; + } + + /** + * Gets the value of the numeroSistemaEstado property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroSistemaEstado() { + return numeroSistemaEstado; + } + + /** + * Sets the value of the numeroSistemaEstado property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroSistemaEstado(String value) { + this.numeroSistemaEstado = value; + } + + /** + * Gets the value of the numeroVT property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNumeroVT() { + return numeroVT; + } + + /** + * Sets the value of the numeroVT property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNumeroVT(String value) { + this.numeroVT = value; + } + + /** + * Gets the value of the origem property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrigem() { + return origem; + } + + /** + * Sets the value of the origem property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrigem(String value) { + this.origem = value; + } + + /** + * Gets the value of the outros property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOutros() { + return outros; + } + + /** + * Sets the value of the outros property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOutros(String value) { + this.outros = value; + } + + /** + * Gets the value of the pedagio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPedagio() { + return pedagio; + } + + /** + * Sets the value of the pedagio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPedagio(String value) { + this.pedagio = value; + } + + /** + * Gets the value of the poltrona property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPoltrona() { + return poltrona; + } + + /** + * Sets the value of the poltrona property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPoltrona(String value) { + this.poltrona = value; + } + + /** + * Gets the value of the porcentagemFormaPagto0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPorcentagemFormaPagto0() { + return porcentagemFormaPagto0; + } + + /** + * Sets the value of the porcentagemFormaPagto0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPorcentagemFormaPagto0(String value) { + this.porcentagemFormaPagto0 = value; + } + + /** + * Gets the value of the porcentagemFormaPagto1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPorcentagemFormaPagto1() { + return porcentagemFormaPagto1; + } + + /** + * Sets the value of the porcentagemFormaPagto1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPorcentagemFormaPagto1(String value) { + this.porcentagemFormaPagto1 = value; + } + + /** + * Gets the value of the porcentagemFormaPagto2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPorcentagemFormaPagto2() { + return porcentagemFormaPagto2; + } + + /** + * Sets the value of the porcentagemFormaPagto2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPorcentagemFormaPagto2(String value) { + this.porcentagemFormaPagto2 = value; + } + + /** + * Gets the value of the prefixoLinha property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPrefixoLinha() { + return prefixoLinha; + } + + /** + * Sets the value of the prefixoLinha property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPrefixoLinha(String value) { + this.prefixoLinha = value; + } + + /** + * Gets the value of the qtdeParcela0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQtdeParcela0() { + return qtdeParcela0; + } + + /** + * Sets the value of the qtdeParcela0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQtdeParcela0(String value) { + this.qtdeParcela0 = value; + } + + /** + * Gets the value of the qtdeParcela1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQtdeParcela1() { + return qtdeParcela1; + } + + /** + * Sets the value of the qtdeParcela1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQtdeParcela1(String value) { + this.qtdeParcela1 = value; + } + + /** + * Gets the value of the qtdeParcela2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQtdeParcela2() { + return qtdeParcela2; + } + + /** + * Sets the value of the qtdeParcela2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQtdeParcela2(String value) { + this.qtdeParcela2 = value; + } + + /** + * Gets the value of the qtdePassageiros property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQtdePassageiros() { + return qtdePassageiros; + } + + /** + * Sets the value of the qtdePassageiros property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQtdePassageiros(String value) { + this.qtdePassageiros = value; + } + + /** + * Gets the value of the quantidadeCanceladoECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getQuantidadeCanceladoECF() { + return quantidadeCanceladoECF; + } + + /** + * Sets the value of the quantidadeCanceladoECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setQuantidadeCanceladoECF(String value) { + this.quantidadeCanceladoECF = value; + } + + /** + * Gets the value of the registros property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getRegistros() { + return registros; + } + + /** + * Sets the value of the registros property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setRegistros(Integer value) { + this.registros = value; + } + + /** + * Gets the value of the svirs property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSVIRS() { + return svirs; + } + + /** + * Sets the value of the svirs property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSVIRS(String value) { + this.svirs = value; + } + + /** + * Gets the value of the seguro property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeguro() { + return seguro; + } + + /** + * Sets the value of the seguro property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeguro(String value) { + this.seguro = value; + } + + /** + * Gets the value of the seriePassagens property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSeriePassagens() { + return seriePassagens; + } + + /** + * Sets the value of the seriePassagens property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSeriePassagens(String value) { + this.seriePassagens = value; + } + + /** + * Gets the value of the servico property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getServico() { + return servico; + } + + /** + * Sets the value of the servico property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setServico(String value) { + this.servico = value; + } + + /** + * Gets the value of the statusSVIRS property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStatusSVIRS() { + return statusSVIRS; + } + + /** + * Sets the value of the statusSVIRS property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStatusSVIRS(String value) { + this.statusSVIRS = value; + } + + /** + * Gets the value of the subseriePassagens property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSubseriePassagens() { + return subseriePassagens; + } + + /** + * Sets the value of the subseriePassagens property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSubseriePassagens(String value) { + this.subseriePassagens = value; + } + + /** + * Gets the value of the substituicaoTributariaICMSECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSubstituicaoTributariaICMSECF() { + return substituicaoTributariaICMSECF; + } + + /** + * Sets the value of the substituicaoTributariaICMSECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSubstituicaoTributariaICMSECF(String value) { + this.substituicaoTributariaICMSECF = value; + } + + /** + * Gets the value of the tmrrs property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTMRRS() { + return tmrrs; + } + + /** + * Sets the value of the tmrrs property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTMRRS(String value) { + this.tmrrs = value; + } + + /** + * Gets the value of the tarifa property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTarifa() { + return tarifa; + } + + /** + * Sets the value of the tarifa property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTarifa(String value) { + this.tarifa = value; + } + + /** + * Gets the value of the taxaEmbarque property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTaxaEmbarque() { + return taxaEmbarque; + } + + /** + * Sets the value of the taxaEmbarque property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTaxaEmbarque(String value) { + this.taxaEmbarque = value; + } + + /** + * Gets the value of the tipoPassagem property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTipoPassagem() { + return tipoPassagem; + } + + /** + * Sets the value of the tipoPassagem property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTipoPassagem(String value) { + this.tipoPassagem = value; + } + + /** + * Gets the value of the valorGrandeTotalECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValorGrandeTotalECF() { + return valorGrandeTotalECF; + } + + /** + * Sets the value of the valorGrandeTotalECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValorGrandeTotalECF(String value) { + this.valorGrandeTotalECF = value; + } + + /** + * Gets the value of the valorMultaCancelamento property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValorMultaCancelamento() { + return valorMultaCancelamento; + } + + /** + * Sets the value of the valorMultaCancelamento property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValorMultaCancelamento(String value) { + this.valorMultaCancelamento = value; + } + + /** + * Gets the value of the valorVendaBrutaECF property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValorVendaBrutaECF() { + return valorVendaBrutaECF; + } + + /** + * Sets the value of the valorVendaBrutaECF property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValorVendaBrutaECF(String value) { + this.valorVendaBrutaECF = value; + } + + /** + * Gets the value of the veiculo property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVeiculo() { + return veiculo; + } + + /** + * Sets the value of the veiculo property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVeiculo(String value) { + this.veiculo = value; + } + + /** + * Gets the value of the vlrFormaPagto0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVlrFormaPagto0() { + return vlrFormaPagto0; + } + + /** + * Sets the value of the vlrFormaPagto0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVlrFormaPagto0(String value) { + this.vlrFormaPagto0 = value; + } + + /** + * Gets the value of the vlrFormaPagto1 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVlrFormaPagto1() { + return vlrFormaPagto1; + } + + /** + * Sets the value of the vlrFormaPagto1 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVlrFormaPagto1(String value) { + this.vlrFormaPagto1 = value; + } + + /** + * Gets the value of the vlrFormaPagto2 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVlrFormaPagto2() { + return vlrFormaPagto2; + } + + /** + * Sets the value of the vlrFormaPagto2 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVlrFormaPagto2(String value) { + this.vlrFormaPagto2 = value; + } + +} diff --git a/src/com/rjconsultores/hstcajservice/ws/ObjectFactory.java b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ObjectFactory.java similarity index 97% rename from src/com/rjconsultores/hstcajservice/ws/ObjectFactory.java rename to ModelWeb/src/com/rjconsultores/hstcajservice/ws/ObjectFactory.java index 29388fc23..87a0c6006 100644 --- a/src/com/rjconsultores/hstcajservice/ws/ObjectFactory.java +++ b/ModelWeb/src/com/rjconsultores/hstcajservice/ws/ObjectFactory.java @@ -1,555 +1,555 @@ - -package com.rjconsultores.hstcajservice.ws; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the com.rjconsultores.hstcajservice.ws package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _CadReceitaDespesa_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadReceitaDespesa"); - private final static QName _BuscarReceitaDespesaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarReceitaDespesaResponse"); - private final static QName _CadEstadoResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadEstadoResponse"); - private final static QName _CadLocalidadeResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLocalidadeResponse"); - private final static QName _CadCliente_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadCliente"); - private final static QName _CadEstado_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadEstado"); - private final static QName _BuscarBilhetes_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetes"); - private final static QName _CadLinha_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLinha"); - private final static QName _CadBeneficioResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBeneficioResponse"); - private final static QName _CadAgenciaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadAgenciaResponse"); - private final static QName _CadLinhaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLinhaResponse"); - private final static QName _BuscarBilhetesInconsistente_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetesInconsistente"); - private final static QName _CadReceitaDespesaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadReceitaDespesaResponse"); - private final static QName _CadBilheteiroResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBilheteiroResponse"); - private final static QName _CadFormaPagamento_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadFormaPagamento"); - private final static QName _CadFormaPagamentoResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadFormaPagamentoResponse"); - private final static QName _CadClienteResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadClienteResponse"); - private final static QName _BuscarBilhetesInconsistenteResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetesInconsistenteResponse"); - private final static QName _BuscarBilhetesResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetesResponse"); - private final static QName _BuscarReceitaDespesa_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarReceitaDespesa"); - private final static QName _CadBilheteiro_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBilheteiro"); - private final static QName _CadBeneficio_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBeneficio"); - private final static QName _CadLocalidade_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLocalidade"); - private final static QName _CadAgencia_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadAgencia"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.rjconsultores.hstcajservice.ws - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link CadBilheteiro } - * - */ - public CadBilheteiro createCadBilheteiro() { - return new CadBilheteiro(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadClienteWS } - * - */ - public ExportaIntegracaoCadClienteWS createExportaIntegracaoCadClienteWS() { - return new ExportaIntegracaoCadClienteWS(); - } - - /** - * Create an instance of {@link CadBilheteiroResponse } - * - */ - public CadBilheteiroResponse createCadBilheteiroResponse() { - return new CadBilheteiroResponse(); - } - - /** - * Create an instance of {@link CadCliente } - * - */ - public CadCliente createCadCliente() { - return new CadCliente(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadFormaPagamentoWS } - * - */ - public ExportaIntegracaoCadFormaPagamentoWS createExportaIntegracaoCadFormaPagamentoWS() { - return new ExportaIntegracaoCadFormaPagamentoWS(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadBilheteiroWS } - * - */ - public ExportaIntegracaoCadBilheteiroWS createExportaIntegracaoCadBilheteiroWS() { - return new ExportaIntegracaoCadBilheteiroWS(); - } - - /** - * Create an instance of {@link CadLocalidade } - * - */ - public CadLocalidade createCadLocalidade() { - return new CadLocalidade(); - } - - /** - * Create an instance of {@link ExportaIntegracaoWS } - * - */ - public ExportaIntegracaoWS createExportaIntegracaoWS() { - return new ExportaIntegracaoWS(); - } - - /** - * Create an instance of {@link BuscarBilhetesInconsistente } - * - */ - public BuscarBilhetesInconsistente createBuscarBilhetesInconsistente() { - return new BuscarBilhetesInconsistente(); - } - - /** - * Create an instance of {@link CadReceitaDespesaResponse } - * - */ - public CadReceitaDespesaResponse createCadReceitaDespesaResponse() { - return new CadReceitaDespesaResponse(); - } - - /** - * Create an instance of {@link CadEstadoResponse } - * - */ - public CadEstadoResponse createCadEstadoResponse() { - return new CadEstadoResponse(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadLocalidadeWS } - * - */ - public ExportaIntegracaoCadLocalidadeWS createExportaIntegracaoCadLocalidadeWS() { - return new ExportaIntegracaoCadLocalidadeWS(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadAgenciaWS } - * - */ - public ExportaIntegracaoCadAgenciaWS createExportaIntegracaoCadAgenciaWS() { - return new ExportaIntegracaoCadAgenciaWS(); - } - - /** - * Create an instance of {@link CadLinha } - * - */ - public CadLinha createCadLinha() { - return new CadLinha(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadLinhaWS } - * - */ - public ExportaIntegracaoCadLinhaWS createExportaIntegracaoCadLinhaWS() { - return new ExportaIntegracaoCadLinhaWS(); - } - - /** - * Create an instance of {@link CadAgencia } - * - */ - public CadAgencia createCadAgencia() { - return new CadAgencia(); - } - - /** - * Create an instance of {@link CadReceitaDespesa } - * - */ - public CadReceitaDespesa createCadReceitaDespesa() { - return new CadReceitaDespesa(); - } - - /** - * Create an instance of {@link BuscarBilhetes } - * - */ - public BuscarBilhetes createBuscarBilhetes() { - return new BuscarBilhetes(); - } - - /** - * Create an instance of {@link BuscarBilhetesResponse } - * - */ - public BuscarBilhetesResponse createBuscarBilhetesResponse() { - return new BuscarBilhetesResponse(); - } - - /** - * Create an instance of {@link CadFormaPagamentoResponse } - * - */ - public CadFormaPagamentoResponse createCadFormaPagamentoResponse() { - return new CadFormaPagamentoResponse(); - } - - /** - * Create an instance of {@link CadFormaPagamento } - * - */ - public CadFormaPagamento createCadFormaPagamento() { - return new CadFormaPagamento(); - } - - /** - * Create an instance of {@link CadBeneficioResponse } - * - */ - public CadBeneficioResponse createCadBeneficioResponse() { - return new CadBeneficioResponse(); - } - - /** - * Create an instance of {@link CadEstado } - * - */ - public CadEstado createCadEstado() { - return new CadEstado(); - } - - /** - * Create an instance of {@link CadBeneficio } - * - */ - public CadBeneficio createCadBeneficio() { - return new CadBeneficio(); - } - - /** - * Create an instance of {@link BuscarReceitaDespesa } - * - */ - public BuscarReceitaDespesa createBuscarReceitaDespesa() { - return new BuscarReceitaDespesa(); - } - - /** - * Create an instance of {@link ExportaIntegracaoReceitaDespesaWS } - * - */ - public ExportaIntegracaoReceitaDespesaWS createExportaIntegracaoReceitaDespesaWS() { - return new ExportaIntegracaoReceitaDespesaWS(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadBeneficioWS } - * - */ - public ExportaIntegracaoCadBeneficioWS createExportaIntegracaoCadBeneficioWS() { - return new ExportaIntegracaoCadBeneficioWS(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadReceitaDespesaWS } - * - */ - public ExportaIntegracaoCadReceitaDespesaWS createExportaIntegracaoCadReceitaDespesaWS() { - return new ExportaIntegracaoCadReceitaDespesaWS(); - } - - /** - * Create an instance of {@link CadLocalidadeResponse } - * - */ - public CadLocalidadeResponse createCadLocalidadeResponse() { - return new CadLocalidadeResponse(); - } - - /** - * Create an instance of {@link BuscarReceitaDespesaResponse } - * - */ - public BuscarReceitaDespesaResponse createBuscarReceitaDespesaResponse() { - return new BuscarReceitaDespesaResponse(); - } - - /** - * Create an instance of {@link ExportaIntegracaoCadEstadoWS } - * - */ - public ExportaIntegracaoCadEstadoWS createExportaIntegracaoCadEstadoWS() { - return new ExportaIntegracaoCadEstadoWS(); - } - - /** - * Create an instance of {@link CadAgenciaResponse } - * - */ - public CadAgenciaResponse createCadAgenciaResponse() { - return new CadAgenciaResponse(); - } - - /** - * Create an instance of {@link BuscarBilhetesInconsistenteResponse } - * - */ - public BuscarBilhetesInconsistenteResponse createBuscarBilhetesInconsistenteResponse() { - return new BuscarBilhetesInconsistenteResponse(); - } - - /** - * Create an instance of {@link CadClienteResponse } - * - */ - public CadClienteResponse createCadClienteResponse() { - return new CadClienteResponse(); - } - - /** - * Create an instance of {@link CadLinhaResponse } - * - */ - public CadLinhaResponse createCadLinhaResponse() { - return new CadLinhaResponse(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadReceitaDespesa }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadReceitaDespesa") - public JAXBElement createCadReceitaDespesa(CadReceitaDespesa value) { - return new JAXBElement(_CadReceitaDespesa_QNAME, CadReceitaDespesa.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BuscarReceitaDespesaResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarReceitaDespesaResponse") - public JAXBElement createBuscarReceitaDespesaResponse(BuscarReceitaDespesaResponse value) { - return new JAXBElement(_BuscarReceitaDespesaResponse_QNAME, BuscarReceitaDespesaResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadEstadoResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadEstadoResponse") - public JAXBElement createCadEstadoResponse(CadEstadoResponse value) { - return new JAXBElement(_CadEstadoResponse_QNAME, CadEstadoResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadLocalidadeResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLocalidadeResponse") - public JAXBElement createCadLocalidadeResponse(CadLocalidadeResponse value) { - return new JAXBElement(_CadLocalidadeResponse_QNAME, CadLocalidadeResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadCliente }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadCliente") - public JAXBElement createCadCliente(CadCliente value) { - return new JAXBElement(_CadCliente_QNAME, CadCliente.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadEstado }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadEstado") - public JAXBElement createCadEstado(CadEstado value) { - return new JAXBElement(_CadEstado_QNAME, CadEstado.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetes }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetes") - public JAXBElement createBuscarBilhetes(BuscarBilhetes value) { - return new JAXBElement(_BuscarBilhetes_QNAME, BuscarBilhetes.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadLinha }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLinha") - public JAXBElement createCadLinha(CadLinha value) { - return new JAXBElement(_CadLinha_QNAME, CadLinha.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadBeneficioResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBeneficioResponse") - public JAXBElement createCadBeneficioResponse(CadBeneficioResponse value) { - return new JAXBElement(_CadBeneficioResponse_QNAME, CadBeneficioResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadAgenciaResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadAgenciaResponse") - public JAXBElement createCadAgenciaResponse(CadAgenciaResponse value) { - return new JAXBElement(_CadAgenciaResponse_QNAME, CadAgenciaResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadLinhaResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLinhaResponse") - public JAXBElement createCadLinhaResponse(CadLinhaResponse value) { - return new JAXBElement(_CadLinhaResponse_QNAME, CadLinhaResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetesInconsistente }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetesInconsistente") - public JAXBElement createBuscarBilhetesInconsistente(BuscarBilhetesInconsistente value) { - return new JAXBElement(_BuscarBilhetesInconsistente_QNAME, BuscarBilhetesInconsistente.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadReceitaDespesaResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadReceitaDespesaResponse") - public JAXBElement createCadReceitaDespesaResponse(CadReceitaDespesaResponse value) { - return new JAXBElement(_CadReceitaDespesaResponse_QNAME, CadReceitaDespesaResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadBilheteiroResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBilheteiroResponse") - public JAXBElement createCadBilheteiroResponse(CadBilheteiroResponse value) { - return new JAXBElement(_CadBilheteiroResponse_QNAME, CadBilheteiroResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadFormaPagamento }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadFormaPagamento") - public JAXBElement createCadFormaPagamento(CadFormaPagamento value) { - return new JAXBElement(_CadFormaPagamento_QNAME, CadFormaPagamento.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadFormaPagamentoResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadFormaPagamentoResponse") - public JAXBElement createCadFormaPagamentoResponse(CadFormaPagamentoResponse value) { - return new JAXBElement(_CadFormaPagamentoResponse_QNAME, CadFormaPagamentoResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadClienteResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadClienteResponse") - public JAXBElement createCadClienteResponse(CadClienteResponse value) { - return new JAXBElement(_CadClienteResponse_QNAME, CadClienteResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetesInconsistenteResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetesInconsistenteResponse") - public JAXBElement createBuscarBilhetesInconsistenteResponse(BuscarBilhetesInconsistenteResponse value) { - return new JAXBElement(_BuscarBilhetesInconsistenteResponse_QNAME, BuscarBilhetesInconsistenteResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetesResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetesResponse") - public JAXBElement createBuscarBilhetesResponse(BuscarBilhetesResponse value) { - return new JAXBElement(_BuscarBilhetesResponse_QNAME, BuscarBilhetesResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BuscarReceitaDespesa }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarReceitaDespesa") - public JAXBElement createBuscarReceitaDespesa(BuscarReceitaDespesa value) { - return new JAXBElement(_BuscarReceitaDespesa_QNAME, BuscarReceitaDespesa.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadBilheteiro }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBilheteiro") - public JAXBElement createCadBilheteiro(CadBilheteiro value) { - return new JAXBElement(_CadBilheteiro_QNAME, CadBilheteiro.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadBeneficio }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBeneficio") - public JAXBElement createCadBeneficio(CadBeneficio value) { - return new JAXBElement(_CadBeneficio_QNAME, CadBeneficio.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadLocalidade }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLocalidade") - public JAXBElement createCadLocalidade(CadLocalidade value) { - return new JAXBElement(_CadLocalidade_QNAME, CadLocalidade.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CadAgencia }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadAgencia") - public JAXBElement createCadAgencia(CadAgencia value) { - return new JAXBElement(_CadAgencia_QNAME, CadAgencia.class, null, value); - } - -} + +package com.rjconsultores.hstcajservice.ws; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.rjconsultores.hstcajservice.ws package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _CadReceitaDespesa_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadReceitaDespesa"); + private final static QName _BuscarReceitaDespesaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarReceitaDespesaResponse"); + private final static QName _CadEstadoResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadEstadoResponse"); + private final static QName _CadLocalidadeResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLocalidadeResponse"); + private final static QName _CadCliente_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadCliente"); + private final static QName _CadEstado_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadEstado"); + private final static QName _BuscarBilhetes_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetes"); + private final static QName _CadLinha_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLinha"); + private final static QName _CadBeneficioResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBeneficioResponse"); + private final static QName _CadAgenciaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadAgenciaResponse"); + private final static QName _CadLinhaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLinhaResponse"); + private final static QName _BuscarBilhetesInconsistente_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetesInconsistente"); + private final static QName _CadReceitaDespesaResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadReceitaDespesaResponse"); + private final static QName _CadBilheteiroResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBilheteiroResponse"); + private final static QName _CadFormaPagamento_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadFormaPagamento"); + private final static QName _CadFormaPagamentoResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadFormaPagamentoResponse"); + private final static QName _CadClienteResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadClienteResponse"); + private final static QName _BuscarBilhetesInconsistenteResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetesInconsistenteResponse"); + private final static QName _BuscarBilhetesResponse_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarBilhetesResponse"); + private final static QName _BuscarReceitaDespesa_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "buscarReceitaDespesa"); + private final static QName _CadBilheteiro_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBilheteiro"); + private final static QName _CadBeneficio_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadBeneficio"); + private final static QName _CadLocalidade_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadLocalidade"); + private final static QName _CadAgencia_QNAME = new QName("http://ws.hstcajservice.rjconsultores.com/", "cadAgencia"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.rjconsultores.hstcajservice.ws + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link CadBilheteiro } + * + */ + public CadBilheteiro createCadBilheteiro() { + return new CadBilheteiro(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadClienteWS } + * + */ + public ExportaIntegracaoCadClienteWS createExportaIntegracaoCadClienteWS() { + return new ExportaIntegracaoCadClienteWS(); + } + + /** + * Create an instance of {@link CadBilheteiroResponse } + * + */ + public CadBilheteiroResponse createCadBilheteiroResponse() { + return new CadBilheteiroResponse(); + } + + /** + * Create an instance of {@link CadCliente } + * + */ + public CadCliente createCadCliente() { + return new CadCliente(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadFormaPagamentoWS } + * + */ + public ExportaIntegracaoCadFormaPagamentoWS createExportaIntegracaoCadFormaPagamentoWS() { + return new ExportaIntegracaoCadFormaPagamentoWS(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadBilheteiroWS } + * + */ + public ExportaIntegracaoCadBilheteiroWS createExportaIntegracaoCadBilheteiroWS() { + return new ExportaIntegracaoCadBilheteiroWS(); + } + + /** + * Create an instance of {@link CadLocalidade } + * + */ + public CadLocalidade createCadLocalidade() { + return new CadLocalidade(); + } + + /** + * Create an instance of {@link ExportaIntegracaoWS } + * + */ + public ExportaIntegracaoWS createExportaIntegracaoWS() { + return new ExportaIntegracaoWS(); + } + + /** + * Create an instance of {@link BuscarBilhetesInconsistente } + * + */ + public BuscarBilhetesInconsistente createBuscarBilhetesInconsistente() { + return new BuscarBilhetesInconsistente(); + } + + /** + * Create an instance of {@link CadReceitaDespesaResponse } + * + */ + public CadReceitaDespesaResponse createCadReceitaDespesaResponse() { + return new CadReceitaDespesaResponse(); + } + + /** + * Create an instance of {@link CadEstadoResponse } + * + */ + public CadEstadoResponse createCadEstadoResponse() { + return new CadEstadoResponse(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadLocalidadeWS } + * + */ + public ExportaIntegracaoCadLocalidadeWS createExportaIntegracaoCadLocalidadeWS() { + return new ExportaIntegracaoCadLocalidadeWS(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadAgenciaWS } + * + */ + public ExportaIntegracaoCadAgenciaWS createExportaIntegracaoCadAgenciaWS() { + return new ExportaIntegracaoCadAgenciaWS(); + } + + /** + * Create an instance of {@link CadLinha } + * + */ + public CadLinha createCadLinha() { + return new CadLinha(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadLinhaWS } + * + */ + public ExportaIntegracaoCadLinhaWS createExportaIntegracaoCadLinhaWS() { + return new ExportaIntegracaoCadLinhaWS(); + } + + /** + * Create an instance of {@link CadAgencia } + * + */ + public CadAgencia createCadAgencia() { + return new CadAgencia(); + } + + /** + * Create an instance of {@link CadReceitaDespesa } + * + */ + public CadReceitaDespesa createCadReceitaDespesa() { + return new CadReceitaDespesa(); + } + + /** + * Create an instance of {@link BuscarBilhetes } + * + */ + public BuscarBilhetes createBuscarBilhetes() { + return new BuscarBilhetes(); + } + + /** + * Create an instance of {@link BuscarBilhetesResponse } + * + */ + public BuscarBilhetesResponse createBuscarBilhetesResponse() { + return new BuscarBilhetesResponse(); + } + + /** + * Create an instance of {@link CadFormaPagamentoResponse } + * + */ + public CadFormaPagamentoResponse createCadFormaPagamentoResponse() { + return new CadFormaPagamentoResponse(); + } + + /** + * Create an instance of {@link CadFormaPagamento } + * + */ + public CadFormaPagamento createCadFormaPagamento() { + return new CadFormaPagamento(); + } + + /** + * Create an instance of {@link CadBeneficioResponse } + * + */ + public CadBeneficioResponse createCadBeneficioResponse() { + return new CadBeneficioResponse(); + } + + /** + * Create an instance of {@link CadEstado } + * + */ + public CadEstado createCadEstado() { + return new CadEstado(); + } + + /** + * Create an instance of {@link CadBeneficio } + * + */ + public CadBeneficio createCadBeneficio() { + return new CadBeneficio(); + } + + /** + * Create an instance of {@link BuscarReceitaDespesa } + * + */ + public BuscarReceitaDespesa createBuscarReceitaDespesa() { + return new BuscarReceitaDespesa(); + } + + /** + * Create an instance of {@link ExportaIntegracaoReceitaDespesaWS } + * + */ + public ExportaIntegracaoReceitaDespesaWS createExportaIntegracaoReceitaDespesaWS() { + return new ExportaIntegracaoReceitaDespesaWS(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadBeneficioWS } + * + */ + public ExportaIntegracaoCadBeneficioWS createExportaIntegracaoCadBeneficioWS() { + return new ExportaIntegracaoCadBeneficioWS(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadReceitaDespesaWS } + * + */ + public ExportaIntegracaoCadReceitaDespesaWS createExportaIntegracaoCadReceitaDespesaWS() { + return new ExportaIntegracaoCadReceitaDespesaWS(); + } + + /** + * Create an instance of {@link CadLocalidadeResponse } + * + */ + public CadLocalidadeResponse createCadLocalidadeResponse() { + return new CadLocalidadeResponse(); + } + + /** + * Create an instance of {@link BuscarReceitaDespesaResponse } + * + */ + public BuscarReceitaDespesaResponse createBuscarReceitaDespesaResponse() { + return new BuscarReceitaDespesaResponse(); + } + + /** + * Create an instance of {@link ExportaIntegracaoCadEstadoWS } + * + */ + public ExportaIntegracaoCadEstadoWS createExportaIntegracaoCadEstadoWS() { + return new ExportaIntegracaoCadEstadoWS(); + } + + /** + * Create an instance of {@link CadAgenciaResponse } + * + */ + public CadAgenciaResponse createCadAgenciaResponse() { + return new CadAgenciaResponse(); + } + + /** + * Create an instance of {@link BuscarBilhetesInconsistenteResponse } + * + */ + public BuscarBilhetesInconsistenteResponse createBuscarBilhetesInconsistenteResponse() { + return new BuscarBilhetesInconsistenteResponse(); + } + + /** + * Create an instance of {@link CadClienteResponse } + * + */ + public CadClienteResponse createCadClienteResponse() { + return new CadClienteResponse(); + } + + /** + * Create an instance of {@link CadLinhaResponse } + * + */ + public CadLinhaResponse createCadLinhaResponse() { + return new CadLinhaResponse(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadReceitaDespesa }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadReceitaDespesa") + public JAXBElement createCadReceitaDespesa(CadReceitaDespesa value) { + return new JAXBElement(_CadReceitaDespesa_QNAME, CadReceitaDespesa.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BuscarReceitaDespesaResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarReceitaDespesaResponse") + public JAXBElement createBuscarReceitaDespesaResponse(BuscarReceitaDespesaResponse value) { + return new JAXBElement(_BuscarReceitaDespesaResponse_QNAME, BuscarReceitaDespesaResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadEstadoResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadEstadoResponse") + public JAXBElement createCadEstadoResponse(CadEstadoResponse value) { + return new JAXBElement(_CadEstadoResponse_QNAME, CadEstadoResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadLocalidadeResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLocalidadeResponse") + public JAXBElement createCadLocalidadeResponse(CadLocalidadeResponse value) { + return new JAXBElement(_CadLocalidadeResponse_QNAME, CadLocalidadeResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadCliente }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadCliente") + public JAXBElement createCadCliente(CadCliente value) { + return new JAXBElement(_CadCliente_QNAME, CadCliente.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadEstado }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadEstado") + public JAXBElement createCadEstado(CadEstado value) { + return new JAXBElement(_CadEstado_QNAME, CadEstado.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetes }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetes") + public JAXBElement createBuscarBilhetes(BuscarBilhetes value) { + return new JAXBElement(_BuscarBilhetes_QNAME, BuscarBilhetes.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadLinha }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLinha") + public JAXBElement createCadLinha(CadLinha value) { + return new JAXBElement(_CadLinha_QNAME, CadLinha.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadBeneficioResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBeneficioResponse") + public JAXBElement createCadBeneficioResponse(CadBeneficioResponse value) { + return new JAXBElement(_CadBeneficioResponse_QNAME, CadBeneficioResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadAgenciaResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadAgenciaResponse") + public JAXBElement createCadAgenciaResponse(CadAgenciaResponse value) { + return new JAXBElement(_CadAgenciaResponse_QNAME, CadAgenciaResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadLinhaResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLinhaResponse") + public JAXBElement createCadLinhaResponse(CadLinhaResponse value) { + return new JAXBElement(_CadLinhaResponse_QNAME, CadLinhaResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetesInconsistente }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetesInconsistente") + public JAXBElement createBuscarBilhetesInconsistente(BuscarBilhetesInconsistente value) { + return new JAXBElement(_BuscarBilhetesInconsistente_QNAME, BuscarBilhetesInconsistente.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadReceitaDespesaResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadReceitaDespesaResponse") + public JAXBElement createCadReceitaDespesaResponse(CadReceitaDespesaResponse value) { + return new JAXBElement(_CadReceitaDespesaResponse_QNAME, CadReceitaDespesaResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadBilheteiroResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBilheteiroResponse") + public JAXBElement createCadBilheteiroResponse(CadBilheteiroResponse value) { + return new JAXBElement(_CadBilheteiroResponse_QNAME, CadBilheteiroResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadFormaPagamento }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadFormaPagamento") + public JAXBElement createCadFormaPagamento(CadFormaPagamento value) { + return new JAXBElement(_CadFormaPagamento_QNAME, CadFormaPagamento.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadFormaPagamentoResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadFormaPagamentoResponse") + public JAXBElement createCadFormaPagamentoResponse(CadFormaPagamentoResponse value) { + return new JAXBElement(_CadFormaPagamentoResponse_QNAME, CadFormaPagamentoResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadClienteResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadClienteResponse") + public JAXBElement createCadClienteResponse(CadClienteResponse value) { + return new JAXBElement(_CadClienteResponse_QNAME, CadClienteResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetesInconsistenteResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetesInconsistenteResponse") + public JAXBElement createBuscarBilhetesInconsistenteResponse(BuscarBilhetesInconsistenteResponse value) { + return new JAXBElement(_BuscarBilhetesInconsistenteResponse_QNAME, BuscarBilhetesInconsistenteResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BuscarBilhetesResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarBilhetesResponse") + public JAXBElement createBuscarBilhetesResponse(BuscarBilhetesResponse value) { + return new JAXBElement(_BuscarBilhetesResponse_QNAME, BuscarBilhetesResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BuscarReceitaDespesa }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "buscarReceitaDespesa") + public JAXBElement createBuscarReceitaDespesa(BuscarReceitaDespesa value) { + return new JAXBElement(_BuscarReceitaDespesa_QNAME, BuscarReceitaDespesa.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadBilheteiro }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBilheteiro") + public JAXBElement createCadBilheteiro(CadBilheteiro value) { + return new JAXBElement(_CadBilheteiro_QNAME, CadBilheteiro.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadBeneficio }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadBeneficio") + public JAXBElement createCadBeneficio(CadBeneficio value) { + return new JAXBElement(_CadBeneficio_QNAME, CadBeneficio.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadLocalidade }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadLocalidade") + public JAXBElement createCadLocalidade(CadLocalidade value) { + return new JAXBElement(_CadLocalidade_QNAME, CadLocalidade.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CadAgencia }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.hstcajservice.rjconsultores.com/", name = "cadAgencia") + public JAXBElement createCadAgencia(CadAgencia value) { + return new JAXBElement(_CadAgencia_QNAME, CadAgencia.class, null, value); + } + +} diff --git a/src/com/rjconsultores/routing/DynamicDataSourceHolder.java b/ModelWeb/src/com/rjconsultores/routing/DynamicDataSourceHolder.java similarity index 95% rename from src/com/rjconsultores/routing/DynamicDataSourceHolder.java rename to ModelWeb/src/com/rjconsultores/routing/DynamicDataSourceHolder.java index 62c806c66..94df3d94c 100644 --- a/src/com/rjconsultores/routing/DynamicDataSourceHolder.java +++ b/ModelWeb/src/com/rjconsultores/routing/DynamicDataSourceHolder.java @@ -1,18 +1,18 @@ -package com.rjconsultores.routing; - -public class DynamicDataSourceHolder { - private static ThreadLocal routeKey = new ThreadLocal(); - - public static String getRouteKey() { - String key = routeKey.get(); - return key; - } - - public static void setRouteKey(String key) { - routeKey.set(key); - } - - public static void removeRouteKey() { - routeKey.remove(); - } +package com.rjconsultores.routing; + +public class DynamicDataSourceHolder { + private static ThreadLocal routeKey = new ThreadLocal(); + + public static String getRouteKey() { + String key = routeKey.get(); + return key; + } + + public static void setRouteKey(String key) { + routeKey.set(key); + } + + public static void removeRouteKey() { + routeKey.remove(); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/routing/MultipleDataSource.java b/ModelWeb/src/com/rjconsultores/routing/MultipleDataSource.java similarity index 96% rename from src/com/rjconsultores/routing/MultipleDataSource.java rename to ModelWeb/src/com/rjconsultores/routing/MultipleDataSource.java index f34a1030d..1837e1598 100644 --- a/src/com/rjconsultores/routing/MultipleDataSource.java +++ b/ModelWeb/src/com/rjconsultores/routing/MultipleDataSource.java @@ -1,16 +1,16 @@ -package com.rjconsultores.routing; - -import java.util.logging.Logger; - -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - -public class MultipleDataSource extends AbstractRoutingDataSource { - @Override - protected Object determineCurrentLookupKey() { - return DynamicDataSourceHolder.getRouteKey(); - } - - public Logger getParentLogger(){ - return Logger.getLogger("MultipleDataSource"); - } -} +package com.rjconsultores.routing; + +import java.util.logging.Logger; + +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +public class MultipleDataSource extends AbstractRoutingDataSource { + @Override + protected Object determineCurrentLookupKey() { + return DynamicDataSourceHolder.getRouteKey(); + } + + public Logger getParentLogger(){ + return Logger.getLogger("MultipleDataSource"); + } +} diff --git a/src/com/rjconsultores/routing/ReadOnlyConnection.java b/ModelWeb/src/com/rjconsultores/routing/ReadOnlyConnection.java similarity index 96% rename from src/com/rjconsultores/routing/ReadOnlyConnection.java rename to ModelWeb/src/com/rjconsultores/routing/ReadOnlyConnection.java index 6cd607659..5aa970911 100644 --- a/src/com/rjconsultores/routing/ReadOnlyConnection.java +++ b/ModelWeb/src/com/rjconsultores/routing/ReadOnlyConnection.java @@ -1,12 +1,12 @@ -package com.rjconsultores.routing; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD, ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface ReadOnlyConnection { - +package com.rjconsultores.routing; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ReadOnlyConnection { + } \ No newline at end of file diff --git a/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java b/ModelWeb/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java similarity index 97% rename from src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java rename to ModelWeb/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java index 46cd8aa20..370dc456d 100644 --- a/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java +++ b/ModelWeb/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java @@ -1,40 +1,40 @@ -package com.rjconsultores.routing; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; - -@Aspect -@Component -@Order(0) -public class ReadOnlyRouteInterceptor { - private static final Logger log = LogManager.getLogger(ReadOnlyRouteInterceptor.class); - - @Around("@annotation(readOnlyConnection)") - public Object proceed(ProceedingJoinPoint proceedingJoinPoint, ReadOnlyConnection readOnlyConnection) throws Throwable { - if (ApplicationProperties.getInstance().getReadOnlyConnection()) { - try { - String className = proceedingJoinPoint.getSignature().getDeclaringTypeName(); - String methodName = proceedingJoinPoint.getSignature().getName(); - - log.debug("*** READ *** [" + className + "." + methodName + "()"); - } catch (Exception e) {} - - try { - DynamicDataSourceHolder.setRouteKey("dataSourceRead"); - - return proceedingJoinPoint.proceed(); - } finally { - DynamicDataSourceHolder.removeRouteKey(); - } - } else { - return proceedingJoinPoint.proceed(); - } - } -} +package com.rjconsultores.routing; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; + +@Aspect +@Component +@Order(0) +public class ReadOnlyRouteInterceptor { + private static final Logger log = LogManager.getLogger(ReadOnlyRouteInterceptor.class); + + @Around("@annotation(readOnlyConnection)") + public Object proceed(ProceedingJoinPoint proceedingJoinPoint, ReadOnlyConnection readOnlyConnection) throws Throwable { + if (ApplicationProperties.getInstance().getReadOnlyConnection()) { + try { + String className = proceedingJoinPoint.getSignature().getDeclaringTypeName(); + String methodName = proceedingJoinPoint.getSignature().getName(); + + log.debug("*** READ *** [" + className + "." + methodName + "()"); + } catch (Exception e) {} + + try { + DynamicDataSourceHolder.setRouteKey("dataSourceRead"); + + return proceedingJoinPoint.proceed(); + } finally { + DynamicDataSourceHolder.removeRouteKey(); + } + } else { + return proceedingJoinPoint.proceed(); + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/anotacao/Renderizado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/anotacao/Renderizado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/anotacao/Renderizado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/anotacao/Renderizado.java diff --git a/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/AuditControl.java diff --git a/src/com/rjconsultores/ventaboletos/auditoria/AuditManager.java b/ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/AuditManager.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/auditoria/AuditManager.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/AuditManager.java index 9dec4163e..4a8a2ecd3 100644 --- a/src/com/rjconsultores/ventaboletos/auditoria/AuditManager.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/AuditManager.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.auditoria; - -public class AuditManager { - private static AuditControl INSTANCE; - - public static AuditControl getINSTANCE(String currentActionService) { - INSTANCE = new AuditControl(currentActionService); - return INSTANCE; - } - - public static AuditControl getINSTANCE() { - return INSTANCE; - } -} +package com.rjconsultores.ventaboletos.auditoria; + +public class AuditManager { + private static AuditControl INSTANCE; + + public static AuditControl getINSTANCE(String currentActionService) { + INSTANCE = new AuditControl(currentActionService); + return INSTANCE; + } + + public static AuditControl getINSTANCE() { + return INSTANCE; + } +} diff --git a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java b/ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java index e0cf930c2..9749ae041 100644 --- a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java @@ -1,187 +1,187 @@ -package com.rjconsultores.ventaboletos.auditoria.interceptor; - -import java.io.Serializable; -import java.sql.Date; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.EmptyInterceptor; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.hibernate.type.Type; - -import com.rjconsultores.ventaboletos.auditoria.AuditControl; -import com.rjconsultores.ventaboletos.auditoria.AuditManager; -import com.rjconsultores.ventaboletos.dao.util.DBUtil; -import com.rjconsultores.ventaboletos.entidad.AuditLog; -import com.rjconsultores.ventaboletos.entidad.AuditService; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.FuncionSistema; -import com.rjconsultores.ventaboletos.entidad.Sistema; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.enums.auditoria.EnumAuditAction; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -public class AuditInterceptor extends EmptyInterceptor { - private static final long serialVersionUID = 1L; - - private static final Logger log = LogManager.getLogger(AuditInterceptor.class); - - private static final String ACTIVO = "activo"; - - // Considera que o ADM sempre tenha o ID igual a 1 - private Integer SISTEMA_ID = 1; - - @Override - public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { - final SessionFactory sessionFactory = DBUtil.getInstance().getSessionFactory(); - final Session session = sessionFactory.openSession(); - - try { - genAudit(session, entity, EnumAuditAction.CRIACAO); - } catch (Exception exception) { - log.error(exception.getMessage(), exception); - } - - if (session != null) { - session.close(); - } - - return super.onSave(entity, id, state, propertyNames, types); - } - - @Override - public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { - final SessionFactory sessionFactory = DBUtil.getInstance().getSessionFactory(); - final Session session = sessionFactory.openSession(); - - try { - genAudit(session, entity, EnumAuditAction.ALTERACAO); - } catch (Exception exception) { - log.error(exception.getMessage(), exception); - } - - if (session != null) { - session.close(); - } - - return super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types); - } - - @Override - public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { - final SessionFactory sessionFactory = DBUtil.getInstance().getSessionFactory(); - final Session session = sessionFactory.openSession(); - - try { - genAudit(session, entity, EnumAuditAction.EXCLUSAO); - } catch (Exception exception) { - log.error(exception.getMessage(), exception); - } - - if (session != null) { - session.close(); - } - - super.onDelete(entity, id, state, propertyNames, types); - } - - private void genAudit(final Session session, Object entity, EnumAuditAction action) { - if (!getAuditModuleService(session)) { - return; - } - - try { - /** - * Ignorado caso a entidade for de auditoria e se não for encontrado o módulo no banco - */ - if (!(entity instanceof AuditLog)) { - AuditService service = AuditManager.getINSTANCE().getCurrentService(); - - if (!(entity instanceof AuditLog) && service != null && service.getModule() != null) { - /** - * A auditoria não será realizada nos seguintes cenários: 1) não for encontrado o serviço no banco de dados 2) O serviço for encontrado, porém não está habilitado para auditoria - */ - if (service.getModule().getIndAuditable()) { - AuditLog audit = new AuditLog(); - audit.setCreatedDate(new Date(System.currentTimeMillis())); - audit.setEntityName(entity.getClass().getSimpleName()); - audit.setService(service); - audit.setEntityDetail(AuditControl.toJson(entity)); - - Sistema sistema = new Sistema(); - sistema.setSistemaId(SISTEMA_ID); - audit.setSistema(sistema); - - audit.setAction(action.getId()); - audit.setUsuario(UsuarioLogado.getUsuarioLogado() != null ? UsuarioLogado.getUsuarioLogado() : new Usuario(1)); - - session.persist(audit); - session.flush(); - } - } - } - - } catch (Exception exception) { - log.error(exception.getMessage(), exception); - - } - } - - private boolean getAuditModuleService(final Session session) { - if (AuditManager.getINSTANCE() != null && AuditManager.getINSTANCE().getAuditar() == null) { - Criteria criteriaAuditar = session.createCriteria(Constante.class); - criteriaAuditar.add(Restrictions.eq("nombconstante", "AUDITAR_SISTEMA")); - criteriaAuditar.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - Constante constante = (Constante) criteriaAuditar.uniqueResult(); - - Boolean auditar = Boolean.FALSE; - - if (constante != null) { - try { - auditar = Boolean.valueOf(constante.getValorconstante()); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - - AuditManager.getINSTANCE().setAuditar(auditar); - } - - if (AuditManager.getINSTANCE() == null || AuditManager.getINSTANCE().getAuditar() == null || !AuditManager.getINSTANCE().getAuditar()) { - return false; - } - - if (!AuditManager.getINSTANCE().getCheckModuleAudit()) { - return AuditManager.getINSTANCE().getCurrentService() != null ? true : false; - } - - AuditService auditService = null; - - Criteria criteriaFuncionSistema = session.createCriteria(FuncionSistema.class); - criteriaFuncionSistema.add(Restrictions.eq("descruta", AuditManager.getINSTANCE().getCurrentActionService())); - FuncionSistema funcionSistema = (FuncionSistema) criteriaFuncionSistema.uniqueResult(); - - if (funcionSistema == null) { - log.info("Função sistema " + funcionSistema + " não encontrada na base de dados."); - AuditManager.getINSTANCE().setCurrentService(auditService); - - return false; - } - - Criteria criteriaService = session.createCriteria(AuditService.class); - criteriaService.add(Restrictions.eq("funcionSistema", funcionSistema)); - auditService = (AuditService) criteriaService.uniqueResult(); - - if (auditService == null) { - return false; - } - - AuditManager.getINSTANCE().setCurrentService(auditService); - AuditManager.getINSTANCE().setCheckModuleAudit(Boolean.FALSE); - - return true; - } -} +package com.rjconsultores.ventaboletos.auditoria.interceptor; + +import java.io.Serializable; +import java.sql.Date; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.EmptyInterceptor; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.hibernate.type.Type; + +import com.rjconsultores.ventaboletos.auditoria.AuditControl; +import com.rjconsultores.ventaboletos.auditoria.AuditManager; +import com.rjconsultores.ventaboletos.dao.util.DBUtil; +import com.rjconsultores.ventaboletos.entidad.AuditLog; +import com.rjconsultores.ventaboletos.entidad.AuditService; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.FuncionSistema; +import com.rjconsultores.ventaboletos.entidad.Sistema; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.enums.auditoria.EnumAuditAction; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +public class AuditInterceptor extends EmptyInterceptor { + private static final long serialVersionUID = 1L; + + private static final Logger log = LogManager.getLogger(AuditInterceptor.class); + + private static final String ACTIVO = "activo"; + + // Considera que o ADM sempre tenha o ID igual a 1 + private Integer SISTEMA_ID = 1; + + @Override + public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { + final SessionFactory sessionFactory = DBUtil.getInstance().getSessionFactory(); + final Session session = sessionFactory.openSession(); + + try { + genAudit(session, entity, EnumAuditAction.CRIACAO); + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + } + + if (session != null) { + session.close(); + } + + return super.onSave(entity, id, state, propertyNames, types); + } + + @Override + public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { + final SessionFactory sessionFactory = DBUtil.getInstance().getSessionFactory(); + final Session session = sessionFactory.openSession(); + + try { + genAudit(session, entity, EnumAuditAction.ALTERACAO); + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + } + + if (session != null) { + session.close(); + } + + return super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types); + } + + @Override + public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { + final SessionFactory sessionFactory = DBUtil.getInstance().getSessionFactory(); + final Session session = sessionFactory.openSession(); + + try { + genAudit(session, entity, EnumAuditAction.EXCLUSAO); + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + } + + if (session != null) { + session.close(); + } + + super.onDelete(entity, id, state, propertyNames, types); + } + + private void genAudit(final Session session, Object entity, EnumAuditAction action) { + if (!getAuditModuleService(session)) { + return; + } + + try { + /** + * Ignorado caso a entidade for de auditoria e se não for encontrado o módulo no banco + */ + if (!(entity instanceof AuditLog)) { + AuditService service = AuditManager.getINSTANCE().getCurrentService(); + + if (!(entity instanceof AuditLog) && service != null && service.getModule() != null) { + /** + * A auditoria não será realizada nos seguintes cenários: 1) não for encontrado o serviço no banco de dados 2) O serviço for encontrado, porém não está habilitado para auditoria + */ + if (service.getModule().getIndAuditable()) { + AuditLog audit = new AuditLog(); + audit.setCreatedDate(new Date(System.currentTimeMillis())); + audit.setEntityName(entity.getClass().getSimpleName()); + audit.setService(service); + audit.setEntityDetail(AuditControl.toJson(entity)); + + Sistema sistema = new Sistema(); + sistema.setSistemaId(SISTEMA_ID); + audit.setSistema(sistema); + + audit.setAction(action.getId()); + audit.setUsuario(UsuarioLogado.getUsuarioLogado() != null ? UsuarioLogado.getUsuarioLogado() : new Usuario(1)); + + session.persist(audit); + session.flush(); + } + } + } + + } catch (Exception exception) { + log.error(exception.getMessage(), exception); + + } + } + + private boolean getAuditModuleService(final Session session) { + if (AuditManager.getINSTANCE() != null && AuditManager.getINSTANCE().getAuditar() == null) { + Criteria criteriaAuditar = session.createCriteria(Constante.class); + criteriaAuditar.add(Restrictions.eq("nombconstante", "AUDITAR_SISTEMA")); + criteriaAuditar.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + Constante constante = (Constante) criteriaAuditar.uniqueResult(); + + Boolean auditar = Boolean.FALSE; + + if (constante != null) { + try { + auditar = Boolean.valueOf(constante.getValorconstante()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + AuditManager.getINSTANCE().setAuditar(auditar); + } + + if (AuditManager.getINSTANCE() == null || AuditManager.getINSTANCE().getAuditar() == null || !AuditManager.getINSTANCE().getAuditar()) { + return false; + } + + if (!AuditManager.getINSTANCE().getCheckModuleAudit()) { + return AuditManager.getINSTANCE().getCurrentService() != null ? true : false; + } + + AuditService auditService = null; + + Criteria criteriaFuncionSistema = session.createCriteria(FuncionSistema.class); + criteriaFuncionSistema.add(Restrictions.eq("descruta", AuditManager.getINSTANCE().getCurrentActionService())); + FuncionSistema funcionSistema = (FuncionSistema) criteriaFuncionSistema.uniqueResult(); + + if (funcionSistema == null) { + log.info("Função sistema " + funcionSistema + " não encontrada na base de dados."); + AuditManager.getINSTANCE().setCurrentService(auditService); + + return false; + } + + Criteria criteriaService = session.createCriteria(AuditService.class); + criteriaService.add(Restrictions.eq("funcionSistema", funcionSistema)); + auditService = (AuditService) criteriaService.uniqueResult(); + + if (auditService == null) { + return false; + } + + AuditManager.getINSTANCE().setCurrentService(auditService); + AuditManager.getINSTANCE().setCheckModuleAudit(Boolean.FALSE); + + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/Constantes.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/constantes/Constantes.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/Constantes.java index 1a527660a..745c3ca79 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/Constantes.java @@ -1,160 +1,160 @@ -package com.rjconsultores.ventaboletos.constantes; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - - -public class Constantes { - - public static final Long FORMA_PAGO_DINHEIRO = 1L; - public static final Long FORMA_PAGO_CREDITO = 2L; - public static final Long FORMA_PAGO_DEBITO = 3L; - public static final Long FORMA_PAGO_TROCA_PASSAGEM = 10L; - public static final Long FORMA_PAGO_ORDEN_SERVICIO = 11L; - public static final Long FORMA_PAGO_GERACAO_OCD = 35L; - public static final Long FORMA_PAGO_NOTA_CREDITO = 93L; - public static final Long FORMA_PAGO_RESERVA = 94L; - - - public static final Long MVO_CANCEL_CANCELACION = 31L; - public static final Long MVO_CANCEL_DEVOLUCAO = 32L; - public static final Long MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_50 = 36L; - public static final Long MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_100 = 37L; - public static final Long MVO_CANCEL_TROCA = 10L; - public static final Long MVO_CANCEL_CHECKIN = 27L; - public static final Long MVO_CANCEL_TRANSFERENCIA = 23L; - public static final Long MVO_CANCEL_BOLETO_ENTREGADO = 16L; - public static final Long MVO_CANCEL_BOLETO_AGRUPAMENTO = 17L; - public static final Long MVO_CANCEL_GERACAO_OCD = 99L; - public static final Long MVO_CANCEL_QUITACAO_OCD = 35L; - public static final Long MVO_CANCEL_VENDA_PACOTE = 33L; - public static final Long ORGAO_CONCEDENTE_ID_AGERBA = 27L; - - public static final Long TPV_DIRECTO_NORMAL = 1L; - public static final Long TPV_MANUAL = 3L; - public static final Long TPV_CALL_CENTER = 5L; - public static final Long TPV_BOLETO_REMOTO = 18L; - public static final Long TPV_TRANSFERENCIAS = 8L; // é a troca de passagens - public static final Long TPV_CAMBIO_VIAJE = 81L; // é a transferência de passagens - public static final Long TPV_CHECKIN_VIAGEM = 41L; // chekin boletos - public static final Long TPV_BOLETO_ABIERTO = 9L; - public static final Long TPV_CONFIRMA_ABIERTO = 82L; - public static final Long TPV_VENDA_BOLETO_ABERTO_MANUAL = 39L; - - public static final Long TPV_RESERVACION_POR_INTERNET = 16L; - public static final Long TPV_POR_INTERNET = 12L; - public static final Long TPV_AGENCIA_WEB = 19L; - - public static final Integer TIPO_OPERACION_CC_LQ = 1; - public static final Integer TIPO_OPERACION_CC_PAGO = 2; - - public static final Integer ARTICULO_VENTA = 1; - public static final Integer ARTICULO_OUTROS = 2; - public static final Integer ARTICULO_MANUAL = 3; - - public static final Short TURNO_AUTOMATICO = new Short("99"); - - public static final String IMAGEM_EMPRESA = "EMPRESA_BACKGROUND"; - public static final String IMAGEM_EMPRESA_GENERICA = "EMPRESA_BACKGROUND_GENERICA"; - - public static final String ORGAO_CONCEDENTE_STRING_AGERBA = "AGERBA"; - - public static List ORGAOS_CONCEDENTES_CALCULO_ARTESP = new ArrayList(Arrays.asList(new Integer[]{21})) ; - /* - 3 ANTT - 4 AGEPAN - 2 DER/PR - 6 DER/MG - 9 DER/RJ - 15 DER/SC - 16 DER/GO - 22 DETRO/RJ - 10 DER/ES - 25 Pref de Ibatiba - 26 Pref de João Neiva - 27 AGERBA - 28 DER/RO - 30 DETER - */ - public static List ORGAOS_CONCEDENTES_CALCULO_ANTT = new ArrayList(Arrays.asList(new Integer[]{2,3,4,6,9,15,16,22,10,25,26,27,28,29,30})); - - /* - * 5 - DER/MT - * 23 - Pref.Marilia - * - */ - public static List ORGAOS_CONCEDENTES_CALCULO_AGER = new ArrayList(Arrays.asList(new Integer[]{5,23})); - - public static final String UTF_8 = "UTF-8"; - public static final String CHARSET_UTF8 = ";charset=utf-8"; - - public static final int INTERVALO_FECHAMENTO_DIARIO = 1; - public static final int INTERVALO_FECHAMENTO_SEMANAL = 7; - public static final int INTERVALO_FECHAMENTO_DECENDIAL = 10; - public static final int INTERVALO_FECHAMENTO_QUINZENAL = 15; - public static final int INTERVALO_FECHAMENTO_MENSAL = 30; - public static final int LIMITE_EVENTO_EXTRA_EDITAVEL = 99000;//TipoEventoExtra com id >= 99000 não são editáveis. - - public static final String DESCONTO_COMPONENTE_PRECO = "DESCONTO_COMPONENTE_PRECO"; - - public static final String TEMPO_LIMITE_PEN_PARAM_OCD = "TEMPO_LIMITE_PEN_PARAM_OCD"; - - public static final String CVESISTEMA_MOTIVO_CANCELAMENTO_ECF = "CANCELAMENTO_ECF"; - - public static final String QTDE_MAX_DIAS_RETENCAO_DIARIA_COMISSAO = "QTDE_MAX_DIAS_RETENCAO_DIARIA_COMISSAO"; - - public static final String RETER_COMISSAO_ADM_FECHAMENTO_CAIXA = "RETER_COMISSAO_ADM_FECHAMENTO_CAIXA"; - - public enum FiltroEnviadosSefaz { SIM, NAO, TODOS }; - - public static final String CVESISTEMA_MOTIVO_CANCELAMENTO_ALTERACAO_POLTRONA = "ALTERACAO_POLTRONA"; - - public static final String BPE_ALTERACAO_POLTRONA = "110116"; - - public static final String ESTACAO_EMBARCADA = "ESTACAO_EMBARCADA"; - - public static final Integer CATEGORIA_NORMAL = 1; - - public static final String BPE_AMBIENTE = "BPE_AMBIENTE"; - - public static final String BPE_URL = "BPE_URL"; - - public static final String BPE_URL_CONTIG = "BPE_URL_CONTIG_"; - - public static final String RELATORIO_BPE_OTIMIZADO = "RELATORIO_BPE_OTIMIZADO"; - - public static final String URL_PAINEL_EMBARCADA = "URL_PAINEL_EMBARCADA"; - - public static final String EXIGE_EMAIL_OU_TEL_CAD_CLIENTE = "EXIGE_EMAIL_OU_TEL_CAD_CLIENTE"; - - public static final String SMTP_COMISSAO_EMAIL = "SMTP_COMISSAO_EMAIL"; - - public static final String SMTP_COMISSAO_HOST = "SMTP_COMISSAO_HOST"; - - public static final String SMTP_COMISSAO_AUTENTICACAO = "SMTP_COMISSAO_AUTENTICACAO"; - - public static final String SMTP_COMISSAO_PASS = "SMTP_COMISSAO_PASS"; - - public static final String SMTP_COMISSAO_PORT = "SMTP_COMISSAO_PORT"; - - public static final String SMTP_COMISSAO_USER = "SMTP_COMISSAO_USER"; - - public static final String TIPO_OCUPACAO_SEM_VALIDACAO = "TIPO_OCUPACAO_SEM_VALIDACAO"; - - public static final String CNPJ_OBRIGATORIO_ORDEN_SERVICO = "CNPJ_OBRIGATORIO_ORDEN_SERVICO"; - - - public static final String NUM_ASIENTO_CON_LETRA = "NUM_ASIENTO_CON_LETRA"; - - public static final String DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO = "DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO"; - - public static final Integer PERFIL_ADM_CONTRATO = 32; - - public static final String NUM_VIAJE_9_DIGITOS = "NUM_VIAJE_9_DIGITOS"; - - private Constantes() { - - } - -} +package com.rjconsultores.ventaboletos.constantes; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + + +public class Constantes { + + public static final Long FORMA_PAGO_DINHEIRO = 1L; + public static final Long FORMA_PAGO_CREDITO = 2L; + public static final Long FORMA_PAGO_DEBITO = 3L; + public static final Long FORMA_PAGO_TROCA_PASSAGEM = 10L; + public static final Long FORMA_PAGO_ORDEN_SERVICIO = 11L; + public static final Long FORMA_PAGO_GERACAO_OCD = 35L; + public static final Long FORMA_PAGO_NOTA_CREDITO = 93L; + public static final Long FORMA_PAGO_RESERVA = 94L; + + + public static final Long MVO_CANCEL_CANCELACION = 31L; + public static final Long MVO_CANCEL_DEVOLUCAO = 32L; + public static final Long MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_50 = 36L; + public static final Long MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_100 = 37L; + public static final Long MVO_CANCEL_TROCA = 10L; + public static final Long MVO_CANCEL_CHECKIN = 27L; + public static final Long MVO_CANCEL_TRANSFERENCIA = 23L; + public static final Long MVO_CANCEL_BOLETO_ENTREGADO = 16L; + public static final Long MVO_CANCEL_BOLETO_AGRUPAMENTO = 17L; + public static final Long MVO_CANCEL_GERACAO_OCD = 99L; + public static final Long MVO_CANCEL_QUITACAO_OCD = 35L; + public static final Long MVO_CANCEL_VENDA_PACOTE = 33L; + public static final Long ORGAO_CONCEDENTE_ID_AGERBA = 27L; + + public static final Long TPV_DIRECTO_NORMAL = 1L; + public static final Long TPV_MANUAL = 3L; + public static final Long TPV_CALL_CENTER = 5L; + public static final Long TPV_BOLETO_REMOTO = 18L; + public static final Long TPV_TRANSFERENCIAS = 8L; // é a troca de passagens + public static final Long TPV_CAMBIO_VIAJE = 81L; // é a transferência de passagens + public static final Long TPV_CHECKIN_VIAGEM = 41L; // chekin boletos + public static final Long TPV_BOLETO_ABIERTO = 9L; + public static final Long TPV_CONFIRMA_ABIERTO = 82L; + public static final Long TPV_VENDA_BOLETO_ABERTO_MANUAL = 39L; + + public static final Long TPV_RESERVACION_POR_INTERNET = 16L; + public static final Long TPV_POR_INTERNET = 12L; + public static final Long TPV_AGENCIA_WEB = 19L; + + public static final Integer TIPO_OPERACION_CC_LQ = 1; + public static final Integer TIPO_OPERACION_CC_PAGO = 2; + + public static final Integer ARTICULO_VENTA = 1; + public static final Integer ARTICULO_OUTROS = 2; + public static final Integer ARTICULO_MANUAL = 3; + + public static final Short TURNO_AUTOMATICO = new Short("99"); + + public static final String IMAGEM_EMPRESA = "EMPRESA_BACKGROUND"; + public static final String IMAGEM_EMPRESA_GENERICA = "EMPRESA_BACKGROUND_GENERICA"; + + public static final String ORGAO_CONCEDENTE_STRING_AGERBA = "AGERBA"; + + public static List ORGAOS_CONCEDENTES_CALCULO_ARTESP = new ArrayList(Arrays.asList(new Integer[]{21})) ; + /* + 3 ANTT + 4 AGEPAN + 2 DER/PR + 6 DER/MG + 9 DER/RJ + 15 DER/SC + 16 DER/GO + 22 DETRO/RJ + 10 DER/ES + 25 Pref de Ibatiba + 26 Pref de João Neiva + 27 AGERBA + 28 DER/RO + 30 DETER + */ + public static List ORGAOS_CONCEDENTES_CALCULO_ANTT = new ArrayList(Arrays.asList(new Integer[]{2,3,4,6,9,15,16,22,10,25,26,27,28,29,30})); + + /* + * 5 - DER/MT + * 23 - Pref.Marilia + * + */ + public static List ORGAOS_CONCEDENTES_CALCULO_AGER = new ArrayList(Arrays.asList(new Integer[]{5,23})); + + public static final String UTF_8 = "UTF-8"; + public static final String CHARSET_UTF8 = ";charset=utf-8"; + + public static final int INTERVALO_FECHAMENTO_DIARIO = 1; + public static final int INTERVALO_FECHAMENTO_SEMANAL = 7; + public static final int INTERVALO_FECHAMENTO_DECENDIAL = 10; + public static final int INTERVALO_FECHAMENTO_QUINZENAL = 15; + public static final int INTERVALO_FECHAMENTO_MENSAL = 30; + public static final int LIMITE_EVENTO_EXTRA_EDITAVEL = 99000;//TipoEventoExtra com id >= 99000 não são editáveis. + + public static final String DESCONTO_COMPONENTE_PRECO = "DESCONTO_COMPONENTE_PRECO"; + + public static final String TEMPO_LIMITE_PEN_PARAM_OCD = "TEMPO_LIMITE_PEN_PARAM_OCD"; + + public static final String CVESISTEMA_MOTIVO_CANCELAMENTO_ECF = "CANCELAMENTO_ECF"; + + public static final String QTDE_MAX_DIAS_RETENCAO_DIARIA_COMISSAO = "QTDE_MAX_DIAS_RETENCAO_DIARIA_COMISSAO"; + + public static final String RETER_COMISSAO_ADM_FECHAMENTO_CAIXA = "RETER_COMISSAO_ADM_FECHAMENTO_CAIXA"; + + public enum FiltroEnviadosSefaz { SIM, NAO, TODOS }; + + public static final String CVESISTEMA_MOTIVO_CANCELAMENTO_ALTERACAO_POLTRONA = "ALTERACAO_POLTRONA"; + + public static final String BPE_ALTERACAO_POLTRONA = "110116"; + + public static final String ESTACAO_EMBARCADA = "ESTACAO_EMBARCADA"; + + public static final Integer CATEGORIA_NORMAL = 1; + + public static final String BPE_AMBIENTE = "BPE_AMBIENTE"; + + public static final String BPE_URL = "BPE_URL"; + + public static final String BPE_URL_CONTIG = "BPE_URL_CONTIG_"; + + public static final String RELATORIO_BPE_OTIMIZADO = "RELATORIO_BPE_OTIMIZADO"; + + public static final String URL_PAINEL_EMBARCADA = "URL_PAINEL_EMBARCADA"; + + public static final String EXIGE_EMAIL_OU_TEL_CAD_CLIENTE = "EXIGE_EMAIL_OU_TEL_CAD_CLIENTE"; + + public static final String SMTP_COMISSAO_EMAIL = "SMTP_COMISSAO_EMAIL"; + + public static final String SMTP_COMISSAO_HOST = "SMTP_COMISSAO_HOST"; + + public static final String SMTP_COMISSAO_AUTENTICACAO = "SMTP_COMISSAO_AUTENTICACAO"; + + public static final String SMTP_COMISSAO_PASS = "SMTP_COMISSAO_PASS"; + + public static final String SMTP_COMISSAO_PORT = "SMTP_COMISSAO_PORT"; + + public static final String SMTP_COMISSAO_USER = "SMTP_COMISSAO_USER"; + + public static final String TIPO_OCUPACAO_SEM_VALIDACAO = "TIPO_OCUPACAO_SEM_VALIDACAO"; + + public static final String CNPJ_OBRIGATORIO_ORDEN_SERVICO = "CNPJ_OBRIGATORIO_ORDEN_SERVICO"; + + + public static final String NUM_ASIENTO_CON_LETRA = "NUM_ASIENTO_CON_LETRA"; + + public static final String DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO = "DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO"; + + public static final Integer PERFIL_ADM_CONTRATO = 32; + + public static final String NUM_VIAJE_9_DIGITOS = "NUM_VIAJE_9_DIGITOS"; + + private Constantes() { + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java similarity index 99% rename from src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java index f437d7c35..cb4efb5b8 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java @@ -1,49 +1,49 @@ -package com.rjconsultores.ventaboletos.constantes; - -public class ConstantesFuncionSistema { - - private ConstantesFuncionSistema() { - } - - public static final String CLAVE_EDITAR_USUARIO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.MENU.USUARIO"; - public static final String CLAVE_EDITAR_COMISSAO = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.EDITARCOMISSAO"; - public static final String CLAVE_EXIBIR_TAB_COMISSAO_CONTA = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.EDITARPORCENTAGEMCONTA"; - public static final String CLAVE_REABRIR_MOVIMENTODIARIO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.COMISSAO.MENU.CONFERENCIACOMISSAO.REABRIRMOVIMENTODIARIO"; - public static final String CLAVE_ENCERRAR_MOVIMENTODIARIO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.COMISSAO.MENU.CONFERENCIACOMISSAO.ENCERRARMOVIMENTODIARIO"; - public static final String CLAVE_GENERA_FOLIOSISTEMA_VTA_INT_IMP_POSTERIOR = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGO.MENU.EMPRESA.GENERAFOLIOSISTEMAVTAINTIMPPOSTERIOR"; - public static final String CLAVE_EDITAR_VENDA_SEM_REDUCAO_Z = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGO.MENU.EMPRESA.RESTRIGEVENDAREDUCAOZ"; - public static final String CLAVE_EDITAR_ALTERA_EXIBECANCEL = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MOTIVOCANCELACION.ALTERAEXIBECANCEL"; - public static final String CLAVE_CALCULODIARIOCOMISSAO_AUTORIZACAOCALCULOTODASAGENCIAS = "COM.RJCONSULTORES.ADM.CALCULODIARIOCOMISSAO.AUTORIZACAOCALCULOTODASAGENCIAS"; - public static final String CLAVE_HISTORICO_COMPRAS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOHISTORICOCOMPRAS"; - public static final String CLAVE_EXPORTACAO_SGTI = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ANALITICO.SGTI"; - public static final String CLAVE_POSICAO_VENDA_BILHETE_IDOSO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOPOSICAOVENDABILHETEIDOSO"; - public static final String CLAVE_INTEGRACAO_ANTI_FRAUDE = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOINTEGRACAOANTIFRAUDE"; - public static final String CLAVE_TARIFAS_DESABILITAR_BOTAO_EXCLUIR_TODOS = "COM.RJCONSULTORES.VENTABOLETOS.GUI.ADM.PRECO.EXCLUIR.TODAS.PESQUISA"; - public static final String CLAVE_CONFIGURACAO_VENDA_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.CONFVENDAEMBARCADA"; - public static final String CLAVE_RELATORIO_VENDA_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOVENDAEMBARCADA"; - public static final String CLAVE_CONTINGENCIA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.MENU.CONTINGENCIA"; - public static final String CLAVE_TROCO_SIMPLES = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.TROCOSIMPLES"; - public static final String CLAVE_RELATORIO_TROCO_SIMPLES = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.RELATORIOTROCOSIMPLES"; - public static final String CLAVE_RELATORIO_ESTORNO_TROCO_SIMPLES = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.RELATORIOESTORNOTROCOSIMPLES"; - public static final String CLAVE_CONFIG_EMITE_SOMENTE_CUPOM_EMBARQUE = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.CONFIGTIPOPASSAGEM.EMITESOMENTECPEMB"; - public static final String CLAVE_ADM_PRICING_MODIFICACAOMASSIVAWS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MODIFICACAOMASSIVAWS"; - public static final String CLAVE_ESTOQUE_W2I = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.ESTOQUEW2I"; - public static final String CLAVE_UPLOAD_ARQUIVO_CONFIGURACAO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.CUSTOMSISTEMA.UPLOADARQUIVOCONFIGURACAO"; - public static final String CLAVE_OPERADORES_DISPOSITIVO_VENDA_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.CONFVENDAEMBARCADA.OPERADORESDISP"; - public static final String CLAVE_MANUTENCAO_FLEXBUS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.FLEXBUS"; - public static final String CLAVE_RELATORIO_PRICING_ESPECIFICO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MENU.RELATORIOPRICINGESPECIFICO"; - public static final String CLAVE_MODIFICACAO_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.TARIFAS.MENU.MODIFICACIONMASIVAEMBARCADA"; - public static final String CLAVE_AUTORIZACAO_RUTA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.AUTORIZACAORUTA"; - - public static final String CLAVE_MENU_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING"; - public static final String CLAVE_GESTAO_PRICING_ESPECIFICO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.PRICINGESPECIFICO"; - public static final String CLAVE_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.PRICING"; - public static final String CLAVE_TELA_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.GESTAOPRICING"; - public static final String CLAVE_MENU_RELATORIOS_MUDANCAS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSDEMUDANCAS"; - public static final String CLAVE_MENU_RELATORIOS_MUDANCAS_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSDEMUDANCAS.RELATORIOSDEMUDANCASPRICING"; - - public static final String CLAVE_MENU_RELATORIOS_VIAJAR_DETALHADO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSESTATISTICOS.PASSAGEIROSVIAJARDETALHADO"; - public static final String FUNCION_RECOLECCION = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.RECOLECCION"; - - public static final String CLAVE_INTEGRACAO_COMPROVANTE_PASSAGEM = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.INTEGRACAOCOMPROVANTEPASSAGEM"; -} +package com.rjconsultores.ventaboletos.constantes; + +public class ConstantesFuncionSistema { + + private ConstantesFuncionSistema() { + } + + public static final String CLAVE_EDITAR_USUARIO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.MENU.USUARIO"; + public static final String CLAVE_EDITAR_COMISSAO = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.EDITARCOMISSAO"; + public static final String CLAVE_EXIBIR_TAB_COMISSAO_CONTA = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.EDITARPORCENTAGEMCONTA"; + public static final String CLAVE_REABRIR_MOVIMENTODIARIO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.COMISSAO.MENU.CONFERENCIACOMISSAO.REABRIRMOVIMENTODIARIO"; + public static final String CLAVE_ENCERRAR_MOVIMENTODIARIO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.COMISSAO.MENU.CONFERENCIACOMISSAO.ENCERRARMOVIMENTODIARIO"; + public static final String CLAVE_GENERA_FOLIOSISTEMA_VTA_INT_IMP_POSTERIOR = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGO.MENU.EMPRESA.GENERAFOLIOSISTEMAVTAINTIMPPOSTERIOR"; + public static final String CLAVE_EDITAR_VENDA_SEM_REDUCAO_Z = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGO.MENU.EMPRESA.RESTRIGEVENDAREDUCAOZ"; + public static final String CLAVE_EDITAR_ALTERA_EXIBECANCEL = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MOTIVOCANCELACION.ALTERAEXIBECANCEL"; + public static final String CLAVE_CALCULODIARIOCOMISSAO_AUTORIZACAOCALCULOTODASAGENCIAS = "COM.RJCONSULTORES.ADM.CALCULODIARIOCOMISSAO.AUTORIZACAOCALCULOTODASAGENCIAS"; + public static final String CLAVE_HISTORICO_COMPRAS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOHISTORICOCOMPRAS"; + public static final String CLAVE_EXPORTACAO_SGTI = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ANALITICO.SGTI"; + public static final String CLAVE_POSICAO_VENDA_BILHETE_IDOSO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOPOSICAOVENDABILHETEIDOSO"; + public static final String CLAVE_INTEGRACAO_ANTI_FRAUDE = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOINTEGRACAOANTIFRAUDE"; + public static final String CLAVE_TARIFAS_DESABILITAR_BOTAO_EXCLUIR_TODOS = "COM.RJCONSULTORES.VENTABOLETOS.GUI.ADM.PRECO.EXCLUIR.TODAS.PESQUISA"; + public static final String CLAVE_CONFIGURACAO_VENDA_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.CONFVENDAEMBARCADA"; + public static final String CLAVE_RELATORIO_VENDA_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOVENDAEMBARCADA"; + public static final String CLAVE_CONTINGENCIA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.MENU.CONTINGENCIA"; + public static final String CLAVE_TROCO_SIMPLES = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.TROCOSIMPLES"; + public static final String CLAVE_RELATORIO_TROCO_SIMPLES = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.RELATORIOTROCOSIMPLES"; + public static final String CLAVE_RELATORIO_ESTORNO_TROCO_SIMPLES = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.RELATORIOESTORNOTROCOSIMPLES"; + public static final String CLAVE_CONFIG_EMITE_SOMENTE_CUPOM_EMBARQUE = "COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.CONFIGTIPOPASSAGEM.EMITESOMENTECPEMB"; + public static final String CLAVE_ADM_PRICING_MODIFICACAOMASSIVAWS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MODIFICACAOMASSIVAWS"; + public static final String CLAVE_ESTOQUE_W2I = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.ESTOQUEW2I"; + public static final String CLAVE_UPLOAD_ARQUIVO_CONFIGURACAO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.CUSTOMSISTEMA.UPLOADARQUIVOCONFIGURACAO"; + public static final String CLAVE_OPERADORES_DISPOSITIVO_VENDA_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.CONFVENDAEMBARCADA.OPERADORESDISP"; + public static final String CLAVE_MANUTENCAO_FLEXBUS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.FLEXBUS"; + public static final String CLAVE_RELATORIO_PRICING_ESPECIFICO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MENU.RELATORIOPRICINGESPECIFICO"; + public static final String CLAVE_MODIFICACAO_EMBARCADA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.TARIFAS.MENU.MODIFICACIONMASIVAEMBARCADA"; + public static final String CLAVE_AUTORIZACAO_RUTA = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.AUTORIZACAORUTA"; + + public static final String CLAVE_MENU_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING"; + public static final String CLAVE_GESTAO_PRICING_ESPECIFICO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.PRICINGESPECIFICO"; + public static final String CLAVE_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.PRICING"; + public static final String CLAVE_TELA_GESTAO_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.GESTAODEPRICING.GESTAOPRICING"; + public static final String CLAVE_MENU_RELATORIOS_MUDANCAS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSDEMUDANCAS"; + public static final String CLAVE_MENU_RELATORIOS_MUDANCAS_PRICING = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSDEMUDANCAS.RELATORIOSDEMUDANCASPRICING"; + + public static final String CLAVE_MENU_RELATORIOS_VIAJAR_DETALHADO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.RELATORIOSESTATISTICOS.PASSAGEIROSVIAJARDETALHADO"; + public static final String FUNCION_RECOLECCION = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.RECOLECCION"; + + public static final String CLAVE_INTEGRACAO_COMPROVANTE_PASSAGEM = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.INTEGRACAOCOMPROVANTEPASSAGEM"; +} diff --git a/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoDesconto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoDesconto.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoDesconto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoDesconto.java index a5c6043bf..070b7c495 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoDesconto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoDesconto.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.constantes; - -public interface ConstantesTipoDesconto { - int DESCONTO_POR_NUMERO_DOCUMENTO = 1, - DESCONTO_POR_QUANTIDADE = 2, - TIPO_DESCONTO_NAO_INFORMADO = 0; +package com.rjconsultores.ventaboletos.constantes; + +public interface ConstantesTipoDesconto { + int DESCONTO_POR_NUMERO_DOCUMENTO = 1, + DESCONTO_POR_QUANTIDADE = 2, + TIPO_DESCONTO_NAO_INFORMADO = 0; } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoValidaVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoValidaVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoValidaVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoValidaVenta.java index 171757094..7265f3fc0 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoValidaVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesTipoValidaVenta.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.constantes; - -public interface ConstantesTipoValidaVenta { - String COD_AGENCIA = "A"; - String COD_MOTORISTA = "M"; - String AGENCIA = "AGENCIA"; - String MOTORISTA = "MOTORISTA"; +package com.rjconsultores.ventaboletos.constantes; + +public interface ConstantesTipoValidaVenta { + String COD_AGENCIA = "A"; + String COD_MOTORISTA = "M"; + String AGENCIA = "AGENCIA"; + String MOTORISTA = "MOTORISTA"; } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/constantes/ConstantesVendaEmbarcada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesVendaEmbarcada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/constantes/ConstantesVendaEmbarcada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesVendaEmbarcada.java index 12de64bc3..db046d57c 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/ConstantesVendaEmbarcada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ConstantesVendaEmbarcada.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.constantes; - -public class ConstantesVendaEmbarcada { - - public static final int VENDA_GERADA = 0; - public static final int VENDA_BOLETO_ERROR = 1; - public static final int VENDA_BOLETO_FORMAPAGO_ERROR = 2; - public static final int VENDA_CAJA_ERROR = 3; - public static final int VENDA_CAJA_FORMAPAGO_ERROR = 4; - -} +package com.rjconsultores.ventaboletos.constantes; + +public class ConstantesVendaEmbarcada { + + public static final int VENDA_GERADA = 0; + public static final int VENDA_BOLETO_ERROR = 1; + public static final int VENDA_BOLETO_FORMAPAGO_ERROR = 2; + public static final int VENDA_CAJA_ERROR = 3; + public static final int VENDA_CAJA_FORMAPAGO_ERROR = 4; + +} diff --git a/src/com/rjconsultores/ventaboletos/constantes/ContanteTipoComprovante.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ContanteTipoComprovante.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/constantes/ContanteTipoComprovante.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/ContanteTipoComprovante.java diff --git a/src/com/rjconsultores/ventaboletos/constantes/CustomEnumTypeHibernate.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/CustomEnumTypeHibernate.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/constantes/CustomEnumTypeHibernate.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/CustomEnumTypeHibernate.java diff --git a/src/com/rjconsultores/ventaboletos/constantes/DescricaoTipoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/DescricaoTipoVenta.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/constantes/DescricaoTipoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/DescricaoTipoVenta.java index af6cf6620..585511b4b 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/DescricaoTipoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/DescricaoTipoVenta.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.constantes; - -public class DescricaoTipoVenta { - - public static String getDescricaoTipoVenta(Integer tipoVentaId) { - if(Constantes.TPV_DIRECTO_NORMAL.intValue() == tipoVentaId) { - return "NORMAL"; - } else if(Constantes.TPV_MANUAL.intValue() == tipoVentaId) { - return "MANUAL"; - } else if(Constantes.TPV_BOLETO_REMOTO.intValue() == tipoVentaId) { - return "GAP"; - } else if(Constantes.TPV_TRANSFERENCIAS.intValue() == tipoVentaId) { - return "TRANSFERENCIA"; - } else if(Constantes.TPV_CAMBIO_VIAJE.intValue() == tipoVentaId) { - return "TROCA PASSAGEM"; - } else if(Constantes.TPV_CHECKIN_VIAGEM.intValue() == tipoVentaId) { - return "CHECKIN VIAGEM"; - } else if(Constantes.TPV_BOLETO_ABIERTO.intValue() == tipoVentaId) { - return "BOLETO ABERTO"; - } - return ""; - } - -} +package com.rjconsultores.ventaboletos.constantes; + +public class DescricaoTipoVenta { + + public static String getDescricaoTipoVenta(Integer tipoVentaId) { + if(Constantes.TPV_DIRECTO_NORMAL.intValue() == tipoVentaId) { + return "NORMAL"; + } else if(Constantes.TPV_MANUAL.intValue() == tipoVentaId) { + return "MANUAL"; + } else if(Constantes.TPV_BOLETO_REMOTO.intValue() == tipoVentaId) { + return "GAP"; + } else if(Constantes.TPV_TRANSFERENCIAS.intValue() == tipoVentaId) { + return "TRANSFERENCIA"; + } else if(Constantes.TPV_CAMBIO_VIAJE.intValue() == tipoVentaId) { + return "TROCA PASSAGEM"; + } else if(Constantes.TPV_CHECKIN_VIAGEM.intValue() == tipoVentaId) { + return "CHECKIN VIAGEM"; + } else if(Constantes.TPV_BOLETO_ABIERTO.intValue() == tipoVentaId) { + return "BOLETO ABERTO"; + } + return ""; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java index dd215edc3..1d3573e48 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.constantes; - -public enum TipoEventoExtra { - - OUTRO("OUTRO"), - SEGURO_OPCIONAL("SEGURO_OPCIONAL"), - EXCESSO_BAGAGEM("EXCESSO_BAGAGEM"), - TAXA_EMBARQUE("TAXA_EMBARQUE"), - SEGURO_RESSARCIMENTO("SEGURO_RESSARCIMENTO"), - TAXA_EMBARQUE_RESSARCIMENTO("TAXA_EMBARQUE_RESSARCIMENTO"), - MULTA("MULTA"), - DIF_MAIOR("DIF_MAIOR"), - DIF_MENOR("DIF_MENOR"), - SUPRIMENTO("SUPRIMENTO"), - SANGRIA("SANGRIA"), - RECARGA_CELULAR("RECARGA_CELULAR"), - RECARGA_TV("RECARGA_TV"), - RECARGA_PIN("RECARGA_PIN"), - PACOTE("PACOTE"), - SMART_CARD("SMART_CARD"), - TAXA_CONVENIENCIA_SVI("TAXA_CONVENIENCIA_SVI"), - TARIFA_SAFER("TARIFA_SAFER"), - JUROS_CARTAO_CREDITO("JUROS_CARTAO_CREDITO"), - EMBARQUE_JA("EMBARQUE_JA"), - ; - - private String descricao; - - private TipoEventoExtra(String descricao) { - this.descricao = descricao; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return getDescricao(); - } -} +package com.rjconsultores.ventaboletos.constantes; + +public enum TipoEventoExtra { + + OUTRO("OUTRO"), + SEGURO_OPCIONAL("SEGURO_OPCIONAL"), + EXCESSO_BAGAGEM("EXCESSO_BAGAGEM"), + TAXA_EMBARQUE("TAXA_EMBARQUE"), + SEGURO_RESSARCIMENTO("SEGURO_RESSARCIMENTO"), + TAXA_EMBARQUE_RESSARCIMENTO("TAXA_EMBARQUE_RESSARCIMENTO"), + MULTA("MULTA"), + DIF_MAIOR("DIF_MAIOR"), + DIF_MENOR("DIF_MENOR"), + SUPRIMENTO("SUPRIMENTO"), + SANGRIA("SANGRIA"), + RECARGA_CELULAR("RECARGA_CELULAR"), + RECARGA_TV("RECARGA_TV"), + RECARGA_PIN("RECARGA_PIN"), + PACOTE("PACOTE"), + SMART_CARD("SMART_CARD"), + TAXA_CONVENIENCIA_SVI("TAXA_CONVENIENCIA_SVI"), + TARIFA_SAFER("TARIFA_SAFER"), + JUROS_CARTAO_CREDITO("JUROS_CARTAO_CREDITO"), + EMBARQUE_JA("EMBARQUE_JA"), + ; + + private String descricao; + + private TipoEventoExtra(String descricao) { + this.descricao = descricao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/constantes/TipoSeguro.java b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/TipoSeguro.java similarity index 92% rename from src/com/rjconsultores/ventaboletos/constantes/TipoSeguro.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/constantes/TipoSeguro.java index e12a225ab..87233a957 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/TipoSeguro.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/constantes/TipoSeguro.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.constantes; - -public enum TipoSeguro { - - SEGURO, - TPP; - -} +package com.rjconsultores.ventaboletos.constantes; + +public enum TipoSeguro { + + SEGURO, + TPP; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AbastoBoletoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoBoletoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AbastoBoletoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoBoletoDAO.java index 65cc0d810..4af6f5cf1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AbastoBoletoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoBoletoDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface AbastoBoletoDAO extends GenericDAO { - - public List buscaAbastoBoletoPorPuntoVenta(PuntoVenta puntoVenta); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface AbastoBoletoDAO extends GenericDAO { + + public List buscaAbastoBoletoPorPuntoVenta(PuntoVenta puntoVenta); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AbastoCentralDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoCentralDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/AbastoCentralDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoCentralDAO.java index d5d7905b5..f4ca04b9a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AbastoCentralDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoCentralDAO.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface AbastoCentralDAO extends GenericDAO { - - - public List obtenerBilhetes(Aidf aidf, PuntoVenta origem); - public List obtenerBilhetes(Aidf aidf, String formInicial, String formFinal, PuntoVenta origem); - - public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes); - public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes, Estacion origem); - public List obtenerBilhetesPorPuntoVenta(String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes); - public List obtenerBilhetesPorPuntoVenta(String numSerie, String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes, Estacion origem); - - public void actualizaBilhetes(List bilhetes, PuntoVenta destino); - public void actualizaBilhetes(List bilhetes, Estacion destino); - public void suscribirBilhetes(List bilhetes); - public List buscaBilhetesPorAidf(Aidf aidf); - - public void gravaControleEstoqueMigracao(PuntoVenta puntoVenta, Date fecmodif, Integer usuarioId); - - public List buscarSeriesBilhetesPorEstacion(Estacion estacion); - - public void borrarLosQueTienenAIDF(Aidf aidf); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface AbastoCentralDAO extends GenericDAO { + + + public List obtenerBilhetes(Aidf aidf, PuntoVenta origem); + public List obtenerBilhetes(Aidf aidf, String formInicial, String formFinal, PuntoVenta origem); + + public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes); + public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes, Estacion origem); + public List obtenerBilhetesPorPuntoVenta(String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes); + public List obtenerBilhetesPorPuntoVenta(String numSerie, String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes, Estacion origem); + + public void actualizaBilhetes(List bilhetes, PuntoVenta destino); + public void actualizaBilhetes(List bilhetes, Estacion destino); + public void suscribirBilhetes(List bilhetes); + public List buscaBilhetesPorAidf(Aidf aidf); + + public void gravaControleEstoqueMigracao(PuntoVenta puntoVenta, Date fecmodif, Integer usuarioId); + + public List buscarSeriesBilhetesPorEstacion(Estacion estacion); + + public void borrarLosQueTienenAIDF(Aidf aidf); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AbastoHistoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoHistoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/AbastoHistoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoHistoDAO.java index 028d90a0a..101375f6a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AbastoHistoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AbastoHistoDAO.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.AbastoHisto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; - -public interface AbastoHistoDAO extends GenericDAO { - - public void grabaHistoricoBilhetes(List bilhetes, TipoMovimentacion tipoMovimentacion); - - public void borrarLosQueTienenAIDF(Aidf aidf); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.AbastoHisto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; + +public interface AbastoHistoDAO extends GenericDAO { + + public void grabaHistoricoBilhetes(List bilhetes, TipoMovimentacion tipoMovimentacion); + + public void borrarLosQueTienenAIDF(Aidf aidf); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AgruparParadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AgruparParadaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AgruparParadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AgruparParadaDAO.java index f12a66363..cff4227d3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AgruparParadaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AgruparParadaDAO.java @@ -1,21 +1,21 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; - -public interface AgruparParadaDAO { - - public AgrupamentoParada obtenerID(Integer id); - - public AgrupamentoParada suscribir(AgrupamentoParada entidad); - - public AgrupamentoParada actualizacion(AgrupamentoParada entidad); - - public List obtenerTodos(); - - public List buscar(String descAgrupamentoParada); - - public List buscarCVE(String cveAgrupamentoParada); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; + +public interface AgruparParadaDAO { + + public AgrupamentoParada obtenerID(Integer id); + + public AgrupamentoParada suscribir(AgrupamentoParada entidad); + + public AgrupamentoParada actualizacion(AgrupamentoParada entidad); + + public List obtenerTodos(); + + public List buscar(String descAgrupamentoParada); + + public List buscarCVE(String cveAgrupamentoParada); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AidfDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/AidfDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfDAO.java index a9e44ea46..7f2110f11 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AidfDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfDAO.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.sql.Connection; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; - -public interface AidfDAO extends GenericDAO { - - public List buscaAidfsPorEmpresas(List empresas); - - public Boolean existeAidfComCodFiscalEEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado); - - public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId,Boolean isRMD); - - public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId); - - public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio); - - public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal, Estado estado, PuntoVenta agencia); - - public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda); - - public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn,Integer empresaId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.sql.Connection; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; + +public interface AidfDAO extends GenericDAO { + + public List buscaAidfsPorEmpresas(List empresas); + + public Boolean existeAidfComCodFiscalEEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado); + + public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId,Boolean isRMD); + + public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId); + + public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio); + + public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal, Estado estado, PuntoVenta agencia); + + public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda); + + public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn,Integer empresaId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AidfEspecieDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfEspecieDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AidfEspecieDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfEspecieDAO.java index 7341d7e4c..26018b005 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AidfEspecieDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfEspecieDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.AidfEspecie; - -public interface AidfEspecieDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.AidfEspecie; + +public interface AidfEspecieDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AidfTipoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfTipoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AidfTipoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfTipoDAO.java index 2bfd527ac..bd3d4a7e8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AidfTipoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AidfTipoDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.AidfTipo; - -public interface AidfTipoDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.AidfTipo; + +public interface AidfTipoDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AjusteEventoExtraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AjusteEventoExtraDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AjusteEventoExtraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AjusteEventoExtraDAO.java index 94040913f..2c9203f31 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AjusteEventoExtraDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AjusteEventoExtraDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; - -public interface AjusteEventoExtraDAO extends GenericDAO{ - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; + +public interface AjusteEventoExtraDAO extends GenericDAO{ + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AlertaCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AlertaCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AlertaCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AlertaCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AliasClasseDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliasClasseDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AliasClasseDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliasClasseDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AliasServicoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliasServicoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AliasServicoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliasServicoDAO.java index c429b3d83..787d46bea 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AliasServicoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliasServicoDAO.java @@ -1,60 +1,60 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.ArrayList; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AliasServico; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; - -public interface AliasServicoDAO extends GenericDAO{ - - /** - * Realiza a buscar com os filtros informados e restringindo o corridaId para is null - * - * @param origenId - * @param destinoId - * @param rutaId - * @return - */ - public List buscarAliasSemCorrida(Integer origenId,Integer destinoId,Integer rutaId); - - /** - * Realiza a busca com os filtro informados. - * @param origenId - * @param destinoId - * @param rutaId - * @param corridaId - * @return - */ - public List buscar(Integer origenId,Integer destinoId,Integer rutaId,Integer corridaId); - - - /** - * Realiza a busca com os filtro informados. - * @param linas - * @param empresas - * @param tiposClasses - * @param orgaos - * @param prefixo - * @return - */ - public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo); - - - /** - * Realiza a busca com os filtro informados. - * @param origem - * @param destino - * @param linha - * @param idCorrida - * @return - */ - public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida); - - List buscarPorRuta(Integer rutaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.ArrayList; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AliasServico; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; + +public interface AliasServicoDAO extends GenericDAO{ + + /** + * Realiza a buscar com os filtros informados e restringindo o corridaId para is null + * + * @param origenId + * @param destinoId + * @param rutaId + * @return + */ + public List buscarAliasSemCorrida(Integer origenId,Integer destinoId,Integer rutaId); + + /** + * Realiza a busca com os filtro informados. + * @param origenId + * @param destinoId + * @param rutaId + * @param corridaId + * @return + */ + public List buscar(Integer origenId,Integer destinoId,Integer rutaId,Integer corridaId); + + + /** + * Realiza a busca com os filtro informados. + * @param linas + * @param empresas + * @param tiposClasses + * @param orgaos + * @param prefixo + * @return + */ + public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo); + + + /** + * Realiza a busca com os filtro informados. + * @param origem + * @param destino + * @param linha + * @param idCorrida + * @return + */ + public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida); + + List buscarPorRuta(Integer rutaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AliquotaEstadoDestinoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliquotaEstadoDestinoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AliquotaEstadoDestinoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliquotaEstadoDestinoDAO.java index dd20b3f4f..0c63c86ce 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AliquotaEstadoDestinoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AliquotaEstadoDestinoDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; -import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; - -public interface AliquotaEstadoDestinoDAO extends GenericDAO { - - public List getChildrens(EmpresaImposto parent); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; +import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; + +public interface AliquotaEstadoDestinoDAO extends GenericDAO { + + public List getChildrens(EmpresaImposto parent); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ArticuloDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ArticuloDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ArticuloDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ArticuloDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AsientoExclusivoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AsientoExclusivoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AsientoExclusivoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AsientoExclusivoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AsistenciaDeViajeEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AsistenciaDeViajeEmpresaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AsistenciaDeViajeEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AsistenciaDeViajeEmpresaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AuditLogDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditLogDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AuditLogDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditLogDAO.java index 4164f302c..b404a35fb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AuditLogDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditLogDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AuditLog; -import com.rjconsultores.ventaboletos.entidad.AuditModule; - -public interface AuditLogDAO extends GenericDAO { - public List carregarLog(AuditModule modulo); - - public List filtrarLog(AuditLog log); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AuditLog; +import com.rjconsultores.ventaboletos.entidad.AuditModule; + +public interface AuditLogDAO extends GenericDAO { + public List carregarLog(AuditModule modulo); + + public List filtrarLog(AuditLog log); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AuditModuleDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditModuleDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AuditModuleDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditModuleDAO.java index beb08ea69..5278e9183 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AuditModuleDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditModuleDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.AuditModule; - -public interface AuditModuleDAO extends GenericDAO{ - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.AuditModule; + +public interface AuditModuleDAO extends GenericDAO{ + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AuditServiceDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditServiceDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/AuditServiceDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditServiceDAO.java index e7e249c6f..dfb2fde22 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AuditServiceDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AuditServiceDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.AuditService; - -public interface AuditServiceDAO extends GenericDAO { - public AuditService carregarService(AuditService auditService); -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.AuditService; + +public interface AuditServiceDAO extends GenericDAO { + public AuditService carregarService(AuditService auditService); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AutobusDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutobusDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AutobusDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutobusDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AutobusDocDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutobusDocDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/AutobusDocDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutobusDocDAO.java index b3e8073c0..ca2c89e99 100644 --- a/src/com/rjconsultores/ventaboletos/dao/AutobusDocDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutobusDocDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Autobus; -import com.rjconsultores.ventaboletos.entidad.AutobusDoc; - -public interface AutobusDocDAO extends GenericDAO { - public List obtenerPorAutobus(Autobus autobus); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Autobus; +import com.rjconsultores.ventaboletos.entidad.AutobusDoc; + +public interface AutobusDocDAO extends GenericDAO { + public List obtenerPorAutobus(Autobus autobus); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/AutorizacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutorizacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AutorizacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutorizacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/AutorizacionPerfilDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutorizacionPerfilDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/AutorizacionPerfilDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/AutorizacionPerfilDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/BancoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/BancoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/BancoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/BancoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/BoletoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/BoletoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/BoletoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/BoletoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/BpeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/BpeDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/BpeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/BpeDAO.java index 86da3f6cf..25c241ff5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/BpeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/BpeDAO.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.sql.Connection; -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; - -public interface BpeDAO { - - public List buscarBpeRDI(Connection connection, Date inicio, Date fim, Integer empresaId, List estados, boolean isReceitaTerceiros, boolean consultaOtimizada); - - public ExportacaoBPEVo buscarRegistroExportacaoBpe(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado, boolean consultaOtimizada, String codContPrevidencia); - - public String buscarXmlBPE(Connection connection, String chBpe); - - public List buscarBPeRejeitadosContingencia(Integer empresaId, String numBpe, String chbpe, Date dtVendaInicio, Date dtVendaFim, List estados, List codigosRejeicoes); - - public void definirBPeRejeitadoSefazReenvio(Integer bpeId, String codstat) throws BusinessException; - - public List buscarBPeVendaEEventosAutorizados(Integer empresaId, Date dtVendaInicio, Date dtVendaFim, Integer estadoId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.sql.Connection; +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; + +public interface BpeDAO { + + public List buscarBpeRDI(Connection connection, Date inicio, Date fim, Integer empresaId, List estados, boolean isReceitaTerceiros, boolean consultaOtimizada); + + public ExportacaoBPEVo buscarRegistroExportacaoBpe(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado, boolean consultaOtimizada, String codContPrevidencia); + + public String buscarXmlBPE(Connection connection, String chBpe); + + public List buscarBPeRejeitadosContingencia(Integer empresaId, String numBpe, String chbpe, Date dtVendaInicio, Date dtVendaFim, List estados, List codigosRejeicoes); + + public void definirBPeRejeitadoSefazReenvio(Integer bpeId, String codstat) throws BusinessException; + + public List buscarBPeVendaEEventosAutorizados(Integer empresaId, Date dtVendaInicio, Date dtVendaFim, Integer estadoId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java index 0df494203..abce13a87 100644 --- a/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; - -public interface BusquedaDatosTicketDAO { - - public List buscaDatosTickets(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; + +public interface BusquedaDatosTicketDAO { + + public List buscaDatosTickets(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CajaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CajaDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/CajaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CajaDAO.java index 68e5e69f7..450349731 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CajaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CajaDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Caja; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoFormapagoException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaFormapagoException; -import com.rjconsultores.ventaboletos.vo.caja.CajaDetalleVO; -import com.rjconsultores.ventaboletos.vo.caja.CajaVO; -import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; -import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; -import com.rjconsultores.ventaboletos.vo.cashmonitor.RelatorioVendaCartaoCashMonitorVO; - -public interface CajaDAO { - public List buscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta); - - public List buscarCajaCerrado(Date fecha, String cveusuario, String turnoid); - - List buscarUsuarioCerrado(Date fecha); - - public void gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException, VendaEmbarcadaBoletoFormapagoException, VendaEmbarcadaCajaException, VendaEmbarcadaCajaFormapagoException; - - public List buscarDetalleCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote); - - Map> buscarCajaYTarjeta(String... numoperacion); - - public Integer atualizaCajasIntegracaoTotvs(Marca marca, Date dataIncial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException; - - public List buscarVendaCartaoCashMonitor(Date dataIncial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta); - - public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Caja; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoFormapagoException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaFormapagoException; +import com.rjconsultores.ventaboletos.vo.caja.CajaDetalleVO; +import com.rjconsultores.ventaboletos.vo.caja.CajaVO; +import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; +import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; +import com.rjconsultores.ventaboletos.vo.cashmonitor.RelatorioVendaCartaoCashMonitorVO; + +public interface CajaDAO { + public List buscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta); + + public List buscarCajaCerrado(Date fecha, String cveusuario, String turnoid); + + List buscarUsuarioCerrado(Date fecha); + + public void gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException, VendaEmbarcadaBoletoFormapagoException, VendaEmbarcadaCajaException, VendaEmbarcadaCajaFormapagoException; + + public List buscarDetalleCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote); + + Map> buscarCajaYTarjeta(String... numoperacion); + + public Integer atualizaCajasIntegracaoTotvs(Marca marca, Date dataIncial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException; + + public List buscarVendaCartaoCashMonitor(Date dataIncial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta); + + public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CalcularPeajeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CalcularPeajeDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CalcularPeajeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CalcularPeajeDAO.java index 66b993d28..3bca26d20 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CalcularPeajeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CalcularPeajeDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Ruta; - -public interface CalcularPeajeDAO { - public List buscarCasetasPeajeWithinTramo(Ruta ruta,Integer[] listCasetaPeaje); - - public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception; - - public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Ruta; + +public interface CalcularPeajeDAO { + public List buscarCasetasPeajeWithinTramo(Ruta ruta,Integer[] listCasetaPeaje); + + public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception; + + public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CancelacionCargoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CancelacionCargoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CancelacionCargoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CancelacionCargoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CancelacionCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CancelacionCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CancelacionCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CancelacionCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java index cd21b2e90..32e9d9a1b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; - -public interface CasetaPeajeDAO extends GenericDAO { - - List buscar(String casetaPeajeDesc); - List buscarTodosOrdenadoPorDescricao(); - void deletarVigencias(List cpes); +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; + +public interface CasetaPeajeDAO extends GenericDAO { + + List buscar(String casetaPeajeDesc); + List buscarTodosOrdenadoPorDescricao(); + void deletarVigencias(List cpes); } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeExcepcionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeExcepcionDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CasetaPeajeExcepcionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeExcepcionDAO.java index f02a977ef..1544273f5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeExcepcionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeExcepcionDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; - -public interface CasetaPeajeExcepcionDAO extends GenericDAO { - public List obtenerPorCasetaPeaje(CasetaPeaje caseta); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; + +public interface CasetaPeajeExcepcionDAO extends GenericDAO { + public List obtenerPorCasetaPeaje(CasetaPeaje caseta); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaBloqueioImpPosteriorDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaBloqueioImpPosteriorDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaBloqueioImpPosteriorDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaBloqueioImpPosteriorDAO.java index e9b814bdb..99ad16cd5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CategoriaBloqueioImpPosteriorDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaBloqueioImpPosteriorDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; - -public interface CategoriaBloqueioImpPosteriorDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; + +public interface CategoriaBloqueioImpPosteriorDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaClaseDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaClaseDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaClaseDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaClaseDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaCorridaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaCorridaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaCorridaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaCorridaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaDescuentoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaDescuentoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaDescuentoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaDescuentoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaFormAutorizacaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaFormAutorizacaoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaFormAutorizacaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaFormAutorizacaoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaMarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaMarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaMarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaMarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaMercadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaMercadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaMercadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaMercadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaOrgaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaOrgaoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaOrgaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaOrgaoDAO.java index 0e93cf8fe..3fd871cad 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CategoriaOrgaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaOrgaoDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; -import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; - -public interface CategoriaOrgaoDAO extends GenericDAO { - - public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl); -} - +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; +import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; + +public interface CategoriaOrgaoDAO extends GenericDAO { + + public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl); +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaPeriodoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaPeriodoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaPeriodoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaPeriodoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaRutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaRutaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaRutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaRutaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaRutaExcecaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaRutaExcecaoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaRutaExcecaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaRutaExcecaoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaTipoPtoVtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaTipoPtoVtaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CategoriaTipoPtoVtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CategoriaTipoPtoVtaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CiudadDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CiudadDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CiudadDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CiudadDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ClaseservicioEquivalenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClaseservicioEquivalenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ClaseservicioEquivalenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClaseservicioEquivalenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ClienteCorporativoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteCorporativoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ClienteCorporativoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteCorporativoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ClienteCursoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteCursoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ClienteCursoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteCursoDAO.java index 4dd3c2f45..67686f5e1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ClienteCursoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteCursoDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteCurso; -import com.rjconsultores.ventaboletos.entidad.Curso; - -public interface ClienteCursoDAO extends GenericDAO { - - public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteCurso; +import com.rjconsultores.ventaboletos.entidad.Curso; + +public interface ClienteCursoDAO extends GenericDAO { + + public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ClienteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ClienteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDAO.java index 876846c98..04e0778b7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ClienteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDAO.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.Empresa; - -public interface ClienteDAO extends GenericDAO { - - public List buscar(String nombCliente); - - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa); - - public List buscarPorDocumento(String documento); - - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.Empresa; + +public interface ClienteDAO extends GenericDAO { + + public List buscar(String nombCliente); + + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa); + + public List buscarPorDocumento(String documento); + + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ClienteDescuentoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDescuentoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ClienteDescuentoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDescuentoDAO.java index 220e4faff..8e65e2f3f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ClienteDescuentoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDescuentoDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; - -public interface ClienteDescuentoDAO extends GenericDAO{ - - public List buscar(Cliente cliente); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; + +public interface ClienteDescuentoDAO extends GenericDAO{ + + public List buscar(Cliente cliente); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ClienteDireccionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDireccionDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/ClienteDireccionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDireccionDAO.java index 28895dd98..442226c64 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ClienteDireccionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClienteDireccionDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; - - - - - -public interface ClienteDireccionDAO extends GenericDAO { - - public List buscar(Integer clienteId); - - public List buscar(Cliente cliente); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; + + + + + +public interface ClienteDireccionDAO extends GenericDAO { + + public List buscar(Integer clienteId); + + public List buscar(Cliente cliente); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ClientePacoteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClientePacoteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ClientePacoteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClientePacoteDAO.java index d479d039f..f0fe46e3a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ClientePacoteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ClientePacoteDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ClientePacote; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; - -public interface ClientePacoteDAO extends GenericDAO { - - public List busquedaDatosClientePacote(String cpfCnpj); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ClientePacote; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; + +public interface ClientePacoteDAO extends GenericDAO { + + public List busquedaDatosClientePacote(String cpfCnpj); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CobrancaAdcPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CobrancaAdcPuntoVentaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CobrancaAdcPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CobrancaAdcPuntoVentaDAO.java index 9fd992066..5c69b8c7a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CobrancaAdcPuntoVentaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CobrancaAdcPuntoVentaDAO.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface CobrancaAdcPuntoVentaDAO extends GenericDAO { - - List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal); - - List buscarTodasAsCobrancas(PuntoVenta puntoVenta); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface CobrancaAdcPuntoVentaDAO extends GenericDAO { + + List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal); + + List buscarTodasAsCobrancas(PuntoVenta puntoVenta); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CodigoBarraTrechoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CodigoBarraTrechoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CodigoBarraTrechoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CodigoBarraTrechoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CoeficienteTarifaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CoeficienteTarifaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/CoeficienteTarifaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CoeficienteTarifaDAO.java index 941c43316..cffdfe74d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CoeficienteTarifaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CoeficienteTarifaDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; - -public interface CoeficienteTarifaDAO extends GenericDAO { - - public List buscar(String nomb); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; + +public interface CoeficienteTarifaDAO extends GenericDAO { + + public List buscar(String nomb); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ColoniaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ColoniaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ColoniaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ColoniaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ComisionistaExternoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComisionistaExternoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ComisionistaExternoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComisionistaExternoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java index 7f6c07723..ce3b8cfcd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.entidad.Comissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; - -public interface ComissaoDAO extends GenericDAO { - - public List buscarReceitasComissoes(Integer puntoVentaId, Integer empresaId, Date periodo); - - public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, String competencia); - - public List buscaHistoricoComissao(Map parametros); - - public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId); - - public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal); - - public List buscaPuntoVentasComComissaoParametrizada(); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.Comissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; + +public interface ComissaoDAO extends GenericDAO { + + public List buscarReceitasComissoes(Integer puntoVentaId, Integer empresaId, Date periodo); + + public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, String competencia); + + public List buscaHistoricoComissao(Map parametros); + + public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId); + + public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal); + + public List buscaPuntoVentasComComissaoParametrizada(); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ComissaoLogDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoLogDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ComissaoLogDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoLogDAO.java index 1ac2dc505..1caf03f05 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ComissaoLogDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoLogDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ComissaoLog; -import com.rjconsultores.ventaboletos.vo.comissao.ComissaoLogVO; - -public interface ComissaoLogDAO extends GenericDAO { - - public void limparComissaoLog(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal); - - public void suscribirTodos(List lsComissaoLogVO); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ComissaoLog; +import com.rjconsultores.ventaboletos.vo.comissao.ComissaoLogVO; + +public interface ComissaoLogDAO extends GenericDAO { + + public void limparComissaoLog(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal); + + public void suscribirTodos(List lsComissaoLogVO); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ComissaoReceitaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoReceitaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ComissaoReceitaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoReceitaDAO.java index 719cebaed..02bb70d7b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ComissaoReceitaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ComissaoReceitaDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface ComissaoReceitaDAO extends GenericDAO { - - public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal); - - public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface ComissaoReceitaDAO extends GenericDAO { + + public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal); + + public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CompaniaBancariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CompaniaBancariaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CompaniaBancariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CompaniaBancariaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConductorDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConductorDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConductorDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConductorDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionConfDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionConfDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConexionConfDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionConfDAO.java index 0fe4fb799..0433345a5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionConfDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionConfDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionConf; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; - -public interface ConexionConfDAO extends GenericDAO { - - public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo); - - public List buscarPorConexionCtrl(ConexionCtrl conexionCtrl); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionConf; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; + +public interface ConexionConfDAO extends GenericDAO { + + public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo); + + public List buscarPorConexionCtrl(ConexionCtrl conexionCtrl); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionCtrlDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionCtrlDAO.java index 74b5f99d3..832c53e81 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionCtrlDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionCtrlDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.PricingConexao; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -public interface ConexionCtrlDAO extends GenericDAO { - - public List buscarConexionesCtrl(Integer origenId, Integer destinoId); - - public List buscarTodasConexionesCtrlPricing(); - - public List carregarConexoesCadastradas(Long conexionctrlId); - - public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId); - - public void limparPesquisaPricingConexao(Integer pricingId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.PricingConexao; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +public interface ConexionCtrlDAO extends GenericDAO { + + public List buscarConexionesCtrl(Integer origenId, Integer destinoId); + + public List buscarTodasConexionesCtrlPricing(); + + public List carregarConexoesCadastradas(Long conexionctrlId); + + public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId); + + public void limparPesquisaPricingConexao(Integer pricingId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConexionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionDAO.java index cb13b4ac7..9170d5683 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionDAO.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; - -public interface ConexionDAO extends GenericDAO { - - /** - * Apaga os dados temporários das tabelas de conexion_temp e conexion_ctrl_temp - * - * @param usuarioId - */ - public void generarConexiones(Integer usuarioId); - - public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId); - - public List buscarPorConexionCtrl(Long conexcionCtrlId); - - public List buscarConexionesValidas(); - - public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; + +public interface ConexionDAO extends GenericDAO { + + /** + * Apaga os dados temporários das tabelas de conexion_temp e conexion_ctrl_temp + * + * @param usuarioId + */ + public void generarConexiones(Integer usuarioId); + + public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId); + + public List buscarPorConexionCtrl(Long conexcionCtrlId); + + public List buscarConexionesValidas(); + + public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionDescuentoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionDescuentoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionDescuentoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionDescuentoDAO.java index e416a281f..c65d4cf53 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionDescuentoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionDescuentoDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; - -public interface ConexionDescuentoDAO extends GenericDAO { - public List bucarPorConexion(Long conexionId); - - public List bucarPorConexionInativos(Long conexionId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; + +public interface ConexionDescuentoDAO extends GenericDAO { + public List bucarPorConexion(Long conexionId); + + public List bucarPorConexionInativos(Long conexionId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionDAO.java index 5dfbfb4e3..e551cf8f9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; - -public interface ConexionExcepcionDAO extends GenericDAO { - - public List obtenerConexionExcepcionsActivo(Long conexionctrlId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; + +public interface ConexionExcepcionDAO extends GenericDAO { + + public List obtenerConexionExcepcionsActivo(Long conexionctrlId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionRutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionRutaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionRutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionRutaDAO.java index be061a024..73c063c2f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionRutaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionExcepcionRutaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; - -public interface ConexionExcepcionRutaDAO extends GenericDAO { - - public List obtenerConexionExcepcionsActivo(Long conexionctrlId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; + +public interface ConexionExcepcionRutaDAO extends GenericDAO { + + public List obtenerConexionExcepcionsActivo(Long conexionctrlId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaConfDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaConfDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionRutaConfDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaConfDAO.java index 75666366f..df8a14eeb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaConfDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaConfDAO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -public interface ConexionRutaConfDAO extends GenericDAO { - - List buscarPorDescricao(String descricao); - - List obtenerTodosActivo(); - - public void excluirConfiguracao(ConexionRutaConf conexion, Integer usuarioId, boolean excluirConexionRutaConf, boolean isConexionGerada); - - public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId); - - public List> buscarRutasPorConexionConf(Integer conexionRutaConfId); - - public void atualizarTempoMinimoEMaximo(ConexionRutaConf conexionRutaConf); - - public ConexionRutaConf getByIdActivo(Integer conexionRutaConf); - - public String getSQLCarregarConexoesCadastradas(); - - public void transformarObjetosConexao(List localidadesCombinadas, - List listConexionCtrl, List listConexionCtrlVO, List result); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +public interface ConexionRutaConfDAO extends GenericDAO { + + List buscarPorDescricao(String descricao); + + List obtenerTodosActivo(); + + public void excluirConfiguracao(ConexionRutaConf conexion, Integer usuarioId, boolean excluirConexionRutaConf, boolean isConexionGerada); + + public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId); + + public List> buscarRutasPorConexionConf(Integer conexionRutaConfId); + + public void atualizarTempoMinimoEMaximo(ConexionRutaConf conexionRutaConf); + + public ConexionRutaConf getByIdActivo(Integer conexionRutaConf); + + public String getSQLCarregarConexoesCadastradas(); + + public void transformarObjetosConexao(List localidadesCombinadas, + List listConexionCtrl, List listConexionCtrlVO, List result); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaCtrlDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionRutaCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaCtrlDAO.java index 6411d3e29..8cb78edee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaCtrlDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaCtrlDAO.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; - -public interface ConexionRutaCtrlDAO extends GenericDAO { - - List buscarConexionesValidas(); - - List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId); - - List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; + +public interface ConexionRutaCtrlDAO extends GenericDAO { + + List buscarConexionesValidas(); + + List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId); + + List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionPtoVtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionPtoVtaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionPtoVtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionPtoVtaDAO.java index e751a06f3..7898c0507 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionPtoVtaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionPtoVtaDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; - -public interface ConexionRutaExcepcionPtoVtaDAO extends GenericDAO { - - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); - - public void update(ConexionRutaExcepcionPtoVta entidad); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; + +public interface ConexionRutaExcepcionPtoVtaDAO extends GenericDAO { + + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); + + public void update(ConexionRutaExcepcionPtoVta entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionTipoPtoVtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionTipoPtoVtaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionTipoPtoVtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionTipoPtoVtaDAO.java index 5858f744d..609737456 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionTipoPtoVtaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaExcepcionTipoPtoVtaDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; - -public interface ConexionRutaExcepcionTipoPtoVtaDAO extends GenericDAO { - - public List buscarPorConexionConf(ConexionRutaConf conexionRutaCtrl); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; + +public interface ConexionRutaExcepcionTipoPtoVtaDAO extends GenericDAO { + + public List buscarPorConexionConf(ConexionRutaConf conexionRutaCtrl); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaLocalidadeRemovidaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaLocalidadeRemovidaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConexionRutaLocalidadeRemovidaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaLocalidadeRemovidaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaTramoCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaTramoCtrlDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConexionRutaTramoCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaTramoCtrlDAO.java index 7b756fe98..772b053a2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConexionRutaTramoCtrlDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConexionRutaTramoCtrlDAO.java @@ -1,23 +1,23 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; -import com.rjconsultores.ventaboletos.entidad.Parada; - -public interface ConexionRutaTramoCtrlDAO extends GenericDAO { - - boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId, Integer destinoTrechoId2); - - List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId); - - public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId); - - public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId); - - public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId); - - public List buscarLocalidadesPorConexionRutaConfAndEixo(Integer conexionRutaConfId, char tipo); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; +import com.rjconsultores.ventaboletos.entidad.Parada; + +public interface ConexionRutaTramoCtrlDAO extends GenericDAO { + + boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId, Integer destinoTrechoId2); + + List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId); + + public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId); + + public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId); + + public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId); + + public List buscarLocalidadesPorConexionRutaConfAndEixo(Integer conexionRutaConfId, char tipo); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfComprovantePassagemDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfComprovantePassagemDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConfComprovantePassagemDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfComprovantePassagemDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfContratoPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfContratoPuntoVentaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConfContratoPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfContratoPuntoVentaDAO.java index 252d3fa20..580a65166 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfContratoPuntoVentaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfContratoPuntoVentaDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; - -public interface ConfContratoPuntoVentaDAO extends GenericDAO { - - public List buscarConfContratoPorPuntoVenta(PuntoVenta puntoVenta); - - public ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; + +public interface ConfContratoPuntoVentaDAO extends GenericDAO { + + public List buscarConfContratoPorPuntoVenta(PuntoVenta puntoVenta); + + public ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java index e375c8941..ee30584e0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; - -public interface ConfRestricaoCanalVentaDAO{ - - public ConfRestricaoCanalVenta obtenerID(Long id); - - public ConfRestricaoCanalVenta suscribir(ConfRestricaoCanalVenta entidad); - - public ConfRestricaoCanalVenta actualizacion(ConfRestricaoCanalVenta entidad); - - public void borrar(ConfRestricaoCanalVenta entidad); - - public Long count(String campo, Object o); - - public Boolean inativarListConfRestricaoCanalVenta(List idsConfRestricaoCanalVenta, Integer usuarioId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; + +public interface ConfRestricaoCanalVentaDAO{ + + public ConfRestricaoCanalVenta obtenerID(Long id); + + public ConfRestricaoCanalVenta suscribir(ConfRestricaoCanalVenta entidad); + + public ConfRestricaoCanalVenta actualizacion(ConfRestricaoCanalVenta entidad); + + public void borrar(ConfRestricaoCanalVenta entidad); + + public Long count(String campo, Object o); + + public Boolean inativarListConfRestricaoCanalVenta(List idsConfRestricaoCanalVenta, Integer usuarioId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoExcecaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoExcecaoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoExcecaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoExcecaoDAO.java index 6311b242d..6b8f2dadb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoExcecaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoExcecaoDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; - -public interface ConfRestricaoExcecaoDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; + +public interface ConfRestricaoExcecaoDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoOrgaoConcedenteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoOrgaoConcedenteDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoOrgaoConcedenteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoOrgaoConcedenteDAO.java index 476f86c42..37c9a00ac 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoOrgaoConcedenteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoOrgaoConcedenteDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; - -public interface ConfRestricaoOrgaoConcedenteDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; + +public interface ConfRestricaoOrgaoConcedenteDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoPtovtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoPtovtaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoPtovtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoPtovtaDAO.java index 6c339b579..73b138827 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoPtovtaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoPtovtaDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; - -public interface ConfRestricaoPtovtaDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; + +public interface ConfRestricaoPtovtaDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoRutasDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoRutasDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoRutasDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoRutasDAO.java index cc5920c48..da35b1d99 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoRutasDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoRutasDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; - -public interface ConfRestricaoRutasDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; + +public interface ConfRestricaoRutasDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoDAO.java index 1bf61f641..0bfeb9533 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; - -public interface ConfRestricaoTramoDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; + +public interface ConfRestricaoTramoDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoOCDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoOCDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoOCDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoOCDAO.java index e2d00b790..c731b981d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoOCDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoTramoOCDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; - -public interface ConfRestricaoTramoOCDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; + +public interface ConfRestricaoTramoOCDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoVendaWebDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoVendaWebDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConfRestricaoVendaWebDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoVendaWebDAO.java index 62cc2c65a..d39139fca 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoVendaWebDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoVendaWebDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; - -public interface ConfRestricaoVendaWebDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; + +public interface ConfRestricaoVendaWebDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfTotemDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfTotemDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/ConfTotemDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfTotemDAO.java index b22b71442..ef269f423 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfTotemDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfTotemDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ConfTotem; - -/** - * - * @author Wallace - */ -public interface ConfTotemDAO extends GenericDAO { - - public ConfTotem buscar(String chave); -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ConfTotem; + +/** + * + * @author Wallace + */ +public interface ConfTotemDAO extends GenericDAO { + + public ConfTotem buscar(String chave); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfTotemVentaRapidaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfTotemVentaRapidaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ConfTotemVentaRapidaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfTotemVentaRapidaDAO.java index b2403642f..4e8ee6807 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConfTotemVentaRapidaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfTotemVentaRapidaDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConfTotemVentaRapida; -import com.rjconsultores.ventaboletos.entidad.Parada; - -public interface ConfTotemVentaRapidaDAO extends GenericDAO { - - ConfTotemVentaRapida buscarOrigemDestino(Parada origem, Parada destino); - - List buscarOrigem(Parada origem); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConfTotemVentaRapida; +import com.rjconsultores.ventaboletos.entidad.Parada; + +public interface ConfTotemVentaRapidaDAO extends GenericDAO { + + ConfTotemVentaRapida buscarOrigemDestino(Parada origem, Parada destino); + + List buscarOrigem(Parada origem); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java index a3d01de36..96c0c2512 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.LogConferencia; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.ConferenciaComissaoVO; -import com.rjconsultores.ventaboletos.vo.comissao.DiaConferenciaComissaoVO; -import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; -import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO; -import com.rjconsultores.ventaboletos.vo.comissao.OcdVO; - -public interface ConferenciaComissaoDAO extends GenericDAO { - - public Conferencia suscribirOrActualizacion(Conferencia entidad); - - public List carregarConferenciaComissao(String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados ) throws BusinessException; - - public List carregarConferenciaComissao(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException; - - public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException; - - public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException; - - public List carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException; - - public List carregarLogConferencia(Conferencia conferencia) throws BusinessException; - - public LogConferencia suscribirLogConferencia(LogConferencia logConferencia) throws BusinessException; - - public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException; - - public LogConferencia obtenerLogConferenciaID(Long logconferenciaId); - - public List carregarBilhetesComissao(Conferencia conferencia, boolean isCalculoComissao, boolean ehConsultaComissao) throws BusinessException; - - public List carregarOcds(Conferencia conferencia) throws BusinessException; - - public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException; - - public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException; - - public List carregarLogConferencia(Long conferenciaId) throws BusinessException; - - public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException; - - public BigDecimal carregarValorDepositoContaCorrente(Integer empresaId, Integer puntoventaId, Date datamovimento); - - public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException; - - public Conferencia cancelarChegadaMalote(Conferencia conferencia); - - public boolean isConferidoVenta(BoletoComissao boletoComissao); - - public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException; - - public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException; - - public boolean isConfMovFPTrocaVlrDeposito(Empresa empresa); - - public BigDecimal getComissaoPuntoVenta(Integer puntoventaId, Integer empresaId, Date dataInicial, Date dataFinal) throws BusinessException; -} +package com.rjconsultores.ventaboletos.dao; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.LogConferencia; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.ConferenciaComissaoVO; +import com.rjconsultores.ventaboletos.vo.comissao.DiaConferenciaComissaoVO; +import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; +import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO; +import com.rjconsultores.ventaboletos.vo.comissao.OcdVO; + +public interface ConferenciaComissaoDAO extends GenericDAO { + + public Conferencia suscribirOrActualizacion(Conferencia entidad); + + public List carregarConferenciaComissao(String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados ) throws BusinessException; + + public List carregarConferenciaComissao(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException; + + public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException; + + public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException; + + public List carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException; + + public List carregarLogConferencia(Conferencia conferencia) throws BusinessException; + + public LogConferencia suscribirLogConferencia(LogConferencia logConferencia) throws BusinessException; + + public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException; + + public LogConferencia obtenerLogConferenciaID(Long logconferenciaId); + + public List carregarBilhetesComissao(Conferencia conferencia, boolean isCalculoComissao, boolean ehConsultaComissao) throws BusinessException; + + public List carregarOcds(Conferencia conferencia) throws BusinessException; + + public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException; + + public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException; + + public List carregarLogConferencia(Long conferenciaId) throws BusinessException; + + public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException; + + public BigDecimal carregarValorDepositoContaCorrente(Integer empresaId, Integer puntoventaId, Date datamovimento); + + public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException; + + public Conferencia cancelarChegadaMalote(Conferencia conferencia); + + public boolean isConferidoVenta(BoletoComissao boletoComissao); + + public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException; + + public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException; + + public boolean isConfMovFPTrocaVlrDeposito(Empresa empresa); + + public BigDecimal getComissaoPuntoVenta(Integer puntoventaId, Integer empresaId, Date dataInicial, Date dataFinal) throws BusinessException; +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaPendenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConferenciaPendenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConferenciaPendenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConferenciaPendenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfigRestriccionPagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfigRestriccionPagoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConfigRestriccionPagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfigRestriccionPagoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoParadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoParadaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoParadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConfiguracionProductoParadaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConstanteDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ContaCorrenteAgenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContaCorrenteAgenciaDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/ContaCorrenteAgenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContaCorrenteAgenciaDAO.java index 05c274a4d..494ab3326 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ContaCorrenteAgenciaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContaCorrenteAgenciaDAO.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.math.BigDecimal; -import java.util.Date; - -import com.rjconsultores.ventaboletos.entidad.ContaCorrentePtoVta; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface ContaCorrenteAgenciaDAO extends GenericDAO { - - public ContaCorrentePtoVta gravarContaCorrente(Integer itemPuntoVentaId, String descOperacion, Date fecCorte, Integer usuarioId, Integer tipoOperacionCCId, - Integer empresaId, short turnoId, BigDecimal importeTotalTarifa, BigDecimal importeTotalPedagio, BigDecimal importeTotalTasaAbordaje, - BigDecimal importeTotalSeguro, BigDecimal importeTotalIngreso, BigDecimal importeTotalEgreso, BigDecimal importeTotalDevolucion, - BigDecimal importeTotalTransferencia, BigDecimal importeFinal, boolean corteAutomatico, - BigDecimal totalVentaSegOpcional, BigDecimal totalCancSegOpcional, BigDecimal importeTotalEfectivo ) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.dao; + +import java.math.BigDecimal; +import java.util.Date; + +import com.rjconsultores.ventaboletos.entidad.ContaCorrentePtoVta; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface ContaCorrenteAgenciaDAO extends GenericDAO { + + public ContaCorrentePtoVta gravarContaCorrente(Integer itemPuntoVentaId, String descOperacion, Date fecCorte, Integer usuarioId, Integer tipoOperacionCCId, + Integer empresaId, short turnoId, BigDecimal importeTotalTarifa, BigDecimal importeTotalPedagio, BigDecimal importeTotalTasaAbordaje, + BigDecimal importeTotalSeguro, BigDecimal importeTotalIngreso, BigDecimal importeTotalEgreso, BigDecimal importeTotalDevolucion, + BigDecimal importeTotalTransferencia, BigDecimal importeFinal, boolean corteAutomatico, + BigDecimal totalVentaSegOpcional, BigDecimal totalCancSegOpcional, BigDecimal importeTotalEfectivo ) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ContaMDDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContaMDDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ContaMDDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContaMDDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ContratoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContratoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ContratoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ContratoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConvenioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConvenioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConvenioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConvenioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConvenioDetDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConvenioDetDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConvenioDetDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConvenioDetDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ConvenioTransportadoraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConvenioTransportadoraDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ConvenioTransportadoraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ConvenioTransportadoraDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CorridaCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CorridaCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java similarity index 99% rename from src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java index 625523ffd..5a1ed7561 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaDAO.java @@ -113,5 +113,5 @@ public interface CorridaDAO extends GenericDAO { public List buscarCorridas(Parada ori, Parada des, Date dataInicio, Date dataFinal, ClaseServicio cs, Ruta linha, Empresa empresa); - public Corrida buscarCorridaAtivaPorId(Id id); + public Corrida buscarCorridaAtivaPorId(Id id); } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/CorridaInfoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaInfoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CorridaInfoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaInfoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java index d42e7b023..659e1133e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CorridaTramoDAO.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.Tramo; - -public interface CorridaTramoDAO extends GenericDAO { - - public List obtenerTramoTarjetaEmitida(); - - public List buscarTarjetaMesmaCorrida(CorridaTramo ct); - - List buscarCorridaTramoPorCorrida(Corrida corrida); - - public BigDecimal buscarSumTarjetaMesmaCorrida(CorridaTramo ct); - - List buscarTramoPorCorridaId(Integer corridaId); - - public CorridaTramo buscaCorridaTramoByFecCorridaECorridaIdEdOrigemId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado, Integer paradaId); - - public List buscaCorridaTramoByFecCorridaECorridaId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado); -} +package com.rjconsultores.ventaboletos.dao; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.Tramo; + +public interface CorridaTramoDAO extends GenericDAO { + + public List obtenerTramoTarjetaEmitida(); + + public List buscarTarjetaMesmaCorrida(CorridaTramo ct); + + List buscarCorridaTramoPorCorrida(Corrida corrida); + + public BigDecimal buscarSumTarjetaMesmaCorrida(CorridaTramo ct); + + List buscarTramoPorCorridaId(Integer corridaId); + + public CorridaTramo buscaCorridaTramoByFecCorridaECorridaIdEdOrigemId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado, Integer paradaId); + + public List buscaCorridaTramoByFecCorridaECorridaId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CortesiaBeneficiarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CortesiaBeneficiarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CortesiaBeneficiarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CortesiaBeneficiarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CortesiaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CortesiaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CortesiaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CortesiaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CortesiaDireccionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CortesiaDireccionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CortesiaDireccionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CortesiaDireccionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CotacaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CotacaoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CotacaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CotacaoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CtrlFechamentoCaixaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlFechamentoCaixaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/CtrlFechamentoCaixaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlFechamentoCaixaDAO.java index c8380152e..1c33818e6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CtrlFechamentoCaixaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlFechamentoCaixaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; - -import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; - -public interface CtrlFechamentoCaixaDAO extends GenericDAO { - - public CtrlFechamentoCaixa obtenerFeccorte(Date feccorte); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; + +import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; + +public interface CtrlFechamentoCaixaDAO extends GenericDAO { + + public CtrlFechamentoCaixa obtenerFeccorte(Date feccorte); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CtrlSerieBPeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlSerieBPeDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/CtrlSerieBPeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlSerieBPeDAO.java index 39cb50c1c..ce770cc26 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CtrlSerieBPeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlSerieBPeDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.CtrlSerieBPe; - -public interface CtrlSerieBPeDAO extends GenericDAO { - - public Boolean gerarSeqSerieBPe(Integer empresaId, String estado, Integer minvalue) throws RuntimeException; - public Integer buscarSequencia(Integer empresaId, String estado); - public Integer buscarSerieEmb(Integer empresaId, String estado) throws RuntimeException; - - public CtrlSerieBPe buscarPorEmpresaEstado(Integer empresaId, Integer estadoId); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.CtrlSerieBPe; + +public interface CtrlSerieBPeDAO extends GenericDAO { + + public Boolean gerarSeqSerieBPe(Integer empresaId, String estado, Integer minvalue) throws RuntimeException; + public Integer buscarSequencia(Integer empresaId, String estado); + public Integer buscarSerieEmb(Integer empresaId, String estado) throws RuntimeException; + + public CtrlSerieBPe buscarPorEmpresaEstado(Integer empresaId, Integer estadoId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CtrlSerieEmbarcadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlSerieEmbarcadaDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/CtrlSerieEmbarcadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlSerieEmbarcadaDAO.java index 202dcdf47..7722830a5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CtrlSerieEmbarcadaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CtrlSerieEmbarcadaDAO.java @@ -1,25 +1,25 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; -import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.exception.SerieEmbarcadaNaoDisponivelException; -import com.rjconsultores.ventaboletos.vo.embarcada.SerieEmbarcada; - -public interface CtrlSerieEmbarcadaDAO extends GenericDAO { - - public CtrlSerieEmbarcada suscribir(CtrlSerieEmbarcada entity); - public CtrlSerieEmbarcada actualizacion(CtrlSerieEmbarcada entity); - public void borrar(CtrlSerieEmbarcada entity); - - public Boolean validaDispositivoEmpresaEstadoCadastrado(DispositivoEmbarcada dispositivo, Empresa empresa, Estado estado); - public List buscarSeriesEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId); - public SerieEmbarcada buscarSerieEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) throws SerieEmbarcadaNaoDisponivelException; - public CtrlSerieEmbarcada buscarCtrlSerieEmbarcada(final Long ctrlSerieEmbarcadaId) throws SerieEmbarcadaNaoDisponivelException; - - public Boolean validaPossuiDispositivo(Integer empresaId, Integer estadoId, String serie); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; +import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.exception.SerieEmbarcadaNaoDisponivelException; +import com.rjconsultores.ventaboletos.vo.embarcada.SerieEmbarcada; + +public interface CtrlSerieEmbarcadaDAO extends GenericDAO { + + public CtrlSerieEmbarcada suscribir(CtrlSerieEmbarcada entity); + public CtrlSerieEmbarcada actualizacion(CtrlSerieEmbarcada entity); + public void borrar(CtrlSerieEmbarcada entity); + + public Boolean validaDispositivoEmpresaEstadoCadastrado(DispositivoEmbarcada dispositivo, Empresa empresa, Estado estado); + public List buscarSeriesEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId); + public SerieEmbarcada buscarSerieEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) throws SerieEmbarcadaNaoDisponivelException; + public CtrlSerieEmbarcada buscarCtrlSerieEmbarcada(final Long ctrlSerieEmbarcadaId) throws SerieEmbarcadaNaoDisponivelException; + + public Boolean validaPossuiDispositivo(Integer empresaId, Integer estadoId, String serie); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/CuponConvenioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CuponConvenioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CuponConvenioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CuponConvenioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CuponSecretariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CuponSecretariaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CuponSecretariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CuponSecretariaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/CursoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CursoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/CursoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CursoDAO.java index f88563684..2855f29f9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CursoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CursoDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Curso; - -public interface CursoDAO extends GenericDAO { - public List buscar(String nomcurso); +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Curso; + +public interface CursoDAO extends GenericDAO { + public List buscar(String nomcurso); } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/CustomDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/CustomDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/CustomDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/CustomDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/DepositoBancarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DepositoBancarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/DepositoBancarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DepositoBancarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/DescontoComissaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DescontoComissaoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/DescontoComissaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DescontoComissaoDAO.java index d805236d1..780b596c1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/DescontoComissaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DescontoComissaoDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.DescontoComissao; - -public interface DescontoComissaoDAO extends GenericDAO { - - public List buscaDescontoComissao(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.DescontoComissao; + +public interface DescontoComissaoDAO extends GenericDAO { + + public List buscaDescontoComissao(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/DescontoContratoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DescontoContratoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/DescontoContratoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DescontoContratoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/DetAbastoBoletoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DetAbastoBoletoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/DetAbastoBoletoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DetAbastoBoletoDAO.java index 977ce0082..0a9e26ab4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/DetAbastoBoletoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DetAbastoBoletoDAO.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface DetAbastoBoletoDAO extends GenericDAO { - - public Long getSecuencia(); - - public List buscaDetAbastoBoletos(AbastoBoleto abastoBoleto); - - public List buscaDetAbastoBoletos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa); - - public void desativaDetAbastos(List detAbastoBoletos); - - public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa); - - public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(com.rjconsultores.ventaboletos.entidad.Aidf aidf); - - public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVenta, String folioInicial, String folioFinal); - - public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface DetAbastoBoletoDAO extends GenericDAO { + + public Long getSecuencia(); + + public List buscaDetAbastoBoletos(AbastoBoleto abastoBoleto); + + public List buscaDetAbastoBoletos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa); + + public void desativaDetAbastos(List detAbastoBoletos); + + public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa); + + public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(com.rjconsultores.ventaboletos.entidad.Aidf aidf); + + public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVenta, String folioInicial, String folioFinal); + + public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/DetDiagramaAutobusDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DetDiagramaAutobusDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/DetDiagramaAutobusDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DetDiagramaAutobusDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/DiagramaAutobusDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DiagramaAutobusDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/DiagramaAutobusDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DiagramaAutobusDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/DisponibilidadDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DisponibilidadDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/DisponibilidadDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DisponibilidadDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaDAO.java index f9d6cecd3..64d3f24d1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaDAO.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; -import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; -import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface DispositivoEmbarcadaDAO extends GenericDAO { - - public DispositivoEmbarcada buscarVersaoUltimaSinc(String versaoUltimaSinc); - public DispositivoEmbarcada buscarDispositivoPorId(DispositivoEmbarcada dispositivoEmbarcada); - public DispositivoEmbarcada suscribirActualizar(DispositivoEmbarcada dispositivoEmbarcada); - public DispositivoEmbarcada buscarImei(String imei); - public DispositivoEmbarcada buscarImeiDuplicado(String imei); - public List buscarPorEmpresaPuntoVenta(Empresa empresa, PuntoVenta puntoventa); - - public List buscarTodos(); - public List buscarAllVersaoUltimaSinc(); - - public List getListaFormaPago(Integer puntoventaId); - public List getListaSeguroTaxaEmbarque(Integer puntoventaId); - public List getListaTiposPassagensBloqueadas(Integer puntoventaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; +import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; +import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface DispositivoEmbarcadaDAO extends GenericDAO { + + public DispositivoEmbarcada buscarVersaoUltimaSinc(String versaoUltimaSinc); + public DispositivoEmbarcada buscarDispositivoPorId(DispositivoEmbarcada dispositivoEmbarcada); + public DispositivoEmbarcada suscribirActualizar(DispositivoEmbarcada dispositivoEmbarcada); + public DispositivoEmbarcada buscarImei(String imei); + public DispositivoEmbarcada buscarImeiDuplicado(String imei); + public List buscarPorEmpresaPuntoVenta(Empresa empresa, PuntoVenta puntoventa); + + public List buscarTodos(); + public List buscarAllVersaoUltimaSinc(); + + public List getListaFormaPago(Integer puntoventaId); + public List getListaSeguroTaxaEmbarque(Integer puntoventaId); + public List getListaTiposPassagensBloqueadas(Integer puntoventaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaHistoricoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaHistoricoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaHistoricoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaHistoricoDAO.java index ff5dc1dad..5c5904f64 100644 --- a/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaHistoricoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DispositivoEmbarcadaHistoricoDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcadaHistorico; - -public interface DispositivoEmbarcadaHistoricoDAO extends GenericDAO { - - public List buscarHistoricoDispositivoPorId(Long dispositivoId); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcadaHistorico; + +public interface DispositivoEmbarcadaHistoricoDAO extends GenericDAO { + + public List buscarHistoricoDispositivoPorId(Long dispositivoId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/DivisionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DivisionDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/DivisionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/DivisionDAO.java index a97ac77be..f3e430ee8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/DivisionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/DivisionDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Division; - -public interface DivisionDAO extends GenericDAO { - - public List obtenerTodos(); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Division; + +public interface DivisionDAO extends GenericDAO { + + public List obtenerTodos(); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmbarcadaDispOperadorDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmbarcadaDispOperadorDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/EmbarcadaDispOperadorDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmbarcadaDispOperadorDAO.java index 8344af7b8..a4220a0fe 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmbarcadaDispOperadorDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmbarcadaDispOperadorDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; - -public interface EmbarcadaDispOperadorDAO extends GenericDAO { - - public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId); - - public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList); - - public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; + +public interface EmbarcadaDispOperadorDAO extends GenericDAO { + + public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId); + + public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList); + + public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmbarqueCatracaRodoviariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmbarqueCatracaRodoviariaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmbarqueCatracaRodoviariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmbarqueCatracaRodoviariaDAO.java index 45e77dc48..31d871203 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmbarqueCatracaRodoviariaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmbarqueCatracaRodoviariaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; - -public interface EmbarqueCatracaRodoviariaDAO extends GenericDAO { - - @Override - List obtenerTodos(); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; + +public interface EmbarqueCatracaRodoviariaDAO extends GenericDAO { + + @Override + List obtenerTodos(); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpleadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpleadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpleadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpleadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaAdyenConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaAdyenConfigDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaAdyenConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaAdyenConfigDAO.java index 3290953a7..a0d174657 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaAdyenConfigDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaAdyenConfigDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; - -public interface EmpresaAdyenConfigDAO extends GenericDAO { - - public List obtenerTodos(); - - public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; + +public interface EmpresaAdyenConfigDAO extends GenericDAO { + + public List obtenerTodos(); + + public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaAsistenciaDeViajeConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaAsistenciaDeViajeConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaAsistenciaDeViajeConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaAsistenciaDeViajeConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaCertificadoConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaCertificadoConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaCertificadoConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaCertificadoConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaCieloLinkDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaCieloLinkDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaCieloLinkDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaCieloLinkDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaComprovantePassagemConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaComprovantePassagemConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaComprovantePassagemConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaComprovantePassagemConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaConfigLayoutDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaConfigLayoutDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaConfigLayoutDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaConfigLayoutDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaContaBancariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaContaBancariaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaContaBancariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaContaBancariaDAO.java index e1171a908..59417c6db 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaContaBancariaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaContaBancariaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; - -public interface EmpresaContaBancariaDAO { - - public EmpresaContaBancaria suscribir(EmpresaContaBancaria entidad); - - public EmpresaContaBancaria actualizacion(EmpresaContaBancaria entidad); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; + +public interface EmpresaContaBancariaDAO { + + public EmpresaContaBancaria suscribir(EmpresaContaBancaria entidad); + + public EmpresaContaBancaria actualizacion(EmpresaContaBancaria entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaCrediBancoConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaCrediBancoConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaCrediBancoConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaCrediBancoConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailConfigDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaEmailConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailConfigDAO.java index b57a1e3b5..1c1517040 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailConfigDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailConfigDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; - -public interface EmpresaEmailConfigDAO extends GenericDAO { - - public List obtenerTodos(); - - public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; + +public interface EmpresaEmailConfigDAO extends GenericDAO { + + public List obtenerTodos(); + + public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaEmailDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailDAO.java index 947fc8d64..18e767ca0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; - -public interface EmpresaEmailDAO extends GenericDAO { - - public List obtenerTodos(); - - public EmpresaEmail buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; + +public interface EmpresaEmailDAO extends GenericDAO { + + public List obtenerTodos(); + + public EmpresaEmail buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailEComerceDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailEComerceDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaEmailEComerceDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailEComerceDAO.java index e26a2cab3..3038d6ef1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailEComerceDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailEComerceDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; - -public interface EmpresaEmailEComerceDAO extends GenericDAO { - - public List obtenerTodos(); - - public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; + +public interface EmpresaEmailEComerceDAO extends GenericDAO { + + public List obtenerTodos(); + + public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailFlexBusDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailFlexBusDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaEmailFlexBusDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailFlexBusDAO.java index 78422f6e2..c3ac0cd39 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailFlexBusDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEmailFlexBusDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; - -public interface EmpresaEmailFlexBusDAO extends GenericDAO { - - public List obtenerTodos(); - - public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; + +public interface EmpresaEmailFlexBusDAO extends GenericDAO { + + public List obtenerTodos(); + + public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaEquivalenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEquivalenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaEquivalenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaEquivalenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaImpostoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaImpostoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaImpostoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaImpostoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaIziPayDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaIziPayDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaIziPayDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaIziPayDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaMercadoPagoConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaMercadoPagoConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaMercadoPagoConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaMercadoPagoConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaNequiConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaNequiConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaNequiConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaNequiConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaPMArtespConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaPMArtespConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaPMArtespConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaPMArtespConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaRecargaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaRecargaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaRecargaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaRecargaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaSaferConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaSaferConfigDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaSaferConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaSaferConfigDAO.java index 3f2440ecd..8ba992059 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaSaferConfigDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaSaferConfigDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; - -public interface EmpresaSaferConfigDAO extends GenericDAO { - - public List obtenerTodos(); - - public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; + +public interface EmpresaSaferConfigDAO extends GenericDAO { + + public List obtenerTodos(); + + public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaSicfeConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaSicfeConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaSicfeConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaSicfeConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EmpresaTrocoSimplesDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaTrocoSimplesDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/EmpresaTrocoSimplesDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaTrocoSimplesDAO.java index 0307f4848..eb9e8ca3b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EmpresaTrocoSimplesDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EmpresaTrocoSimplesDAO.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; - -public interface EmpresaTrocoSimplesDAO extends GenericDAO { - - public EmpresaTrocoSimples buscarPorEmpresaId(Integer empresaId); -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; + +public interface EmpresaTrocoSimplesDAO extends GenericDAO { + + public EmpresaTrocoSimples buscarPorEmpresaId(Integer empresaId); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EnderecoApanheDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EnderecoApanheDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EnderecoApanheDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EnderecoApanheDAO.java index 91a9aea97..5e1d40fac 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EnderecoApanheDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EnderecoApanheDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EnderecoApanhe; - -public interface EnderecoApanheDAO extends GenericDAO{ - - public List buscar(Date datapacote, String numoperacion); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EnderecoApanhe; + +public interface EnderecoApanheDAO extends GenericDAO{ + + public List buscar(Date datapacote, String numoperacion); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EscolaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EscolaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/EscolaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EscolaDAO.java index 329c7e528..162088fc4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EscolaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EscolaDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Ciudad; -import com.rjconsultores.ventaboletos.entidad.Escola; - -public interface EscolaDAO extends GenericDAO { - public List buscar(String nombescola, Ciudad ciudad); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Ciudad; +import com.rjconsultores.ventaboletos.entidad.Escola; + +public interface EscolaDAO extends GenericDAO { + public List buscar(String nombescola, Ciudad ciudad); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaAgrupacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaAgrupacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaAgrupacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaAgrupacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaAsientoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaAsientoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaAsientoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaAsientoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaEmbarqueDesembarqueDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaEmbarqueDesembarqueDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaEmbarqueDesembarqueDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaEmbarqueDesembarqueDAO.java index 50fb55eab..83fb621ce 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaEmbarqueDesembarqueDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaEmbarqueDesembarqueDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaEmbarqueDesembarque; - -public interface EsquemaCorridaEmbarqueDesembarqueDAO extends GenericDAO { - - List obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaEmbarqueDesembarque; + +public interface EsquemaCorridaEmbarqueDesembarqueDAO extends GenericDAO { + + List obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaInfoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaInfoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaInfoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaInfoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaOperacionalDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaOperacionalDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaOperacionalDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaOperacionalDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaTramoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaTramoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EsquemaTramoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EsquemaTramoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EstacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EstacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EstacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EstacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EstadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EstadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/EstadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EstadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/EventoExtraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EventoExtraDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/EventoExtraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/EventoExtraDAO.java index 103b44320..a4db573c6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/EventoExtraDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/EventoExtraDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -public interface EventoExtraDAO extends GenericDAO{ - public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +public interface EventoExtraDAO extends GenericDAO{ + public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ExcecaoGrupoContratoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcecaoGrupoContratoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ExcecaoGrupoContratoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcecaoGrupoContratoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ExcepcionPeajeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcepcionPeajeDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ExcepcionPeajeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcepcionPeajeDAO.java index 0392196a6..8b9151c23 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ExcepcionPeajeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcepcionPeajeDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; - -public interface ExcepcionPeajeDAO extends GenericDAO { - public List buscar(String descconvenio, String cveconvenio); - - public void deletarVigencias(List epv); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; + +public interface ExcepcionPeajeDAO extends GenericDAO { + public List buscar(String descconvenio, String cveconvenio); + + public void deletarVigencias(List epv); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ExcepcionRedondoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcepcionRedondoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ExcepcionRedondoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ExcepcionRedondoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/FechamentoParamgeralDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FechamentoParamgeralDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/FechamentoParamgeralDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FechamentoParamgeralDAO.java index 637905ea6..affc6eb46 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FechamentoParamgeralDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FechamentoParamgeralDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; - -public interface FechamentoParamgeralDAO extends GenericDAO { - - public List buscaParametrosPorEmpresas(List empresasId); - public List buscaParametrosPorEmpresa(Integer empresasId); - public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresaId, String boletoBancoCod); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; + +public interface FechamentoParamgeralDAO extends GenericDAO { + + public List buscaParametrosPorEmpresas(List empresasId); + public List buscaParametrosPorEmpresa(Integer empresasId); + public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresaId, String boletoBancoCod); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FechamentoParamptovtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FechamentoParamptovtaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/FechamentoParamptovtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FechamentoParamptovtaDAO.java index 74962de82..bf1d08faf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FechamentoParamptovtaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FechamentoParamptovtaDAO.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface FechamentoParamptovtaDAO extends GenericDAO { - - public List buscaParametrosPorEmpresas(List empresasId); - public List buscaParametrosPorEmpresa(Integer empresasId); - public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa); - public FechamentoParamptovta buscaParametrosPorPuntoventa(PuntoVenta puntoventa, Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface FechamentoParamptovtaDAO extends GenericDAO { + + public List buscaParametrosPorEmpresas(List empresasId); + public List buscaParametrosPorEmpresa(Integer empresasId); + public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa); + public FechamentoParamptovta buscaParametrosPorPuntoventa(PuntoVenta puntoventa, Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FeriadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FeriadoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/FeriadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FeriadoDAO.java index 2af35c7c8..7a4e3dc96 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FeriadoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FeriadoDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.sql.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Feriado; - - -public interface FeriadoDAO extends GenericDAO { - - public List buscar(Date fecferiado); - - public boolean ehFeriado(Date fecFeriado, Empresa empresa, Estado estadoOrigem); - - public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado); -} - +package com.rjconsultores.ventaboletos.dao; + +import java.sql.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Feriado; + + +public interface FeriadoDAO extends GenericDAO { + + public List buscar(Date fecferiado); + + public boolean ehFeriado(Date fecFeriado, Empresa empresa, Estado estadoOrigem); + + public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado); +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalAliquotaEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalAliquotaEmpresaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/FiscalAliquotaEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalAliquotaEmpresaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/FiscalDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalDAO.java index b6997536a..a4e934bf2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FiscalDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalDAO.java @@ -1,75 +1,75 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCCF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCFC; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoICF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoPRC; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPR; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoBPS; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoDBP; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoPAR; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoRMD; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqBPS; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; - -public interface FiscalDAO { - - public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException; - - public List buscaDatosFiscaisECF(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isNormal, boolean isCancelados, boolean isPendencias, Connection connection, boolean isBoletoHist) throws SQLException; - - public List buscaDatosFiscaisReducaoZ(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isPendencias, Connection connection) throws SQLException; - - public List buscaDatosFiscaisECFManual(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection, boolean isBoletoHist) throws SQLException; - - public List buscaDatosNaoFiscais(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection) throws SQLException; - - public ExportacaoECF buscarRegistroECF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroECFTipoCFC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroECFTipoCCF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroECFTipoICF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroECFTipoPRC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public ExportacaoBPR buscarRegistroBPR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroRMDTipoPAR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroRMDTipoRMD(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroRMDTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroRMDTipoDBP(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List buscarRegistroRMDSeqTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); - - public List getRegistroImpressaoRMDTipoBPR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado, String rmd, String folio); - - public List getRegistroImpressaoRMDTipoECF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado, String rmd, String folio); - - public void gravarRMDBoleto(Connection connection, List rmds, Aidf aidf, String folio, Integer empresaId, Integer estadoId, boolean isECF, boolean isBPR); - - public void cancelarRMDBoleto(Connection connection, Date inicio, Date fim, Integer empresaId, Estado estado, Aidf aidf, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR); - - public List buscarRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, List estados, boolean isReceitaTerceiros); - - public void limparCache(Connection connection); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCCF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCFC; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoICF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoPRC; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPR; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoBPS; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoDBP; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoPAR; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoRMD; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqBPS; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; + +public interface FiscalDAO { + + public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException; + + public List buscaDatosFiscaisECF(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isNormal, boolean isCancelados, boolean isPendencias, Connection connection, boolean isBoletoHist) throws SQLException; + + public List buscaDatosFiscaisReducaoZ(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isPendencias, Connection connection) throws SQLException; + + public List buscaDatosFiscaisECFManual(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection, boolean isBoletoHist) throws SQLException; + + public List buscaDatosNaoFiscais(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection) throws SQLException; + + public ExportacaoECF buscarRegistroECF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroECFTipoCFC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroECFTipoCCF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroECFTipoICF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroECFTipoPRC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public ExportacaoBPR buscarRegistroBPR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroRMDTipoPAR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroRMDTipoRMD(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroRMDTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroRMDTipoDBP(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List buscarRegistroRMDSeqTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado); + + public List getRegistroImpressaoRMDTipoBPR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado, String rmd, String folio); + + public List getRegistroImpressaoRMDTipoECF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado, String rmd, String folio); + + public void gravarRMDBoleto(Connection connection, List rmds, Aidf aidf, String folio, Integer empresaId, Integer estadoId, boolean isECF, boolean isBPR); + + public void cancelarRMDBoleto(Connection connection, Date inicio, Date fim, Integer empresaId, Estado estado, Aidf aidf, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR); + + public List buscarRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, List estados, boolean isReceitaTerceiros); + + public void limparCache(Connection connection); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalFormapagoEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalFormapagoEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/FiscalFormapagoEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalFormapagoEmpresa.java index 434128351..08b23d834 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FiscalFormapagoEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalFormapagoEmpresa.java @@ -1,5 +1,5 @@ -package com.rjconsultores.ventaboletos.dao; - -public interface FiscalFormapagoEmpresa extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +public interface FiscalFormapagoEmpresa extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraDAO.java index 5cd82cb31..56177c3cb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraDAO.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -public interface FiscalImpressoraDAO { - - public List obtenerTodos(); - public FiscalImpressora obtenerID(Integer id); - public FiscalImpressora suscribir(FiscalImpressora entidad); - public FiscalImpressora actualizacion(FiscalImpressora entidad); - public void borrar(FiscalImpressora entidad); - public Long count(String campo,Object o); - - - public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId); - public List obtenerTodosTotnaofiscalEmpresa(); - public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id); - public FiscalTotnaofiscalEmpresa suscribirTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); - public FiscalTotnaofiscalEmpresa actualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); - public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); - - public List buscarFormaPagoEmpresa(Integer empresaEcfId); - public List obtenerTodosFormapagoEmpresa(); - public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id); - public FiscalFormapagoEmpresa suscribirFormapagoEmpresa(FiscalFormapagoEmpresa entidad); - public FiscalFormapagoEmpresa actualizacionFormapagoEmpresa(FiscalFormapagoEmpresa entidad); - - public List buscarItensRelgerencialEmpresa(Integer empresaEcfId); - public List obtenerTodosRelgerencialEmpresa(); - public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id); - public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); - public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); - public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa, String tipoTotalizador); - public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa, String tipoTotalizador,String descEcf); - public FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa, String tipoformapago); - FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa, String tipoformapago, String descEcf); - FiscalRelgerencialEmpresa buscarRelGerencial(Empresa empresa, String tipoRelGerencial ); - FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa, String tipoTotalizador, String descEcf, TipoEventoExtra tipoeventoextra); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +public interface FiscalImpressoraDAO { + + public List obtenerTodos(); + public FiscalImpressora obtenerID(Integer id); + public FiscalImpressora suscribir(FiscalImpressora entidad); + public FiscalImpressora actualizacion(FiscalImpressora entidad); + public void borrar(FiscalImpressora entidad); + public Long count(String campo,Object o); + + + public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId); + public List obtenerTodosTotnaofiscalEmpresa(); + public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id); + public FiscalTotnaofiscalEmpresa suscribirTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); + public FiscalTotnaofiscalEmpresa actualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); + public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); + + public List buscarFormaPagoEmpresa(Integer empresaEcfId); + public List obtenerTodosFormapagoEmpresa(); + public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id); + public FiscalFormapagoEmpresa suscribirFormapagoEmpresa(FiscalFormapagoEmpresa entidad); + public FiscalFormapagoEmpresa actualizacionFormapagoEmpresa(FiscalFormapagoEmpresa entidad); + + public List buscarItensRelgerencialEmpresa(Integer empresaEcfId); + public List obtenerTodosRelgerencialEmpresa(); + public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id); + public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); + public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); + public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa, String tipoTotalizador); + public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa, String tipoTotalizador,String descEcf); + public FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa, String tipoformapago); + FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa, String tipoformapago, String descEcf); + FiscalRelgerencialEmpresa buscarRelGerencial(Empresa empresa, String tipoRelGerencial ); + FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa, String tipoTotalizador, String descEcf, TipoEventoExtra tipoeventoextra); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraEstadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraEstadoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraEstadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraEstadoDAO.java index 737b251de..8a99372c3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraEstadoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalImpressoraEstadoDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; - -public interface FiscalImpressoraEstadoDAO { - - public List obtenerTodos(); - public FiscalImpressoraEstado obtenerID(Integer id); - public FiscalImpressoraEstado suscribir(FiscalImpressoraEstado entidad); - public FiscalImpressoraEstado actualizacion(FiscalImpressoraEstado entidad); - public void borrar(FiscalImpressoraEstado entidad); - public Long count(String campo,Object o); - - public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) ; - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; + +public interface FiscalImpressoraEstadoDAO { + + public List obtenerTodos(); + public FiscalImpressoraEstado obtenerID(Integer id); + public FiscalImpressoraEstado suscribir(FiscalImpressoraEstado entidad); + public FiscalImpressoraEstado actualizacion(FiscalImpressoraEstado entidad); + public void borrar(FiscalImpressoraEstado entidad); + public Long count(String campo,Object o); + + public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) ; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalRelgerencialEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalRelgerencialEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/FiscalRelgerencialEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalRelgerencialEmpresa.java index ef5578804..7c3cff179 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FiscalRelgerencialEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalRelgerencialEmpresa.java @@ -1,5 +1,5 @@ -package com.rjconsultores.ventaboletos.dao; - -public interface FiscalRelgerencialEmpresa extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +public interface FiscalRelgerencialEmpresa extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FiscalTotnaofiscalEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalTotnaofiscalEmpresaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/FiscalTotnaofiscalEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalTotnaofiscalEmpresaDAO.java index c797895d4..2eb7adbc3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FiscalTotnaofiscalEmpresaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FiscalTotnaofiscalEmpresaDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; - -public interface FiscalTotnaofiscalEmpresaDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; + +public interface FiscalTotnaofiscalEmpresaDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FlywayUtilDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FlywayUtilDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/FlywayUtilDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FlywayUtilDAO.java index d3d0582c9..0448a9c8c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FlywayUtilDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FlywayUtilDAO.java @@ -1,5 +1,5 @@ -package com.rjconsultores.ventaboletos.dao; - -public interface FlywayUtilDAO { - public boolean existeErroExecucaoScript(); -} +package com.rjconsultores.ventaboletos.dao; + +public interface FlywayUtilDAO { + public boolean existeErroExecucaoScript(); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FolioPreimpresoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FolioPreimpresoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/FolioPreimpresoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FolioPreimpresoDAO.java index 737aa4013..59b947a28 100644 --- a/src/com/rjconsultores/ventaboletos/dao/FolioPreimpresoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FolioPreimpresoDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; - -public interface FolioPreimpresoDAO extends GenericDAO { - - public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; + +public interface FolioPreimpresoDAO extends GenericDAO { + + public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/FormaPagamentoAgenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FormaPagamentoAgenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/FormaPagamentoAgenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FormaPagamentoAgenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/FormaPagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FormaPagoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/FormaPagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FormaPagoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/FormaPagoDetDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FormaPagoDetDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/FormaPagoDetDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FormaPagoDetDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/FuncionSistemaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/FuncionSistemaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/FuncionSistemaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/FuncionSistemaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingAsientoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingAsientoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingAsientoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingAsientoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingCategoriaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingCategoriaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingClaseDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingClaseDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingClaseDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingClaseDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingClasseTarifariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingClasseTarifariaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingClasseTarifariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingClasseTarifariaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingCorridaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingCorridaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingCorridaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingCorridaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingDiaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingDiaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingDiaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingDiaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoAgenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoAgenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoAgenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoAgenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCanalVendasDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCanalVendasDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCanalVendasDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCanalVendasDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCategoriaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoCategoriaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoOcupacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoOcupacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoOcupacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingEspecificoOcupacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingFormapagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingFormapagoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingFormapagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingFormapagoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingGestaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingGestaoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingGestaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingGestaoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingHistoricoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingHistoricoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingHistoricoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingHistoricoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingImporteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingImporteDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingImporteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingImporteDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingMarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingMarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingMarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingMarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingMercadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingMercadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingMercadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingMercadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingOcupaAntecipaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingOcupaAntecipaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingOcupaAntecipaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingOcupaAntecipaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingRutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingRutaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingRutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingRutaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoPtoVtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoPtoVtaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoPtoVtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoPtoVtaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingTipoServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GP_PricingVigenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingVigenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GP_PricingVigenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GP_PricingVigenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GenericDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GenericDAOInforme.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GenericDAOInforme.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GenericDAOInforme.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GenericDAOInforme.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GrupoCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoCategoriaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/GrupoCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoCategoriaDAO.java index 85849ab01..efa191daa 100644 --- a/src/com/rjconsultores/ventaboletos/dao/GrupoCategoriaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoCategoriaDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; - -public interface GrupoCategoriaDAO extends GenericDAO { - - public List buscar(String descricao); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; + +public interface GrupoCategoriaDAO extends GenericDAO { + + public List buscar(String descricao); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GrupoCortesiasDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoCortesiasDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GrupoCortesiasDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoCortesiasDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/GrupoRutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoRutaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/GrupoRutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/GrupoRutaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/HeaderEsquemaCorridaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/HeaderEsquemaCorridaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/HeaderEsquemaCorridaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/HeaderEsquemaCorridaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/HistoricoFormaPagoPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/HistoricoFormaPagoPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/HistoricoFormaPagoPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/HistoricoFormaPagoPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/HotelDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/HotelDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/HotelDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/HotelDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ImagemDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ImagemDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ImagemDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ImagemDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ImpresionLayoutConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ImpresionLayoutConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ImpresionLayoutConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ImpresionLayoutConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/InformeCategoriaVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformeCategoriaVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/InformeCategoriaVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformeCategoriaVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/InformePasajeroServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformePasajeroServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/InformePasajeroServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformePasajeroServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/InformeServicioDiarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformeServicioDiarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/InformeServicioDiarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformeServicioDiarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/InformeVentasPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformeVentasPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/InformeVentasPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/InformeVentasPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/InstiFinanceiraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/InstiFinanceiraDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/InstiFinanceiraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/InstiFinanceiraDAO.java index fcbaae3c2..6e295f0bd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/InstiFinanceiraDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/InstiFinanceiraDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - - - -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; -import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; - -public interface InstiFinanceiraDAO extends GenericDAO { - - public List buscar(String nome); - public List buscarContasBancariasPorIdEmpresa(Integer empresaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + + + +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; +import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; + +public interface InstiFinanceiraDAO extends GenericDAO { + + public List buscar(String nome); + public List buscarContasBancariasPorIdEmpresa(Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/IntegracaoDerPrDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/IntegracaoDerPrDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/IntegracaoDerPrDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/IntegracaoDerPrDAO.java index f6006a1d3..e0f148254 100644 --- a/src/com/rjconsultores/ventaboletos/dao/IntegracaoDerPrDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/IntegracaoDerPrDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; - -public interface IntegracaoDerPrDAO extends GenericDAO { - - public String buscarDadosImportacaoCabeca(Date inicio, Date fim, Empresa empresa, Integer linhaId); - public List buscarDadosImportacaoLinha(Date inicio, Date fim, Empresa empresa, Integer linhaId); - public String buscarDadosImportacaoRodape(Date inicio, Date fim, Empresa empresa, Integer linhaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; + +public interface IntegracaoDerPrDAO extends GenericDAO { + + public String buscarDadosImportacaoCabeca(Date inicio, Date fim, Empresa empresa, Integer linhaId); + public List buscarDadosImportacaoLinha(Date inicio, Date fim, Empresa empresa, Integer linhaId); + public String buscarDadosImportacaoRodape(Date inicio, Date fim, Empresa empresa, Integer linhaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/IntegracaoTotvsDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/IntegracaoTotvsDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/IntegracaoTotvsDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/IntegracaoTotvsDAO.java index 5cf98ef8b..615c6e612 100644 --- a/src/com/rjconsultores/ventaboletos/dao/IntegracaoTotvsDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/IntegracaoTotvsDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.IntegracaoTotvs; - -public interface IntegracaoTotvsDAO extends GenericDAO { - - public void borrarByCorrida(Corrida corrida); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.IntegracaoTotvs; + +public interface IntegracaoTotvsDAO extends GenericDAO { + + public void borrarByCorrida(Corrida corrida); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ItemAdicionalDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ItemAdicionalDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ItemAdicionalDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ItemAdicionalDAO.java index 4c207290f..75d3b22bc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ItemAdicionalDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ItemAdicionalDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; - -public interface ItemAdicionalDAO extends GenericDAO { - - public List buscaItemAdicionalPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; + +public interface ItemAdicionalDAO extends GenericDAO { + + public List buscaItemAdicionalPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ItemDescontoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ItemDescontoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ItemDescontoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ItemDescontoDAO.java index cfcd30721..b75ffc5b9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ItemDescontoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ItemDescontoDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ItemDesconto; - -public interface ItemDescontoDAO extends GenericDAO { - - public List buscarPorNome(String nomitemdesconto); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ItemDesconto; + +public interface ItemDescontoDAO extends GenericDAO { + + public List buscarPorNome(String nomitemdesconto); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/LogAuditoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogAuditoriaDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/LogAuditoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogAuditoriaDAO.java index 168fb8510..9bbef24a5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/LogAuditoriaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogAuditoriaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.LogAuditoria; - -public interface LogAuditoriaDAO extends GenericDAO { - - public List listarTodasAsTelas(); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.LogAuditoria; + +public interface LogAuditoriaDAO extends GenericDAO { + + public List listarTodasAsTelas(); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/LogDespesaReceitaDivDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogDespesaReceitaDivDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/LogDespesaReceitaDivDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogDespesaReceitaDivDAO.java index de3cdd63a..c1da959e6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/LogDespesaReceitaDivDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogDespesaReceitaDivDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; - -public interface LogDespesaReceitaDivDAO extends GenericDAO { - List obterPorPeriodo(Date inicio, Date fim); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; + +public interface LogDespesaReceitaDivDAO extends GenericDAO { + List obterPorPeriodo(Date inicio, Date fim); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/LogHistoricoContingenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogHistoricoContingenciaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/LogHistoricoContingenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogHistoricoContingenciaDAO.java index 0674928a2..288fc67ee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/LogHistoricoContingenciaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/LogHistoricoContingenciaDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; - -/** - * @author vjcor - * - */ -public interface LogHistoricoContingenciaDAO extends GenericDAO { - - public List buscarHistorico(Integer empresaID, Integer estadoID); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; + +/** + * @author vjcor + * + */ +public interface LogHistoricoContingenciaDAO extends GenericDAO { + + public List buscarHistorico(Integer empresaID, Integer estadoID); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MarcaAutobusDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaAutobusDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/MarcaAutobusDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaAutobusDAO.java index f1dff5dba..f5ad0cd8e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MarcaAutobusDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaAutobusDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; - - -public interface MarcaAutobusDAO extends GenericDAO { - - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; + + +public interface MarcaAutobusDAO extends GenericDAO { + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MarcaClaseServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaClaseServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MarcaClaseServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaClaseServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MensagemRecusaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensagemRecusaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/MensagemRecusaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensagemRecusaDAO.java index 38bdafa52..7d70bee53 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MensagemRecusaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensagemRecusaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.MensagemRecusa; - -public interface MensagemRecusaDAO extends GenericDAO { - - public List buscarPorCategoriaPadraoAPI(Integer categoriaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.MensagemRecusa; + +public interface MensagemRecusaDAO extends GenericDAO { + + public List buscarPorCategoriaPadraoAPI(Integer categoriaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MensajeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/MensajeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeDAO.java index 6a80ef6cf..783c9966a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MensajeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Mensaje; - -public interface MensajeDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Mensaje; + +public interface MensajeDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MensajeEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeEmpresaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/MensajeEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeEmpresaDAO.java index 55f600159..9a67f252f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MensajeEmpresaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeEmpresaDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Mensaje; -import com.rjconsultores.ventaboletos.entidad.MensajeEmpresa; - -public interface MensajeEmpresaDAO extends GenericDAO { - - public List obtenerPorMensaje(Mensaje mensaje); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Mensaje; +import com.rjconsultores.ventaboletos.entidad.MensajeEmpresa; + +public interface MensajeEmpresaDAO extends GenericDAO { + + public List obtenerPorMensaje(Mensaje mensaje); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MensajePuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajePuntoVentaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/MensajePuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajePuntoVentaDAO.java index bf6e86d92..283b2dc5a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MensajePuntoVentaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajePuntoVentaDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Mensaje; -import com.rjconsultores.ventaboletos.entidad.MensajePuntoVenta; - -public interface MensajePuntoVentaDAO extends GenericDAO { - - public List obtenerPorMensaje(Mensaje mensaje); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Mensaje; +import com.rjconsultores.ventaboletos.entidad.MensajePuntoVenta; + +public interface MensajePuntoVentaDAO extends GenericDAO { + + public List obtenerPorMensaje(Mensaje mensaje); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MensajeUsuarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeUsuarioDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/MensajeUsuarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeUsuarioDAO.java index 8803b2fe8..d4ea40c5e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MensajeUsuarioDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MensajeUsuarioDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Mensaje; -import com.rjconsultores.ventaboletos.entidad.MensajeUsuario; - -public interface MensajeUsuarioDAO extends GenericDAO { - - public List obtenerPorMensaje(Mensaje mensaje); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Mensaje; +import com.rjconsultores.ventaboletos.entidad.MensajeUsuario; + +public interface MensajeUsuarioDAO extends GenericDAO { + + public List obtenerPorMensaje(Mensaje mensaje); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MercadoCompetidoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MercadoCompetidoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MercadoCompetidoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MercadoCompetidoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MerchantBancarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MerchantBancarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MerchantBancarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MerchantBancarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MonedaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonedaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MonedaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonedaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCCFDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCCFDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/MonitoramentoCCFDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCCFDAO.java index d98185a4d..43322287c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCCFDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCCFDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.sql.Connection; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; - -public interface MonitoramentoCCFDAO extends GenericDAO { - public List buscaQuebraCCF(final String numserie, final Date data, final Integer ccfInicial); - public List obtenerTodos(); - public void setConnection(Connection con); - public Map obterImpressorasComCCFInicial(Date data); -} +package com.rjconsultores.ventaboletos.dao; + +import java.sql.Connection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; + +public interface MonitoramentoCCFDAO extends GenericDAO { + public List buscaQuebraCCF(final String numserie, final Date data, final Integer ccfInicial); + public List obtenerTodos(); + public void setConnection(Connection con); + public Map obterImpressorasComCCFInicial(Date data); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCRZDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCRZDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/MonitoramentoCRZDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCRZDAO.java index c31f09b2b..76072abbe 100644 --- a/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCRZDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MonitoramentoCRZDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; - -public interface MonitoramentoCRZDAO extends GenericDAO { - public List buscaQuebraCRZ(Date data); - public List obtenerTodos(); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; + +public interface MonitoramentoCRZDAO extends GenericDAO { + public List buscaQuebraCRZ(Date data); + public List obtenerTodos(); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/MotivoCancelVendaPacoteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoCancelVendaPacoteDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MotivoCancelVendaPacoteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoCancelVendaPacoteDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MotivoCancelacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoCancelacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MotivoCancelacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoCancelacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MotivoDevolucaoBilheteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoDevolucaoBilheteDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MotivoDevolucaoBilheteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoDevolucaoBilheteDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MotivoReimpresionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoReimpresionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MotivoReimpresionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoReimpresionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MotivoViajeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoViajeDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MotivoViajeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivoViajeDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/MotivocancelacionEquivalenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivocancelacionEquivalenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/MotivocancelacionEquivalenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/MotivocancelacionEquivalenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/NodoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/NodoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/NodoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/NodoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/NotaCreditoVendaPacoteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/NotaCreditoVendaPacoteDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/NotaCreditoVendaPacoteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/NotaCreditoVendaPacoteDAO.java index 03a235b41..ca4d4b352 100644 --- a/src/com/rjconsultores/ventaboletos/dao/NotaCreditoVendaPacoteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/NotaCreditoVendaPacoteDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.NotaCreditoVendaPacote; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -public interface NotaCreditoVendaPacoteDAO extends GenericDAO { - - List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, - Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.NotaCreditoVendaPacote; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +public interface NotaCreditoVendaPacoteDAO extends GenericDAO { + + List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, + Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OCDDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/OCDDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java index 207f272c9..14f08bc83 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OCDParam; - -public interface OCDParamDAO extends GenericDAO { - - public OCDParam suscribirActualizar(OCDParam entidad); - public OCDParam buscaOCDParamPorEmpresa(Empresa empresa); - public List buscaOCDParams(Empresa empresa); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OCDParam; + +public interface OCDParamDAO extends GenericDAO { + + public OCDParam suscribirActualizar(OCDParam entidad); + public OCDParam buscaOCDParamPorEmpresa(Empresa empresa); + public List buscaOCDParams(Empresa empresa); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OCDPtoVtaParamDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDPtoVtaParamDAO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/dao/OCDPtoVtaParamDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDPtoVtaParamDAO.java index 8751f0bf2..0b5bb3d20 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OCDPtoVtaParamDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OCDPtoVtaParamDAO.java @@ -1,14 +1,14 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; - -/** - * @author Thiago - * - */ -public interface OCDPtoVtaParamDAO extends GenericDAO { - -} +/** + * + */ +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; + +/** + * @author Thiago + * + */ +public interface OCDPtoVtaParamDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaDAO.java index 2aeb2e3eb..824d3253e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaDAO.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; - -public interface OperadorEmbarcadaDAO extends GenericDAO { - - public List buscarTodosOperadores(); - - public OperadorEmbarcada burcarOperadorPorId(Long operadorEmbarcadaID); - - public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario); - - public PuntoVentaVO getPuntoVentaVO(Integer operador); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; + +public interface OperadorEmbarcadaDAO extends GenericDAO { + + public List buscarTodosOperadores(); + + public OperadorEmbarcada burcarOperadorPorId(Long operadorEmbarcadaID); + + public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario); + + public PuntoVentaVO getPuntoVentaVO(Integer operador); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaLinhaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaLinhaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaLinhaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaLinhaDAO.java index 1a23c3689..c23e38ae1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaLinhaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaLinhaDAO.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; -import com.rjconsultores.ventaboletos.vo.ruta.RutaVO; - -public interface OperadorEmbarcadaLinhaDAO extends GenericDAO { - - public List buscarPorOperador(OperadorEmbarcada operador); - - public List getListaRutaVO(Integer operador); - - public List getListaResumidaRutaVO(Integer operador); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; +import com.rjconsultores.ventaboletos.vo.ruta.RutaVO; + +public interface OperadorEmbarcadaLinhaDAO extends GenericDAO { + + public List buscarPorOperador(OperadorEmbarcada operador); + + public List getListaRutaVO(Integer operador); + + public List getListaResumidaRutaVO(Integer operador); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaServicoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaServicoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaServicoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaServicoDAO.java index 890ac3a6d..037cc4ce8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaServicoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OperadorEmbarcadaServicoDAO.java @@ -1,25 +1,25 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; - -@SuppressWarnings("rawtypes") -public interface OperadorEmbarcadaServicoDAO extends GenericDAO { - - public List buscarPorOperador(OperadorEmbarcada operador); -// public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario); - - public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta); - - public List getListaResumidaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta, Boolean retornaTramos) throws Exception ; - - public List getListaCorridaProxyVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim); - - public void preencherCorrida(CorridaVO corrida, PuntoVenta puntoVenta, Empresa empresa); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; + +@SuppressWarnings("rawtypes") +public interface OperadorEmbarcadaServicoDAO extends GenericDAO { + + public List buscarPorOperador(OperadorEmbarcada operador); +// public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario); + + public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta); + + public List getListaResumidaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta, Boolean retornaTramos) throws Exception ; + + public List getListaCorridaProxyVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim); + + public void preencherCorrida(CorridaVO corrida, PuntoVenta puntoVenta, Empresa empresa); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OrgaoCancelacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoCancelacionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/OrgaoCancelacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoCancelacionDAO.java index ed5d98f6a..74293286d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OrgaoCancelacionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoCancelacionDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -public interface OrgaoCancelacionDAO extends GenericDAO { - - public List buscarPorOrgao(OrgaoConcedente orgaoConcedente); - - public List obtenerTodos(); - - public List obtenerTodosIds() ; -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +public interface OrgaoCancelacionDAO extends GenericDAO { + + public List buscarPorOrgao(OrgaoConcedente orgaoConcedente); + + public List obtenerTodos(); + + public List obtenerTodosIds() ; +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OrgaoComprovanteCustomizadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoComprovanteCustomizadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/OrgaoComprovanteCustomizadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoComprovanteCustomizadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/OrgaoConcedenteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoConcedenteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/OrgaoConcedenteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoConcedenteDAO.java index 6851e1693..ed869ae96 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OrgaoConcedenteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoConcedenteDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -public interface OrgaoConcedenteDAO extends GenericDAO { - - public List buscar(String desc); - - public List obtenerTodos(); - - public List obtenerTodosIds() ; - - public List obtenerTodosExceto(Integer... id); - - public List buscarListaPorIds(List claseIds); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +public interface OrgaoConcedenteDAO extends GenericDAO { + + public List buscar(String desc); + + public List obtenerTodos(); + + public List obtenerTodosIds() ; + + public List obtenerTodosExceto(Integer... id); + + public List buscarListaPorIds(List claseIds); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java index acc1e9620..add75a2c0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; - -public interface OrgaoEmpParamDAO extends GenericDAO { - - public List obterPorOrgao(Integer orgaoConcedenteId); - - public List obterPorEmpresa(Integer empresaId); - - public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; + +public interface OrgaoEmpParamDAO extends GenericDAO { + + public List obterPorOrgao(Integer orgaoConcedenteId); + + public List obterPorEmpresa(Integer empresaId); + + public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/OrgaoTramoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoTramoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/OrgaoTramoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoTramoDAO.java index a50b72b68..fba3d9cbf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/OrgaoTramoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/OrgaoTramoDAO.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.OrgaoTramo; - -public interface OrgaoTramoDAO { - - /** - * Hace la busqueda de la configuracion del coeficiente por tramo
- * - * @param origenId - * @param destinoId - * @param viaId - * @param orgaoConcedenteId - * @param claseServicioId - * @return - */ - public OrgaoTramo buscar(Integer origenId, Integer destinoId, Integer viaId, Integer orgaoConcedenteId, Integer claseServicioId); - - /** - * Graba el registro en la base de datos - * @param orgaoTramo - * @return - */ - public OrgaoTramo suscribir(OrgaoTramo orgaoTramo); - - public Long count(String campo, Object o); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.OrgaoTramo; + +public interface OrgaoTramoDAO { + + /** + * Hace la busqueda de la configuracion del coeficiente por tramo
+ * + * @param origenId + * @param destinoId + * @param viaId + * @param orgaoConcedenteId + * @param claseServicioId + * @return + */ + public OrgaoTramo buscar(Integer origenId, Integer destinoId, Integer viaId, Integer orgaoConcedenteId, Integer claseServicioId); + + /** + * Graba el registro en la base de datos + * @param orgaoTramo + * @return + */ + public OrgaoTramo suscribir(OrgaoTramo orgaoTramo); + + public Long count(String campo, Object o); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PacoteConvenioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteConvenioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PacoteConvenioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteConvenioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java index d4f93d07f..cbe2df3f0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Pacote; - -public interface PacoteDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Pacote; + +public interface PacoteDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PacoteDescontoBilheteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteDescontoBilheteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PacoteDescontoBilheteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteDescontoBilheteDAO.java index 4e5975427..5ac9f5f74 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PacoteDescontoBilheteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteDescontoBilheteDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; - -public interface PacoteDescontoBilheteDAO extends GenericDAO { - - public List obtenerTodos(Integer pacoteId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; + +public interface PacoteDescontoBilheteDAO extends GenericDAO { + + public List obtenerTodos(Integer pacoteId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PacoteItemDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteItemDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PacoteItemDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteItemDAO.java index 935581093..6d3da5937 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PacoteItemDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteItemDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteItem; - -public interface PacoteItemDAO extends GenericDAO { - - public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item); - - public List buscaItensPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteItem; + +public interface PacoteItemDAO extends GenericDAO { + + public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item); + + public List buscaItensPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PacoteTarifaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteTarifaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PacoteTarifaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteTarifaDAO.java index dc571f460..aeee175d2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PacoteTarifaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PacoteTarifaDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -public interface PacoteTarifaDAO extends GenericDAO { - - public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote); - - public List buscaTarifasPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +public interface PacoteTarifaDAO extends GenericDAO { + + public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote); + + public List buscaTarifasPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PaisDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PaisDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PaisDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PaisDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java index cbef316e5..cc781c04d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaCodOrgaoConcedenteDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; - -public interface ParadaCodOrgaoConcedenteDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; + +public interface ParadaCodOrgaoConcedenteDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParadaEquivalenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaEquivalenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParadaEquivalenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParadaEquivalenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamAcumulaMasivoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamAcumulaMasivoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParamAcumulaMasivoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamAcumulaMasivoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamAcumulaPuntoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamAcumulaPuntoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParamAcumulaPuntoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamAcumulaPuntoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamArticuloDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamArticuloDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ParamArticuloDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamArticuloDAO.java index 9e3c7faa9..7874a7f3b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ParamArticuloDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamArticuloDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ParamArticulo; - -public interface ParamArticuloDAO extends GenericDAO{ - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ParamArticulo; + +public interface ParamArticuloDAO extends GenericDAO{ + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamCanjePuntoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamCanjePuntoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParamCanjePuntoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamCanjePuntoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamCompraPuntoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamCompraPuntoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParamCompraPuntoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamCompraPuntoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamConexionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamConexionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/ParamConexionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamConexionDAO.java index 93a1f1484..8c0722762 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ParamConexionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamConexionDAO.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.ParamConexion; - -public interface ParamConexionDAO { - - public ParamConexion actualizacion(ParamConexion paramConexion) ; -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.ParamConexion; + +public interface ParamConexionDAO { + + public ParamConexion actualizacion(ParamConexion paramConexion) ; +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamCostoTarjetaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamCostoTarjetaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParamCostoTarjetaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamCostoTarjetaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ParamRecoleccionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamRecoleccionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ParamRecoleccionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ParamRecoleccionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PeajeDao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PeajeDao.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/PeajeDao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PeajeDao.java index 187593527..7f0415b31 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PeajeDao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PeajeDao.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Peaje; - -public interface PeajeDao extends GenericDAO { - - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Peaje; + +public interface PeajeDao extends GenericDAO { + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PerfilDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PerfilDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PerfilDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PerfilDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PerfilFuncionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PerfilFuncionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PerfilFuncionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PerfilFuncionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PeriodoVacacionalDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PeriodoVacacionalDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PeriodoVacacionalDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PeriodoVacacionalDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PlazaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PlazaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PlazaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PlazaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PrecioFixoPedagioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PrecioFixoPedagioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PrecioFixoPedagioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PrecioFixoPedagioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PrecioVentajaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PrecioVentajaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PrecioVentajaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PrecioVentajaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PrecoApanheDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PrecoApanheDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PrecoApanheDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PrecoApanheDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingAsientoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingAsientoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingAsientoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingAsientoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingCategoriaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingCategoriaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingClaseDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingClaseDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingClaseDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingClaseDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingClasseTarifariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingClasseTarifariaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PricingClasseTarifariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingClasseTarifariaDAO.java index 516786611..110550cf1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingClasseTarifariaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingClasseTarifariaDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; - -public interface PricingClasseTarifariaDAO extends GenericDAO { - - public Boolean validacionSigla(String sigla); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; + +public interface PricingClasseTarifariaDAO extends GenericDAO { + + public Boolean validacionSigla(String sigla); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingCorridaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingCorridaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingCorridaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingCorridaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingDiaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingDiaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingDiaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingDiaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoAgenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoAgenciaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PricingEspecificoAgenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoAgenciaDAO.java index 40a9a81a7..837939a1e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoAgenciaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoAgenciaDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; - -public interface PricingEspecificoAgenciaDAO extends GenericDAO { - - Boolean isDuplicado(PricingEspecificoAgencia entidad); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; + +public interface PricingEspecificoAgenciaDAO extends GenericDAO { + + Boolean isDuplicado(PricingEspecificoAgencia entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCanalVendasDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCanalVendasDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCanalVendasDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCanalVendasDAO.java index c20f36dde..a9e6fe692 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCanalVendasDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCanalVendasDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; - -public interface PricingEspecificoCanalVendasDAO extends GenericDAO { - - Boolean isDuplicado(PricingEspecificoCanalVendas entidad); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; + +public interface PricingEspecificoCanalVendasDAO extends GenericDAO { + + Boolean isDuplicado(PricingEspecificoCanalVendas entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCategoriaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCategoriaDAO.java index 866ab1e67..125ef3e8f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCategoriaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoCategoriaDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; - -public interface PricingEspecificoCategoriaDAO extends GenericDAO { - - Boolean isDuplicado(PricingEspecificoCategoria entidad); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; + +public interface PricingEspecificoCategoriaDAO extends GenericDAO { + + Boolean isDuplicado(PricingEspecificoCategoria entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoOcupacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoOcupacionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PricingEspecificoOcupacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoOcupacionDAO.java index 6854160be..3e7c3e5eb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoOcupacionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoOcupacionDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; - -public interface PricingEspecificoOcupacionDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; + +public interface PricingEspecificoOcupacionDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingFormapagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingFormapagoDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/PricingFormapagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingFormapagoDAO.java index a2ba8f67e..b2d385588 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingFormapagoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingFormapagoDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PricingFormapago; - -public interface PricingFormapagoDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PricingFormapago; + +public interface PricingFormapagoDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingImporteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingImporteDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingImporteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingImporteDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingMarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingMarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingMarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingMarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingMercadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingMercadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingMercadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingMercadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingOcupaAntecipaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingOcupaAntecipaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingOcupaAntecipaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingOcupaAntecipaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingRutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingRutaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingRutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingRutaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingTipoPtoVtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingTipoPtoVtaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingTipoPtoVtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingTipoPtoVtaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingTipoServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingTipoServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingTipoServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingTipoServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingVigenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingVigenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PricingVigenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PricingVigenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdClaseServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdClaseServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdClaseServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdClaseServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdFormaPagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdFormaPagoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdFormaPagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdFormaPagoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdMarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdMarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdMarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdMarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdMercadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdMercadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdMercadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdMercadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdPrecioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdPrecioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdPrecioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdPrecioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdRutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdRutaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdRutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdRutaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdTipoptovtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdTipoptovtaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdTipoptovtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdTipoptovtaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProdVigenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdVigenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProdVigenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProdVigenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ProductoServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProductoServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ProductoServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ProductoServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PtoVtaCheckinDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaCheckinDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/PtoVtaCheckinDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaCheckinDAO.java index 67041d626..15744316d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtoVtaCheckinDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaCheckinDAO.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; - -public interface PtoVtaCheckinDAO extends GenericDAO { - - +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; + +public interface PtoVtaCheckinDAO extends GenericDAO { + + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/PtoVtaSeguroDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaSeguroDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/PtoVtaSeguroDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaSeguroDAO.java index 6a9e4bafc..e12071885 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtoVtaSeguroDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaSeguroDAO.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; - -public interface PtoVtaSeguroDAO extends GenericDAO { - - +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; + +public interface PtoVtaSeguroDAO extends GenericDAO { + + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/PtoVtaUsuarioBancarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaUsuarioBancarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PtoVtaUsuarioBancarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtoVtaUsuarioBancarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaAgenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAgenciaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaAgenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAgenciaDAO.java index 6061005d0..184eedf90 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaAgenciaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAgenciaDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; - - -public interface PtovtaAgenciaDAO extends GenericDAO { - - public List buscar(String numagencia); - public void borrarFisico(PtovtaAgencia pto); - +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; + + +public interface PtovtaAgenciaDAO extends GenericDAO { + + public List buscar(String numagencia); + public void borrarFisico(PtovtaAgencia pto); + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaAntecipacomissaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAntecipacomissaoDAO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaAntecipacomissaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAntecipacomissaoDAO.java index f1379c56d..fa83d565d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaAntecipacomissaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAntecipacomissaoDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - - -import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; - -public interface PtovtaAntecipacomissaoDAO extends GenericDAO { - - public List buscar(int id); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + + +import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; + +public interface PtovtaAntecipacomissaoDAO extends GenericDAO { + + public List buscar(int id); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaAntifraudeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAntifraudeDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaAntifraudeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAntifraudeDAO.java index 1d4b52416..60ccf8a71 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaAntifraudeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaAntifraudeDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; - -public interface PtovtaAntifraudeDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; + +public interface PtovtaAntifraudeDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaCatIndDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaCatIndDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaCatIndDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaCatIndDAO.java index 9ecc19f4a..0043e2b51 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaCatIndDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaCatIndDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; - -public interface PtovtaCatIndDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; + +public interface PtovtaCatIndDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaComissaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaComissaoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaComissaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaComissaoDAO.java index be9876c69..f76e8a525 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaComissaoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaComissaoDAO.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface PtovtaComissaoDAO extends GenericDAO { - - public List buscar(int id); - - public List buscarByPuntaVenta(PuntoVenta puntaVenta); - - public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface PtovtaComissaoDAO extends GenericDAO { + + public List buscar(int id); + + public List buscarByPuntaVenta(PuntoVenta puntaVenta); + + public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaContaMDDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaContaMDDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaContaMDDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaContaMDDAO.java index be771cc90..43c4b3e2e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaContaMDDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaContaMDDAO.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; - -public interface PtovtaContaMDDAO extends GenericDAO { - - boolean contemItem(PtovtaContaMD ptovtaContaMD); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; + +public interface PtovtaContaMDDAO extends GenericDAO { + + boolean contemItem(PtovtaContaMD ptovtaContaMD); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaDiversosDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaDiversosDAO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaDiversosDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaDiversosDAO.java index e83446161..44a5aba95 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaDiversosDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaDiversosDAO.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; - - - - -public interface PtovtaDiversosDAO extends GenericDAO { - - public List buscar(int id); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; + + + + +public interface PtovtaDiversosDAO extends GenericDAO { + + public List buscar(int id); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaBloqueadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaBloqueadaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaBloqueadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaBloqueadaDAO.java index d73f75eac..31057b9a1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaBloqueadaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaBloqueadaDAO.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; - -public interface PtovtaEmpresaBloqueadaDAO extends GenericDAO { - - +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; + +public interface PtovtaEmpresaBloqueadaDAO extends GenericDAO { + + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaEstoqueDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEstoqueDAO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaEstoqueDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEstoqueDAO.java index f0b9230b0..da40c1061 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaEstoqueDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaEstoqueDAO.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; - - - - - - -public interface PtovtaEstoqueDAO extends GenericDAO { - - public List buscar(int id); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; + + + + + + +public interface PtovtaEstoqueDAO extends GenericDAO { + + public List buscar(int id); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaExcecaoMultaCancDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaExcecaoMultaCancDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaExcecaoMultaCancDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaExcecaoMultaCancDAO.java index daa121d8d..379f110dc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaExcecaoMultaCancDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaExcecaoMultaCancDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; - -public interface PtovtaExcecaoMultaCancDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; + +public interface PtovtaExcecaoMultaCancDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaHorarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaHorarioDAO.java similarity index 93% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaHorarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaHorarioDAO.java index 587129a9d..7d60b479e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaHorarioDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaHorarioDAO.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; - - - - - - - -public interface PtovtaHorarioDAO extends GenericDAO { - - public List buscar(int id); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; + + + + + + + +public interface PtovtaHorarioDAO extends GenericDAO { + + public List buscar(int id); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaTipoEstoqueDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaTipoEstoqueDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaTipoEstoqueDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaTipoEstoqueDAO.java index 502e40a36..4d709a79e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaTipoEstoqueDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaTipoEstoqueDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.PtovtaTipoEstoque; - -public interface PtovtaTipoEstoqueDAO extends GenericDAO { - - public PtovtaTipoEstoque buscarTipoSuprimento(); - public PtovtaTipoEstoque buscarTipoContabilidade(); - public PtovtaTipoEstoque buscarTipoNormal(); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaTipoEstoque; + +public interface PtovtaTipoEstoqueDAO extends GenericDAO { + + public PtovtaTipoEstoque buscarTipoSuprimento(); + public PtovtaTipoEstoque buscarTipoContabilidade(); + public PtovtaTipoEstoque buscarTipoNormal(); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaTitularDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaTitularDAO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/dao/PtovtaTitularDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaTitularDAO.java index 8dda0b813..deb27dd45 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PtovtaTitularDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PtovtaTitularDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; - - - -public interface PtovtaTitularDAO extends GenericDAO { - - public List buscar(int id); - - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; + + + +public interface PtovtaTitularDAO extends GenericDAO { + + public List buscar(int id); + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/PuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/PuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/PuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/PuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ReceitaDespesaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReceitaDespesaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ReceitaDespesaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReceitaDespesaDAO.java index a39c8d850..d0ddf6eb3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ReceitaDespesaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReceitaDespesaDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; - -public interface ReceitaDespesaDAO { - - public List getRelatorioDetalhado(Map parametros) throws BusinessException; - - public List getRelatorioSintetico(Map parametros) throws BusinessException; - - public List getRelatorioAgencia(Map parametros) throws BusinessException; - - public List getRelatorioEvento(Map parametros) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; + +public interface ReceitaDespesaDAO { + + public List getRelatorioDetalhado(Map parametros) throws BusinessException; + + public List getRelatorioSintetico(Map parametros) throws BusinessException; + + public List getRelatorioAgencia(Map parametros) throws BusinessException; + + public List getRelatorioEvento(Map parametros) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/RecuperarSenhaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RecuperarSenhaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RecuperarSenhaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RecuperarSenhaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RedondeoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RedondeoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RedondeoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RedondeoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RedondeoMarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RedondeoMarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RedondeoMarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RedondeoMarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RegionMetropolitanaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RegionMetropolitanaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/RegionMetropolitanaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RegionMetropolitanaDAO.java index e65ec6bf8..2152622a5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RegionMetropolitanaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RegionMetropolitanaDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; - -public interface RegionMetropolitanaDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; + +public interface RegionMetropolitanaDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/RelatorioAgepanDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RelatorioAgepanDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/RelatorioAgepanDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RelatorioAgepanDAO.java index b8c9b96b3..32c6a2f06 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RelatorioAgepanDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RelatorioAgepanDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; - -public interface RelatorioAgepanDAO { - - public List listar(Map parametros) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; + +public interface RelatorioAgepanDAO { + + public List listar(Map parametros) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java index c76de7af1..63c2a0228 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java @@ -1,46 +1,46 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.sql.SQLException; -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.ArquivoRemessa; -import com.rjconsultores.ventaboletos.blocos.DetalheRetorno; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; - -public interface RemessaCNABBancosDAO extends GenericDAO{ - - public String findBanco(Empresa empresa); - - public ArquivoRemessa remessaBradesco(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaSantander(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaSicoob(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaCaixa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaMercantil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaItau(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaBancoBrasil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public ArquivoRemessa remessaSafra(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; - - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); - - public List getEmpresas(); - - public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception; - - public FechamentoBoleto obtenerFechamentoBoletoPorNossoNumero(String nossoNumero, Integer empresaId); - - public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId, DetalheRetorno detalhe) throws SQLException; - - public FechamentoBoleto obtenerFechamentoBoletoPorId(Integer idBoletoFechamento); - - public boolean quitarFechamentoBoleto(DetalheRetorno detalhe, Integer usuarioId) throws SQLException; - -} +package com.rjconsultores.ventaboletos.dao; + +import java.sql.SQLException; +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.ArquivoRemessa; +import com.rjconsultores.ventaboletos.blocos.DetalheRetorno; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; + +public interface RemessaCNABBancosDAO extends GenericDAO{ + + public String findBanco(Empresa empresa); + + public ArquivoRemessa remessaBradesco(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaSantander(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaSicoob(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaCaixa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaMercantil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaItau(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaBancoBrasil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public ArquivoRemessa remessaSafra(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception; + + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); + + public List getEmpresas(); + + public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception; + + public FechamentoBoleto obtenerFechamentoBoletoPorNossoNumero(String nossoNumero, Integer empresaId); + + public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId, DetalheRetorno detalhe) throws SQLException; + + public FechamentoBoleto obtenerFechamentoBoletoPorId(Integer idBoletoFechamento); + + public boolean quitarFechamentoBoleto(DetalheRetorno detalhe, Integer usuarioId) throws SQLException; + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/RequisicionBoletoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RequisicionBoletoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/RequisicionBoletoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RequisicionBoletoDAO.java index db2e698d8..a39c1444b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RequisicionBoletoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RequisicionBoletoDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; - -public interface RequisicionBoletoDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; + +public interface RequisicionBoletoDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservaEspecialClienteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservaEspecialClienteDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/ReservaEspecialClienteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservaEspecialClienteDAO.java index 75d756ef9..092f7e670 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ReservaEspecialClienteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservaEspecialClienteDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; - -public interface ReservaEspecialClienteDAO extends GenericDAO { - - public List bucarReservaEspecialByClienteId(Long clienteId) ; - public List bucarReservaEspecialByCorridaId(Long corridaId) ; -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; + +public interface ReservaEspecialClienteDAO extends GenericDAO { + + public List bucarReservaEspecialByClienteId(Long clienteId) ; + public List bucarReservaEspecialByCorridaId(Long corridaId) ; +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservacionCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionCategoriaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ReservacionCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionCategoriaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservacionClaseDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionClaseDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ReservacionClaseDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionClaseDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservacionCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ReservacionCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservacionMarcaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionMarcaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ReservacionMarcaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionMarcaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservacionMercadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionMercadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ReservacionMercadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionMercadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/ReservacionPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ReservacionPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ReservacionPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RestriccionPagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RestriccionPagoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RestriccionPagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RestriccionPagoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RevenueConfigDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RevenueConfigDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RevenueConfigDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RevenueConfigDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RhPagoConductorDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RhPagoConductorDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RhPagoConductorDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RhPagoConductorDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RolOperativoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RolOperativoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RolOperativoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RolOperativoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaCasetaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaCasetaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/RutaCasetaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaCasetaDAO.java index d3e8198d4..1befafef5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RutaCasetaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaCasetaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - - - -import com.rjconsultores.ventaboletos.entidad.RutaCaseta; - -public interface RutaCasetaDAO extends GenericDAO { - -// public RutaCaseta suscribir(RutaCaseta entidad); - public void deletarRutaCasetasFromRutaSecuenciaId(Integer id); -} +package com.rjconsultores.ventaboletos.dao; + + + +import com.rjconsultores.ventaboletos.entidad.RutaCaseta; + +public interface RutaCasetaDAO extends GenericDAO { + +// public RutaCaseta suscribir(RutaCaseta entidad); + public void deletarRutaCasetasFromRutaSecuenciaId(Integer id); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaCombinacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaCombinacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RutaCombinacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaCombinacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RutaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaEmbarqueDesembarqueDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaEmbarqueDesembarqueDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/RutaEmbarqueDesembarqueDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaEmbarqueDesembarqueDAO.java index a07e987bf..7e2d33ac3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RutaEmbarqueDesembarqueDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaEmbarqueDesembarqueDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaEmbarqueDesembarque; - -public interface RutaEmbarqueDesembarqueDAO extends GenericDAO { - - List obtenerPorRuta(Ruta ruta); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaEmbarqueDesembarque; + +public interface RutaEmbarqueDesembarqueDAO extends GenericDAO { + + List obtenerPorRuta(Ruta ruta); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaEmpresaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RutaEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaEmpresaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaIcmsExcepcionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaIcmsExcepcionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RutaIcmsExcepcionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaIcmsExcepcionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaSecuenciaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaSecuenciaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/RutaSecuenciaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/RutaSecuenciaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/SapDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SapDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/SapDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SapDAO.java index 310d6477c..112a0a26e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SapDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SapDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; - -public interface SapDAO extends GenericDAO { - - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status); - - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status, PuntoVenta puntoVenta); - - public boolean atualizaFechamento(Long fechamentocntcorrenteId, int status) throws Exception; - +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; + +public interface SapDAO extends GenericDAO { + + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status); + + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status, PuntoVenta puntoVenta); + + public boolean atualizaFechamento(Long fechamentocntcorrenteId, int status) throws Exception; + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/SecretariaEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SecretariaEmpresaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/SecretariaEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SecretariaEmpresaDAO.java index 3975ecf8f..e420bda3c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SecretariaEmpresaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SecretariaEmpresaDAO.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Secretaria; -import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; - -public interface SecretariaEmpresaDAO extends GenericDAO { - - public List buscarPorSecretaria(Secretaria secretaria); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Secretaria; +import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; + +public interface SecretariaEmpresaDAO extends GenericDAO { + + public List buscarPorSecretaria(Secretaria secretaria); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/SegVKMDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SegVKMDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/SegVKMDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SegVKMDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/SeguradoraEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguradoraEmpresaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/SeguradoraEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguradoraEmpresaDAO.java index 6c9e674f3..64a9b35cd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SeguradoraEmpresaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguradoraEmpresaDAO.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; - -public interface SeguradoraEmpresaDAO extends GenericDAO { - public boolean existe(Empresa empresa, String serie); -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; + +public interface SeguradoraEmpresaDAO extends GenericDAO { + public boolean existe(Empresa empresa, String serie); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java index 17817445d..6aa29964b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguroKmDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroKm; -import java.util.List; - -public interface SeguroKmDAO extends GenericDAO { - - /** - * Indica se existe seguroKm para o orgaoConcedenteId informado - * - * @param orgaoConcedenteId - * @return - */ - public boolean existe(Integer orgaoConcedenteId); - - public List buscarPorOrgao(OrgaoConcedente orgao); - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroKm; +import java.util.List; + +public interface SeguroKmDAO extends GenericDAO { + + /** + * Indica se existe seguroKm para o orgaoConcedenteId informado + * + * @param orgaoConcedenteId + * @return + */ + public boolean existe(Integer orgaoConcedenteId); + + public List buscarPorOrgao(OrgaoConcedente orgao); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/SeguroTarifaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguroTarifaDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/SeguroTarifaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguroTarifaDAO.java index 385d550e6..9391f0b5b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SeguroTarifaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SeguroTarifaDAO.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; -import java.util.List; - -public interface SeguroTarifaDAO extends GenericDAO { - - /** - * Indica se existe seguroTarifa para o orgaoConcedenteId informado - * - * @param orgaoConcedenteId - * @return - */ - public boolean existe(Integer orgaoConcedenteId); - - public List buscarPorOrgao(OrgaoConcedente orgao); -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; +import java.util.List; + +public interface SeguroTarifaDAO extends GenericDAO { + + /** + * Indica se existe seguroTarifa para o orgaoConcedenteId informado + * + * @param orgaoConcedenteId + * @return + */ + public boolean existe(Integer orgaoConcedenteId); + + public List buscarPorOrgao(OrgaoConcedente orgao); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/SisdapDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SisdapDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/SisdapDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SisdapDAO.java index 249780224..a947ad77d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SisdapDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SisdapDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -public interface SisdapDAO { - public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId); - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem); - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, List pesquisaGratuidadeEstudante, List pesquisaGratuidadeProfessor); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +public interface SisdapDAO { + public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId); + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem); + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, List pesquisaGratuidadeEstudante, List pesquisaGratuidadeProfessor); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/SistemaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SistemaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/SistemaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SistemaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/SolicitudExpresosDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/SolicitudExpresosDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/SolicitudExpresosDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/SolicitudExpresosDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/StatusSolicitudExpresosDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/StatusSolicitudExpresosDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/StatusSolicitudExpresosDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/StatusSolicitudExpresosDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaCategoriaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaCategoriaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaCategoriaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaCategoriaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaConvenioTransportDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaConvenioTransportDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaConvenioTransportDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaConvenioTransportDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaHistDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaHistDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaHistDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaEmbarcadaHistDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaGrupoContratoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaGrupoContratoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaGrupoContratoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaGrupoContratoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaHistDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaHistDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaHistDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaHistDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaKmDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaKmDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/TarifaKmDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaKmDAO.java index 65f98858e..0d86d85e4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TarifaKmDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaKmDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.TarifaKm; - -public interface TarifaKmDAO extends GenericDAO{ - - public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.TarifaKm; + +public interface TarifaKmDAO extends GenericDAO{ + + public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaMinimaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaMinimaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaMinimaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaMinimaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java index fb4519712..87be8932c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java @@ -1,110 +1,110 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.math.BigDecimal; -import java.util.List; - -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TarifaOficial; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.service.TarifaOficialService; -import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialComComposicaoDoPedagioVo; -import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialVO; - -public interface TarifaOficialDAO extends GenericDAO { - /** - * See {@link TarifaOficialService#gerarTarifaPorCoeficiente(Integer, Integer)} - * @param ruta - * @param usuarioId TODO - * @param orgaoConcedenteId TODO - * @return TODO - */ - public Integer gerarTarifaPorCoeficiente(Integer ruta, Integer usuarioId, OrgaoConcedente orgaoConcedente, List idsEmpresas,Integer[] lsCasetaPeaje); - - public Integer gerarTarifaArtesp(Integer ruta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas); - - public Integer gerarTabelaZerada(Integer ruta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,ListlsParadaId); - - /** - * See {@link TarifaOficialService#atualizarTarifaPorCoeficiente(Integer, Integer)} - * @param rutaId - * @param usuarioId TODO - * @param orgaoConcedenteId - * @return TODO - */ - public Integer atualizarTarifaCoeficiente(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedenteId); - - /** - * See {@link TarifaOficialService#copiarParaTarifa(VigenciaTarifa)} - * @param vigenciaTarifa - * @param usuarioId TODO - * @param calculaPegagio Boolean - * @param calculaTarifa Boolean - * @param calculaTaxaEmbarque Boolean - * @param empresa Empresa - * @param orgaoConcedente OrgaoConcedente - */ - public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente); - - /** - * See {@link TarifaOficialService#atualizarTaxaEmbarque(Integer, Integer)} - * @param rutaId - * @param usuarioId TODO - * @param orgaoConcedenteId TODO - * @param empresaId TODO - */ - public void atualizarTaxaEmbarque(List lsRuta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds); - - /** - * See {@link TarifaOficialService#atualizarSeguroPorKm(Integer, Integer, Integer)} - * @param rutaId - * @param orgaoId - * @param usuarioId - */ - public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro); - - /** - * See {@link TarifaOficialService#atualizarSeguroPorTarifa(Integer, Integer, Integer)} - * @param rutaId - * @param orgaoId - * @param usuarioId - */ - public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId, Integer usuarioId); - - /** - * Aplica a regra de arredondamento para as tarifas do órgão concedente informado.
- * - * - * após somar todos os componentes (precio,importetaxaembarque,importeseguro,importeoutros e importepedagio) obtem-se o PRECO final.
- * - * Baseado nesse valor, são aplicados as regras de arredondamento onde o componente precio pode sofrer um acréscimo os descréscimo de preço para que o arredondamento
- * fique certo - * - * @param orgaoConcedenteId - * @param usuarioId TODO - */ - public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Integer usuarioId, Boolean taxaEmbarque); - - public void limparTarifasOficiais(List lsEmpresaSelected); - - public void atualizarPedagio(); - - public void atualizarPrecioPorTPP(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro); - - public long obtenerCount(List lsEmpresaSelected); - - public List obterTarifaOficialPorFiltroVO(Moneda moneda, Marca marca,List lsMarcas,Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende); - - public List oberTarifaOficialComComposicaoDoPedagioVo(Integer empresaId); - - public void atualizarPedagioComFiltroDePracaDePedagio(Integer tarifaOficialId, BigDecimal importePedagio, String composicaoPedagio ); - - public void removerDuplicidadeNaTarifaOficial(); -} +package com.rjconsultores.ventaboletos.dao; + +import java.math.BigDecimal; +import java.util.List; + +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TarifaOficial; +import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; +import com.rjconsultores.ventaboletos.service.TarifaOficialService; +import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialComComposicaoDoPedagioVo; +import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialVO; + +public interface TarifaOficialDAO extends GenericDAO { + /** + * See {@link TarifaOficialService#gerarTarifaPorCoeficiente(Integer, Integer)} + * @param ruta + * @param usuarioId TODO + * @param orgaoConcedenteId TODO + * @return TODO + */ + public Integer gerarTarifaPorCoeficiente(Integer ruta, Integer usuarioId, OrgaoConcedente orgaoConcedente, List idsEmpresas,Integer[] lsCasetaPeaje); + + public Integer gerarTarifaArtesp(Integer ruta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas); + + public Integer gerarTabelaZerada(Integer ruta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,ListlsParadaId); + + /** + * See {@link TarifaOficialService#atualizarTarifaPorCoeficiente(Integer, Integer)} + * @param rutaId + * @param usuarioId TODO + * @param orgaoConcedenteId + * @return TODO + */ + public Integer atualizarTarifaCoeficiente(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedenteId); + + /** + * See {@link TarifaOficialService#copiarParaTarifa(VigenciaTarifa)} + * @param vigenciaTarifa + * @param usuarioId TODO + * @param calculaPegagio Boolean + * @param calculaTarifa Boolean + * @param calculaTaxaEmbarque Boolean + * @param empresa Empresa + * @param orgaoConcedente OrgaoConcedente + */ + public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente); + + /** + * See {@link TarifaOficialService#atualizarTaxaEmbarque(Integer, Integer)} + * @param rutaId + * @param usuarioId TODO + * @param orgaoConcedenteId TODO + * @param empresaId TODO + */ + public void atualizarTaxaEmbarque(List lsRuta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds); + + /** + * See {@link TarifaOficialService#atualizarSeguroPorKm(Integer, Integer, Integer)} + * @param rutaId + * @param orgaoId + * @param usuarioId + */ + public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro); + + /** + * See {@link TarifaOficialService#atualizarSeguroPorTarifa(Integer, Integer, Integer)} + * @param rutaId + * @param orgaoId + * @param usuarioId + */ + public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId, Integer usuarioId); + + /** + * Aplica a regra de arredondamento para as tarifas do órgão concedente informado.
+ * + * + * após somar todos os componentes (precio,importetaxaembarque,importeseguro,importeoutros e importepedagio) obtem-se o PRECO final.
+ * + * Baseado nesse valor, são aplicados as regras de arredondamento onde o componente precio pode sofrer um acréscimo os descréscimo de preço para que o arredondamento
+ * fique certo + * + * @param orgaoConcedenteId + * @param usuarioId TODO + */ + public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Integer usuarioId, Boolean taxaEmbarque); + + public void limparTarifasOficiais(List lsEmpresaSelected); + + public void atualizarPedagio(); + + public void atualizarPrecioPorTPP(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro); + + public long obtenerCount(List lsEmpresaSelected); + + public List obterTarifaOficialPorFiltroVO(Moneda moneda, Marca marca,List lsMarcas,Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende); + + public List oberTarifaOficialComComposicaoDoPedagioVo(Integer empresaId); + + public void atualizarPedagioComFiltroDePracaDePedagio(Integer tarifaOficialId, BigDecimal importePedagio, String composicaoPedagio ); + + public void removerDuplicidadeNaTarifaOficial(); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaTipoptovtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaTipoptovtaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarifaTipoptovtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarifaTipoptovtaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarjetaCreditoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaCreditoDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TarjetaCreditoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaCreditoDAO.java index c83e532df..0d816f686 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TarjetaCreditoDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaCreditoDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; - -public interface TarjetaCreditoDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; + +public interface TarjetaCreditoDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TarjetaFidelidadDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaFidelidadDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarjetaFidelidadDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaFidelidadDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarjetaRecaudacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaRecaudacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TarjetaRecaudacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaRecaudacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TarjetaViajeDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaViajeDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TarjetaViajeDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaViajeDAO.java index d975626e0..b2b7852a6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TarjetaViajeDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TarjetaViajeDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.Date; -import java.util.List; - -import org.zkoss.zul.Comboitem; - -import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; - -public interface TarjetaViajeDAO extends GenericDAO { - - public List buscarTarjetaPorFiltros(Integer autoIni, Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa); - - public List buscarTarjetasParaEnvioNomina(Date fecIni, Date fecFin); - - public List buscarTarjetaPorFiltros(TarjetaViaje tarjeta); - - public boolean buscarTarjetaExisteVolta(TarjetaViaje t); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.Date; +import java.util.List; + +import org.zkoss.zul.Comboitem; + +import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; + +public interface TarjetaViajeDAO extends GenericDAO { + + public List buscarTarjetaPorFiltros(Integer autoIni, Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa); + + public List buscarTarjetasParaEnvioNomina(Date fecIni, Date fecFin); + + public List buscarTarjetaPorFiltros(TarjetaViaje tarjeta); + + public boolean buscarTarjetaExisteVolta(TarjetaViaje t); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TaxaEmbLevanteCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbLevanteCtrlDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/TaxaEmbLevanteCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbLevanteCtrlDAO.java index c53615bfd..951da4372 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TaxaEmbLevanteCtrlDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbLevanteCtrlDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; - -public interface TaxaEmbLevanteCtrlDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; + +public interface TaxaEmbLevanteCtrlDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueKmDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueKmDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueKmDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueKmDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueParadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueParadaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueParadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TaxaEmbarqueParadaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoCambioCiudadDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCambioCiudadDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoCambioCiudadDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCambioCiudadDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoCambioCtrlDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCambioCtrlDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoCambioCtrlDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCambioCtrlDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoConvenioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoConvenioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoConvenioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoConvenioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoCorteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCorteDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoCorteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCorteDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDescuentoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDescuentoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDescuentoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoCortesiaDescuentoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoDocAutobusDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoDocAutobusDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TipoDocAutobusDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoDocAutobusDAO.java index 6250e7bd2..7343bf03b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoDocAutobusDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoDocAutobusDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; - -public interface TipoDocAutobusDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; + +public interface TipoDocAutobusDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoDomicilioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoDomicilioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoDomicilioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoDomicilioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoEmpleadoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEmpleadoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoEmpleadoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEmpleadoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraDAO.java index be8ea9319..6240d24d4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -public interface TipoEventoExtraDAO extends - GenericDAO { - - public List buscar(String descingreso); - - public List buscarLike(String descingreso); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +public interface TipoEventoExtraDAO extends + GenericDAO { + + public List buscar(String descingreso); + + public List buscarLike(String descingreso); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraEmpresaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraEmpresaDAO.java index d72b58f2e..605aa2bf3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraEmpresaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraEmpresaDAO.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; - -public interface TipoEventoExtraEmpresaDAO extends GenericDAO { - public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; + +public interface TipoEventoExtraEmpresaDAO extends GenericDAO { + public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraFormaPagoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraFormaPagoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraFormaPagoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraFormaPagoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraPtovtaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraPtovtaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraPtovtaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraPtovtaDAO.java index 4e0d83542..2c0d495bc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraPtovtaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoEventoExtraPtovtaDAO.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; - -public interface TipoEventoExtraPtovtaDAO extends GenericDAO { -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; + +public interface TipoEventoExtraPtovtaDAO extends GenericDAO { +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoIdentificacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoIdentificacionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TipoIdentificacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoIdentificacionDAO.java index 62791c967..a72496310 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoIdentificacionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoIdentificacionDAO.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; - -public interface TipoIdentificacionDAO extends GenericDAO { - - public List obtenerTodos(); - - public TipoIdentificacion buscarPorNome(String descTipoDoc); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; + +public interface TipoIdentificacionDAO extends GenericDAO { + + public List obtenerTodos(); + + public TipoIdentificacion buscarPorNome(String descTipoDoc); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoInformativoComissaoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoInformativoComissaoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoInformativoComissaoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoInformativoComissaoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoMovimentacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoMovimentacionDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TipoMovimentacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoMovimentacionDAO.java index 710a3d47a..9ee0416fb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoMovimentacionDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoMovimentacionDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; - -public interface TipoMovimentacionDAO extends GenericDAO { - - public TipoMovimentacion buscarTipoMovimentacio(int tipoMovimentacion); - public List obtenerTiposMovimetacionPuntoVenta(); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; + +public interface TipoMovimentacionDAO extends GenericDAO { + + public TipoMovimentacion buscarTipoMovimentacio(int tipoMovimentacion); + public List obtenerTiposMovimetacionPuntoVenta(); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoMovimientoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoMovimientoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoMovimientoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoMovimientoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoOcupacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoOcupacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoOcupacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoOcupacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoParadaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoParadaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoParadaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoParadaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoPuntoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoPuntoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoPuntoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoPuntoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoTarifaPacoteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoTarifaPacoteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/TipoTarifaPacoteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoTarifaPacoteDAO.java index b2918fed2..864b8c249 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoTarifaPacoteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoTarifaPacoteDAO.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -public interface TipoTarifaPacoteDAO extends GenericDAO { - - public List buscaTipoTarifaPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +public interface TipoTarifaPacoteDAO extends GenericDAO { + + public List buscaTipoTarifaPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TramoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TramoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TramoKmServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoKmServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TramoKmServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoKmServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TramoServicioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoServicioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TramoServicioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoServicioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TramoTiempoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoTiempoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TramoTiempoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TramoTiempoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TransportadoraDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TransportadoraDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TransportadoraDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TransportadoraDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TrayectosExpresosDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TrayectosExpresosDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TrayectosExpresosDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TrayectosExpresosDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/TurnoDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/TurnoDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/TurnoDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/TurnoDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/UsuarioBancarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioBancarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/UsuarioBancarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioBancarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/UsuarioDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/UsuarioDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/UsuarioEmpresaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioEmpresaDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/UsuarioEmpresaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioEmpresaDAO.java index 13fba99a3..7bd3d7816 100644 --- a/src/com/rjconsultores/ventaboletos/dao/UsuarioEmpresaDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioEmpresaDAO.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.dao; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; - -public interface UsuarioEmpresaDAO extends GenericDAO { - - public List obtenerPorUsuario(Usuario usuario); - public List obtenerEmpresa(Usuario usuario) ; - public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario); -} +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; + +public interface UsuarioEmpresaDAO extends GenericDAO { + + public List obtenerPorUsuario(Usuario usuario); + public List obtenerEmpresa(Usuario usuario) ; + public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/UsuarioPerfilDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioPerfilDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/UsuarioPerfilDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioPerfilDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/UsuarioSesionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioSesionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/UsuarioSesionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioSesionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/UsuarioUbicacionDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioUbicacionDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/UsuarioUbicacionDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/UsuarioUbicacionDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/VendaPacoteDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/VendaPacoteDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/VendaPacoteDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/VendaPacoteDAO.java index a2517f29c..498e14285 100644 --- a/src/com/rjconsultores/ventaboletos/dao/VendaPacoteDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/VendaPacoteDAO.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.dao; - -import com.rjconsultores.ventaboletos.entidad.VendaPacote; - -public interface VendaPacoteDAO extends GenericDAO { - -} +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.VendaPacote; + +public interface VendaPacoteDAO extends GenericDAO { + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/ViaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/ViaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/ViaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/ViaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/VigenciaTarifaDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/VigenciaTarifaDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/VigenciaTarifaDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/VigenciaTarifaDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/VoucherDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/VoucherDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/VoucherDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/VoucherDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java index 7558c30e7..b8b95be3c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AbastoBoletoDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -@Repository("abastoBoletoDAO") -public class AbastoBoletoHibernateDAO extends GenericHibernateDAO - implements AbastoBoletoDAO { - - @Autowired - public AbastoBoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscaAbastoBoletoPorPuntoVenta(PuntoVenta puntoVenta) { - - List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq(ACTIVO, Boolean.TRUE)); - return abastos; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AbastoBoletoDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +@Repository("abastoBoletoDAO") +public class AbastoBoletoHibernateDAO extends GenericHibernateDAO + implements AbastoBoletoDAO { + + @Autowired + public AbastoBoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscaAbastoBoletoPorPuntoVenta(PuntoVenta puntoVenta) { + + List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq(ACTIVO, Boolean.TRUE)); + return abastos; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java index 509f9a237..a2375bebe 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java @@ -1,216 +1,216 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Property; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.ControleEstoqueMigracao; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -@Repository("abastoCentralDAO") -public class AbastoCentralHibernateDAO extends GenericHibernateDAO implements AbastoCentralDAO { - - @Autowired - public AbastoCentralHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - - public List obtenerBilhetes(Aidf aidf, PuntoVenta origem) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("aidf", aidf)); - c.add(Restrictions.eq("puntoventa", origem)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - - public List obtenerBilhetes(Aidf aidf, String formInicial, String formFinal, PuntoVenta origem) { - - String queryStr = "from AbastoCentral act where act.aidf = :aidf and act.puntoventa = :puntoventa and act.activo = true and act.numfoliopreimpreso between :folioinicial and :foliofinal"; - - Query query = getSession().createQuery(queryStr); - - query.setLong("aidf", aidf.getAidfId()); - query.setInteger("puntoventa", origem.getPuntoventaId()); - query.setLong("folioinicial", Long.valueOf(formInicial)); - query.setLong("foliofinal", Long.valueOf(formFinal)); - - return (List)query.list(); - } - - @Transactional - public void actualizaBilhetes(List bilhetes, PuntoVenta destino) { - - Session session = getSessionFactory().getCurrentSession(); - - int count = 0; - - for(AbastoCentral bilhete : bilhetes){ - bilhete.setPuntoventa(destino); - session.update(bilhete); - - if(++count % 20 == 0){ - session.flush(); - session.clear(); - } - } - - session.flush(); - session.clear(); - } - - @Transactional(readOnly=true) - public void suscribirBilhetes(List bilhetes) { - Session session = getSessionFactory().getCurrentSession(); - - int count = 0; - - for(AbastoCentral bilhete : bilhetes){ - - session.save(bilhete); - - if(++count % 50 == 0){ - session.flush(); - session.clear(); - } - } - - session.flush(); - session.clear(); - } - - public List buscaBilhetesPorAidf(Aidf aidf) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("aidf", aidf)); - - return (List)c.list(); - } - - public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("puntoventa", puntoVentaBilhetes)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - public List obtenerBilhetesPorPuntoVenta(String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes) { - - String queryStr = "from AbastoCentral act where act.puntoventa = :puntoventa and act.activo = true and act.numfoliopreimpreso between :folioinicial and :foliofinal"; - - Query query = getSession().createQuery(queryStr); - - query.setInteger("puntoventa", puntoVentaBilhetes.getPuntoventaId()); - query.setLong("folioinicial", Long.valueOf(formInicial)); - query.setLong("foliofinal", Long.valueOf(formFinal)); - - return (List)query.list(); - } - - public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes, Estacion origem) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("puntoventa", puntoVentaBilhetes)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("estacion", origem)); - c.addOrder(Order.asc("numfoliopreimpreso")); - - return (List)c.list(); - } - - public List obtenerBilhetesPorPuntoVenta(String numSerie, String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes, Estacion origem) { - - String queryStr = "from AbastoCentral act where act.puntoventa = :puntoventa and act.numseriepreimpresa = :numseriepreimpresa and act.activo = true and act.numfoliopreimpreso between :folioinicial and :foliofinal"; - - if(origem != null) - queryStr += " and act.estacion = :estacion"; - - Query query = getSession().createQuery(queryStr); - - query.setInteger("puntoventa", puntoVentaBilhetes.getPuntoventaId()); - query.setString("numseriepreimpresa", numSerie); - query.setLong("folioinicial", Long.valueOf(formInicial)); - query.setLong("foliofinal", Long.valueOf(formFinal)); - - if(origem != null) - query.setInteger("estacion", origem.getEstacionId()); - - return (List)query.list(); - } - - @Transactional - public void actualizaBilhetes(List bilhetes, Estacion destino) { - - Session session = getSessionFactory().getCurrentSession(); - - int count = 0; - - for(AbastoCentral bilhete : bilhetes){ - bilhete.setEstacion(destino); - session.update(bilhete); - - if(++count % 20 == 0){ - session.flush(); - session.clear(); - } - } - - session.flush(); - session.clear(); - } - - @Override - public void gravaControleEstoqueMigracao(PuntoVenta puntoVenta, Date fecmodif, Integer usuarioId) { - Session session = getSessionFactory().getCurrentSession(); - ControleEstoqueMigracao ctrlMigracao = new ControleEstoqueMigracao(puntoVenta, fecmodif, usuarioId); - session.save(ctrlMigracao); - session.flush(); - session.clear(); - } - - @Override - public List buscarSeriesBilhetesPorEstacion(Estacion estacion) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.setProjection(Projections.distinct(Property.forName("numseriepreimpresa"))); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("estacion", estacion)); - c.addOrder(Order.asc("numseriepreimpresa")); - - return (List)c.list(); - } - - @Override - public void borrarLosQueTienenAIDF(Aidf aidf){ - String hql = " delete from AbastoCentral where aidf.aidfId = " + aidf.getAidfId(); - Query sq = getSession().createQuery(hql); - sq.executeUpdate(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Property; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.ControleEstoqueMigracao; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +@Repository("abastoCentralDAO") +public class AbastoCentralHibernateDAO extends GenericHibernateDAO implements AbastoCentralDAO { + + @Autowired + public AbastoCentralHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + + public List obtenerBilhetes(Aidf aidf, PuntoVenta origem) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("aidf", aidf)); + c.add(Restrictions.eq("puntoventa", origem)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + + public List obtenerBilhetes(Aidf aidf, String formInicial, String formFinal, PuntoVenta origem) { + + String queryStr = "from AbastoCentral act where act.aidf = :aidf and act.puntoventa = :puntoventa and act.activo = true and act.numfoliopreimpreso between :folioinicial and :foliofinal"; + + Query query = getSession().createQuery(queryStr); + + query.setLong("aidf", aidf.getAidfId()); + query.setInteger("puntoventa", origem.getPuntoventaId()); + query.setLong("folioinicial", Long.valueOf(formInicial)); + query.setLong("foliofinal", Long.valueOf(formFinal)); + + return (List)query.list(); + } + + @Transactional + public void actualizaBilhetes(List bilhetes, PuntoVenta destino) { + + Session session = getSessionFactory().getCurrentSession(); + + int count = 0; + + for(AbastoCentral bilhete : bilhetes){ + bilhete.setPuntoventa(destino); + session.update(bilhete); + + if(++count % 20 == 0){ + session.flush(); + session.clear(); + } + } + + session.flush(); + session.clear(); + } + + @Transactional(readOnly=true) + public void suscribirBilhetes(List bilhetes) { + Session session = getSessionFactory().getCurrentSession(); + + int count = 0; + + for(AbastoCentral bilhete : bilhetes){ + + session.save(bilhete); + + if(++count % 50 == 0){ + session.flush(); + session.clear(); + } + } + + session.flush(); + session.clear(); + } + + public List buscaBilhetesPorAidf(Aidf aidf) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("aidf", aidf)); + + return (List)c.list(); + } + + public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("puntoventa", puntoVentaBilhetes)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + public List obtenerBilhetesPorPuntoVenta(String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes) { + + String queryStr = "from AbastoCentral act where act.puntoventa = :puntoventa and act.activo = true and act.numfoliopreimpreso between :folioinicial and :foliofinal"; + + Query query = getSession().createQuery(queryStr); + + query.setInteger("puntoventa", puntoVentaBilhetes.getPuntoventaId()); + query.setLong("folioinicial", Long.valueOf(formInicial)); + query.setLong("foliofinal", Long.valueOf(formFinal)); + + return (List)query.list(); + } + + public List obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes, Estacion origem) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("puntoventa", puntoVentaBilhetes)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("estacion", origem)); + c.addOrder(Order.asc("numfoliopreimpreso")); + + return (List)c.list(); + } + + public List obtenerBilhetesPorPuntoVenta(String numSerie, String formInicial, String formFinal, PuntoVenta puntoVentaBilhetes, Estacion origem) { + + String queryStr = "from AbastoCentral act where act.puntoventa = :puntoventa and act.numseriepreimpresa = :numseriepreimpresa and act.activo = true and act.numfoliopreimpreso between :folioinicial and :foliofinal"; + + if(origem != null) + queryStr += " and act.estacion = :estacion"; + + Query query = getSession().createQuery(queryStr); + + query.setInteger("puntoventa", puntoVentaBilhetes.getPuntoventaId()); + query.setString("numseriepreimpresa", numSerie); + query.setLong("folioinicial", Long.valueOf(formInicial)); + query.setLong("foliofinal", Long.valueOf(formFinal)); + + if(origem != null) + query.setInteger("estacion", origem.getEstacionId()); + + return (List)query.list(); + } + + @Transactional + public void actualizaBilhetes(List bilhetes, Estacion destino) { + + Session session = getSessionFactory().getCurrentSession(); + + int count = 0; + + for(AbastoCentral bilhete : bilhetes){ + bilhete.setEstacion(destino); + session.update(bilhete); + + if(++count % 20 == 0){ + session.flush(); + session.clear(); + } + } + + session.flush(); + session.clear(); + } + + @Override + public void gravaControleEstoqueMigracao(PuntoVenta puntoVenta, Date fecmodif, Integer usuarioId) { + Session session = getSessionFactory().getCurrentSession(); + ControleEstoqueMigracao ctrlMigracao = new ControleEstoqueMigracao(puntoVenta, fecmodif, usuarioId); + session.save(ctrlMigracao); + session.flush(); + session.clear(); + } + + @Override + public List buscarSeriesBilhetesPorEstacion(Estacion estacion) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.setProjection(Projections.distinct(Property.forName("numseriepreimpresa"))); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("estacion", estacion)); + c.addOrder(Order.asc("numseriepreimpresa")); + + return (List)c.list(); + } + + @Override + public void borrarLosQueTienenAIDF(Aidf aidf){ + String hql = " delete from AbastoCentral where aidf.aidfId = " + aidf.getAidfId(); + Query sq = getSession().createQuery(hql); + sq.executeUpdate(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoHistoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoHistoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoHistoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoHistoHibernateDAO.java index a151317ce..17787c579 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoHistoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoHistoHibernateDAO.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.AbastoHisto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Repository("abastoHistoDAO") -public class AbastoHistoHibernateDAO extends GenericHibernateDAO implements AbastoHistoDAO { - - @Autowired - public AbastoHistoHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - @Override - public void borrarLosQueTienenAIDF(Aidf aidf){ - String hql = " delete from AbastoHisto where aidf.aidfId = " + aidf.getAidfId(); - Query sq = getSession().createQuery(hql); - sq.executeUpdate(); - } - - public void grabaHistoricoBilhetes(List bilhetes, TipoMovimentacion tipoMovimentacion) { - Session session = getSessionFactory().getCurrentSession(); - - int count = 0; - - for(AbastoCentral bilhete : bilhetes){ - - Date dataActual = Calendar.getInstance().getTime(); - AbastoHisto nuevoHistorico = new AbastoHisto(bilhete, tipoMovimentacion, dataActual, true, dataActual, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - session.save(nuevoHistorico); - - if(++count % 20 == 0){ - session.flush(); - session.clear(); - } - } - - session.flush(); - session.clear(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.AbastoHisto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Repository("abastoHistoDAO") +public class AbastoHistoHibernateDAO extends GenericHibernateDAO implements AbastoHistoDAO { + + @Autowired + public AbastoHistoHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + @Override + public void borrarLosQueTienenAIDF(Aidf aidf){ + String hql = " delete from AbastoHisto where aidf.aidfId = " + aidf.getAidfId(); + Query sq = getSession().createQuery(hql); + sq.executeUpdate(); + } + + public void grabaHistoricoBilhetes(List bilhetes, TipoMovimentacion tipoMovimentacion) { + Session session = getSessionFactory().getCurrentSession(); + + int count = 0; + + for(AbastoCentral bilhete : bilhetes){ + + Date dataActual = Calendar.getInstance().getTime(); + AbastoHisto nuevoHistorico = new AbastoHisto(bilhete, tipoMovimentacion, dataActual, true, dataActual, UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + session.save(nuevoHistorico); + + if(++count % 20 == 0){ + session.flush(); + session.clear(); + } + } + + session.flush(); + session.clear(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java index aaa1fb995..914a04646 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AgruparParadaDAO; -import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; - -@Repository("agruparParadaDAO") -public class AgruparParadaHibernateDAO extends GenericHibernateDAO implements AgruparParadaDAO { - - @Autowired - public AgruparParadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descAgrupamentoParada")); - return c.list(); - } - - @Override - public List buscar(String descparada) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("descAgrupamentoParada", descparada)); - return c.list(); - } - - @Override - public List buscarCVE(String cveAgrupamentoParada) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("cveAgrupamentoParada", cveAgrupamentoParada)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AgruparParadaDAO; +import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; + +@Repository("agruparParadaDAO") +public class AgruparParadaHibernateDAO extends GenericHibernateDAO implements AgruparParadaDAO { + + @Autowired + public AgruparParadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descAgrupamentoParada")); + return c.list(); + } + + @Override + public List buscar(String descparada) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("descAgrupamentoParada", descparada)); + return c.list(); + } + + @Override + public List buscarCVE(String cveAgrupamentoParada) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("cveAgrupamentoParada", cveAgrupamentoParada)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java index 8816b9ff8..179d51923 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AidfEspecieDAO; -import com.rjconsultores.ventaboletos.entidad.AidfEspecie; - -@Repository("aidfEspecieDAO") -public class AidfEspecieHibernateDAO extends GenericHibernateDAO implements AidfEspecieDAO{ - - @Autowired - public AidfEspecieHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AidfEspecieDAO; +import com.rjconsultores.ventaboletos.entidad.AidfEspecie; + +@Repository("aidfEspecieDAO") +public class AidfEspecieHibernateDAO extends GenericHibernateDAO implements AidfEspecieDAO{ + + @Autowired + public AidfEspecieHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java index 96f4c41b4..66c931360 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java @@ -1,248 +1,248 @@ - package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AidfDAO; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; - -@Repository("aidfDAO") -public class AidfHibernateDAO extends GenericHibernateDAO implements AidfDAO { - - private static final Logger log = LogManager.getLogger(AidfHibernateDAO.class); - - @Autowired - public AidfHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List) c.list(); - } - - @Override - public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn,Integer empresaId) { - - PreparedStatement pstmt = null; - ResultSet rs = null; - - StringBuilder sb = new StringBuilder(); - sb.append(" select x.AIDF_ID, "); - sb.append(" x.ESTADO_ID, "); - sb.append(" REGEXP_REPLACE( x.docfiscal ,'[^[:alnum:]'' '']', NULL) , "); - sb.append(" x.ACFISCAL, "); - sb.append(" x.SERIE, "); - sb.append(" x.FORMINICIAL, "); - sb.append(" x.FORMFINAL, "); - sb.append(" x.FECADQUISICION, "); - sb.append(" x.FECVENCIMIENTO, "); - sb.append(" x.INSCESTADUAL, "); - sb.append(" x.EMPRESA_ID, "); - sb.append(" x.AIDFESP_ID, "); - sb.append(" x.AIDFTIPO_ID, "); - sb.append(" x.ACTIVO, "); - sb.append(" x.FECMODIF, "); - sb.append(" x.USUARIO_ID, "); - sb.append(" x.SUBSERIE, "); - sb.append(" x.CNPJ, "); - sb.append(" x.TIPOVALIDAVENTA "); - sb.append(" from AIDF x where x.SERIE = '" + serie + "' "); - - if( subSerie !=null && !subSerie.equals("") ) { - sb.append(" AND x.SUBSERIE = '" + subSerie + "' "); - } - - if( docfiscal != null ) { - sb.append(" and REGEXP_REPLACE( x.docfiscal ,'[^[:alnum:]'' '']', NULL) like '" + docfiscal + "' "); - } - if (empresaId != null){ - sb.append(" and x.EMPRESA_ID = ").append(empresaId); - } - sb.append(" and x.activo = 1 "); - - List ls = new ArrayList(); - - try { - pstmt = conn.prepareStatement(sb.toString()); - - rs = pstmt.executeQuery(); - while (rs.next()) { - AidfVo a = new AidfVo(); - a.setAidfId(rs.getLong(1)); - a.setDocfiscal(rs.getString(3)); - a.setSerie(rs.getString(5)); - a.setSubserie(rs.getString(17)!=null?rs.getString(17):""); - a.setForminicial(rs.getString(6)); - a.setFormfinal(rs.getString(7)); - ls.add(a); - } - } catch (Exception e) { - log.error("", e); - } finally { - try { - rs.close(); - } catch (Exception ignore) { - log.error("", ignore); - } - try { - pstmt.close(); - } catch (Exception ignore) { - log.error("", ignore); - } - try { - conn.close(); - } catch (Exception ignore) { - log.error("", ignore); - } - - } - - return ls; - }; - - @Override - public List buscaAidfsPorEmpresas(List empresas) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.in("empresa", empresas)); - - return (List) c.list(); - } - - @Override - public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq("puntoVenta", pontoVenda)); - - return (List) c.list(); - } - - public Boolean existeAidfComCodFiscalEEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("estado", estado)); - c.add(Restrictions.eq("docfiscal", docFiscal)); - - if (idAidf != null) { - c.add(Restrictions.ne("aidfId", idAidf)); - } - - if (especieId != null) { - c.add(Restrictions.eq("aidfEspecie.aidfespId", especieId)); - } - - return c.list().isEmpty(); - } - - @Override - public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId, Boolean isRMD) { - - StringBuilder sb = new StringBuilder(); - sb.append(" from Aidf "); - sb.append(" where activo = :activo "); - sb.append(" and estado.estadoId = :estadoId "); - sb.append(" and empresa.empresaId = :empresaId "); - if(isRMD){ - sb.append(" and aidfEspecie.decespecie = 'RMD' "); - } - - Query query = getSession().createQuery(sb.toString()); - - query.setBoolean("activo", Boolean.TRUE); - query.setInteger("estadoId", estadoId); - query.setInteger("empresaId", empresaId); - - return (List) query.list(); - } - - public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId) { - StringBuilder sb = new StringBuilder(); - sb.append(" select max(to_number(folio)) as ultimo "); - sb.append(" from folio_consumo_rmd "); - sb.append(" where activo = 1 "); - sb.append(" and (indimpresso = 1 or indcancelacion = 1) "); - sb.append(" and rmd_id = :rmdId "); - sb.append(" and empresa_id = :empresaId "); - sb.append(" and estado_id = :estadoId "); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setLong("rmdId", idAidf); - query.setInteger("empresaId", empresaId); - query.setInteger("estadoId", estadoId); - - Object resp = query.uniqueResult(); - - Integer aux = resp == null ? null : Integer.parseInt(resp.toString()); - if (aux != null) - aux++; - return aux == null ? null : aux.toString(); - } - - @Override - public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio) { - StringBuilder sb = new StringBuilder(); - sb.append(" select max(to_number(folio)) as ultimo "); - sb.append(" from folio_consumo_rmd "); - sb.append(" where activo = 1 "); - sb.append(" and (indimpresso = 1 or indcancelacion = 1) "); - sb.append(" and rmd_id = :rmdId "); - sb.append(" and empresa_id = :empresaId "); - sb.append(" and estado_id = :estadoId "); - sb.append(" and folio = :folio "); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setLong("rmdId", idAidf); - query.setInteger("empresaId", empresaId); - query.setInteger("estadoId", estadoId); - query.setString("folio", folio); - - Object resp = query.uniqueResult(); - return resp == null ? true : false; - } - - @Override - public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal, Estado estado, PuntoVenta puntoVenta) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("estado", estado)); - c.add(Restrictions.eq("puntoVenta", puntoVenta)); - c.add(Restrictions.eq("docfiscal", docFiscal)); - c.add(Restrictions.eq("forminicial", formInicial)); - c.add(Restrictions.eq("formfinal", formFinal)); - - if (idAidf != null) { - c.add(Restrictions.ne("aidfId", idAidf)); - } - - if (especieId != null) { - c.add(Restrictions.eq("aidfEspecie.aidfespId", especieId)); - } - return c.list().isEmpty(); - } - -} + package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AidfDAO; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; + +@Repository("aidfDAO") +public class AidfHibernateDAO extends GenericHibernateDAO implements AidfDAO { + + private static final Logger log = LogManager.getLogger(AidfHibernateDAO.class); + + @Autowired + public AidfHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List) c.list(); + } + + @Override + public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn,Integer empresaId) { + + PreparedStatement pstmt = null; + ResultSet rs = null; + + StringBuilder sb = new StringBuilder(); + sb.append(" select x.AIDF_ID, "); + sb.append(" x.ESTADO_ID, "); + sb.append(" REGEXP_REPLACE( x.docfiscal ,'[^[:alnum:]'' '']', NULL) , "); + sb.append(" x.ACFISCAL, "); + sb.append(" x.SERIE, "); + sb.append(" x.FORMINICIAL, "); + sb.append(" x.FORMFINAL, "); + sb.append(" x.FECADQUISICION, "); + sb.append(" x.FECVENCIMIENTO, "); + sb.append(" x.INSCESTADUAL, "); + sb.append(" x.EMPRESA_ID, "); + sb.append(" x.AIDFESP_ID, "); + sb.append(" x.AIDFTIPO_ID, "); + sb.append(" x.ACTIVO, "); + sb.append(" x.FECMODIF, "); + sb.append(" x.USUARIO_ID, "); + sb.append(" x.SUBSERIE, "); + sb.append(" x.CNPJ, "); + sb.append(" x.TIPOVALIDAVENTA "); + sb.append(" from AIDF x where x.SERIE = '" + serie + "' "); + + if( subSerie !=null && !subSerie.equals("") ) { + sb.append(" AND x.SUBSERIE = '" + subSerie + "' "); + } + + if( docfiscal != null ) { + sb.append(" and REGEXP_REPLACE( x.docfiscal ,'[^[:alnum:]'' '']', NULL) like '" + docfiscal + "' "); + } + if (empresaId != null){ + sb.append(" and x.EMPRESA_ID = ").append(empresaId); + } + sb.append(" and x.activo = 1 "); + + List ls = new ArrayList(); + + try { + pstmt = conn.prepareStatement(sb.toString()); + + rs = pstmt.executeQuery(); + while (rs.next()) { + AidfVo a = new AidfVo(); + a.setAidfId(rs.getLong(1)); + a.setDocfiscal(rs.getString(3)); + a.setSerie(rs.getString(5)); + a.setSubserie(rs.getString(17)!=null?rs.getString(17):""); + a.setForminicial(rs.getString(6)); + a.setFormfinal(rs.getString(7)); + ls.add(a); + } + } catch (Exception e) { + log.error("", e); + } finally { + try { + rs.close(); + } catch (Exception ignore) { + log.error("", ignore); + } + try { + pstmt.close(); + } catch (Exception ignore) { + log.error("", ignore); + } + try { + conn.close(); + } catch (Exception ignore) { + log.error("", ignore); + } + + } + + return ls; + }; + + @Override + public List buscaAidfsPorEmpresas(List empresas) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.in("empresa", empresas)); + + return (List) c.list(); + } + + @Override + public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + c.add(Restrictions.eq("puntoVenta", pontoVenda)); + + return (List) c.list(); + } + + public Boolean existeAidfComCodFiscalEEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("estado", estado)); + c.add(Restrictions.eq("docfiscal", docFiscal)); + + if (idAidf != null) { + c.add(Restrictions.ne("aidfId", idAidf)); + } + + if (especieId != null) { + c.add(Restrictions.eq("aidfEspecie.aidfespId", especieId)); + } + + return c.list().isEmpty(); + } + + @Override + public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId, Boolean isRMD) { + + StringBuilder sb = new StringBuilder(); + sb.append(" from Aidf "); + sb.append(" where activo = :activo "); + sb.append(" and estado.estadoId = :estadoId "); + sb.append(" and empresa.empresaId = :empresaId "); + if(isRMD){ + sb.append(" and aidfEspecie.decespecie = 'RMD' "); + } + + Query query = getSession().createQuery(sb.toString()); + + query.setBoolean("activo", Boolean.TRUE); + query.setInteger("estadoId", estadoId); + query.setInteger("empresaId", empresaId); + + return (List) query.list(); + } + + public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId) { + StringBuilder sb = new StringBuilder(); + sb.append(" select max(to_number(folio)) as ultimo "); + sb.append(" from folio_consumo_rmd "); + sb.append(" where activo = 1 "); + sb.append(" and (indimpresso = 1 or indcancelacion = 1) "); + sb.append(" and rmd_id = :rmdId "); + sb.append(" and empresa_id = :empresaId "); + sb.append(" and estado_id = :estadoId "); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setLong("rmdId", idAidf); + query.setInteger("empresaId", empresaId); + query.setInteger("estadoId", estadoId); + + Object resp = query.uniqueResult(); + + Integer aux = resp == null ? null : Integer.parseInt(resp.toString()); + if (aux != null) + aux++; + return aux == null ? null : aux.toString(); + } + + @Override + public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio) { + StringBuilder sb = new StringBuilder(); + sb.append(" select max(to_number(folio)) as ultimo "); + sb.append(" from folio_consumo_rmd "); + sb.append(" where activo = 1 "); + sb.append(" and (indimpresso = 1 or indcancelacion = 1) "); + sb.append(" and rmd_id = :rmdId "); + sb.append(" and empresa_id = :empresaId "); + sb.append(" and estado_id = :estadoId "); + sb.append(" and folio = :folio "); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setLong("rmdId", idAidf); + query.setInteger("empresaId", empresaId); + query.setInteger("estadoId", estadoId); + query.setString("folio", folio); + + Object resp = query.uniqueResult(); + return resp == null ? true : false; + } + + @Override + public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal, Estado estado, PuntoVenta puntoVenta) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("estado", estado)); + c.add(Restrictions.eq("puntoVenta", puntoVenta)); + c.add(Restrictions.eq("docfiscal", docFiscal)); + c.add(Restrictions.eq("forminicial", formInicial)); + c.add(Restrictions.eq("formfinal", formFinal)); + + if (idAidf != null) { + c.add(Restrictions.ne("aidfId", idAidf)); + } + + if (especieId != null) { + c.add(Restrictions.eq("aidfEspecie.aidfespId", especieId)); + } + return c.list().isEmpty(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java index 7d6891af3..26340475a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AidfTipoDAO; -import com.rjconsultores.ventaboletos.entidad.AidfTipo; - -@Repository("aidfTipoDAO") -public class AidfTipoHibernateDAO extends GenericHibernateDAO implements AidfTipoDAO { - - @Autowired - public AidfTipoHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AidfTipoDAO; +import com.rjconsultores.ventaboletos.entidad.AidfTipo; + +@Repository("aidfTipoDAO") +public class AidfTipoHibernateDAO extends GenericHibernateDAO implements AidfTipoDAO { + + @Autowired + public AidfTipoHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java index 5cd70fa1b..a16db2f95 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AjusteEventoExtraDAO; -import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; - -@Repository("ajusteEventoExtraDAO") -public class AjusteEventoExtraHibernateDAO extends - GenericHibernateDAO implements - AjusteEventoExtraDAO { - - @Autowired - public AjusteEventoExtraHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AjusteEventoExtraDAO; +import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; + +@Repository("ajusteEventoExtraDAO") +public class AjusteEventoExtraHibernateDAO extends + GenericHibernateDAO implements + AjusteEventoExtraDAO { + + @Autowired + public AjusteEventoExtraHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java index 91a190ff6..2146ad89d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java @@ -1,142 +1,142 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AliasServicoDAO; -import com.rjconsultores.ventaboletos.entidad.AliasServico; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; - -@Repository("aliasServicoDAO") -@SuppressWarnings("unchecked") -public class AliasServicoHibernateDAO extends GenericHibernateDAO - implements AliasServicoDAO { - - @Autowired - public AliasServicoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarAliasSemCorrida(Integer origenId, Integer destinoId, Integer rutaId) { - - Criteria c = makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("origen.paradaId",origenId)); - c.add(Restrictions.eq("destino.paradaId",destinoId)); - c.add(Restrictions.eq("ruta.rutaId",rutaId)); - c.add(Restrictions.isNull("corridaId")); - - return c.list(); - } - - @Override - public List buscar(Integer origenId, Integer destinoId, Integer rutaId, Integer corridaId) { - Criteria c = makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("origen.paradaId",origenId)); - c.add(Restrictions.eq("destino.paradaId",destinoId)); - c.add(Restrictions.eq("ruta.rutaId",rutaId)); - c.add(Restrictions.eq("corridaId",corridaId)); - - return c.list(); - } - - @Override - public List buscarPorRuta(Integer rutaId) { - - StringBuilder hql = new StringBuilder(); - hql.append("SELECT DISTINCT alias "); - hql.append("FROM AliasServico alias "); - hql.append(" WHERE alias.activo = 1 "); - hql.append(" AND alias.ruta.rutaId = :rutaId" ); - - Query query = getSession().createQuery(hql.toString()); - query.setInteger("rutaId", rutaId); - - return query.list(); - } - - @Override - public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo) { - - StringBuilder hql = new StringBuilder(); - hql.append("SELECT DISTINCT alias "); - hql.append("FROM AliasServico alias "); - hql.append("INNER JOIN alias.ruta.lsRutaEmpresa as re "); - hql.append(" WHERE alias.activo = 1 "); - - if (!linhas.isEmpty()) { - hql.append(" AND alias.ruta.rutaId IN ("); - for (Ruta r : linhas) { - hql.append(r.getRutaId() + ","); - } - hql.deleteCharAt(hql.length() - 1); - hql.append(")"); - } - - if (!empresas.isEmpty()) { - hql.append(" AND re.empresa.empresaId IN ("); - for (Empresa e : empresas) { - hql.append(e.getEmpresaId() + ","); - } - hql.deleteCharAt(hql.length() - 1); - hql.append(")"); - } - - if(!tiposClasses.isEmpty()){ - hql.append(" AND alias.ruta.claseServicio.claseservicioId IN ("); - for (ClaseServicio c : tiposClasses) { - hql.append(c.getClaseservicioId() + ","); - } - hql.deleteCharAt(hql.length() - 1); - hql.append(")"); - } - - if(!orgaos.isEmpty()){ - hql.append(" AND alias.ruta.orgaoConcedente.orgaoConcedenteId IN ("); - for (OrgaoConcedente o : orgaos) { - hql.append(o.getOrgaoConcedenteId() + ","); - } - hql.deleteCharAt(hql.length() - 1); - hql.append(")"); - } - - if(prefixo != null && !prefixo.isEmpty()){ - hql.append(" AND alias.ruta.prefixo = '" + prefixo +"'" ); - } - - Query query = getSession().createQuery(hql.toString()); - - return query.list(); - } - - @Override - public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida) { - Criteria c = makeCriteria(); - - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("origen.paradaId", origem.getParadaId())); - c.add(Restrictions.eq("destino.paradaId", destino.getParadaId())); - c.add(Restrictions.eq("ruta.rutaId", linha.getRutaId())); - if (idCorrida != null) { - c.add(Restrictions.eq("corridaId", idCorrida)); - } else { - c.add(Restrictions.isNull("corridaId")); - } - return (AliasServico) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AliasServicoDAO; +import com.rjconsultores.ventaboletos.entidad.AliasServico; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; + +@Repository("aliasServicoDAO") +@SuppressWarnings("unchecked") +public class AliasServicoHibernateDAO extends GenericHibernateDAO + implements AliasServicoDAO { + + @Autowired + public AliasServicoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarAliasSemCorrida(Integer origenId, Integer destinoId, Integer rutaId) { + + Criteria c = makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("origen.paradaId",origenId)); + c.add(Restrictions.eq("destino.paradaId",destinoId)); + c.add(Restrictions.eq("ruta.rutaId",rutaId)); + c.add(Restrictions.isNull("corridaId")); + + return c.list(); + } + + @Override + public List buscar(Integer origenId, Integer destinoId, Integer rutaId, Integer corridaId) { + Criteria c = makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("origen.paradaId",origenId)); + c.add(Restrictions.eq("destino.paradaId",destinoId)); + c.add(Restrictions.eq("ruta.rutaId",rutaId)); + c.add(Restrictions.eq("corridaId",corridaId)); + + return c.list(); + } + + @Override + public List buscarPorRuta(Integer rutaId) { + + StringBuilder hql = new StringBuilder(); + hql.append("SELECT DISTINCT alias "); + hql.append("FROM AliasServico alias "); + hql.append(" WHERE alias.activo = 1 "); + hql.append(" AND alias.ruta.rutaId = :rutaId" ); + + Query query = getSession().createQuery(hql.toString()); + query.setInteger("rutaId", rutaId); + + return query.list(); + } + + @Override + public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo) { + + StringBuilder hql = new StringBuilder(); + hql.append("SELECT DISTINCT alias "); + hql.append("FROM AliasServico alias "); + hql.append("INNER JOIN alias.ruta.lsRutaEmpresa as re "); + hql.append(" WHERE alias.activo = 1 "); + + if (!linhas.isEmpty()) { + hql.append(" AND alias.ruta.rutaId IN ("); + for (Ruta r : linhas) { + hql.append(r.getRutaId() + ","); + } + hql.deleteCharAt(hql.length() - 1); + hql.append(")"); + } + + if (!empresas.isEmpty()) { + hql.append(" AND re.empresa.empresaId IN ("); + for (Empresa e : empresas) { + hql.append(e.getEmpresaId() + ","); + } + hql.deleteCharAt(hql.length() - 1); + hql.append(")"); + } + + if(!tiposClasses.isEmpty()){ + hql.append(" AND alias.ruta.claseServicio.claseservicioId IN ("); + for (ClaseServicio c : tiposClasses) { + hql.append(c.getClaseservicioId() + ","); + } + hql.deleteCharAt(hql.length() - 1); + hql.append(")"); + } + + if(!orgaos.isEmpty()){ + hql.append(" AND alias.ruta.orgaoConcedente.orgaoConcedenteId IN ("); + for (OrgaoConcedente o : orgaos) { + hql.append(o.getOrgaoConcedenteId() + ","); + } + hql.deleteCharAt(hql.length() - 1); + hql.append(")"); + } + + if(prefixo != null && !prefixo.isEmpty()){ + hql.append(" AND alias.ruta.prefixo = '" + prefixo +"'" ); + } + + Query query = getSession().createQuery(hql.toString()); + + return query.list(); + } + + @Override + public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida) { + Criteria c = makeCriteria(); + + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("origen.paradaId", origem.getParadaId())); + c.add(Restrictions.eq("destino.paradaId", destino.getParadaId())); + c.add(Restrictions.eq("ruta.rutaId", linha.getRutaId())); + if (idCorrida != null) { + c.add(Restrictions.eq("corridaId", idCorrida)); + } else { + c.add(Restrictions.isNull("corridaId")); + } + return (AliasServico) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliquotaEstadoDestinoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliquotaEstadoDestinoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AliquotaEstadoDestinoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliquotaEstadoDestinoHibernateDAO.java index ad4076629..feaf1777b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliquotaEstadoDestinoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AliquotaEstadoDestinoHibernateDAO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AliquotaEstadoDestinoDAO; -import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; -import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; - -@Repository("aliquotaEstadoDestinoDAO") -public class AliquotaEstadoDestinoHibernateDAO extends GenericHibernateDAO -implements AliquotaEstadoDestinoDAO{ - - @Autowired - public AliquotaEstadoDestinoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List getChildrens(EmpresaImposto parent){ - - StringBuilder sb = new StringBuilder(); - - sb.append(" select als from AliquotaEstadoDestino als "); - sb.append(" where als.activo = 1 "); - sb.append(" and als.empresaImposto.empresaImpostoId =:empresaImpostoId "); - sb.append(" order by als.aliquotaEstadoDestinoId "); - - Query query = getSession().createQuery(sb.toString()); - query.setParameter("empresaImpostoId", parent.getEmpresaImpostoId()); - - List lsAliquotaEstadoDestino = query.list(); - - return lsAliquotaEstadoDestino; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AliquotaEstadoDestinoDAO; +import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; +import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; + +@Repository("aliquotaEstadoDestinoDAO") +public class AliquotaEstadoDestinoHibernateDAO extends GenericHibernateDAO +implements AliquotaEstadoDestinoDAO{ + + @Autowired + public AliquotaEstadoDestinoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List getChildrens(EmpresaImposto parent){ + + StringBuilder sb = new StringBuilder(); + + sb.append(" select als from AliquotaEstadoDestino als "); + sb.append(" where als.activo = 1 "); + sb.append(" and als.empresaImposto.empresaImpostoId =:empresaImpostoId "); + sb.append(" order by als.aliquotaEstadoDestinoId "); + + Query query = getSession().createQuery(sb.toString()); + query.setParameter("empresaImpostoId", parent.getEmpresaImpostoId()); + + List lsAliquotaEstadoDestino = query.list(); + + return lsAliquotaEstadoDestino; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ArticuloHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ArticuloHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ArticuloHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ArticuloHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java index d36e470eb..8740f05cb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditLogHibernateDAO.java @@ -1,84 +1,84 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AuditLogDAO; -import com.rjconsultores.ventaboletos.entidad.AuditLog; -import com.rjconsultores.ventaboletos.entidad.AuditModule; -import com.rjconsultores.ventaboletos.entidad.AuditService; - -@Repository("auditLogDAO") -public class AuditLogHibernateDAO extends GenericHibernateDAO - implements AuditLogDAO { - - @Autowired - public AuditLogHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List carregarLog(AuditModule modulo) { - - List services = recuperarServices(modulo); - - List ids = new ArrayList(); - - for (AuditService service : services) { - ids.add(service.getAuditServiceId()); - } - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.in("service.auditServiceId", ids)); - - return c.list(); - } - - private List recuperarServices(AuditModule module) { - Criteria c = getSession().createCriteria(AuditService.class); - c.add(Restrictions.eq("module", module)); - - return c.list(); - } - - @Override - public List filtrarLog(AuditLog log) { - Criteria c = getSession().createCriteria(getPersistentClass()); - - if (log.getSistema() != null) { - c.add(Restrictions.eq("sistema", log.getSistema())); - } - - if (log.getAction() != null) { - c.add(Restrictions.eq("action", log.getAction())); - } - - if (log.getEntityDetail() != null) { - c.add(Restrictions.like("entityDetail", log.getEntityDetail(), MatchMode.ANYWHERE)); - } - - if (log.getUsuario() != null) { - c.add(Restrictions.eq("usuario", log.getUsuario())); - } - - if (log.getService() != null && log.getService().getModule() != null) { - c.add(Restrictions.eq("service.module", log.getService().getModule())); - } - - if (log.getDataInicio() != null && log.getDataFim() != null) { - c.add(Restrictions.between("createdDate", log.getDataInicio(), log.getDataFim())); - } - - return c.list(); - } - - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AuditLogDAO; +import com.rjconsultores.ventaboletos.entidad.AuditLog; +import com.rjconsultores.ventaboletos.entidad.AuditModule; +import com.rjconsultores.ventaboletos.entidad.AuditService; + +@Repository("auditLogDAO") +public class AuditLogHibernateDAO extends GenericHibernateDAO + implements AuditLogDAO { + + @Autowired + public AuditLogHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List carregarLog(AuditModule modulo) { + + List services = recuperarServices(modulo); + + List ids = new ArrayList(); + + for (AuditService service : services) { + ids.add(service.getAuditServiceId()); + } + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.in("service.auditServiceId", ids)); + + return c.list(); + } + + private List recuperarServices(AuditModule module) { + Criteria c = getSession().createCriteria(AuditService.class); + c.add(Restrictions.eq("module", module)); + + return c.list(); + } + + @Override + public List filtrarLog(AuditLog log) { + Criteria c = getSession().createCriteria(getPersistentClass()); + + if (log.getSistema() != null) { + c.add(Restrictions.eq("sistema", log.getSistema())); + } + + if (log.getAction() != null) { + c.add(Restrictions.eq("action", log.getAction())); + } + + if (log.getEntityDetail() != null) { + c.add(Restrictions.like("entityDetail", log.getEntityDetail(), MatchMode.ANYWHERE)); + } + + if (log.getUsuario() != null) { + c.add(Restrictions.eq("usuario", log.getUsuario())); + } + + if (log.getService() != null && log.getService().getModule() != null) { + c.add(Restrictions.eq("service.module", log.getService().getModule())); + } + + if (log.getDataInicio() != null && log.getDataFim() != null) { + c.add(Restrictions.between("createdDate", log.getDataInicio(), log.getDataFim())); + } + + return c.list(); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditModuleHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditModuleHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AuditModuleHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditModuleHibernateDAO.java index 969df2441..3b01faf96 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditModuleHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditModuleHibernateDAO.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AuditModuleDAO; -import com.rjconsultores.ventaboletos.entidad.AuditModule; - -@Repository("auditModuleDAO") -public class AuditModuleHibernateDAO extends GenericHibernateDAO - implements AuditModuleDAO { - - @Autowired - public AuditModuleHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - return c.list(); - } +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AuditModuleDAO; +import com.rjconsultores.ventaboletos.entidad.AuditModule; + +@Repository("auditModuleDAO") +public class AuditModuleHibernateDAO extends GenericHibernateDAO + implements AuditModuleDAO { + + @Autowired + public AuditModuleHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + return c.list(); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditServiceHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditServiceHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AuditServiceHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditServiceHibernateDAO.java index 8d3a59c41..0ab9b3a4a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditServiceHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AuditServiceHibernateDAO.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AuditServiceDAO; -import com.rjconsultores.ventaboletos.entidad.AuditService; - -@Repository("auditServiceDAO") -public class AuditServiceHibernateDAO extends GenericHibernateDAO - implements AuditServiceDAO { - - @Autowired - public AuditServiceHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public AuditService carregarService(AuditService auditService) { - AuditService service = null; - - Criteria criteriaService = getSession().createCriteria(AuditService.class); - - if (auditService.getFuncionSistema() != null && auditService.getFuncionSistema().getDescruta() != null) { - criteriaService.add(Restrictions.eq("funcionSistema", auditService.getFuncionSistema().getDescruta())); - service = (AuditService) criteriaService.uniqueResult(); - } - - return service; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AuditServiceDAO; +import com.rjconsultores.ventaboletos.entidad.AuditService; + +@Repository("auditServiceDAO") +public class AuditServiceHibernateDAO extends GenericHibernateDAO + implements AuditServiceDAO { + + @Autowired + public AuditServiceHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public AuditService carregarService(AuditService auditService) { + AuditService service = null; + + Criteria criteriaService = getSession().createCriteria(AuditService.class); + + if (auditService.getFuncionSistema() != null && auditService.getFuncionSistema().getDescruta() != null) { + criteriaService.add(Restrictions.eq("funcionSistema", auditService.getFuncionSistema().getDescruta())); + service = (AuditService) criteriaService.uniqueResult(); + } + + return service; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java index e25de2ee8..ba634a899 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java @@ -1,43 +1,43 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.AutobusDocDAO; -import com.rjconsultores.ventaboletos.entidad.Autobus; -import com.rjconsultores.ventaboletos.entidad.AutobusDoc; - -@Repository("autobusDocDAO") -public class AutobusDocHibernateDAO extends GenericHibernateDAO -implements AutobusDocDAO { - - @Autowired - public AutobusDocHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public List obtenerPorAutobus(Autobus autobus) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("autobus", autobus)); - - return c.list(); - } - - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.AutobusDocDAO; +import com.rjconsultores.ventaboletos.entidad.Autobus; +import com.rjconsultores.ventaboletos.entidad.AutobusDoc; + +@Repository("autobusDocDAO") +public class AutobusDocHibernateDAO extends GenericHibernateDAO +implements AutobusDocDAO { + + @Autowired + public AutobusDocHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public List obtenerPorAutobus(Autobus autobus) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("autobus", autobus)); + + return c.list(); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java index 28e5b1ce7..4a60712b4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java @@ -1,646 +1,646 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.transform.Transformers; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.BooleanType; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.LongType; -import org.hibernate.type.StringType; -import org.hibernate.type.TimestampType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.BusquedaDatosTicketDAO; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; -import com.rjconsultores.ventaboletos.enums.TipoFormapago; -import com.rjconsultores.ventaboletos.utilerias.OcdUtil; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.EnderecoApanheVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ItemAdicionalVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.OcdPacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PagamentoVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PassageiroVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ServicoVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosClientePacoteResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosDadosBancarioResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosEnderecoApanheResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosItemAdicionalResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosPassageiroResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosServicoResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosTicketResultTransformer; -import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; - -@Repository("busquedaDatosTicketDAO") -public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO implements BusquedaDatosTicketDAO { - - private static Logger log = LogManager.getLogger(BusquedaDatosTicketHibernateDAO.class); - - @Autowired - public BusquedaDatosTicketHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscaDatosTickets(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - List pacotes = new ArrayList(); - - try { - pacotes = carregarDadosPacotes(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - if (!pacotes.isEmpty()) { - carregarDadosPagamento(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - carregarDadosServico(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - carregarDadosPassageiros(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - carregarDadosCliente(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - carregarDadosEnderecoApanhe(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - carregarDadosItemPacotes(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - } - - } catch (Exception e) { - log.error(e.getMessage(), e); - pacotes.clear(); - } - - return getPacotesFiltradosReserva(pacotes); - } - - private List getPacotesFiltradosReserva(List pacotes) { - List retorno = new ArrayList(); - for (PacoteVO p : pacotes) { - if (p.getFormaspagamento() != null && !p.getFormaspagamento().isEmpty()) { - retorno.add(p); - } - } - return retorno; - } - - @SuppressWarnings("unchecked") - private List carregarDadosPacotes(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, ") - .append("P.NOMPACOTE, P.DESCPACOTE, E.NOMBEMPRESA, VP.SITUACAO, PV.NOMBPUNTOVENTA, VP.USUARIO_ID, VP.FECMODIF, VP.DATACANCELAMENTO, ") - .append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDEPASSAGEIRO, E.EMPRESA_ID, ") - .append("SUM(B.PRECIOPAGADO) AS TOTALTARIFA, ") - .append("SUM(B.IMPORTETAXAEMBARQUE) AS TOTALTAXAEMBARQUE, ") - .append("SUM(B.IMPORTEPEDAGIO) AS TOTALPEDAGIO, ") - .append("SUM(B.IMPORTEOUTROS) AS TOTALOUTROS, ") - .append("SUM(B.IMPORTESEGURO) AS TOTALSEGURO, ") - .append("VP.INDENCARGOVENTA, ") - .append("(SELECT COUNT(DISTINCT PFP.PACOTEFORMAPAGO_ID) FROM PACOTE_FORMAPAGO PFP WHERE PFP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID) AS QTDEPACOTEFORMAPAGO ") - .append("FROM VENDA_PACOTE VP ") - .append("JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") - .append("JOIN EMPRESA E ON E.EMPRESA_ID = P.EMPRESA_ID ") - .append("LEFT JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = VP.PUNTOVENTA_ID ") - .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") - .append("WHERE (B.BOLETO_ID IS NULL OR B.INDSTATUSBOLETO = 'V') "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - sQuery.append("GROUP BY VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, ") - .append("VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, P.NOMPACOTE, P.DESCPACOTE, E.NOMBEMPRESA, ") - .append("VP.SITUACAO, PV.NOMBPUNTOVENTA, VP.USUARIO_ID, VP.FECMODIF, VP.DATACANCELAMENTO, E.EMPRESA_ID, VP.INDENCARGOVENTA "); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("DATAPACOTE", DateType.INSTANCE) - .addScalar("DATAVENDA", TimestampType.INSTANCE) - .addScalar("SUBTOTAL", BigDecimalType.INSTANCE) - .addScalar("TOTAL", BigDecimalType.INSTANCE) - .addScalar("DESCONTO", BigDecimalType.INSTANCE) - .addScalar("NUMOPERACION", StringType.INSTANCE) - .addScalar("PACOTE_ID", LongType.INSTANCE) - .addScalar("NOMPACOTE", StringType.INSTANCE) - .addScalar("DESCPACOTE", StringType.INSTANCE) - .addScalar("NOMBEMPRESA", StringType.INSTANCE) - .addScalar("SITUACAO", IntegerType.INSTANCE) - .addScalar("NOMBPUNTOVENTA", StringType.INSTANCE) - .addScalar("USUARIO_ID", IntegerType.INSTANCE) - .addScalar("QTDEPASSAGEIRO", IntegerType.INSTANCE) - .addScalar("TOTALTARIFA", BigDecimalType.INSTANCE) - .addScalar("TOTALTAXAEMBARQUE", BigDecimalType.INSTANCE) - .addScalar("TOTALPEDAGIO", BigDecimalType.INSTANCE) - .addScalar("TOTALOUTROS", BigDecimalType.INSTANCE) - .addScalar("TOTALSEGURO", BigDecimalType.INSTANCE) - .addScalar("QTDEPACOTEFORMAPAGO", IntegerType.INSTANCE) - .addScalar("FECMODIF", TimestampType.INSTANCE) - .addScalar("DATACANCELAMENTO", TimestampType.INSTANCE) - .addScalar("EMPRESA_ID", IntegerType.INSTANCE) - .addScalar("INDENCARGOVENTA", BooleanType.INSTANCE); - - query.setResultTransformer(new DatosTicketResultTransformer()); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - return query.list(); - } - - @SuppressWarnings("unchecked") - private void carregarDadosPagamento(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT "); - sQuery.append("PFP.PACOTEFORMAPAGO_ID,"); - sQuery.append("PFP.VALOR,"); - sQuery.append("PFP.VENDAPACOTE_ID,"); - sQuery.append("FP.FORMAPAGO_ID,"); - sQuery.append("FP.DESCPAGO,"); - sQuery.append("NC.NOTACREDITOVENDAPACOTE_ID,"); - sQuery.append("VPC.NUMOPERACION AS NUMOPERACAOPACOTECANCELAMENTO,"); - sQuery.append("FP.TIPO_PAGO,"); - sQuery.append("OCD.OCD_ID,"); - sQuery.append("OCD.NUMOPERACION AS NUMOPERACION_OCD,"); - sQuery.append("CD.CAJADIVERSOS_ID "); - - sQuery.append("FROM PACOTE_FORMAPAGO PFP "); - sQuery.append("JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = PFP.FORMAPAGO_ID "); - sQuery.append("LEFT JOIN VENDA_PACOTE VP ON VP.VENDAPACOTE_ID = PFP.VENDAPACOTE_ID "); - sQuery.append("LEFT JOIN NOTA_CREDITO_VENDA_PACOTE NC ON NC.NOTACREDITOVENDAPACOTE_ID = PFP.NOTACREDITOVENDAPACOTE_ID "); - sQuery.append("LEFT JOIN VENDA_PACOTE VPC ON NC.VENDAPACOTECANCELAMENTO_ID = VPC.VENDAPACOTE_ID "); - sQuery.append("LEFT JOIN OCD OCD ON OCD.OCD_ID = PFP.OCD_ID "); - sQuery.append("INNER JOIN CAJA_DIVERSOS CD ON CD.VENDAPACOTE_ID = PFP.VENDAPACOTE_ID "); - - sQuery.append("WHERE 1=1 AND CD.PRECIO >= 0 AND (FP.CVESISTEMA <> 'FORMA_PAGO_RESERVA' OR FP.CVESISTEMA IS NULL) "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - sQuery.append("ORDER BY VP.VENDAPACOTE_ID, PFP.PACOTEFORMAPAGO_ID"); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("VALOR", BigDecimalType.INSTANCE) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("FORMAPAGO_ID", IntegerType.INSTANCE) - .addScalar("DESCPAGO", StringType.INSTANCE) - .addScalar("NOTACREDITOVENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("NUMOPERACAOPACOTECANCELAMENTO", StringType.INSTANCE) - .addScalar("TIPO_PAGO", IntegerType.INSTANCE) - .addScalar("OCD_ID", LongType.INSTANCE) - .addScalar("NUMOPERACION_OCD", StringType.INSTANCE) - .addScalar("CAJADIVERSOS_ID", LongType.INSTANCE); - - query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - HashMap>> resultGroupedByCajaDiversos = new HashMap>>(); - - for (HashMap h : (List>) query.list()) { - Long cajaDiversosId = (Long) h.get("CAJADIVERSOS_ID"); - if (!resultGroupedByCajaDiversos.containsKey(cajaDiversosId)) { - List> list = new ArrayList>(); - list.add(h); - resultGroupedByCajaDiversos.put(cajaDiversosId, list); - } else { - resultGroupedByCajaDiversos.get(cajaDiversosId).add(h); - } - } - - List pagamentos = getResult(resultGroupedByCajaDiversos); - - for (PacoteVO pacote : pacotes) { - int flag = -1; - for (PagamentoVO pagamento : pagamentos) { - if (pagamento.getVendapacoteId().equals(pacote.getVendapacoteId())) { - - flag = 0; - if (pacote.getFormaspagamento() == null) { - pacote.setFormaspagamento(new ArrayList()); - } - - if (isPacoteReserva(pacote) && isPagamentoPacoteReserva(pagamento) || - (isPagamentoPacoteReserva(pagamento) && pacote.getQtdePacoteFormaspago() == 1) || - (!isPacoteReserva(pacote) && !isPagamentoPacoteReserva(pagamento))) { - pacote.getFormaspagamento().add(pagamento); - } - - if (isPagamentoDeposito(pagamento)) { - carregarDadosDeposito(pacote, pagamento); - } - } else if (flag == 0) { - break; - } - - } - } - } - - @SuppressWarnings("unchecked") - private List getResult(HashMap>> firstResult) { - - StringBuilder sQuery = new StringBuilder(); - - sQuery.append("SELECT CDP.CAJADIVERSOSPAGO_ID, "); - sQuery.append("CT.TIPOTARJETA, "); - sQuery.append("CT.NUMAUTORIZACION, "); - sQuery.append("CT.CANTPARCELAS, "); - sQuery.append("CT.NOMBTITULAR, "); - sQuery.append("CT.FECOPERACION, "); - sQuery.append("CT.NUMTARJETA, "); - sQuery.append("CT.DESCOPERADORACARTAO, "); - sQuery.append("CDP.CAJADIVERSOS_ID "); - sQuery.append("FROM CAJA_DIVERSOS_PAGO CDP "); - sQuery.append("LEFT JOIN CAJA_TARJETA CT ON CT.CAJATARJETA_ID = CDP.CAJATARJETA_ID "); - sQuery.append("WHERE CDP.CAJADIVERSOS_ID IN (:cajaDiversosId) "); - sQuery.append("ORDER BY CDP.CAJADIVERSOS_ID, CDP.CAJADIVERSOSPAGO_ID "); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("CAJADIVERSOSPAGO_ID", LongType.INSTANCE) - .addScalar("TIPOTARJETA", StringType.INSTANCE) - .addScalar("NUMAUTORIZACION", StringType.INSTANCE) - .addScalar("CANTPARCELAS", IntegerType.INSTANCE) - .addScalar("NOMBTITULAR", StringType.INSTANCE) - .addScalar("FECOPERACION", DateType.INSTANCE) - .addScalar("NUMTARJETA", StringType.INSTANCE) - .addScalar("DESCOPERADORACARTAO", StringType.INSTANCE) - .addScalar("CAJADIVERSOS_ID", LongType.INSTANCE); - - query.setParameterList("cajaDiversosId", firstResult.keySet()); - - query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - - List> secondResult = query.list(); - int count = 0; - - for (Long cajaDiversosId : firstResult.keySet()) { - count = 0; - for (HashMap s : secondResult) { - if (cajaDiversosId.equals(s.get("CAJADIVERSOS_ID"))) { - try{ - firstResult.get(cajaDiversosId).get(count).putAll(s); - }catch(Exception ex){ - log.info("***info> cajaDiversosId: " + cajaDiversosId + ", verificar reserva"); - } - count++; - } - } - } - - List pagamentos = new ArrayList(); - List> dadosExtraidos = new ArrayList>(); - - for (Long cajaDiversosId : firstResult.keySet()) { - dadosExtraidos.addAll(firstResult.get(cajaDiversosId)); - } - - for (HashMap m : dadosExtraidos) { - PagamentoVO pagamento = new PagamentoVO(); - setDatosPacote(pagamento, m); - pagamentos.add(pagamento); - } - - return pagamentos; - } - - private void setDatosPacote(PagamentoVO pagamento, Map tupleMap) { - pagamento.setMoeda("R$"); - pagamento.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); - pagamento.setFormapagoId((Integer) tupleMap.get("FORMAPAGO_ID")); - pagamento.setFormapagamento((String) tupleMap.get("DESCPAGO")); - pagamento.setValor((BigDecimal) tupleMap.get("VALOR")); - - Integer tipoPago = (Integer) tupleMap.get("TIPO_PAGO"); - pagamento.setTipoFormapago(TipoFormapago.getTipoFormapagoByValor(tipoPago)); - - if (isVentaCartaoCredito(pagamento.getTipoFormapago()) || isVentaCartaoDebito(pagamento.getTipoFormapago())) { - PagamentoCartaoVO cartao = new PagamentoCartaoVO(); - cartao.setBandeira((String) tupleMap.get("TIPOTARJETA")); - cartao.setNumautorizacao((String) tupleMap.get("NUMAUTORIZACION")); - cartao.setParcelas((Integer) tupleMap.get("CANTPARCELAS")); - cartao.setTitular((String) tupleMap.get("NOMBTITULAR")); - cartao.setDatapagamento((Date) tupleMap.get("FECOPERACION")); - cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); - cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); - cartao.setOperadoracartao((String) tupleMap.get("DESCOPERADORACARTAO")); - - pagamento.setCartao(cartao); - } - - if (isVentaNotaCredito(pagamento.getTipoFormapago())) { - if (tupleMap.get("NOTACREDITOVENDAPACOTE_ID") != null) { - NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); - notacredito.setVouchernotacredito(((Long) tupleMap.get("NOTACREDITOVENDAPACOTE_ID")).toString()); - notacredito.setNumoperacaopacotecancelamento((String) tupleMap.get("NUMOPERACAOPACOTECANCELAMENTO")); - pagamento.setNotacredito(notacredito); - } - - if (tupleMap.get("OCD_ID") != null) { - String voucherocd = OcdUtil.generaLocalizadorOCD((String) tupleMap.get("NUMOPERACION_OCD"), (Long) tupleMap.get("OCD_ID")); - OcdPacoteVO ocdPacote = new OcdPacoteVO(); - ocdPacote.setVoucherocd(voucherocd); - pagamento.setOcd(ocdPacote); - } - } - - } - - private boolean isVentaCartaoCredito(TipoFormapago tipoFormapago) { - return TipoFormapago.CREDITO.equals(tipoFormapago); - } - - private boolean isVentaCartaoDebito(TipoFormapago tipoFormapago) { - return TipoFormapago.DEBITO.equals(tipoFormapago); - } - - private boolean isVentaNotaCredito(TipoFormapago tipoFormapago) { - return TipoFormapago.NOTA_CREDITO.equals(tipoFormapago); - } - - /** - * Adiciona os filtros na query - * - * @param query - * @param fecInicial - * @param fecFinal - * @param fecVentaInicial - * @param fecVentaFinal - * @param fecAlteracaoInicial - * @param fecAlteracaoFinal - */ - private void adicionarFiltros(SQLQuery query, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - query.setParameter("situacaoPacote", SituacaoVendaPacote.RESERVA.getShortValue()); - - if (fecInicial != null) { - query.setParameter("fecInicial", fecInicial, DateType.INSTANCE); - } - if (fecFinal != null) { - query.setParameter("fecFinal", fecFinal, DateType.INSTANCE); - } - - if (fecVentaInicial != null) { - query.setParameter("fecVentaInicial", fecVentaInicial, TimestampType.INSTANCE); - } - if (fecVentaFinal != null) { - query.setParameter("fecVentaFinal", fecVentaFinal, TimestampType.INSTANCE); - } - - if (fecAlteracaoInicial != null) { - query.setParameter("fecAlteracaoInicial", fecAlteracaoInicial, TimestampType.INSTANCE); - } - if (fecAlteracaoFinal != null) { - query.setParameter("fecAlteracaoFinal", fecAlteracaoFinal, TimestampType.INSTANCE); - } - } - - private void adicionarFiltros(StringBuilder sQuery, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - - sQuery.append("AND VP.SITUACAO != :situacaoPacote "); - - if (fecInicial != null) { - sQuery.append("AND VP.DATAPACOTE >= :fecInicial "); - } - if (fecFinal != null) { - sQuery.append("AND VP.DATAPACOTE <= :fecFinal "); - } - - if (fecVentaInicial != null) { - sQuery.append("AND VP.DATAVENDA >= :fecVentaInicial "); - } - if (fecVentaFinal != null) { - sQuery.append("AND VP.DATAVENDA <= :fecVentaFinal "); - } - - if (fecAlteracaoInicial != null) { - sQuery.append("AND VP.FECMODIF >= :fecAlteracaoInicial "); - } - if (fecAlteracaoFinal != null) { - sQuery.append("AND VP.FECMODIF <= :fecAlteracaoFinal "); - } - - } - - private boolean isPagamentoDeposito(PagamentoVO pagamento) { - return TipoFormapago.DEPOSITO.equals(pagamento.getTipoFormapago()); - } - - private boolean isPacoteReserva(PacoteVO pacote) { - return SituacaoVendaPacote.RESERVA.toString().equals(pacote.getStatus()); - } - - private boolean isPagamentoPacoteReserva(PagamentoVO pagamento) { - return TipoFormapago.RESERVA.equals(pagamento.getTipoFormapago()); - } - - @SuppressWarnings("unchecked") - private void carregarDadosServico(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, B.FECHORVIAJE, B.ORIGEN_ID, CONCAT(CONCAT(ORI.CVEPARADA,' - '),ORI.DESCPARADA) AS ORIGEM, CONCAT(CONCAT(DES.CVEPARADA,' - '),DES.DESCPARADA) AS DESTINO ") - .append("FROM VENDA_PACOTE VP ") - .append("JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") - .append("JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") - .append("JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") - .append("JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") - .append("JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ") - .append("WHERE 1=1 "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("FECHORVIAJE", TimestampType.INSTANCE) - .addScalar("ORIGEN_ID", IntegerType.INSTANCE) - .addScalar("ORIGEM", StringType.INSTANCE) - .addScalar("DESTINO", StringType.INSTANCE); - - query.setResultTransformer(new DatosServicoResultTransformer()); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - List servicos = query.list(); - for (PacoteVO pacote : pacotes) { - for (ServicoVO servico : servicos) { - if (servico.getVendapacoteId().equals(pacote.getVendapacoteId())) { - pacote.setServico(servico); - break; - } - } - } - } - - @SuppressWarnings("unchecked") - private void carregarDadosCliente(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT VP.VENDAPACOTE_ID, C.NOMBCLIENTE, C.APELLIDOPATERNO, C.APELLIDOMATERNO, C.NUMTELEFONO, C.DESCCORREO, C.NUMIDENTIFICAUNO, ") - .append("CD.DESCCALLE, CD.DESCCALLECOMP, CD.DESCCOLONIA, CD.DESCIUDAD, CD.NUMINTERIOR, CD.CODPOSTAL, CD.DESESTADO ") - .append("FROM CLIENTE C ") - .append("JOIN VENDA_PACOTE VP ON VP.CLIENTE_ID = C.CLIENTE_ID ") - .append("LEFT JOIN CLIENTE_DIRECCION CD ON CD.CLIENTE_ID = C.CLIENTE_ID ") - .append("WHERE 1=1 "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("NOMBCLIENTE", StringType.INSTANCE) - .addScalar("APELLIDOPATERNO", StringType.INSTANCE) - .addScalar("APELLIDOMATERNO", StringType.INSTANCE) - .addScalar("NUMIDENTIFICAUNO", StringType.INSTANCE) - .addScalar("DESCCORREO", StringType.INSTANCE) - .addScalar("NUMTELEFONO", StringType.INSTANCE) - .addScalar("CODPOSTAL", StringType.INSTANCE) - .addScalar("DESCCALLE", StringType.INSTANCE) - .addScalar("NUMINTERIOR", StringType.INSTANCE) - .addScalar("DESCCALLECOMP", StringType.INSTANCE) - .addScalar("DESESTADO", StringType.INSTANCE) - .addScalar("DESCIUDAD", StringType.INSTANCE) - .addScalar("DESCCOLONIA", StringType.INSTANCE); - - query.setResultTransformer(new DatosClientePacoteResultTransformer()); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - List clientesPacotes = query.list(); - for (PacoteVO pacote : pacotes) { - for (ClientePacoteVO clientePacote : clientesPacotes) { - if (clientePacote.getVendapacoteId().equals(pacote.getVendapacoteId())) { - pacote.setClientePacote(clientePacote); - } - } - } - } - - @SuppressWarnings("unchecked") - private void carregarDadosPassageiros(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, TVP.TARIFAVENDAPACOTE_ID, TVP.NOMEPASSAGEIRO, CONCAT(CONCAT(TVP.TIPODOC,' - '), TVP.DOCUMENTO) AS DOCUMENTO, B.NUMASIENTO, C.CATEGORIA_ID, C.DESCCATEGORIA, B.BOLETO_ID,C.CVECATEGORIA ") - .append("FROM VENDA_PACOTE VP ") - .append("JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") - .append("LEFT JOIN CATEGORIA C ON C.CATEGORIA_ID = B.CATEGORIA_ID ") - .append("WHERE 1=1 "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("BOLETO_ID", LongType.INSTANCE) - .addScalar("TARIFAVENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("NOMEPASSAGEIRO", StringType.INSTANCE) - .addScalar("DOCUMENTO", StringType.INSTANCE) - .addScalar("NUMASIENTO", StringType.INSTANCE) - .addScalar("CATEGORIA_ID", IntegerType.INSTANCE) - .addScalar("CVECATEGORIA", StringType.INSTANCE) - .addScalar("DESCCATEGORIA", StringType.INSTANCE); - - query.setResultTransformer(new DatosPassageiroResultTransformer()); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - List passageiros = query.list(); - for (PacoteVO pacote : pacotes) { - for (PassageiroVO passageiro : passageiros) { - if (passageiro.getVendapacoteId().equals(pacote.getVendapacoteId())) { - if (pacote.getPax() == null) { - pacote.setPax(new ArrayList()); - } - pacote.getPax().add(passageiro); - } - } - } - } - - @SuppressWarnings("unchecked") - private void carregarDadosEnderecoApanhe(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, EA.LOCAL, EA.DESCHOTEL, EA.CEP, EA.ENDERECO, EA.NUMERO, EA.COMPLEMENTO, EA.CIDADE, EA.BAIRRO, EA.REFERENCIA ") - .append("FROM ENDERECO_APANHE EA ") - .append("JOIN VENDA_PACOTE VP ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") - .append("WHERE EA.ACTIVO = 1 "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("LOCAL", IntegerType.INSTANCE) - .addScalar("CEP", StringType.INSTANCE) - .addScalar("ENDERECO", StringType.INSTANCE) - .addScalar("NUMERO", StringType.INSTANCE) - .addScalar("COMPLEMENTO", StringType.INSTANCE) - .addScalar("CIDADE", StringType.INSTANCE) - .addScalar("BAIRRO", StringType.INSTANCE) - .addScalar("REFERENCIA", StringType.INSTANCE) - .addScalar("DESCHOTEL", StringType.INSTANCE); - - query.setResultTransformer(new DatosEnderecoApanheResultTransformer()); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - List enderecosApanhe = query.list(); - for (PacoteVO pacote : pacotes) { - for (EnderecoApanheVO enderecoApanhe : enderecosApanhe) { - if (enderecoApanhe.getVendapacoteId().equals(pacote.getVendapacoteId())) { - pacote.setEnderecoApanhe(enderecoApanhe); - } - } - } - } - - @SuppressWarnings("unchecked") - private void carregarDadosItemPacotes(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT IA.DESCITEMADICIONAL, VP.VENDAPACOTE_ID, PI.ITEMADICIONAL_ID ") - .append("FROM ITEM_ADICIONAL IA ") - .append("JOIN PACOTE_ITEM PI ON IA.ITEMADICIONAL_ID = PI.ITEMADICIONAL_ID ") - .append("JOIN PACOTE P ON P.PACOTE_ID = PI.PACOTE_ID ") - .append("JOIN VENDA_PACOTE VP ON VP.PACOTE_ID = P.PACOTE_ID ") - .append("WHERE IA.ACTIVO = 1 "); - - adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("DESCITEMADICIONAL", StringType.INSTANCE) - .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) - .addScalar("ITEMADICIONAL_ID", LongType.INSTANCE); - - query.setResultTransformer(new DatosItemAdicionalResultTransformer()); - adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - - List itens = query.list(); - for (PacoteVO pacote : pacotes) { - for (ItemAdicionalVO itemAdicional : itens) { - if (itemAdicional.getVendapacoteId().equals(pacote.getVendapacoteId())) { - if (pacote.getItens() == null) { - pacote.setItens(new ArrayList()); - } - pacote.getItens().add(itemAdicional); - } - } - } - } - - @SuppressWarnings("unchecked") - private void carregarDadosDeposito(PacoteVO pacote, PagamentoVO pagamento) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT CDDP.IDENTIFICACAO_DEPOSITO, CDDP.IMPORTE, CDDP.FECDEPOSITO ") - .append("FROM CAJA_DET_DEPOSITO_PAGO CDDP ") - .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOSPAGO_ID = CDDP.CAJADIVERSOSPAGO_ID ") - .append("JOIN CAJA_DIVERSOS CD ON CD.CAJADIVERSOS_ID = CDP.CAJADIVERSOS_ID ") - .append("WHERE CDDP.ACTIVO = 1 ") - .append("AND CD.VENDAPACOTE_ID = :vendapacoteId ") - .append("AND CDP.FORMAPAGO_ID = :formapagoId "); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("IDENTIFICACAO_DEPOSITO", StringType.INSTANCE) - .addScalar("IMPORTE", BigDecimalType.INSTANCE) - .addScalar("FECDEPOSITO", DateType.INSTANCE); - - query.setResultTransformer(new DatosDadosBancarioResultTransformer()); - query.setParameter("vendapacoteId", pacote.getVendapacoteId()); - query.setParameter("formapagoId", pagamento.getFormapagoId()); - - List dadosBancarios = query.list(); - if (dadosBancarios != null && !dadosBancarios.isEmpty()) { - pagamento.setDadosBancarios(dadosBancarios); - } - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.BooleanType; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.LongType; +import org.hibernate.type.StringType; +import org.hibernate.type.TimestampType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.BusquedaDatosTicketDAO; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; +import com.rjconsultores.ventaboletos.enums.TipoFormapago; +import com.rjconsultores.ventaboletos.utilerias.OcdUtil; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.EnderecoApanheVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ItemAdicionalVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.OcdPacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PagamentoVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PassageiroVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ServicoVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosClientePacoteResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosDadosBancarioResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosEnderecoApanheResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosItemAdicionalResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosPassageiroResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosServicoResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosTicketResultTransformer; +import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; + +@Repository("busquedaDatosTicketDAO") +public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO implements BusquedaDatosTicketDAO { + + private static Logger log = LogManager.getLogger(BusquedaDatosTicketHibernateDAO.class); + + @Autowired + public BusquedaDatosTicketHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscaDatosTickets(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + List pacotes = new ArrayList(); + + try { + pacotes = carregarDadosPacotes(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + if (!pacotes.isEmpty()) { + carregarDadosPagamento(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + carregarDadosServico(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + carregarDadosPassageiros(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + carregarDadosCliente(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + carregarDadosEnderecoApanhe(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + carregarDadosItemPacotes(pacotes, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + pacotes.clear(); + } + + return getPacotesFiltradosReserva(pacotes); + } + + private List getPacotesFiltradosReserva(List pacotes) { + List retorno = new ArrayList(); + for (PacoteVO p : pacotes) { + if (p.getFormaspagamento() != null && !p.getFormaspagamento().isEmpty()) { + retorno.add(p); + } + } + return retorno; + } + + @SuppressWarnings("unchecked") + private List carregarDadosPacotes(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, ") + .append("P.NOMPACOTE, P.DESCPACOTE, E.NOMBEMPRESA, VP.SITUACAO, PV.NOMBPUNTOVENTA, VP.USUARIO_ID, VP.FECMODIF, VP.DATACANCELAMENTO, ") + .append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDEPASSAGEIRO, E.EMPRESA_ID, ") + .append("SUM(B.PRECIOPAGADO) AS TOTALTARIFA, ") + .append("SUM(B.IMPORTETAXAEMBARQUE) AS TOTALTAXAEMBARQUE, ") + .append("SUM(B.IMPORTEPEDAGIO) AS TOTALPEDAGIO, ") + .append("SUM(B.IMPORTEOUTROS) AS TOTALOUTROS, ") + .append("SUM(B.IMPORTESEGURO) AS TOTALSEGURO, ") + .append("VP.INDENCARGOVENTA, ") + .append("(SELECT COUNT(DISTINCT PFP.PACOTEFORMAPAGO_ID) FROM PACOTE_FORMAPAGO PFP WHERE PFP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID) AS QTDEPACOTEFORMAPAGO ") + .append("FROM VENDA_PACOTE VP ") + .append("JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") + .append("JOIN EMPRESA E ON E.EMPRESA_ID = P.EMPRESA_ID ") + .append("LEFT JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = VP.PUNTOVENTA_ID ") + .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") + .append("WHERE (B.BOLETO_ID IS NULL OR B.INDSTATUSBOLETO = 'V') "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + sQuery.append("GROUP BY VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, ") + .append("VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, P.NOMPACOTE, P.DESCPACOTE, E.NOMBEMPRESA, ") + .append("VP.SITUACAO, PV.NOMBPUNTOVENTA, VP.USUARIO_ID, VP.FECMODIF, VP.DATACANCELAMENTO, E.EMPRESA_ID, VP.INDENCARGOVENTA "); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("DATAPACOTE", DateType.INSTANCE) + .addScalar("DATAVENDA", TimestampType.INSTANCE) + .addScalar("SUBTOTAL", BigDecimalType.INSTANCE) + .addScalar("TOTAL", BigDecimalType.INSTANCE) + .addScalar("DESCONTO", BigDecimalType.INSTANCE) + .addScalar("NUMOPERACION", StringType.INSTANCE) + .addScalar("PACOTE_ID", LongType.INSTANCE) + .addScalar("NOMPACOTE", StringType.INSTANCE) + .addScalar("DESCPACOTE", StringType.INSTANCE) + .addScalar("NOMBEMPRESA", StringType.INSTANCE) + .addScalar("SITUACAO", IntegerType.INSTANCE) + .addScalar("NOMBPUNTOVENTA", StringType.INSTANCE) + .addScalar("USUARIO_ID", IntegerType.INSTANCE) + .addScalar("QTDEPASSAGEIRO", IntegerType.INSTANCE) + .addScalar("TOTALTARIFA", BigDecimalType.INSTANCE) + .addScalar("TOTALTAXAEMBARQUE", BigDecimalType.INSTANCE) + .addScalar("TOTALPEDAGIO", BigDecimalType.INSTANCE) + .addScalar("TOTALOUTROS", BigDecimalType.INSTANCE) + .addScalar("TOTALSEGURO", BigDecimalType.INSTANCE) + .addScalar("QTDEPACOTEFORMAPAGO", IntegerType.INSTANCE) + .addScalar("FECMODIF", TimestampType.INSTANCE) + .addScalar("DATACANCELAMENTO", TimestampType.INSTANCE) + .addScalar("EMPRESA_ID", IntegerType.INSTANCE) + .addScalar("INDENCARGOVENTA", BooleanType.INSTANCE); + + query.setResultTransformer(new DatosTicketResultTransformer()); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + return query.list(); + } + + @SuppressWarnings("unchecked") + private void carregarDadosPagamento(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT "); + sQuery.append("PFP.PACOTEFORMAPAGO_ID,"); + sQuery.append("PFP.VALOR,"); + sQuery.append("PFP.VENDAPACOTE_ID,"); + sQuery.append("FP.FORMAPAGO_ID,"); + sQuery.append("FP.DESCPAGO,"); + sQuery.append("NC.NOTACREDITOVENDAPACOTE_ID,"); + sQuery.append("VPC.NUMOPERACION AS NUMOPERACAOPACOTECANCELAMENTO,"); + sQuery.append("FP.TIPO_PAGO,"); + sQuery.append("OCD.OCD_ID,"); + sQuery.append("OCD.NUMOPERACION AS NUMOPERACION_OCD,"); + sQuery.append("CD.CAJADIVERSOS_ID "); + + sQuery.append("FROM PACOTE_FORMAPAGO PFP "); + sQuery.append("JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = PFP.FORMAPAGO_ID "); + sQuery.append("LEFT JOIN VENDA_PACOTE VP ON VP.VENDAPACOTE_ID = PFP.VENDAPACOTE_ID "); + sQuery.append("LEFT JOIN NOTA_CREDITO_VENDA_PACOTE NC ON NC.NOTACREDITOVENDAPACOTE_ID = PFP.NOTACREDITOVENDAPACOTE_ID "); + sQuery.append("LEFT JOIN VENDA_PACOTE VPC ON NC.VENDAPACOTECANCELAMENTO_ID = VPC.VENDAPACOTE_ID "); + sQuery.append("LEFT JOIN OCD OCD ON OCD.OCD_ID = PFP.OCD_ID "); + sQuery.append("INNER JOIN CAJA_DIVERSOS CD ON CD.VENDAPACOTE_ID = PFP.VENDAPACOTE_ID "); + + sQuery.append("WHERE 1=1 AND CD.PRECIO >= 0 AND (FP.CVESISTEMA <> 'FORMA_PAGO_RESERVA' OR FP.CVESISTEMA IS NULL) "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + sQuery.append("ORDER BY VP.VENDAPACOTE_ID, PFP.PACOTEFORMAPAGO_ID"); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("VALOR", BigDecimalType.INSTANCE) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("FORMAPAGO_ID", IntegerType.INSTANCE) + .addScalar("DESCPAGO", StringType.INSTANCE) + .addScalar("NOTACREDITOVENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("NUMOPERACAOPACOTECANCELAMENTO", StringType.INSTANCE) + .addScalar("TIPO_PAGO", IntegerType.INSTANCE) + .addScalar("OCD_ID", LongType.INSTANCE) + .addScalar("NUMOPERACION_OCD", StringType.INSTANCE) + .addScalar("CAJADIVERSOS_ID", LongType.INSTANCE); + + query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + HashMap>> resultGroupedByCajaDiversos = new HashMap>>(); + + for (HashMap h : (List>) query.list()) { + Long cajaDiversosId = (Long) h.get("CAJADIVERSOS_ID"); + if (!resultGroupedByCajaDiversos.containsKey(cajaDiversosId)) { + List> list = new ArrayList>(); + list.add(h); + resultGroupedByCajaDiversos.put(cajaDiversosId, list); + } else { + resultGroupedByCajaDiversos.get(cajaDiversosId).add(h); + } + } + + List pagamentos = getResult(resultGroupedByCajaDiversos); + + for (PacoteVO pacote : pacotes) { + int flag = -1; + for (PagamentoVO pagamento : pagamentos) { + if (pagamento.getVendapacoteId().equals(pacote.getVendapacoteId())) { + + flag = 0; + if (pacote.getFormaspagamento() == null) { + pacote.setFormaspagamento(new ArrayList()); + } + + if (isPacoteReserva(pacote) && isPagamentoPacoteReserva(pagamento) || + (isPagamentoPacoteReserva(pagamento) && pacote.getQtdePacoteFormaspago() == 1) || + (!isPacoteReserva(pacote) && !isPagamentoPacoteReserva(pagamento))) { + pacote.getFormaspagamento().add(pagamento); + } + + if (isPagamentoDeposito(pagamento)) { + carregarDadosDeposito(pacote, pagamento); + } + } else if (flag == 0) { + break; + } + + } + } + } + + @SuppressWarnings("unchecked") + private List getResult(HashMap>> firstResult) { + + StringBuilder sQuery = new StringBuilder(); + + sQuery.append("SELECT CDP.CAJADIVERSOSPAGO_ID, "); + sQuery.append("CT.TIPOTARJETA, "); + sQuery.append("CT.NUMAUTORIZACION, "); + sQuery.append("CT.CANTPARCELAS, "); + sQuery.append("CT.NOMBTITULAR, "); + sQuery.append("CT.FECOPERACION, "); + sQuery.append("CT.NUMTARJETA, "); + sQuery.append("CT.DESCOPERADORACARTAO, "); + sQuery.append("CDP.CAJADIVERSOS_ID "); + sQuery.append("FROM CAJA_DIVERSOS_PAGO CDP "); + sQuery.append("LEFT JOIN CAJA_TARJETA CT ON CT.CAJATARJETA_ID = CDP.CAJATARJETA_ID "); + sQuery.append("WHERE CDP.CAJADIVERSOS_ID IN (:cajaDiversosId) "); + sQuery.append("ORDER BY CDP.CAJADIVERSOS_ID, CDP.CAJADIVERSOSPAGO_ID "); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("CAJADIVERSOSPAGO_ID", LongType.INSTANCE) + .addScalar("TIPOTARJETA", StringType.INSTANCE) + .addScalar("NUMAUTORIZACION", StringType.INSTANCE) + .addScalar("CANTPARCELAS", IntegerType.INSTANCE) + .addScalar("NOMBTITULAR", StringType.INSTANCE) + .addScalar("FECOPERACION", DateType.INSTANCE) + .addScalar("NUMTARJETA", StringType.INSTANCE) + .addScalar("DESCOPERADORACARTAO", StringType.INSTANCE) + .addScalar("CAJADIVERSOS_ID", LongType.INSTANCE); + + query.setParameterList("cajaDiversosId", firstResult.keySet()); + + query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + + List> secondResult = query.list(); + int count = 0; + + for (Long cajaDiversosId : firstResult.keySet()) { + count = 0; + for (HashMap s : secondResult) { + if (cajaDiversosId.equals(s.get("CAJADIVERSOS_ID"))) { + try{ + firstResult.get(cajaDiversosId).get(count).putAll(s); + }catch(Exception ex){ + log.info("***info> cajaDiversosId: " + cajaDiversosId + ", verificar reserva"); + } + count++; + } + } + } + + List pagamentos = new ArrayList(); + List> dadosExtraidos = new ArrayList>(); + + for (Long cajaDiversosId : firstResult.keySet()) { + dadosExtraidos.addAll(firstResult.get(cajaDiversosId)); + } + + for (HashMap m : dadosExtraidos) { + PagamentoVO pagamento = new PagamentoVO(); + setDatosPacote(pagamento, m); + pagamentos.add(pagamento); + } + + return pagamentos; + } + + private void setDatosPacote(PagamentoVO pagamento, Map tupleMap) { + pagamento.setMoeda("R$"); + pagamento.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); + pagamento.setFormapagoId((Integer) tupleMap.get("FORMAPAGO_ID")); + pagamento.setFormapagamento((String) tupleMap.get("DESCPAGO")); + pagamento.setValor((BigDecimal) tupleMap.get("VALOR")); + + Integer tipoPago = (Integer) tupleMap.get("TIPO_PAGO"); + pagamento.setTipoFormapago(TipoFormapago.getTipoFormapagoByValor(tipoPago)); + + if (isVentaCartaoCredito(pagamento.getTipoFormapago()) || isVentaCartaoDebito(pagamento.getTipoFormapago())) { + PagamentoCartaoVO cartao = new PagamentoCartaoVO(); + cartao.setBandeira((String) tupleMap.get("TIPOTARJETA")); + cartao.setNumautorizacao((String) tupleMap.get("NUMAUTORIZACION")); + cartao.setParcelas((Integer) tupleMap.get("CANTPARCELAS")); + cartao.setTitular((String) tupleMap.get("NOMBTITULAR")); + cartao.setDatapagamento((Date) tupleMap.get("FECOPERACION")); + cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); + cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); + cartao.setOperadoracartao((String) tupleMap.get("DESCOPERADORACARTAO")); + + pagamento.setCartao(cartao); + } + + if (isVentaNotaCredito(pagamento.getTipoFormapago())) { + if (tupleMap.get("NOTACREDITOVENDAPACOTE_ID") != null) { + NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); + notacredito.setVouchernotacredito(((Long) tupleMap.get("NOTACREDITOVENDAPACOTE_ID")).toString()); + notacredito.setNumoperacaopacotecancelamento((String) tupleMap.get("NUMOPERACAOPACOTECANCELAMENTO")); + pagamento.setNotacredito(notacredito); + } + + if (tupleMap.get("OCD_ID") != null) { + String voucherocd = OcdUtil.generaLocalizadorOCD((String) tupleMap.get("NUMOPERACION_OCD"), (Long) tupleMap.get("OCD_ID")); + OcdPacoteVO ocdPacote = new OcdPacoteVO(); + ocdPacote.setVoucherocd(voucherocd); + pagamento.setOcd(ocdPacote); + } + } + + } + + private boolean isVentaCartaoCredito(TipoFormapago tipoFormapago) { + return TipoFormapago.CREDITO.equals(tipoFormapago); + } + + private boolean isVentaCartaoDebito(TipoFormapago tipoFormapago) { + return TipoFormapago.DEBITO.equals(tipoFormapago); + } + + private boolean isVentaNotaCredito(TipoFormapago tipoFormapago) { + return TipoFormapago.NOTA_CREDITO.equals(tipoFormapago); + } + + /** + * Adiciona os filtros na query + * + * @param query + * @param fecInicial + * @param fecFinal + * @param fecVentaInicial + * @param fecVentaFinal + * @param fecAlteracaoInicial + * @param fecAlteracaoFinal + */ + private void adicionarFiltros(SQLQuery query, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + query.setParameter("situacaoPacote", SituacaoVendaPacote.RESERVA.getShortValue()); + + if (fecInicial != null) { + query.setParameter("fecInicial", fecInicial, DateType.INSTANCE); + } + if (fecFinal != null) { + query.setParameter("fecFinal", fecFinal, DateType.INSTANCE); + } + + if (fecVentaInicial != null) { + query.setParameter("fecVentaInicial", fecVentaInicial, TimestampType.INSTANCE); + } + if (fecVentaFinal != null) { + query.setParameter("fecVentaFinal", fecVentaFinal, TimestampType.INSTANCE); + } + + if (fecAlteracaoInicial != null) { + query.setParameter("fecAlteracaoInicial", fecAlteracaoInicial, TimestampType.INSTANCE); + } + if (fecAlteracaoFinal != null) { + query.setParameter("fecAlteracaoFinal", fecAlteracaoFinal, TimestampType.INSTANCE); + } + } + + private void adicionarFiltros(StringBuilder sQuery, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + + sQuery.append("AND VP.SITUACAO != :situacaoPacote "); + + if (fecInicial != null) { + sQuery.append("AND VP.DATAPACOTE >= :fecInicial "); + } + if (fecFinal != null) { + sQuery.append("AND VP.DATAPACOTE <= :fecFinal "); + } + + if (fecVentaInicial != null) { + sQuery.append("AND VP.DATAVENDA >= :fecVentaInicial "); + } + if (fecVentaFinal != null) { + sQuery.append("AND VP.DATAVENDA <= :fecVentaFinal "); + } + + if (fecAlteracaoInicial != null) { + sQuery.append("AND VP.FECMODIF >= :fecAlteracaoInicial "); + } + if (fecAlteracaoFinal != null) { + sQuery.append("AND VP.FECMODIF <= :fecAlteracaoFinal "); + } + + } + + private boolean isPagamentoDeposito(PagamentoVO pagamento) { + return TipoFormapago.DEPOSITO.equals(pagamento.getTipoFormapago()); + } + + private boolean isPacoteReserva(PacoteVO pacote) { + return SituacaoVendaPacote.RESERVA.toString().equals(pacote.getStatus()); + } + + private boolean isPagamentoPacoteReserva(PagamentoVO pagamento) { + return TipoFormapago.RESERVA.equals(pagamento.getTipoFormapago()); + } + + @SuppressWarnings("unchecked") + private void carregarDadosServico(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, B.FECHORVIAJE, B.ORIGEN_ID, CONCAT(CONCAT(ORI.CVEPARADA,' - '),ORI.DESCPARADA) AS ORIGEM, CONCAT(CONCAT(DES.CVEPARADA,' - '),DES.DESCPARADA) AS DESTINO ") + .append("FROM VENDA_PACOTE VP ") + .append("JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") + .append("JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") + .append("JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") + .append("JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") + .append("JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ") + .append("WHERE 1=1 "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("FECHORVIAJE", TimestampType.INSTANCE) + .addScalar("ORIGEN_ID", IntegerType.INSTANCE) + .addScalar("ORIGEM", StringType.INSTANCE) + .addScalar("DESTINO", StringType.INSTANCE); + + query.setResultTransformer(new DatosServicoResultTransformer()); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + List servicos = query.list(); + for (PacoteVO pacote : pacotes) { + for (ServicoVO servico : servicos) { + if (servico.getVendapacoteId().equals(pacote.getVendapacoteId())) { + pacote.setServico(servico); + break; + } + } + } + } + + @SuppressWarnings("unchecked") + private void carregarDadosCliente(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT VP.VENDAPACOTE_ID, C.NOMBCLIENTE, C.APELLIDOPATERNO, C.APELLIDOMATERNO, C.NUMTELEFONO, C.DESCCORREO, C.NUMIDENTIFICAUNO, ") + .append("CD.DESCCALLE, CD.DESCCALLECOMP, CD.DESCCOLONIA, CD.DESCIUDAD, CD.NUMINTERIOR, CD.CODPOSTAL, CD.DESESTADO ") + .append("FROM CLIENTE C ") + .append("JOIN VENDA_PACOTE VP ON VP.CLIENTE_ID = C.CLIENTE_ID ") + .append("LEFT JOIN CLIENTE_DIRECCION CD ON CD.CLIENTE_ID = C.CLIENTE_ID ") + .append("WHERE 1=1 "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("NOMBCLIENTE", StringType.INSTANCE) + .addScalar("APELLIDOPATERNO", StringType.INSTANCE) + .addScalar("APELLIDOMATERNO", StringType.INSTANCE) + .addScalar("NUMIDENTIFICAUNO", StringType.INSTANCE) + .addScalar("DESCCORREO", StringType.INSTANCE) + .addScalar("NUMTELEFONO", StringType.INSTANCE) + .addScalar("CODPOSTAL", StringType.INSTANCE) + .addScalar("DESCCALLE", StringType.INSTANCE) + .addScalar("NUMINTERIOR", StringType.INSTANCE) + .addScalar("DESCCALLECOMP", StringType.INSTANCE) + .addScalar("DESESTADO", StringType.INSTANCE) + .addScalar("DESCIUDAD", StringType.INSTANCE) + .addScalar("DESCCOLONIA", StringType.INSTANCE); + + query.setResultTransformer(new DatosClientePacoteResultTransformer()); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + List clientesPacotes = query.list(); + for (PacoteVO pacote : pacotes) { + for (ClientePacoteVO clientePacote : clientesPacotes) { + if (clientePacote.getVendapacoteId().equals(pacote.getVendapacoteId())) { + pacote.setClientePacote(clientePacote); + } + } + } + } + + @SuppressWarnings("unchecked") + private void carregarDadosPassageiros(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, TVP.TARIFAVENDAPACOTE_ID, TVP.NOMEPASSAGEIRO, CONCAT(CONCAT(TVP.TIPODOC,' - '), TVP.DOCUMENTO) AS DOCUMENTO, B.NUMASIENTO, C.CATEGORIA_ID, C.DESCCATEGORIA, B.BOLETO_ID,C.CVECATEGORIA ") + .append("FROM VENDA_PACOTE VP ") + .append("JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ") + .append("LEFT JOIN CATEGORIA C ON C.CATEGORIA_ID = B.CATEGORIA_ID ") + .append("WHERE 1=1 "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("BOLETO_ID", LongType.INSTANCE) + .addScalar("TARIFAVENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("NOMEPASSAGEIRO", StringType.INSTANCE) + .addScalar("DOCUMENTO", StringType.INSTANCE) + .addScalar("NUMASIENTO", StringType.INSTANCE) + .addScalar("CATEGORIA_ID", IntegerType.INSTANCE) + .addScalar("CVECATEGORIA", StringType.INSTANCE) + .addScalar("DESCCATEGORIA", StringType.INSTANCE); + + query.setResultTransformer(new DatosPassageiroResultTransformer()); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + List passageiros = query.list(); + for (PacoteVO pacote : pacotes) { + for (PassageiroVO passageiro : passageiros) { + if (passageiro.getVendapacoteId().equals(pacote.getVendapacoteId())) { + if (pacote.getPax() == null) { + pacote.setPax(new ArrayList()); + } + pacote.getPax().add(passageiro); + } + } + } + } + + @SuppressWarnings("unchecked") + private void carregarDadosEnderecoApanhe(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, EA.LOCAL, EA.DESCHOTEL, EA.CEP, EA.ENDERECO, EA.NUMERO, EA.COMPLEMENTO, EA.CIDADE, EA.BAIRRO, EA.REFERENCIA ") + .append("FROM ENDERECO_APANHE EA ") + .append("JOIN VENDA_PACOTE VP ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") + .append("WHERE EA.ACTIVO = 1 "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("LOCAL", IntegerType.INSTANCE) + .addScalar("CEP", StringType.INSTANCE) + .addScalar("ENDERECO", StringType.INSTANCE) + .addScalar("NUMERO", StringType.INSTANCE) + .addScalar("COMPLEMENTO", StringType.INSTANCE) + .addScalar("CIDADE", StringType.INSTANCE) + .addScalar("BAIRRO", StringType.INSTANCE) + .addScalar("REFERENCIA", StringType.INSTANCE) + .addScalar("DESCHOTEL", StringType.INSTANCE); + + query.setResultTransformer(new DatosEnderecoApanheResultTransformer()); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + List enderecosApanhe = query.list(); + for (PacoteVO pacote : pacotes) { + for (EnderecoApanheVO enderecoApanhe : enderecosApanhe) { + if (enderecoApanhe.getVendapacoteId().equals(pacote.getVendapacoteId())) { + pacote.setEnderecoApanhe(enderecoApanhe); + } + } + } + } + + @SuppressWarnings("unchecked") + private void carregarDadosItemPacotes(List pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT IA.DESCITEMADICIONAL, VP.VENDAPACOTE_ID, PI.ITEMADICIONAL_ID ") + .append("FROM ITEM_ADICIONAL IA ") + .append("JOIN PACOTE_ITEM PI ON IA.ITEMADICIONAL_ID = PI.ITEMADICIONAL_ID ") + .append("JOIN PACOTE P ON P.PACOTE_ID = PI.PACOTE_ID ") + .append("JOIN VENDA_PACOTE VP ON VP.PACOTE_ID = P.PACOTE_ID ") + .append("WHERE IA.ACTIVO = 1 "); + + adicionarFiltros(sQuery, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("DESCITEMADICIONAL", StringType.INSTANCE) + .addScalar("VENDAPACOTE_ID", LongType.INSTANCE) + .addScalar("ITEMADICIONAL_ID", LongType.INSTANCE); + + query.setResultTransformer(new DatosItemAdicionalResultTransformer()); + adicionarFiltros(query, fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + + List itens = query.list(); + for (PacoteVO pacote : pacotes) { + for (ItemAdicionalVO itemAdicional : itens) { + if (itemAdicional.getVendapacoteId().equals(pacote.getVendapacoteId())) { + if (pacote.getItens() == null) { + pacote.setItens(new ArrayList()); + } + pacote.getItens().add(itemAdicional); + } + } + } + } + + @SuppressWarnings("unchecked") + private void carregarDadosDeposito(PacoteVO pacote, PagamentoVO pagamento) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT CDDP.IDENTIFICACAO_DEPOSITO, CDDP.IMPORTE, CDDP.FECDEPOSITO ") + .append("FROM CAJA_DET_DEPOSITO_PAGO CDDP ") + .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOSPAGO_ID = CDDP.CAJADIVERSOSPAGO_ID ") + .append("JOIN CAJA_DIVERSOS CD ON CD.CAJADIVERSOS_ID = CDP.CAJADIVERSOS_ID ") + .append("WHERE CDDP.ACTIVO = 1 ") + .append("AND CD.VENDAPACOTE_ID = :vendapacoteId ") + .append("AND CDP.FORMAPAGO_ID = :formapagoId "); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("IDENTIFICACAO_DEPOSITO", StringType.INSTANCE) + .addScalar("IMPORTE", BigDecimalType.INSTANCE) + .addScalar("FECDEPOSITO", DateType.INSTANCE); + + query.setResultTransformer(new DatosDadosBancarioResultTransformer()); + query.setParameter("vendapacoteId", pacote.getVendapacoteId()); + query.setParameter("formapagoId", pagamento.getFormapagoId()); + + List dadosBancarios = query.list(); + if (dadosBancarios != null && !dadosBancarios.isEmpty()) { + pagamento.setDadosBancarios(dadosBancarios); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 06103e5bd..b94c5e219 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -1,734 +1,734 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.hibernate.Query; -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.BooleanType; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.LongType; -import org.hibernate.type.StringType; -import org.hibernate.type.TimestampType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CajaDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Caja; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.enums.TipoFormapago; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoFormapagoException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaFormapagoException; -import com.rjconsultores.ventaboletos.utilerias.OcdUtil; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosDadosBancarioResultTransformer; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.RelatorioVendaCartaoCashMonitorResultTransformer; -import com.rjconsultores.ventaboletos.vo.caja.CajaCerradoVO; -import com.rjconsultores.ventaboletos.vo.caja.CajaDetalleVO; -import com.rjconsultores.ventaboletos.vo.caja.CajaVO; -import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; -import com.rjconsultores.ventaboletos.vo.caja.PagamentoVO; -import com.rjconsultores.ventaboletos.vo.caja.ReceitaDespesaVO; -import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; -import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; -import com.rjconsultores.ventaboletos.vo.cashmonitor.RelatorioVendaCartaoCashMonitorVO; - -@Repository("cajaDAO") -@SuppressWarnings("unchecked") -public class CajaHibernateDAO extends GenericHibernateDAO implements CajaDAO { - - private static Logger log = LogManager.getLogger(CajaHibernateDAO.class); - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public CajaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta) { - List list = new ArrayList(); - HashMap map = new HashMap(); - - String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarCajaFecha(yaCerrado, fechaDesde, fechaHasta); - SQLQuery sql = getSession().createSQLQuery(sqlBuscarCajaFecha) - .addScalar("cajaId", LongType.INSTANCE) - .addScalar("numAsiento", StringType.INSTANCE) - .addScalar("categoriaId", IntegerType.INSTANCE) - .addScalar("numFolioSistema", StringType.INSTANCE) - .addScalar("claseServicioId", IntegerType.INSTANCE) - .addScalar("marcaId", IntegerType.INSTANCE) - .addScalar("origenId", IntegerType.INSTANCE) - .addScalar("destinoId", IntegerType.INSTANCE) - .addScalar("corridaId", IntegerType.INSTANCE) - .addScalar("fecCorrida", DateType.INSTANCE) - .addScalar("nombPasajero", StringType.INSTANCE) - .addScalar("precioBase", BigDecimalType.INSTANCE) - .addScalar("precioPagado", BigDecimalType.INSTANCE) - .addScalar("tipoVentaId", IntegerType.INSTANCE) - .addScalar("numSeriePreimpresa", StringType.INSTANCE) - .addScalar("numFolioPreImpreso", StringType.INSTANCE) - .addScalar("fecHorViaje", TimestampType.INSTANCE) - .addScalar("fecHorVenta", TimestampType.INSTANCE) - .addScalar("puntoVentaId", IntegerType.INSTANCE) - .addScalar("numPuntoVenta", StringType.INSTANCE) - .addScalar("numKmViaje", BigDecimalType.INSTANCE) - .addScalar("numOperacion", StringType.INSTANCE) - .addScalar("motivoCancelacionId", IntegerType.INSTANCE) - .addScalar("empresaPuntoVentaId", IntegerType.INSTANCE) - .addScalar("empresaCorridaId", IntegerType.INSTANCE) - .addScalar("turnoId", IntegerType.INSTANCE) - .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) - .addScalar("importePedagio", BigDecimalType.INSTANCE) - .addScalar("importeOutros", BigDecimalType.INSTANCE) - .addScalar("importeSeguro", BigDecimalType.INSTANCE) - .addScalar("rutaId", IntegerType.INSTANCE) - .addScalar("usuarioId", IntegerType.INSTANCE) - .addScalar("numAutorizacion", StringType.INSTANCE) - .addScalar("ordenSevicio", StringType.INSTANCE); - - sql.setResultTransformer(new AliasToBeanResultTransformer(CajaVO.class)); - - for (CajaVO cv : (List) sql.list()) { - if (map.containsKey(cv.getCajaId()) && map.get(cv.getCajaId()).getImporteTaxaEmbarque() != null && - !map.get(cv.getCajaId()).getImporteTaxaEmbarque().equals(0)) { - cv.setImporteTaxaEmbarque(new BigDecimal(0)); - } else { - map.put(cv.getCajaId(), cv); - } - list.add(cv); - } - - return list; - } - - @Override - public List buscarDetalleCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote) { - - String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarDatosCaja(fechaDesde, fechaHasta, sembilhetesPacote); - - SQLQuery sql = getSession().createSQLQuery(sqlBuscarCajaFecha) - .addScalar("cajaId", LongType.INSTANCE) - .addScalar("numAsiento", StringType.INSTANCE) - .addScalar("categoriaId", IntegerType.INSTANCE) - .addScalar("numFolioSistema", StringType.INSTANCE) - .addScalar("claseServicioId", IntegerType.INSTANCE) - .addScalar("marcaId", IntegerType.INSTANCE) - .addScalar("origenId", IntegerType.INSTANCE) - .addScalar("destinoId", IntegerType.INSTANCE) - .addScalar("corridaId", IntegerType.INSTANCE) - .addScalar("fecCorrida", DateType.INSTANCE) - .addScalar("nombPasajero", StringType.INSTANCE) - .addScalar("precioBase", BigDecimalType.INSTANCE) - .addScalar("precioPagado", BigDecimalType.INSTANCE) - .addScalar("tipoVentaId", IntegerType.INSTANCE) - .addScalar("numSeriePreimpresa", StringType.INSTANCE) - .addScalar("numFolioPreImpreso", StringType.INSTANCE) - .addScalar("fecHorViaje", TimestampType.INSTANCE) - .addScalar("fecHorVenta", TimestampType.INSTANCE) - .addScalar("puntoVentaId", IntegerType.INSTANCE) - .addScalar("numPuntoVenta", StringType.INSTANCE) - .addScalar("numKmViaje", BigDecimalType.INSTANCE) - .addScalar("numOperacion", StringType.INSTANCE) - .addScalar("motivoCancelacionId", IntegerType.INSTANCE) - .addScalar("empresaPuntoVentaId", IntegerType.INSTANCE) - .addScalar("empresaCorridaId", IntegerType.INSTANCE) - .addScalar("turnoId", IntegerType.INSTANCE) - .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) - .addScalar("importePedagio", BigDecimalType.INSTANCE) - .addScalar("importeOutros", BigDecimalType.INSTANCE) - .addScalar("importeSeguro", BigDecimalType.INSTANCE) - .addScalar("rutaId", IntegerType.INSTANCE) - .addScalar("usuarioId", IntegerType.INSTANCE) - .addScalar("numAutorizacion", StringType.INSTANCE) - .addScalar("ordenSevicio", StringType.INSTANCE) - .addScalar("descPago", StringType.INSTANCE) - .addScalar("cveCategoria", StringType.INSTANCE) - .addScalar("formaPagoId", IntegerType.INSTANCE) - .addScalar("vlrFormaPago", BigDecimalType.INSTANCE) - .addScalar("descMotivo", StringType.INSTANCE) - .addScalar("transacaoId", LongType.INSTANCE) - .addScalar("transacaooriginalId", LongType.INSTANCE) - .addScalar("descnumdoc", StringType.INSTANCE) - .addScalar("descnumdoc2", StringType.INSTANCE) - .addScalar("desctipodoc", StringType.INSTANCE) - .addScalar("desctipodoc2", StringType.INSTANCE) - .addScalar("desctelefono", StringType.INSTANCE) - .addScalar("tipotarjeta", StringType.INSTANCE) - .addScalar("cantparcelas", IntegerType.INSTANCE) - .addScalar("numtarjeta", StringType.INSTANCE) - .addScalar("fecoperacion", TimestampType.INSTANCE) - .addScalar("nombtitular", StringType.INSTANCE) - .addScalar("ocdId", LongType.INSTANCE) - .addScalar("numoperacionOcd", StringType.INSTANCE) - .addScalar("notacreditovendapacoteId", LongType.INSTANCE) - .addScalar("operadoracartao", StringType.INSTANCE) - .addScalar("cvesecretaria", StringType.INSTANCE) - .addScalar("tipoPago", IntegerType.INSTANCE) - .addScalar("indEncargoVenta", BooleanType.INSTANCE) - .addScalar("descconvenio", StringType.INSTANCE) - .addScalar("cveconvenio", StringType.INSTANCE) - .addScalar("descsecretaria", StringType.INSTANCE); - - sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); - - List lsBusca = sql.list(); - - List lsResultado = new ArrayList(); - - for (CajaDetalleVO cd : lsBusca) { - - int indexOf = lsResultado.indexOf(cd); - - CajaDetalleVO cajaDetalleVO = null; - - if (indexOf != -1) { - cajaDetalleVO = lsResultado.get(indexOf); - } else { - cajaDetalleVO = cd; - } - - if (cajaDetalleVO.getFormaspagamento() == null) { - cajaDetalleVO.setFormaspagamento(new ArrayList()); - } - - if (!cd.getDescPago().equalsIgnoreCase("TROCA DE PASSAGEM")) { - PagamentoVO pagamentoVO = new PagamentoVO(); - pagamentoVO.setFormapagamento(cd.getDescPago()); - pagamentoVO.setMoeda("R$"); - pagamentoVO.setValor(cd.getVlrFormaPago()); - pagamentoVO.setIdentificacaoEmpresa(cd.getCvesecretaria()); - pagamentoVO.setRazaoSocial(cd.getDescsecretaria()); - - if (cd.getNotacreditovendapacoteId() != null) { - NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); - notacredito.setVouchernotacredito(cd.getNotacreditovendapacoteId().toString()); - pagamentoVO.setNotacredito(notacredito); - } - - if (cd.getOcdId() != null) { - NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); - notacredito.setVouchernotacredito(OcdUtil.generaLocalizadorOCD(cd.getNumoperacionOcd(), cd.getOcdId())); - pagamentoVO.setNotacredito(notacredito); - } - - if (StringUtils.isNotBlank(cd.getNumAutorizacion())) { - PagamentoCartaoVO cartao = new PagamentoCartaoVO(); - cartao.setNumautorizacao(cd.getNumAutorizacion()); - cartao.setBandeira(cd.getTipotarjeta()); - cartao.setDatapagamento(cd.getFecoperacion()); - cartao.setNumcartao(cd.getNumtarjeta()); - cartao.setParcelas(cd.getCantparcelas()); - cartao.setTitular(cd.getNombtitular()); - cartao.setOperadoracartao(cd.getOperadoracartao()); - - pagamentoVO.setCartao(cartao); - } - - cajaDetalleVO.getFormaspagamento().add(pagamentoVO); - - if (pagamentoVO.getDadosBancarios() == null) { - pagamentoVO.setDadosBancarios(new ArrayList()); - } - - if (isPagamentoDeposito(TipoFormapago.getTipoFormapagoByValor(cd.getTipoPago()))) { - pagamentoVO.getDadosBancarios().addAll(carregarDadosDeposito(cd.getCajaId(), cd.getFormaPagoId())); - } - - if (pagamentoVO.getDadosBancarios().isEmpty()) { - pagamentoVO.setDadosBancarios(null); - } - } - if (indexOf == -1) { - lsResultado.add(cajaDetalleVO); - } - } - - List filtrados = new ArrayList(); - for (CajaDetalleVO c : lsResultado) { - if (c.getFormaspagamento() != null && !c.getFormaspagamento().isEmpty() && !existeApenasFpReserva(c)) { - filtrados.add(c); - } - } - - return filtrados; - } - - private Boolean existeApenasFpReserva(CajaDetalleVO c) { - if (c.getFormaspagamento().size() == 1 - && c.getFormaspagamento().get(0).getFormapagamento().equals("RESERVA")) { - return true; - } - - return false; - } - - @Override - public List buscarCajaCerrado(Date fecha, String cveusuario, String turnoid) { - return buscarCajaCerrado(fecha, cveusuario, turnoid, false); - } - - @Override - public List buscarUsuarioCerrado(Date fecha) { - return buscarCajaCerrado(fecha, "*", "*", true); - } - - private List buscarCajaCerrado(Date fecha, String cveusuario, String turnoid, boolean sinDatosCaja) { - List list = new ArrayList(); - HashMap map = new HashMap(); - - try { - String sqlBuscarUsuariosCajaCerrado = sqlBuilder.getSQLBuscarUsuariosCajaCerrado(fecha, cveusuario, turnoid); - - SQLQuery sql = getSession().createSQLQuery(sqlBuscarUsuariosCajaCerrado) - .addScalar("usuarioId", IntegerType.INSTANCE) - .addScalar("cveusuario", StringType.INSTANCE) - .addScalar("puntoVentaId", IntegerType.INSTANCE) - .addScalar("numPuntoVenta", StringType.INSTANCE) - .addScalar("fecCorte", DateType.INSTANCE) - .addScalar("turnoId", IntegerType.INSTANCE) - .addScalar("importeTotal", BigDecimalType.INSTANCE); - - sql.setResultTransformer(new AliasToBeanResultTransformer(UsuarioVO.class)); - - List usuarios = sql.list(); - if (sinDatosCaja) { - return usuarios; - } - for (UsuarioVO u : usuarios) { - String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarCajaCerrado(u.getUsuarioId(), fecha, turnoid); - - sql = getSession().createSQLQuery(sqlBuscarCajaFecha) - .addScalar("cajaId", LongType.INSTANCE) - .addScalar("numFolioSistema", StringType.INSTANCE) - .addScalar("origen", StringType.INSTANCE) - .addScalar("destino", StringType.INSTANCE) - .addScalar("corridaId", IntegerType.INSTANCE) - .addScalar("precioPagado", BigDecimalType.INSTANCE) - .addScalar("fecHorVenta", DateType.INSTANCE) - .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) - .addScalar("ruta", StringType.INSTANCE) - .addScalar("numAutorizacion", StringType.INSTANCE) - .addScalar("ordenSevicio", StringType.INSTANCE) - .addScalar("secretaria", StringType.INSTANCE) - .addScalar("cvesecretaria", StringType.INSTANCE) - .addScalar("emissorTarjeta", StringType.INSTANCE) - .addScalar("tipoPasaje", StringType.INSTANCE) - .addScalar("formaPago", StringType.INSTANCE); - - sql.setResultTransformer(new AliasToBeanResultTransformer(CajaCerradoVO.class)); - - for (CajaCerradoVO cv : (List) sql.list()) { - if (map.containsKey(cv.getCajaId()) && map.get(cv.getCajaId()).getImporteTaxaEmbarque() != null && - !map.get(cv.getCajaId()).getImporteTaxaEmbarque().equals(0)) { - cv.setImporteTaxaEmbarque(new BigDecimal(0)); - } else { - map.put(cv.getCajaId(), cv); - } - list.add(cv); - } - - u.setPasajes(list); - - String sqlBuscarReceitaDespesa = sqlBuilder.getSQLBuscarReceitasDespesasCaja(u.getUsuarioId(), fecha); - sql = getSession().createSQLQuery(sqlBuscarReceitaDespesa) - .addScalar("precio", BigDecimalType.INSTANCE) - .addScalar("tipoEvento", StringType.INSTANCE); - sql.setResultTransformer(new AliasToBeanResultTransformer(ReceitaDespesaVO.class)); - u.setDiversos(sql.list()); - } - return usuarios; - } catch (Exception e) { - log.error("", e); - - return null; - } - } - - @Override - @Transactional(rollbackFor = { BusinessException.class, VendaEmbarcadaBoletoException.class, VendaEmbarcadaBoletoFormapagoException.class, VendaEmbarcadaCajaException.class, VendaEmbarcadaCajaFormapagoException.class }) - public void gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException, VendaEmbarcadaBoletoFormapagoException, VendaEmbarcadaCajaException, VendaEmbarcadaCajaFormapagoException { - inserirBoletoVendaEmbarcada(vendaEmbarcada); - inserirBoletoFormaPagoVendaEmbarcada(vendaEmbarcada); - inserirCajaVendaEmbarcada(vendaEmbarcada); - inserirCajaFormaPagoVendaEmbarcada(vendaEmbarcada); - } - - private void inserirCajaVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaCajaException { - - try { - - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirCajaVendaEmbarcada()); - - vendaEmbarcada.setCajaId(obterIdCaja().longValue()); - - query.setLong("cajaId", vendaEmbarcada.getCajaId()); - query.setString("numAsiento", vendaEmbarcada.getNumAsiento()); - query.setInteger("categoriaId", vendaEmbarcada.getCategoriaId()); - query.setInteger("claseServicioId", vendaEmbarcada.getClaseServicioId()); - query.setInteger("marcaId", vendaEmbarcada.getMarcaId()); - query.setInteger("origemId", vendaEmbarcada.getOrigemId()); - query.setInteger("destinoId", vendaEmbarcada.getDestinoId()); - query.setInteger("corridaId", vendaEmbarcada.getCorridaId()); - query.setDate("fecCorrida", vendaEmbarcada.getFecCorrida()); - query.setBigDecimal("precioBase", vendaEmbarcada.getPrecio()); - query.setBigDecimal("precioPagado", vendaEmbarcada.getPrecio()); - query.setInteger("tipoVentaId", vendaEmbarcada.getTipoVentaId()); - query.setDate("fechorViaje", vendaEmbarcada.getFechorViaje()); - query.setDate("fechorVenta", vendaEmbarcada.getFechorVenta()); - query.setInteger("puntoVentaId", vendaEmbarcada.getPuntoVentaId()); - query.setString("numOperacion", vendaEmbarcada.getNumOperacion()); - query.setBigInteger("empresaPuntoVentaId", vendaEmbarcada.getEmpresaId()); - query.setBigInteger("empresaCorridaId", vendaEmbarcada.getEmpresaId()); - query.setInteger("estacionId", vendaEmbarcada.getEstacionId()); - query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); - query.setBigDecimal("importeTaxaEmbarque", vendaEmbarcada.getImporteTaxaEmbarque()); - query.setBigDecimal("importePedagio", vendaEmbarcada.getImportePedagio()); - query.setBigDecimal("importeOutros", vendaEmbarcada.getImporteOutros()); - query.setBigDecimal("importeSeguro", vendaEmbarcada.getImporteSeguro()); - query.setDate("fecCreacion", vendaEmbarcada.getFechorVenta()); - query.setInteger("rutaId", vendaEmbarcada.getRutaId()); - query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); - query.setString("numFolioPreimpresso", vendaEmbarcada.getNumFolioPreimpresso()); - query.setString("serieImpFiscal", vendaEmbarcada.getSerieImpFiscal()); - - if (query.executeUpdate() != 1) { - throw new VendaEmbarcadaCajaException("Erro ao gerar caixa venda embarcada"); - } - - } catch (VendaEmbarcadaCajaException e) { - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new VendaEmbarcadaCajaException(e.getMessage(), e); - } - - } - - private void inserirCajaFormaPagoVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaCajaFormapagoException { - try { - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirCajaFormaPagoVendaEmbarcada()); - - query.setInteger("formaPagoId", vendaEmbarcada.getFormaPagoId()); - query.setLong("cajaId", vendaEmbarcada.getCajaId()); - query.setBigDecimal("importe", vendaEmbarcada.getPrecio()); - query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); - query.setLong("cajaFormaPagoId", obterIdCajaFormaPago().longValue()); - query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); - - if (query.executeUpdate() != 1) { - throw new VendaEmbarcadaCajaFormapagoException("Erro ao gerar forma de pagamento do caixa venda embarcada"); - } - - } catch (VendaEmbarcadaCajaFormapagoException e) { - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new VendaEmbarcadaCajaFormapagoException(e.getMessage(), e); - } - } - - private void inserirBoletoVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException { - try { - - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirBoletoVendaEmbarcada()); - - vendaEmbarcada.setBoletoId(obterIdBoleto().longValue()); - vendaEmbarcada.setNumOperacion(obterNumOperacion().toString()); - - query.setBigInteger("empresaCorridaId", vendaEmbarcada.getEmpresaId()); - query.setInteger("destinoId", vendaEmbarcada.getDestinoId()); - query.setInteger("tipoVentaId", vendaEmbarcada.getTipoVentaId()); - query.setInteger("categoriaId", vendaEmbarcada.getCategoriaId()); - query.setInteger("corridaId", vendaEmbarcada.getCorridaId()); - query.setInteger("claseServicioId", vendaEmbarcada.getClaseServicioId()); - query.setDate("fecCorrida", vendaEmbarcada.getFecCorrida()); - query.setInteger("puntoVentaId", vendaEmbarcada.getPuntoVentaId()); - query.setBigInteger("empresaPuntoVentaId", vendaEmbarcada.getEmpresaId()); - query.setInteger("origemId", vendaEmbarcada.getOrigemId()); - query.setInteger("marcaId", vendaEmbarcada.getMarcaId()); - query.setString("numAsiento", vendaEmbarcada.getNumAsiento()); - query.setBigDecimal("precioPagado", vendaEmbarcada.getPrecio()); - query.setDate("fechorViaje", vendaEmbarcada.getFechorViaje()); - query.setDate("fechorVenta", vendaEmbarcada.getFechorVenta()); - query.setString("numOperacion", vendaEmbarcada.getNumOperacion()); - query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); - query.setBigDecimal("precioBase", vendaEmbarcada.getPrecio()); - query.setInteger("estacionId", vendaEmbarcada.getEstacionId()); - query.setBigDecimal("importeTaxaEmbarque", vendaEmbarcada.getImporteTaxaEmbarque()); - query.setBigDecimal("importePedagio", vendaEmbarcada.getImportePedagio()); - query.setBigDecimal("importeOutros", vendaEmbarcada.getImporteOutros()); - query.setBigDecimal("importeSeguro", vendaEmbarcada.getImporteSeguro()); - query.setInteger("rutaId", vendaEmbarcada.getRutaId()); - query.setLong("boletoId", vendaEmbarcada.getBoletoId()); - query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); - query.setBigDecimal("precioPricing", vendaEmbarcada.getPrecio()); - query.setString("numFolioPreimpresso", vendaEmbarcada.getNumFolioPreimpresso()); - query.setString("serieImpFiscal", vendaEmbarcada.getSerieImpFiscal()); - - if (query.executeUpdate() != 1) { - throw new VendaEmbarcadaBoletoException("Erro ao gerar boleto venda embarcada"); - } - - } catch (VendaEmbarcadaBoletoException e) { - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new VendaEmbarcadaBoletoException(e.getMessage(), e); - } - } - - private void inserirBoletoFormaPagoVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoFormapagoException { - try { - - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirBoletoFormaPagoVendaEmbarcada()); - - query.setInteger("formaPagoId", vendaEmbarcada.getFormaPagoId()); - query.setLong("boletoId", vendaEmbarcada.getBoletoId()); - query.setBigDecimal("importe", vendaEmbarcada.getPrecio()); - query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); - query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); - query.setBigDecimal("boletoFormaPagoId", obterIdBoletoFormaPago()); - - if (query.executeUpdate() != 1) { - throw new VendaEmbarcadaBoletoFormapagoException("Erro ao gerar forma de pagamento do boleto venda embarcada"); - } - - } catch (VendaEmbarcadaBoletoFormapagoException e) { - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new VendaEmbarcadaBoletoFormapagoException(e.getMessage(), e); - } - } - - private BigDecimal obterIdBoletoFormaPago() { - SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceBoletoFormaPago()); - - return gerarChave((BigDecimal) sql.uniqueResult()); - } - - private BigDecimal obterIdCajaFormaPago() { - SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceCajaFormaPago()); - - return gerarChave((BigDecimal) sql.uniqueResult()); - } - - private BigDecimal obterIdBoleto() { - SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceCajaFormaPago()); - - return gerarChave((BigDecimal) sql.uniqueResult()); - } - - private BigDecimal obterIdCaja() { - SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceCaja()); - - return gerarChave((BigDecimal) sql.uniqueResult()); - } - - private BigDecimal obterNumOperacion() { - SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenciaNumOperacion()); - - return gerarChave((BigDecimal) sql.uniqueResult()); - } - - private BigDecimal gerarChave(BigDecimal seq) { - Integer tamChave = 13; - - String chave = "1"; - - --tamChave; - - while ((seq.toString().length() + chave.length()) <= (tamChave)) { - chave += "0"; - } - - return new BigDecimal(chave += seq); - } - - private List carregarDadosDeposito(Long cajaId, Integer formapagoId) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT CDDP.IDENTIFICACAO_DEPOSITO, CDDP.IMPORTE, CDDP.FECDEPOSITO ") - .append("FROM CAJA_DET_DEPOSITO_PAGO CDDP ") - .append("JOIN CAJA_FORMAPAGO CFP ON CFP.CAJAFORMAPAGO_ID = CDDP.CAJAFORMAPAGO_ID ") - .append("WHERE CDDP.ACTIVO = 1 ") - .append("AND CFP.CAJA_ID = :cajaId ") - .append("AND CFP.FORMAPAGO_ID = :formapagoId "); - - SQLQuery query = getSession().createSQLQuery(sQuery.toString()) - .addScalar("IDENTIFICACAO_DEPOSITO", StringType.INSTANCE) - .addScalar("IMPORTE", BigDecimalType.INSTANCE) - .addScalar("FECDEPOSITO", DateType.INSTANCE); - - query.setResultTransformer(new DatosDadosBancarioResultTransformer()); - query.setParameter("cajaId", cajaId); - query.setParameter("formapagoId", formapagoId); - - return query.list(); - } - - private boolean isPagamentoDeposito(TipoFormapago tipoFormapago) { - return TipoFormapago.DEPOSITO.equals(tipoFormapago); - } - - @Override - public Map> buscarCajaYTarjeta(String... numoperacionList) { - - String queryString = "SELECT DISTINCT c FROM Caja c " - + "LEFT JOIN FETCH c.cajaFormaPago cfp " - + "LEFT JOIN FETCH cfp.cajaDetPago cdp " - + "LEFT JOIN FETCH cdp.cajaTarjetas ct " - + "WHERE c.numoperacion IN(:numoperacion) "; - - Query query = getSession().createQuery(queryString); - query.setParameterList("numoperacion", numoperacionList); - - List cajaList = query.list(); - HashMap> result = new HashMap>(); - for (Caja caja : cajaList) { - String numoperacion = caja.getNumoperacion(); - List cajaListTemp = result.get(numoperacion); - if (cajaListTemp == null) { - cajaListTemp = new ArrayList(); - result.put(numoperacion, cajaListTemp); - } - cajaListTemp.add(caja); - } - - return result; - - } - - @Override - @Transactional(rollbackFor = { BusinessException.class }) - public Integer atualizaCajasIntegracaoTotvs(Marca marca, Date dataIncial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException { - - // update caja set integradototvs = 0 where PUNTOVENTA_ID = 269 and FECHORVENTA >= '30/03/2018' and FECHORVENTA <= '01/04/2018'; - StringBuilder sb = new StringBuilder(); - sb.append(" update caja set integradototvs = 2, CONTADORINTEGRADOTOTVS = 0 "); - sb.append(" where FECHORVENTA >= :fechorInicial "); - sb.append(" and FECHORVENTA <= :fechorFinal "); - sb.append(" and PUNTOVENTA_ID = :puntoVentaId "); - if (marca != null) { - sb.append(" and MARCA_ID = :marcaId "); - } - SQLQuery query = getSession().createSQLQuery(sb.toString()); - if (marca != null) { - query.setInteger("marcaId", marca.getMarcaId()); - } - query.setInteger("puntoVentaId", puntoVenta.getPuntoventaId()); - query.setTimestamp("fechorInicial", dataIncial); - query.setTimestamp("fechorFinal", dataFinal); - Integer result = query.executeUpdate(); - return result; - } - - @Override - public List buscarVendaCartaoCashMonitor(Date dataIncial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta) { - SimpleDateFormat formatadorData = new SimpleDateFormat("dd/MM/yyyy"); - - StringBuilder sql = new StringBuilder(); - sql.append("select to_char(ct.fecoperacion, 'dd/mm/yyyy') as data_transacao, "); - sql.append("pv.nombpuntoventa as loja, "); - sql.append("ct.nombtitular as adquirente, "); - sql.append("ct.nsu as nsu, "); - sql.append("ct.numautorizacion as autorizacao, "); - sql.append("sum(cfp.importe) as valor_bruto, "); - sql.append("fp.formapago_id as formapago_id, "); - sql.append("ct.tipotarjeta as bandeira, "); - sql.append("c.numoperacion as codigo_pedido, "); - sql.append("cfp.importe valor_parcela, "); - sql.append("count(ct.cajatarjeta_id) as parcelas "); - sql.append("from caja c "); - sql.append("inner join caja_formapago cfp on c.caja_id = cfp.caja_id and cfp.activo = 1 "); - sql.append("inner join marca ma on ma.marca_id = c.marca_id "); - sql.append("inner join forma_pago fp on cfp.formapago_id = fp.formapago_id "); - sql.append("inner join caja_det_pago cdp on c.caja_id = cdp.caja_id and cdp.cajaformapago_id = cfp.cajaformapago_id "); - sql.append("inner join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); - sql.append("inner join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sql.append("where c.activo = 1 "); - sql.append("and c.indreimpresion = 0 "); - sql.append("and fp.formapago_id in (2, 3) "); // Débito e Crédito - sql.append("and ct.fecoperacion between to_date('" + formatadorData.format(dataIncial) + " 00:00', 'dd/mm/yyyy hh24:mi') and to_date('" + formatadorData.format(dataFinal) + " 23:59', 'dd/mm/yyyy hh24:mi') "); - - if (empresa!=null) { - sql.append(" and ma.empresa_id = " + empresa.getEmpresaId()); - } - - if (puntoVenta!=null) { - sql.append(" and c.puntoventa_id = " + puntoVenta.getPuntoventaId()); - } - - sql.append(" group by to_char(ct.fecoperacion, 'dd/mm/yyyy'), pv.nombpuntoventa, ct.nombtitular, ct.nsu, ct.numautorizacion, fp.formapago_id, ct.tipotarjeta, c.numoperacion, cfp.importe"); - sql.append(" order by 1, 2, 3, 4, 5"); - - SQLQuery query = getSession().createSQLQuery(sql.toString()) - .addScalar("data_transacao", StringType.INSTANCE) - .addScalar("loja", StringType.INSTANCE) - .addScalar("adquirente", StringType.INSTANCE) - .addScalar("nsu", StringType.INSTANCE) - .addScalar("autorizacao", StringType.INSTANCE) - .addScalar("valor_bruto", BigDecimalType.INSTANCE) - .addScalar("formapago_id", IntegerType.INSTANCE) - .addScalar("bandeira", StringType.INSTANCE) - .addScalar("codigo_pedido", StringType.INSTANCE) - .addScalar("valor_parcela", BigDecimalType.INSTANCE) - .addScalar("parcelas", IntegerType.INSTANCE); - - query.setResultTransformer(new RelatorioVendaCartaoCashMonitorResultTransformer()); - - return query.list(); - } - - @Override - public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal) { - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT tb.folio from ( "); - sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio "); - sql.append(" FROM caja "); - sql.append(" where activo = 1 "); - sql.append(" and numseriepreimpresa = :serie "); - sql.append(" and to_number(numfoliopreimpreso) between :folioInicial and :folioFinal "); - sql.append(" union all "); - sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio "); - sql.append(" FROM caja_diversos "); - sql.append(" where activo = 1 "); - sql.append(" and numseriepreimpresa = :serie "); - sql.append(" and to_number(numfoliopreimpreso) between :folioInicial and :folioFinal "); - sql.append(" )tb "); - sql.append(" where tb.folio > 0 "); - sql.append(" group by tb.folio "); - - - SQLQuery query = getSession().createSQLQuery(sql.toString()); - query.setString("serie", aidf.obterSerieSubserieFormatada()); - query.setString("folioInicial", folioInicial); - query.setString("folioFinal", folioFinal); - return (String)query.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.hibernate.Query; +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.BooleanType; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.LongType; +import org.hibernate.type.StringType; +import org.hibernate.type.TimestampType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CajaDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Caja; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.enums.TipoFormapago; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoFormapagoException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaFormapagoException; +import com.rjconsultores.ventaboletos.utilerias.OcdUtil; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.DatosDadosBancarioResultTransformer; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer.RelatorioVendaCartaoCashMonitorResultTransformer; +import com.rjconsultores.ventaboletos.vo.caja.CajaCerradoVO; +import com.rjconsultores.ventaboletos.vo.caja.CajaDetalleVO; +import com.rjconsultores.ventaboletos.vo.caja.CajaVO; +import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; +import com.rjconsultores.ventaboletos.vo.caja.PagamentoVO; +import com.rjconsultores.ventaboletos.vo.caja.ReceitaDespesaVO; +import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; +import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; +import com.rjconsultores.ventaboletos.vo.cashmonitor.RelatorioVendaCartaoCashMonitorVO; + +@Repository("cajaDAO") +@SuppressWarnings("unchecked") +public class CajaHibernateDAO extends GenericHibernateDAO implements CajaDAO { + + private static Logger log = LogManager.getLogger(CajaHibernateDAO.class); + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public CajaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta) { + List list = new ArrayList(); + HashMap map = new HashMap(); + + String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarCajaFecha(yaCerrado, fechaDesde, fechaHasta); + SQLQuery sql = getSession().createSQLQuery(sqlBuscarCajaFecha) + .addScalar("cajaId", LongType.INSTANCE) + .addScalar("numAsiento", StringType.INSTANCE) + .addScalar("categoriaId", IntegerType.INSTANCE) + .addScalar("numFolioSistema", StringType.INSTANCE) + .addScalar("claseServicioId", IntegerType.INSTANCE) + .addScalar("marcaId", IntegerType.INSTANCE) + .addScalar("origenId", IntegerType.INSTANCE) + .addScalar("destinoId", IntegerType.INSTANCE) + .addScalar("corridaId", IntegerType.INSTANCE) + .addScalar("fecCorrida", DateType.INSTANCE) + .addScalar("nombPasajero", StringType.INSTANCE) + .addScalar("precioBase", BigDecimalType.INSTANCE) + .addScalar("precioPagado", BigDecimalType.INSTANCE) + .addScalar("tipoVentaId", IntegerType.INSTANCE) + .addScalar("numSeriePreimpresa", StringType.INSTANCE) + .addScalar("numFolioPreImpreso", StringType.INSTANCE) + .addScalar("fecHorViaje", TimestampType.INSTANCE) + .addScalar("fecHorVenta", TimestampType.INSTANCE) + .addScalar("puntoVentaId", IntegerType.INSTANCE) + .addScalar("numPuntoVenta", StringType.INSTANCE) + .addScalar("numKmViaje", BigDecimalType.INSTANCE) + .addScalar("numOperacion", StringType.INSTANCE) + .addScalar("motivoCancelacionId", IntegerType.INSTANCE) + .addScalar("empresaPuntoVentaId", IntegerType.INSTANCE) + .addScalar("empresaCorridaId", IntegerType.INSTANCE) + .addScalar("turnoId", IntegerType.INSTANCE) + .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) + .addScalar("importePedagio", BigDecimalType.INSTANCE) + .addScalar("importeOutros", BigDecimalType.INSTANCE) + .addScalar("importeSeguro", BigDecimalType.INSTANCE) + .addScalar("rutaId", IntegerType.INSTANCE) + .addScalar("usuarioId", IntegerType.INSTANCE) + .addScalar("numAutorizacion", StringType.INSTANCE) + .addScalar("ordenSevicio", StringType.INSTANCE); + + sql.setResultTransformer(new AliasToBeanResultTransformer(CajaVO.class)); + + for (CajaVO cv : (List) sql.list()) { + if (map.containsKey(cv.getCajaId()) && map.get(cv.getCajaId()).getImporteTaxaEmbarque() != null && + !map.get(cv.getCajaId()).getImporteTaxaEmbarque().equals(0)) { + cv.setImporteTaxaEmbarque(new BigDecimal(0)); + } else { + map.put(cv.getCajaId(), cv); + } + list.add(cv); + } + + return list; + } + + @Override + public List buscarDetalleCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote) { + + String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarDatosCaja(fechaDesde, fechaHasta, sembilhetesPacote); + + SQLQuery sql = getSession().createSQLQuery(sqlBuscarCajaFecha) + .addScalar("cajaId", LongType.INSTANCE) + .addScalar("numAsiento", StringType.INSTANCE) + .addScalar("categoriaId", IntegerType.INSTANCE) + .addScalar("numFolioSistema", StringType.INSTANCE) + .addScalar("claseServicioId", IntegerType.INSTANCE) + .addScalar("marcaId", IntegerType.INSTANCE) + .addScalar("origenId", IntegerType.INSTANCE) + .addScalar("destinoId", IntegerType.INSTANCE) + .addScalar("corridaId", IntegerType.INSTANCE) + .addScalar("fecCorrida", DateType.INSTANCE) + .addScalar("nombPasajero", StringType.INSTANCE) + .addScalar("precioBase", BigDecimalType.INSTANCE) + .addScalar("precioPagado", BigDecimalType.INSTANCE) + .addScalar("tipoVentaId", IntegerType.INSTANCE) + .addScalar("numSeriePreimpresa", StringType.INSTANCE) + .addScalar("numFolioPreImpreso", StringType.INSTANCE) + .addScalar("fecHorViaje", TimestampType.INSTANCE) + .addScalar("fecHorVenta", TimestampType.INSTANCE) + .addScalar("puntoVentaId", IntegerType.INSTANCE) + .addScalar("numPuntoVenta", StringType.INSTANCE) + .addScalar("numKmViaje", BigDecimalType.INSTANCE) + .addScalar("numOperacion", StringType.INSTANCE) + .addScalar("motivoCancelacionId", IntegerType.INSTANCE) + .addScalar("empresaPuntoVentaId", IntegerType.INSTANCE) + .addScalar("empresaCorridaId", IntegerType.INSTANCE) + .addScalar("turnoId", IntegerType.INSTANCE) + .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) + .addScalar("importePedagio", BigDecimalType.INSTANCE) + .addScalar("importeOutros", BigDecimalType.INSTANCE) + .addScalar("importeSeguro", BigDecimalType.INSTANCE) + .addScalar("rutaId", IntegerType.INSTANCE) + .addScalar("usuarioId", IntegerType.INSTANCE) + .addScalar("numAutorizacion", StringType.INSTANCE) + .addScalar("ordenSevicio", StringType.INSTANCE) + .addScalar("descPago", StringType.INSTANCE) + .addScalar("cveCategoria", StringType.INSTANCE) + .addScalar("formaPagoId", IntegerType.INSTANCE) + .addScalar("vlrFormaPago", BigDecimalType.INSTANCE) + .addScalar("descMotivo", StringType.INSTANCE) + .addScalar("transacaoId", LongType.INSTANCE) + .addScalar("transacaooriginalId", LongType.INSTANCE) + .addScalar("descnumdoc", StringType.INSTANCE) + .addScalar("descnumdoc2", StringType.INSTANCE) + .addScalar("desctipodoc", StringType.INSTANCE) + .addScalar("desctipodoc2", StringType.INSTANCE) + .addScalar("desctelefono", StringType.INSTANCE) + .addScalar("tipotarjeta", StringType.INSTANCE) + .addScalar("cantparcelas", IntegerType.INSTANCE) + .addScalar("numtarjeta", StringType.INSTANCE) + .addScalar("fecoperacion", TimestampType.INSTANCE) + .addScalar("nombtitular", StringType.INSTANCE) + .addScalar("ocdId", LongType.INSTANCE) + .addScalar("numoperacionOcd", StringType.INSTANCE) + .addScalar("notacreditovendapacoteId", LongType.INSTANCE) + .addScalar("operadoracartao", StringType.INSTANCE) + .addScalar("cvesecretaria", StringType.INSTANCE) + .addScalar("tipoPago", IntegerType.INSTANCE) + .addScalar("indEncargoVenta", BooleanType.INSTANCE) + .addScalar("descconvenio", StringType.INSTANCE) + .addScalar("cveconvenio", StringType.INSTANCE) + .addScalar("descsecretaria", StringType.INSTANCE); + + sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); + + List lsBusca = sql.list(); + + List lsResultado = new ArrayList(); + + for (CajaDetalleVO cd : lsBusca) { + + int indexOf = lsResultado.indexOf(cd); + + CajaDetalleVO cajaDetalleVO = null; + + if (indexOf != -1) { + cajaDetalleVO = lsResultado.get(indexOf); + } else { + cajaDetalleVO = cd; + } + + if (cajaDetalleVO.getFormaspagamento() == null) { + cajaDetalleVO.setFormaspagamento(new ArrayList()); + } + + if (!cd.getDescPago().equalsIgnoreCase("TROCA DE PASSAGEM")) { + PagamentoVO pagamentoVO = new PagamentoVO(); + pagamentoVO.setFormapagamento(cd.getDescPago()); + pagamentoVO.setMoeda("R$"); + pagamentoVO.setValor(cd.getVlrFormaPago()); + pagamentoVO.setIdentificacaoEmpresa(cd.getCvesecretaria()); + pagamentoVO.setRazaoSocial(cd.getDescsecretaria()); + + if (cd.getNotacreditovendapacoteId() != null) { + NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); + notacredito.setVouchernotacredito(cd.getNotacreditovendapacoteId().toString()); + pagamentoVO.setNotacredito(notacredito); + } + + if (cd.getOcdId() != null) { + NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); + notacredito.setVouchernotacredito(OcdUtil.generaLocalizadorOCD(cd.getNumoperacionOcd(), cd.getOcdId())); + pagamentoVO.setNotacredito(notacredito); + } + + if (StringUtils.isNotBlank(cd.getNumAutorizacion())) { + PagamentoCartaoVO cartao = new PagamentoCartaoVO(); + cartao.setNumautorizacao(cd.getNumAutorizacion()); + cartao.setBandeira(cd.getTipotarjeta()); + cartao.setDatapagamento(cd.getFecoperacion()); + cartao.setNumcartao(cd.getNumtarjeta()); + cartao.setParcelas(cd.getCantparcelas()); + cartao.setTitular(cd.getNombtitular()); + cartao.setOperadoracartao(cd.getOperadoracartao()); + + pagamentoVO.setCartao(cartao); + } + + cajaDetalleVO.getFormaspagamento().add(pagamentoVO); + + if (pagamentoVO.getDadosBancarios() == null) { + pagamentoVO.setDadosBancarios(new ArrayList()); + } + + if (isPagamentoDeposito(TipoFormapago.getTipoFormapagoByValor(cd.getTipoPago()))) { + pagamentoVO.getDadosBancarios().addAll(carregarDadosDeposito(cd.getCajaId(), cd.getFormaPagoId())); + } + + if (pagamentoVO.getDadosBancarios().isEmpty()) { + pagamentoVO.setDadosBancarios(null); + } + } + if (indexOf == -1) { + lsResultado.add(cajaDetalleVO); + } + } + + List filtrados = new ArrayList(); + for (CajaDetalleVO c : lsResultado) { + if (c.getFormaspagamento() != null && !c.getFormaspagamento().isEmpty() && !existeApenasFpReserva(c)) { + filtrados.add(c); + } + } + + return filtrados; + } + + private Boolean existeApenasFpReserva(CajaDetalleVO c) { + if (c.getFormaspagamento().size() == 1 + && c.getFormaspagamento().get(0).getFormapagamento().equals("RESERVA")) { + return true; + } + + return false; + } + + @Override + public List buscarCajaCerrado(Date fecha, String cveusuario, String turnoid) { + return buscarCajaCerrado(fecha, cveusuario, turnoid, false); + } + + @Override + public List buscarUsuarioCerrado(Date fecha) { + return buscarCajaCerrado(fecha, "*", "*", true); + } + + private List buscarCajaCerrado(Date fecha, String cveusuario, String turnoid, boolean sinDatosCaja) { + List list = new ArrayList(); + HashMap map = new HashMap(); + + try { + String sqlBuscarUsuariosCajaCerrado = sqlBuilder.getSQLBuscarUsuariosCajaCerrado(fecha, cveusuario, turnoid); + + SQLQuery sql = getSession().createSQLQuery(sqlBuscarUsuariosCajaCerrado) + .addScalar("usuarioId", IntegerType.INSTANCE) + .addScalar("cveusuario", StringType.INSTANCE) + .addScalar("puntoVentaId", IntegerType.INSTANCE) + .addScalar("numPuntoVenta", StringType.INSTANCE) + .addScalar("fecCorte", DateType.INSTANCE) + .addScalar("turnoId", IntegerType.INSTANCE) + .addScalar("importeTotal", BigDecimalType.INSTANCE); + + sql.setResultTransformer(new AliasToBeanResultTransformer(UsuarioVO.class)); + + List usuarios = sql.list(); + if (sinDatosCaja) { + return usuarios; + } + for (UsuarioVO u : usuarios) { + String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarCajaCerrado(u.getUsuarioId(), fecha, turnoid); + + sql = getSession().createSQLQuery(sqlBuscarCajaFecha) + .addScalar("cajaId", LongType.INSTANCE) + .addScalar("numFolioSistema", StringType.INSTANCE) + .addScalar("origen", StringType.INSTANCE) + .addScalar("destino", StringType.INSTANCE) + .addScalar("corridaId", IntegerType.INSTANCE) + .addScalar("precioPagado", BigDecimalType.INSTANCE) + .addScalar("fecHorVenta", DateType.INSTANCE) + .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) + .addScalar("ruta", StringType.INSTANCE) + .addScalar("numAutorizacion", StringType.INSTANCE) + .addScalar("ordenSevicio", StringType.INSTANCE) + .addScalar("secretaria", StringType.INSTANCE) + .addScalar("cvesecretaria", StringType.INSTANCE) + .addScalar("emissorTarjeta", StringType.INSTANCE) + .addScalar("tipoPasaje", StringType.INSTANCE) + .addScalar("formaPago", StringType.INSTANCE); + + sql.setResultTransformer(new AliasToBeanResultTransformer(CajaCerradoVO.class)); + + for (CajaCerradoVO cv : (List) sql.list()) { + if (map.containsKey(cv.getCajaId()) && map.get(cv.getCajaId()).getImporteTaxaEmbarque() != null && + !map.get(cv.getCajaId()).getImporteTaxaEmbarque().equals(0)) { + cv.setImporteTaxaEmbarque(new BigDecimal(0)); + } else { + map.put(cv.getCajaId(), cv); + } + list.add(cv); + } + + u.setPasajes(list); + + String sqlBuscarReceitaDespesa = sqlBuilder.getSQLBuscarReceitasDespesasCaja(u.getUsuarioId(), fecha); + sql = getSession().createSQLQuery(sqlBuscarReceitaDespesa) + .addScalar("precio", BigDecimalType.INSTANCE) + .addScalar("tipoEvento", StringType.INSTANCE); + sql.setResultTransformer(new AliasToBeanResultTransformer(ReceitaDespesaVO.class)); + u.setDiversos(sql.list()); + } + return usuarios; + } catch (Exception e) { + log.error("", e); + + return null; + } + } + + @Override + @Transactional(rollbackFor = { BusinessException.class, VendaEmbarcadaBoletoException.class, VendaEmbarcadaBoletoFormapagoException.class, VendaEmbarcadaCajaException.class, VendaEmbarcadaCajaFormapagoException.class }) + public void gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException, VendaEmbarcadaBoletoFormapagoException, VendaEmbarcadaCajaException, VendaEmbarcadaCajaFormapagoException { + inserirBoletoVendaEmbarcada(vendaEmbarcada); + inserirBoletoFormaPagoVendaEmbarcada(vendaEmbarcada); + inserirCajaVendaEmbarcada(vendaEmbarcada); + inserirCajaFormaPagoVendaEmbarcada(vendaEmbarcada); + } + + private void inserirCajaVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaCajaException { + + try { + + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirCajaVendaEmbarcada()); + + vendaEmbarcada.setCajaId(obterIdCaja().longValue()); + + query.setLong("cajaId", vendaEmbarcada.getCajaId()); + query.setString("numAsiento", vendaEmbarcada.getNumAsiento()); + query.setInteger("categoriaId", vendaEmbarcada.getCategoriaId()); + query.setInteger("claseServicioId", vendaEmbarcada.getClaseServicioId()); + query.setInteger("marcaId", vendaEmbarcada.getMarcaId()); + query.setInteger("origemId", vendaEmbarcada.getOrigemId()); + query.setInteger("destinoId", vendaEmbarcada.getDestinoId()); + query.setInteger("corridaId", vendaEmbarcada.getCorridaId()); + query.setDate("fecCorrida", vendaEmbarcada.getFecCorrida()); + query.setBigDecimal("precioBase", vendaEmbarcada.getPrecio()); + query.setBigDecimal("precioPagado", vendaEmbarcada.getPrecio()); + query.setInteger("tipoVentaId", vendaEmbarcada.getTipoVentaId()); + query.setDate("fechorViaje", vendaEmbarcada.getFechorViaje()); + query.setDate("fechorVenta", vendaEmbarcada.getFechorVenta()); + query.setInteger("puntoVentaId", vendaEmbarcada.getPuntoVentaId()); + query.setString("numOperacion", vendaEmbarcada.getNumOperacion()); + query.setBigInteger("empresaPuntoVentaId", vendaEmbarcada.getEmpresaId()); + query.setBigInteger("empresaCorridaId", vendaEmbarcada.getEmpresaId()); + query.setInteger("estacionId", vendaEmbarcada.getEstacionId()); + query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); + query.setBigDecimal("importeTaxaEmbarque", vendaEmbarcada.getImporteTaxaEmbarque()); + query.setBigDecimal("importePedagio", vendaEmbarcada.getImportePedagio()); + query.setBigDecimal("importeOutros", vendaEmbarcada.getImporteOutros()); + query.setBigDecimal("importeSeguro", vendaEmbarcada.getImporteSeguro()); + query.setDate("fecCreacion", vendaEmbarcada.getFechorVenta()); + query.setInteger("rutaId", vendaEmbarcada.getRutaId()); + query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); + query.setString("numFolioPreimpresso", vendaEmbarcada.getNumFolioPreimpresso()); + query.setString("serieImpFiscal", vendaEmbarcada.getSerieImpFiscal()); + + if (query.executeUpdate() != 1) { + throw new VendaEmbarcadaCajaException("Erro ao gerar caixa venda embarcada"); + } + + } catch (VendaEmbarcadaCajaException e) { + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new VendaEmbarcadaCajaException(e.getMessage(), e); + } + + } + + private void inserirCajaFormaPagoVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaCajaFormapagoException { + try { + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirCajaFormaPagoVendaEmbarcada()); + + query.setInteger("formaPagoId", vendaEmbarcada.getFormaPagoId()); + query.setLong("cajaId", vendaEmbarcada.getCajaId()); + query.setBigDecimal("importe", vendaEmbarcada.getPrecio()); + query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); + query.setLong("cajaFormaPagoId", obterIdCajaFormaPago().longValue()); + query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); + + if (query.executeUpdate() != 1) { + throw new VendaEmbarcadaCajaFormapagoException("Erro ao gerar forma de pagamento do caixa venda embarcada"); + } + + } catch (VendaEmbarcadaCajaFormapagoException e) { + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new VendaEmbarcadaCajaFormapagoException(e.getMessage(), e); + } + } + + private void inserirBoletoVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoException { + try { + + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirBoletoVendaEmbarcada()); + + vendaEmbarcada.setBoletoId(obterIdBoleto().longValue()); + vendaEmbarcada.setNumOperacion(obterNumOperacion().toString()); + + query.setBigInteger("empresaCorridaId", vendaEmbarcada.getEmpresaId()); + query.setInteger("destinoId", vendaEmbarcada.getDestinoId()); + query.setInteger("tipoVentaId", vendaEmbarcada.getTipoVentaId()); + query.setInteger("categoriaId", vendaEmbarcada.getCategoriaId()); + query.setInteger("corridaId", vendaEmbarcada.getCorridaId()); + query.setInteger("claseServicioId", vendaEmbarcada.getClaseServicioId()); + query.setDate("fecCorrida", vendaEmbarcada.getFecCorrida()); + query.setInteger("puntoVentaId", vendaEmbarcada.getPuntoVentaId()); + query.setBigInteger("empresaPuntoVentaId", vendaEmbarcada.getEmpresaId()); + query.setInteger("origemId", vendaEmbarcada.getOrigemId()); + query.setInteger("marcaId", vendaEmbarcada.getMarcaId()); + query.setString("numAsiento", vendaEmbarcada.getNumAsiento()); + query.setBigDecimal("precioPagado", vendaEmbarcada.getPrecio()); + query.setDate("fechorViaje", vendaEmbarcada.getFechorViaje()); + query.setDate("fechorVenta", vendaEmbarcada.getFechorVenta()); + query.setString("numOperacion", vendaEmbarcada.getNumOperacion()); + query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); + query.setBigDecimal("precioBase", vendaEmbarcada.getPrecio()); + query.setInteger("estacionId", vendaEmbarcada.getEstacionId()); + query.setBigDecimal("importeTaxaEmbarque", vendaEmbarcada.getImporteTaxaEmbarque()); + query.setBigDecimal("importePedagio", vendaEmbarcada.getImportePedagio()); + query.setBigDecimal("importeOutros", vendaEmbarcada.getImporteOutros()); + query.setBigDecimal("importeSeguro", vendaEmbarcada.getImporteSeguro()); + query.setInteger("rutaId", vendaEmbarcada.getRutaId()); + query.setLong("boletoId", vendaEmbarcada.getBoletoId()); + query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); + query.setBigDecimal("precioPricing", vendaEmbarcada.getPrecio()); + query.setString("numFolioPreimpresso", vendaEmbarcada.getNumFolioPreimpresso()); + query.setString("serieImpFiscal", vendaEmbarcada.getSerieImpFiscal()); + + if (query.executeUpdate() != 1) { + throw new VendaEmbarcadaBoletoException("Erro ao gerar boleto venda embarcada"); + } + + } catch (VendaEmbarcadaBoletoException e) { + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new VendaEmbarcadaBoletoException(e.getMessage(), e); + } + } + + private void inserirBoletoFormaPagoVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws VendaEmbarcadaBoletoFormapagoException { + try { + + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLInserirBoletoFormaPagoVendaEmbarcada()); + + query.setInteger("formaPagoId", vendaEmbarcada.getFormaPagoId()); + query.setLong("boletoId", vendaEmbarcada.getBoletoId()); + query.setBigDecimal("importe", vendaEmbarcada.getPrecio()); + query.setTimestamp("fecModIf", vendaEmbarcada.getFecModIf()); + query.setInteger("usuarioId", vendaEmbarcada.getUsuarioId()); + query.setBigDecimal("boletoFormaPagoId", obterIdBoletoFormaPago()); + + if (query.executeUpdate() != 1) { + throw new VendaEmbarcadaBoletoFormapagoException("Erro ao gerar forma de pagamento do boleto venda embarcada"); + } + + } catch (VendaEmbarcadaBoletoFormapagoException e) { + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new VendaEmbarcadaBoletoFormapagoException(e.getMessage(), e); + } + } + + private BigDecimal obterIdBoletoFormaPago() { + SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceBoletoFormaPago()); + + return gerarChave((BigDecimal) sql.uniqueResult()); + } + + private BigDecimal obterIdCajaFormaPago() { + SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceCajaFormaPago()); + + return gerarChave((BigDecimal) sql.uniqueResult()); + } + + private BigDecimal obterIdBoleto() { + SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceCajaFormaPago()); + + return gerarChave((BigDecimal) sql.uniqueResult()); + } + + private BigDecimal obterIdCaja() { + SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenceCaja()); + + return gerarChave((BigDecimal) sql.uniqueResult()); + } + + private BigDecimal obterNumOperacion() { + SQLQuery sql = getSession().createSQLQuery(sqlBuilder.getSQLObterSequenciaNumOperacion()); + + return gerarChave((BigDecimal) sql.uniqueResult()); + } + + private BigDecimal gerarChave(BigDecimal seq) { + Integer tamChave = 13; + + String chave = "1"; + + --tamChave; + + while ((seq.toString().length() + chave.length()) <= (tamChave)) { + chave += "0"; + } + + return new BigDecimal(chave += seq); + } + + private List carregarDadosDeposito(Long cajaId, Integer formapagoId) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT CDDP.IDENTIFICACAO_DEPOSITO, CDDP.IMPORTE, CDDP.FECDEPOSITO ") + .append("FROM CAJA_DET_DEPOSITO_PAGO CDDP ") + .append("JOIN CAJA_FORMAPAGO CFP ON CFP.CAJAFORMAPAGO_ID = CDDP.CAJAFORMAPAGO_ID ") + .append("WHERE CDDP.ACTIVO = 1 ") + .append("AND CFP.CAJA_ID = :cajaId ") + .append("AND CFP.FORMAPAGO_ID = :formapagoId "); + + SQLQuery query = getSession().createSQLQuery(sQuery.toString()) + .addScalar("IDENTIFICACAO_DEPOSITO", StringType.INSTANCE) + .addScalar("IMPORTE", BigDecimalType.INSTANCE) + .addScalar("FECDEPOSITO", DateType.INSTANCE); + + query.setResultTransformer(new DatosDadosBancarioResultTransformer()); + query.setParameter("cajaId", cajaId); + query.setParameter("formapagoId", formapagoId); + + return query.list(); + } + + private boolean isPagamentoDeposito(TipoFormapago tipoFormapago) { + return TipoFormapago.DEPOSITO.equals(tipoFormapago); + } + + @Override + public Map> buscarCajaYTarjeta(String... numoperacionList) { + + String queryString = "SELECT DISTINCT c FROM Caja c " + + "LEFT JOIN FETCH c.cajaFormaPago cfp " + + "LEFT JOIN FETCH cfp.cajaDetPago cdp " + + "LEFT JOIN FETCH cdp.cajaTarjetas ct " + + "WHERE c.numoperacion IN(:numoperacion) "; + + Query query = getSession().createQuery(queryString); + query.setParameterList("numoperacion", numoperacionList); + + List cajaList = query.list(); + HashMap> result = new HashMap>(); + for (Caja caja : cajaList) { + String numoperacion = caja.getNumoperacion(); + List cajaListTemp = result.get(numoperacion); + if (cajaListTemp == null) { + cajaListTemp = new ArrayList(); + result.put(numoperacion, cajaListTemp); + } + cajaListTemp.add(caja); + } + + return result; + + } + + @Override + @Transactional(rollbackFor = { BusinessException.class }) + public Integer atualizaCajasIntegracaoTotvs(Marca marca, Date dataIncial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException { + + // update caja set integradototvs = 0 where PUNTOVENTA_ID = 269 and FECHORVENTA >= '30/03/2018' and FECHORVENTA <= '01/04/2018'; + StringBuilder sb = new StringBuilder(); + sb.append(" update caja set integradototvs = 2, CONTADORINTEGRADOTOTVS = 0 "); + sb.append(" where FECHORVENTA >= :fechorInicial "); + sb.append(" and FECHORVENTA <= :fechorFinal "); + sb.append(" and PUNTOVENTA_ID = :puntoVentaId "); + if (marca != null) { + sb.append(" and MARCA_ID = :marcaId "); + } + SQLQuery query = getSession().createSQLQuery(sb.toString()); + if (marca != null) { + query.setInteger("marcaId", marca.getMarcaId()); + } + query.setInteger("puntoVentaId", puntoVenta.getPuntoventaId()); + query.setTimestamp("fechorInicial", dataIncial); + query.setTimestamp("fechorFinal", dataFinal); + Integer result = query.executeUpdate(); + return result; + } + + @Override + public List buscarVendaCartaoCashMonitor(Date dataIncial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta) { + SimpleDateFormat formatadorData = new SimpleDateFormat("dd/MM/yyyy"); + + StringBuilder sql = new StringBuilder(); + sql.append("select to_char(ct.fecoperacion, 'dd/mm/yyyy') as data_transacao, "); + sql.append("pv.nombpuntoventa as loja, "); + sql.append("ct.nombtitular as adquirente, "); + sql.append("ct.nsu as nsu, "); + sql.append("ct.numautorizacion as autorizacao, "); + sql.append("sum(cfp.importe) as valor_bruto, "); + sql.append("fp.formapago_id as formapago_id, "); + sql.append("ct.tipotarjeta as bandeira, "); + sql.append("c.numoperacion as codigo_pedido, "); + sql.append("cfp.importe valor_parcela, "); + sql.append("count(ct.cajatarjeta_id) as parcelas "); + sql.append("from caja c "); + sql.append("inner join caja_formapago cfp on c.caja_id = cfp.caja_id and cfp.activo = 1 "); + sql.append("inner join marca ma on ma.marca_id = c.marca_id "); + sql.append("inner join forma_pago fp on cfp.formapago_id = fp.formapago_id "); + sql.append("inner join caja_det_pago cdp on c.caja_id = cdp.caja_id and cdp.cajaformapago_id = cfp.cajaformapago_id "); + sql.append("inner join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); + sql.append("inner join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sql.append("where c.activo = 1 "); + sql.append("and c.indreimpresion = 0 "); + sql.append("and fp.formapago_id in (2, 3) "); // Débito e Crédito + sql.append("and ct.fecoperacion between to_date('" + formatadorData.format(dataIncial) + " 00:00', 'dd/mm/yyyy hh24:mi') and to_date('" + formatadorData.format(dataFinal) + " 23:59', 'dd/mm/yyyy hh24:mi') "); + + if (empresa!=null) { + sql.append(" and ma.empresa_id = " + empresa.getEmpresaId()); + } + + if (puntoVenta!=null) { + sql.append(" and c.puntoventa_id = " + puntoVenta.getPuntoventaId()); + } + + sql.append(" group by to_char(ct.fecoperacion, 'dd/mm/yyyy'), pv.nombpuntoventa, ct.nombtitular, ct.nsu, ct.numautorizacion, fp.formapago_id, ct.tipotarjeta, c.numoperacion, cfp.importe"); + sql.append(" order by 1, 2, 3, 4, 5"); + + SQLQuery query = getSession().createSQLQuery(sql.toString()) + .addScalar("data_transacao", StringType.INSTANCE) + .addScalar("loja", StringType.INSTANCE) + .addScalar("adquirente", StringType.INSTANCE) + .addScalar("nsu", StringType.INSTANCE) + .addScalar("autorizacao", StringType.INSTANCE) + .addScalar("valor_bruto", BigDecimalType.INSTANCE) + .addScalar("formapago_id", IntegerType.INSTANCE) + .addScalar("bandeira", StringType.INSTANCE) + .addScalar("codigo_pedido", StringType.INSTANCE) + .addScalar("valor_parcela", BigDecimalType.INSTANCE) + .addScalar("parcelas", IntegerType.INSTANCE); + + query.setResultTransformer(new RelatorioVendaCartaoCashMonitorResultTransformer()); + + return query.list(); + } + + @Override + public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal) { + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT tb.folio from ( "); + sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio "); + sql.append(" FROM caja "); + sql.append(" where activo = 1 "); + sql.append(" and numseriepreimpresa = :serie "); + sql.append(" and to_number(numfoliopreimpreso) between :folioInicial and :folioFinal "); + sql.append(" union all "); + sql.append(" SELECT coalesce(min( numfoliopreimpreso), '0') as folio "); + sql.append(" FROM caja_diversos "); + sql.append(" where activo = 1 "); + sql.append(" and numseriepreimpresa = :serie "); + sql.append(" and to_number(numfoliopreimpreso) between :folioInicial and :folioFinal "); + sql.append(" )tb "); + sql.append(" where tb.folio > 0 "); + sql.append(" group by tb.folio "); + + + SQLQuery query = getSession().createSQLQuery(sql.toString()); + query.setString("serie", aidf.obterSerieSubserieFormatada()); + query.setString("folioInicial", folioInicial); + query.setString("folioFinal", folioFinal); + return (String)query.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java index 454c9d088..f992db17a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java @@ -1,673 +1,673 @@ -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.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.criteria.CriteriaBuilder.Case; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.dao.CalcularPeajeDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.ClasseIndicePeaje; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.PrecioFixoPedagio; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; -import com.rjconsultores.ventaboletos.service.PrecioFixoPedagioService; -import com.rjconsultores.ventaboletos.service.RutaCombinacionService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Repository("calcularPeajeDAO") -public class CalcularPeajeHibernateDAO extends GenericHibernateDAO - implements CalcularPeajeDAO { - - - /** - * Este índice foi estabelecido conforme portaria do orgão anexa do mantis 8274 - */ - private static final float INDICE_ORIGINAL_AGER_MT = 0.004895f; - - @Autowired - private OrgaoConcedenteService orgaoConcedenteService; - - @Autowired - private RutaCombinacionService rutaCombinacionService; - - @Autowired - private PrecioFixoPedagioService precioFixoPedagioService; - - @Autowired - public CalcularPeajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - private static final Logger log = LogManager.getLogger(CalcularPeajeHibernateDAO.class); - - @Override - public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc) { - StringBuilder sql = new StringBuilder() - .append("select distinct r ") - .append("from Ruta r, RutaCaseta rc, RutaSecuencia rs, CasetaPeaje cp ") - .append("where rc.rutaSecuencia.rutasecuenciaId = rs.rutasecuenciaId ") - .append(" and rc.casetaPeaje.casetaPeajeId = cp.casetaPeajeId ") - .append(" and rs.ruta.rutaId = r.rutaId "); - if (oc != null && oc.getOrgaoConcedenteId() != null) { - sql.append(" and r.orgaoConcedente.orgaoConcedenteId = :orgaoConcedenteId "); - } - sql.append(" order by r.descruta "); - - Query query = getSession().createQuery(sql.toString()); - if (oc != null && oc.getOrgaoConcedenteId() != null) { - query.setInteger("orgaoConcedenteId", oc.getOrgaoConcedenteId()); - } - - return query.list(); - } - - @Override - public List buscarCasetasPeajeWithinTramo(Ruta ruta, Integer[] listCasetaPeaje) { - StringBuilder sql = new StringBuilder() - .append("with tramo_tmp as ( ") - .append(" select t.origen_id as orig, t.destino_id as dest, t.tramo_id as tra, ") - .append(" t.desctramo as tradesc, t.origen_id as traorig, t.destino_id as tradest, ") - .append(" t.via_id as travia, t.cantkmreal as tracantkm, t.cantkmpagoconductor as tracantkmpago, ") - .append(" t.activo as traactivo, t.fecmodif as trafecmodif, t.usuario_id as trausuario ") - .append(" from ruta_combinacion rcom ") - .append(" inner join ruta r on r.ruta_id = rcom.ruta_id ") - .append(" inner join orgao_concedente oc on oc.orgaoconcedente_id = r.orgaoconcedente_id ") - .append(" inner join tramo t on t.tramo_id = rcom.tramo_id ") - .append(" where r.ruta_id = :rutaId and rcom.activo =1 and r.activo=1 and oc.activo =1 and t.activo = 1 ") - .append("), mytable as ( ") - .append(" select eiorig.icms as icms, ") - .append(" rseqorig.numsecuencia as origen_tramo_inicial_seq, rseqdest.numsecuencia as destino_tramo_final_seq, ") - .append(" torig.tramo_id as tramo_orig, tdest.tramo_id as tramo_dest, ") - .append(" tt.tra as tracomb, tt.orig as ttorig, tt.dest as ttdest, ") - .append(" tt.tradesc as tracombdesc, tt.traorig as tracomborig, tt.tradest as tracombdest, ") - .append(" tt.travia as tracombvia, tt.tracantkm as tracombcantkm, tt.tracantkmpago as tracombcantkmpago, ") - .append(" tt.traactivo as tracombactivo, tt.trafecmodif as tracombfecmodif, tt.trausuario as tracombusuario, emp.NOMBEMPRESA, es.NOMBESTADO ") - .append(" from ruta_secuencia rseqorig ") - .append(" inner join tramo torig on torig.tramo_id = rseqorig.tramo_id and rseqorig.ruta_id = :rutaId ") - .append(" inner join ruta_secuencia rseqdest on rseqorig.ruta_id = rseqdest.ruta_id ") - .append(" inner join tramo tdest on tdest.tramo_id = rseqdest.tramo_id and rseqdest.ruta_id = :rutaId ") - .append(" inner join ruta_empresa re on re.ruta_id = :rutaId ") - .append(" inner join empresa e on re.empresa_id = e.empresa_id ") - .append(" inner join parada porig on torig.origen_id = porig.parada_id ") - .append(" inner join ciudad corig on corig.ciudad_id = porig.ciudad_id ") - .append(" inner join estado eorig on eorig.estado_id = corig.estado_id ") - .append(" inner join empresa_imposto eiorig on eiorig.empresa_id = e.empresa_id and eiorig.estado_id = eorig.estado_id and eiorig.activo = 1 ") - - .append(" join empresa emp on emp.empresa_id = eiorig.empresa_id ") - .append(" join estado es on eiorig.estado_id = es.estado_id ") - - .append(" inner join tramo_tmp tt on torig.origen_id = tt.orig and tdest.destino_id = tt.dest ") - .append(" where rseqorig.activo = 1 and torig.activo = 1 and rseqdest.activo = 1 and tdest.activo = 1 and re.activo = 1 and e.activo = 1 and porig.activo = 1 and corig.activo = 1 and eorig.activo = 1 ") - .append("), caseta_tramo_da_ruta as ( ") - .append(" select rcas.rutacaseta_id as rutacasetaid, rcas.rutasecuencia_id as rutasecuenciaid, rcas.casetapeaje_id, ") - .append(" rseq1.numsecuencia as numsecuencia, rseq1.tramo_id as tramoid, rseq2.numsecuencia as numsecuencia2, ") - .append(" casp.casetapeaje_id as casetapeajeid, casp.desccaseta as desccaseta, casp.importeida as importeida, ") - .append(" casp.importevuelta as importevuelta, casp.activo as caspactivo, casp.fecmodif as caspfecmodif, ") - .append(" casp.usuario_id as caspusuario ") - .append(" from ruta_caseta rcas ") - .append(" inner join ruta_secuencia rseq1 on rcas.rutasecuencia_id = rseq1.rutasecuencia_id ") - .append(" inner join ruta_secuencia rseq2 on rseq2.tramo_id = rseq1.tramo_id ") - .append(" inner join tramo tra on tra.tramo_id = rseq1.tramo_id and rseq1.ruta_id = :rutaId ") - .append(" inner join caseta_peaje casp on casp.casetapeaje_id = rcas.casetapeaje_id ") - .append(" where rcas.activo =1 and rseq1.activo =1 and rseq2.activo =1 and tra.activo =1 and casp.activo =1 "); - if(null!=listCasetaPeaje) { - sql.append( "and casp.casetapeaje_id in (" + StringUtils.join(listCasetaPeaje,",") + ") "); - - } - sql.append(") ") - .append("select distinct origen_tramo_inicial_seq, destino_tramo_final_seq, tramo_orig, tramo_dest, tracomb, ttorig, ttdest, ") - .append(" tracombdesc, tracomborig, tracombdest, tracombvia, tracombcantkm, tracombcantkmpago, tracombactivo, ") - .append(" tracombfecmodif, tracombusuario, rutacasetaid, rutasecuenciaid, casetapeaje_id, tramoid, casetapeajeid, ") - .append(" desccaseta, importeida, importevuelta, caspactivo, caspfecmodif, caspusuario, icms, NOMBEMPRESA, NOMBESTADO ") - .append("from mytable my ") - .append(" inner join caseta_tramo_da_ruta ctr on ctr.numsecuencia between my.origen_tramo_inicial_seq and my.destino_tramo_final_seq ") - .append(" order by tracomb "); - - Query query = getSession().createSQLQuery(sql.toString()); - query.setInteger("rutaId", ruta.getRutaId()); - query.setInteger("rutaId", ruta.getRutaId()); - query.setInteger("rutaId", ruta.getRutaId()); - query.setInteger("rutaId", ruta.getRutaId()); - - - return query.list(); - } - - // pra cada ruta obter as combinacoes de tramos, cada tramo com sua lista de casetaPeaje - public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception { - boolean isOrgaoNull = orgao == null; - List updates = new ArrayList(); - Set peajes = new HashSet(); - - List classeIndicePeajes = new ArrayList(); - if(orgao != null){ - orgao = orgaoConcedenteService.obtenerID(orgao.getOrgaoConcedenteId()); - classeIndicePeajes = orgao.getClassesIndicePeaje(); - isOrgaoNull = orgao == null; - } - - log.info("****** INICIO DO PROCESSO DE CALCULO DE PEDAGIO ******"); - log.info("****** QTD DE LINHAS = "+lsRuta.size()+"******"); - int z = 0; - for (Ruta ruta : lsRuta) { - log.info("****** Linha "+(++z)+" de "+lsRuta.size()+" ******"); - log.info("****** LINHA : "+ruta.toString()+" ******"); - - List lsObj = buscarCasetasPeajeWithinTramo(ruta,listCasetaPeaje); - log.info("****** QTD COMBINAÇÕES DE TRECHOS x QTD PEDAGIOS POR TRECHO: "+lsObj.size()+" ******"); - - if(isOrgaoNull){ - orgao = orgaoConcedenteService.obtenerID(ruta.getOrgaoConcedente().getOrgaoConcedenteId()); - classeIndicePeajes = orgao.getClassesIndicePeaje(); - String update = " update peaje set activo = 0 where ruta_id ="+ruta.getRutaId(); - if(null!=listCasetaPeaje) { - update = update + " and casetapeaje_id in (" + StringUtils.join(listCasetaPeaje,",") + ") "; - } - updates.add(update); - } - - List lsPrecioFixoPedagio = precioFixoPedagioService.obtenerTodos(); - - if (null != lsObj) { - - for (Object arrObj : lsObj) { - - if (((Object[]) arrObj)[27] == null) { - throw new Exception (((Object[])arrObj)[28].toString() + " / " + ((Object[])arrObj)[29].toString()); - } - BigDecimal bigKm = new BigDecimal(((Object[]) arrObj)[11].toString()) ; - PeajeVO pvo = PeajeVO.create(ruta, orgao, (Object[]) arrObj, classeIndicePeajes, usaICMS, bigKm); - // ATENCAO !!! - // neste 'FOR' nao se pode abrir nenhum tipo de consulta no banco pois o 'lsObj' vem com milhares de registros - // e se abrir uma sessao no banco para cada um dos registros, o banco trava. - - PrecioFixoPedagio pfp = new PrecioFixoPedagio(); - pfp.setOrgaoConcedenteId(orgao); - pfp.setClasseId(ruta.getClaseServicio()); - CasetaPeaje pracaPedagio = new CasetaPeaje(); - pracaPedagio.setCasetaPeajeId(pvo.casetaPeajeId); - pfp.setPracaPedagioId(pracaPedagio); - - for(PrecioFixoPedagio pfp2 : lsPrecioFixoPedagio){ - if(pfp.getOrgaoConcedenteId().getOrgaoConcedenteId() == -1 || (pfp2.getPracaPedagioId().getCasetaPeajeId().equals(pfp.getPracaPedagioId().getCasetaPeajeId()) - && pfp2.getOrgaoConcedenteId().getOrgaoConcedenteId().equals(pfp.getOrgaoConcedenteId().getOrgaoConcedenteId()) - && pfp2.getClasseId().getClaseservicioId().equals(pfp.getClasseId().getClaseservicioId())) - ){ - pvo.importePeaje = pfp2.getValorFixo(); - break; - } - } - - peajes.add(pvo); - } - } - log.info("****** FIM LINHA : "+ruta.toString()+" . INSTRUCOES DE INSERT NO BANCO PRONTAS ******"); - } - log.info("****** FIM DO PROCESSO DE CALCULO DE PEDAGIO ******"); - - StringBuilder updateSql = new StringBuilder(); - if(isOrgaoNull == false){ - updateSql = new StringBuilder() - .append("update peaje set activo = 0 ") - .append("where orgaoconcedente_id = ") - .append(orgao.getOrgaoConcedenteId()); - } - - int[] result = {}; - Connection con = getSession().connection(); - try { - Statement stmt = con.createStatement(); - con.setAutoCommit(false); - if(!isOrgaoNull){ - stmt.addBatch(updateSql.toString()); - }else{ - for(String up : updates){ - stmt.addBatch(up); - } - } - int i=0; - - for(PeajeVO peajeVO : peajes){ - i++; - - stmt.addBatch(peajeVO.toInsertQuery()); - stmt.addBatch(peajeVO.toUpdateExcepcionPeajeQuery()); - stmt.addBatch(peajeVO.toUpdateExcepcionPeajeVigenciaQuery()); - - - log.info("**** "+i+ "- de "+ peajes.size()+" de combinacoes de trecho X (praca pedagio por trecho) ****"); - - if(i%100 == 0){ - result = stmt.executeBatch(); - con.commit(); - stmt.close(); - stmt = con.createStatement(); - } - - } - - result = stmt.executeBatch(); - con.commit(); - stmt.close(); - recalcularExcecoesPedagio(peajes); - } - catch (SQLException e) { - e.printStackTrace(); - } - - return result; - } - - private Map buscaCasetas(Set pvo) { - Set ids = new LinkedHashSet(); - Map casetas = new HashMap(); - - for (PeajeVO p : pvo) { - ids.add(p.casetaPeajeId); - } - - if(!ids.isEmpty()){ - Query query = getSession() - .createQuery("select c from CasetaPeaje c where c.casetaPeajeId in (:ids) "); - query.setParameterList("ids", ids); - - for (CasetaPeaje c : (List) query.list()) { - casetas.put(c.getCasetaPeajeId(), c); - } - } - - return casetas; - } - - private ExcepcionPeaje getExcepcion(Integer rutaId, Integer origenId, Integer destinoId) { - Query query = getSession().createQuery("select e from ExcepcionPeaje e where e.ruta.rutaId = :rutaId " + - "and e.origem.paradaId = :origenId and e.destino.paradaId = :destinoId and e.activo = 1 "); - - query.setInteger("rutaId", rutaId); - query.setInteger("origenId", origenId); - query.setInteger("destinoId", destinoId); - return (ExcepcionPeaje) query.uniqueResult(); - } - - private Parada getParada(Integer paradaId) { - return (Parada) getSession().get(Parada.class, paradaId); - } - - private Ruta getRuta(Integer rutaId) { - return (Ruta) getSession().get(Ruta.class, rutaId); - } - - @Transactional - private void recalcularExcecoesPedagio(Set pvos) { - Map casetas = buscaCasetas(pvos); - for (PeajeVO peaje : pvos) { - ExcepcionPeaje excepcion = null; - CasetaPeaje caseta = casetas.get(peaje.casetaPeajeId); - - for (CasetaPeajeExcepcion cpe : caseta.getLsCasetaPeajeExcepcion()) { - if (excepcion == null) { - excepcion = new ExcepcionPeaje(); - excepcion.setActivo(true); - excepcion.setDestino(getParada(peaje.destinoId)); - excepcion.setFecmodif(Calendar.getInstance().getTime()); - excepcion.setOrigem(getParada(peaje.origenId)); - excepcion.setRuta(getRuta(peaje.rutaId)); - excepcion.setUsuarioId(1); - } - ExcepcionPeajeVigencia epv = new ExcepcionPeajeVigencia(); - epv.setActivo(cpe.getActivo()); - epv.setExcepcionPeaje(excepcion); - epv.setFecmodif(Calendar.getInstance().getTime()); - epv.setFecVentaFin(cpe.getFecVentaFin()); - epv.setFecVentaIni(cpe.getFecVentaIni()); - epv.setHoraFin(cpe.getHoraFin()); - epv.setHoraIni(cpe.getHoraIni()); - epv.setINDDOMINGO(cpe.getINDDOMINGO()); - epv.setINDJUEVES(cpe.getINDJUEVES()); - epv.setINDLUNES(cpe.getINDLUNES()); - epv.setINDMARTES(cpe.getINDMARTES()); - epv.setINDMIERCOLES(cpe.getINDMIERCOLES()); - epv.setINDSABADO(cpe.getINDSABADO()); - epv.setINDVIERNES(cpe.getINDVIERNES()); - epv.setPrecio(cpe.getPrecio()); - epv.setUsuarioId(1); - epv.setCasetaPeaje(caseta); - excepcion.getLsExcepcionPeajeVigencia().add(epv); - } - if (excepcion != null) { - getSession().saveOrUpdate(excepcion); - } - } - } - - private static class PeajeVO { - - private static final int HIGH_PRECISION = 10; - private static final BigDecimal A_HUNDRED = new BigDecimal(100); - private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - - private Integer rutaId; - private Integer origenId; - private Integer destinoId; - private Integer orgaoId; - private Integer casetaPeajeId; - private Integer cantAsientos; - private Integer cantEixos; - private BigDecimal importePeaje; - private BigDecimal indicePeaje; - private Integer activo; - private Date fecmodif; - private Integer usuarioId; - - private static BigDecimal getCantEixos(Ruta ruta) { - try { - return new BigDecimal(ruta.getCantEixos()); - } catch (NullPointerException e) { - throw new RuntimeException("rutaSemQtdEixos;" + ruta.getRutaId()); - } - } - - private static BigDecimal getRutaCantAsientos(Ruta ruta) { - try { - return new BigDecimal(ruta.getCantAsientos()); - } - catch (NullPointerException e) { - throw new RuntimeException("rutaSemQtdAsientos;" + ruta.getRutaId()); - } - } - - private static BigDecimal getImporte(Ruta ruta, Object[] obj) { - if (ruta.getIndSentidoIda()) { - return new BigDecimal(obj[22].toString()); - } - else { - return new BigDecimal(obj[23].toString()); - } - } - - private static BigDecimal getIcms(Ruta ruta, Object[] obj) { - return new BigDecimal(obj[27].toString()) - .divide(A_HUNDRED, HIGH_PRECISION, RoundingMode.HALF_UP); - } - - // ((importe * rutaCantEixos) / (indice * rutaCantAsientos)) / ( 1 - icms) - private static BigDecimal calculateImportePeajeANTT(BigDecimal importe, BigDecimal icms, - BigDecimal indice, BigDecimal rutaCantEixos, BigDecimal rutaCantAsientos, boolean usaICMS) { - - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.CALCULO_PEAJE_REUNIDAS_ANTT.getDescricao())) { - // (importe * rutaCantEixos) / (indice) - return importe.multiply(rutaCantEixos) - .divide(indice, HIGH_PRECISION, RoundingMode.HALF_UP); - } - else { - if(!usaICMS){ - return importe.multiply(rutaCantEixos) - .divide(indice.multiply(rutaCantAsientos), HIGH_PRECISION, RoundingMode.HALF_UP); - }else{ - return importe.multiply(rutaCantEixos) - .divide(indice.multiply(rutaCantAsientos), HIGH_PRECISION, RoundingMode.HALF_UP) - .divide(BigDecimal.ONE.subtract(icms), HIGH_PRECISION, RoundingMode.HALF_UP); - } - - } - } - - private static BigDecimal calculateImportePeajeAGER(BigDecimal km, OrgaoConcedente orgao, BigDecimal importe, - BigDecimal rutaCantEixos, BigDecimal rutaCantAsientos) { - BigDecimal indicePejeOrgao = orgao!=null && orgao.getIndicePeaje() !=null ? orgao.getIndicePeaje() : new BigDecimal(INDICE_ORIGINAL_AGER_MT); - // esse valor deveria vir do indice do orgao mas as casas decimais nao sao compativeis.. verificar se pode mudar a precisao do campo de indice.. - return validaValorMaxPedagioAGR(km.multiply(indicePejeOrgao).setScale(HIGH_PRECISION, RoundingMode.HALF_UP), - indicePejeOrgao, importe, rutaCantEixos, rutaCantAsientos ); } - - /* -- RESOLUÇÃO NORMATIVA AGER/MT N.º 002/2023 -- - * O cálculo do valor a ser repassado ao passageiro não poderá ser superior ao - * valor obtido mediante a aplicação da seguinte fórmula: - * 𝐕𝐀𝐏 = ∑𝐕𝐏 𝐱 𝐧º𝐄 / 𝐋𝐎𝐓 𝐱 𝐈𝐀𝐏 - * VAP - Valor a ser pago por passageiro - * ∑VP – Somatória do valor de pedágio no trecho percorrido pelo passageiro para 01 eixo simples - * NºE – Número de Eixos - * LOT - Lotação total do veículo padrão - 46 lugares (Edital de Licitação STCRIP) - * IAP - Índice de Aproveitamento previsto na planilha tarifária - 60% (Edital de Licitação STCRIP) - * */ - private static BigDecimal validaValorMaxPedagioAGR(BigDecimal pedagio, BigDecimal indicePejeOrgao, BigDecimal importe, - BigDecimal rutaCantEixos, BigDecimal rutaCantAsientos) { - BigDecimal valorCalculado = importe.multiply(rutaCantEixos) - .divide(indicePejeOrgao.multiply(rutaCantAsientos),HIGH_PRECISION, RoundingMode.HALF_UP); - return valorCalculado.min(pedagio); - } - - // ((importe * rutaCantEixos) / (indice)) / ( 1 - icms) - private static BigDecimal calculateImportePeajeARTESP(BigDecimal importe, BigDecimal icms, - BigDecimal indice, BigDecimal rutaCantEixos, boolean usaICMS) { - if(!usaICMS){ - return importe.multiply(rutaCantEixos) - .divide(indice, HIGH_PRECISION, RoundingMode.HALF_UP); - }else{ - return importe.multiply(rutaCantEixos) - .divide(indice, HIGH_PRECISION, RoundingMode.HALF_UP) - .divide(BigDecimal.ONE.subtract(icms), HIGH_PRECISION, RoundingMode.HALF_UP); - } - - } - - private static BigDecimal calculateImportePeaje(Ruta ruta, OrgaoConcedente orgao, Object[] obj, BigDecimal indicePeaje, boolean usaICMS, BigDecimal km) { - BigDecimal rutaCantEixos = getCantEixos(ruta); - BigDecimal indice = indicePeaje; - BigDecimal importe = getImporte(ruta, obj); - BigDecimal icms = usaICMS ? getIcms(ruta, obj) : null; - - if (Constantes.ORGAOS_CONCEDENTES_CALCULO_ARTESP.contains(orgao.getOrgaoConcedenteId())) { - return calculateImportePeajeARTESP(importe, icms, indice, rutaCantEixos, usaICMS); - } - if (Constantes.ORGAOS_CONCEDENTES_CALCULO_ANTT.contains(orgao.getOrgaoConcedenteId())) { - return calculateImportePeajeANTT(importe, icms, indice, rutaCantEixos, getRutaCantAsientos(ruta), usaICMS); - } - if (Constantes.ORGAOS_CONCEDENTES_CALCULO_AGER.contains(orgao.getOrgaoConcedenteId())) { - return calculateImportePeajeAGER(km, orgao, importe, rutaCantEixos, getRutaCantAsientos(ruta)); - } - - return BigDecimal.ZERO; // TODO throw an exception? como calcular quando é outro orgao concendente? - } - - private static BigDecimal getIndicePeaje(ClaseServicio claseServicio, - OrgaoConcedente orgao, List lsClasseIndicePeaje) { - - for (ClasseIndicePeaje classeIndicePeaje : lsClasseIndicePeaje) { - if (claseServicio.equals(classeIndicePeaje.getClasseServicio())) { - return classeIndicePeaje.getIndicePeaje(); - } - } - return orgao.getIndicePeaje(); - } - - private static PeajeVO create(Ruta ruta, OrgaoConcedente orgao, - Object[] obj, List lsClasseIndicePeaje, boolean usaICMS, BigDecimal km) { - - PeajeVO pvo = new PeajeVO(); - - pvo.rutaId = ruta.getRutaId(); - pvo.cantEixos = ruta.getCantEixos(); - pvo.cantAsientos = ruta.getCantAsientos(); - pvo.origenId = Integer.parseInt(obj[8].toString()); - pvo.destinoId = Integer.parseInt(obj[9].toString()); - pvo.orgaoId = orgao.getOrgaoConcedenteId(); - pvo.casetaPeajeId = Integer.parseInt(obj[20].toString()); - pvo.indicePeaje = getIndicePeaje(ruta.getClaseServicio(), orgao, lsClasseIndicePeaje); - - pvo.importePeaje = calculateImportePeaje(ruta, orgao, obj, pvo.indicePeaje, usaICMS, km); - - pvo.activo = 1; - pvo.fecmodif = new Date(); - pvo.usuarioId = UsuarioLogado.getUsuarioLogado().getUsuarioId(); - - return pvo; - } - - private String toInsertQuery() { - return new StringBuilder() - .append("insert into peaje ( peaje_id, ruta_id, origen_id, destino_id, ") - .append(" orgaoconcedente_id, casetapeaje_id, cantasientos, canteixos, ") - .append(" importepeaje, indicepeaje, activo, fecmodif, usuario_id ) ") - .append("values ( peaje_seq.nextval, ") - .append(rutaId).append(", ") - .append(origenId).append(", ") - .append(destinoId).append(", ") - .append(orgaoId).append(", ") - .append(casetaPeajeId).append(", ") - .append(cantAsientos).append(", ") - .append(cantEixos).append(", ") - .append(importePeaje).append(", ") - .append(indicePeaje).append(", ") - .append(activo).append(", ") - .append("to_date('") - .append(SDF.format(fecmodif)) - .append("', 'yyyy/mm/dd hh24:mi:ss'), ") - .append(usuarioId).append(" ) ") - .toString(); - } - - private String toUpdateExcepcionPeajeQuery() { - return new StringBuilder() - .append("update excepcion_peaje ") - .append("set activo = 0 ") - .append("where ruta_id = ").append(rutaId) - .append(" and origen_id = ").append(origenId) - .append(" and destino_id = ").append(origenId) - .toString(); - } - - private String toUpdateExcepcionPeajeVigenciaQuery() { - return new StringBuilder() - .append("update excepcion_peaje_vigencia ") - .append("set activo = 0 ") - .append("where excepcionpeaje_id in ( ") - .append(" select excepcionpeaje_id ") - .append(" from excepcion_peaje ") - .append(" where ruta_id = ").append(rutaId) - .append(" and origen_id = ").append(origenId) - .append(" and destino_id = ").append(origenId) - .append(")") - .toString(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((cantAsientos == null) ? 0 : cantAsientos.hashCode()); - result = prime * result + ((cantEixos == null) ? 0 : cantEixos.hashCode()); - result = prime * result + ((casetaPeajeId == null) ? 0 : casetaPeajeId.hashCode()); - result = prime * result + ((destinoId == null) ? 0 : destinoId.hashCode()); - result = prime * result + ((importePeaje == null) ? 0 : importePeaje.hashCode()); - result = prime * result + ((indicePeaje == null) ? 0 : indicePeaje.hashCode()); - result = prime * result + ((orgaoId == null) ? 0 : orgaoId.hashCode()); - result = prime * result + ((origenId == null) ? 0 : origenId.hashCode()); - result = prime * result + ((rutaId == null) ? 0 : rutaId.hashCode()); - result = prime * result + ((usuarioId == null) ? 0 : usuarioId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PeajeVO other = (PeajeVO) obj; - if (activo == null) { - if (other.activo != null) - return false; - } else if (!activo.equals(other.activo)) - return false; - if (cantAsientos == null) { - if (other.cantAsientos != null) - return false; - } else if (!cantAsientos.equals(other.cantAsientos)) - return false; - if (cantEixos == null) { - if (other.cantEixos != null) - return false; - } else if (!cantEixos.equals(other.cantEixos)) - return false; - if (casetaPeajeId == null) { - if (other.casetaPeajeId != null) - return false; - } else if (!casetaPeajeId.equals(other.casetaPeajeId)) - return false; - if (destinoId == null) { - if (other.destinoId != null) - return false; - } else if (!destinoId.equals(other.destinoId)) - return false; - if (importePeaje == null) { - if (other.importePeaje != null) - return false; - } else if (!importePeaje.equals(other.importePeaje)) - return false; - if (indicePeaje == null) { - if (other.indicePeaje != null) - return false; - } else if (!indicePeaje.equals(other.indicePeaje)) - return false; - if (orgaoId == null) { - if (other.orgaoId != null) - return false; - } else if (!orgaoId.equals(other.orgaoId)) - return false; - if (origenId == null) { - if (other.origenId != null) - return false; - } else if (!origenId.equals(other.origenId)) - return false; - if (rutaId == null) { - if (other.rutaId != null) - return false; - } else if (!rutaId.equals(other.rutaId)) - return false; - if (usuarioId == null) { - if (other.usuarioId != null) - return false; - } else if (!usuarioId.equals(other.usuarioId)) - return false; - return true; - } - - } - -} +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.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.persistence.criteria.CriteriaBuilder.Case; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.dao.CalcularPeajeDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.ClasseIndicePeaje; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.PrecioFixoPedagio; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; +import com.rjconsultores.ventaboletos.service.PrecioFixoPedagioService; +import com.rjconsultores.ventaboletos.service.RutaCombinacionService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Repository("calcularPeajeDAO") +public class CalcularPeajeHibernateDAO extends GenericHibernateDAO + implements CalcularPeajeDAO { + + + /** + * Este índice foi estabelecido conforme portaria do orgão anexa do mantis 8274 + */ + private static final float INDICE_ORIGINAL_AGER_MT = 0.004895f; + + @Autowired + private OrgaoConcedenteService orgaoConcedenteService; + + @Autowired + private RutaCombinacionService rutaCombinacionService; + + @Autowired + private PrecioFixoPedagioService precioFixoPedagioService; + + @Autowired + public CalcularPeajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + private static final Logger log = LogManager.getLogger(CalcularPeajeHibernateDAO.class); + + @Override + public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc) { + StringBuilder sql = new StringBuilder() + .append("select distinct r ") + .append("from Ruta r, RutaCaseta rc, RutaSecuencia rs, CasetaPeaje cp ") + .append("where rc.rutaSecuencia.rutasecuenciaId = rs.rutasecuenciaId ") + .append(" and rc.casetaPeaje.casetaPeajeId = cp.casetaPeajeId ") + .append(" and rs.ruta.rutaId = r.rutaId "); + if (oc != null && oc.getOrgaoConcedenteId() != null) { + sql.append(" and r.orgaoConcedente.orgaoConcedenteId = :orgaoConcedenteId "); + } + sql.append(" order by r.descruta "); + + Query query = getSession().createQuery(sql.toString()); + if (oc != null && oc.getOrgaoConcedenteId() != null) { + query.setInteger("orgaoConcedenteId", oc.getOrgaoConcedenteId()); + } + + return query.list(); + } + + @Override + public List buscarCasetasPeajeWithinTramo(Ruta ruta, Integer[] listCasetaPeaje) { + StringBuilder sql = new StringBuilder() + .append("with tramo_tmp as ( ") + .append(" select t.origen_id as orig, t.destino_id as dest, t.tramo_id as tra, ") + .append(" t.desctramo as tradesc, t.origen_id as traorig, t.destino_id as tradest, ") + .append(" t.via_id as travia, t.cantkmreal as tracantkm, t.cantkmpagoconductor as tracantkmpago, ") + .append(" t.activo as traactivo, t.fecmodif as trafecmodif, t.usuario_id as trausuario ") + .append(" from ruta_combinacion rcom ") + .append(" inner join ruta r on r.ruta_id = rcom.ruta_id ") + .append(" inner join orgao_concedente oc on oc.orgaoconcedente_id = r.orgaoconcedente_id ") + .append(" inner join tramo t on t.tramo_id = rcom.tramo_id ") + .append(" where r.ruta_id = :rutaId and rcom.activo =1 and r.activo=1 and oc.activo =1 and t.activo = 1 ") + .append("), mytable as ( ") + .append(" select eiorig.icms as icms, ") + .append(" rseqorig.numsecuencia as origen_tramo_inicial_seq, rseqdest.numsecuencia as destino_tramo_final_seq, ") + .append(" torig.tramo_id as tramo_orig, tdest.tramo_id as tramo_dest, ") + .append(" tt.tra as tracomb, tt.orig as ttorig, tt.dest as ttdest, ") + .append(" tt.tradesc as tracombdesc, tt.traorig as tracomborig, tt.tradest as tracombdest, ") + .append(" tt.travia as tracombvia, tt.tracantkm as tracombcantkm, tt.tracantkmpago as tracombcantkmpago, ") + .append(" tt.traactivo as tracombactivo, tt.trafecmodif as tracombfecmodif, tt.trausuario as tracombusuario, emp.NOMBEMPRESA, es.NOMBESTADO ") + .append(" from ruta_secuencia rseqorig ") + .append(" inner join tramo torig on torig.tramo_id = rseqorig.tramo_id and rseqorig.ruta_id = :rutaId ") + .append(" inner join ruta_secuencia rseqdest on rseqorig.ruta_id = rseqdest.ruta_id ") + .append(" inner join tramo tdest on tdest.tramo_id = rseqdest.tramo_id and rseqdest.ruta_id = :rutaId ") + .append(" inner join ruta_empresa re on re.ruta_id = :rutaId ") + .append(" inner join empresa e on re.empresa_id = e.empresa_id ") + .append(" inner join parada porig on torig.origen_id = porig.parada_id ") + .append(" inner join ciudad corig on corig.ciudad_id = porig.ciudad_id ") + .append(" inner join estado eorig on eorig.estado_id = corig.estado_id ") + .append(" inner join empresa_imposto eiorig on eiorig.empresa_id = e.empresa_id and eiorig.estado_id = eorig.estado_id and eiorig.activo = 1 ") + + .append(" join empresa emp on emp.empresa_id = eiorig.empresa_id ") + .append(" join estado es on eiorig.estado_id = es.estado_id ") + + .append(" inner join tramo_tmp tt on torig.origen_id = tt.orig and tdest.destino_id = tt.dest ") + .append(" where rseqorig.activo = 1 and torig.activo = 1 and rseqdest.activo = 1 and tdest.activo = 1 and re.activo = 1 and e.activo = 1 and porig.activo = 1 and corig.activo = 1 and eorig.activo = 1 ") + .append("), caseta_tramo_da_ruta as ( ") + .append(" select rcas.rutacaseta_id as rutacasetaid, rcas.rutasecuencia_id as rutasecuenciaid, rcas.casetapeaje_id, ") + .append(" rseq1.numsecuencia as numsecuencia, rseq1.tramo_id as tramoid, rseq2.numsecuencia as numsecuencia2, ") + .append(" casp.casetapeaje_id as casetapeajeid, casp.desccaseta as desccaseta, casp.importeida as importeida, ") + .append(" casp.importevuelta as importevuelta, casp.activo as caspactivo, casp.fecmodif as caspfecmodif, ") + .append(" casp.usuario_id as caspusuario ") + .append(" from ruta_caseta rcas ") + .append(" inner join ruta_secuencia rseq1 on rcas.rutasecuencia_id = rseq1.rutasecuencia_id ") + .append(" inner join ruta_secuencia rseq2 on rseq2.tramo_id = rseq1.tramo_id ") + .append(" inner join tramo tra on tra.tramo_id = rseq1.tramo_id and rseq1.ruta_id = :rutaId ") + .append(" inner join caseta_peaje casp on casp.casetapeaje_id = rcas.casetapeaje_id ") + .append(" where rcas.activo =1 and rseq1.activo =1 and rseq2.activo =1 and tra.activo =1 and casp.activo =1 "); + if(null!=listCasetaPeaje) { + sql.append( "and casp.casetapeaje_id in (" + StringUtils.join(listCasetaPeaje,",") + ") "); + + } + sql.append(") ") + .append("select distinct origen_tramo_inicial_seq, destino_tramo_final_seq, tramo_orig, tramo_dest, tracomb, ttorig, ttdest, ") + .append(" tracombdesc, tracomborig, tracombdest, tracombvia, tracombcantkm, tracombcantkmpago, tracombactivo, ") + .append(" tracombfecmodif, tracombusuario, rutacasetaid, rutasecuenciaid, casetapeaje_id, tramoid, casetapeajeid, ") + .append(" desccaseta, importeida, importevuelta, caspactivo, caspfecmodif, caspusuario, icms, NOMBEMPRESA, NOMBESTADO ") + .append("from mytable my ") + .append(" inner join caseta_tramo_da_ruta ctr on ctr.numsecuencia between my.origen_tramo_inicial_seq and my.destino_tramo_final_seq ") + .append(" order by tracomb "); + + Query query = getSession().createSQLQuery(sql.toString()); + query.setInteger("rutaId", ruta.getRutaId()); + query.setInteger("rutaId", ruta.getRutaId()); + query.setInteger("rutaId", ruta.getRutaId()); + query.setInteger("rutaId", ruta.getRutaId()); + + + return query.list(); + } + + // pra cada ruta obter as combinacoes de tramos, cada tramo com sua lista de casetaPeaje + public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception { + boolean isOrgaoNull = orgao == null; + List updates = new ArrayList(); + Set peajes = new HashSet(); + + List classeIndicePeajes = new ArrayList(); + if(orgao != null){ + orgao = orgaoConcedenteService.obtenerID(orgao.getOrgaoConcedenteId()); + classeIndicePeajes = orgao.getClassesIndicePeaje(); + isOrgaoNull = orgao == null; + } + + log.info("****** INICIO DO PROCESSO DE CALCULO DE PEDAGIO ******"); + log.info("****** QTD DE LINHAS = "+lsRuta.size()+"******"); + int z = 0; + for (Ruta ruta : lsRuta) { + log.info("****** Linha "+(++z)+" de "+lsRuta.size()+" ******"); + log.info("****** LINHA : "+ruta.toString()+" ******"); + + List lsObj = buscarCasetasPeajeWithinTramo(ruta,listCasetaPeaje); + log.info("****** QTD COMBINAÇÕES DE TRECHOS x QTD PEDAGIOS POR TRECHO: "+lsObj.size()+" ******"); + + if(isOrgaoNull){ + orgao = orgaoConcedenteService.obtenerID(ruta.getOrgaoConcedente().getOrgaoConcedenteId()); + classeIndicePeajes = orgao.getClassesIndicePeaje(); + String update = " update peaje set activo = 0 where ruta_id ="+ruta.getRutaId(); + if(null!=listCasetaPeaje) { + update = update + " and casetapeaje_id in (" + StringUtils.join(listCasetaPeaje,",") + ") "; + } + updates.add(update); + } + + List lsPrecioFixoPedagio = precioFixoPedagioService.obtenerTodos(); + + if (null != lsObj) { + + for (Object arrObj : lsObj) { + + if (((Object[]) arrObj)[27] == null) { + throw new Exception (((Object[])arrObj)[28].toString() + " / " + ((Object[])arrObj)[29].toString()); + } + BigDecimal bigKm = new BigDecimal(((Object[]) arrObj)[11].toString()) ; + PeajeVO pvo = PeajeVO.create(ruta, orgao, (Object[]) arrObj, classeIndicePeajes, usaICMS, bigKm); + // ATENCAO !!! + // neste 'FOR' nao se pode abrir nenhum tipo de consulta no banco pois o 'lsObj' vem com milhares de registros + // e se abrir uma sessao no banco para cada um dos registros, o banco trava. + + PrecioFixoPedagio pfp = new PrecioFixoPedagio(); + pfp.setOrgaoConcedenteId(orgao); + pfp.setClasseId(ruta.getClaseServicio()); + CasetaPeaje pracaPedagio = new CasetaPeaje(); + pracaPedagio.setCasetaPeajeId(pvo.casetaPeajeId); + pfp.setPracaPedagioId(pracaPedagio); + + for(PrecioFixoPedagio pfp2 : lsPrecioFixoPedagio){ + if(pfp.getOrgaoConcedenteId().getOrgaoConcedenteId() == -1 || (pfp2.getPracaPedagioId().getCasetaPeajeId().equals(pfp.getPracaPedagioId().getCasetaPeajeId()) + && pfp2.getOrgaoConcedenteId().getOrgaoConcedenteId().equals(pfp.getOrgaoConcedenteId().getOrgaoConcedenteId()) + && pfp2.getClasseId().getClaseservicioId().equals(pfp.getClasseId().getClaseservicioId())) + ){ + pvo.importePeaje = pfp2.getValorFixo(); + break; + } + } + + peajes.add(pvo); + } + } + log.info("****** FIM LINHA : "+ruta.toString()+" . INSTRUCOES DE INSERT NO BANCO PRONTAS ******"); + } + log.info("****** FIM DO PROCESSO DE CALCULO DE PEDAGIO ******"); + + StringBuilder updateSql = new StringBuilder(); + if(isOrgaoNull == false){ + updateSql = new StringBuilder() + .append("update peaje set activo = 0 ") + .append("where orgaoconcedente_id = ") + .append(orgao.getOrgaoConcedenteId()); + } + + int[] result = {}; + Connection con = getSession().connection(); + try { + Statement stmt = con.createStatement(); + con.setAutoCommit(false); + if(!isOrgaoNull){ + stmt.addBatch(updateSql.toString()); + }else{ + for(String up : updates){ + stmt.addBatch(up); + } + } + int i=0; + + for(PeajeVO peajeVO : peajes){ + i++; + + stmt.addBatch(peajeVO.toInsertQuery()); + stmt.addBatch(peajeVO.toUpdateExcepcionPeajeQuery()); + stmt.addBatch(peajeVO.toUpdateExcepcionPeajeVigenciaQuery()); + + + log.info("**** "+i+ "- de "+ peajes.size()+" de combinacoes de trecho X (praca pedagio por trecho) ****"); + + if(i%100 == 0){ + result = stmt.executeBatch(); + con.commit(); + stmt.close(); + stmt = con.createStatement(); + } + + } + + result = stmt.executeBatch(); + con.commit(); + stmt.close(); + recalcularExcecoesPedagio(peajes); + } + catch (SQLException e) { + e.printStackTrace(); + } + + return result; + } + + private Map buscaCasetas(Set pvo) { + Set ids = new LinkedHashSet(); + Map casetas = new HashMap(); + + for (PeajeVO p : pvo) { + ids.add(p.casetaPeajeId); + } + + if(!ids.isEmpty()){ + Query query = getSession() + .createQuery("select c from CasetaPeaje c where c.casetaPeajeId in (:ids) "); + query.setParameterList("ids", ids); + + for (CasetaPeaje c : (List) query.list()) { + casetas.put(c.getCasetaPeajeId(), c); + } + } + + return casetas; + } + + private ExcepcionPeaje getExcepcion(Integer rutaId, Integer origenId, Integer destinoId) { + Query query = getSession().createQuery("select e from ExcepcionPeaje e where e.ruta.rutaId = :rutaId " + + "and e.origem.paradaId = :origenId and e.destino.paradaId = :destinoId and e.activo = 1 "); + + query.setInteger("rutaId", rutaId); + query.setInteger("origenId", origenId); + query.setInteger("destinoId", destinoId); + return (ExcepcionPeaje) query.uniqueResult(); + } + + private Parada getParada(Integer paradaId) { + return (Parada) getSession().get(Parada.class, paradaId); + } + + private Ruta getRuta(Integer rutaId) { + return (Ruta) getSession().get(Ruta.class, rutaId); + } + + @Transactional + private void recalcularExcecoesPedagio(Set pvos) { + Map casetas = buscaCasetas(pvos); + for (PeajeVO peaje : pvos) { + ExcepcionPeaje excepcion = null; + CasetaPeaje caseta = casetas.get(peaje.casetaPeajeId); + + for (CasetaPeajeExcepcion cpe : caseta.getLsCasetaPeajeExcepcion()) { + if (excepcion == null) { + excepcion = new ExcepcionPeaje(); + excepcion.setActivo(true); + excepcion.setDestino(getParada(peaje.destinoId)); + excepcion.setFecmodif(Calendar.getInstance().getTime()); + excepcion.setOrigem(getParada(peaje.origenId)); + excepcion.setRuta(getRuta(peaje.rutaId)); + excepcion.setUsuarioId(1); + } + ExcepcionPeajeVigencia epv = new ExcepcionPeajeVigencia(); + epv.setActivo(cpe.getActivo()); + epv.setExcepcionPeaje(excepcion); + epv.setFecmodif(Calendar.getInstance().getTime()); + epv.setFecVentaFin(cpe.getFecVentaFin()); + epv.setFecVentaIni(cpe.getFecVentaIni()); + epv.setHoraFin(cpe.getHoraFin()); + epv.setHoraIni(cpe.getHoraIni()); + epv.setINDDOMINGO(cpe.getINDDOMINGO()); + epv.setINDJUEVES(cpe.getINDJUEVES()); + epv.setINDLUNES(cpe.getINDLUNES()); + epv.setINDMARTES(cpe.getINDMARTES()); + epv.setINDMIERCOLES(cpe.getINDMIERCOLES()); + epv.setINDSABADO(cpe.getINDSABADO()); + epv.setINDVIERNES(cpe.getINDVIERNES()); + epv.setPrecio(cpe.getPrecio()); + epv.setUsuarioId(1); + epv.setCasetaPeaje(caseta); + excepcion.getLsExcepcionPeajeVigencia().add(epv); + } + if (excepcion != null) { + getSession().saveOrUpdate(excepcion); + } + } + } + + private static class PeajeVO { + + private static final int HIGH_PRECISION = 10; + private static final BigDecimal A_HUNDRED = new BigDecimal(100); + private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + + private Integer rutaId; + private Integer origenId; + private Integer destinoId; + private Integer orgaoId; + private Integer casetaPeajeId; + private Integer cantAsientos; + private Integer cantEixos; + private BigDecimal importePeaje; + private BigDecimal indicePeaje; + private Integer activo; + private Date fecmodif; + private Integer usuarioId; + + private static BigDecimal getCantEixos(Ruta ruta) { + try { + return new BigDecimal(ruta.getCantEixos()); + } catch (NullPointerException e) { + throw new RuntimeException("rutaSemQtdEixos;" + ruta.getRutaId()); + } + } + + private static BigDecimal getRutaCantAsientos(Ruta ruta) { + try { + return new BigDecimal(ruta.getCantAsientos()); + } + catch (NullPointerException e) { + throw new RuntimeException("rutaSemQtdAsientos;" + ruta.getRutaId()); + } + } + + private static BigDecimal getImporte(Ruta ruta, Object[] obj) { + if (ruta.getIndSentidoIda()) { + return new BigDecimal(obj[22].toString()); + } + else { + return new BigDecimal(obj[23].toString()); + } + } + + private static BigDecimal getIcms(Ruta ruta, Object[] obj) { + return new BigDecimal(obj[27].toString()) + .divide(A_HUNDRED, HIGH_PRECISION, RoundingMode.HALF_UP); + } + + // ((importe * rutaCantEixos) / (indice * rutaCantAsientos)) / ( 1 - icms) + private static BigDecimal calculateImportePeajeANTT(BigDecimal importe, BigDecimal icms, + BigDecimal indice, BigDecimal rutaCantEixos, BigDecimal rutaCantAsientos, boolean usaICMS) { + + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.CALCULO_PEAJE_REUNIDAS_ANTT.getDescricao())) { + // (importe * rutaCantEixos) / (indice) + return importe.multiply(rutaCantEixos) + .divide(indice, HIGH_PRECISION, RoundingMode.HALF_UP); + } + else { + if(!usaICMS){ + return importe.multiply(rutaCantEixos) + .divide(indice.multiply(rutaCantAsientos), HIGH_PRECISION, RoundingMode.HALF_UP); + }else{ + return importe.multiply(rutaCantEixos) + .divide(indice.multiply(rutaCantAsientos), HIGH_PRECISION, RoundingMode.HALF_UP) + .divide(BigDecimal.ONE.subtract(icms), HIGH_PRECISION, RoundingMode.HALF_UP); + } + + } + } + + private static BigDecimal calculateImportePeajeAGER(BigDecimal km, OrgaoConcedente orgao, BigDecimal importe, + BigDecimal rutaCantEixos, BigDecimal rutaCantAsientos) { + BigDecimal indicePejeOrgao = orgao!=null && orgao.getIndicePeaje() !=null ? orgao.getIndicePeaje() : new BigDecimal(INDICE_ORIGINAL_AGER_MT); + // esse valor deveria vir do indice do orgao mas as casas decimais nao sao compativeis.. verificar se pode mudar a precisao do campo de indice.. + return validaValorMaxPedagioAGR(km.multiply(indicePejeOrgao).setScale(HIGH_PRECISION, RoundingMode.HALF_UP), + indicePejeOrgao, importe, rutaCantEixos, rutaCantAsientos ); } + + /* -- RESOLUÇÃO NORMATIVA AGER/MT N.º 002/2023 -- + * O cálculo do valor a ser repassado ao passageiro não poderá ser superior ao + * valor obtido mediante a aplicação da seguinte fórmula: + * 𝐕𝐀𝐏 = ∑𝐕𝐏 𝐱 𝐧º𝐄 / 𝐋𝐎𝐓 𝐱 𝐈𝐀𝐏 + * VAP - Valor a ser pago por passageiro + * ∑VP – Somatória do valor de pedágio no trecho percorrido pelo passageiro para 01 eixo simples + * NºE – Número de Eixos + * LOT - Lotação total do veículo padrão - 46 lugares (Edital de Licitação STCRIP) + * IAP - Índice de Aproveitamento previsto na planilha tarifária - 60% (Edital de Licitação STCRIP) + * */ + private static BigDecimal validaValorMaxPedagioAGR(BigDecimal pedagio, BigDecimal indicePejeOrgao, BigDecimal importe, + BigDecimal rutaCantEixos, BigDecimal rutaCantAsientos) { + BigDecimal valorCalculado = importe.multiply(rutaCantEixos) + .divide(indicePejeOrgao.multiply(rutaCantAsientos),HIGH_PRECISION, RoundingMode.HALF_UP); + return valorCalculado.min(pedagio); + } + + // ((importe * rutaCantEixos) / (indice)) / ( 1 - icms) + private static BigDecimal calculateImportePeajeARTESP(BigDecimal importe, BigDecimal icms, + BigDecimal indice, BigDecimal rutaCantEixos, boolean usaICMS) { + if(!usaICMS){ + return importe.multiply(rutaCantEixos) + .divide(indice, HIGH_PRECISION, RoundingMode.HALF_UP); + }else{ + return importe.multiply(rutaCantEixos) + .divide(indice, HIGH_PRECISION, RoundingMode.HALF_UP) + .divide(BigDecimal.ONE.subtract(icms), HIGH_PRECISION, RoundingMode.HALF_UP); + } + + } + + private static BigDecimal calculateImportePeaje(Ruta ruta, OrgaoConcedente orgao, Object[] obj, BigDecimal indicePeaje, boolean usaICMS, BigDecimal km) { + BigDecimal rutaCantEixos = getCantEixos(ruta); + BigDecimal indice = indicePeaje; + BigDecimal importe = getImporte(ruta, obj); + BigDecimal icms = usaICMS ? getIcms(ruta, obj) : null; + + if (Constantes.ORGAOS_CONCEDENTES_CALCULO_ARTESP.contains(orgao.getOrgaoConcedenteId())) { + return calculateImportePeajeARTESP(importe, icms, indice, rutaCantEixos, usaICMS); + } + if (Constantes.ORGAOS_CONCEDENTES_CALCULO_ANTT.contains(orgao.getOrgaoConcedenteId())) { + return calculateImportePeajeANTT(importe, icms, indice, rutaCantEixos, getRutaCantAsientos(ruta), usaICMS); + } + if (Constantes.ORGAOS_CONCEDENTES_CALCULO_AGER.contains(orgao.getOrgaoConcedenteId())) { + return calculateImportePeajeAGER(km, orgao, importe, rutaCantEixos, getRutaCantAsientos(ruta)); + } + + return BigDecimal.ZERO; // TODO throw an exception? como calcular quando é outro orgao concendente? + } + + private static BigDecimal getIndicePeaje(ClaseServicio claseServicio, + OrgaoConcedente orgao, List lsClasseIndicePeaje) { + + for (ClasseIndicePeaje classeIndicePeaje : lsClasseIndicePeaje) { + if (claseServicio.equals(classeIndicePeaje.getClasseServicio())) { + return classeIndicePeaje.getIndicePeaje(); + } + } + return orgao.getIndicePeaje(); + } + + private static PeajeVO create(Ruta ruta, OrgaoConcedente orgao, + Object[] obj, List lsClasseIndicePeaje, boolean usaICMS, BigDecimal km) { + + PeajeVO pvo = new PeajeVO(); + + pvo.rutaId = ruta.getRutaId(); + pvo.cantEixos = ruta.getCantEixos(); + pvo.cantAsientos = ruta.getCantAsientos(); + pvo.origenId = Integer.parseInt(obj[8].toString()); + pvo.destinoId = Integer.parseInt(obj[9].toString()); + pvo.orgaoId = orgao.getOrgaoConcedenteId(); + pvo.casetaPeajeId = Integer.parseInt(obj[20].toString()); + pvo.indicePeaje = getIndicePeaje(ruta.getClaseServicio(), orgao, lsClasseIndicePeaje); + + pvo.importePeaje = calculateImportePeaje(ruta, orgao, obj, pvo.indicePeaje, usaICMS, km); + + pvo.activo = 1; + pvo.fecmodif = new Date(); + pvo.usuarioId = UsuarioLogado.getUsuarioLogado().getUsuarioId(); + + return pvo; + } + + private String toInsertQuery() { + return new StringBuilder() + .append("insert into peaje ( peaje_id, ruta_id, origen_id, destino_id, ") + .append(" orgaoconcedente_id, casetapeaje_id, cantasientos, canteixos, ") + .append(" importepeaje, indicepeaje, activo, fecmodif, usuario_id ) ") + .append("values ( peaje_seq.nextval, ") + .append(rutaId).append(", ") + .append(origenId).append(", ") + .append(destinoId).append(", ") + .append(orgaoId).append(", ") + .append(casetaPeajeId).append(", ") + .append(cantAsientos).append(", ") + .append(cantEixos).append(", ") + .append(importePeaje).append(", ") + .append(indicePeaje).append(", ") + .append(activo).append(", ") + .append("to_date('") + .append(SDF.format(fecmodif)) + .append("', 'yyyy/mm/dd hh24:mi:ss'), ") + .append(usuarioId).append(" ) ") + .toString(); + } + + private String toUpdateExcepcionPeajeQuery() { + return new StringBuilder() + .append("update excepcion_peaje ") + .append("set activo = 0 ") + .append("where ruta_id = ").append(rutaId) + .append(" and origen_id = ").append(origenId) + .append(" and destino_id = ").append(origenId) + .toString(); + } + + private String toUpdateExcepcionPeajeVigenciaQuery() { + return new StringBuilder() + .append("update excepcion_peaje_vigencia ") + .append("set activo = 0 ") + .append("where excepcionpeaje_id in ( ") + .append(" select excepcionpeaje_id ") + .append(" from excepcion_peaje ") + .append(" where ruta_id = ").append(rutaId) + .append(" and origen_id = ").append(origenId) + .append(" and destino_id = ").append(origenId) + .append(")") + .toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((cantAsientos == null) ? 0 : cantAsientos.hashCode()); + result = prime * result + ((cantEixos == null) ? 0 : cantEixos.hashCode()); + result = prime * result + ((casetaPeajeId == null) ? 0 : casetaPeajeId.hashCode()); + result = prime * result + ((destinoId == null) ? 0 : destinoId.hashCode()); + result = prime * result + ((importePeaje == null) ? 0 : importePeaje.hashCode()); + result = prime * result + ((indicePeaje == null) ? 0 : indicePeaje.hashCode()); + result = prime * result + ((orgaoId == null) ? 0 : orgaoId.hashCode()); + result = prime * result + ((origenId == null) ? 0 : origenId.hashCode()); + result = prime * result + ((rutaId == null) ? 0 : rutaId.hashCode()); + result = prime * result + ((usuarioId == null) ? 0 : usuarioId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PeajeVO other = (PeajeVO) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (cantAsientos == null) { + if (other.cantAsientos != null) + return false; + } else if (!cantAsientos.equals(other.cantAsientos)) + return false; + if (cantEixos == null) { + if (other.cantEixos != null) + return false; + } else if (!cantEixos.equals(other.cantEixos)) + return false; + if (casetaPeajeId == null) { + if (other.casetaPeajeId != null) + return false; + } else if (!casetaPeajeId.equals(other.casetaPeajeId)) + return false; + if (destinoId == null) { + if (other.destinoId != null) + return false; + } else if (!destinoId.equals(other.destinoId)) + return false; + if (importePeaje == null) { + if (other.importePeaje != null) + return false; + } else if (!importePeaje.equals(other.importePeaje)) + return false; + if (indicePeaje == null) { + if (other.indicePeaje != null) + return false; + } else if (!indicePeaje.equals(other.indicePeaje)) + return false; + if (orgaoId == null) { + if (other.orgaoId != null) + return false; + } else if (!orgaoId.equals(other.orgaoId)) + return false; + if (origenId == null) { + if (other.origenId != null) + return false; + } else if (!origenId.equals(other.origenId)) + return false; + if (rutaId == null) { + if (other.rutaId != null) + return false; + } else if (!rutaId.equals(other.rutaId)) + return false; + if (usuarioId == null) { + if (other.usuarioId != null) + return false; + } else if (!usuarioId.equals(other.usuarioId)) + return false; + return true; + } + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCargoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCargoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCargoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCargoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeExcepcionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeExcepcionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeExcepcionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeExcepcionHibernateDAO.java index 9105f4bd2..b016190c4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeExcepcionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeExcepcionHibernateDAO.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CasetaPeajeExcepcionDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; - -@Repository("casetaPeajeExcepcionDAO") -public class CasetaPeajeExcepcionHibernateDAO extends GenericHibernateDAO implements CasetaPeajeExcepcionDAO { - - @Autowired - public CasetaPeajeExcepcionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public List obtenerPorCasetaPeaje(CasetaPeaje caseta) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("casetaPeaje", caseta)); - c.add(Restrictions.eq(ACTIVO, true)).setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CasetaPeajeExcepcionDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; + +@Repository("casetaPeajeExcepcionDAO") +public class CasetaPeajeExcepcionHibernateDAO extends GenericHibernateDAO implements CasetaPeajeExcepcionDAO { + + @Autowired + public CasetaPeajeExcepcionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public List obtenerPorCasetaPeaje(CasetaPeaje caseta) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("casetaPeaje", caseta)); + c.add(Restrictions.eq(ACTIVO, true)).setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java index 751eb536f..b34f4e212 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java @@ -1,59 +1,59 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CasetaPeajeDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; - -@Repository("casetaPeajeDAO") -public class CasetaPeajeHibernateDAO extends GenericHibernateDAO implements CasetaPeajeDAO { - - @Autowired - public CasetaPeajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return (List) c.list(); - } - - public List buscarTodosOrdenadoPorDescricao() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("desccaseta")); - c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); - return (List) c.list(); - } - - @Override - public List buscar(String casetaPeajeDesc) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("desccaseta", casetaPeajeDesc)); - return c.list(); - } - - @Override - public void deletarVigencias(List cpes) { - for (CasetaPeajeExcepcion cpe : cpes) { - String hql = " update CasetaPeajeExcepcion set activo = false, fecModif = :fecModif, usuarioId = :usuarioId where casetaPeajeExcepcionId = " + cpe.getCasetaPeajeExcepcionId(); - Query sq = getSession().createQuery(hql); - sq.setTimestamp("fecModif", cpe.getFecmodif()); - sq.setInteger("usuarioId", cpe.getUsuarioId()); - sq.executeUpdate(); - } - } +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CasetaPeajeDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; + +@Repository("casetaPeajeDAO") +public class CasetaPeajeHibernateDAO extends GenericHibernateDAO implements CasetaPeajeDAO { + + @Autowired + public CasetaPeajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return (List) c.list(); + } + + public List buscarTodosOrdenadoPorDescricao() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("desccaseta")); + c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); + return (List) c.list(); + } + + @Override + public List buscar(String casetaPeajeDesc) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("desccaseta", casetaPeajeDesc)); + return c.list(); + } + + @Override + public void deletarVigencias(List cpes) { + for (CasetaPeajeExcepcion cpe : cpes) { + String hql = " update CasetaPeajeExcepcion set activo = false, fecModif = :fecModif, usuarioId = :usuarioId where casetaPeajeExcepcionId = " + cpe.getCasetaPeajeExcepcionId(); + Query sq = getSession().createQuery(hql); + sq.setTimestamp("fecModif", cpe.getFecmodif()); + sq.setInteger("usuarioId", cpe.getUsuarioId()); + sq.executeUpdate(); + } + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaBloqueioImpPosteriorHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaBloqueioImpPosteriorHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaBloqueioImpPosteriorHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaBloqueioImpPosteriorHibernateDAO.java index 3177f7847..e4f4f627a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaBloqueioImpPosteriorHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaBloqueioImpPosteriorHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CategoriaBloqueioImpPosteriorDAO; -import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; - -@Repository("categoriaBloqueioImpPosteriorDAO") -public class CategoriaBloqueioImpPosteriorHibernateDAO extends GenericHibernateDAO - implements CategoriaBloqueioImpPosteriorDAO { - - @Autowired - public CategoriaBloqueioImpPosteriorHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CategoriaBloqueioImpPosteriorDAO; +import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; + +@Repository("categoriaBloqueioImpPosteriorDAO") +public class CategoriaBloqueioImpPosteriorHibernateDAO extends GenericHibernateDAO + implements CategoriaBloqueioImpPosteriorDAO { + + @Autowired + public CategoriaBloqueioImpPosteriorHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaFormAutorizacaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaFormAutorizacaoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaFormAutorizacaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaFormAutorizacaoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java index 2eb3d5973..acd746d52 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java @@ -1,44 +1,44 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CategoriaOrgaoDAO; -import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; -import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; - -@Repository("categoriaOrgaoDAO") - -public class CategoriaOrgaoHibernateDAO extends GenericHibernateDAO - implements CategoriaOrgaoDAO { - - @Autowired - public CategoriaOrgaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("categoriaCtrl", categoriaCtrl)); - - return (CategoriaOrgao) c.uniqueResult(); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CategoriaOrgaoDAO; +import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; +import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; + +@Repository("categoriaOrgaoDAO") + +public class CategoriaOrgaoHibernateDAO extends GenericHibernateDAO + implements CategoriaOrgaoDAO { + + @Autowired + public CategoriaOrgaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("categoriaCtrl", categoriaCtrl)); + + return (CategoriaOrgao) c.uniqueResult(); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java index a117e7ec6..f45410faf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java @@ -1,43 +1,43 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ClienteCursoDAO; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteCurso; -import com.rjconsultores.ventaboletos.entidad.Curso; - -@Repository("clienteCursoDAO") -public class ClienteCursoHibernateDAO extends GenericHibernateDAO - implements ClienteCursoDAO { - - @Autowired - public ClienteCursoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @Override - public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("cliente", cliente)); - c.add(Restrictions.eq("curso", curso)); - - return (ClienteCurso) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ClienteCursoDAO; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteCurso; +import com.rjconsultores.ventaboletos.entidad.Curso; + +@Repository("clienteCursoDAO") +public class ClienteCursoHibernateDAO extends GenericHibernateDAO + implements ClienteCursoDAO { + + @Autowired + public ClienteCursoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @Override + public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("cliente", cliente)); + c.add(Restrictions.eq("curso", curso)); + + return (ClienteCurso) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java index fa6b714d1..f72ad6f97 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ClienteDescuentoDAO; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; - -@Repository("clienteDescuentoDAO") -public class ClienteDescuentoHibernateDAO extends GenericHibernateDAO -implements ClienteDescuentoDAO { - - @Autowired - public ClienteDescuentoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List buscar(Cliente cliente) { - Criteria c = getSession().createCriteria(getPersistentClass()); - //c.add(Restrictions.eq(ACTIVO, 1)); - c.add(Restrictions.eq("cliente", cliente)); - return c.list(); - } - - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ClienteDescuentoDAO; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; + +@Repository("clienteDescuentoDAO") +public class ClienteDescuentoHibernateDAO extends GenericHibernateDAO +implements ClienteDescuentoDAO { + + @Autowired + public ClienteDescuentoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List buscar(Cliente cliente) { + Criteria c = getSession().createCriteria(getPersistentClass()); + //c.add(Restrictions.eq(ACTIVO, 1)); + c.add(Restrictions.eq("cliente", cliente)); + return c.list(); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java index ce634845d..ff455ded4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - - - -import com.rjconsultores.ventaboletos.dao.ClienteDireccionDAO; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; - - -@Repository("clienteDireccionDAO") -public class ClienteDireccionHibernateDAO extends GenericHibernateDAO - implements ClienteDireccionDAO { - - @Autowired - public ClienteDireccionHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(Integer clienteId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - Cliente cliente = new Cliente(); - cliente.setClienteId(clienteId); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("clienteId", cliente)); - return c.list(); - } - - public List buscar(Cliente cliente){ - Criteria c = getSession().createCriteria(getPersistentClass()); - //c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("clienteId", cliente)); - return c.list(); - } -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + + + +import com.rjconsultores.ventaboletos.dao.ClienteDireccionDAO; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; + + +@Repository("clienteDireccionDAO") +public class ClienteDireccionHibernateDAO extends GenericHibernateDAO + implements ClienteDireccionDAO { + + @Autowired + public ClienteDireccionHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(Integer clienteId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + Cliente cliente = new Cliente(); + cliente.setClienteId(clienteId); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("clienteId", cliente)); + return c.list(); + } + + public List buscar(Cliente cliente){ + Criteria c = getSession().createCriteria(getPersistentClass()); + //c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("clienteId", cliente)); + return c.list(); + } +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteHibernateDAO.java index 76c5f1e1e..e8e1deafe 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteHibernateDAO.java @@ -1,97 +1,97 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ClienteDAO; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.Empresa; - -@Repository("clienteDAO") -public class ClienteHibernateDAO extends GenericHibernateDAO - implements ClienteDAO { - - private static final String FIELD_ACTIVO = "activo"; - - @Autowired - public ClienteHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getCriteriaClienteActivo(); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(String nombCliente) { - Criteria c = getCriteriaClienteActivo(); - c.add(Restrictions.eq("nombcliente", nombCliente)); - - return c.list(); - } - - @Override - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa) { - Criteria c = getSession().createCriteria(getPersistentClass()); - - c.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - - Criteria clienteFidelidad = null; - clienteFidelidad = c.createCriteria("listClienteFidelidad"); - clienteFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - clienteFidelidad.add(Restrictions.eq("empresa", empresa)); - - Criteria tarjetaFidelidad = null; - tarjetaFidelidad = clienteFidelidad.createCriteria("tarjetaFidelidad"); - tarjetaFidelidad.add(Restrictions.eq("numTarjeta", numeroFidelidade)); - tarjetaFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - - c.setMaxResults(1); - return (Cliente)c.uniqueResult(); - } - - @Override - public List buscarPorDocumento(String documento) { - Criteria c = getCriteriaClienteActivo(); - c.add(Restrictions.or( - Restrictions.eq("numIdentificaUno", documento), - Restrictions.eq("numIdentificaDos", documento) - )); - return c.list(); - } - - private Criteria getCriteriaClienteActivo() { - Criteria criteria = getSession().createCriteria(getPersistentClass()); - criteria.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - return criteria; - } - - @Override - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade) { - Criteria c = getSession().createCriteria(getPersistentClass()); - - Criteria clienteFidelidad = null; - clienteFidelidad = c.createCriteria("listClienteFidelidad"); - clienteFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - - - Criteria tarjetaFidelidad = null; - tarjetaFidelidad = clienteFidelidad.createCriteria("tarjetaFidelidad"); - tarjetaFidelidad.add(Restrictions.eq("numTarjeta", numeroFidelidade)); - tarjetaFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - - - c.setMaxResults(1); - return (Cliente)c.uniqueResult(); } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ClienteDAO; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.Empresa; + +@Repository("clienteDAO") +public class ClienteHibernateDAO extends GenericHibernateDAO + implements ClienteDAO { + + private static final String FIELD_ACTIVO = "activo"; + + @Autowired + public ClienteHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getCriteriaClienteActivo(); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(String nombCliente) { + Criteria c = getCriteriaClienteActivo(); + c.add(Restrictions.eq("nombcliente", nombCliente)); + + return c.list(); + } + + @Override + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa) { + Criteria c = getSession().createCriteria(getPersistentClass()); + + c.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + + Criteria clienteFidelidad = null; + clienteFidelidad = c.createCriteria("listClienteFidelidad"); + clienteFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + clienteFidelidad.add(Restrictions.eq("empresa", empresa)); + + Criteria tarjetaFidelidad = null; + tarjetaFidelidad = clienteFidelidad.createCriteria("tarjetaFidelidad"); + tarjetaFidelidad.add(Restrictions.eq("numTarjeta", numeroFidelidade)); + tarjetaFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + + c.setMaxResults(1); + return (Cliente)c.uniqueResult(); + } + + @Override + public List buscarPorDocumento(String documento) { + Criteria c = getCriteriaClienteActivo(); + c.add(Restrictions.or( + Restrictions.eq("numIdentificaUno", documento), + Restrictions.eq("numIdentificaDos", documento) + )); + return c.list(); + } + + private Criteria getCriteriaClienteActivo() { + Criteria criteria = getSession().createCriteria(getPersistentClass()); + criteria.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + return criteria; + } + + @Override + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade) { + Criteria c = getSession().createCriteria(getPersistentClass()); + + Criteria clienteFidelidad = null; + clienteFidelidad = c.createCriteria("listClienteFidelidad"); + clienteFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + + + Criteria tarjetaFidelidad = null; + tarjetaFidelidad = clienteFidelidad.createCriteria("tarjetaFidelidad"); + tarjetaFidelidad.add(Restrictions.eq("numTarjeta", numeroFidelidade)); + tarjetaFidelidad.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + + + c.setMaxResults(1); + return (Cliente)c.uniqueResult(); } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java index 4baecf701..4c7dae245 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang.StringUtils; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ClientePacoteDAO; -import com.rjconsultores.ventaboletos.entidad.ClientePacote; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; - -@Repository("clientePacoteDAO") -public class ClientePacoteHibernateDAO extends GenericHibernateDAO implements ClientePacoteDAO { - - @Autowired - public ClientePacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List busquedaDatosClientePacote(String cpfCnpj) { - List clientePacoteVOs = new ArrayList(); - if(StringUtils.isNotBlank(cpfCnpj)) { - Map parametros = new HashMap(); - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT NEW com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO(cp.razaoSocial, cp.cpfCnpj, cp.tipoPessoa, cp.descemail, cp.desctelefone, cp.descfax, cp.cep, ") - .append("cp.endereco, cp.numero, cp.complemento, cp.pais, cp.estado, cp.cidade, cp.bairro) ") - .append("FROM ClientePacote cp "); - - if(StringUtils.isNotBlank(cpfCnpj)) { - sQuery.append("WHERE cp.cpfCnpj = :cpfCnpj "); - parametros.put("cpfCnpj", cpfCnpj.replaceAll("[^0-9]", "")); - } - - sQuery.append("ORDER BY cp.razaoSocial "); - Query qr = getSession().createQuery(sQuery.toString()); - for (Entry parametro : parametros.entrySet()) { - qr.setParameter(parametro.getKey(), parametro.getValue()); - } - - clientePacoteVOs = qr.list(); - } - - return clientePacoteVOs; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.commons.lang.StringUtils; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ClientePacoteDAO; +import com.rjconsultores.ventaboletos.entidad.ClientePacote; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; + +@Repository("clientePacoteDAO") +public class ClientePacoteHibernateDAO extends GenericHibernateDAO implements ClientePacoteDAO { + + @Autowired + public ClientePacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List busquedaDatosClientePacote(String cpfCnpj) { + List clientePacoteVOs = new ArrayList(); + if(StringUtils.isNotBlank(cpfCnpj)) { + Map parametros = new HashMap(); + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT NEW com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO(cp.razaoSocial, cp.cpfCnpj, cp.tipoPessoa, cp.descemail, cp.desctelefone, cp.descfax, cp.cep, ") + .append("cp.endereco, cp.numero, cp.complemento, cp.pais, cp.estado, cp.cidade, cp.bairro) ") + .append("FROM ClientePacote cp "); + + if(StringUtils.isNotBlank(cpfCnpj)) { + sQuery.append("WHERE cp.cpfCnpj = :cpfCnpj "); + parametros.put("cpfCnpj", cpfCnpj.replaceAll("[^0-9]", "")); + } + + sQuery.append("ORDER BY cp.razaoSocial "); + Query qr = getSession().createQuery(sQuery.toString()); + for (Entry parametro : parametros.entrySet()) { + qr.setParameter(parametro.getKey(), parametro.getValue()); + } + + clientePacoteVOs = qr.list(); + } + + return clientePacoteVOs; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CobrancaAdcPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CobrancaAdcPuntoVentaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CobrancaAdcPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CobrancaAdcPuntoVentaHibernateDAO.java index f0fdb3f80..975274a65 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CobrancaAdcPuntoVentaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CobrancaAdcPuntoVentaHibernateDAO.java @@ -1,82 +1,82 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CobrancaAdcPuntoVentaDAO; -import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -@Repository("cobrancaAdcPuntoVentaHibernateDAO") -public class CobrancaAdcPuntoVentaHibernateDAO extends GenericHibernateDAO implements CobrancaAdcPuntoVentaDAO { - - @Autowired - public CobrancaAdcPuntoVentaHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal) { - List cobrancaHistorico = new ArrayList(); - - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT ") - .append(" h ") - .append("FROM ") - .append(" CobrancaAdicionalHistorico h ") - .append("WHERE ") - .append(" h.cobrancaAdicional.cobrancaAddPuntoVenta_id = :cobrancaAdicionalId and ") - .append(" h.dataRegistro between :dataInicial and :dataFinal ") - .append("ORDER BY ") - .append(" h.cobrancaAdicionalHistoricoID "); - - Query qr = getSession().createQuery(sQuery.toString()); - - qr.setParameter("dataInicial", dataInicial); - qr.setParameter("dataFinal", dataFinal); - qr.setParameter("cobrancaAdicionalId", cobranca == null ? 0 : cobranca.getCobrancaAddPuntoVenta_id()); - - cobrancaHistorico = qr.list(); - - return cobrancaHistorico; - } - - @Override - @SuppressWarnings("unchecked") - public List buscarTodasAsCobrancas(PuntoVenta puntoVenta) { - - if (puntoVenta == null) - return null; - - List cobrancaAdcList = new ArrayList(); - - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT ") - .append(" h ") - .append("FROM ") - .append(" CobrancaAdcPuntoVenta h ") - .append("WHERE ") - .append(" h.puntoVenta.puntoventaId = :puntoVentaId ") - .append("ORDER BY ") - .append(" h.cobrancaAddPuntoVenta_id "); - - Query qr = getSession().createQuery(sQuery.toString()); - - qr.setParameter("puntoVentaId", puntoVenta.getPuntoventaId()); - - cobrancaAdcList = qr.list(); - - return cobrancaAdcList; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CobrancaAdcPuntoVentaDAO; +import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +@Repository("cobrancaAdcPuntoVentaHibernateDAO") +public class CobrancaAdcPuntoVentaHibernateDAO extends GenericHibernateDAO implements CobrancaAdcPuntoVentaDAO { + + @Autowired + public CobrancaAdcPuntoVentaHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal) { + List cobrancaHistorico = new ArrayList(); + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT ") + .append(" h ") + .append("FROM ") + .append(" CobrancaAdicionalHistorico h ") + .append("WHERE ") + .append(" h.cobrancaAdicional.cobrancaAddPuntoVenta_id = :cobrancaAdicionalId and ") + .append(" h.dataRegistro between :dataInicial and :dataFinal ") + .append("ORDER BY ") + .append(" h.cobrancaAdicionalHistoricoID "); + + Query qr = getSession().createQuery(sQuery.toString()); + + qr.setParameter("dataInicial", dataInicial); + qr.setParameter("dataFinal", dataFinal); + qr.setParameter("cobrancaAdicionalId", cobranca == null ? 0 : cobranca.getCobrancaAddPuntoVenta_id()); + + cobrancaHistorico = qr.list(); + + return cobrancaHistorico; + } + + @Override + @SuppressWarnings("unchecked") + public List buscarTodasAsCobrancas(PuntoVenta puntoVenta) { + + if (puntoVenta == null) + return null; + + List cobrancaAdcList = new ArrayList(); + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT ") + .append(" h ") + .append("FROM ") + .append(" CobrancaAdcPuntoVenta h ") + .append("WHERE ") + .append(" h.puntoVenta.puntoventaId = :puntoVentaId ") + .append("ORDER BY ") + .append(" h.cobrancaAddPuntoVenta_id "); + + Query qr = getSession().createQuery(sQuery.toString()); + + qr.setParameter("puntoVentaId", puntoVenta.getPuntoventaId()); + + cobrancaAdcList = qr.list(); + + return cobrancaAdcList; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CodigoBarraTrechoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CodigoBarraTrechoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CodigoBarraTrechoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CodigoBarraTrechoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java index 01cff14ff..f91cf8093 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CoeficienteTarifaDAO; -import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; - -@Repository("coeficienteTarifaDAO") -public class CoeficienteTarifaHibernateDAO extends GenericHibernateDAO - implements CoeficienteTarifaDAO { - - @Autowired - public CoeficienteTarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descCoeficiente")); - - return c.list(); - } - - @Override - public List buscar(String nomb) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.ilike("descCoeficiente", nomb, MatchMode.START)); - c.addOrder(Order.asc("descCoeficiente")); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CoeficienteTarifaDAO; +import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; + +@Repository("coeficienteTarifaDAO") +public class CoeficienteTarifaHibernateDAO extends GenericHibernateDAO + implements CoeficienteTarifaDAO { + + @Autowired + public CoeficienteTarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descCoeficiente")); + + return c.list(); + } + + @Override + public List buscar(String nomb) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.ilike("descCoeficiente", nomb, MatchMode.START)); + c.addOrder(Order.asc("descCoeficiente")); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java index 9ff1331c2..da9b53d42 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java @@ -1,299 +1,299 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.BooleanType; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; -import com.rjconsultores.ventaboletos.dao.ComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.Comissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; - -@Repository("comissaoHibernateDAO") -public class ComissaoHibernateDAO extends GenericHibernateDAO implements ComissaoDAO { - - @Autowired - public ComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List buscarReceitasComissoes(Integer puntoVentaId, Integer empresaId, Date periodo) { - - StringBuffer sql = new StringBuffer(); - sql.append("select "); - sql.append("b.marca_id as empresaId, b.puntoventa_id as puntoVentaId, "); - sql.append("to_char(b.fechorventa, 'dd-mm-yyyy') as datavenda, b.indstatusboleto as indstatusboleto, "); - sql.append("b.tipoventa_id as tipoVenta, b.motivocancelacion_id as motivoCancelacionId, "); - sql.append("coalesce(sum(b.preciopagado), 0) as valorpagado, coalesce(sum(b.importeseguro), 0) as seguro, "); - sql.append("coalesce(sum(b.importepedagio), 0) as pedagio, coalesce(sum(b.importetaxaembarque), 0) as embarque, "); - sql.append("coalesce(sum(case when tee.cvetipoevento = :teeexcbag then ee.impingreso else 0 end), 0) as excessoBagagem, "); - sql.append("coalesce(sum(case when tee.cvetipoevento = :teesegop then ee.impingreso else 0 end), 0) as seguroOpcional, "); - sql.append("coalesce(sum(case when tee.cvetipoevento not in (:teesegop,:teeexcbag) then ee.impingreso else 0 end), 0) as seguroOutros, "); - sql.append("case when b.ptovtaventa_id = b.puntoventa_id then 1 else 0 end as ptoVtaOrigem, "); - sql.append("ei.icms as icmsBase, e.estado_id as estadoId "); - sql.append("from boleto b "); - sql.append("inner join parada origen on origen.parada_id = b.origen_id "); - sql.append("inner join ciudad ci on origen.ciudad_id = ci.ciudad_id "); - sql.append("inner join estado e on ci.estado_id = e.estado_id "); - sql.append("inner join punto_venta p on b.puntoventa_id = p.puntoventa_id "); - sql.append("inner join empresa_imposto ei on (ei.estado_id = e.estado_id "); - sql.append(" and ei.empresa_id = b.marca_id and ei.activo = 1) "); - /*sql.append("left join caja c on c.numoperacion = b.numoperacion and c.numfoliosistema = b.numfoliosistema "); - sql.append(" and c.numfoliopreimpreso = b.numfoliopreimpreso and c.numseriepreimpresa = b.numseriepreimpresa ");*/ - sql.append("left join evento_extra ee on ee.boleto_id = b.boleto_id "); - sql.append("left join tipo_evento_extra tee on tee.tipoeventoextra_id = ee.tipoeventoextra_id "); - sql.append("where b.fechorventa between TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') and TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') "); - sql.append("and b.marca_id = :empresaId "); - sql.append("and (p.puntoventa_id = :puntoventaId or p.puntoventapadre_id = :puntoventaId) "); - sql.append("group by b.marca_id, b.puntoventa_id, to_char(b.fechorventa, 'dd-mm-yyyy'), "); - sql.append("b.indstatusboleto, b.tipoventa_id, b.motivocancelacion_id, b.ptovtaventa_id, ei.icms, e.estado_id "); - sql.append("order by datavenda "); - - Query query = getSession().createSQLQuery(sql.toString()) - .addScalar("empresaId", IntegerType.INSTANCE) - .addScalar("puntoVentaId", IntegerType.INSTANCE) - .addScalar("datavenda", StringType.INSTANCE) - .addScalar("tipoVenta", IntegerType.INSTANCE) - .addScalar("indstatusboleto", StringType.INSTANCE) - .addScalar("motivoCancelacionId", IntegerType.INSTANCE) - .addScalar("valorpagado", BigDecimalType.INSTANCE) - .addScalar("seguro", BigDecimalType.INSTANCE) - .addScalar("pedagio", BigDecimalType.INSTANCE) - .addScalar("embarque", BigDecimalType.INSTANCE) - .addScalar("excessoBagagem", BigDecimalType.INSTANCE) - .addScalar("seguroOpcional", BigDecimalType.INSTANCE) - .addScalar("seguroOutros", BigDecimalType.INSTANCE) - .addScalar("ptoVtaOrigem", BooleanType.INSTANCE) - .addScalar("icmsBase", BigDecimalType.INSTANCE) - .addScalar("estadoId", IntegerType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(BoletoComissao.class)); - - Date inicioPeriodo = DateUtil.inicioFechaPeriodoMeses(periodo); - Date fimPeriodo = DateUtil.fimFechaPeriodoMeses(periodo); - - query.setString("dataInicial", DateUtil.getStringDate(inicioPeriodo, "dd/MM/yyyy HH:mm")); - query.setString("dataFinal", DateUtil.getStringDate(fimPeriodo, "dd/MM/yyyy HH:mm")); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - query.setString("teeexcbag", TipoEventoExtra.EXCESSO_BAGAGEM.toString()); - query.setString("teesegop", TipoEventoExtra.SEGURO_OPCIONAL.toString()); - - return query.list(); - } - - @Override - public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, String competencia) { - - StringBuilder hql = new StringBuilder(); - hql.append(" from Comissao c "); - hql.append(" where c.activo = 1 "); - hql.append(" AND c.puntoVenta.puntoventaId = :puntoventaId "); - hql.append(" AND c.empresaId = :empresaId "); - hql.append(" AND c.competencia = :periodo "); - - Query query = getSession().createQuery(hql.toString()); - query.setString("periodo", competencia); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - - return (Comissao) query.uniqueResult(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscaHistoricoComissao(Map parametros) { - - /*String competenciaInicio = DateUtil.getStringDate(periodoInicio, "MM/yyyy"); - String competenciaFim = DateUtil.getStringDate(periodoFim, "MM/yyyy");*/ - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT c.competencia AS competencia, pv.nombpuntoventa, pv.numpuntoventa, "); - sql.append(" c.datapagamento AS dataPagamento, "); - sql.append(" c.comissao_bpr AS comissaoBpr, "); - sql.append(" c.receita_excessobagagem AS receitaExcessobagagem, "); - sql.append(" c.receita_seguroopcional AS receitaSeguroopcional, "); - sql.append(" c.receita_seguro AS receitaSeguro, "); - sql.append(" c.descontos_fixos AS descontosFixos, "); - sql.append(" c.descontos_eventuais AS descontosEventuais, "); - sql.append(" c.royaties AS royaties, "); - sql.append(" c.iss_retido AS issRetido, "); - sql.append(" c.bonificacao_metas AS bonificacaoMetas, "); - sql.append(" c.entregas_passagem AS entregasPassagem, "); - sql.append(" c.receita_outros AS receitaOutros, "); - sql.append(" c.receita_bpr AS receitaBPR, "); - sql.append(" c.devolvidos AS devolvidos, "); - sql.append(" c.receita_bruta_excessobagagem AS receitaBrutaExcessoBagagem, "); - sql.append(" c.receita_bruta_seguroopcional AS receitaBrutaSeguroopcional, "); - sql.append(" c.receita_bruta_seguro AS receitaBrutaSeguro, "); - sql.append(" c.indpago AS indPago, "); - sql.append(" CASE WHEN c.indpago = 1 THEN 'PAGO' ELSE 'PENDENTE' END AS pagamento, "); - sql.append(" up.nombusuario AS usuarioPagamento, "); - sql.append(" ul.nombusuario AS usuarioLancamento, "); - sql.append(" e.nombempresa, e.cnpj, "); - sql.append(" pa.numagencia as agencia, pa.numconta || '-' || pa.digito as conta, if.nome as banco, "); - sql.append(" ci.nombciudad as cidade, pv.descCorreo, pv.razonsocial, pv.numdocpuntoventa as cnpjPuntoventa, "); - sql.append(" c.data_inicial as dataInicial, c.data_final as dataFinal, "); - sql.append(" c.receita_gap as receitaGAP, c.empresa_id as empresaId "); - sql.append("FROM comissao c "); - sql.append("JOIN punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sql.append("JOIN empresa e on e.empresa_id = c.empresa_id "); - sql.append("LEFT JOIN ptovta_agencia pa on pa.ptovtaagencia_id = pv.ptovtaagencia_id "); - sql.append("LEFT JOIN insti_financeira if on if.instifinanceira_id = pa.instifinanceira_id "); - sql.append("LEFT JOIN colonia co on co.colonia_id = pv.colonia_id "); - sql.append("LEFT JOIN ciudad ci on ci.ciudad_id = co.ciudad_id "); - sql.append("LEFT JOIN usuario up ON up.usuario_id = c.usuariopagamento_id "); - sql.append("LEFT JOIN usuario ul ON ul.usuario_id = c.usuario_id "); - sql.append("WHERE c.activo = 1 "); - - if(parametros.containsKey("empresaId")) { - sql.append(" AND c.empresa_id = :empresaId "); - } - - if(parametros.containsKey("competenciaInicial") && parametros.containsKey("competenciaFinal")) { - sql.append(" AND TO_DATE(c.competencia,'MM/YYYY') BETWEEN TO_DATE(:competenciaInicial,'MM/YYYY') and TO_DATE(:competenciaFinal,'MM/YYYY') "); - } - - if(parametros.containsKey("dataInicial") && parametros.containsKey("dataFinal")) { - sql.append(" AND ((TO_DATE(:dataInicial,'dd/mm/yyyy') between c.data_inicial and c.data_final) OR (TO_DATE(:dataFinal,'dd/mm/yyyy') between c.data_inicial and c.data_final)) "); - } - - if(parametros.containsKey("puntoventaId")) { - sql.append(" AND c.puntoventa_id = :puntoventaId "); - } - - if(parametros.containsKey("competenciaInicio") && parametros.containsKey("competenciaFim")) { - sql.append("ORDER BY pv.nombpuntoventa, TO_DATE(c.competencia,'MM/YYYY') "); - } - - if(parametros.containsKey("dataInicial") && parametros.containsKey("dataFinal")) { - sql.append("ORDER BY pv.nombpuntoventa, c.data_inicial "); - } - - Query query = getSession().createSQLQuery(sql.toString()) - .addScalar("competencia", StringType.INSTANCE) - .addScalar("nombpuntoventa", StringType.INSTANCE) - .addScalar("numpuntoventa", StringType.INSTANCE) - .addScalar("dataPagamento", DateType.INSTANCE) - .addScalar("comissaoBpr", BigDecimalType.INSTANCE) - .addScalar("receitaExcessobagagem", BigDecimalType.INSTANCE) - .addScalar("receitaSeguroopcional", BigDecimalType.INSTANCE) - .addScalar("receitaSeguro", BigDecimalType.INSTANCE) - .addScalar("descontosFixos", BigDecimalType.INSTANCE) - .addScalar("descontosEventuais", BigDecimalType.INSTANCE) - .addScalar("royaties", BigDecimalType.INSTANCE) - .addScalar("issRetido", BigDecimalType.INSTANCE) - .addScalar("bonificacaoMetas", BigDecimalType.INSTANCE) - .addScalar("entregasPassagem", BigDecimalType.INSTANCE) - .addScalar("receitaOutros", BigDecimalType.INSTANCE) - .addScalar("indPago", BooleanType.INSTANCE) - .addScalar("pagamento", StringType.INSTANCE) - .addScalar("usuarioPagamento", StringType.INSTANCE) - .addScalar("usuarioLancamento", StringType.INSTANCE) - .addScalar("nombempresa", StringType.INSTANCE) - .addScalar("cnpj", StringType.INSTANCE) - .addScalar("conta", StringType.INSTANCE) - .addScalar("banco", StringType.INSTANCE) - .addScalar("cidade", StringType.INSTANCE) - .addScalar("agencia", StringType.INSTANCE) - .addScalar("descCorreo", StringType.INSTANCE) - .addScalar("razonsocial", StringType.INSTANCE) - .addScalar("cnpjPuntoventa", StringType.INSTANCE) - .addScalar("receitaBPR", BigDecimalType.INSTANCE) - .addScalar("devolvidos", BigDecimalType.INSTANCE) - .addScalar("receitaBrutaExcessoBagagem", BigDecimalType.INSTANCE) - .addScalar("receitaBrutaSeguroopcional", BigDecimalType.INSTANCE) - .addScalar("receitaBrutaSeguro", BigDecimalType.INSTANCE) - .addScalar("dataInicial", DateType.INSTANCE) - .addScalar("dataFinal", DateType.INSTANCE) - .addScalar("receitaGAP", BigDecimalType.INSTANCE) - .addScalar("empresaId", IntegerType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(HistoricoComissao.class)); - - setParametros(query, parametros); - - return query.list(); - } - - @Override - @SuppressWarnings("unchecked") - public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) { - StringBuilder sQuery = new StringBuilder("SELECT NEW com.rjconsultores.ventaboletos.entidad.PuntoVenta(pv.puntoventaId, pv.nombpuntoventa) FROM PtovtaComissao c "); - sQuery.append("JOIN c.puntoventaId pv ") - .append("JOIN c.empresaId e ") - .append("WHERE pv.activo = 1 ") - .append("AND e.empresaId = :empresaId ") - .append("AND c.activo = 1") - .append("AND pv.statusaprobacion = 'A'"); - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("empresaId", empresaId); - - return qr.list(); - } - - @Override - @SuppressWarnings("unchecked") - public List buscaPuntoVentasComComissaoParametrizada() { - StringBuilder sQuery = new StringBuilder("SELECT NEW com.rjconsultores.ventaboletos.entidad.PuntoVenta(pv.puntoventaId, pv.nombpuntoventa) FROM PtovtaComissao c "); - sQuery.append("JOIN c.puntoventaId pv ") - .append("JOIN c.empresaId e ") - .append("WHERE pv.activo = 1 ") - .append("AND c.indretercomissao = 1 ") - .append("AND c.activo = 1") - .append("AND pv.statusaprobacion = 'A'"); - Query qr = getSession().createQuery(sQuery.toString()); - ; - - return qr.list(); - } - - @Override - public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) { - StringBuilder hql = new StringBuilder(); - hql.append(" from Comissao c "); - hql.append(" where c.activo = 1 "); - hql.append(" AND c.puntoVenta.puntoventaId = :puntoventaId "); - hql.append(" AND c.empresaId = :empresaId "); - hql.append(" AND ((TO_DATE(:dataInicial,'dd/mm/yyyy') between c.dataInicial and c.dataFinal) OR (TO_DATE(:dataFinal,'dd/mm/yyyy') between c.dataInicial and c.dataFinal))"); - - Query query = getSession().createQuery(hql.toString()); - query.setString("dataInicial", DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")); - query.setString("dataFinal", DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - - return (Comissao) query.uniqueResult(); - } - - @SuppressWarnings("rawtypes") - private void setParametros(Query qr, Map parametros) { - for (Entry parametro : parametros.entrySet()) { - if (parametro.getValue() instanceof Collection) { - qr.setParameterList(parametro.getKey(), (Collection) parametro.getValue()); - } else if (parametro.getValue() instanceof List) { - qr.setParameterList(parametro.getKey(), (List) parametro.getValue()); - } else { - qr.setParameter(parametro.getKey(), parametro.getValue()); - } - } - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.BooleanType; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; +import com.rjconsultores.ventaboletos.dao.ComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.Comissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; + +@Repository("comissaoHibernateDAO") +public class ComissaoHibernateDAO extends GenericHibernateDAO implements ComissaoDAO { + + @Autowired + public ComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List buscarReceitasComissoes(Integer puntoVentaId, Integer empresaId, Date periodo) { + + StringBuffer sql = new StringBuffer(); + sql.append("select "); + sql.append("b.marca_id as empresaId, b.puntoventa_id as puntoVentaId, "); + sql.append("to_char(b.fechorventa, 'dd-mm-yyyy') as datavenda, b.indstatusboleto as indstatusboleto, "); + sql.append("b.tipoventa_id as tipoVenta, b.motivocancelacion_id as motivoCancelacionId, "); + sql.append("coalesce(sum(b.preciopagado), 0) as valorpagado, coalesce(sum(b.importeseguro), 0) as seguro, "); + sql.append("coalesce(sum(b.importepedagio), 0) as pedagio, coalesce(sum(b.importetaxaembarque), 0) as embarque, "); + sql.append("coalesce(sum(case when tee.cvetipoevento = :teeexcbag then ee.impingreso else 0 end), 0) as excessoBagagem, "); + sql.append("coalesce(sum(case when tee.cvetipoevento = :teesegop then ee.impingreso else 0 end), 0) as seguroOpcional, "); + sql.append("coalesce(sum(case when tee.cvetipoevento not in (:teesegop,:teeexcbag) then ee.impingreso else 0 end), 0) as seguroOutros, "); + sql.append("case when b.ptovtaventa_id = b.puntoventa_id then 1 else 0 end as ptoVtaOrigem, "); + sql.append("ei.icms as icmsBase, e.estado_id as estadoId "); + sql.append("from boleto b "); + sql.append("inner join parada origen on origen.parada_id = b.origen_id "); + sql.append("inner join ciudad ci on origen.ciudad_id = ci.ciudad_id "); + sql.append("inner join estado e on ci.estado_id = e.estado_id "); + sql.append("inner join punto_venta p on b.puntoventa_id = p.puntoventa_id "); + sql.append("inner join empresa_imposto ei on (ei.estado_id = e.estado_id "); + sql.append(" and ei.empresa_id = b.marca_id and ei.activo = 1) "); + /*sql.append("left join caja c on c.numoperacion = b.numoperacion and c.numfoliosistema = b.numfoliosistema "); + sql.append(" and c.numfoliopreimpreso = b.numfoliopreimpreso and c.numseriepreimpresa = b.numseriepreimpresa ");*/ + sql.append("left join evento_extra ee on ee.boleto_id = b.boleto_id "); + sql.append("left join tipo_evento_extra tee on tee.tipoeventoextra_id = ee.tipoeventoextra_id "); + sql.append("where b.fechorventa between TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') and TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') "); + sql.append("and b.marca_id = :empresaId "); + sql.append("and (p.puntoventa_id = :puntoventaId or p.puntoventapadre_id = :puntoventaId) "); + sql.append("group by b.marca_id, b.puntoventa_id, to_char(b.fechorventa, 'dd-mm-yyyy'), "); + sql.append("b.indstatusboleto, b.tipoventa_id, b.motivocancelacion_id, b.ptovtaventa_id, ei.icms, e.estado_id "); + sql.append("order by datavenda "); + + Query query = getSession().createSQLQuery(sql.toString()) + .addScalar("empresaId", IntegerType.INSTANCE) + .addScalar("puntoVentaId", IntegerType.INSTANCE) + .addScalar("datavenda", StringType.INSTANCE) + .addScalar("tipoVenta", IntegerType.INSTANCE) + .addScalar("indstatusboleto", StringType.INSTANCE) + .addScalar("motivoCancelacionId", IntegerType.INSTANCE) + .addScalar("valorpagado", BigDecimalType.INSTANCE) + .addScalar("seguro", BigDecimalType.INSTANCE) + .addScalar("pedagio", BigDecimalType.INSTANCE) + .addScalar("embarque", BigDecimalType.INSTANCE) + .addScalar("excessoBagagem", BigDecimalType.INSTANCE) + .addScalar("seguroOpcional", BigDecimalType.INSTANCE) + .addScalar("seguroOutros", BigDecimalType.INSTANCE) + .addScalar("ptoVtaOrigem", BooleanType.INSTANCE) + .addScalar("icmsBase", BigDecimalType.INSTANCE) + .addScalar("estadoId", IntegerType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(BoletoComissao.class)); + + Date inicioPeriodo = DateUtil.inicioFechaPeriodoMeses(periodo); + Date fimPeriodo = DateUtil.fimFechaPeriodoMeses(periodo); + + query.setString("dataInicial", DateUtil.getStringDate(inicioPeriodo, "dd/MM/yyyy HH:mm")); + query.setString("dataFinal", DateUtil.getStringDate(fimPeriodo, "dd/MM/yyyy HH:mm")); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + query.setString("teeexcbag", TipoEventoExtra.EXCESSO_BAGAGEM.toString()); + query.setString("teesegop", TipoEventoExtra.SEGURO_OPCIONAL.toString()); + + return query.list(); + } + + @Override + public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, String competencia) { + + StringBuilder hql = new StringBuilder(); + hql.append(" from Comissao c "); + hql.append(" where c.activo = 1 "); + hql.append(" AND c.puntoVenta.puntoventaId = :puntoventaId "); + hql.append(" AND c.empresaId = :empresaId "); + hql.append(" AND c.competencia = :periodo "); + + Query query = getSession().createQuery(hql.toString()); + query.setString("periodo", competencia); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + + return (Comissao) query.uniqueResult(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscaHistoricoComissao(Map parametros) { + + /*String competenciaInicio = DateUtil.getStringDate(periodoInicio, "MM/yyyy"); + String competenciaFim = DateUtil.getStringDate(periodoFim, "MM/yyyy");*/ + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT c.competencia AS competencia, pv.nombpuntoventa, pv.numpuntoventa, "); + sql.append(" c.datapagamento AS dataPagamento, "); + sql.append(" c.comissao_bpr AS comissaoBpr, "); + sql.append(" c.receita_excessobagagem AS receitaExcessobagagem, "); + sql.append(" c.receita_seguroopcional AS receitaSeguroopcional, "); + sql.append(" c.receita_seguro AS receitaSeguro, "); + sql.append(" c.descontos_fixos AS descontosFixos, "); + sql.append(" c.descontos_eventuais AS descontosEventuais, "); + sql.append(" c.royaties AS royaties, "); + sql.append(" c.iss_retido AS issRetido, "); + sql.append(" c.bonificacao_metas AS bonificacaoMetas, "); + sql.append(" c.entregas_passagem AS entregasPassagem, "); + sql.append(" c.receita_outros AS receitaOutros, "); + sql.append(" c.receita_bpr AS receitaBPR, "); + sql.append(" c.devolvidos AS devolvidos, "); + sql.append(" c.receita_bruta_excessobagagem AS receitaBrutaExcessoBagagem, "); + sql.append(" c.receita_bruta_seguroopcional AS receitaBrutaSeguroopcional, "); + sql.append(" c.receita_bruta_seguro AS receitaBrutaSeguro, "); + sql.append(" c.indpago AS indPago, "); + sql.append(" CASE WHEN c.indpago = 1 THEN 'PAGO' ELSE 'PENDENTE' END AS pagamento, "); + sql.append(" up.nombusuario AS usuarioPagamento, "); + sql.append(" ul.nombusuario AS usuarioLancamento, "); + sql.append(" e.nombempresa, e.cnpj, "); + sql.append(" pa.numagencia as agencia, pa.numconta || '-' || pa.digito as conta, if.nome as banco, "); + sql.append(" ci.nombciudad as cidade, pv.descCorreo, pv.razonsocial, pv.numdocpuntoventa as cnpjPuntoventa, "); + sql.append(" c.data_inicial as dataInicial, c.data_final as dataFinal, "); + sql.append(" c.receita_gap as receitaGAP, c.empresa_id as empresaId "); + sql.append("FROM comissao c "); + sql.append("JOIN punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sql.append("JOIN empresa e on e.empresa_id = c.empresa_id "); + sql.append("LEFT JOIN ptovta_agencia pa on pa.ptovtaagencia_id = pv.ptovtaagencia_id "); + sql.append("LEFT JOIN insti_financeira if on if.instifinanceira_id = pa.instifinanceira_id "); + sql.append("LEFT JOIN colonia co on co.colonia_id = pv.colonia_id "); + sql.append("LEFT JOIN ciudad ci on ci.ciudad_id = co.ciudad_id "); + sql.append("LEFT JOIN usuario up ON up.usuario_id = c.usuariopagamento_id "); + sql.append("LEFT JOIN usuario ul ON ul.usuario_id = c.usuario_id "); + sql.append("WHERE c.activo = 1 "); + + if(parametros.containsKey("empresaId")) { + sql.append(" AND c.empresa_id = :empresaId "); + } + + if(parametros.containsKey("competenciaInicial") && parametros.containsKey("competenciaFinal")) { + sql.append(" AND TO_DATE(c.competencia,'MM/YYYY') BETWEEN TO_DATE(:competenciaInicial,'MM/YYYY') and TO_DATE(:competenciaFinal,'MM/YYYY') "); + } + + if(parametros.containsKey("dataInicial") && parametros.containsKey("dataFinal")) { + sql.append(" AND ((TO_DATE(:dataInicial,'dd/mm/yyyy') between c.data_inicial and c.data_final) OR (TO_DATE(:dataFinal,'dd/mm/yyyy') between c.data_inicial and c.data_final)) "); + } + + if(parametros.containsKey("puntoventaId")) { + sql.append(" AND c.puntoventa_id = :puntoventaId "); + } + + if(parametros.containsKey("competenciaInicio") && parametros.containsKey("competenciaFim")) { + sql.append("ORDER BY pv.nombpuntoventa, TO_DATE(c.competencia,'MM/YYYY') "); + } + + if(parametros.containsKey("dataInicial") && parametros.containsKey("dataFinal")) { + sql.append("ORDER BY pv.nombpuntoventa, c.data_inicial "); + } + + Query query = getSession().createSQLQuery(sql.toString()) + .addScalar("competencia", StringType.INSTANCE) + .addScalar("nombpuntoventa", StringType.INSTANCE) + .addScalar("numpuntoventa", StringType.INSTANCE) + .addScalar("dataPagamento", DateType.INSTANCE) + .addScalar("comissaoBpr", BigDecimalType.INSTANCE) + .addScalar("receitaExcessobagagem", BigDecimalType.INSTANCE) + .addScalar("receitaSeguroopcional", BigDecimalType.INSTANCE) + .addScalar("receitaSeguro", BigDecimalType.INSTANCE) + .addScalar("descontosFixos", BigDecimalType.INSTANCE) + .addScalar("descontosEventuais", BigDecimalType.INSTANCE) + .addScalar("royaties", BigDecimalType.INSTANCE) + .addScalar("issRetido", BigDecimalType.INSTANCE) + .addScalar("bonificacaoMetas", BigDecimalType.INSTANCE) + .addScalar("entregasPassagem", BigDecimalType.INSTANCE) + .addScalar("receitaOutros", BigDecimalType.INSTANCE) + .addScalar("indPago", BooleanType.INSTANCE) + .addScalar("pagamento", StringType.INSTANCE) + .addScalar("usuarioPagamento", StringType.INSTANCE) + .addScalar("usuarioLancamento", StringType.INSTANCE) + .addScalar("nombempresa", StringType.INSTANCE) + .addScalar("cnpj", StringType.INSTANCE) + .addScalar("conta", StringType.INSTANCE) + .addScalar("banco", StringType.INSTANCE) + .addScalar("cidade", StringType.INSTANCE) + .addScalar("agencia", StringType.INSTANCE) + .addScalar("descCorreo", StringType.INSTANCE) + .addScalar("razonsocial", StringType.INSTANCE) + .addScalar("cnpjPuntoventa", StringType.INSTANCE) + .addScalar("receitaBPR", BigDecimalType.INSTANCE) + .addScalar("devolvidos", BigDecimalType.INSTANCE) + .addScalar("receitaBrutaExcessoBagagem", BigDecimalType.INSTANCE) + .addScalar("receitaBrutaSeguroopcional", BigDecimalType.INSTANCE) + .addScalar("receitaBrutaSeguro", BigDecimalType.INSTANCE) + .addScalar("dataInicial", DateType.INSTANCE) + .addScalar("dataFinal", DateType.INSTANCE) + .addScalar("receitaGAP", BigDecimalType.INSTANCE) + .addScalar("empresaId", IntegerType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(HistoricoComissao.class)); + + setParametros(query, parametros); + + return query.list(); + } + + @Override + @SuppressWarnings("unchecked") + public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) { + StringBuilder sQuery = new StringBuilder("SELECT NEW com.rjconsultores.ventaboletos.entidad.PuntoVenta(pv.puntoventaId, pv.nombpuntoventa) FROM PtovtaComissao c "); + sQuery.append("JOIN c.puntoventaId pv ") + .append("JOIN c.empresaId e ") + .append("WHERE pv.activo = 1 ") + .append("AND e.empresaId = :empresaId ") + .append("AND c.activo = 1") + .append("AND pv.statusaprobacion = 'A'"); + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("empresaId", empresaId); + + return qr.list(); + } + + @Override + @SuppressWarnings("unchecked") + public List buscaPuntoVentasComComissaoParametrizada() { + StringBuilder sQuery = new StringBuilder("SELECT NEW com.rjconsultores.ventaboletos.entidad.PuntoVenta(pv.puntoventaId, pv.nombpuntoventa) FROM PtovtaComissao c "); + sQuery.append("JOIN c.puntoventaId pv ") + .append("JOIN c.empresaId e ") + .append("WHERE pv.activo = 1 ") + .append("AND c.indretercomissao = 1 ") + .append("AND c.activo = 1") + .append("AND pv.statusaprobacion = 'A'"); + Query qr = getSession().createQuery(sQuery.toString()); + ; + + return qr.list(); + } + + @Override + public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) { + StringBuilder hql = new StringBuilder(); + hql.append(" from Comissao c "); + hql.append(" where c.activo = 1 "); + hql.append(" AND c.puntoVenta.puntoventaId = :puntoventaId "); + hql.append(" AND c.empresaId = :empresaId "); + hql.append(" AND ((TO_DATE(:dataInicial,'dd/mm/yyyy') between c.dataInicial and c.dataFinal) OR (TO_DATE(:dataFinal,'dd/mm/yyyy') between c.dataInicial and c.dataFinal))"); + + Query query = getSession().createQuery(hql.toString()); + query.setString("dataInicial", DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")); + query.setString("dataFinal", DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + + return (Comissao) query.uniqueResult(); + } + + @SuppressWarnings("rawtypes") + private void setParametros(Query qr, Map parametros) { + for (Entry parametro : parametros.entrySet()) { + if (parametro.getValue() instanceof Collection) { + qr.setParameterList(parametro.getKey(), (Collection) parametro.getValue()); + } else if (parametro.getValue() instanceof List) { + qr.setParameterList(parametro.getKey(), (List) parametro.getValue()); + } else { + qr.setParameter(parametro.getKey(), parametro.getValue()); + } + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoLogHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoLogHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoLogHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoLogHibernateDAO.java index 6943454ca..f1119b622 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoLogHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoLogHibernateDAO.java @@ -1,66 +1,66 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ComissaoLogDAO; -import com.rjconsultores.ventaboletos.entidad.ComissaoLog; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.comissao.ComissaoLogVO; - -@Repository("comissaoLogHibernateDAO") -public class ComissaoLogHibernateDAO extends GenericHibernateDAO implements ComissaoLogDAO { - - @Autowired - public ComissaoLogHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public void limparComissaoLog(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { - StringBuilder hql = new StringBuilder(); - hql.append("delete comissao_log "); - hql.append("where activo = 1 "); - hql.append(" AND puntoventa_id = :puntoventaId "); - hql.append(" AND empresa_id = :empresaId "); - hql.append(" AND feccorte between TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') and TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi') "); - - Query query = getSession().createSQLQuery(hql.toString()); - query.setString("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(dataInicial), "dd/MM/yyyy HH:mm")); - query.setString("dataFinal", DateUtil.getStringDate(DateUtil.inicioFecha(dataFinal), "dd/MM/yyyy HH:mm")); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - - query.executeUpdate(); - } - - @Override - public void suscribirTodos(List lsComissaoLogVO) { - for (ComissaoLogVO vo : lsComissaoLogVO) { - ComissaoLog comissaoLog = new ComissaoLog(); - comissaoLog.setPuntoventaId(vo.getPuntoventaId()); - comissaoLog.setEmpresaId(vo.getEmpresaId()); - comissaoLog.setActivo(true); - comissaoLog.setFecmodif(new Date()); - comissaoLog.setFeccorte(vo.getFeccorte()); - comissaoLog.setUsuarioId(vo.getUsuarioId()); - comissaoLog.setTurnoId(vo.getTurnoId()); - comissaoLog.setCajaId(vo.getCajaId()); - comissaoLog.setCajadiversosId(vo.getCajadiversosId()); - comissaoLog.setPorcComissao(vo.getPorcComissao()); - comissaoLog.setValorBase(vo.getValorBase()); - comissaoLog.setValorComissao(vo.getValorComissao()); - comissaoLog.setOrigem(vo.getOrigem()); - comissaoLog.setTexto(vo.getTexto()); - - suscribir(comissaoLog); - } - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ComissaoLogDAO; +import com.rjconsultores.ventaboletos.entidad.ComissaoLog; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.comissao.ComissaoLogVO; + +@Repository("comissaoLogHibernateDAO") +public class ComissaoLogHibernateDAO extends GenericHibernateDAO implements ComissaoLogDAO { + + @Autowired + public ComissaoLogHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public void limparComissaoLog(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { + StringBuilder hql = new StringBuilder(); + hql.append("delete comissao_log "); + hql.append("where activo = 1 "); + hql.append(" AND puntoventa_id = :puntoventaId "); + hql.append(" AND empresa_id = :empresaId "); + hql.append(" AND feccorte between TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') and TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi') "); + + Query query = getSession().createSQLQuery(hql.toString()); + query.setString("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(dataInicial), "dd/MM/yyyy HH:mm")); + query.setString("dataFinal", DateUtil.getStringDate(DateUtil.inicioFecha(dataFinal), "dd/MM/yyyy HH:mm")); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + + query.executeUpdate(); + } + + @Override + public void suscribirTodos(List lsComissaoLogVO) { + for (ComissaoLogVO vo : lsComissaoLogVO) { + ComissaoLog comissaoLog = new ComissaoLog(); + comissaoLog.setPuntoventaId(vo.getPuntoventaId()); + comissaoLog.setEmpresaId(vo.getEmpresaId()); + comissaoLog.setActivo(true); + comissaoLog.setFecmodif(new Date()); + comissaoLog.setFeccorte(vo.getFeccorte()); + comissaoLog.setUsuarioId(vo.getUsuarioId()); + comissaoLog.setTurnoId(vo.getTurnoId()); + comissaoLog.setCajaId(vo.getCajaId()); + comissaoLog.setCajadiversosId(vo.getCajadiversosId()); + comissaoLog.setPorcComissao(vo.getPorcComissao()); + comissaoLog.setValorBase(vo.getValorBase()); + comissaoLog.setValorComissao(vo.getValorComissao()); + comissaoLog.setOrigem(vo.getOrigem()); + comissaoLog.setTexto(vo.getTexto()); + + suscribir(comissaoLog); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoReceitaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoReceitaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoReceitaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoReceitaHibernateDAO.java index a9cb51f70..daadcb55e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoReceitaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoReceitaHibernateDAO.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ComissaoReceitaDAO; -import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -@Repository("comissaoReceitaHibernateDAO") -public class ComissaoReceitaHibernateDAO extends GenericHibernateDAO implements ComissaoReceitaDAO { - - @Autowired - public ComissaoReceitaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { - StringBuilder hql = new StringBuilder(); - hql.append("select c from ComissaoReceita c ") - .append("where c.activo = 1 ") - .append(" AND c.puntoVenta.puntoventaId = :puntoventaId ") - .append(" AND c.empresa.empresaId = :empresaId ") - .append(" AND c.datamovimento between TO_DATE(:dataInicial,'DD/MM/YYYY') and TO_DATE(:dataFinal,'DD/MM/YYYY') ") - .append("order by c.empresa.nombempresa, c.puntoVenta.nombpuntoventa, c.datamovimento"); - - Query query = getSession().createQuery(hql.toString()); - query.setString("dataInicial", DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")); - query.setString("dataFinal", DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - - return query.list(); - } - - @Override - public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { - StringBuilder hql = new StringBuilder(); - hql.append("delete comissao_receita "); - hql.append("where activo = 1 "); - hql.append(" AND puntoventa_id = :puntoventaId "); - hql.append(" AND empresa_id = :empresaId "); - hql.append(" AND datamovimento between TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') and TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi') "); - - Query query = getSession().createSQLQuery(hql.toString()); - query.setString("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(dataInicial), "dd/MM/yyyy HH:mm")); - query.setString("dataFinal", DateUtil.getStringDate(DateUtil.inicioFecha(dataFinal), "dd/MM/yyyy HH:mm")); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - - query.executeUpdate(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ComissaoReceitaDAO; +import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +@Repository("comissaoReceitaHibernateDAO") +public class ComissaoReceitaHibernateDAO extends GenericHibernateDAO implements ComissaoReceitaDAO { + + @Autowired + public ComissaoReceitaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { + StringBuilder hql = new StringBuilder(); + hql.append("select c from ComissaoReceita c ") + .append("where c.activo = 1 ") + .append(" AND c.puntoVenta.puntoventaId = :puntoventaId ") + .append(" AND c.empresa.empresaId = :empresaId ") + .append(" AND c.datamovimento between TO_DATE(:dataInicial,'DD/MM/YYYY') and TO_DATE(:dataFinal,'DD/MM/YYYY') ") + .append("order by c.empresa.nombempresa, c.puntoVenta.nombpuntoventa, c.datamovimento"); + + Query query = getSession().createQuery(hql.toString()); + query.setString("dataInicial", DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")); + query.setString("dataFinal", DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + + return query.list(); + } + + @Override + public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { + StringBuilder hql = new StringBuilder(); + hql.append("delete comissao_receita "); + hql.append("where activo = 1 "); + hql.append(" AND puntoventa_id = :puntoventaId "); + hql.append(" AND empresa_id = :empresaId "); + hql.append(" AND datamovimento between TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') and TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi') "); + + Query query = getSession().createSQLQuery(hql.toString()); + query.setString("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(dataInicial), "dd/MM/yyyy HH:mm")); + query.setString("dataFinal", DateUtil.getStringDate(DateUtil.inicioFecha(dataFinal), "dd/MM/yyyy HH:mm")); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + + query.executeUpdate(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java index dffa44aed..e2e72ecf0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionConfDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionConf; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; - -@Repository("conexionConfDAO") -public class ConexionConfHibernateDAO extends GenericHibernateDAO - implements ConexionConfDAO { - - @Autowired - public ConexionConfHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("grupo", numgrupo)); - - Criteria ctrl = c.createCriteria("conexionCtrl"); - ctrl.add(Restrictions.eq("conexionctrlId", conexionCtrlId)); - - return (ConexionConf) c.uniqueResult(); - } - - @Override - public List buscarPorConexionCtrl(ConexionCtrl conexionCtrl) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("conexionCtrl", conexionCtrl)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionConfDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionConf; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; + +@Repository("conexionConfDAO") +public class ConexionConfHibernateDAO extends GenericHibernateDAO + implements ConexionConfDAO { + + @Autowired + public ConexionConfHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("grupo", numgrupo)); + + Criteria ctrl = c.createCriteria("conexionCtrl"); + ctrl.add(Restrictions.eq("conexionctrlId", conexionCtrlId)); + + return (ConexionConf) c.uniqueResult(); + } + + @Override + public List buscarPorConexionCtrl(ConexionCtrl conexionCtrl) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("conexionCtrl", conexionCtrl)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionCtrlHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionCtrlHibernateDAO.java index 97f68c75a..0a4f2bab0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionCtrlHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionCtrlHibernateDAO.java @@ -1,164 +1,164 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.PricingConexao; -import com.rjconsultores.ventaboletos.vo.conexion.OrdenarLocalidadesGeradas; -import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -@Repository("conexionCtrlDAO") -public class ConexionCtrlHibernateDAO extends GenericHibernateDAO - implements ConexionCtrlDAO { - - @Autowired - private ConexionRutaConfHibernateDAO confRutaDAO; - - @Autowired - public ConexionCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarConexionesCtrl(Integer origenId, Integer destinoId) { - - StringBuilder sb = new StringBuilder(); - sb.append(" from ConexionCtrl "); - sb.append(" where activo = 1 "); - - if (origenId != null) { - sb.append(" and origenId = ").append(origenId); - } - if (destinoId != null) { - sb.append(" and destinoId = ").append(destinoId); - } - - Query query = getSession().createQuery(sb.toString()); - List list = query.list(); - - return list; - } - - @Override - @SuppressWarnings("unchecked") - public List buscarTodasConexionesCtrlPricing() { - StringBuilder sb = new StringBuilder(); - sb.append(" from ConexionCtrl "); - sb.append(" where activo = 1 and indPricing = 1 "); - - Query query = getSession().createQuery(sb.toString()); - List list = query.list(); - - return list; - } - - @SuppressWarnings("unchecked") - @Override - public List carregarConexoesCadastradas(Long conexionctrlId) { - - if(conexionctrlId == null) { - return null; - } - - StringBuilder sQuery = new StringBuilder(); - sQuery.append(confRutaDAO.getSQLCarregarConexoesCadastradas()) - .append(" where ") - .append(" coctrl.activo = 1 and coctrl.conexionctrl_id = :conexionctrl_id "); - - Query qr = getSession().createSQLQuery(sQuery.toString()); - qr.setParameter("conexionctrl_id", conexionctrlId); - - List localidadesCombinadas = new ArrayList(0); - List listConexionCtrl = new ArrayList(0); - List listConexionCtrlVO = new ArrayList(0); - - List result = qr.list(); - - confRutaDAO.transformarObjetosConexao(localidadesCombinadas, listConexionCtrl, listConexionCtrlVO, result); - - Collections.sort(localidadesCombinadas, new OrdenarLocalidadesGeradas()); - - return localidadesCombinadas; - - } - - @SuppressWarnings("unchecked") - @Override - public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId) { - - if(origenId == null || destinoId == null) { - return null; - } - - StringBuilder sQuery = new StringBuilder(); - sQuery.append(" select distinct ") - .append(" origem.descparada as origem, destino.descparada as destino, c.conexionctrl_id ") - .append(" from") - .append(" conexion_ctrl c inner join ") - .append(" parada origem on origem.parada_id = c.origen_id inner join ") - .append(" parada destino on destino.parada_id = c.destino_id ") - .append(" where ") - .append(" c.activo = 1 and c.indpricing = 1 and c.origen_id = :origenId and c.destino_id = :destinoId "); - - if(conexionctrlId != null) { - sQuery.append(" and c.conexionctrl_id = :conexionctrlId "); - } - - Query qr = getSession().createSQLQuery(sQuery.toString()); - qr.setParameter("origenId", origenId); - qr.setParameter("destinoId", destinoId); - - if(conexionctrlId != null) { - qr.setParameter("conexionctrlId", conexionctrlId); - } - - List localidadesCombinadas = new ArrayList(0); - - List result = qr.list(); - - for (Object[] tupla : result) { - - Parada paradaOrigem = new Parada(origenId, null, tupla[0].toString()); - Parada paradaDestino = new Parada(destinoId, null, tupla[1].toString()); - - conexionctrlId = Long.valueOf(tupla[2].toString()); - - ConexionCtrlVO conex = new ConexionCtrlVO(origenId, destinoId); - conex.setConexionctrlId(conexionctrlId); - conex.setIndPricing(true); - conex.setOrigenId(origenId); - conex.setDestinoId(destinoId); - - ParadaVOConexionRuta parada = new ParadaVOConexionRuta(); - - parada.setParadaOrigem(paradaOrigem); - parada.setParadaDestino(paradaDestino); - parada.setConexionCtrl(conex); - - localidadesCombinadas.add(parada); - } - - return localidadesCombinadas; - - } - - public void limparPesquisaPricingConexao(Integer pricingId) { - StringBuilder sQuery = new StringBuilder("DELETE FROM PRICING_CONEXAO_VALOR WHERE PRICING_ID = :pricingId AND TRUNC(FECMODIF) = TRUNC(SYSDATE) "); - SQLQuery qrUpdate = getSession().createSQLQuery(sQuery.toString()); - - qrUpdate.setParameter("pricingId", pricingId); - qrUpdate.executeUpdate(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.PricingConexao; +import com.rjconsultores.ventaboletos.vo.conexion.OrdenarLocalidadesGeradas; +import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +@Repository("conexionCtrlDAO") +public class ConexionCtrlHibernateDAO extends GenericHibernateDAO + implements ConexionCtrlDAO { + + @Autowired + private ConexionRutaConfHibernateDAO confRutaDAO; + + @Autowired + public ConexionCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarConexionesCtrl(Integer origenId, Integer destinoId) { + + StringBuilder sb = new StringBuilder(); + sb.append(" from ConexionCtrl "); + sb.append(" where activo = 1 "); + + if (origenId != null) { + sb.append(" and origenId = ").append(origenId); + } + if (destinoId != null) { + sb.append(" and destinoId = ").append(destinoId); + } + + Query query = getSession().createQuery(sb.toString()); + List list = query.list(); + + return list; + } + + @Override + @SuppressWarnings("unchecked") + public List buscarTodasConexionesCtrlPricing() { + StringBuilder sb = new StringBuilder(); + sb.append(" from ConexionCtrl "); + sb.append(" where activo = 1 and indPricing = 1 "); + + Query query = getSession().createQuery(sb.toString()); + List list = query.list(); + + return list; + } + + @SuppressWarnings("unchecked") + @Override + public List carregarConexoesCadastradas(Long conexionctrlId) { + + if(conexionctrlId == null) { + return null; + } + + StringBuilder sQuery = new StringBuilder(); + sQuery.append(confRutaDAO.getSQLCarregarConexoesCadastradas()) + .append(" where ") + .append(" coctrl.activo = 1 and coctrl.conexionctrl_id = :conexionctrl_id "); + + Query qr = getSession().createSQLQuery(sQuery.toString()); + qr.setParameter("conexionctrl_id", conexionctrlId); + + List localidadesCombinadas = new ArrayList(0); + List listConexionCtrl = new ArrayList(0); + List listConexionCtrlVO = new ArrayList(0); + + List result = qr.list(); + + confRutaDAO.transformarObjetosConexao(localidadesCombinadas, listConexionCtrl, listConexionCtrlVO, result); + + Collections.sort(localidadesCombinadas, new OrdenarLocalidadesGeradas()); + + return localidadesCombinadas; + + } + + @SuppressWarnings("unchecked") + @Override + public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId) { + + if(origenId == null || destinoId == null) { + return null; + } + + StringBuilder sQuery = new StringBuilder(); + sQuery.append(" select distinct ") + .append(" origem.descparada as origem, destino.descparada as destino, c.conexionctrl_id ") + .append(" from") + .append(" conexion_ctrl c inner join ") + .append(" parada origem on origem.parada_id = c.origen_id inner join ") + .append(" parada destino on destino.parada_id = c.destino_id ") + .append(" where ") + .append(" c.activo = 1 and c.indpricing = 1 and c.origen_id = :origenId and c.destino_id = :destinoId "); + + if(conexionctrlId != null) { + sQuery.append(" and c.conexionctrl_id = :conexionctrlId "); + } + + Query qr = getSession().createSQLQuery(sQuery.toString()); + qr.setParameter("origenId", origenId); + qr.setParameter("destinoId", destinoId); + + if(conexionctrlId != null) { + qr.setParameter("conexionctrlId", conexionctrlId); + } + + List localidadesCombinadas = new ArrayList(0); + + List result = qr.list(); + + for (Object[] tupla : result) { + + Parada paradaOrigem = new Parada(origenId, null, tupla[0].toString()); + Parada paradaDestino = new Parada(destinoId, null, tupla[1].toString()); + + conexionctrlId = Long.valueOf(tupla[2].toString()); + + ConexionCtrlVO conex = new ConexionCtrlVO(origenId, destinoId); + conex.setConexionctrlId(conexionctrlId); + conex.setIndPricing(true); + conex.setOrigenId(origenId); + conex.setDestinoId(destinoId); + + ParadaVOConexionRuta parada = new ParadaVOConexionRuta(); + + parada.setParadaOrigem(paradaOrigem); + parada.setParadaDestino(paradaDestino); + parada.setConexionCtrl(conex); + + localidadesCombinadas.add(parada); + } + + return localidadesCombinadas; + + } + + public void limparPesquisaPricingConexao(Integer pricingId) { + StringBuilder sQuery = new StringBuilder("DELETE FROM PRICING_CONEXAO_VALOR WHERE PRICING_ID = :pricingId AND TRUNC(FECMODIF) = TRUNC(SYSDATE) "); + SQLQuery qrUpdate = getSession().createSQLQuery(sQuery.toString()); + + qrUpdate.setParameter("pricingId", pricingId); + qrUpdate.executeUpdate(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java index 277be013a..d6f34bb5e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionDescuentoDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; - -@Repository("conexionDescuentoDAO") -public class ConexionDescuentoHibernateDAO extends GenericHibernateDAO -implements ConexionDescuentoDAO { - - @Autowired - public ConexionDescuentoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List bucarPorConexion(Long conexionId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexion.conexionId", conexionId)); - c.add(Restrictions.eq(ACTIVO, true)); - return c.list(); - } - - @Override - @SuppressWarnings("unchecked") - public List bucarPorConexionInativos(Long conexionId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexion.conexionId", conexionId)); - c.add(Restrictions.eq(ACTIVO, false)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionDescuentoDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; + +@Repository("conexionDescuentoDAO") +public class ConexionDescuentoHibernateDAO extends GenericHibernateDAO +implements ConexionDescuentoDAO { + + @Autowired + public ConexionDescuentoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List bucarPorConexion(Long conexionId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexion.conexionId", conexionId)); + c.add(Restrictions.eq(ACTIVO, true)); + return c.list(); + } + + @Override + @SuppressWarnings("unchecked") + public List bucarPorConexionInativos(Long conexionId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexion.conexionId", conexionId)); + c.add(Restrictions.eq(ACTIVO, false)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java index 95855a01d..fbfd114bf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java @@ -1,31 +1,31 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionExcepcionDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; - -@Repository("conexionExcepcionDAO") -public class ConexionExcepcionHibernateDAO extends GenericHibernateDAO - implements ConexionExcepcionDAO { - - @Autowired - public ConexionExcepcionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexionctrlId", conexionctrlId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionExcepcionDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; + +@Repository("conexionExcepcionDAO") +public class ConexionExcepcionHibernateDAO extends GenericHibernateDAO + implements ConexionExcepcionDAO { + + @Autowired + public ConexionExcepcionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexionctrlId", conexionctrlId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java index 6394358a6..b8cf44162 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java @@ -1,31 +1,31 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionExcepcionRutaDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; - -@Repository("conexionExcepcionRutaDAO") -public class ConexionExcepcionRutaHibernateDAO extends GenericHibernateDAO - implements ConexionExcepcionRutaDAO { - - @Autowired - public ConexionExcepcionRutaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexionctrlId", conexionctrlId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionExcepcionRutaDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; + +@Repository("conexionExcepcionRutaDAO") +public class ConexionExcepcionRutaHibernateDAO extends GenericHibernateDAO + implements ConexionExcepcionRutaDAO { + + @Autowired + public ConexionExcepcionRutaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexionctrlId", conexionctrlId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java index 048e386d1..cffb45c91 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java @@ -1,361 +1,361 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionDAO; -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrlTemp; -import com.rjconsultores.ventaboletos.entidad.ConexionTemp; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; - -@Repository("conexionDAO") -public class ConexionHibernateDAO extends GenericHibernateDAO - implements ConexionDAO { - - @Autowired - public ConexionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarConexionesValidas() { - - StringBuilder sb = new StringBuilder(); - sb.append("SELECT DISTINCT cct.conexionctrl_id AS conexionCtrlId, "); - sb.append(" po1.descparada AS conOrigen, "); - sb.append(" pd1.descparada AS conDestino, "); - sb.append(" c.numgrupo AS grupo, "); - sb.append(" po2.descparada AS tramoOrigen, "); - sb.append(" pd2.descparada AS tramoDestino, "); - sb.append(" c.numsecuencia AS numSecuencia "); - sb.append("FROM conexion c "); - sb.append(" inner join conexion_conf cf "); - sb.append(" ON ( cf.conexionctrl_id = c.conexionctrl_id "); - sb.append(" AND cf.activo = 1 ) "); - sb.append(" inner join conexion_ctrl cct "); - sb.append(" ON ( cct.conexionctrl_id = c.conexionctrl_id "); - sb.append(" AND cct.activo = 1 ) "); - sb.append(" inner join parada po1 "); - sb.append(" ON ( po1.parada_id = cct.origen_id ) "); - sb.append(" inner join parada pd1 "); - sb.append(" ON ( pd1.parada_id = cct.destino_id ) "); - sb.append(" inner join parada po2 "); - sb.append(" ON ( po2.parada_id = c.origen_id ) "); - sb.append(" inner join parada pd2 "); - sb.append(" ON ( pd2.parada_id = c.destino_id ) "); - sb.append("WHERE cct.activo = 1 and c.activo = 1 "); - sb.append("ORDER BY po1.descparada, "); - sb.append(" pd1.descparada, "); - sb.append(" cct.conexionctrl_id, "); - sb.append(" c.numgrupo, "); - sb.append(" c.numsecuencia, "); - sb.append(" po2.descparada, "); - sb.append(" pd2.descparada "); - - Query query = getSession().createSQLQuery(sb.toString()); - List conexionVOs = new ArrayList(); - - for (Object o : query.list()) { - Object[] oc = (Object[]) o; - - ConexionVO conexionVO = new ConexionVO(); - conexionVO.setConexionCtrlId(((BigDecimal) oc[0]).longValue()); - conexionVO.setConOrigen((String) oc[1]); - conexionVO.setConDestino((String) oc[2]); - conexionVO.setGrupo(((BigDecimal) oc[3]).intValue()); - conexionVO.setTramoOrigen((String) oc[4]); - conexionVO.setTramoDestino((String) oc[5]); - - conexionVO.setBuscaAgruapada(false); - - conexionVOs.add(conexionVO); - } - - return conexionVOs; - } - - @Override - public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId) { - - String queryStr = getQueryConexiones(origenId, destinoId); - - Query query = getSession().createSQLQuery(queryStr); - List list = query.list(); - - List vos = new ArrayList(); - for (Object[] o : list) { - ConexionVO vo = new ConexionVO(); - vo.setGrupo(((BigDecimal) o[0]).intValue()); - vo.setConexionCtrlId(((BigDecimal) o[1]).longValue()); - vo.setConOrigen((String) o[2]); - vo.setConDestino((String) o[3]); - vo.setTramoOrigen((String) o[4]); - vo.setTramoDestino((String) o[5]); - vo.setBuscaAgruapada(isBuscaAgrupada); - - vos.add(vo); - } - - if (isBuscaAgrupada) { - return agruparConexiones(vos); - } - - return vos; - } - - private List agruparConexiones(List conexiones) { - - LinkedHashMap> map = new LinkedHashMap>(); - - List agrpVo = new ArrayList(); - - String grupoTrecho = null; - Integer grupo = null; - for (ConexionVO vo : conexiones) { - - if (grupo == null) - grupo = vo.getGrupo(); - - if (!grupo.equals(vo.getGrupo())) { - if (!map.containsKey(grupoTrecho)) { - map.put(grupoTrecho, agrpVo); - } - - grupo = vo.getGrupo(); - grupoTrecho = null; - agrpVo = new ArrayList(); - } - - if (grupo.equals(vo.getGrupo())) { - - if (grupoTrecho == null) { - grupoTrecho = vo.getTramoOrigen() + ";" + vo.getTramoDestino() + ";"; - } else { - grupoTrecho += vo.getTramoOrigen() + ";" + vo.getTramoDestino() + ";"; - } - - agrpVo.add(vo); - } - - } - - List agrupados = new ArrayList(); - for (Map.Entry> entry : map.entrySet()) { - agrupados.addAll(entry.getValue()); - } - - return agrupados; - } - - private String getQueryConexiones(Integer origenId, Integer destinoId) { - - StringBuilder sb = new StringBuilder(); - sb.append(" select "); - sb.append(" c.numgrupo as grupo, "); - sb.append(" cc.conexionctrl_id as conexionCtrlId, occ.descparada as conOrigen, dcc.descparada as conDestino, "); - sb.append(" oc.descparada as tramoOrigen, dc.descparada as tramoDestino, c.numsecuencia as numsecuencia "); - sb.append(" from conexion_ctrl cc "); - sb.append(" inner join conexion_conf conf "); - sb.append(" on conf.conexionctrl_id = cc.conexionctrl_id, "); - sb.append(" conexion c, "); - sb.append(" parada occ, "); - sb.append(" parada dcc, "); - sb.append(" parada oc, "); - sb.append(" parada dc "); - sb.append(" where cc.activo = 1 and c.activo = 1 and conf.activo = 1"); - sb.append(" and cc.conexionctrl_id = c.conexionctrl_id "); - sb.append(" and occ.parada_id = cc.origen_id "); - sb.append(" and conf.grupo = c.numgrupo "); - sb.append(" and dcc.parada_id = cc.destino_id "); - sb.append(" and oc.parada_id = c.origen_id "); - sb.append(" and dc.parada_id = c.destino_id "); - - if (origenId != null) { - sb.append(" and cc.origen_id = ").append(origenId); - } - - if (destinoId != null) { - sb.append(" and cc.destino_id = ").append(destinoId); - } - - sb.append(" order by conOrigen, conDestino, conexionCtrlId, grupo, numsecuencia, tramoOrigen, tramoDestino "); - return sb.toString(); - } - - @Override - public void generarConexiones(Integer usuarioId) { - this.getSession().createQuery("DELETE ConexionTemp").executeUpdate(); - this.getSession().createQuery("DELETE ConexionCtrlTemp").executeUpdate(); - - Query queryParadas = this.getSession().createQuery("select distinct t.origem.paradaId,t.destino.paradaId from Tramo t where t.activo = 1 order by t.origem.paradaId "); - List lsParadas = queryParadas.list(); - - StringBuilder sb = new StringBuilder(""); - sb.append("SELECT "); - sb.append(" t.origem.paradaId, "); - sb.append(" t.destino.paradaId, "); - sb.append(" t2.origem.paradaId, "); - sb.append(" t2.destino.paradaId, "); - sb.append(" MAX(t.kmReal), "); - sb.append(" MAX(tcs.tiemporecorrido), "); - sb.append(" MAX(t2.kmReal), "); - sb.append(" MAX(tcs2.tiemporecorrido) "); - sb.append(" "); - sb.append("FROM "); - sb.append(" Tramo t, "); - sb.append(" Tramo t2, "); - sb.append(" TramoServicio tcs, "); - sb.append(" TramoServicio tcs2 "); - sb.append(" "); - sb.append("where "); - sb.append(" t.origem.paradaId = :origen "); - sb.append(" and t.activo=1 "); - sb.append(" "); - sb.append(" and t2.destino.paradaId = :destino "); - sb.append(" and t2.activo=1 "); - sb.append(" and t2.origem= t.destino "); - sb.append(" "); - sb.append(" and tcs.tramo=t "); - sb.append(" and tcs.activo=1 "); - sb.append(" "); - sb.append(" and tcs2.tramo=t2 "); - sb.append(" and tcs2.activo=1 "); - sb.append(" "); - sb.append("group by "); - sb.append(" t.origem.paradaId, "); - sb.append(" t.destino.paradaId, "); - sb.append(" t2.origem.paradaId, "); - sb.append(" t2.destino.paradaId "); - - Map mapConexionCtrlId = new HashMap(); - for (Object[] obj : lsParadas) { - int grupo = 0; - Integer origenId = (Integer) obj[0]; - Integer destinoId = (Integer) obj[1]; - - Query query = getSession().createQuery(sb.toString()); - query.setParameter("origen", origenId); - query.setParameter("destino", destinoId); - - List list = query.list(); - - for (Object[] objConexion : list) { - Integer origen1 = (Integer) objConexion[0]; - Integer destino1 = (Integer) objConexion[1]; - Integer origen2 = (Integer) objConexion[2]; - Integer destino2 = (Integer) objConexion[3]; - - String claveConexionCtrl = origenId + "-" + destinoId; - - Long conexionCtrlId = mapConexionCtrlId.get(claveConexionCtrl); - - if (conexionCtrlId == null) { - ConexionCtrlTemp c = new ConexionCtrlTemp(); - c.setActivo(true); - c.setOrigenId(origen1); - c.setDestinoId(destino2); - c.setFecmodif(new java.util.Date()); - c.setUsuarioId(usuarioId); - - conexionCtrlId = (Long) this.getSession().save(c); - mapConexionCtrlId.put(claveConexionCtrl, conexionCtrlId); - } - grupo++; - - ConexionTemp cTemp = new ConexionTemp(); - cTemp.setActivo(true); - cTemp.setConexionctrlId(conexionCtrlId); - cTemp.setOrigenId(origen1); - cTemp.setDestinoId(destino1); - cTemp.setNumgrupo(grupo); - cTemp.setNumsecuencia((short) 1); - cTemp.setUsuarioId(usuarioId); - cTemp.setFecmodif(new java.util.Date()); - - ConexionTemp cTemp2 = new ConexionTemp(); - cTemp2.setActivo(true); - cTemp2.setConexionctrlId(conexionCtrlId); - cTemp2.setOrigenId(origen2); - cTemp2.setDestinoId(destino2); - cTemp2.setNumgrupo(grupo); - cTemp2.setNumsecuencia((short) 2); - cTemp2.setUsuarioId(usuarioId); - cTemp2.setFecmodif(new java.util.Date()); - - getSession().save(cTemp); - getSession().save(cTemp2); - } - } - - // deletando, exceto conexoes que foram criadas manualmente: - this.getSession().createQuery("DELETE Conexion c WHERE c.conexionctrlId NOT IN (SELECT cc.conexionCtrl.conexionctrlId FROM ConexionConf cc)").executeUpdate(); - this.getSession().createQuery("DELETE ConexionCtrl cct WHERE cct.conexionctrlId NOT IN (SELECT cc.conexionCtrl.conexionctrlId FROM ConexionConf cc)").executeUpdate(); - - sb = new StringBuilder(""); - sb.append(" INSERT INTO ConexionCtrl (conexionctrlId,fecmodif,activo,usuarioId,origenId,destinoId) "); - sb.append(" SELECT cct.conexionctrlId, "); - sb.append(" cct.fecmodif, "); - sb.append(" cct.activo, "); - sb.append(" cct.usuarioId, "); - sb.append(" cct.origenId, "); - sb.append(" cct.destinoId "); - sb.append(" FROM ConexionCtrlTemp cct "); - sb.append(" WHERE cct.origenId || '_' || cct.destinoId NOT IN "); - sb.append(" ( SELECT cc.origenId || '_' || cc.destinoId "); - sb.append(" FROM ConexionCtrl cc "); - sb.append(" WHERE cc.activo = 1) "); - this.getSession().createQuery(sb.toString()).executeUpdate(); - - sb = new StringBuilder(""); - sb.append(" INSERT INTO Conexion (conexionId,numgrupo,numsecuencia,activo,fecmodif,usuarioId,origenId,destinoId,conexionctrlId) "); - sb.append(" SELECT ct.conexionId, "); - sb.append(" ct.numgrupo, "); - sb.append(" ct.numsecuencia, "); - sb.append(" ct.activo, "); - sb.append(" ct.fecmodif, "); - sb.append(" ct.usuarioId, "); - sb.append(" ct.origenId, "); - sb.append(" ct.destinoId, "); - sb.append(" ct.conexionctrlId "); - sb.append(" FROM ConexionTemp ct "); - sb.append(" WHERE ct.origenId || '_' || ct.destinoId NOT IN "); - sb.append(" ( SELECT c.origenId || '_' || c.destinoId "); - sb.append(" FROM Conexion c "); - sb.append(" WHERE c.activo = 1) "); - this.getSession().createQuery(sb.toString()).executeUpdate(); - } - - @Override - public List buscarPorConexionCtrl(Long conexionCtrlId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexionctrlId", conexionCtrlId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("numgrupo")); - c.addOrder(Order.asc("numsecuencia")); - - return c.list(); - } - - @Override - public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexionRutaTramoId", conexionRutaTramoId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return (Conexion) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionDAO; +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrlTemp; +import com.rjconsultores.ventaboletos.entidad.ConexionTemp; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; + +@Repository("conexionDAO") +public class ConexionHibernateDAO extends GenericHibernateDAO + implements ConexionDAO { + + @Autowired + public ConexionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarConexionesValidas() { + + StringBuilder sb = new StringBuilder(); + sb.append("SELECT DISTINCT cct.conexionctrl_id AS conexionCtrlId, "); + sb.append(" po1.descparada AS conOrigen, "); + sb.append(" pd1.descparada AS conDestino, "); + sb.append(" c.numgrupo AS grupo, "); + sb.append(" po2.descparada AS tramoOrigen, "); + sb.append(" pd2.descparada AS tramoDestino, "); + sb.append(" c.numsecuencia AS numSecuencia "); + sb.append("FROM conexion c "); + sb.append(" inner join conexion_conf cf "); + sb.append(" ON ( cf.conexionctrl_id = c.conexionctrl_id "); + sb.append(" AND cf.activo = 1 ) "); + sb.append(" inner join conexion_ctrl cct "); + sb.append(" ON ( cct.conexionctrl_id = c.conexionctrl_id "); + sb.append(" AND cct.activo = 1 ) "); + sb.append(" inner join parada po1 "); + sb.append(" ON ( po1.parada_id = cct.origen_id ) "); + sb.append(" inner join parada pd1 "); + sb.append(" ON ( pd1.parada_id = cct.destino_id ) "); + sb.append(" inner join parada po2 "); + sb.append(" ON ( po2.parada_id = c.origen_id ) "); + sb.append(" inner join parada pd2 "); + sb.append(" ON ( pd2.parada_id = c.destino_id ) "); + sb.append("WHERE cct.activo = 1 and c.activo = 1 "); + sb.append("ORDER BY po1.descparada, "); + sb.append(" pd1.descparada, "); + sb.append(" cct.conexionctrl_id, "); + sb.append(" c.numgrupo, "); + sb.append(" c.numsecuencia, "); + sb.append(" po2.descparada, "); + sb.append(" pd2.descparada "); + + Query query = getSession().createSQLQuery(sb.toString()); + List conexionVOs = new ArrayList(); + + for (Object o : query.list()) { + Object[] oc = (Object[]) o; + + ConexionVO conexionVO = new ConexionVO(); + conexionVO.setConexionCtrlId(((BigDecimal) oc[0]).longValue()); + conexionVO.setConOrigen((String) oc[1]); + conexionVO.setConDestino((String) oc[2]); + conexionVO.setGrupo(((BigDecimal) oc[3]).intValue()); + conexionVO.setTramoOrigen((String) oc[4]); + conexionVO.setTramoDestino((String) oc[5]); + + conexionVO.setBuscaAgruapada(false); + + conexionVOs.add(conexionVO); + } + + return conexionVOs; + } + + @Override + public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId) { + + String queryStr = getQueryConexiones(origenId, destinoId); + + Query query = getSession().createSQLQuery(queryStr); + List list = query.list(); + + List vos = new ArrayList(); + for (Object[] o : list) { + ConexionVO vo = new ConexionVO(); + vo.setGrupo(((BigDecimal) o[0]).intValue()); + vo.setConexionCtrlId(((BigDecimal) o[1]).longValue()); + vo.setConOrigen((String) o[2]); + vo.setConDestino((String) o[3]); + vo.setTramoOrigen((String) o[4]); + vo.setTramoDestino((String) o[5]); + vo.setBuscaAgruapada(isBuscaAgrupada); + + vos.add(vo); + } + + if (isBuscaAgrupada) { + return agruparConexiones(vos); + } + + return vos; + } + + private List agruparConexiones(List conexiones) { + + LinkedHashMap> map = new LinkedHashMap>(); + + List agrpVo = new ArrayList(); + + String grupoTrecho = null; + Integer grupo = null; + for (ConexionVO vo : conexiones) { + + if (grupo == null) + grupo = vo.getGrupo(); + + if (!grupo.equals(vo.getGrupo())) { + if (!map.containsKey(grupoTrecho)) { + map.put(grupoTrecho, agrpVo); + } + + grupo = vo.getGrupo(); + grupoTrecho = null; + agrpVo = new ArrayList(); + } + + if (grupo.equals(vo.getGrupo())) { + + if (grupoTrecho == null) { + grupoTrecho = vo.getTramoOrigen() + ";" + vo.getTramoDestino() + ";"; + } else { + grupoTrecho += vo.getTramoOrigen() + ";" + vo.getTramoDestino() + ";"; + } + + agrpVo.add(vo); + } + + } + + List agrupados = new ArrayList(); + for (Map.Entry> entry : map.entrySet()) { + agrupados.addAll(entry.getValue()); + } + + return agrupados; + } + + private String getQueryConexiones(Integer origenId, Integer destinoId) { + + StringBuilder sb = new StringBuilder(); + sb.append(" select "); + sb.append(" c.numgrupo as grupo, "); + sb.append(" cc.conexionctrl_id as conexionCtrlId, occ.descparada as conOrigen, dcc.descparada as conDestino, "); + sb.append(" oc.descparada as tramoOrigen, dc.descparada as tramoDestino, c.numsecuencia as numsecuencia "); + sb.append(" from conexion_ctrl cc "); + sb.append(" inner join conexion_conf conf "); + sb.append(" on conf.conexionctrl_id = cc.conexionctrl_id, "); + sb.append(" conexion c, "); + sb.append(" parada occ, "); + sb.append(" parada dcc, "); + sb.append(" parada oc, "); + sb.append(" parada dc "); + sb.append(" where cc.activo = 1 and c.activo = 1 and conf.activo = 1"); + sb.append(" and cc.conexionctrl_id = c.conexionctrl_id "); + sb.append(" and occ.parada_id = cc.origen_id "); + sb.append(" and conf.grupo = c.numgrupo "); + sb.append(" and dcc.parada_id = cc.destino_id "); + sb.append(" and oc.parada_id = c.origen_id "); + sb.append(" and dc.parada_id = c.destino_id "); + + if (origenId != null) { + sb.append(" and cc.origen_id = ").append(origenId); + } + + if (destinoId != null) { + sb.append(" and cc.destino_id = ").append(destinoId); + } + + sb.append(" order by conOrigen, conDestino, conexionCtrlId, grupo, numsecuencia, tramoOrigen, tramoDestino "); + return sb.toString(); + } + + @Override + public void generarConexiones(Integer usuarioId) { + this.getSession().createQuery("DELETE ConexionTemp").executeUpdate(); + this.getSession().createQuery("DELETE ConexionCtrlTemp").executeUpdate(); + + Query queryParadas = this.getSession().createQuery("select distinct t.origem.paradaId,t.destino.paradaId from Tramo t where t.activo = 1 order by t.origem.paradaId "); + List lsParadas = queryParadas.list(); + + StringBuilder sb = new StringBuilder(""); + sb.append("SELECT "); + sb.append(" t.origem.paradaId, "); + sb.append(" t.destino.paradaId, "); + sb.append(" t2.origem.paradaId, "); + sb.append(" t2.destino.paradaId, "); + sb.append(" MAX(t.kmReal), "); + sb.append(" MAX(tcs.tiemporecorrido), "); + sb.append(" MAX(t2.kmReal), "); + sb.append(" MAX(tcs2.tiemporecorrido) "); + sb.append(" "); + sb.append("FROM "); + sb.append(" Tramo t, "); + sb.append(" Tramo t2, "); + sb.append(" TramoServicio tcs, "); + sb.append(" TramoServicio tcs2 "); + sb.append(" "); + sb.append("where "); + sb.append(" t.origem.paradaId = :origen "); + sb.append(" and t.activo=1 "); + sb.append(" "); + sb.append(" and t2.destino.paradaId = :destino "); + sb.append(" and t2.activo=1 "); + sb.append(" and t2.origem= t.destino "); + sb.append(" "); + sb.append(" and tcs.tramo=t "); + sb.append(" and tcs.activo=1 "); + sb.append(" "); + sb.append(" and tcs2.tramo=t2 "); + sb.append(" and tcs2.activo=1 "); + sb.append(" "); + sb.append("group by "); + sb.append(" t.origem.paradaId, "); + sb.append(" t.destino.paradaId, "); + sb.append(" t2.origem.paradaId, "); + sb.append(" t2.destino.paradaId "); + + Map mapConexionCtrlId = new HashMap(); + for (Object[] obj : lsParadas) { + int grupo = 0; + Integer origenId = (Integer) obj[0]; + Integer destinoId = (Integer) obj[1]; + + Query query = getSession().createQuery(sb.toString()); + query.setParameter("origen", origenId); + query.setParameter("destino", destinoId); + + List list = query.list(); + + for (Object[] objConexion : list) { + Integer origen1 = (Integer) objConexion[0]; + Integer destino1 = (Integer) objConexion[1]; + Integer origen2 = (Integer) objConexion[2]; + Integer destino2 = (Integer) objConexion[3]; + + String claveConexionCtrl = origenId + "-" + destinoId; + + Long conexionCtrlId = mapConexionCtrlId.get(claveConexionCtrl); + + if (conexionCtrlId == null) { + ConexionCtrlTemp c = new ConexionCtrlTemp(); + c.setActivo(true); + c.setOrigenId(origen1); + c.setDestinoId(destino2); + c.setFecmodif(new java.util.Date()); + c.setUsuarioId(usuarioId); + + conexionCtrlId = (Long) this.getSession().save(c); + mapConexionCtrlId.put(claveConexionCtrl, conexionCtrlId); + } + grupo++; + + ConexionTemp cTemp = new ConexionTemp(); + cTemp.setActivo(true); + cTemp.setConexionctrlId(conexionCtrlId); + cTemp.setOrigenId(origen1); + cTemp.setDestinoId(destino1); + cTemp.setNumgrupo(grupo); + cTemp.setNumsecuencia((short) 1); + cTemp.setUsuarioId(usuarioId); + cTemp.setFecmodif(new java.util.Date()); + + ConexionTemp cTemp2 = new ConexionTemp(); + cTemp2.setActivo(true); + cTemp2.setConexionctrlId(conexionCtrlId); + cTemp2.setOrigenId(origen2); + cTemp2.setDestinoId(destino2); + cTemp2.setNumgrupo(grupo); + cTemp2.setNumsecuencia((short) 2); + cTemp2.setUsuarioId(usuarioId); + cTemp2.setFecmodif(new java.util.Date()); + + getSession().save(cTemp); + getSession().save(cTemp2); + } + } + + // deletando, exceto conexoes que foram criadas manualmente: + this.getSession().createQuery("DELETE Conexion c WHERE c.conexionctrlId NOT IN (SELECT cc.conexionCtrl.conexionctrlId FROM ConexionConf cc)").executeUpdate(); + this.getSession().createQuery("DELETE ConexionCtrl cct WHERE cct.conexionctrlId NOT IN (SELECT cc.conexionCtrl.conexionctrlId FROM ConexionConf cc)").executeUpdate(); + + sb = new StringBuilder(""); + sb.append(" INSERT INTO ConexionCtrl (conexionctrlId,fecmodif,activo,usuarioId,origenId,destinoId) "); + sb.append(" SELECT cct.conexionctrlId, "); + sb.append(" cct.fecmodif, "); + sb.append(" cct.activo, "); + sb.append(" cct.usuarioId, "); + sb.append(" cct.origenId, "); + sb.append(" cct.destinoId "); + sb.append(" FROM ConexionCtrlTemp cct "); + sb.append(" WHERE cct.origenId || '_' || cct.destinoId NOT IN "); + sb.append(" ( SELECT cc.origenId || '_' || cc.destinoId "); + sb.append(" FROM ConexionCtrl cc "); + sb.append(" WHERE cc.activo = 1) "); + this.getSession().createQuery(sb.toString()).executeUpdate(); + + sb = new StringBuilder(""); + sb.append(" INSERT INTO Conexion (conexionId,numgrupo,numsecuencia,activo,fecmodif,usuarioId,origenId,destinoId,conexionctrlId) "); + sb.append(" SELECT ct.conexionId, "); + sb.append(" ct.numgrupo, "); + sb.append(" ct.numsecuencia, "); + sb.append(" ct.activo, "); + sb.append(" ct.fecmodif, "); + sb.append(" ct.usuarioId, "); + sb.append(" ct.origenId, "); + sb.append(" ct.destinoId, "); + sb.append(" ct.conexionctrlId "); + sb.append(" FROM ConexionTemp ct "); + sb.append(" WHERE ct.origenId || '_' || ct.destinoId NOT IN "); + sb.append(" ( SELECT c.origenId || '_' || c.destinoId "); + sb.append(" FROM Conexion c "); + sb.append(" WHERE c.activo = 1) "); + this.getSession().createQuery(sb.toString()).executeUpdate(); + } + + @Override + public List buscarPorConexionCtrl(Long conexionCtrlId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexionctrlId", conexionCtrlId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("numgrupo")); + c.addOrder(Order.asc("numsecuencia")); + + return c.list(); + } + + @Override + public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexionRutaTramoId", conexionRutaTramoId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return (Conexion) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java index ddb6e2826..f07da0a50 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java @@ -1,337 +1,337 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaConfDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.vo.conexion.OrdenarLocalidadesGeradas; -import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -@Repository("conexionRutaConfDAO") -public class ConexionRutaConfHibernateDAO extends GenericHibernateDAO implements ConexionRutaConfDAO { - - @Autowired - public ConexionRutaConfHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarPorDescricao(String descricao) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.ilike("descricao", descricao, MatchMode.ANYWHERE)); - - return c.list(); - } - - @Override - public List obtenerTodosActivo() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @Override - public void excluirConfiguracao(ConexionRutaConf conexion, Integer usuarioId, boolean excluirConexionRutaConf, boolean isConexionGerada) { - List comandos = carregarComandosInativarConfiguracao(excluirConexionRutaConf, isConexionGerada); - for (String comando : comandos) { - Query qr = getSession().createSQLQuery(comando); - qr.setParameter("usuarioId", usuarioId); - qr.setParameter("conexionrutaconfId", conexion.getConexionRutaConfId()); - qr.setParameter("fecmodif", Calendar.getInstance().getTime()); - qr.executeUpdate(); - } - } - - private List carregarComandosInativarConfiguracao(boolean excluirConexionRutaConf, boolean isConexionGerada) { - List comandos = new ArrayList(0); - - StringBuilder sb = new StringBuilder(); - if(excluirConexionRutaConf) { - sb.append("update conexion_ruta_conf ") - .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") - .append("where conexionrutaconf_id = :conexionrutaconfId ") - .append("and activo = 1"); - comandos.add(sb.toString()); - } - - sb = new StringBuilder(); - sb.append("update conexion_ruta_excepcion_ptovta ") - .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") - .append("where conexionrutaconf_id = :conexionrutaconfId ") - .append("and activo = 1"); - comandos.add(sb.toString()); - - sb = new StringBuilder(); - sb.append("update conexion_rutaexcepciontipopta ") - .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") - .append("where conexionrutaconf_id = :conexionrutaconfId ") - .append("and activo = 1"); - comandos.add(sb.toString()); - - if(isConexionGerada || excluirConexionRutaConf) { - sb = new StringBuilder(); - sb.append("update conexion_ruta_ctrl ") - .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") - .append("where conexionrutaconf_id = :conexionrutaconfId ") - .append("and activo = 1"); - comandos.add(sb.toString()); - - sb = new StringBuilder(); - sb.append("merge into conexion_ruta_tramo_ctrl c ") - .append("using ( ") - .append("select c1.conexionrutatramoctrl_id ") - .append("from conexion_ruta_tramo_ctrl c1 ") - .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") - .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c1.activo = 1) t on (t.conexionrutatramoctrl_id = c.conexionrutatramoctrl_id) ") - .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif "); - comandos.add(sb.toString()); - - sb = new StringBuilder(); - sb.append("merge into conexion c ") - .append("using ( ") - .append("select c.conexion_id ") - .append("from conexion c ") - .append("join conexion_ruta_tramo_ctrl c1 on c.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") - .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") - .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexion_id = c.conexion_id) ") - .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif"); - comandos.add(sb.toString()); - - sb = new StringBuilder(); - sb.append("merge into conexion_ctrl c ") - .append("using ( ") - .append("select distinct c.conexionctrl_id ") - .append("from conexion_ctrl c ") - .append("join conexion c3 on c3.conexionctrl_id = c.conexionctrl_id ") - .append("join conexion_ruta_tramo_ctrl c1 on c3.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") - .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") - .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexionctrl_id = c.conexionctrl_id) ") - .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif"); - comandos.add(sb.toString()); - - sb = new StringBuilder(); - sb.append("merge into conexion_conf c ") - .append("using ( ") - .append("select distinct c.conexionconf_id ") - .append("from conexion_conf c ") - .append("join conexion_ctrl c4 on c4.conexionctrl_id = c.conexionctrl_id ") - .append("join conexion c3 on c3.conexionctrl_id = c4.conexionctrl_id ") - .append("join conexion_ruta_tramo_ctrl c1 on c3.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") - .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") - .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexionconf_id = c.conexionconf_id) ") - .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif "); - comandos.add(sb.toString()); - } - - return comandos; - } - - @SuppressWarnings("unchecked") - @Override - public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId) { - ConexionRutaConfVO retorno = new ConexionRutaConfVO(); - - if(conexionrutaconfId == null) { - return retorno; - } - - StringBuilder sQuery = new StringBuilder(); - sQuery.append(getSQLCarregarConexoesCadastradas()) - .append(" where ctrl.activo = 1 ") - .append(" and conf.conexionrutaconf_id = :conexionrutaconfId "); - - Query qr = getSession().createSQLQuery(sQuery.toString()); - qr.setParameter("conexionrutaconfId", conexionrutaconfId); - - List localidadesCombinadas = new ArrayList(0); - List listConexionCtrl = new ArrayList(0); - List listConexionCtrlVO = new ArrayList(0); - - List result = qr.list(); - - transformarObjetosConexao(localidadesCombinadas, listConexionCtrl, listConexionCtrlVO, result); - - retorno.setListConexionCtrl(listConexionCtrl); - - Collections.sort(localidadesCombinadas, new OrdenarLocalidadesGeradas()); - retorno.setLocalidadesCombinadas(localidadesCombinadas); - - return retorno; - } - - @Override - public void transformarObjetosConexao(List localidadesCombinadas, - List listConexionCtrl, List listConexionCtrlVO, List result) { - for (Object[] tupla : result) { - Long conexionRutaTramoId = Long.valueOf(tupla[0].toString()); - Integer rutaId = Integer.valueOf(tupla[1].toString()); - String numRuta = tupla[2].toString(); - String sentido = tupla[3].toString(); - - Parada paradaOrigem = new Parada(Integer.valueOf(tupla[4].toString()), tupla[5].toString(), tupla[6].toString()); - Parada paradaDestino = new Parada(Integer.valueOf(tupla[7].toString()), tupla[8].toString(), tupla[9].toString()); - Parada paradaOrigemTrecho = new Parada(Integer.valueOf(tupla[10].toString()), tupla[11].toString(), tupla[12].toString()); - Parada paradaDestinoTrecho = new Parada(Integer.valueOf(tupla[13].toString()), tupla[14].toString(), tupla[15].toString()); - Integer grupo = Integer.valueOf(tupla[16].toString()); - Short secuencia = Short.valueOf(tupla[17].toString()); - - Integer rutaOrigemId = Integer.valueOf(tupla[18].toString()); - Integer rutaDestinoId = Integer.valueOf(tupla[19].toString()); - - Integer rutaDestinoCId = null; - if(tupla[20] != null) { - rutaDestinoCId = Integer.valueOf(tupla[20].toString()); - } - - Long conexionctrlId = Long.valueOf(tupla[21].toString()); - Boolean indPricing = tupla[22] == null ? false : Integer.valueOf(tupla[22].toString()) == 1; - - ConexionCtrlVO conexionCtrl = recuperarConexionCtrlVO(listConexionCtrlVO, listConexionCtrl, paradaOrigemTrecho.getParadaId(), paradaDestinoTrecho.getParadaId(), conexionctrlId, indPricing, grupo); - ConexionRutaCtrlVO conexionRutaCtrl = new ConexionRutaCtrlVO(rutaOrigemId, rutaDestinoId, rutaDestinoCId); - - ParadaVOConexionRuta trecho = new ParadaVOConexionRuta(grupo, paradaOrigem, paradaDestino, rutaId, numRuta, secuencia, true, paradaOrigemTrecho, paradaDestinoTrecho, conexionCtrl, conexionRutaCtrl, sentido); - trecho.setConexionRutaTramoId(conexionRutaTramoId); - - localidadesCombinadas.add(trecho); - } - } - - @Override - public String getSQLCarregarConexoesCadastradas() { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("select ctrl.conexionrutatramoctrl_id conexionrutatramoctrlId, r.ruta_id rutaId, r.numruta, ") - .append("case when coalesce(r.indsentidoida,1) = 1 then 'IDA' else 'VOLTA' end sentido, ") - .append("ori.parada_id paradaIdOri, ori.cveparada cveparadaOri, ori.descparada descparadaOri, ") - .append("des.parada_id paradaIdDes, des.cveparada cveparadaDes, des.descparada descparadaDes, ") - .append("oriT.parada_id paradaIdOriT, oriT.cveparada cveparadaOriT, oriT.descparada descparadaOriT, ") - .append("desT.parada_id paradaIdDesT, desT.cveparada cveparadaDesT, desT.descparada descparadaDesT, ") - .append("co.numgrupo, co.numsecuencia, ctr.ruta_origen_id rutaOrigenId, ctr.ruta_destino_id rutaDestinoId, ") - .append("ctr.ruta_destinoc_id rutaDestinoCId, coctrl.conexionctrl_id, coctrl.indPricing ") - .append("from conexion_ruta_tramo_ctrl ctrl ") - .append("join ruta r on r.ruta_id = ctrl.ruta_id ") - .append("join conexion_ruta_ctrl ctr on ctr.conexionrutactrl_id = ctrl.conexionrutactrl_id ") - .append("join conexion_ruta_conf conf on conf.conexionrutaconf_id = ctr.conexionrutaconf_id ") - .append("join conexion co on co.conexionrutatramoctrl_id = ctrl.conexionrutatramoctrl_id and co.activo = 1 ") - .append("join conexion_ctrl coctrl on coctrl.conexionctrl_id = co.conexionctrl_id and co.activo = 1 ") - .append("join parada ori on ori.parada_id = ctrl.origen_id ") - .append("join parada des on des.parada_id = ctrl.destino_id ") - .append("join parada oriT on oriT.parada_id = coctrl.origen_id ") - .append("join parada desT on desT.parada_id = coctrl.destino_id "); - - return sQuery.toString(); - } - - private ConexionCtrlVO recuperarConexionCtrlVO(List listConexionCtrlVO, List listConexionCtrl, Integer origemConexaoCtrl, Integer destinoConexaoCtrl, Long conexionctrlId, Boolean indPricing, Integer grupo) { - for (ConexionCtrlVO conexionCtrlTemp : listConexionCtrlVO) { - if(conexionCtrlTemp.isOrigemDestinoGrupoIgual(origemConexaoCtrl, destinoConexaoCtrl, grupo)) { - return conexionCtrlTemp; - } - } - - ConexionCtrlVO conexionCtrlVO = new ConexionCtrlVO(origemConexaoCtrl, destinoConexaoCtrl); - conexionCtrlVO.setConexionctrlId(conexionctrlId); - conexionCtrlVO.setIndPricing(indPricing); - conexionCtrlVO.setGrupo(grupo); - listConexionCtrlVO.add(conexionCtrlVO); - - ConexionCtrl conexaoCtrl = new ConexionCtrl(origemConexaoCtrl, destinoConexaoCtrl, grupo); - conexaoCtrl.setConexionctrlId(conexionctrlId); - conexaoCtrl.setIndPricing(indPricing); - listConexionCtrl.add(conexaoCtrl); - - return conexionCtrlVO; - } - - @Override - @SuppressWarnings("unchecked") - public List> buscarRutasPorConexionConf(Integer conexionRutaConfId) { - StringBuilder sQuery = new StringBuilder("SELECT ctrl "); - sQuery.append("FROM ConexionRutaCtrl ctrl ") - .append("WHERE ctrl.activo = 1 ") - .append("AND ctrl.conexionRutaConf.conexionRutaConfId = :conexionRutaConfId "); - - - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("conexionRutaConfId", conexionRutaConfId); - List result = qr.list(); - - List lsRutaOrigem = new ArrayList(); - List lsRutaDestino = new ArrayList(); - List lsRutaDestinoC = new ArrayList(); - - for (ConexionRutaCtrl conexionRutaCtrl : result) { - if(!lsRutaOrigem.contains(conexionRutaCtrl.getRutaOrigen())) { - lsRutaOrigem.add(conexionRutaCtrl.getRutaOrigen()); - } - - if(!lsRutaDestino.contains(conexionRutaCtrl.getRutaDestino())) { - lsRutaDestino.add(conexionRutaCtrl.getRutaDestino()); - } - - if(conexionRutaCtrl.getRutaDestinoC() != null && !lsRutaDestinoC.contains(conexionRutaCtrl.getRutaDestinoC())) { - lsRutaDestinoC.add(conexionRutaCtrl.getRutaDestinoC()); - } - } - - List> retorno = new ArrayList>(); - retorno.add(lsRutaOrigem); - retorno.add(lsRutaDestino); - retorno.add(lsRutaDestinoC); - - return retorno; - - } - - @Override - public void atualizarTempoMinimoEMaximo(ConexionRutaConf conexionRutaConf) { - StringBuilder sb = new StringBuilder(); - sb.append("merge into conexion_conf c ") - .append("using ( ") - .append("select distinct c.conexionconf_id ") - .append("from conexion_conf c ") - .append("join conexion_ctrl c4 on c4.conexionctrl_id = c.conexionctrl_id ") - .append("join conexion c3 on c3.conexionctrl_id = c4.conexionctrl_id ") - .append("join conexion_ruta_tramo_ctrl c1 on c3.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") - .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") - .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexionconf_id = c.conexionconf_id) ") - .append("when matched then update set usuario_id = :usuarioId, fecmodif = :fecmodif, tiempomin = :tiempomin, tiempomax = :tiempomax "); - - Query qr = getSession().createSQLQuery(sb.toString()); - qr.setParameter("usuarioId", conexionRutaConf.getUsuarioId()); - qr.setParameter("conexionrutaconfId", conexionRutaConf.getConexionRutaConfId()); - qr.setParameter("fecmodif", Calendar.getInstance().getTime()); - qr.setParameter("tiempomin", conexionRutaConf.getTiempoMin()); - qr.setParameter("tiempomax", conexionRutaConf.getTiempoMax()); - qr.executeUpdate(); - } - - @Override - public ConexionRutaConf getByIdActivo(Integer conexionRutaConfId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("conexionRutaConfId", conexionRutaConfId)); - return (ConexionRutaConf) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaConfDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.vo.conexion.OrdenarLocalidadesGeradas; +import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +@Repository("conexionRutaConfDAO") +public class ConexionRutaConfHibernateDAO extends GenericHibernateDAO implements ConexionRutaConfDAO { + + @Autowired + public ConexionRutaConfHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarPorDescricao(String descricao) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.ilike("descricao", descricao, MatchMode.ANYWHERE)); + + return c.list(); + } + + @Override + public List obtenerTodosActivo() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @Override + public void excluirConfiguracao(ConexionRutaConf conexion, Integer usuarioId, boolean excluirConexionRutaConf, boolean isConexionGerada) { + List comandos = carregarComandosInativarConfiguracao(excluirConexionRutaConf, isConexionGerada); + for (String comando : comandos) { + Query qr = getSession().createSQLQuery(comando); + qr.setParameter("usuarioId", usuarioId); + qr.setParameter("conexionrutaconfId", conexion.getConexionRutaConfId()); + qr.setParameter("fecmodif", Calendar.getInstance().getTime()); + qr.executeUpdate(); + } + } + + private List carregarComandosInativarConfiguracao(boolean excluirConexionRutaConf, boolean isConexionGerada) { + List comandos = new ArrayList(0); + + StringBuilder sb = new StringBuilder(); + if(excluirConexionRutaConf) { + sb.append("update conexion_ruta_conf ") + .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") + .append("where conexionrutaconf_id = :conexionrutaconfId ") + .append("and activo = 1"); + comandos.add(sb.toString()); + } + + sb = new StringBuilder(); + sb.append("update conexion_ruta_excepcion_ptovta ") + .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") + .append("where conexionrutaconf_id = :conexionrutaconfId ") + .append("and activo = 1"); + comandos.add(sb.toString()); + + sb = new StringBuilder(); + sb.append("update conexion_rutaexcepciontipopta ") + .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") + .append("where conexionrutaconf_id = :conexionrutaconfId ") + .append("and activo = 1"); + comandos.add(sb.toString()); + + if(isConexionGerada || excluirConexionRutaConf) { + sb = new StringBuilder(); + sb.append("update conexion_ruta_ctrl ") + .append("set activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif ") + .append("where conexionrutaconf_id = :conexionrutaconfId ") + .append("and activo = 1"); + comandos.add(sb.toString()); + + sb = new StringBuilder(); + sb.append("merge into conexion_ruta_tramo_ctrl c ") + .append("using ( ") + .append("select c1.conexionrutatramoctrl_id ") + .append("from conexion_ruta_tramo_ctrl c1 ") + .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") + .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c1.activo = 1) t on (t.conexionrutatramoctrl_id = c.conexionrutatramoctrl_id) ") + .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif "); + comandos.add(sb.toString()); + + sb = new StringBuilder(); + sb.append("merge into conexion c ") + .append("using ( ") + .append("select c.conexion_id ") + .append("from conexion c ") + .append("join conexion_ruta_tramo_ctrl c1 on c.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") + .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") + .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexion_id = c.conexion_id) ") + .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif"); + comandos.add(sb.toString()); + + sb = new StringBuilder(); + sb.append("merge into conexion_ctrl c ") + .append("using ( ") + .append("select distinct c.conexionctrl_id ") + .append("from conexion_ctrl c ") + .append("join conexion c3 on c3.conexionctrl_id = c.conexionctrl_id ") + .append("join conexion_ruta_tramo_ctrl c1 on c3.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") + .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") + .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexionctrl_id = c.conexionctrl_id) ") + .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif"); + comandos.add(sb.toString()); + + sb = new StringBuilder(); + sb.append("merge into conexion_conf c ") + .append("using ( ") + .append("select distinct c.conexionconf_id ") + .append("from conexion_conf c ") + .append("join conexion_ctrl c4 on c4.conexionctrl_id = c.conexionctrl_id ") + .append("join conexion c3 on c3.conexionctrl_id = c4.conexionctrl_id ") + .append("join conexion_ruta_tramo_ctrl c1 on c3.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") + .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") + .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexionconf_id = c.conexionconf_id) ") + .append("when matched then update set c.activo = 0, usuario_id = :usuarioId, fecmodif = :fecmodif "); + comandos.add(sb.toString()); + } + + return comandos; + } + + @SuppressWarnings("unchecked") + @Override + public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId) { + ConexionRutaConfVO retorno = new ConexionRutaConfVO(); + + if(conexionrutaconfId == null) { + return retorno; + } + + StringBuilder sQuery = new StringBuilder(); + sQuery.append(getSQLCarregarConexoesCadastradas()) + .append(" where ctrl.activo = 1 ") + .append(" and conf.conexionrutaconf_id = :conexionrutaconfId "); + + Query qr = getSession().createSQLQuery(sQuery.toString()); + qr.setParameter("conexionrutaconfId", conexionrutaconfId); + + List localidadesCombinadas = new ArrayList(0); + List listConexionCtrl = new ArrayList(0); + List listConexionCtrlVO = new ArrayList(0); + + List result = qr.list(); + + transformarObjetosConexao(localidadesCombinadas, listConexionCtrl, listConexionCtrlVO, result); + + retorno.setListConexionCtrl(listConexionCtrl); + + Collections.sort(localidadesCombinadas, new OrdenarLocalidadesGeradas()); + retorno.setLocalidadesCombinadas(localidadesCombinadas); + + return retorno; + } + + @Override + public void transformarObjetosConexao(List localidadesCombinadas, + List listConexionCtrl, List listConexionCtrlVO, List result) { + for (Object[] tupla : result) { + Long conexionRutaTramoId = Long.valueOf(tupla[0].toString()); + Integer rutaId = Integer.valueOf(tupla[1].toString()); + String numRuta = tupla[2].toString(); + String sentido = tupla[3].toString(); + + Parada paradaOrigem = new Parada(Integer.valueOf(tupla[4].toString()), tupla[5].toString(), tupla[6].toString()); + Parada paradaDestino = new Parada(Integer.valueOf(tupla[7].toString()), tupla[8].toString(), tupla[9].toString()); + Parada paradaOrigemTrecho = new Parada(Integer.valueOf(tupla[10].toString()), tupla[11].toString(), tupla[12].toString()); + Parada paradaDestinoTrecho = new Parada(Integer.valueOf(tupla[13].toString()), tupla[14].toString(), tupla[15].toString()); + Integer grupo = Integer.valueOf(tupla[16].toString()); + Short secuencia = Short.valueOf(tupla[17].toString()); + + Integer rutaOrigemId = Integer.valueOf(tupla[18].toString()); + Integer rutaDestinoId = Integer.valueOf(tupla[19].toString()); + + Integer rutaDestinoCId = null; + if(tupla[20] != null) { + rutaDestinoCId = Integer.valueOf(tupla[20].toString()); + } + + Long conexionctrlId = Long.valueOf(tupla[21].toString()); + Boolean indPricing = tupla[22] == null ? false : Integer.valueOf(tupla[22].toString()) == 1; + + ConexionCtrlVO conexionCtrl = recuperarConexionCtrlVO(listConexionCtrlVO, listConexionCtrl, paradaOrigemTrecho.getParadaId(), paradaDestinoTrecho.getParadaId(), conexionctrlId, indPricing, grupo); + ConexionRutaCtrlVO conexionRutaCtrl = new ConexionRutaCtrlVO(rutaOrigemId, rutaDestinoId, rutaDestinoCId); + + ParadaVOConexionRuta trecho = new ParadaVOConexionRuta(grupo, paradaOrigem, paradaDestino, rutaId, numRuta, secuencia, true, paradaOrigemTrecho, paradaDestinoTrecho, conexionCtrl, conexionRutaCtrl, sentido); + trecho.setConexionRutaTramoId(conexionRutaTramoId); + + localidadesCombinadas.add(trecho); + } + } + + @Override + public String getSQLCarregarConexoesCadastradas() { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("select ctrl.conexionrutatramoctrl_id conexionrutatramoctrlId, r.ruta_id rutaId, r.numruta, ") + .append("case when coalesce(r.indsentidoida,1) = 1 then 'IDA' else 'VOLTA' end sentido, ") + .append("ori.parada_id paradaIdOri, ori.cveparada cveparadaOri, ori.descparada descparadaOri, ") + .append("des.parada_id paradaIdDes, des.cveparada cveparadaDes, des.descparada descparadaDes, ") + .append("oriT.parada_id paradaIdOriT, oriT.cveparada cveparadaOriT, oriT.descparada descparadaOriT, ") + .append("desT.parada_id paradaIdDesT, desT.cveparada cveparadaDesT, desT.descparada descparadaDesT, ") + .append("co.numgrupo, co.numsecuencia, ctr.ruta_origen_id rutaOrigenId, ctr.ruta_destino_id rutaDestinoId, ") + .append("ctr.ruta_destinoc_id rutaDestinoCId, coctrl.conexionctrl_id, coctrl.indPricing ") + .append("from conexion_ruta_tramo_ctrl ctrl ") + .append("join ruta r on r.ruta_id = ctrl.ruta_id ") + .append("join conexion_ruta_ctrl ctr on ctr.conexionrutactrl_id = ctrl.conexionrutactrl_id ") + .append("join conexion_ruta_conf conf on conf.conexionrutaconf_id = ctr.conexionrutaconf_id ") + .append("join conexion co on co.conexionrutatramoctrl_id = ctrl.conexionrutatramoctrl_id and co.activo = 1 ") + .append("join conexion_ctrl coctrl on coctrl.conexionctrl_id = co.conexionctrl_id and co.activo = 1 ") + .append("join parada ori on ori.parada_id = ctrl.origen_id ") + .append("join parada des on des.parada_id = ctrl.destino_id ") + .append("join parada oriT on oriT.parada_id = coctrl.origen_id ") + .append("join parada desT on desT.parada_id = coctrl.destino_id "); + + return sQuery.toString(); + } + + private ConexionCtrlVO recuperarConexionCtrlVO(List listConexionCtrlVO, List listConexionCtrl, Integer origemConexaoCtrl, Integer destinoConexaoCtrl, Long conexionctrlId, Boolean indPricing, Integer grupo) { + for (ConexionCtrlVO conexionCtrlTemp : listConexionCtrlVO) { + if(conexionCtrlTemp.isOrigemDestinoGrupoIgual(origemConexaoCtrl, destinoConexaoCtrl, grupo)) { + return conexionCtrlTemp; + } + } + + ConexionCtrlVO conexionCtrlVO = new ConexionCtrlVO(origemConexaoCtrl, destinoConexaoCtrl); + conexionCtrlVO.setConexionctrlId(conexionctrlId); + conexionCtrlVO.setIndPricing(indPricing); + conexionCtrlVO.setGrupo(grupo); + listConexionCtrlVO.add(conexionCtrlVO); + + ConexionCtrl conexaoCtrl = new ConexionCtrl(origemConexaoCtrl, destinoConexaoCtrl, grupo); + conexaoCtrl.setConexionctrlId(conexionctrlId); + conexaoCtrl.setIndPricing(indPricing); + listConexionCtrl.add(conexaoCtrl); + + return conexionCtrlVO; + } + + @Override + @SuppressWarnings("unchecked") + public List> buscarRutasPorConexionConf(Integer conexionRutaConfId) { + StringBuilder sQuery = new StringBuilder("SELECT ctrl "); + sQuery.append("FROM ConexionRutaCtrl ctrl ") + .append("WHERE ctrl.activo = 1 ") + .append("AND ctrl.conexionRutaConf.conexionRutaConfId = :conexionRutaConfId "); + + + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("conexionRutaConfId", conexionRutaConfId); + List result = qr.list(); + + List lsRutaOrigem = new ArrayList(); + List lsRutaDestino = new ArrayList(); + List lsRutaDestinoC = new ArrayList(); + + for (ConexionRutaCtrl conexionRutaCtrl : result) { + if(!lsRutaOrigem.contains(conexionRutaCtrl.getRutaOrigen())) { + lsRutaOrigem.add(conexionRutaCtrl.getRutaOrigen()); + } + + if(!lsRutaDestino.contains(conexionRutaCtrl.getRutaDestino())) { + lsRutaDestino.add(conexionRutaCtrl.getRutaDestino()); + } + + if(conexionRutaCtrl.getRutaDestinoC() != null && !lsRutaDestinoC.contains(conexionRutaCtrl.getRutaDestinoC())) { + lsRutaDestinoC.add(conexionRutaCtrl.getRutaDestinoC()); + } + } + + List> retorno = new ArrayList>(); + retorno.add(lsRutaOrigem); + retorno.add(lsRutaDestino); + retorno.add(lsRutaDestinoC); + + return retorno; + + } + + @Override + public void atualizarTempoMinimoEMaximo(ConexionRutaConf conexionRutaConf) { + StringBuilder sb = new StringBuilder(); + sb.append("merge into conexion_conf c ") + .append("using ( ") + .append("select distinct c.conexionconf_id ") + .append("from conexion_conf c ") + .append("join conexion_ctrl c4 on c4.conexionctrl_id = c.conexionctrl_id ") + .append("join conexion c3 on c3.conexionctrl_id = c4.conexionctrl_id ") + .append("join conexion_ruta_tramo_ctrl c1 on c3.conexionrutatramoctrl_id = c1.conexionrutatramoctrl_id ") + .append("join conexion_ruta_ctrl c2 on c1.conexionrutactrl_id = c2.conexionrutactrl_id ") + .append("where c2.conexionrutaconf_id = :conexionrutaconfId and c.activo = 1) t on (t.conexionconf_id = c.conexionconf_id) ") + .append("when matched then update set usuario_id = :usuarioId, fecmodif = :fecmodif, tiempomin = :tiempomin, tiempomax = :tiempomax "); + + Query qr = getSession().createSQLQuery(sb.toString()); + qr.setParameter("usuarioId", conexionRutaConf.getUsuarioId()); + qr.setParameter("conexionrutaconfId", conexionRutaConf.getConexionRutaConfId()); + qr.setParameter("fecmodif", Calendar.getInstance().getTime()); + qr.setParameter("tiempomin", conexionRutaConf.getTiempoMin()); + qr.setParameter("tiempomax", conexionRutaConf.getTiempoMax()); + qr.executeUpdate(); + } + + @Override + public ConexionRutaConf getByIdActivo(Integer conexionRutaConfId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("conexionRutaConfId", conexionRutaConfId)); + return (ConexionRutaConf) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaCtrlHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaCtrlHibernateDAO.java index e41171c43..7db5830e2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaCtrlHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaCtrlHibernateDAO.java @@ -1,146 +1,146 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; - -@Repository("conexionRutaCtrlDAO") -public class ConexionRutaCtrlHibernateDAO extends GenericHibernateDAO implements ConexionRutaCtrlDAO { - - @Autowired - public ConexionRutaCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarConexionesValidas() { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT ro.descruta as descLinhaOrigem, "); - sb.append(" ro.numruta as numRutaOrigen, "); - sb.append(" rd.descruta as descLinhaDestino, "); - sb.append(" rd.numruta as numRutaDestino, "); - sb.append(" po.descparada as tramoOrigen, "); - sb.append(" pd.descparada as tramoDestino, "); - sb.append(" crc.conexionrutactrl_id as conexionRutaCtrl, "); - sb.append(" ro.ruta_id as rutaOrigenId, "); - sb.append(" rd.ruta_id as rutaDestinonId "); - sb.append("FROM conexion_ruta_ctrl crc "); - sb.append("INNER JOIN conexion_ruta_tramo_ctrl crtc ON (crc.conexionrutactrl_id = crtc.conexionrutactrl_id "); - sb.append(" AND crtc.activo = 1) "); - sb.append("INNER JOIN ruta ro ON (crc.ruta_origen_id = ro.ruta_id "); - sb.append(" AND ro.activo =1 )"); - sb.append("INNER JOIN ruta rd ON (crc.ruta_destino_id = rd.ruta_id"); - sb.append(" AND rd.activo =1)"); - sb.append("INNER JOIN parada po ON (po.parada_id = crtc.origen_id) "); - sb.append("INNER JOIN parada pd ON (pd.parada_id = crtc.destino_id) "); - sb.append("WHERE crc.activo =1"); - sb.append(" AND crtc.activo = 1"); - sb.append(" AND ro.activo = 1"); - sb.append(" ORDER BY crtc.conexionrutatramoctrl_id, conexionRutaCtrl "); - - Query query = getSession().createSQLQuery(sb.toString()); - List conexionVOs = new ArrayList(); - - for (Object o : query.list()) { - Object[] oc = (Object[]) o; - - ConexionRutaVO conexionVO = new ConexionRutaVO(); - conexionVO.setDescLinhaOrigem((String) oc[0]); - conexionVO.setNumRutaOrigen(((BigDecimal) oc[1]).intValue()); - conexionVO.setDescLinhaDestino((String) oc[2]); - conexionVO.setNumRutaDestino(((BigDecimal) oc[3]).intValue()); - conexionVO.setTramoOrigen((String) oc[4]); - conexionVO.setTramoDestino((String) oc[5]); - conexionVO.setConexionRutaCtrl(((BigDecimal) oc[6]).intValue()); - conexionVO.setRutaOrigenId(((BigDecimal) oc[7]).intValue()); - conexionVO.setRutaDestinoId(((BigDecimal) oc[8]).intValue()); - conexionVOs.add(conexionVO); - } - - return conexionVOs; - - } - - @Override - public List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId) { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT ro.descruta as descLinhaOrigem, "); - sb.append(" ro.numruta as numRutaOrigen, "); - sb.append(" rd.descruta as descLinhaDestino, "); - sb.append(" rd.numruta as numRutaDestino, "); - sb.append(" po.descparada as tramoOrigen, "); - sb.append(" pd.descparada as tramoDestino, "); - sb.append(" crc.conexionrutactrl_id as conexionRutaCtrl, "); - sb.append(" ro.ruta_id as rutaOrigenId, "); - sb.append(" rd.ruta_id as rutaDestinonId "); - sb.append("FROM conexion_ruta_ctrl crc "); - sb.append("INNER JOIN conexion_ruta_tramo_ctrl crtc ON (crc.conexionrutactrl_id = crtc.conexionrutactrl_id "); - sb.append(" AND crtc.activo = 1) "); - sb.append("INNER JOIN ruta ro ON (crc.ruta_origen_id = ro.ruta_id "); - sb.append(" AND ro.activo =1 )"); - sb.append("INNER JOIN ruta rd ON (crc.ruta_destino_id = rd.ruta_id"); - sb.append(" AND rd.activo =1)"); - sb.append("INNER JOIN parada po ON (po.parada_id = crtc.origen_id) "); - sb.append("INNER JOIN parada pd ON (pd.parada_id = crtc.destino_id) "); - sb.append("WHERE crc.activo = 1"); - sb.append(" AND crtc.activo = 1"); - sb.append(" AND ro.activo = 1"); - if (rutaOrigemId != null) { - sb.append(" and crc.ruta_origen_id = ").append(rutaOrigemId); - } - if (rutaDestinoId != null) { - sb.append(" and crc.ruta_destino_id = ").append(rutaDestinoId); - } - sb.append(" ORDER BY conexionRutaCtrl,ro.descruta, "); - sb.append(" rd.descruta,"); - sb.append(" crtc.conexionrutatramoctrl_id "); - - Query query = getSession().createSQLQuery(sb.toString()); - List conexionVOs = new ArrayList(); - - for (Object o : query.list()) { - Object[] oc = (Object[]) o; - - ConexionRutaVO conexionVO = new ConexionRutaVO(); - conexionVO.setDescLinhaOrigem((String) oc[0]); - conexionVO.setNumRutaOrigen(((BigDecimal) oc[1]).intValue()); - conexionVO.setDescLinhaDestino((String) oc[2]); - conexionVO.setNumRutaDestino(((BigDecimal) oc[3]).intValue()); - conexionVO.setTramoOrigen((String) oc[4]); - conexionVO.setTramoDestino((String) oc[5]); - conexionVO.setConexionRutaCtrl(((BigDecimal) oc[6]).intValue()); - conexionVO.setRutaOrigenId(((BigDecimal) oc[7]).intValue()); - conexionVO.setRutaDestinoId(((BigDecimal) oc[8]).intValue()); - conexionVOs.add(conexionVO); - } - - return conexionVOs; - } - - @Override - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; + +@Repository("conexionRutaCtrlDAO") +public class ConexionRutaCtrlHibernateDAO extends GenericHibernateDAO implements ConexionRutaCtrlDAO { + + @Autowired + public ConexionRutaCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarConexionesValidas() { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT ro.descruta as descLinhaOrigem, "); + sb.append(" ro.numruta as numRutaOrigen, "); + sb.append(" rd.descruta as descLinhaDestino, "); + sb.append(" rd.numruta as numRutaDestino, "); + sb.append(" po.descparada as tramoOrigen, "); + sb.append(" pd.descparada as tramoDestino, "); + sb.append(" crc.conexionrutactrl_id as conexionRutaCtrl, "); + sb.append(" ro.ruta_id as rutaOrigenId, "); + sb.append(" rd.ruta_id as rutaDestinonId "); + sb.append("FROM conexion_ruta_ctrl crc "); + sb.append("INNER JOIN conexion_ruta_tramo_ctrl crtc ON (crc.conexionrutactrl_id = crtc.conexionrutactrl_id "); + sb.append(" AND crtc.activo = 1) "); + sb.append("INNER JOIN ruta ro ON (crc.ruta_origen_id = ro.ruta_id "); + sb.append(" AND ro.activo =1 )"); + sb.append("INNER JOIN ruta rd ON (crc.ruta_destino_id = rd.ruta_id"); + sb.append(" AND rd.activo =1)"); + sb.append("INNER JOIN parada po ON (po.parada_id = crtc.origen_id) "); + sb.append("INNER JOIN parada pd ON (pd.parada_id = crtc.destino_id) "); + sb.append("WHERE crc.activo =1"); + sb.append(" AND crtc.activo = 1"); + sb.append(" AND ro.activo = 1"); + sb.append(" ORDER BY crtc.conexionrutatramoctrl_id, conexionRutaCtrl "); + + Query query = getSession().createSQLQuery(sb.toString()); + List conexionVOs = new ArrayList(); + + for (Object o : query.list()) { + Object[] oc = (Object[]) o; + + ConexionRutaVO conexionVO = new ConexionRutaVO(); + conexionVO.setDescLinhaOrigem((String) oc[0]); + conexionVO.setNumRutaOrigen(((BigDecimal) oc[1]).intValue()); + conexionVO.setDescLinhaDestino((String) oc[2]); + conexionVO.setNumRutaDestino(((BigDecimal) oc[3]).intValue()); + conexionVO.setTramoOrigen((String) oc[4]); + conexionVO.setTramoDestino((String) oc[5]); + conexionVO.setConexionRutaCtrl(((BigDecimal) oc[6]).intValue()); + conexionVO.setRutaOrigenId(((BigDecimal) oc[7]).intValue()); + conexionVO.setRutaDestinoId(((BigDecimal) oc[8]).intValue()); + conexionVOs.add(conexionVO); + } + + return conexionVOs; + + } + + @Override + public List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId) { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT ro.descruta as descLinhaOrigem, "); + sb.append(" ro.numruta as numRutaOrigen, "); + sb.append(" rd.descruta as descLinhaDestino, "); + sb.append(" rd.numruta as numRutaDestino, "); + sb.append(" po.descparada as tramoOrigen, "); + sb.append(" pd.descparada as tramoDestino, "); + sb.append(" crc.conexionrutactrl_id as conexionRutaCtrl, "); + sb.append(" ro.ruta_id as rutaOrigenId, "); + sb.append(" rd.ruta_id as rutaDestinonId "); + sb.append("FROM conexion_ruta_ctrl crc "); + sb.append("INNER JOIN conexion_ruta_tramo_ctrl crtc ON (crc.conexionrutactrl_id = crtc.conexionrutactrl_id "); + sb.append(" AND crtc.activo = 1) "); + sb.append("INNER JOIN ruta ro ON (crc.ruta_origen_id = ro.ruta_id "); + sb.append(" AND ro.activo =1 )"); + sb.append("INNER JOIN ruta rd ON (crc.ruta_destino_id = rd.ruta_id"); + sb.append(" AND rd.activo =1)"); + sb.append("INNER JOIN parada po ON (po.parada_id = crtc.origen_id) "); + sb.append("INNER JOIN parada pd ON (pd.parada_id = crtc.destino_id) "); + sb.append("WHERE crc.activo = 1"); + sb.append(" AND crtc.activo = 1"); + sb.append(" AND ro.activo = 1"); + if (rutaOrigemId != null) { + sb.append(" and crc.ruta_origen_id = ").append(rutaOrigemId); + } + if (rutaDestinoId != null) { + sb.append(" and crc.ruta_destino_id = ").append(rutaDestinoId); + } + sb.append(" ORDER BY conexionRutaCtrl,ro.descruta, "); + sb.append(" rd.descruta,"); + sb.append(" crtc.conexionrutatramoctrl_id "); + + Query query = getSession().createSQLQuery(sb.toString()); + List conexionVOs = new ArrayList(); + + for (Object o : query.list()) { + Object[] oc = (Object[]) o; + + ConexionRutaVO conexionVO = new ConexionRutaVO(); + conexionVO.setDescLinhaOrigem((String) oc[0]); + conexionVO.setNumRutaOrigen(((BigDecimal) oc[1]).intValue()); + conexionVO.setDescLinhaDestino((String) oc[2]); + conexionVO.setNumRutaDestino(((BigDecimal) oc[3]).intValue()); + conexionVO.setTramoOrigen((String) oc[4]); + conexionVO.setTramoDestino((String) oc[5]); + conexionVO.setConexionRutaCtrl(((BigDecimal) oc[6]).intValue()); + conexionVO.setRutaOrigenId(((BigDecimal) oc[7]).intValue()); + conexionVO.setRutaDestinoId(((BigDecimal) oc[8]).intValue()); + conexionVOs.add(conexionVO); + } + + return conexionVOs; + } + + @Override + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java index e9181c98e..df863b45d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionTipoPtoVtaDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; - -@Repository("conexionRutaExcepcionTipoPtoVtaDAO") -public class ConexionRutaExcepcionTipoPtoVtaHibernateDAO extends GenericHibernateDAO implements ConexionRutaExcepcionTipoPtoVtaDAO { - - @Autowired - public ConexionRutaExcepcionTipoPtoVtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionTipoPtoVtaDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; + +@Repository("conexionRutaExcepcionTipoPtoVtaDAO") +public class ConexionRutaExcepcionTipoPtoVtaHibernateDAO extends GenericHibernateDAO implements ConexionRutaExcepcionTipoPtoVtaDAO { + + @Autowired + public ConexionRutaExcepcionTipoPtoVtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java index ed0d6b5e0..face183b9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionPtoVtaDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; - -@Repository("conexionRutaRestricaoPtoVtaDAO") -public class ConexionRutaRestricaoPtoVtaHibernateDAO extends GenericHibernateDAO implements ConexionRutaExcepcionPtoVtaDAO { - - @Autowired - public ConexionRutaRestricaoPtoVtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @Override - public void update(ConexionRutaExcepcionPtoVta entidad) { - Session session = getSessionFactory().getCurrentSession(); - session.update(entidad); - session.flush(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionPtoVtaDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; + +@Repository("conexionRutaRestricaoPtoVtaDAO") +public class ConexionRutaRestricaoPtoVtaHibernateDAO extends GenericHibernateDAO implements ConexionRutaExcepcionPtoVtaDAO { + + @Autowired + public ConexionRutaRestricaoPtoVtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @Override + public void update(ConexionRutaExcepcionPtoVta entidad) { + Session session = getSessionFactory().getCurrentSession(); + session.update(entidad); + session.flush(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java index e0d76b9b3..60aa3bfcb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java @@ -1,162 +1,162 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaTramoCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Tramo; - -@Repository("conexionRutaTramoCtrlDAO") -public class ConexionRutaTramoCtrlHibernateDAO extends GenericHibernateDAO implements ConexionRutaTramoCtrlDAO { - - @Autowired - public ConexionRutaTramoCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer rutaDestinoCId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId) { - - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT *"); - sb.append(" FROM conexion_ruta_ctrl crt "); - sb.append(" INNER JOIN conexion_ruta_tramo_ctrl crtl ON (crtl.conexionrutactrl_id = crt.conexionrutactrl_id) "); - sb.append(" INNER JOIN conexion c ON (c.conexionrutatramoctrl_id = crtl.conexionrutatramoctrl_id) "); - sb.append(" INNER JOIN conexion_ctrl cc ON (cc.conexionctrl_id = c.conexionctrl_id) "); - sb.append(" WHERE crt.ruta_origen_id = ").append(rutaOrigenId); - sb.append(" AND crt.ruta_destino_id = ").append(rutaDestinoId); - sb.append(" AND crt.ruta_destinoc_id = ").append(rutaDestinoCId); - sb.append(" AND crtl.origen_id = ").append(paradaOrigenId); - sb.append(" AND crtl.destino_id = ").append(paradaDestinoId); - sb.append(" AND cc.origen_id = ").append(origemTrechoId); - sb.append(" AND cc.destino_id = ").append(destinoTrechoId); - sb.append(" and crt.activo = 1 and crtl.activo = 1 and c.activo =1 and cc.activo = 1"); - - Query query = getSession().createSQLQuery(sb.toString()); - List list = query.list(); - - return !list.isEmpty(); - } - - @Override - public List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("conexionRutaCtrl", conexionRutaCtrl)); - c.add(Restrictions.eq("ruta.rutaId", rutaId)); - - return c.list(); - } - - @Override - public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId) { - return carregarParadas(conexionRutaConfId, 'A'); - } - - @Override - public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId) { - return carregarParadas(conexionRutaConfId, 'B'); - } - - @Override - public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId) { - return carregarParadas(conexionRutaConfId, 'C'); - } - - @SuppressWarnings("unchecked") - private List carregarParadas(Integer conexionRutaConfId, char tipo) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT t ") - .append("FROM ConexionRutaCtrl ctrl "); - - switch (tipo) { - case 'A': - sQuery.append("JOIN ctrl.rutaOrigen r "); - break; - case 'B': - sQuery.append("JOIN ctrl.rutaDestino r "); - break; - case 'C': - sQuery.append("JOIN ctrl.rutaDestinoC r "); - break; - } - - sQuery.append("JOIN r.rutaCombinacionList rc ") - .append("JOIN rc.tramo t ") - .append("WHERE ctrl.activo = 1 ") - .append("AND rc.activo = 1 ") - .append("AND t.activo = 1 ") - .append("AND ctrl.conexionRutaConf.conexionRutaConfId = :conexionRutaConfId"); - - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("conexionRutaConfId", conexionRutaConfId); - List listTramos = qr.list(); - Set paradas = new HashSet(); - for (Tramo tramo : listTramos) { - paradas.add(tramo.getOrigem()); - paradas.add(tramo.getDestino()); - } - - return new ArrayList(paradas); - } - - /** - *Busca localidades de acordo com o conexionRutaConfId e pelo eixo informado ('A', 'B', 'C') - */ - @Override - @SuppressWarnings("unchecked") - public List buscarLocalidadesPorConexionRutaConfAndEixo(Integer conexionRutaConfId, char tipo) { - - String filtro = ""; - String join = ""; - - switch (tipo) { - case 'A': - filtro = "AND ctrlt.ruta = ctrl.rutaOrigen "; - join = "JOIN ctrlt.origen p "; - break; - case 'B': - filtro = "AND ctrlt.ruta = ctrl.rutaDestino "; - join = "JOIN ctrlt.destino p "; - break; - case 'C': - filtro = "AND ctrlt.ruta = ctrl.rutaDestinoC "; - join = "JOIN ctrlt.destino p "; - break; - } - - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT p ") - .append("FROM ConexionRutaTramoCtrl ctrlt ") - .append(join) - .append("JOIN ctrlt.conexionRutaCtrl ctrl ") - .append("WHERE ctrlt.activo = 1") - .append("AND ctrl.activo = 1") - .append("AND ctrl.conexionRutaConf.conexionRutaConfId = :conexionRutaConfId ") - .append(filtro); - - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("conexionRutaConfId", conexionRutaConfId); - List paradas = qr.list(); - - return paradas; - - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaTramoCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Tramo; + +@Repository("conexionRutaTramoCtrlDAO") +public class ConexionRutaTramoCtrlHibernateDAO extends GenericHibernateDAO implements ConexionRutaTramoCtrlDAO { + + @Autowired + public ConexionRutaTramoCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer rutaDestinoCId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId) { + + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT *"); + sb.append(" FROM conexion_ruta_ctrl crt "); + sb.append(" INNER JOIN conexion_ruta_tramo_ctrl crtl ON (crtl.conexionrutactrl_id = crt.conexionrutactrl_id) "); + sb.append(" INNER JOIN conexion c ON (c.conexionrutatramoctrl_id = crtl.conexionrutatramoctrl_id) "); + sb.append(" INNER JOIN conexion_ctrl cc ON (cc.conexionctrl_id = c.conexionctrl_id) "); + sb.append(" WHERE crt.ruta_origen_id = ").append(rutaOrigenId); + sb.append(" AND crt.ruta_destino_id = ").append(rutaDestinoId); + sb.append(" AND crt.ruta_destinoc_id = ").append(rutaDestinoCId); + sb.append(" AND crtl.origen_id = ").append(paradaOrigenId); + sb.append(" AND crtl.destino_id = ").append(paradaDestinoId); + sb.append(" AND cc.origen_id = ").append(origemTrechoId); + sb.append(" AND cc.destino_id = ").append(destinoTrechoId); + sb.append(" and crt.activo = 1 and crtl.activo = 1 and c.activo =1 and cc.activo = 1"); + + Query query = getSession().createSQLQuery(sb.toString()); + List list = query.list(); + + return !list.isEmpty(); + } + + @Override + public List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("conexionRutaCtrl", conexionRutaCtrl)); + c.add(Restrictions.eq("ruta.rutaId", rutaId)); + + return c.list(); + } + + @Override + public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId) { + return carregarParadas(conexionRutaConfId, 'A'); + } + + @Override + public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId) { + return carregarParadas(conexionRutaConfId, 'B'); + } + + @Override + public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId) { + return carregarParadas(conexionRutaConfId, 'C'); + } + + @SuppressWarnings("unchecked") + private List carregarParadas(Integer conexionRutaConfId, char tipo) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT t ") + .append("FROM ConexionRutaCtrl ctrl "); + + switch (tipo) { + case 'A': + sQuery.append("JOIN ctrl.rutaOrigen r "); + break; + case 'B': + sQuery.append("JOIN ctrl.rutaDestino r "); + break; + case 'C': + sQuery.append("JOIN ctrl.rutaDestinoC r "); + break; + } + + sQuery.append("JOIN r.rutaCombinacionList rc ") + .append("JOIN rc.tramo t ") + .append("WHERE ctrl.activo = 1 ") + .append("AND rc.activo = 1 ") + .append("AND t.activo = 1 ") + .append("AND ctrl.conexionRutaConf.conexionRutaConfId = :conexionRutaConfId"); + + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("conexionRutaConfId", conexionRutaConfId); + List listTramos = qr.list(); + Set paradas = new HashSet(); + for (Tramo tramo : listTramos) { + paradas.add(tramo.getOrigem()); + paradas.add(tramo.getDestino()); + } + + return new ArrayList(paradas); + } + + /** + *Busca localidades de acordo com o conexionRutaConfId e pelo eixo informado ('A', 'B', 'C') + */ + @Override + @SuppressWarnings("unchecked") + public List buscarLocalidadesPorConexionRutaConfAndEixo(Integer conexionRutaConfId, char tipo) { + + String filtro = ""; + String join = ""; + + switch (tipo) { + case 'A': + filtro = "AND ctrlt.ruta = ctrl.rutaOrigen "; + join = "JOIN ctrlt.origen p "; + break; + case 'B': + filtro = "AND ctrlt.ruta = ctrl.rutaDestino "; + join = "JOIN ctrlt.destino p "; + break; + case 'C': + filtro = "AND ctrlt.ruta = ctrl.rutaDestinoC "; + join = "JOIN ctrlt.destino p "; + break; + } + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT p ") + .append("FROM ConexionRutaTramoCtrl ctrlt ") + .append(join) + .append("JOIN ctrlt.conexionRutaCtrl ctrl ") + .append("WHERE ctrlt.activo = 1") + .append("AND ctrl.activo = 1") + .append("AND ctrl.conexionRutaConf.conexionRutaConfId = :conexionRutaConfId ") + .append(filtro); + + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("conexionRutaConfId", conexionRutaConfId); + List paradas = qr.list(); + + return paradas; + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfContratoPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfContratoPuntoVentaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfContratoPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfContratoPuntoVentaHibernateDAO.java index 0ad3b200e..171eed66e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfContratoPuntoVentaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfContratoPuntoVentaHibernateDAO.java @@ -1,134 +1,134 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfContratoPuntoVentaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; -import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; - -@Repository("confContratoPuntoVentaDAO") -public class ConfContratoPuntoVentaHibernateDAO extends GenericHibernateDAO implements ConfContratoPuntoVentaDAO { - - @Autowired - public ConfContratoPuntoVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarConfContratoPorPuntoVenta(PuntoVenta puntoVenta) { - - List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq(ACTIVO, Boolean.TRUE)); - return abastos; - } - - @Override - public ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaId) { - - - StringBuilder sb = new StringBuilder(); - - sb.append("select pa.descparada as nomeLocalidade,"); - sb.append(" pv.numdocpuntoventa as CNPJ,"); - sb.append(" pv.fecabertura as dataAbertura,"); - sb.append(" pv.razonsocial as razaoSocial,"); - sb.append(" ci.nombciudad as nomeCidade,"); - sb.append(" pv.desccorreo as email,"); - sb.append(" pv.codpostal codigoPostal,"); - sb.append(" pv.direccionnumero as numero,"); - sb.append(" ptoco.passagembaixa as passagemBaixa,"); - sb.append(" ptoco.passagemalta as passagemAlta,"); - sb.append(" ptoco.seguroobrigatoriobaixa as seguroObrigatorioBaixa,"); - sb.append(" ptoco.seguroobrigatorioalta as seguroObrigatorioAlta,"); - sb.append(" ptoco.valor_venda_gap_comp as valorVendaGapBaixa,"); - sb.append(" ptoco.valor_venda_gap_alta_comp as valorVendaGapAlta,"); - sb.append(" ptoco.valor_imp_gap_comp as valorVendaGapBaixaImp,"); - sb.append(" ptoco.valor_imp_gap_alta_comp as valorVendaGapAltaImp,"); - sb.append(" ptoco.segurobaixa as seguroBaixa,"); - sb.append(" ptoco.seguroalta as seguroAlta,"); - sb.append(" ptoco.outrosbaixa as outrosBaixa,"); - sb.append(" ptoco.outrosalta as outrosAlta,"); - sb.append(" ptoco.excessobaixa as excesssoBaixa,"); - sb.append(" ptoco.excessoalta as excesssoAlta, "); - sb.append(" pvt.nome as nomeTitular, "); - sb.append(" ifi.nome as nomeBanco, "); - sb.append(" pva.numagencia as numeroAgencia, "); - sb.append(" pva.numconta as numeroConta, "); - sb.append(" pv.tipo_socio as tipoSocio, "); - sb.append(" pv.direccioncalle as rua, "); - sb.append(" co.desccolonia as bairro "); - sb.append("from punto_venta pv "); - sb.append("inner join ptovta_comissao ptoco on (ptoco.puntoventa_id = pv.puntoventa_id "); - sb.append(" and ptoco.empresa_id =:empresaId )"); - sb.append("inner join ptovta_empresa pe on (pe.puntoventa_id = pv.puntoventa_id "); - sb.append(" and ptoco.empresa_id = pe.empresa_id) "); - sb.append("inner join parada pa on (pv.parada_id = pa.parada_id)"); - sb.append("inner join colonia co on (co.colonia_id = pv.colonia_id) "); - sb.append("inner join ciudad ci on (ci.ciudad_id = co.ciudad_id) "); - sb.append("inner join ptovta_titular pvt on (pvt.ptovtatitular_id = pv.ptovtatitular_id) "); - sb.append("inner join ptovta_agencia pva on (pva.ptovtaagencia_id = pv.ptovtaagencia_id) "); - sb.append("inner join insti_financeira ifi on (ifi.instifinanceira_id = pva.instifinanceira_id) "); - sb.append("where pv.puntoventa_id =:puntoVentaId "); - sb.append(" and ptoco.empresa_id =:empresaId "); - sb.append(" and pv.activo =1 "); - sb.append(" and ptoco.activo =1 "); - sb.append(" and pe.activo = 1 "); - - - - SQLQuery sql = getSession().createSQLQuery(sb.toString()) - .addScalar("nomeLocalidade", StringType.INSTANCE) - .addScalar("CNPJ", StringType.INSTANCE) - .addScalar("dataAbertura", DateType.INSTANCE) - .addScalar("razaoSocial", StringType.INSTANCE) - .addScalar("nomeCidade", StringType.INSTANCE) - .addScalar("email", StringType.INSTANCE) - .addScalar("codigoPostal", StringType.INSTANCE) - .addScalar("numero", StringType.INSTANCE) - .addScalar("passagemBaixa", BigDecimalType.INSTANCE) - .addScalar("passagemAlta", BigDecimalType.INSTANCE) - .addScalar("seguroObrigatorioBaixa", BigDecimalType.INSTANCE) - .addScalar("seguroObrigatorioAlta", BigDecimalType.INSTANCE) - .addScalar("valorVendaGapBaixa", BigDecimalType.INSTANCE) - .addScalar("valorVendaGapAlta", BigDecimalType.INSTANCE) - .addScalar("valorVendaGapBaixaImp", BigDecimalType.INSTANCE) - .addScalar("valorVendaGapAltaImp", BigDecimalType.INSTANCE) - .addScalar("seguroBaixa", BigDecimalType.INSTANCE) - .addScalar("seguroAlta", BigDecimalType.INSTANCE) - .addScalar("outrosBaixa", BigDecimalType.INSTANCE) - .addScalar("outrosAlta", BigDecimalType.INSTANCE) - .addScalar("excesssoBaixa", BigDecimalType.INSTANCE) - .addScalar("excesssoAlta", BigDecimalType.INSTANCE) - .addScalar("nomeTitular", StringType.INSTANCE) - .addScalar("nomeBanco", StringType.INSTANCE) - .addScalar("numeroAgencia", StringType.INSTANCE) - .addScalar("numeroConta", StringType.INSTANCE) - .addScalar("tipoSocio", StringType.INSTANCE) - .addScalar("bairro", StringType.INSTANCE) - .addScalar("rua", StringType.INSTANCE); - - - - sql.setInteger("empresaId", empresaId); - sql.setInteger("puntoVentaId", puntoVentaId); - sql.setResultTransformer(new AliasToBeanResultTransformer(ConfLayoutContratoVO.class)); - - @SuppressWarnings("unchecked") - ConfLayoutContratoVO confLayoutContratoVO = (ConfLayoutContratoVO) sql.uniqueResult(); - - return confLayoutContratoVO; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfContratoPuntoVentaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; +import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; + +@Repository("confContratoPuntoVentaDAO") +public class ConfContratoPuntoVentaHibernateDAO extends GenericHibernateDAO implements ConfContratoPuntoVentaDAO { + + @Autowired + public ConfContratoPuntoVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarConfContratoPorPuntoVenta(PuntoVenta puntoVenta) { + + List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq(ACTIVO, Boolean.TRUE)); + return abastos; + } + + @Override + public ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaId) { + + + StringBuilder sb = new StringBuilder(); + + sb.append("select pa.descparada as nomeLocalidade,"); + sb.append(" pv.numdocpuntoventa as CNPJ,"); + sb.append(" pv.fecabertura as dataAbertura,"); + sb.append(" pv.razonsocial as razaoSocial,"); + sb.append(" ci.nombciudad as nomeCidade,"); + sb.append(" pv.desccorreo as email,"); + sb.append(" pv.codpostal codigoPostal,"); + sb.append(" pv.direccionnumero as numero,"); + sb.append(" ptoco.passagembaixa as passagemBaixa,"); + sb.append(" ptoco.passagemalta as passagemAlta,"); + sb.append(" ptoco.seguroobrigatoriobaixa as seguroObrigatorioBaixa,"); + sb.append(" ptoco.seguroobrigatorioalta as seguroObrigatorioAlta,"); + sb.append(" ptoco.valor_venda_gap_comp as valorVendaGapBaixa,"); + sb.append(" ptoco.valor_venda_gap_alta_comp as valorVendaGapAlta,"); + sb.append(" ptoco.valor_imp_gap_comp as valorVendaGapBaixaImp,"); + sb.append(" ptoco.valor_imp_gap_alta_comp as valorVendaGapAltaImp,"); + sb.append(" ptoco.segurobaixa as seguroBaixa,"); + sb.append(" ptoco.seguroalta as seguroAlta,"); + sb.append(" ptoco.outrosbaixa as outrosBaixa,"); + sb.append(" ptoco.outrosalta as outrosAlta,"); + sb.append(" ptoco.excessobaixa as excesssoBaixa,"); + sb.append(" ptoco.excessoalta as excesssoAlta, "); + sb.append(" pvt.nome as nomeTitular, "); + sb.append(" ifi.nome as nomeBanco, "); + sb.append(" pva.numagencia as numeroAgencia, "); + sb.append(" pva.numconta as numeroConta, "); + sb.append(" pv.tipo_socio as tipoSocio, "); + sb.append(" pv.direccioncalle as rua, "); + sb.append(" co.desccolonia as bairro "); + sb.append("from punto_venta pv "); + sb.append("inner join ptovta_comissao ptoco on (ptoco.puntoventa_id = pv.puntoventa_id "); + sb.append(" and ptoco.empresa_id =:empresaId )"); + sb.append("inner join ptovta_empresa pe on (pe.puntoventa_id = pv.puntoventa_id "); + sb.append(" and ptoco.empresa_id = pe.empresa_id) "); + sb.append("inner join parada pa on (pv.parada_id = pa.parada_id)"); + sb.append("inner join colonia co on (co.colonia_id = pv.colonia_id) "); + sb.append("inner join ciudad ci on (ci.ciudad_id = co.ciudad_id) "); + sb.append("inner join ptovta_titular pvt on (pvt.ptovtatitular_id = pv.ptovtatitular_id) "); + sb.append("inner join ptovta_agencia pva on (pva.ptovtaagencia_id = pv.ptovtaagencia_id) "); + sb.append("inner join insti_financeira ifi on (ifi.instifinanceira_id = pva.instifinanceira_id) "); + sb.append("where pv.puntoventa_id =:puntoVentaId "); + sb.append(" and ptoco.empresa_id =:empresaId "); + sb.append(" and pv.activo =1 "); + sb.append(" and ptoco.activo =1 "); + sb.append(" and pe.activo = 1 "); + + + + SQLQuery sql = getSession().createSQLQuery(sb.toString()) + .addScalar("nomeLocalidade", StringType.INSTANCE) + .addScalar("CNPJ", StringType.INSTANCE) + .addScalar("dataAbertura", DateType.INSTANCE) + .addScalar("razaoSocial", StringType.INSTANCE) + .addScalar("nomeCidade", StringType.INSTANCE) + .addScalar("email", StringType.INSTANCE) + .addScalar("codigoPostal", StringType.INSTANCE) + .addScalar("numero", StringType.INSTANCE) + .addScalar("passagemBaixa", BigDecimalType.INSTANCE) + .addScalar("passagemAlta", BigDecimalType.INSTANCE) + .addScalar("seguroObrigatorioBaixa", BigDecimalType.INSTANCE) + .addScalar("seguroObrigatorioAlta", BigDecimalType.INSTANCE) + .addScalar("valorVendaGapBaixa", BigDecimalType.INSTANCE) + .addScalar("valorVendaGapAlta", BigDecimalType.INSTANCE) + .addScalar("valorVendaGapBaixaImp", BigDecimalType.INSTANCE) + .addScalar("valorVendaGapAltaImp", BigDecimalType.INSTANCE) + .addScalar("seguroBaixa", BigDecimalType.INSTANCE) + .addScalar("seguroAlta", BigDecimalType.INSTANCE) + .addScalar("outrosBaixa", BigDecimalType.INSTANCE) + .addScalar("outrosAlta", BigDecimalType.INSTANCE) + .addScalar("excesssoBaixa", BigDecimalType.INSTANCE) + .addScalar("excesssoAlta", BigDecimalType.INSTANCE) + .addScalar("nomeTitular", StringType.INSTANCE) + .addScalar("nomeBanco", StringType.INSTANCE) + .addScalar("numeroAgencia", StringType.INSTANCE) + .addScalar("numeroConta", StringType.INSTANCE) + .addScalar("tipoSocio", StringType.INSTANCE) + .addScalar("bairro", StringType.INSTANCE) + .addScalar("rua", StringType.INSTANCE); + + + + sql.setInteger("empresaId", empresaId); + sql.setInteger("puntoVentaId", puntoVentaId); + sql.setResultTransformer(new AliasToBeanResultTransformer(ConfLayoutContratoVO.class)); + + @SuppressWarnings("unchecked") + ConfLayoutContratoVO confLayoutContratoVO = (ConfLayoutContratoVO) sql.uniqueResult(); + + return confLayoutContratoVO; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java index ab0eb681b..602fd969c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoCanalVentaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; - -@Repository("confRestricaoCanalVentaDAO") -public class ConfRestricaoCanalVentaHibernateDAO extends GenericHibernateDAO implements ConfRestricaoCanalVentaDAO { - - @Autowired - public ConfRestricaoCanalVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public Boolean inativarListConfRestricaoCanalVenta(List idsConfRestricaoCanalVenta, Integer usuarioId) { - if(idsConfRestricaoCanalVenta.isEmpty()) { - return false; - } - StringBuilder sb = new StringBuilder(); - sb.append(" UPDATE ConfRestricaoCanalVenta SET activo=0, "); - sb.append(" usuarioId=:usuarioId, "); - sb.append(" fecmodif=:data" ); - sb.append(" where confRestricaoCanalVentaId in ("); - sb.append(idsConfRestricaoCanalVenta.toString().substring(1, idsConfRestricaoCanalVenta.toString().length() - 1)).append(" ) "); - Query queryConfRestricaoCanalVenta = getSession().createQuery(sb.toString()); - queryConfRestricaoCanalVenta.setInteger("usuarioId", usuarioId); - queryConfRestricaoCanalVenta.setDate("data", new Date()); - - return queryConfRestricaoCanalVenta.executeUpdate()>1?true:false; - - - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoCanalVentaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; + +@Repository("confRestricaoCanalVentaDAO") +public class ConfRestricaoCanalVentaHibernateDAO extends GenericHibernateDAO implements ConfRestricaoCanalVentaDAO { + + @Autowired + public ConfRestricaoCanalVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public Boolean inativarListConfRestricaoCanalVenta(List idsConfRestricaoCanalVenta, Integer usuarioId) { + if(idsConfRestricaoCanalVenta.isEmpty()) { + return false; + } + StringBuilder sb = new StringBuilder(); + sb.append(" UPDATE ConfRestricaoCanalVenta SET activo=0, "); + sb.append(" usuarioId=:usuarioId, "); + sb.append(" fecmodif=:data" ); + sb.append(" where confRestricaoCanalVentaId in ("); + sb.append(idsConfRestricaoCanalVenta.toString().substring(1, idsConfRestricaoCanalVenta.toString().length() - 1)).append(" ) "); + Query queryConfRestricaoCanalVenta = getSession().createQuery(sb.toString()); + queryConfRestricaoCanalVenta.setInteger("usuarioId", usuarioId); + queryConfRestricaoCanalVenta.setDate("data", new Date()); + + return queryConfRestricaoCanalVenta.executeUpdate()>1?true:false; + + + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoExcecaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoExcecaoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoExcecaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoExcecaoHibernateDAO.java index 4b8519902..0354b91ee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoExcecaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoExcecaoHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoExcecaoDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; - -@Repository("confRestricaoExcecaoDAO") -public class ConfRestricaoExcecaoHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoExcecaoDAO { - - @Autowired - public ConfRestricaoExcecaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoExcecaoDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; + +@Repository("confRestricaoExcecaoDAO") +public class ConfRestricaoExcecaoHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoExcecaoDAO { + + @Autowired + public ConfRestricaoExcecaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoOrgaoConcedenteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoOrgaoConcedenteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoOrgaoConcedenteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoOrgaoConcedenteHibernateDAO.java index 48cc9af4c..7741797a4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoOrgaoConcedenteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoOrgaoConcedenteHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoOrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; - -@Repository("confRestricaoOrgaoConcedenteDAO") -public class ConfRestricaoOrgaoConcedenteHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoOrgaoConcedenteDAO { - - @Autowired - public ConfRestricaoOrgaoConcedenteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoOrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; + +@Repository("confRestricaoOrgaoConcedenteDAO") +public class ConfRestricaoOrgaoConcedenteHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoOrgaoConcedenteDAO { + + @Autowired + public ConfRestricaoOrgaoConcedenteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoPtovtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoPtovtaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoPtovtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoPtovtaHibernateDAO.java index 0600634b7..a8bd5442c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoPtovtaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoPtovtaHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoPtovtaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; - -@Repository("confRestricaoPtovtaDAO") -public class ConfRestricaoPtovtaHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoPtovtaDAO { - - @Autowired - public ConfRestricaoPtovtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoPtovtaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; + +@Repository("confRestricaoPtovtaDAO") +public class ConfRestricaoPtovtaHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoPtovtaDAO { + + @Autowired + public ConfRestricaoPtovtaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoRutasHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoRutasHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoRutasHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoRutasHibernateDAO.java index c6b5d3bc3..f510ff452 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoRutasHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoRutasHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoRutasDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; - -@Repository("confRestricaoRutasDAO") -public class ConfRestricaoRutasHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoRutasDAO { - - @Autowired - public ConfRestricaoRutasHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoRutasDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; + +@Repository("confRestricaoRutasDAO") +public class ConfRestricaoRutasHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoRutasDAO { + + @Autowired + public ConfRestricaoRutasHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoHibernateDAO.java index 0276506e9..cd281063e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; - -@Repository("confRestricaoTramoDAO") -public class ConfRestricaoTramoHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoTramoDAO { - - @Autowired - public ConfRestricaoTramoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; + +@Repository("confRestricaoTramoDAO") +public class ConfRestricaoTramoHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoTramoDAO { + + @Autowired + public ConfRestricaoTramoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoOCHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoOCHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoOCHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoOCHibernateDAO.java index 80d6bdcbf..773d0ca58 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoOCHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoTramoOCHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoOCDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; - -@Repository("confRestricaoTramoOCDAO") -public class ConfRestricaoTramoOCHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoTramoOCDAO { - - @Autowired - public ConfRestricaoTramoOCHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoOCDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; + +@Repository("confRestricaoTramoOCDAO") +public class ConfRestricaoTramoOCHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoTramoOCDAO { + + @Autowired + public ConfRestricaoTramoOCHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java index abb33750f..81a0a0ffb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoVendaWebDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; -import com.rjconsultores.ventaboletos.entidad.Constante; - -@Repository("confRestricaoVendaWebDAO") -public class ConfRestricaoVendaWebHibernateDAO extends GenericHibernateDAO - implements ConfRestricaoVendaWebDAO { - - @Autowired - public ConfRestricaoVendaWebHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoVendaWebDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; +import com.rjconsultores.ventaboletos.entidad.Constante; + +@Repository("confRestricaoVendaWebDAO") +public class ConfRestricaoVendaWebHibernateDAO extends GenericHibernateDAO + implements ConfRestricaoVendaWebDAO { + + @Autowired + public ConfRestricaoVendaWebHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java index b589dd224..87cd17fdd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfTotemDAO; -import com.rjconsultores.ventaboletos.entidad.ConfTotem; - -/** - * - * @author Wallace - */ -@Repository("confTotemDAO") -public class ConfTotemHibernateDAO extends GenericHibernateDAO - implements ConfTotemDAO { - - @Autowired - public ConfTotemHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public ConfTotem buscar(String chave) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.add(Restrictions.ilike("chave", chave)); - - return c.list().isEmpty() ? null : (ConfTotem) c.list().get(0); - } +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfTotemDAO; +import com.rjconsultores.ventaboletos.entidad.ConfTotem; + +/** + * + * @author Wallace + */ +@Repository("confTotemDAO") +public class ConfTotemHibernateDAO extends GenericHibernateDAO + implements ConfTotemDAO { + + @Autowired + public ConfTotemHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public ConfTotem buscar(String chave) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.add(Restrictions.ilike("chave", chave)); + + return c.list().isEmpty() ? null : (ConfTotem) c.list().get(0); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java index 611c2f17b..308a097cf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ConfTotemVentaRapidaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfTotemVentaRapida; -import com.rjconsultores.ventaboletos.entidad.Parada; - -/** - * - * @author Wallace - */ -@Repository("ConfTotemVentaRapidaDAO") -public class ConfTotemVentaRapidaHibernateDAO extends GenericHibernateDAO implements ConfTotemVentaRapidaDAO { - - @Autowired - public ConfTotemVentaRapidaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public ConfTotemVentaRapida buscarOrigemDestino(Parada origem, Parada destino) { - - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("origen", origem)); - c.add(Restrictions.eq("destino", destino)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (ConfTotemVentaRapida) c.uniqueResult(); - } - - @Override - public List buscarOrigem(Parada origem) { - - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("origen", origem)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ConfTotemVentaRapidaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfTotemVentaRapida; +import com.rjconsultores.ventaboletos.entidad.Parada; + +/** + * + * @author Wallace + */ +@Repository("ConfTotemVentaRapidaDAO") +public class ConfTotemVentaRapidaHibernateDAO extends GenericHibernateDAO implements ConfTotemVentaRapidaDAO { + + @Autowired + public ConfTotemVentaRapidaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public ConfTotemVentaRapida buscarOrigemDestino(Parada origem, Parada destino) { + + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("origen", origem)); + c.add(Restrictions.eq("destino", destino)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (ConfTotemVentaRapida) c.uniqueResult(); + } + + @Override + public List buscarOrigem(Parada origem) { + + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("origen", origem)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index e9793ab4f..c91c0b87a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -1,1474 +1,1474 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; - -import javax.sql.DataSource; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.transform.Transformers; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO; -import com.rjconsultores.ventaboletos.dao.ContaCorrenteAgenciaDAO; -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.entidad.ContaCorrentePtoVta; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.LogConferencia; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.ConferenciaComissaoVO; -import com.rjconsultores.ventaboletos.vo.comissao.DiaConferenciaComissaoVO; -import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; -import com.rjconsultores.ventaboletos.vo.comissao.FormaPagoEventosFinanceirosVO; -import com.rjconsultores.ventaboletos.vo.comissao.FormapagoVO; -import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO; -import com.rjconsultores.ventaboletos.vo.comissao.OcdVO; -import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; - -@Repository("conferenciaComissaoDAO") -public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO - implements ConferenciaComissaoDAO { - - private static final Logger log = LogManager.getLogger(ConferenciaComissaoHibernateDAO.class); - - @Autowired - private ContaCorrenteAgenciaDAO contaCorrenteAgenciaDAO; - - @Autowired - private DataSource dataSourceRead; - - @Autowired - private DataSource dataSource; - - @Autowired - public ConferenciaComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List carregarConferenciaComissao(String competencia, - Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException { - Connection con = null; - try { - con = getConnection(); - - List lsConferencias = new ArrayList(); - - carregarPuntoVentas(lsConferencias, competencia, empresa, puntoVenta, dataMovimento, isDesconsideraPtVendaFechados); - carregarConferenciasRegistradas(lsConferencias, competencia, empresa, puntoVenta, dataMovimento, null, null, null); - carregarMovimentoVendas(con, lsConferencias, competencia, empresa, puntoVenta, dataMovimento, null, null); - carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, dataMovimento); - - Collections.sort(lsConferencias); - - return lsConferencias; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } finally { - try { - if (con != null && !con.isClosed()) { - con.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - public List carregarConferenciaComissao(Date dataInicial, Date dataFinal, - Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException { - Connection con = null; - try { - con = getConnection(); - - List lsConferencias = new ArrayList(); - Map parametros = carregarParametros(dataInicial, dataFinal, null, empresa, puntoVenta, dataMovimento, false); - - SimpleDateFormat format = new SimpleDateFormat("MM/yyyy"); - String competencia = format.format(dataInicial); - - carregarPuntoVentas(lsConferencias, dataInicial, dataFinal, empresa, puntoVenta, dataMovimento); - carregarConferenciasRegistradas(lsConferencias, null, empresa, puntoVenta, dataMovimento, null, null, parametros); - carregarMovimentoVendas(con, lsConferencias, null, empresa, puntoVenta, dataMovimento, dataInicial, dataFinal); - carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, dataMovimento); - - return lsConferencias; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } finally { - try { - if (con != null && !con.isClosed()) { - con.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - private void carregarPuntoVentas(List lsConferencias, Date dataInicial, Date dataFinal, - Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException { - - Set diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal); - ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); - conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId()); - conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa()); - conferenciaComissao.setNumPuntoVenta(puntoVenta.getNumPuntoVenta()); - conferenciaComissao.setDataInicial(dataInicial); - conferenciaComissao.setDataFinal(dataFinal); - conferenciaComissao.setDiasSemMovimentos(diasSemMovimentos); - lsConferencias.add(conferenciaComissao); - - return; - } - - @SuppressWarnings("unchecked") - private void carregarPuntoVentas(List lsConferencias, String competencia, - Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException { - try { - if (puntoVenta != null && puntoVenta.getPuntoventaId() > -1) { - Set diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); - ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); - conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId()); - conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa()); - conferenciaComissao.setNumPuntoVenta(puntoVenta.getNumPuntoVenta()); - conferenciaComissao.setCompetencia(competencia); - conferenciaComissao.setDiasSemMovimentos(diasSemMovimentos); - lsConferencias.add(conferenciaComissao); - - return; - } - - Map parametros = new HashMap(); - StringBuilder sQuery = new StringBuilder() - .append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", ") - .append("PV.NUMPUNTOVENTA as \"numPuntoVenta\", PV.NOMBPUNTOVENTA as \"nombpuntoventa\" ") - .append("FROM PUNTO_VENTA PV ") - .append("JOIN PTOVTA_EMPRESA PTE ON PTE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID AND PTE.ACTIVO = 1 ") - .append("WHERE PV.ACTIVO = 1 "); - - if (empresa != null) { - sQuery.append("AND PTE.EMPRESA_ID = :empresaId "); - parametros.put("empresaId", empresa.getEmpresaId()); - } - - if(isDesconsideraPtVendaFechados) { - sQuery.append("AND PV.STATUSAPROBACION = 'A' "); - } - - sQuery.append("ORDER BY PV.NOMBPUNTOVENTA "); - - @SuppressWarnings("deprecation") - Query qr = getSession().createSQLQuery(sQuery.toString()) - .addScalar("puntoventaId", Hibernate.INTEGER) - .addScalar("numPuntoVenta", Hibernate.STRING) - .addScalar("nombpuntoventa", Hibernate.STRING) - .setResultTransformer(Transformers.aliasToBean(ConferenciaComissaoVO.class)); - setParametros(qr, parametros); - - processarQueryConferenciaComissao(qr.list(), lsConferencias, competencia, dataMovimento, null, null); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @SuppressWarnings("unchecked") - private void carregarConferenciasRegistradas(List lsConferencias, - String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, Date dataInicial, Date dataFinal, Map parametros) throws BusinessException { - try { - if (parametros == null) { - parametros = carregarParametros(dataInicial, dataFinal, competencia, empresa, puntoVenta, dataMovimento, false); - } - StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co "); - sQuery.append("JOIN co.empresa em ") - .append("JOIN co.puntoVenta pv ") - .append("WHERE co.activo = 1 ") - .append("AND co.datamovimento BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') "); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND em.empresaId = :empresaId "); - } - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND pv.puntoventaId = :puntoventaId "); - } - - Query qr = getSession().createQuery(sQuery.toString()); - setParametros(qr, parametros); - dataInicial = parametros.get("dataInicial") != null ? DateUtil.getDateFromString(parametros.get("dataInicial").toString(), "dd/MM/yyyy HH:mm") : null; - dataFinal = parametros.get("dataFinal") != null ? DateUtil.getDateFromString(parametros.get("dataFinal").toString(), "dd/MM/yyyy HH:mm") : null; - processarQueryConferencia(qr.list(), lsConferencias, competencia, dataMovimento, dataInicial, dataFinal); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @SuppressWarnings("rawtypes") - private void setParametros(Query qr, Map parametros) { - for (Entry parametro : parametros.entrySet()) { - if (parametro.getValue() instanceof Collection) { - qr.setParameterList(parametro.getKey(), (Collection) parametro.getValue()); - } else if (parametro.getValue() instanceof List) { - qr.setParameterList(parametro.getKey(), (List) parametro.getValue()); - } else { - qr.setParameter(parametro.getKey(), parametro.getValue()); - } - } - } - - private void setParametros(NamedParameterStatement npst, Map parametros) throws SQLException { - for (Entry parametro : parametros.entrySet()) { - npst.setObject(parametro.getKey(), parametro.getValue()); - } - } - - private void carregarMovimentoVendas(Connection con, List lsConferencias, - String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, Date dataInicialDate, Date dataFinalDate) - throws BusinessException, SQLException { - PreparedStatement stmt = null; - ResultSet rset = null; - try { - - Map parametros = carregarParametros(dataInicialDate, dataFinalDate, competencia, empresa, puntoVenta, dataMovimento, false); - - StringBuilder sQuery = new StringBuilder() - .append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ") - .append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ") - .append("FROM CAJA C ") - .append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ") - .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ") - .append("WHERE PV.ACTIVO = 1 ") - .append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = ?) ") - .append("AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') "); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND M.EMPRESA_ID = ? "); - } - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND PV.PUNTOVENTA_ID = ? "); - } - - sQuery.append(" UNION ") - .append(" SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ") - .append(" PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ") - .append(" FROM EVENTO_EXTRA ee ") - .append(" INNER JOIN CAJA_DIVERSOS C ON C.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ") - .append(" INNER JOIN punto_venta pv ON ee.puntoventa_id = pv.puntoventa_id ") - .append(" WHERE ee.activo = 1") - .append(" AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') "); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND ee.EMPRESA_ID = ? "); - } - - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND PV.PUNTOVENTA_ID = ? "); - } - - sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECCORTE, 'DD/MM/YY') "); - - int idxParametro = 1; - stmt = con.prepareStatement(sQuery.toString()); - String dataIncial = (String) parametros.get("dataInicial"); - String dataFinal = (String) parametros.get("dataFinal"); - stmt.setInt(idxParametro++, Constantes.MVO_CANCEL_GERACAO_OCD.intValue()); - stmt.setString(idxParametro++, dataIncial); - stmt.setString(idxParametro++, dataFinal); - if (parametros.containsKey("empresaId")) { - stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId")); - } - if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) { - stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId")); - } - - //Parametros Evento extra - stmt.setString(idxParametro++, dataIncial); - stmt.setString(idxParametro++, dataFinal); - - if (parametros.containsKey("empresaId")) { - stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId")); - } - - if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) { - stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId")); - } - - rset = stmt.executeQuery(); - List movimentos = new ArrayList(); - while (rset.next()) { - ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); - conferenciaComissao.setPuntoventaId(rset.getInt("puntoventaId")); - conferenciaComissao.setNumPuntoVenta(rset.getString("numPuntoVenta")); - conferenciaComissao.setNombpuntoventa(rset.getString("nombpuntoventa")); - conferenciaComissao.setDataMovimento(rset.getDate("datamovimento")); - - movimentos.add(conferenciaComissao); - } - - processarQueryConferenciaComissao(movimentos, lsConferencias, competencia, dataMovimento, dataInicialDate, dataFinalDate); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } finally { - if (rset != null && !rset.isClosed()) { - rset.close(); - } - if (stmt != null && !stmt.isClosed()) { - stmt.close(); - } - } - } - - /** - * Carrega a {@link ConferenciaComissaoVO} a partir de uma consulta com sql nativo, transformando o resultado em uma coleção de {@link ConferenciaComissaoVO} - * - * @param lsQuery - * @param lsConferencias - * @param competencia - * @param corPadrao - * @throws ParseException - */ - private void processarQueryConferenciaComissao(List lsQuery, - List lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException { - - Set diasSemMovimentos = new TreeSet(); - if(dataInicial != null && dataFinal != null) { - diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal); - } - - if (competencia != null) { - diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); - } - - for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) { - ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); - conferenciaComissao.setCompetencia(competencia); - conferenciaComissao.setDataInicial(dataInicial); - conferenciaComissao.setDataFinal(dataFinal); - conferenciaComissao.setPuntoventaId(conferenciaComissaoMovimentoDiario.getPuntoventaId()); - conferenciaComissao.setNumPuntoVenta(conferenciaComissaoMovimentoDiario.getNumPuntoVenta()); - conferenciaComissao.setNombpuntoventa(conferenciaComissaoMovimentoDiario.getNombpuntoventa()); - conferenciaComissao.setDiasSemMovimentos(new TreeSet(diasSemMovimentos)); - - if (lsConferencias.contains(conferenciaComissao)) { - conferenciaComissao = lsConferencias.get(lsConferencias.indexOf(conferenciaComissao)); - } - - if (conferenciaComissaoMovimentoDiario.getDataMovimento() != null) { - Integer dia = Integer.valueOf(DateUtil.getStringDate(conferenciaComissaoMovimentoDiario.getDataMovimento(), "dd")); - if (conferenciaComissao.getDiasSemMovimentos() != null && conferenciaComissao.getDiasSemMovimentos().contains(dia)) { - - DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO(); - diaConferenciaComissao.setDia(dia); - if (competencia != null) { - diaConferenciaComissao.setData(DateUtil.getDateFromString(dia + "/" + competencia, "dd/MM/yyyy")); - } else { - diaConferenciaComissao.setData(dataMovimento); - } - - if (conferenciaComissao.getDias() == null) { - conferenciaComissao.setDias(new ArrayList()); - } - - conferenciaComissao.getDias().add(diaConferenciaComissao); - conferenciaComissao.getDiasSemMovimentos().remove(diaConferenciaComissao.getDia()); - } - } - - if (!lsConferencias.contains(conferenciaComissao)) { - lsConferencias.add(conferenciaComissao); - } - } - } - - /** - * Carrega a {@link ConferenciaComissaoVO} a partir dos registros da tabela {@link Conferencia} - * - * @param lsQuery - * @param lsConferencias - * @param competencia - * @throws ParseException - */ - private void processarQueryConferencia(List lsQuery, - List lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException { - if (lsQuery != null && !lsQuery.isEmpty()) { - Set diasSemMovimentos = null; - if (competencia != null) { - diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); - } - for (Conferencia conferencia : lsQuery) { - ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); - conferenciaComissao.setCompetencia(competencia); - conferenciaComissao.setDataInicial(dataInicial); - conferenciaComissao.setDataFinal(dataFinal); - conferenciaComissao.setPuntoventaId(conferencia.getPuntoVenta().getPuntoventaId()); - conferenciaComissao.setNumPuntoVenta(conferencia.getPuntoVenta().getNumPuntoVenta()); - conferenciaComissao.setNombpuntoventa(conferencia.getPuntoVenta().getNombpuntoventa()); - conferenciaComissao.setDiasSemMovimentos(diasSemMovimentos == null ? null : new TreeSet(diasSemMovimentos)); - - if (lsConferencias.contains(conferenciaComissao)) { - conferenciaComissao = lsConferencias.get(lsConferencias.indexOf(conferenciaComissao)); - } - - if (conferencia.getDatamovimento() != null) { - Integer dia = Integer.valueOf(DateUtil.getStringDate(conferencia.getDatamovimento(), "dd")); - if (conferenciaComissao.getDiasSemMovimentos() != null && conferenciaComissao.getDiasSemMovimentos().contains(dia)) { - - DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO(); - diaConferenciaComissao.setConferenciaId(conferencia.getConferenciaId()); - diaConferenciaComissao.setDia(dia); - if (competencia != null) { - diaConferenciaComissao.setData(DateUtil.getDateFromString(dia + "/" + competencia, "dd/MM/yyyy")); - } else { - diaConferenciaComissao.setData(dataMovimento); - } - diaConferenciaComissao.setIndboletogerado(conferencia.getIndboletogerado()); - diaConferenciaComissao.setIndconferido(conferencia.getIndconferido()); - diaConferenciaComissao.setIndmaloterecebido(conferencia.getIndmaloterecebido()); - diaConferenciaComissao.setIndpendencia(conferencia.getIndpendencia()); - diaConferenciaComissao.setIndsemmovimento(conferencia.getIndsemmovimento()); - - if (conferenciaComissao.getDias() == null) { - conferenciaComissao.setDias(new ArrayList()); - } - - conferenciaComissao.getDias().add(diaConferenciaComissao); - conferenciaComissao.getDiasSemMovimentos().remove(diaConferenciaComissao.getDia()); - } - } - - if (!lsConferencias.contains(conferenciaComissao)) { - lsConferencias.add(conferenciaComissao); - } - } - } - } - - private void carregarDiasSemMovimento(List lsConferencias, - String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws ParseException { - for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) { - for (Integer diaSemMovimento : conferenciaComissao.getDiasSemMovimentos()) { - DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO(); - diaConferenciaComissao.setDia(diaSemMovimento); - if (competencia == null && diaSemMovimento != null) { - diaConferenciaComissao.setData(dataMovimento); - } else { - diaConferenciaComissao.setData(DateUtil.getDateFromString(diaSemMovimento + "/" + competencia, "dd/MM/yyyy")); - } - diaConferenciaComissao.setIndsemmovimento(true); - - if (conferenciaComissao.getDias() == null) { - conferenciaComissao.setDias(new ArrayList()); - } - conferenciaComissao.getDias().add(diaConferenciaComissao); - } - conferenciaComissao.getDiasSemMovimentos().clear(); - } - } - - private Map carregarParametros(Date dataInicial, Date dataFinal, String competencia, Empresa empresa, - PuntoVenta puntoVenta, Date datamovimento, boolean formatoDataSemHora) throws ParseException { - Map parametros = new HashMap(); - - String formatoData = (formatoDataSemHora ? "dd/MM/yyyy" : "dd/MM/yyyy HH:mm"); - - if (empresa != null) { - parametros.put("empresaId", empresa.getEmpresaId()); - } - if (puntoVenta != null && puntoVenta.getPuntoventaId() > -1) { - parametros.put("puntoventaId", puntoVenta.getPuntoventaId()); - } - - if (datamovimento != null) { - parametros.put("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(datamovimento), formatoData)); - parametros.put("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(datamovimento), formatoData)); - } - - if (StringUtils.isNotBlank(competencia) && datamovimento == null) { - parametros.put("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(DateUtil.getDataInicialCompetencia(competencia)), formatoData)); - parametros.put("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(DateUtil.getDataFinalCompetencia(competencia)), formatoData)); - } - - if (parametros.get("dataInicial") == null && dataInicial != null) { - parametros.put("dataInicial", DateUtil.getStringDate(dataInicial, formatoData)); - parametros.put("dataFinal", DateUtil.getStringDate(dataFinal, formatoData)); - } - - return parametros; - } - - @Override - @Transactional - public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException { - try { - conferencia.setIndmaloterecebido(Boolean.TRUE); - if (conferencia.isSemPendenciaConferencia()) { - return encerrarMovimentoDiario(conferencia); - } - return suscribirOrActualizacion(conferencia); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - @Transactional - public Conferencia cancelarChegadaMalote(Conferencia conferencia) { - conferencia.setIndmaloterecebido(Boolean.FALSE); - return suscribirOrActualizacion(conferencia); - } - - @Override - @Transactional - public Conferencia suscribirOrActualizacion(Conferencia entidad) { - if (entidad.getConferenciaId() == null) { - return suscribir(entidad); - } else { - return actualizacion(entidad); - } - } - - @Override - @Transactional - public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException { - try { - conferencia.setIndconferido(Boolean.TRUE); - conferencia.setIndpendencia(isMovimentoDiarioPendencia(conferencia)); - conferencia.setIndboletogerado(isMovimentoDiarioBoletoGerado(conferencia)); - - gerarLancamentoContaCorrente(conferencia); - return suscribirOrActualizacion(conferencia); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - @Transactional - public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException { - try { - conferencia.setIndconferido(Boolean.FALSE); - return suscribirOrActualizacion(conferencia); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - private boolean isMovimentoDiarioBoletoGerado(Conferencia conferencia) - throws BusinessException { - try { - Map parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), conferencia.getPuntoVenta(), null, false); - StringBuilder sQuery = new StringBuilder() - .append("SELECT FECHAMENTOCNTCORRENTE_ID ") - .append("FROM FECHAMENTO_CNTCORRENTE ") - .append("WHERE ACTIVO = 1 ") - .append("AND :datamovimento BETWEEN FECINIFECHAMENTO AND FECFINFECHAMENTO "); - - parametros.put("datamovimento", conferencia.getDatamovimento()); - if (parametros.containsKey("empresaId")) { - sQuery.append("AND EMPRESA_ID = :empresaId "); - } - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND PUNTOVENTA_ID = :puntoventaId "); - } - - Query qr = getSession().createSQLQuery(sQuery.toString()); - setParametros(qr, parametros); - - return !qr.list().isEmpty(); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - private boolean isMovimentoDiarioPendencia(Conferencia conferencia) { - Query qr = getSession().createQuery( - "SELECT COUNT(log) FROM LogConferencia log WHERE log.activo = 1 AND log.conferencia.conferenciaId = :conferenciaId AND log.status = :status"); - qr.setParameter("conferenciaId", conferencia.getConferenciaId()); - qr.setParameter("status", StatusLogConferencia.PENDENCIA); - return !qr.list().isEmpty() && ((Long) qr.list().get(0)) > 0; - } - - @Override - public List carregarEventosFinanceiros(Conferencia conferencia) - throws BusinessException { - Connection con = null; - NamedParameterStatement npst = null; - ResultSet rSet = null; - - try { - Map parametros = carregarParametros(conferencia.getDataInicial(), conferencia.getDataFinal(), conferencia.getCompetencia(), conferencia.getEmpresa(), - conferencia.getPuntoVenta(), conferencia.getDatamovimento(), true); - StringBuilder sQuery = new StringBuilder() - .append("SELECT DISTINCT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ") - .append("CFP.IMPORTE AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ") - .append("NVL(LOG.STATUS,-1) AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ") - .append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.CONFERENCIA_ID AS \"logconferenciaId\", ") - .append("COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMTEE.COMEMPTIPOEVENTOEXTRA_ID AS \"comemptipoeventoextraId\", ") - .append("COALESCE(CEC.INDTIPO_DEB_CRED, 0) AS \"tipoeventoextradebcred\", ") - .append("CEC.INDEVENTOSFINANCEIROS AS \"exigeConferenciaAba\", B.NUMFOLIOSISTEMA \"numFolioSistema\", ") - .append("TEE.CVETIPOEVENTO AS \"cvetipoevento\", CD.FECCORTE AS \"feccorte\", ") - .append("EI.ICMS as \"icmsBase\", NVL(EST.ESTADO_ID,0) as \"estadoId\", CD.CAJADIVERSOS_ID as cajaDiversosId, U.USUARIO_ID as usuarioId, ") - .append("CD.TURNO_ID as turnoId ") - .append("FROM EVENTO_EXTRA EE ") - .append("JOIN TIPO_EVENTO_EXTRA TEE ON EE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID ") - .append("JOIN CAJA_DIVERSOS CD ON CD.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ") - .append("JOIN CAJA_DIVERSOS_PAGO CFP ON CFP.CAJADIVERSOS_ID = CD.CAJADIVERSOS_ID ") - .append("JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID ") - .append("INNER JOIN USUARIO U ON EE.USUARIO_ID = U.USUARIO_ID ") - .append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON EE.EMPRESA_ID = CEC.EMPRESA_ID AND CEC.ACTIVO = 1 ") - .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID AND LOG.ACTIVO = 1 ") - .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = EE.EMPRESA_ID AND COMFP.ACTIVO = 1 ") - .append("LEFT JOIN COM_EMP_TIPOEVENTOEXTRA COMTEE ON COMTEE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID AND COMTEE.EMPRESA_ID = EE.EMPRESA_ID AND COMTEE.ACTIVO = 1 ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = EE.BOLETO_ID ") - .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") - .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ") - .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ") - .append("LEFT JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") - .append("LEFT JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") - .append("LEFT JOIN EMPRESA_IMPOSTO EI ON (EI.ESTADO_ID = EST.ESTADO_ID AND EI.EMPRESA_ID = E.EMPRESA_ID AND EI.ACTIVO = 1) ") - .append("WHERE EE.ACTIVO = 1 ") - .append("AND CD.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') "); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND EE.EMPRESA_ID = :empresaId "); - } - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND CD.PUNTOVENTA_ID = :puntoventaId "); - } - sQuery.append("ORDER BY TEE.DESCTIPOEVENTO "); - - con = getConnection(); - npst = new NamedParameterStatement(con, sQuery.toString()); - setParametros(npst, parametros); - rSet = npst.executeQuery(); - - List result = new ArrayList(); - while(rSet.next()) { - EventosFinanceirosVO eventosFinanceiros = new EventosFinanceirosVO(rSet.getLong("eventoextraId"), rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : 0); - eventosFinanceiros.setBoletoId(rSet.getLong("boletoId") > 0 ? rSet.getLong("boletoId") : null); - eventosFinanceiros.setNumdocumento(rSet.getString("numdocumento")); - eventosFinanceiros.setImpingreso(rSet.getBigDecimal("impingreso")); - eventosFinanceiros.setDesctipoevento(rSet.getString("desctipoevento")); - eventosFinanceiros.setDescinfo(rSet.getString("descinfo")); - eventosFinanceiros.setStatus(rSet.getInt("status") >= 0 ? rSet.getInt("status") : null); - eventosFinanceiros.setFormapagoId(rSet.getInt("formapagoId") > 0 ? rSet.getInt("formapagoId") : null); - eventosFinanceiros.setDescpago(rSet.getString("descpago")); - eventosFinanceiros.setComempformapagoId(rSet.getInt("comempformapagoId") > 0 ? rSet.getInt("comempformapagoId") : null); - eventosFinanceiros.setComemptipoeventoextraId(rSet.getInt("comemptipoeventoextraId") > 0 ? rSet.getInt("comemptipoeventoextraId") : null); - eventosFinanceiros.setTipoeventoextradebcred(rSet.getInt("tipoeventoextradebcred") > 0 ? rSet.getInt("tipoeventoextradebcred") : null); - eventosFinanceiros.setIndtipo(rSet.getString("indtipo")); - eventosFinanceiros.setNombusuario(rSet.getString("nombusuario")); - eventosFinanceiros.setExigeConferenciaAba(rSet.getBoolean("exigeConferenciaAba")); - eventosFinanceiros.setNumFolioSistema(rSet.getString("numFolioSistema")); - eventosFinanceiros.setCvetipoevento(rSet.getString("cvetipoevento")); - eventosFinanceiros.setFeccorte(rSet.getDate("feccorte")); - eventosFinanceiros.setIcmsBase(rSet.getBigDecimal("icmsBase")); - eventosFinanceiros.setEstadoId(rSet.getInt("estadoId") > 0 ? rSet.getInt("estadoId") : null); - eventosFinanceiros.setCajaDiversosId(rSet.getLong("cajaDiversosId")); - eventosFinanceiros.setUsuarioId(rSet.getInt("usuarioId")); - eventosFinanceiros.setTurnoId(rSet.getInt("turnoId")); - - eventosFinanceiros.setConferencia(conferencia); - - - if (result.contains(eventosFinanceiros)) { - int indice = result.indexOf(eventosFinanceiros); - EventosFinanceirosVO aux = result.get(indice); - FormaPagoEventosFinanceirosVO formapagoVO = new FormaPagoEventosFinanceirosVO(eventosFinanceiros.getFormapagoId(),eventosFinanceiros.getDescpago(),eventosFinanceiros.getImpingreso()); - aux.getFormapagos().add(formapagoVO); - result.set(indice, aux); - }else { - eventosFinanceiros.setFormapagos(new ArrayList()); - eventosFinanceiros.getFormapagos().add(new FormaPagoEventosFinanceirosVO(eventosFinanceiros.getFormapagoId(),eventosFinanceiros.getDescpago(),eventosFinanceiros.getImpingreso())); - result.add(eventosFinanceiros); - } - - } - - return result; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } finally { - try { - if(rSet != null && !rSet.isClosed()) { - rSet.close(); - } - if(npst != null && !npst.isClosed()) { - npst.close(); - } - if(con != null && !con.isClosed()) { - con.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - @SuppressWarnings("unchecked") - public List carregarLogConferencia(Conferencia conferencia) - throws BusinessException { - try { - if (conferencia != null && conferencia.getConferenciaId() != null) { - StringBuilder sQuery = new StringBuilder() - .append("SELECT LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", LOG.OBSERVACAO AS \"observacao\", LOG.PRECO AS \"preco\", ") - .append("LOG.STATUS AS \"status\", NVL(B.NUMFOLIOSISTEMA,C.NUMFOLIOSISTEMA) AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ") - .append("O.NUMOPERACION AS \"numoperacion\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", U.NOMBUSUARIO AS \"nombusuario\", ") - .append("LOG.FECMODIF AS \"fecmodif\", LOG.INDCREDITO AS \"indcredito\", B.BOLETO_ID AS \"boletoId\", O.OCD_ID AS \"ocdId\", ") - .append("EE.EVENTOEXTRA_ID AS \"eventoextraId\", TI.DESCTIPO AS \"desctipoinformativo\", LOG.CONFERENCIAPENDENCIA_ID as \"pendenciaId\", ") - .append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\", C.CAJA_ID AS \"cajaId\" ") - .append("FROM LOG_CONFERENCIA LOG ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ") - .append("LEFT JOIN CAJA C ON C.CAJA_ID = LOG.CAJA_ID ") - .append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ") - .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") - .append("LEFT JOIN OCD O ON O.OCD_ID = LOG.OCD_ID ") - .append("LEFT JOIN TIPO_INFORMATIVO TI ON TI.TIPOINFORMATIVO_ID = LOG.TIPOINFORMATIVOCOMISSAO_ID ") - .append("LEFT JOIN CONFERENCIA_PENDENCIA CP ON CP.CONFERENCIAPENDENCIA_ID = LOG.CONFERENCIAPENDENCIA_ID ") - .append("JOIN USUARIO U ON U.USUARIO_ID = LOG.USUARIO_ID ") - .append("WHERE LOG.ACTIVO = 1 ") - .append("AND LOG.CONFERENCIA_ID = :conferenciaId ORDER BY LOGCONFERENCIA_ID"); - - @SuppressWarnings("deprecation") - Query qr = getSession().createSQLQuery(sQuery.toString()) - .addScalar("logconferenciaId", Hibernate.LONG) - .addScalar("observacao", Hibernate.STRING) - .addScalar("preco", Hibernate.BIG_DECIMAL) - .addScalar("descComportamentoData", Hibernate.STRING) - .addScalar("status", Hibernate.INTEGER) - .addScalar("numfoliosistema", Hibernate.STRING) - .addScalar("tipo", Hibernate.INTEGER) - .addScalar("numoperacion", Hibernate.STRING) - .addScalar("desctipoevento", Hibernate.STRING) - .addScalar("nombusuario", Hibernate.STRING) - .addScalar("fecmodif", Hibernate.TIMESTAMP) - .addScalar("indcredito", Hibernate.SHORT) - .addScalar("boletoId", Hibernate.LONG) - .addScalar("ocdId", Hibernate.LONG) - .addScalar("eventoextraId", Hibernate.LONG) - .addScalar("desctipoinformativo", Hibernate.STRING) - .addScalar("descpendencia", Hibernate.STRING) - .addScalar("cajaId", Hibernate.LONG) - .addScalar("pendenciaId", Hibernate.INTEGER) - .setResultTransformer(Transformers.aliasToBean(LogConferenciaVO.class)); - qr.setParameter("conferenciaId", conferencia.getConferenciaId()); - - List result = qr.list(); - - for (LogConferenciaVO l : result) { - l.setConferencia(conferencia); - } - - return result; - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - - return new ArrayList(); - } - - @Override - @Transactional - public LogConferencia suscribirLogConferencia(LogConferencia logConferencia) - throws BusinessException { - try { - logConferencia.setActivo(Boolean.TRUE); - logConferencia.setUsuario(UsuarioLogado.getUsuarioLogado()); - logConferencia.setFecmodif(new Date()); - - if (logConferencia.getConferencia().getConferenciaId() == null) { - logConferencia.setConferencia(suscribir(logConferencia.getConferencia())); - } - - getSession().save(logConferencia); - return logConferencia; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - @Transactional - public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException { - try { - if(logConferencia == null) { - return; - } - - if (logConferencia.getContaCorrentePtoVta() != null) { - ContaCorrentePtoVta contaCorrentePtoVta = logConferencia.getContaCorrentePtoVta(); - contaCorrentePtoVta.setActivo(Boolean.FALSE); - contaCorrentePtoVta.setFecmodif(logConferencia.getFecmodif()); - contaCorrentePtoVta.setUsuario(logConferencia.getUsuario()); - - contaCorrenteAgenciaDAO.actualizacion(contaCorrentePtoVta); - } - - logConferencia.setActivo(Boolean.FALSE); - logConferencia.setUsuario(UsuarioLogado.getUsuarioLogado()); - logConferencia.setFecmodif(new Date()); - - getSession().merge(logConferencia); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public LogConferencia obtenerLogConferenciaID(Long logconferenciaId) { - try { - return (LogConferencia) this.getHibernateTemplate().get(LogConferencia.class.getName(), logconferenciaId); - } catch (final HibernateException ex) { - throw convertHibernateAccessException(ex); - } - } - - @Override - public List carregarBilhetesComissao(Conferencia conferencia, boolean isCalculoComissao, boolean isConsideraBilhetesDevolvidosEmOutraAgencia) - throws BusinessException { - - Connection con = null; - NamedParameterStatement npst = null; - ResultSet rSet = null; - - try { - Map parametros = carregarParametros(conferencia.getDataInicial(), conferencia.getDataFinal(), conferencia.getCompetencia(), conferencia.getEmpresa(), - conferencia.getPuntoVenta(), conferencia.getDatamovimento(), true); - - StringBuilder sQuery = new StringBuilder() - .append("SELECT DISTINCT C.CAJA_ID AS \"cajaId\", C.NUMASIENTO AS \"numAsiento\", C.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", C.NUMOPERACION AS \"numoperacion\", C.NUMFOLIOSISTEMA AS \"numFolioSistema\", ") - .append("C.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", C.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ") - .append("NVL(C.PRECIOBASE,0) AS \"valorbase\", NVL(C.PRECIOPAGADO,0) AS \"valorpagado\", NVL(C.IMPORTEOUTROS,0) AS \"seguroOutros\", NVL(C.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(C.IMPORTESEGURO,0) AS \"seguro\", ") - .append("NVL(C.IMPORTETAXAEMBARQUE,0) AS \"embarque\", C.TIPOVENTA_ID AS \"tipoVenta\", C.INDSTATUSBOLETO AS \"indstatusboleto\", NVL(LOG.STATUS,-1) AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", ") - .append("FP.DESCPAGO AS \"descpago\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", MC.DESCMOTIVO AS \"descmotivocancelacion\", U.NOMBUSUARIO AS \"nombusuario\", C.MOTIVOCANCELACION_ID AS \"motivocancelacionId\", ") - .append("CF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", ") - .append("(select max(COMEMPCATEGORIA_ID) from COM_EMP_CATEGORIA where CATEGORIA_ID = C.CATEGORIA_ID AND EMPRESA_ID = M.EMPRESA_ID AND ACTIVO = 1) AS \"comempcategoriaId\", C.NOMBPASAJERO AS \"nombpasajero\", ") - .append("E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", C.FECCORRIDA AS \"feccorrida\", C.CORRIDA_ID \"corridaId\", ") - .append("case when t.tarifa_id is not null then nvl(t.precio, 0) + nvl(t.importepedagio, 0) + nvl(t.importetaxaembarque, 0) + nvl(t.importeseguro, 0) + nvl ") - .append("(t.importeoutros, 0) else nvl(c.preciobase,0) + nvl(c.importepedagio, 0) + nvl(c.importetaxaembarque, 0) + nvl(c.importeseguro, 0) + nvl ") - .append("(c.importeoutros, 0) end AS \"valorTabela\"," ) - .append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\", C.FECCORTE AS \"feccorte\", C.TRANSACAOORIGINAL_ID AS \"transacaoOriginalId\", ") - .append("EI.ICMS as \"icmsBase\", EST.ESTADO_ID as \"estadoId\", ") - .append("CASE WHEN C.PTOVTAVENTA_ID = :puntoventaId OR C.PTOVTAVENTA_ID IS NULL THEN 1 ELSE 0 END AS ptoVtaOrigem, ") - .append("M.EMPRESA_ID AS empresaId, C.TRANSACAO_ID AS \"transacaoId\", ") - .append("CASE WHEN LOG.CONFERENCIA_ID IS NOT NULL OR ") - .append(" (C.INDSTATUSBOLETO = 'E' ") - .append(" AND LOG.LOGCONFERENCIA_ID IS NULL ") - .append(" AND (SELECT LC.LOGCONFERENCIA_ID FROM LOG_CONFERENCIA LC ") - .append(" WHERE LC.ACTIVO = 1 ") - .append(" AND LC.TRANSACAOORIGINAL_ID = C.TRANSACAOORIGINAL_ID ") - .append(" AND LC.LOGCONFERENCIA_ID <> LOG.LOGCONFERENCIA_ID) IS NOT NULL) ") - .append(" THEN 1 ELSE 0 END AS \"conferidoEntrega\", ") - .append("C.PTOVTAVENTA_ID AS ptovtaventaId, ") - .append("C.PUNTOVENTA_ID AS puntoventaId ") - .append(", CF.cajaformapago_id, U.USUARIO_ID usuarioId, C.TURNO_ID as turnoId ") //Mantis 17018 - .append("FROM CAJA C ") - .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ") - .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ") - .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ") - .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ") - .append("LEFT JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA AND CT.ORIGEN_ID = C.ORIGEN_ID AND CT.DESTINO_ID = C.DESTINO_ID ") - .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ") - .append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = C.MOTIVOCANCELACION_ID ") - .append("INNER JOIN CAJA_FORMAPAGO CF ON CF.CAJA_ID = C.CAJA_ID ") - .append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CF.FORMAPAGO_ID ") - .append("INNER JOIN USUARIO U ON C.USUARIO_ID = U.USUARIO_ID ") - .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ") - .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") - .append("LEFT JOIN EMPRESA_IMPOSTO EI ON (EI.ESTADO_ID = EST.ESTADO_ID AND EI.EMPRESA_ID = E.EMPRESA_ID AND EI.ACTIVO = 1) ") - .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ") - .append("LEFT JOIN TARIFA T ON (T.DESTINO_ID = C.DESTINO_ID AND T.CLASESERVICIO_ID = C.CLASESERVICIO_ID AND T.MARCA_ID = M.MARCA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.RUTA_ID = C.RUTA_ID and T.ACTIVO = 1 and (ct.tramo_id = t.tramo_id)) ") - .append("LEFT JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID ) ") - .append("WHERE C.ACTIVO = 1 AND (T.TARIFA_ID IS NULL OR (T.TARIFA_ID IS NOT NULL AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA)) ") - .append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ") - .append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = :motivoCancelacionGeracaoOcd) "); - parametros.put("motivoCancelacionGeracaoOcd", Constantes.MVO_CANCEL_GERACAO_OCD.intValue()); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND M.EMPRESA_ID = :empresaId "); - } - - if (parametros.containsKey("puntoventaId")) { - if (isCalculoComissao && isConsideraBilhetesDevolvidosEmOutraAgencia){ - String sMotivosCancelacion = Arrays.asList( - Constantes.MVO_CANCEL_DEVOLUCAO.intValue(), - Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_100.intValue(), - Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_50.intValue(), - Constantes.MVO_CANCEL_CANCELACION.intValue(), - Constantes.MVO_CANCEL_GERACAO_OCD.intValue(), - Constantes.MVO_CANCEL_TROCA.intValue(), - Constantes.MVO_CANCEL_TRANSFERENCIA.intValue() - ).toString().replaceAll("[\\[\\]]", ""); - - sQuery.append("AND ( ") - /* Filtra pela agencias, com a operação feita na agencia ou que tenha origem na agencia de filtro */ - .append(" ( ") - .append(" ((C.PUNTOVENTA_ID = :puntoventaId AND C.PTOVTAVENTA_ID IS NULL) OR C.PTOVTAVENTA_ID = :puntoventaId) ") - .append(" AND ") - /* Filtro os não cancelados e os cancelados conforme lista de motivos de cancelamentos aceitos */ - .append(" ( ") - .append(" C.MOTIVOCANCELACION_ID IS NULL ") - .append(" OR ") - .append(" C.MOTIVOCANCELACION_ID IN (").append(sMotivosCancelacion).append(") ") - .append(" ) ") - .append(" ) ") - /* Carrega os bilhetes entregues na agencia */ - .append(" OR ") - .append(" (C.PUNTOVENTA_ID = :puntoventaId AND C.INDSTATUSBOLETO = 'E' AND C.MOTIVOCANCELACION_ID IS NULL) ") - .append(" ) "); - }else{ - sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId "); - } - } - if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) { - sQuery.append("AND C.NUMFOLIOSISTEMA = :numfoliosistema "); - parametros.put("numfoliosistema", conferencia.getNumfoliosistema()); - } - sQuery.append("ORDER BY C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.CAJA_ID "); - - con = getConnection(); - npst = new NamedParameterStatement(con, sQuery.toString()); - setParametros(npst, parametros); - npst.setFetchSize(100); - rSet = npst.executeQuery(); - - List lsBoletoComissao = new ArrayList(); - while(rSet.next()) { - BoletoComissao boletoComissao = new BoletoComissao(); - boletoComissao.setCajaId(rSet.getLong("cajaId")); - boletoComissao.setTransacaoOriginalId(rSet.getLong("transacaoOriginalId") > 0 ? rSet.getLong("transacaoOriginalId") : null ); - boletoComissao.setNumAsiento(rSet.getString("numAsiento")); - boletoComissao.setNumAsientoVinculado(rSet.getString("numAsientoVinculado")); - boletoComissao.setNumFolioSistema(rSet.getString("numFolioSistema")); - boletoComissao.setNumSeriePreimpresa(rSet.getString("numSeriePreimpresa")); - boletoComissao.setNumFolioPreImpreso(rSet.getString("numFolioPreImpreso")); - boletoComissao.setUf(rSet.getString("uf")); - boletoComissao.setDesccategoria(rSet.getString("desccategoria")); - boletoComissao.setValorpagado(rSet.getBigDecimal("valorpagado")); - boletoComissao.setValorTabela(rSet.getBigDecimal("valorTabela")); - boletoComissao.setSeguroOutros(rSet.getBigDecimal("seguroOutros")); - boletoComissao.setPedagio(rSet.getBigDecimal("pedagio")); - boletoComissao.setEmbarque(rSet.getBigDecimal("embarque")); - boletoComissao.setSeguro(rSet.getBigDecimal("seguro")); - boletoComissao.setTipoVenta(rSet.getInt("tipoVenta")); - boletoComissao.setIndstatusboleto(rSet.getString("indstatusboleto")); - boletoComissao.setStatus(rSet.getInt("status") >= 0 ? rSet.getInt("status") : null); - boletoComissao.setFormapagoId(rSet.getInt("formapagoId") > 0 ? rSet.getInt("formapagoId") : null); - boletoComissao.setDescpago(rSet.getString("descpago")); - boletoComissao.setLogconferenciaId(rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : null); - boletoComissao.setDescmotivocancelacion(rSet.getString("descmotivocancelacion")); - boletoComissao.setNombusuario(rSet.getString("nombusuario")); - boletoComissao.setMotivoCancelacionId(rSet.getInt("motivoCancelacionId") > 0 ? rSet.getInt("motivoCancelacionId") : null); - boletoComissao.setImporteFp(rSet.getBigDecimal("importeFp")); - boletoComissao.setComempformapagoId(rSet.getInt("comempformapagoId") > 0 ? rSet.getInt("comempformapagoId") : null); - boletoComissao.setComempcategoriaId(rSet.getInt("comempcategoriaId") > 0 ? rSet.getInt("comempcategoriaId") : null); - boletoComissao.setNumoperacion(rSet.getString("numoperacion")); - boletoComissao.setNombpasajero(rSet.getString("nombpasajero")); - boletoComissao.setIndcarboletosdevolvidosconf(rSet.getBoolean("indcarboletosdevolvidosconf")); - boletoComissao.setFeccorrida(rSet.getDate("feccorrida")); - boletoComissao.setCorridaId(rSet.getInt("corridaId") > 0 ? rSet.getInt("corridaId") : null); - boletoComissao.setIndCancelacion(rSet.getBoolean("indCancelacion")); - boletoComissao.setIndreimpresion(rSet.getBoolean("indreimpresion")); - boletoComissao.setFeccorte(rSet.getDate("feccorte")); - boletoComissao.setIcmsBase(rSet.getBigDecimal("icmsBase")); - boletoComissao.setEstadoId(rSet.getInt("estadoId") > 0 ? rSet.getInt("estadoId") : null); - boletoComissao.setPtoVtaOrigem(rSet.getBoolean("ptoVtaOrigem")); - boletoComissao.setValorbase(rSet.getBigDecimal("valorbase")); - boletoComissao.setEmpresaId(rSet.getInt("empresaId")); - boletoComissao.setTransacaoId(rSet.getLong("transacaoId") > 0 ? rSet.getLong("transacaoId") : null); - boletoComissao.setPtovtaventaId(rSet.getInt("ptovtaventaId")); - boletoComissao.setPuntoVentaId(rSet.getInt("puntoventaId")); - boletoComissao.setConferidoEntrega(rSet.getBoolean("conferidoEntrega")); - boletoComissao.setUsuarioId(rSet.getInt("usuarioId")); - boletoComissao.setTurnoId(rSet.getInt("turnoId")); - - if(boletoComissao.getStatus() == null && boletoComissao.getConferidoEntrega() != null && boletoComissao.getConferidoEntrega()) { - boletoComissao.setConferido(true); - boletoComissao.setStatus(StatusLogConferencia.CONFERIDO.getValue()); - } - - if (boletoComissao.getFormapagos() == null) { - boletoComissao.setFormapagos(new ArrayList()); - boletoComissao.setConferencia(conferencia); - } - if(boletoComissao.getImporteFp() == null){ - boletoComissao.setImporteFp(BigDecimal.ZERO); - } - - if (lsBoletoComissao.contains(boletoComissao)) { - int indice = lsBoletoComissao.indexOf(boletoComissao); - BoletoComissao aux = lsBoletoComissao.get(indice); - aux.setComempcategoriaId(boletoComissao.getComempcategoriaId() != null - ? boletoComissao.getComempcategoriaId() : aux.getComempcategoriaId()); - aux.setComempformapagoId(boletoComissao.getComempformapagoId() != null - ? boletoComissao.getComempformapagoId() : aux.getComempformapagoId()); - - FormapagoVO formapagoVO = new FormapagoVO(boletoComissao.getFormapagoId(), - boletoComissao.getDescpago(), - boletoComissao.getIndconferenciafisicacomissao(), - boletoComissao.getImporteFp()); - - if (aux.getFormapagos().contains(formapagoVO)) { - formapagoVO = aux.getFormapagos().get(aux.getFormapagos().indexOf(formapagoVO)); - formapagoVO.add(boletoComissao.getImporteFp()); - } else { - aux.getFormapagos().add(formapagoVO); - } - lsBoletoComissao.set(indice, aux); - } else { - boletoComissao.getFormapagos().add(new FormapagoVO(boletoComissao.getFormapagoId(), - boletoComissao.getDescpago(), - boletoComissao.getIndconferenciafisicacomissao(), - boletoComissao.getImporteFp())); - lsBoletoComissao.add(boletoComissao); - } - } - - return lsBoletoComissao; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } finally { - try { - if(rSet != null && !rSet.isClosed()) { - rSet.close(); - } - if(npst != null && !npst.isClosed()) { - npst.close(); - } - if(con != null && !con.isClosed()) { - con.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public List carregarOcds(Conferencia conferencia) throws BusinessException { - - Connection con = null; - NamedParameterStatement npst = null; - ResultSet rSet = null; - - try { - Map parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), - conferencia.getPuntoVenta(), conferencia.getDatamovimento(), false); - - StringBuilder sQuery = new StringBuilder() - .append("SELECT DISTINCT O.OCD_ID AS \"ocdId\", O.NUMOPERACION AS \"numoperacion\", O.FECINC AS \"fecinc\", O.FECPAGAR AS \"fecpagar\", O.FECPAGO AS \"fecpago\", ") - .append("O.INDPAGO AS \"indpago\", O.VALOR_PAGAR AS \"valorPagar\", (B.PRECIOPAGADO * (O.PENALIZACION / 100)) AS \"penalizacion\", NVL(LOG.STATUS,-1) AS \"status\", ") - .append("U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", U.CVEUSUARIO AS \"login\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", ") - .append("CEC.INDOCD AS \"exigeConferenciaAba\" ") - .append("FROM OCD O ") - .append("INNER JOIN BOLETO B ON B.BOLETO_ID = O.BOLETO_ID ") - .append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") - .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID AND LOG.ACTIVO = 1 ") - .append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ") - .append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = M.EMPRESA_ID AND CEC.ACTIVO = 1 ") - .append("INNER JOIN MARCA ON m.MARCA_ID = b.MARCA_ID ") - .append("WHERE O.ACTIVO = 1 ") - .append("AND O.FECPAGO BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ") - .append("AND O.INDPAGO = 1 "); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND ((B.EMPRESACORRIDA_ID IS NOT NULL AND B.EMPRESACORRIDA_ID = :empresaId) OR(m.EMPRESA_ID = :empresaId)) "); - } - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND O.PUNTOVENTAPAGO_ID = :puntoventaId "); - } - - con = getConnection(); - npst = new NamedParameterStatement(con, sQuery.toString()); - setParametros(npst, parametros); - rSet = npst.executeQuery(); - - List result = new ArrayList(); - while(rSet.next()) { - OcdVO ocd = new OcdVO(); - ocd.setOcdId(rSet.getLong("ocdId")); - ocd.setNumoperacion(rSet.getString("numoperacion")); - ocd.setFecinc(rSet.getDate("fecinc")); - ocd.setFecpagar(rSet.getDate("fecpagar")); - ocd.setFecpago(rSet.getDate("fecpago")); - ocd.setIndpago(rSet.getBoolean("indpago")); - ocd.setValorPagar(rSet.getBigDecimal("valorPagar")); - ocd.setPenalizacion(rSet.getBigDecimal("penalizacion")); - ocd.setStatus(rSet.getInt("status") >= 0 ? rSet.getInt("status") : null); - ocd.setLogconferenciaId(rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : null); - ocd.setLogin(rSet.getString("login")); - ocd.setNombusuario(rSet.getString("nombusuario")); - ocd.setNumFolioSistema(rSet.getString("numFolioSistema")); - ocd.setExigeConferenciaAba(rSet.getBoolean("exigeConferenciaAba")); - ocd.setConferencia(conferencia); - - result.add(ocd); - } - - return result; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } finally { - try { - if(rSet != null && !rSet.isClosed()) { - rSet.close(); - } - if(npst != null && !npst.isClosed()) { - npst.close(); - } - if(con != null && !con.isClosed()) { - con.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, - Integer empresaId) throws BusinessException { - try { - StringBuilder sQuery = new StringBuilder() - .append("SELECT co ").append("FROM Conferencia co ") - .append("WHERE co.activo = 1 ").append("AND co.datamovimento = :datamovimento ") - .append("AND co.empresa.empresaId = :empresaId ") - .append("AND co.puntoVenta.puntoventaId = :puntoventaId "); - - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("datamovimento", datamovimento); - qr.setParameter("empresaId", empresaId); - qr.setParameter("puntoventaId", puntoventaId); - qr.setMaxResults(1); - return (Conferencia) qr.uniqueResult(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Transactional - private void gerarLancamentoContaCorrente(Conferencia conferencia) throws BusinessException { - try { - - Calendar calHoje = Calendar.getInstance(); - Calendar calAmanha = Calendar.getInstance(); - - calAmanha.add(Calendar.DAY_OF_MONTH, 1); - - List lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId()); - String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy"); - String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento; - - for (LogConferencia logConferencia : lsLogConferencia) { - Calendar cal = calHoje; - - if (!Boolean.TRUE.equals(logConferencia.getIndmesmodia())) { - cal = calAmanha; - } - - if (logConferencia.getStatus().equals(StatusLogConferencia.CONFERIDO) - || ((logConferencia.getContaCorrentePtoVta() != null - && logConferencia.getContaCorrentePtoVta().getActivo() != null - && logConferencia.getContaCorrentePtoVta().getActivo())) - || (logConferencia.getPreco() == null - || logConferencia.getPreco().doubleValue() == 0d) - || logConferencia.isIndcredito().equals((short) 2)) { - continue; - } - - ContaCorrentePtoVta contaCorrentePtoVta = contaCorrenteAgenciaDAO - .gravarContaCorrente(conferencia.getPuntoVenta().getPuntoventaId(), - descOperacion, DateUtil.normalizarToFecha(cal.getTime()), logConferencia.getUsuario().getUsuarioId(), - logConferencia.isIndcredito().equals((short) 1) ? Constantes.TIPO_OPERACION_CC_PAGO : Constantes.TIPO_OPERACION_CC_LQ, - conferencia.getEmpresa().getEmpresaId(), - Constantes.TURNO_AUTOMATICO, BigDecimal.ZERO, BigDecimal.ZERO, - BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, - BigDecimal.ZERO, BigDecimal.ZERO, logConferencia.getPreco(), false, - BigDecimal.ZERO, BigDecimal.ZERO, logConferencia.getPreco()); - - logConferencia.setContaCorrentePtoVta(contaCorrentePtoVta); - suscribirLogConferencia(logConferencia); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - @SuppressWarnings("unchecked") - public List carregarLogConferencia(Long conferenciaId) throws BusinessException { - try { - StringBuilder sQuery = new StringBuilder() - .append("SELECT log ") - .append("FROM LogConferencia log ") - .append("WHERE log.activo = 1 ") - .append("AND log.conferencia.conferenciaId = :conferenciaId "); - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("conferenciaId", conferenciaId); - return qr.list(); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, - PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException { - try { - List lsConferencias = new ArrayList(); - - carregarConferenciasRegistradas(lsConferencias, competencia, empresa, puntoVenta, null, null, null, null); - carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, null); - - for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) { - for (DiaConferenciaComissaoVO diaConferenciaComissao : conferenciaComissao.getDias()) { - if (!diaConferenciaComissao.getIndsemmovimento() && !diaConferenciaComissao.getIndconferido()) { - return false; - } - } - } - - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public BigDecimal carregarValorDepositoContaCorrente(Integer empresaId, Integer puntoventaId, Date datamovimento) { - StringBuilder sQuery = new StringBuilder() - .append("SELECT SUM(importeTotalEfectivo) ").append("FROM ContaCorrentePtoVta cc ") - .append("WHERE cc.activo = 1 ").append("AND cc.empresa.empresaId = :empresaId ") - .append("AND cc.puntoVenta.puntoventaId = :puntoventaId ") - .append("AND cc.fecHorOperacion = :datamovimento "); - - Query qr = getSession().createQuery(sQuery.toString()); - qr.setParameter("empresaId", empresaId); - qr.setParameter("puntoventaId", puntoventaId); - qr.setParameter("datamovimento", datamovimento); - qr.setMaxResults(1); - - return (BigDecimal) qr.uniqueResult(); - } - - @Override - @SuppressWarnings("unchecked") - public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, - Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { - try { - String competencia = DateUtil.getStringDate(datamovimento, "MM/yyyy"); - Map parametros = carregarParametros(null, null, competencia, empresa, puntoVenta, datamovimento, false); - StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co ") - .append("JOIN co.empresa em ").append("JOIN co.puntoVenta pv ") - .append("WHERE co.activo = 1 ") - .append("AND co.datamovimento BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') "); - - if (parametros.containsKey("empresaId")) { - sQuery.append("AND em.empresaId = :empresaId "); - } - if (parametros.containsKey("puntoventaId")) { - sQuery.append("AND pv.puntoventaId = :puntoventaId "); - } - - Query qr = getSession().createQuery(sQuery.toString()); - setParametros(qr, parametros); - - List lsConferenciaComissao = new ArrayList(); - processarQueryConferencia(qr.list(), lsConferenciaComissao, competencia, datamovimento, null, null); - - if (!lsConferenciaComissao.isEmpty()) { - for (DiaConferenciaComissaoVO diaConferenciaComissao : lsConferenciaComissao - .iterator().next().getDiasOrdenado()) { - if (diaConferenciaComissao.getData().equals(datamovimento)) { - return diaConferenciaComissao; - } - } - } - - return null; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - /** - * Recupera a conexão conforme parametrização em application.properties - * - * @return - * @throws SQLException - */ - public Connection getConnection() throws SQLException { - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_DATASOURCE_COMISSAO_BANCO_PRODUCAO.getDescricao())) { - return dataSource.getConnection(); - } else { - return dataSourceRead.getConnection(); - } - } - - @Override - public boolean isConferidoVenta(BoletoComissao boletoComissao) { - if(boletoComissao.getTransacaoOriginalId() == null ){ - return false; - } - - StringBuilder sql = new StringBuilder(); - - sql.append(" SELECT * FROM log_conferencia lc "); - sql.append(" WHERE lc.ACTIVO = 1 "); - sql.append(" AND lc.TRANSACAOORIGINAL_ID =:transacaoId "); - - Query qr = getSession().createSQLQuery(sql.toString()); - qr.setParameter("transacaoId", boletoComissao.getTransacaoOriginalId()); - - return !qr.list().isEmpty(); - - } - - @Override - @SuppressWarnings("unchecked") - @Transactional - public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException { - try { - StringBuilder sql = new StringBuilder(); - - sql.append("SELECT log ") - .append("FROM LogConferencia log ") - .append("WHERE log.activo = 1 ") - .append("AND log.transacaoOriginalId =:transacaoId "); - - Query qr = getSession().createQuery(sql.toString()); - qr.setParameter("transacaoId", transacaoId); - - List logConferencias = qr.list(); - for (LogConferencia logConferencia : logConferencias) { - borrarLogConferencia(logConferencia); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException { - try { - List lsConferencias = new ArrayList(); - - String competencia = DateUtil.getStringDate(dataInicial, "MM/yyyy"); - - carregarConferenciasRegistradas(lsConferencias, competencia, empresa, puntoVenta, null, dataInicial, dataFinal, null); - carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, null); - - for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) { - for (DiaConferenciaComissaoVO diaConferenciaComissao : conferenciaComissao.getDias()) { - if (DateUtil.compareOnlyDate(diaConferenciaComissao.getData(), dataInicial) >= 0 && - DateUtil.compareOnlyDate(diaConferenciaComissao.getData(), dataFinal) <= 0 && - !diaConferenciaComissao.getIndsemmovimento() && !diaConferenciaComissao.getIndconferido()) { - return false; - } - } - } - - return true; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public boolean isConfMovFPTrocaVlrDeposito(Empresa empresa) { - if(empresa == null || empresa.getEmpresaId() == null) { - return false; - } - - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT EMPRESA_ID ") - .append(" FROM EMPRESA ") - .append(" WHERE ACTIVO = 1 ") - .append(" AND INDCONFMOVFPTROCAVLRDEPOSITO = 1 ") - .append(" AND EMPRESA_ID = :empresaId "); - - Query qr = getSession().createSQLQuery(sql.toString()); - qr.setParameter("empresaId", empresa.getEmpresaId()); - - return !qr.list().isEmpty(); - } - - @Override - public BigDecimal getComissaoPuntoVenta(Integer puntoventaId, Integer empresaId, Date dataInicial, Date dataFinal) throws BusinessException { - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT SUM(importe) ") - .append(" FROM conta_corrente_ptovta ") - .append(" WHERE ACTIVO = 1 ") - .append(" AND EMPRESA_ID = :empresaId ") - .append(" AND PUNTOVENTA_ID = :puntoventaId ") - .append(" AND TIPOOPERACIONCC_ID = 5 ") - .append(" AND feccorte BETWEEN to_date(:dataInicial, 'DD/MM/YYYY') AND to_date(:dataFinal, 'DD/MM/YYYY') "); - - - Query qr = getSession().createSQLQuery(sql.toString()); - qr.setParameter("empresaId", empresaId); - qr.setParameter("puntoventaId", puntoventaId); - qr.setParameter("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(dataInicial), "dd/MM/yyyy")); - qr.setParameter("dataFinal", DateUtil.getStringDate(DateUtil.inicioFecha(dataFinal), "dd/MM/yyyy")); - - return (BigDecimal) qr.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; + +import javax.sql.DataSource; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Hibernate; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO; +import com.rjconsultores.ventaboletos.dao.ContaCorrenteAgenciaDAO; +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.entidad.ContaCorrentePtoVta; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.LogConferencia; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.ConferenciaComissaoVO; +import com.rjconsultores.ventaboletos.vo.comissao.DiaConferenciaComissaoVO; +import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; +import com.rjconsultores.ventaboletos.vo.comissao.FormaPagoEventosFinanceirosVO; +import com.rjconsultores.ventaboletos.vo.comissao.FormapagoVO; +import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO; +import com.rjconsultores.ventaboletos.vo.comissao.OcdVO; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +@Repository("conferenciaComissaoDAO") +public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO + implements ConferenciaComissaoDAO { + + private static final Logger log = LogManager.getLogger(ConferenciaComissaoHibernateDAO.class); + + @Autowired + private ContaCorrenteAgenciaDAO contaCorrenteAgenciaDAO; + + @Autowired + private DataSource dataSourceRead; + + @Autowired + private DataSource dataSource; + + @Autowired + public ConferenciaComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List carregarConferenciaComissao(String competencia, + Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException { + Connection con = null; + try { + con = getConnection(); + + List lsConferencias = new ArrayList(); + + carregarPuntoVentas(lsConferencias, competencia, empresa, puntoVenta, dataMovimento, isDesconsideraPtVendaFechados); + carregarConferenciasRegistradas(lsConferencias, competencia, empresa, puntoVenta, dataMovimento, null, null, null); + carregarMovimentoVendas(con, lsConferencias, competencia, empresa, puntoVenta, dataMovimento, null, null); + carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, dataMovimento); + + Collections.sort(lsConferencias); + + return lsConferencias; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } finally { + try { + if (con != null && !con.isClosed()) { + con.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + public List carregarConferenciaComissao(Date dataInicial, Date dataFinal, + Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException { + Connection con = null; + try { + con = getConnection(); + + List lsConferencias = new ArrayList(); + Map parametros = carregarParametros(dataInicial, dataFinal, null, empresa, puntoVenta, dataMovimento, false); + + SimpleDateFormat format = new SimpleDateFormat("MM/yyyy"); + String competencia = format.format(dataInicial); + + carregarPuntoVentas(lsConferencias, dataInicial, dataFinal, empresa, puntoVenta, dataMovimento); + carregarConferenciasRegistradas(lsConferencias, null, empresa, puntoVenta, dataMovimento, null, null, parametros); + carregarMovimentoVendas(con, lsConferencias, null, empresa, puntoVenta, dataMovimento, dataInicial, dataFinal); + carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, dataMovimento); + + return lsConferencias; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } finally { + try { + if (con != null && !con.isClosed()) { + con.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + private void carregarPuntoVentas(List lsConferencias, Date dataInicial, Date dataFinal, + Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException { + + Set diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal); + ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); + conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId()); + conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa()); + conferenciaComissao.setNumPuntoVenta(puntoVenta.getNumPuntoVenta()); + conferenciaComissao.setDataInicial(dataInicial); + conferenciaComissao.setDataFinal(dataFinal); + conferenciaComissao.setDiasSemMovimentos(diasSemMovimentos); + lsConferencias.add(conferenciaComissao); + + return; + } + + @SuppressWarnings("unchecked") + private void carregarPuntoVentas(List lsConferencias, String competencia, + Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException { + try { + if (puntoVenta != null && puntoVenta.getPuntoventaId() > -1) { + Set diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); + ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); + conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId()); + conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa()); + conferenciaComissao.setNumPuntoVenta(puntoVenta.getNumPuntoVenta()); + conferenciaComissao.setCompetencia(competencia); + conferenciaComissao.setDiasSemMovimentos(diasSemMovimentos); + lsConferencias.add(conferenciaComissao); + + return; + } + + Map parametros = new HashMap(); + StringBuilder sQuery = new StringBuilder() + .append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", ") + .append("PV.NUMPUNTOVENTA as \"numPuntoVenta\", PV.NOMBPUNTOVENTA as \"nombpuntoventa\" ") + .append("FROM PUNTO_VENTA PV ") + .append("JOIN PTOVTA_EMPRESA PTE ON PTE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID AND PTE.ACTIVO = 1 ") + .append("WHERE PV.ACTIVO = 1 "); + + if (empresa != null) { + sQuery.append("AND PTE.EMPRESA_ID = :empresaId "); + parametros.put("empresaId", empresa.getEmpresaId()); + } + + if(isDesconsideraPtVendaFechados) { + sQuery.append("AND PV.STATUSAPROBACION = 'A' "); + } + + sQuery.append("ORDER BY PV.NOMBPUNTOVENTA "); + + @SuppressWarnings("deprecation") + Query qr = getSession().createSQLQuery(sQuery.toString()) + .addScalar("puntoventaId", Hibernate.INTEGER) + .addScalar("numPuntoVenta", Hibernate.STRING) + .addScalar("nombpuntoventa", Hibernate.STRING) + .setResultTransformer(Transformers.aliasToBean(ConferenciaComissaoVO.class)); + setParametros(qr, parametros); + + processarQueryConferenciaComissao(qr.list(), lsConferencias, competencia, dataMovimento, null, null); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @SuppressWarnings("unchecked") + private void carregarConferenciasRegistradas(List lsConferencias, + String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, Date dataInicial, Date dataFinal, Map parametros) throws BusinessException { + try { + if (parametros == null) { + parametros = carregarParametros(dataInicial, dataFinal, competencia, empresa, puntoVenta, dataMovimento, false); + } + StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co "); + sQuery.append("JOIN co.empresa em ") + .append("JOIN co.puntoVenta pv ") + .append("WHERE co.activo = 1 ") + .append("AND co.datamovimento BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') "); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND em.empresaId = :empresaId "); + } + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND pv.puntoventaId = :puntoventaId "); + } + + Query qr = getSession().createQuery(sQuery.toString()); + setParametros(qr, parametros); + dataInicial = parametros.get("dataInicial") != null ? DateUtil.getDateFromString(parametros.get("dataInicial").toString(), "dd/MM/yyyy HH:mm") : null; + dataFinal = parametros.get("dataFinal") != null ? DateUtil.getDateFromString(parametros.get("dataFinal").toString(), "dd/MM/yyyy HH:mm") : null; + processarQueryConferencia(qr.list(), lsConferencias, competencia, dataMovimento, dataInicial, dataFinal); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @SuppressWarnings("rawtypes") + private void setParametros(Query qr, Map parametros) { + for (Entry parametro : parametros.entrySet()) { + if (parametro.getValue() instanceof Collection) { + qr.setParameterList(parametro.getKey(), (Collection) parametro.getValue()); + } else if (parametro.getValue() instanceof List) { + qr.setParameterList(parametro.getKey(), (List) parametro.getValue()); + } else { + qr.setParameter(parametro.getKey(), parametro.getValue()); + } + } + } + + private void setParametros(NamedParameterStatement npst, Map parametros) throws SQLException { + for (Entry parametro : parametros.entrySet()) { + npst.setObject(parametro.getKey(), parametro.getValue()); + } + } + + private void carregarMovimentoVendas(Connection con, List lsConferencias, + String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, Date dataInicialDate, Date dataFinalDate) + throws BusinessException, SQLException { + PreparedStatement stmt = null; + ResultSet rset = null; + try { + + Map parametros = carregarParametros(dataInicialDate, dataFinalDate, competencia, empresa, puntoVenta, dataMovimento, false); + + StringBuilder sQuery = new StringBuilder() + .append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ") + .append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ") + .append("FROM CAJA C ") + .append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ") + .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ") + .append("WHERE PV.ACTIVO = 1 ") + .append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = ?) ") + .append("AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') "); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND M.EMPRESA_ID = ? "); + } + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND PV.PUNTOVENTA_ID = ? "); + } + + sQuery.append(" UNION ") + .append(" SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ") + .append(" PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ") + .append(" FROM EVENTO_EXTRA ee ") + .append(" INNER JOIN CAJA_DIVERSOS C ON C.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ") + .append(" INNER JOIN punto_venta pv ON ee.puntoventa_id = pv.puntoventa_id ") + .append(" WHERE ee.activo = 1") + .append(" AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') "); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND ee.EMPRESA_ID = ? "); + } + + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND PV.PUNTOVENTA_ID = ? "); + } + + sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECCORTE, 'DD/MM/YY') "); + + int idxParametro = 1; + stmt = con.prepareStatement(sQuery.toString()); + String dataIncial = (String) parametros.get("dataInicial"); + String dataFinal = (String) parametros.get("dataFinal"); + stmt.setInt(idxParametro++, Constantes.MVO_CANCEL_GERACAO_OCD.intValue()); + stmt.setString(idxParametro++, dataIncial); + stmt.setString(idxParametro++, dataFinal); + if (parametros.containsKey("empresaId")) { + stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId")); + } + if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) { + stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId")); + } + + //Parametros Evento extra + stmt.setString(idxParametro++, dataIncial); + stmt.setString(idxParametro++, dataFinal); + + if (parametros.containsKey("empresaId")) { + stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId")); + } + + if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) { + stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId")); + } + + rset = stmt.executeQuery(); + List movimentos = new ArrayList(); + while (rset.next()) { + ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); + conferenciaComissao.setPuntoventaId(rset.getInt("puntoventaId")); + conferenciaComissao.setNumPuntoVenta(rset.getString("numPuntoVenta")); + conferenciaComissao.setNombpuntoventa(rset.getString("nombpuntoventa")); + conferenciaComissao.setDataMovimento(rset.getDate("datamovimento")); + + movimentos.add(conferenciaComissao); + } + + processarQueryConferenciaComissao(movimentos, lsConferencias, competencia, dataMovimento, dataInicialDate, dataFinalDate); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } finally { + if (rset != null && !rset.isClosed()) { + rset.close(); + } + if (stmt != null && !stmt.isClosed()) { + stmt.close(); + } + } + } + + /** + * Carrega a {@link ConferenciaComissaoVO} a partir de uma consulta com sql nativo, transformando o resultado em uma coleção de {@link ConferenciaComissaoVO} + * + * @param lsQuery + * @param lsConferencias + * @param competencia + * @param corPadrao + * @throws ParseException + */ + private void processarQueryConferenciaComissao(List lsQuery, + List lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException { + + Set diasSemMovimentos = new TreeSet(); + if(dataInicial != null && dataFinal != null) { + diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal); + } + + if (competencia != null) { + diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); + } + + for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) { + ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); + conferenciaComissao.setCompetencia(competencia); + conferenciaComissao.setDataInicial(dataInicial); + conferenciaComissao.setDataFinal(dataFinal); + conferenciaComissao.setPuntoventaId(conferenciaComissaoMovimentoDiario.getPuntoventaId()); + conferenciaComissao.setNumPuntoVenta(conferenciaComissaoMovimentoDiario.getNumPuntoVenta()); + conferenciaComissao.setNombpuntoventa(conferenciaComissaoMovimentoDiario.getNombpuntoventa()); + conferenciaComissao.setDiasSemMovimentos(new TreeSet(diasSemMovimentos)); + + if (lsConferencias.contains(conferenciaComissao)) { + conferenciaComissao = lsConferencias.get(lsConferencias.indexOf(conferenciaComissao)); + } + + if (conferenciaComissaoMovimentoDiario.getDataMovimento() != null) { + Integer dia = Integer.valueOf(DateUtil.getStringDate(conferenciaComissaoMovimentoDiario.getDataMovimento(), "dd")); + if (conferenciaComissao.getDiasSemMovimentos() != null && conferenciaComissao.getDiasSemMovimentos().contains(dia)) { + + DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO(); + diaConferenciaComissao.setDia(dia); + if (competencia != null) { + diaConferenciaComissao.setData(DateUtil.getDateFromString(dia + "/" + competencia, "dd/MM/yyyy")); + } else { + diaConferenciaComissao.setData(dataMovimento); + } + + if (conferenciaComissao.getDias() == null) { + conferenciaComissao.setDias(new ArrayList()); + } + + conferenciaComissao.getDias().add(diaConferenciaComissao); + conferenciaComissao.getDiasSemMovimentos().remove(diaConferenciaComissao.getDia()); + } + } + + if (!lsConferencias.contains(conferenciaComissao)) { + lsConferencias.add(conferenciaComissao); + } + } + } + + /** + * Carrega a {@link ConferenciaComissaoVO} a partir dos registros da tabela {@link Conferencia} + * + * @param lsQuery + * @param lsConferencias + * @param competencia + * @throws ParseException + */ + private void processarQueryConferencia(List lsQuery, + List lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException { + if (lsQuery != null && !lsQuery.isEmpty()) { + Set diasSemMovimentos = null; + if (competencia != null) { + diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); + } + for (Conferencia conferencia : lsQuery) { + ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); + conferenciaComissao.setCompetencia(competencia); + conferenciaComissao.setDataInicial(dataInicial); + conferenciaComissao.setDataFinal(dataFinal); + conferenciaComissao.setPuntoventaId(conferencia.getPuntoVenta().getPuntoventaId()); + conferenciaComissao.setNumPuntoVenta(conferencia.getPuntoVenta().getNumPuntoVenta()); + conferenciaComissao.setNombpuntoventa(conferencia.getPuntoVenta().getNombpuntoventa()); + conferenciaComissao.setDiasSemMovimentos(diasSemMovimentos == null ? null : new TreeSet(diasSemMovimentos)); + + if (lsConferencias.contains(conferenciaComissao)) { + conferenciaComissao = lsConferencias.get(lsConferencias.indexOf(conferenciaComissao)); + } + + if (conferencia.getDatamovimento() != null) { + Integer dia = Integer.valueOf(DateUtil.getStringDate(conferencia.getDatamovimento(), "dd")); + if (conferenciaComissao.getDiasSemMovimentos() != null && conferenciaComissao.getDiasSemMovimentos().contains(dia)) { + + DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO(); + diaConferenciaComissao.setConferenciaId(conferencia.getConferenciaId()); + diaConferenciaComissao.setDia(dia); + if (competencia != null) { + diaConferenciaComissao.setData(DateUtil.getDateFromString(dia + "/" + competencia, "dd/MM/yyyy")); + } else { + diaConferenciaComissao.setData(dataMovimento); + } + diaConferenciaComissao.setIndboletogerado(conferencia.getIndboletogerado()); + diaConferenciaComissao.setIndconferido(conferencia.getIndconferido()); + diaConferenciaComissao.setIndmaloterecebido(conferencia.getIndmaloterecebido()); + diaConferenciaComissao.setIndpendencia(conferencia.getIndpendencia()); + diaConferenciaComissao.setIndsemmovimento(conferencia.getIndsemmovimento()); + + if (conferenciaComissao.getDias() == null) { + conferenciaComissao.setDias(new ArrayList()); + } + + conferenciaComissao.getDias().add(diaConferenciaComissao); + conferenciaComissao.getDiasSemMovimentos().remove(diaConferenciaComissao.getDia()); + } + } + + if (!lsConferencias.contains(conferenciaComissao)) { + lsConferencias.add(conferenciaComissao); + } + } + } + } + + private void carregarDiasSemMovimento(List lsConferencias, + String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws ParseException { + for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) { + for (Integer diaSemMovimento : conferenciaComissao.getDiasSemMovimentos()) { + DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO(); + diaConferenciaComissao.setDia(diaSemMovimento); + if (competencia == null && diaSemMovimento != null) { + diaConferenciaComissao.setData(dataMovimento); + } else { + diaConferenciaComissao.setData(DateUtil.getDateFromString(diaSemMovimento + "/" + competencia, "dd/MM/yyyy")); + } + diaConferenciaComissao.setIndsemmovimento(true); + + if (conferenciaComissao.getDias() == null) { + conferenciaComissao.setDias(new ArrayList()); + } + conferenciaComissao.getDias().add(diaConferenciaComissao); + } + conferenciaComissao.getDiasSemMovimentos().clear(); + } + } + + private Map carregarParametros(Date dataInicial, Date dataFinal, String competencia, Empresa empresa, + PuntoVenta puntoVenta, Date datamovimento, boolean formatoDataSemHora) throws ParseException { + Map parametros = new HashMap(); + + String formatoData = (formatoDataSemHora ? "dd/MM/yyyy" : "dd/MM/yyyy HH:mm"); + + if (empresa != null) { + parametros.put("empresaId", empresa.getEmpresaId()); + } + if (puntoVenta != null && puntoVenta.getPuntoventaId() > -1) { + parametros.put("puntoventaId", puntoVenta.getPuntoventaId()); + } + + if (datamovimento != null) { + parametros.put("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(datamovimento), formatoData)); + parametros.put("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(datamovimento), formatoData)); + } + + if (StringUtils.isNotBlank(competencia) && datamovimento == null) { + parametros.put("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(DateUtil.getDataInicialCompetencia(competencia)), formatoData)); + parametros.put("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(DateUtil.getDataFinalCompetencia(competencia)), formatoData)); + } + + if (parametros.get("dataInicial") == null && dataInicial != null) { + parametros.put("dataInicial", DateUtil.getStringDate(dataInicial, formatoData)); + parametros.put("dataFinal", DateUtil.getStringDate(dataFinal, formatoData)); + } + + return parametros; + } + + @Override + @Transactional + public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException { + try { + conferencia.setIndmaloterecebido(Boolean.TRUE); + if (conferencia.isSemPendenciaConferencia()) { + return encerrarMovimentoDiario(conferencia); + } + return suscribirOrActualizacion(conferencia); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + @Transactional + public Conferencia cancelarChegadaMalote(Conferencia conferencia) { + conferencia.setIndmaloterecebido(Boolean.FALSE); + return suscribirOrActualizacion(conferencia); + } + + @Override + @Transactional + public Conferencia suscribirOrActualizacion(Conferencia entidad) { + if (entidad.getConferenciaId() == null) { + return suscribir(entidad); + } else { + return actualizacion(entidad); + } + } + + @Override + @Transactional + public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException { + try { + conferencia.setIndconferido(Boolean.TRUE); + conferencia.setIndpendencia(isMovimentoDiarioPendencia(conferencia)); + conferencia.setIndboletogerado(isMovimentoDiarioBoletoGerado(conferencia)); + + gerarLancamentoContaCorrente(conferencia); + return suscribirOrActualizacion(conferencia); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + @Transactional + public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException { + try { + conferencia.setIndconferido(Boolean.FALSE); + return suscribirOrActualizacion(conferencia); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + private boolean isMovimentoDiarioBoletoGerado(Conferencia conferencia) + throws BusinessException { + try { + Map parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), conferencia.getPuntoVenta(), null, false); + StringBuilder sQuery = new StringBuilder() + .append("SELECT FECHAMENTOCNTCORRENTE_ID ") + .append("FROM FECHAMENTO_CNTCORRENTE ") + .append("WHERE ACTIVO = 1 ") + .append("AND :datamovimento BETWEEN FECINIFECHAMENTO AND FECFINFECHAMENTO "); + + parametros.put("datamovimento", conferencia.getDatamovimento()); + if (parametros.containsKey("empresaId")) { + sQuery.append("AND EMPRESA_ID = :empresaId "); + } + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND PUNTOVENTA_ID = :puntoventaId "); + } + + Query qr = getSession().createSQLQuery(sQuery.toString()); + setParametros(qr, parametros); + + return !qr.list().isEmpty(); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + private boolean isMovimentoDiarioPendencia(Conferencia conferencia) { + Query qr = getSession().createQuery( + "SELECT COUNT(log) FROM LogConferencia log WHERE log.activo = 1 AND log.conferencia.conferenciaId = :conferenciaId AND log.status = :status"); + qr.setParameter("conferenciaId", conferencia.getConferenciaId()); + qr.setParameter("status", StatusLogConferencia.PENDENCIA); + return !qr.list().isEmpty() && ((Long) qr.list().get(0)) > 0; + } + + @Override + public List carregarEventosFinanceiros(Conferencia conferencia) + throws BusinessException { + Connection con = null; + NamedParameterStatement npst = null; + ResultSet rSet = null; + + try { + Map parametros = carregarParametros(conferencia.getDataInicial(), conferencia.getDataFinal(), conferencia.getCompetencia(), conferencia.getEmpresa(), + conferencia.getPuntoVenta(), conferencia.getDatamovimento(), true); + StringBuilder sQuery = new StringBuilder() + .append("SELECT DISTINCT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ") + .append("CFP.IMPORTE AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ") + .append("NVL(LOG.STATUS,-1) AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ") + .append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.CONFERENCIA_ID AS \"logconferenciaId\", ") + .append("COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMTEE.COMEMPTIPOEVENTOEXTRA_ID AS \"comemptipoeventoextraId\", ") + .append("COALESCE(CEC.INDTIPO_DEB_CRED, 0) AS \"tipoeventoextradebcred\", ") + .append("CEC.INDEVENTOSFINANCEIROS AS \"exigeConferenciaAba\", B.NUMFOLIOSISTEMA \"numFolioSistema\", ") + .append("TEE.CVETIPOEVENTO AS \"cvetipoevento\", CD.FECCORTE AS \"feccorte\", ") + .append("EI.ICMS as \"icmsBase\", NVL(EST.ESTADO_ID,0) as \"estadoId\", CD.CAJADIVERSOS_ID as cajaDiversosId, U.USUARIO_ID as usuarioId, ") + .append("CD.TURNO_ID as turnoId ") + .append("FROM EVENTO_EXTRA EE ") + .append("JOIN TIPO_EVENTO_EXTRA TEE ON EE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID ") + .append("JOIN CAJA_DIVERSOS CD ON CD.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ") + .append("JOIN CAJA_DIVERSOS_PAGO CFP ON CFP.CAJADIVERSOS_ID = CD.CAJADIVERSOS_ID ") + .append("JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID ") + .append("INNER JOIN USUARIO U ON EE.USUARIO_ID = U.USUARIO_ID ") + .append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON EE.EMPRESA_ID = CEC.EMPRESA_ID AND CEC.ACTIVO = 1 ") + .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID AND LOG.ACTIVO = 1 ") + .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = EE.EMPRESA_ID AND COMFP.ACTIVO = 1 ") + .append("LEFT JOIN COM_EMP_TIPOEVENTOEXTRA COMTEE ON COMTEE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID AND COMTEE.EMPRESA_ID = EE.EMPRESA_ID AND COMTEE.ACTIVO = 1 ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = EE.BOLETO_ID ") + .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") + .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ") + .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ") + .append("LEFT JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") + .append("LEFT JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") + .append("LEFT JOIN EMPRESA_IMPOSTO EI ON (EI.ESTADO_ID = EST.ESTADO_ID AND EI.EMPRESA_ID = E.EMPRESA_ID AND EI.ACTIVO = 1) ") + .append("WHERE EE.ACTIVO = 1 ") + .append("AND CD.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') "); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND EE.EMPRESA_ID = :empresaId "); + } + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND CD.PUNTOVENTA_ID = :puntoventaId "); + } + sQuery.append("ORDER BY TEE.DESCTIPOEVENTO "); + + con = getConnection(); + npst = new NamedParameterStatement(con, sQuery.toString()); + setParametros(npst, parametros); + rSet = npst.executeQuery(); + + List result = new ArrayList(); + while(rSet.next()) { + EventosFinanceirosVO eventosFinanceiros = new EventosFinanceirosVO(rSet.getLong("eventoextraId"), rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : 0); + eventosFinanceiros.setBoletoId(rSet.getLong("boletoId") > 0 ? rSet.getLong("boletoId") : null); + eventosFinanceiros.setNumdocumento(rSet.getString("numdocumento")); + eventosFinanceiros.setImpingreso(rSet.getBigDecimal("impingreso")); + eventosFinanceiros.setDesctipoevento(rSet.getString("desctipoevento")); + eventosFinanceiros.setDescinfo(rSet.getString("descinfo")); + eventosFinanceiros.setStatus(rSet.getInt("status") >= 0 ? rSet.getInt("status") : null); + eventosFinanceiros.setFormapagoId(rSet.getInt("formapagoId") > 0 ? rSet.getInt("formapagoId") : null); + eventosFinanceiros.setDescpago(rSet.getString("descpago")); + eventosFinanceiros.setComempformapagoId(rSet.getInt("comempformapagoId") > 0 ? rSet.getInt("comempformapagoId") : null); + eventosFinanceiros.setComemptipoeventoextraId(rSet.getInt("comemptipoeventoextraId") > 0 ? rSet.getInt("comemptipoeventoextraId") : null); + eventosFinanceiros.setTipoeventoextradebcred(rSet.getInt("tipoeventoextradebcred") > 0 ? rSet.getInt("tipoeventoextradebcred") : null); + eventosFinanceiros.setIndtipo(rSet.getString("indtipo")); + eventosFinanceiros.setNombusuario(rSet.getString("nombusuario")); + eventosFinanceiros.setExigeConferenciaAba(rSet.getBoolean("exigeConferenciaAba")); + eventosFinanceiros.setNumFolioSistema(rSet.getString("numFolioSistema")); + eventosFinanceiros.setCvetipoevento(rSet.getString("cvetipoevento")); + eventosFinanceiros.setFeccorte(rSet.getDate("feccorte")); + eventosFinanceiros.setIcmsBase(rSet.getBigDecimal("icmsBase")); + eventosFinanceiros.setEstadoId(rSet.getInt("estadoId") > 0 ? rSet.getInt("estadoId") : null); + eventosFinanceiros.setCajaDiversosId(rSet.getLong("cajaDiversosId")); + eventosFinanceiros.setUsuarioId(rSet.getInt("usuarioId")); + eventosFinanceiros.setTurnoId(rSet.getInt("turnoId")); + + eventosFinanceiros.setConferencia(conferencia); + + + if (result.contains(eventosFinanceiros)) { + int indice = result.indexOf(eventosFinanceiros); + EventosFinanceirosVO aux = result.get(indice); + FormaPagoEventosFinanceirosVO formapagoVO = new FormaPagoEventosFinanceirosVO(eventosFinanceiros.getFormapagoId(),eventosFinanceiros.getDescpago(),eventosFinanceiros.getImpingreso()); + aux.getFormapagos().add(formapagoVO); + result.set(indice, aux); + }else { + eventosFinanceiros.setFormapagos(new ArrayList()); + eventosFinanceiros.getFormapagos().add(new FormaPagoEventosFinanceirosVO(eventosFinanceiros.getFormapagoId(),eventosFinanceiros.getDescpago(),eventosFinanceiros.getImpingreso())); + result.add(eventosFinanceiros); + } + + } + + return result; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } finally { + try { + if(rSet != null && !rSet.isClosed()) { + rSet.close(); + } + if(npst != null && !npst.isClosed()) { + npst.close(); + } + if(con != null && !con.isClosed()) { + con.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @Override + @SuppressWarnings("unchecked") + public List carregarLogConferencia(Conferencia conferencia) + throws BusinessException { + try { + if (conferencia != null && conferencia.getConferenciaId() != null) { + StringBuilder sQuery = new StringBuilder() + .append("SELECT LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", LOG.OBSERVACAO AS \"observacao\", LOG.PRECO AS \"preco\", ") + .append("LOG.STATUS AS \"status\", NVL(B.NUMFOLIOSISTEMA,C.NUMFOLIOSISTEMA) AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ") + .append("O.NUMOPERACION AS \"numoperacion\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", U.NOMBUSUARIO AS \"nombusuario\", ") + .append("LOG.FECMODIF AS \"fecmodif\", LOG.INDCREDITO AS \"indcredito\", B.BOLETO_ID AS \"boletoId\", O.OCD_ID AS \"ocdId\", ") + .append("EE.EVENTOEXTRA_ID AS \"eventoextraId\", TI.DESCTIPO AS \"desctipoinformativo\", LOG.CONFERENCIAPENDENCIA_ID as \"pendenciaId\", ") + .append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\", C.CAJA_ID AS \"cajaId\" ") + .append("FROM LOG_CONFERENCIA LOG ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ") + .append("LEFT JOIN CAJA C ON C.CAJA_ID = LOG.CAJA_ID ") + .append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ") + .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") + .append("LEFT JOIN OCD O ON O.OCD_ID = LOG.OCD_ID ") + .append("LEFT JOIN TIPO_INFORMATIVO TI ON TI.TIPOINFORMATIVO_ID = LOG.TIPOINFORMATIVOCOMISSAO_ID ") + .append("LEFT JOIN CONFERENCIA_PENDENCIA CP ON CP.CONFERENCIAPENDENCIA_ID = LOG.CONFERENCIAPENDENCIA_ID ") + .append("JOIN USUARIO U ON U.USUARIO_ID = LOG.USUARIO_ID ") + .append("WHERE LOG.ACTIVO = 1 ") + .append("AND LOG.CONFERENCIA_ID = :conferenciaId ORDER BY LOGCONFERENCIA_ID"); + + @SuppressWarnings("deprecation") + Query qr = getSession().createSQLQuery(sQuery.toString()) + .addScalar("logconferenciaId", Hibernate.LONG) + .addScalar("observacao", Hibernate.STRING) + .addScalar("preco", Hibernate.BIG_DECIMAL) + .addScalar("descComportamentoData", Hibernate.STRING) + .addScalar("status", Hibernate.INTEGER) + .addScalar("numfoliosistema", Hibernate.STRING) + .addScalar("tipo", Hibernate.INTEGER) + .addScalar("numoperacion", Hibernate.STRING) + .addScalar("desctipoevento", Hibernate.STRING) + .addScalar("nombusuario", Hibernate.STRING) + .addScalar("fecmodif", Hibernate.TIMESTAMP) + .addScalar("indcredito", Hibernate.SHORT) + .addScalar("boletoId", Hibernate.LONG) + .addScalar("ocdId", Hibernate.LONG) + .addScalar("eventoextraId", Hibernate.LONG) + .addScalar("desctipoinformativo", Hibernate.STRING) + .addScalar("descpendencia", Hibernate.STRING) + .addScalar("cajaId", Hibernate.LONG) + .addScalar("pendenciaId", Hibernate.INTEGER) + .setResultTransformer(Transformers.aliasToBean(LogConferenciaVO.class)); + qr.setParameter("conferenciaId", conferencia.getConferenciaId()); + + List result = qr.list(); + + for (LogConferenciaVO l : result) { + l.setConferencia(conferencia); + } + + return result; + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + + return new ArrayList(); + } + + @Override + @Transactional + public LogConferencia suscribirLogConferencia(LogConferencia logConferencia) + throws BusinessException { + try { + logConferencia.setActivo(Boolean.TRUE); + logConferencia.setUsuario(UsuarioLogado.getUsuarioLogado()); + logConferencia.setFecmodif(new Date()); + + if (logConferencia.getConferencia().getConferenciaId() == null) { + logConferencia.setConferencia(suscribir(logConferencia.getConferencia())); + } + + getSession().save(logConferencia); + return logConferencia; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + @Transactional + public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException { + try { + if(logConferencia == null) { + return; + } + + if (logConferencia.getContaCorrentePtoVta() != null) { + ContaCorrentePtoVta contaCorrentePtoVta = logConferencia.getContaCorrentePtoVta(); + contaCorrentePtoVta.setActivo(Boolean.FALSE); + contaCorrentePtoVta.setFecmodif(logConferencia.getFecmodif()); + contaCorrentePtoVta.setUsuario(logConferencia.getUsuario()); + + contaCorrenteAgenciaDAO.actualizacion(contaCorrentePtoVta); + } + + logConferencia.setActivo(Boolean.FALSE); + logConferencia.setUsuario(UsuarioLogado.getUsuarioLogado()); + logConferencia.setFecmodif(new Date()); + + getSession().merge(logConferencia); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public LogConferencia obtenerLogConferenciaID(Long logconferenciaId) { + try { + return (LogConferencia) this.getHibernateTemplate().get(LogConferencia.class.getName(), logconferenciaId); + } catch (final HibernateException ex) { + throw convertHibernateAccessException(ex); + } + } + + @Override + public List carregarBilhetesComissao(Conferencia conferencia, boolean isCalculoComissao, boolean isConsideraBilhetesDevolvidosEmOutraAgencia) + throws BusinessException { + + Connection con = null; + NamedParameterStatement npst = null; + ResultSet rSet = null; + + try { + Map parametros = carregarParametros(conferencia.getDataInicial(), conferencia.getDataFinal(), conferencia.getCompetencia(), conferencia.getEmpresa(), + conferencia.getPuntoVenta(), conferencia.getDatamovimento(), true); + + StringBuilder sQuery = new StringBuilder() + .append("SELECT DISTINCT C.CAJA_ID AS \"cajaId\", C.NUMASIENTO AS \"numAsiento\", C.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", C.NUMOPERACION AS \"numoperacion\", C.NUMFOLIOSISTEMA AS \"numFolioSistema\", ") + .append("C.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", C.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ") + .append("NVL(C.PRECIOBASE,0) AS \"valorbase\", NVL(C.PRECIOPAGADO,0) AS \"valorpagado\", NVL(C.IMPORTEOUTROS,0) AS \"seguroOutros\", NVL(C.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(C.IMPORTESEGURO,0) AS \"seguro\", ") + .append("NVL(C.IMPORTETAXAEMBARQUE,0) AS \"embarque\", C.TIPOVENTA_ID AS \"tipoVenta\", C.INDSTATUSBOLETO AS \"indstatusboleto\", NVL(LOG.STATUS,-1) AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", ") + .append("FP.DESCPAGO AS \"descpago\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", MC.DESCMOTIVO AS \"descmotivocancelacion\", U.NOMBUSUARIO AS \"nombusuario\", C.MOTIVOCANCELACION_ID AS \"motivocancelacionId\", ") + .append("CF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", ") + .append("(select max(COMEMPCATEGORIA_ID) from COM_EMP_CATEGORIA where CATEGORIA_ID = C.CATEGORIA_ID AND EMPRESA_ID = M.EMPRESA_ID AND ACTIVO = 1) AS \"comempcategoriaId\", C.NOMBPASAJERO AS \"nombpasajero\", ") + .append("E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", C.FECCORRIDA AS \"feccorrida\", C.CORRIDA_ID \"corridaId\", ") + .append("case when t.tarifa_id is not null then nvl(t.precio, 0) + nvl(t.importepedagio, 0) + nvl(t.importetaxaembarque, 0) + nvl(t.importeseguro, 0) + nvl ") + .append("(t.importeoutros, 0) else nvl(c.preciobase,0) + nvl(c.importepedagio, 0) + nvl(c.importetaxaembarque, 0) + nvl(c.importeseguro, 0) + nvl ") + .append("(c.importeoutros, 0) end AS \"valorTabela\"," ) + .append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\", C.FECCORTE AS \"feccorte\", C.TRANSACAOORIGINAL_ID AS \"transacaoOriginalId\", ") + .append("EI.ICMS as \"icmsBase\", EST.ESTADO_ID as \"estadoId\", ") + .append("CASE WHEN C.PTOVTAVENTA_ID = :puntoventaId OR C.PTOVTAVENTA_ID IS NULL THEN 1 ELSE 0 END AS ptoVtaOrigem, ") + .append("M.EMPRESA_ID AS empresaId, C.TRANSACAO_ID AS \"transacaoId\", ") + .append("CASE WHEN LOG.CONFERENCIA_ID IS NOT NULL OR ") + .append(" (C.INDSTATUSBOLETO = 'E' ") + .append(" AND LOG.LOGCONFERENCIA_ID IS NULL ") + .append(" AND (SELECT LC.LOGCONFERENCIA_ID FROM LOG_CONFERENCIA LC ") + .append(" WHERE LC.ACTIVO = 1 ") + .append(" AND LC.TRANSACAOORIGINAL_ID = C.TRANSACAOORIGINAL_ID ") + .append(" AND LC.LOGCONFERENCIA_ID <> LOG.LOGCONFERENCIA_ID) IS NOT NULL) ") + .append(" THEN 1 ELSE 0 END AS \"conferidoEntrega\", ") + .append("C.PTOVTAVENTA_ID AS ptovtaventaId, ") + .append("C.PUNTOVENTA_ID AS puntoventaId ") + .append(", CF.cajaformapago_id, U.USUARIO_ID usuarioId, C.TURNO_ID as turnoId ") //Mantis 17018 + .append("FROM CAJA C ") + .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ") + .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ") + .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ") + .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ") + .append("LEFT JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA AND CT.ORIGEN_ID = C.ORIGEN_ID AND CT.DESTINO_ID = C.DESTINO_ID ") + .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ") + .append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = C.MOTIVOCANCELACION_ID ") + .append("INNER JOIN CAJA_FORMAPAGO CF ON CF.CAJA_ID = C.CAJA_ID ") + .append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CF.FORMAPAGO_ID ") + .append("INNER JOIN USUARIO U ON C.USUARIO_ID = U.USUARIO_ID ") + .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ") + .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") + .append("LEFT JOIN EMPRESA_IMPOSTO EI ON (EI.ESTADO_ID = EST.ESTADO_ID AND EI.EMPRESA_ID = E.EMPRESA_ID AND EI.ACTIVO = 1) ") + .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ") + .append("LEFT JOIN TARIFA T ON (T.DESTINO_ID = C.DESTINO_ID AND T.CLASESERVICIO_ID = C.CLASESERVICIO_ID AND T.MARCA_ID = M.MARCA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.RUTA_ID = C.RUTA_ID and T.ACTIVO = 1 and (ct.tramo_id = t.tramo_id)) ") + .append("LEFT JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID ) ") + .append("WHERE C.ACTIVO = 1 AND (T.TARIFA_ID IS NULL OR (T.TARIFA_ID IS NOT NULL AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA)) ") + .append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ") + .append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = :motivoCancelacionGeracaoOcd) "); + parametros.put("motivoCancelacionGeracaoOcd", Constantes.MVO_CANCEL_GERACAO_OCD.intValue()); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND M.EMPRESA_ID = :empresaId "); + } + + if (parametros.containsKey("puntoventaId")) { + if (isCalculoComissao && isConsideraBilhetesDevolvidosEmOutraAgencia){ + String sMotivosCancelacion = Arrays.asList( + Constantes.MVO_CANCEL_DEVOLUCAO.intValue(), + Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_100.intValue(), + Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_50.intValue(), + Constantes.MVO_CANCEL_CANCELACION.intValue(), + Constantes.MVO_CANCEL_GERACAO_OCD.intValue(), + Constantes.MVO_CANCEL_TROCA.intValue(), + Constantes.MVO_CANCEL_TRANSFERENCIA.intValue() + ).toString().replaceAll("[\\[\\]]", ""); + + sQuery.append("AND ( ") + /* Filtra pela agencias, com a operação feita na agencia ou que tenha origem na agencia de filtro */ + .append(" ( ") + .append(" ((C.PUNTOVENTA_ID = :puntoventaId AND C.PTOVTAVENTA_ID IS NULL) OR C.PTOVTAVENTA_ID = :puntoventaId) ") + .append(" AND ") + /* Filtro os não cancelados e os cancelados conforme lista de motivos de cancelamentos aceitos */ + .append(" ( ") + .append(" C.MOTIVOCANCELACION_ID IS NULL ") + .append(" OR ") + .append(" C.MOTIVOCANCELACION_ID IN (").append(sMotivosCancelacion).append(") ") + .append(" ) ") + .append(" ) ") + /* Carrega os bilhetes entregues na agencia */ + .append(" OR ") + .append(" (C.PUNTOVENTA_ID = :puntoventaId AND C.INDSTATUSBOLETO = 'E' AND C.MOTIVOCANCELACION_ID IS NULL) ") + .append(" ) "); + }else{ + sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId "); + } + } + if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) { + sQuery.append("AND C.NUMFOLIOSISTEMA = :numfoliosistema "); + parametros.put("numfoliosistema", conferencia.getNumfoliosistema()); + } + sQuery.append("ORDER BY C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.CAJA_ID "); + + con = getConnection(); + npst = new NamedParameterStatement(con, sQuery.toString()); + setParametros(npst, parametros); + npst.setFetchSize(100); + rSet = npst.executeQuery(); + + List lsBoletoComissao = new ArrayList(); + while(rSet.next()) { + BoletoComissao boletoComissao = new BoletoComissao(); + boletoComissao.setCajaId(rSet.getLong("cajaId")); + boletoComissao.setTransacaoOriginalId(rSet.getLong("transacaoOriginalId") > 0 ? rSet.getLong("transacaoOriginalId") : null ); + boletoComissao.setNumAsiento(rSet.getString("numAsiento")); + boletoComissao.setNumAsientoVinculado(rSet.getString("numAsientoVinculado")); + boletoComissao.setNumFolioSistema(rSet.getString("numFolioSistema")); + boletoComissao.setNumSeriePreimpresa(rSet.getString("numSeriePreimpresa")); + boletoComissao.setNumFolioPreImpreso(rSet.getString("numFolioPreImpreso")); + boletoComissao.setUf(rSet.getString("uf")); + boletoComissao.setDesccategoria(rSet.getString("desccategoria")); + boletoComissao.setValorpagado(rSet.getBigDecimal("valorpagado")); + boletoComissao.setValorTabela(rSet.getBigDecimal("valorTabela")); + boletoComissao.setSeguroOutros(rSet.getBigDecimal("seguroOutros")); + boletoComissao.setPedagio(rSet.getBigDecimal("pedagio")); + boletoComissao.setEmbarque(rSet.getBigDecimal("embarque")); + boletoComissao.setSeguro(rSet.getBigDecimal("seguro")); + boletoComissao.setTipoVenta(rSet.getInt("tipoVenta")); + boletoComissao.setIndstatusboleto(rSet.getString("indstatusboleto")); + boletoComissao.setStatus(rSet.getInt("status") >= 0 ? rSet.getInt("status") : null); + boletoComissao.setFormapagoId(rSet.getInt("formapagoId") > 0 ? rSet.getInt("formapagoId") : null); + boletoComissao.setDescpago(rSet.getString("descpago")); + boletoComissao.setLogconferenciaId(rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : null); + boletoComissao.setDescmotivocancelacion(rSet.getString("descmotivocancelacion")); + boletoComissao.setNombusuario(rSet.getString("nombusuario")); + boletoComissao.setMotivoCancelacionId(rSet.getInt("motivoCancelacionId") > 0 ? rSet.getInt("motivoCancelacionId") : null); + boletoComissao.setImporteFp(rSet.getBigDecimal("importeFp")); + boletoComissao.setComempformapagoId(rSet.getInt("comempformapagoId") > 0 ? rSet.getInt("comempformapagoId") : null); + boletoComissao.setComempcategoriaId(rSet.getInt("comempcategoriaId") > 0 ? rSet.getInt("comempcategoriaId") : null); + boletoComissao.setNumoperacion(rSet.getString("numoperacion")); + boletoComissao.setNombpasajero(rSet.getString("nombpasajero")); + boletoComissao.setIndcarboletosdevolvidosconf(rSet.getBoolean("indcarboletosdevolvidosconf")); + boletoComissao.setFeccorrida(rSet.getDate("feccorrida")); + boletoComissao.setCorridaId(rSet.getInt("corridaId") > 0 ? rSet.getInt("corridaId") : null); + boletoComissao.setIndCancelacion(rSet.getBoolean("indCancelacion")); + boletoComissao.setIndreimpresion(rSet.getBoolean("indreimpresion")); + boletoComissao.setFeccorte(rSet.getDate("feccorte")); + boletoComissao.setIcmsBase(rSet.getBigDecimal("icmsBase")); + boletoComissao.setEstadoId(rSet.getInt("estadoId") > 0 ? rSet.getInt("estadoId") : null); + boletoComissao.setPtoVtaOrigem(rSet.getBoolean("ptoVtaOrigem")); + boletoComissao.setValorbase(rSet.getBigDecimal("valorbase")); + boletoComissao.setEmpresaId(rSet.getInt("empresaId")); + boletoComissao.setTransacaoId(rSet.getLong("transacaoId") > 0 ? rSet.getLong("transacaoId") : null); + boletoComissao.setPtovtaventaId(rSet.getInt("ptovtaventaId")); + boletoComissao.setPuntoVentaId(rSet.getInt("puntoventaId")); + boletoComissao.setConferidoEntrega(rSet.getBoolean("conferidoEntrega")); + boletoComissao.setUsuarioId(rSet.getInt("usuarioId")); + boletoComissao.setTurnoId(rSet.getInt("turnoId")); + + if(boletoComissao.getStatus() == null && boletoComissao.getConferidoEntrega() != null && boletoComissao.getConferidoEntrega()) { + boletoComissao.setConferido(true); + boletoComissao.setStatus(StatusLogConferencia.CONFERIDO.getValue()); + } + + if (boletoComissao.getFormapagos() == null) { + boletoComissao.setFormapagos(new ArrayList()); + boletoComissao.setConferencia(conferencia); + } + if(boletoComissao.getImporteFp() == null){ + boletoComissao.setImporteFp(BigDecimal.ZERO); + } + + if (lsBoletoComissao.contains(boletoComissao)) { + int indice = lsBoletoComissao.indexOf(boletoComissao); + BoletoComissao aux = lsBoletoComissao.get(indice); + aux.setComempcategoriaId(boletoComissao.getComempcategoriaId() != null + ? boletoComissao.getComempcategoriaId() : aux.getComempcategoriaId()); + aux.setComempformapagoId(boletoComissao.getComempformapagoId() != null + ? boletoComissao.getComempformapagoId() : aux.getComempformapagoId()); + + FormapagoVO formapagoVO = new FormapagoVO(boletoComissao.getFormapagoId(), + boletoComissao.getDescpago(), + boletoComissao.getIndconferenciafisicacomissao(), + boletoComissao.getImporteFp()); + + if (aux.getFormapagos().contains(formapagoVO)) { + formapagoVO = aux.getFormapagos().get(aux.getFormapagos().indexOf(formapagoVO)); + formapagoVO.add(boletoComissao.getImporteFp()); + } else { + aux.getFormapagos().add(formapagoVO); + } + lsBoletoComissao.set(indice, aux); + } else { + boletoComissao.getFormapagos().add(new FormapagoVO(boletoComissao.getFormapagoId(), + boletoComissao.getDescpago(), + boletoComissao.getIndconferenciafisicacomissao(), + boletoComissao.getImporteFp())); + lsBoletoComissao.add(boletoComissao); + } + } + + return lsBoletoComissao; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } finally { + try { + if(rSet != null && !rSet.isClosed()) { + rSet.close(); + } + if(npst != null && !npst.isClosed()) { + npst.close(); + } + if(con != null && !con.isClosed()) { + con.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @Override + public List carregarOcds(Conferencia conferencia) throws BusinessException { + + Connection con = null; + NamedParameterStatement npst = null; + ResultSet rSet = null; + + try { + Map parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), + conferencia.getPuntoVenta(), conferencia.getDatamovimento(), false); + + StringBuilder sQuery = new StringBuilder() + .append("SELECT DISTINCT O.OCD_ID AS \"ocdId\", O.NUMOPERACION AS \"numoperacion\", O.FECINC AS \"fecinc\", O.FECPAGAR AS \"fecpagar\", O.FECPAGO AS \"fecpago\", ") + .append("O.INDPAGO AS \"indpago\", O.VALOR_PAGAR AS \"valorPagar\", (B.PRECIOPAGADO * (O.PENALIZACION / 100)) AS \"penalizacion\", NVL(LOG.STATUS,-1) AS \"status\", ") + .append("U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", U.CVEUSUARIO AS \"login\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", ") + .append("CEC.INDOCD AS \"exigeConferenciaAba\" ") + .append("FROM OCD O ") + .append("INNER JOIN BOLETO B ON B.BOLETO_ID = O.BOLETO_ID ") + .append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") + .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID AND LOG.ACTIVO = 1 ") + .append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ") + .append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = M.EMPRESA_ID AND CEC.ACTIVO = 1 ") + .append("INNER JOIN MARCA ON m.MARCA_ID = b.MARCA_ID ") + .append("WHERE O.ACTIVO = 1 ") + .append("AND O.FECPAGO BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ") + .append("AND O.INDPAGO = 1 "); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND ((B.EMPRESACORRIDA_ID IS NOT NULL AND B.EMPRESACORRIDA_ID = :empresaId) OR(m.EMPRESA_ID = :empresaId)) "); + } + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND O.PUNTOVENTAPAGO_ID = :puntoventaId "); + } + + con = getConnection(); + npst = new NamedParameterStatement(con, sQuery.toString()); + setParametros(npst, parametros); + rSet = npst.executeQuery(); + + List result = new ArrayList(); + while(rSet.next()) { + OcdVO ocd = new OcdVO(); + ocd.setOcdId(rSet.getLong("ocdId")); + ocd.setNumoperacion(rSet.getString("numoperacion")); + ocd.setFecinc(rSet.getDate("fecinc")); + ocd.setFecpagar(rSet.getDate("fecpagar")); + ocd.setFecpago(rSet.getDate("fecpago")); + ocd.setIndpago(rSet.getBoolean("indpago")); + ocd.setValorPagar(rSet.getBigDecimal("valorPagar")); + ocd.setPenalizacion(rSet.getBigDecimal("penalizacion")); + ocd.setStatus(rSet.getInt("status") >= 0 ? rSet.getInt("status") : null); + ocd.setLogconferenciaId(rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : null); + ocd.setLogin(rSet.getString("login")); + ocd.setNombusuario(rSet.getString("nombusuario")); + ocd.setNumFolioSistema(rSet.getString("numFolioSistema")); + ocd.setExigeConferenciaAba(rSet.getBoolean("exigeConferenciaAba")); + ocd.setConferencia(conferencia); + + result.add(ocd); + } + + return result; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } finally { + try { + if(rSet != null && !rSet.isClosed()) { + rSet.close(); + } + if(npst != null && !npst.isClosed()) { + npst.close(); + } + if(con != null && !con.isClosed()) { + con.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @Override + public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, + Integer empresaId) throws BusinessException { + try { + StringBuilder sQuery = new StringBuilder() + .append("SELECT co ").append("FROM Conferencia co ") + .append("WHERE co.activo = 1 ").append("AND co.datamovimento = :datamovimento ") + .append("AND co.empresa.empresaId = :empresaId ") + .append("AND co.puntoVenta.puntoventaId = :puntoventaId "); + + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("datamovimento", datamovimento); + qr.setParameter("empresaId", empresaId); + qr.setParameter("puntoventaId", puntoventaId); + qr.setMaxResults(1); + return (Conferencia) qr.uniqueResult(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Transactional + private void gerarLancamentoContaCorrente(Conferencia conferencia) throws BusinessException { + try { + + Calendar calHoje = Calendar.getInstance(); + Calendar calAmanha = Calendar.getInstance(); + + calAmanha.add(Calendar.DAY_OF_MONTH, 1); + + List lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId()); + String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy"); + String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento; + + for (LogConferencia logConferencia : lsLogConferencia) { + Calendar cal = calHoje; + + if (!Boolean.TRUE.equals(logConferencia.getIndmesmodia())) { + cal = calAmanha; + } + + if (logConferencia.getStatus().equals(StatusLogConferencia.CONFERIDO) + || ((logConferencia.getContaCorrentePtoVta() != null + && logConferencia.getContaCorrentePtoVta().getActivo() != null + && logConferencia.getContaCorrentePtoVta().getActivo())) + || (logConferencia.getPreco() == null + || logConferencia.getPreco().doubleValue() == 0d) + || logConferencia.isIndcredito().equals((short) 2)) { + continue; + } + + ContaCorrentePtoVta contaCorrentePtoVta = contaCorrenteAgenciaDAO + .gravarContaCorrente(conferencia.getPuntoVenta().getPuntoventaId(), + descOperacion, DateUtil.normalizarToFecha(cal.getTime()), logConferencia.getUsuario().getUsuarioId(), + logConferencia.isIndcredito().equals((short) 1) ? Constantes.TIPO_OPERACION_CC_PAGO : Constantes.TIPO_OPERACION_CC_LQ, + conferencia.getEmpresa().getEmpresaId(), + Constantes.TURNO_AUTOMATICO, BigDecimal.ZERO, BigDecimal.ZERO, + BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, + BigDecimal.ZERO, BigDecimal.ZERO, logConferencia.getPreco(), false, + BigDecimal.ZERO, BigDecimal.ZERO, logConferencia.getPreco()); + + logConferencia.setContaCorrentePtoVta(contaCorrentePtoVta); + suscribirLogConferencia(logConferencia); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + @SuppressWarnings("unchecked") + public List carregarLogConferencia(Long conferenciaId) throws BusinessException { + try { + StringBuilder sQuery = new StringBuilder() + .append("SELECT log ") + .append("FROM LogConferencia log ") + .append("WHERE log.activo = 1 ") + .append("AND log.conferencia.conferenciaId = :conferenciaId "); + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("conferenciaId", conferenciaId); + return qr.list(); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, + PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException { + try { + List lsConferencias = new ArrayList(); + + carregarConferenciasRegistradas(lsConferencias, competencia, empresa, puntoVenta, null, null, null, null); + carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, null); + + for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) { + for (DiaConferenciaComissaoVO diaConferenciaComissao : conferenciaComissao.getDias()) { + if (!diaConferenciaComissao.getIndsemmovimento() && !diaConferenciaComissao.getIndconferido()) { + return false; + } + } + } + + return true; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public BigDecimal carregarValorDepositoContaCorrente(Integer empresaId, Integer puntoventaId, Date datamovimento) { + StringBuilder sQuery = new StringBuilder() + .append("SELECT SUM(importeTotalEfectivo) ").append("FROM ContaCorrentePtoVta cc ") + .append("WHERE cc.activo = 1 ").append("AND cc.empresa.empresaId = :empresaId ") + .append("AND cc.puntoVenta.puntoventaId = :puntoventaId ") + .append("AND cc.fecHorOperacion = :datamovimento "); + + Query qr = getSession().createQuery(sQuery.toString()); + qr.setParameter("empresaId", empresaId); + qr.setParameter("puntoventaId", puntoventaId); + qr.setParameter("datamovimento", datamovimento); + qr.setMaxResults(1); + + return (BigDecimal) qr.uniqueResult(); + } + + @Override + @SuppressWarnings("unchecked") + public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, + Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { + try { + String competencia = DateUtil.getStringDate(datamovimento, "MM/yyyy"); + Map parametros = carregarParametros(null, null, competencia, empresa, puntoVenta, datamovimento, false); + StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co ") + .append("JOIN co.empresa em ").append("JOIN co.puntoVenta pv ") + .append("WHERE co.activo = 1 ") + .append("AND co.datamovimento BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') "); + + if (parametros.containsKey("empresaId")) { + sQuery.append("AND em.empresaId = :empresaId "); + } + if (parametros.containsKey("puntoventaId")) { + sQuery.append("AND pv.puntoventaId = :puntoventaId "); + } + + Query qr = getSession().createQuery(sQuery.toString()); + setParametros(qr, parametros); + + List lsConferenciaComissao = new ArrayList(); + processarQueryConferencia(qr.list(), lsConferenciaComissao, competencia, datamovimento, null, null); + + if (!lsConferenciaComissao.isEmpty()) { + for (DiaConferenciaComissaoVO diaConferenciaComissao : lsConferenciaComissao + .iterator().next().getDiasOrdenado()) { + if (diaConferenciaComissao.getData().equals(datamovimento)) { + return diaConferenciaComissao; + } + } + } + + return null; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + /** + * Recupera a conexão conforme parametrização em application.properties + * + * @return + * @throws SQLException + */ + public Connection getConnection() throws SQLException { + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_DATASOURCE_COMISSAO_BANCO_PRODUCAO.getDescricao())) { + return dataSource.getConnection(); + } else { + return dataSourceRead.getConnection(); + } + } + + @Override + public boolean isConferidoVenta(BoletoComissao boletoComissao) { + if(boletoComissao.getTransacaoOriginalId() == null ){ + return false; + } + + StringBuilder sql = new StringBuilder(); + + sql.append(" SELECT * FROM log_conferencia lc "); + sql.append(" WHERE lc.ACTIVO = 1 "); + sql.append(" AND lc.TRANSACAOORIGINAL_ID =:transacaoId "); + + Query qr = getSession().createSQLQuery(sql.toString()); + qr.setParameter("transacaoId", boletoComissao.getTransacaoOriginalId()); + + return !qr.list().isEmpty(); + + } + + @Override + @SuppressWarnings("unchecked") + @Transactional + public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException { + try { + StringBuilder sql = new StringBuilder(); + + sql.append("SELECT log ") + .append("FROM LogConferencia log ") + .append("WHERE log.activo = 1 ") + .append("AND log.transacaoOriginalId =:transacaoId "); + + Query qr = getSession().createQuery(sql.toString()); + qr.setParameter("transacaoId", transacaoId); + + List logConferencias = qr.list(); + for (LogConferencia logConferencia : logConferencias) { + borrarLogConferencia(logConferencia); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException { + try { + List lsConferencias = new ArrayList(); + + String competencia = DateUtil.getStringDate(dataInicial, "MM/yyyy"); + + carregarConferenciasRegistradas(lsConferencias, competencia, empresa, puntoVenta, null, dataInicial, dataFinal, null); + carregarDiasSemMovimento(lsConferencias, competencia, empresa, puntoVenta, null); + + for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) { + for (DiaConferenciaComissaoVO diaConferenciaComissao : conferenciaComissao.getDias()) { + if (DateUtil.compareOnlyDate(diaConferenciaComissao.getData(), dataInicial) >= 0 && + DateUtil.compareOnlyDate(diaConferenciaComissao.getData(), dataFinal) <= 0 && + !diaConferenciaComissao.getIndsemmovimento() && !diaConferenciaComissao.getIndconferido()) { + return false; + } + } + } + + return true; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public boolean isConfMovFPTrocaVlrDeposito(Empresa empresa) { + if(empresa == null || empresa.getEmpresaId() == null) { + return false; + } + + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT EMPRESA_ID ") + .append(" FROM EMPRESA ") + .append(" WHERE ACTIVO = 1 ") + .append(" AND INDCONFMOVFPTROCAVLRDEPOSITO = 1 ") + .append(" AND EMPRESA_ID = :empresaId "); + + Query qr = getSession().createSQLQuery(sql.toString()); + qr.setParameter("empresaId", empresa.getEmpresaId()); + + return !qr.list().isEmpty(); + } + + @Override + public BigDecimal getComissaoPuntoVenta(Integer puntoventaId, Integer empresaId, Date dataInicial, Date dataFinal) throws BusinessException { + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT SUM(importe) ") + .append(" FROM conta_corrente_ptovta ") + .append(" WHERE ACTIVO = 1 ") + .append(" AND EMPRESA_ID = :empresaId ") + .append(" AND PUNTOVENTA_ID = :puntoventaId ") + .append(" AND TIPOOPERACIONCC_ID = 5 ") + .append(" AND feccorte BETWEEN to_date(:dataInicial, 'DD/MM/YYYY') AND to_date(:dataFinal, 'DD/MM/YYYY') "); + + + Query qr = getSession().createSQLQuery(sql.toString()); + qr.setParameter("empresaId", empresaId); + qr.setParameter("puntoventaId", puntoventaId); + qr.setParameter("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(dataInicial), "dd/MM/yyyy")); + qr.setParameter("dataFinal", DateUtil.getStringDate(DateUtil.inicioFecha(dataFinal), "dd/MM/yyyy")); + + return (BigDecimal) qr.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaPendenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaPendenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaPendenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaPendenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoParadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoParadaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoParadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfiguracionProductoParadaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java index 9d9d0cf75..4df352c4c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.Date; - -import org.apache.logging.log4j.LogManager; - -import org.apache.logging.log4j.Logger; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ContaCorrenteAgenciaDAO; -import com.rjconsultores.ventaboletos.entidad.ContaCorrentePtoVta; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TipoOperacionCC; -import com.rjconsultores.ventaboletos.entidad.Turno; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -@Repository("contaCorrenteAgenciaDAO") -public class ContaCorrenteAgenciaHibernateDAO extends GenericHibernateDAO implements ContaCorrenteAgenciaDAO { - - private static final Logger log = LogManager.getLogger(ContaCorrenteAgenciaHibernateDAO.class); - - @Autowired - public ContaCorrenteAgenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @Transactional - public ContaCorrentePtoVta gravarContaCorrente(Integer puntoVentaId, String descOperacion, Date fecCorte, Integer usuarioId, Integer tipoOperacionCCId, Integer empresaId, short turnoId, BigDecimal importeTotalTarifa, BigDecimal importeTotalPedagio, BigDecimal importeTotalTasaAbordaje, BigDecimal importeTotalSeguro, BigDecimal importeTotalIngreso, BigDecimal importeTotalEgreso, BigDecimal importeTotalDevolucion, BigDecimal importeTotalTransferencia, BigDecimal importeFinal, boolean corteAutomatico, BigDecimal totalVentaSegOpcional, BigDecimal totalCancSegOpcional, BigDecimal importeTotalEfectivo) throws BusinessException { - try { - - ContaCorrentePtoVta ccPtoVta = new ContaCorrentePtoVta(); - ccPtoVta.setActivo(Boolean.TRUE); - ccPtoVta.setDescOperacion(descOperacion); - ccPtoVta.setEmpresa(new Empresa(empresaId)); - ccPtoVta.setFecmodif(Calendar.getInstance().getTime()); - ccPtoVta.setImporteTotalTarifa(importeTotalTarifa); - ccPtoVta.setImporteTotalPedagio(importeTotalPedagio); - ccPtoVta.setImporteTotalTasaAbordaje(importeTotalTasaAbordaje); - ccPtoVta.setImporteTotalSeguro(importeTotalSeguro); - ccPtoVta.setImporteTotalIngreso(importeTotalIngreso); - ccPtoVta.setImporteTotalEgreso(importeTotalEgreso); - ccPtoVta.setImporteTotalDevolucion(importeTotalDevolucion); - ccPtoVta.setImporteTotalTransferencia(importeTotalTransferencia); - ccPtoVta.setImporte(importeFinal); - ccPtoVta.setImporteTotalEfectivo(importeTotalEfectivo); - ccPtoVta.setPuntoVenta(new PuntoVenta(puntoVentaId)); - ccPtoVta.setTurno(new Turno(turnoId)); - ccPtoVta.setUsuarioModifId(usuarioId); - ccPtoVta.setUsuario(new Usuario(usuarioId)); - ccPtoVta.setTipoOperacionCC(new TipoOperacionCC(tipoOperacionCCId)); - ccPtoVta.setFecCorte(fecCorte); - ccPtoVta.setFecHorOperacion(fecCorte); - ccPtoVta.setTotalVentaSegOpcional(totalVentaSegOpcional); - ccPtoVta.setTotalCancSegOpcional(totalCancSegOpcional); - ccPtoVta.setIndComissao(Boolean.TRUE); - ccPtoVta.setImportetotalDebito(BigDecimal.ZERO); - ccPtoVta.setImportetotalCredito(BigDecimal.ZERO); - - getSession().save(ccPtoVta); - - return ccPtoVta; - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.Date; + +import org.apache.logging.log4j.LogManager; + +import org.apache.logging.log4j.Logger; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ContaCorrenteAgenciaDAO; +import com.rjconsultores.ventaboletos.entidad.ContaCorrentePtoVta; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.TipoOperacionCC; +import com.rjconsultores.ventaboletos.entidad.Turno; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +@Repository("contaCorrenteAgenciaDAO") +public class ContaCorrenteAgenciaHibernateDAO extends GenericHibernateDAO implements ContaCorrenteAgenciaDAO { + + private static final Logger log = LogManager.getLogger(ContaCorrenteAgenciaHibernateDAO.class); + + @Autowired + public ContaCorrenteAgenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @Transactional + public ContaCorrentePtoVta gravarContaCorrente(Integer puntoVentaId, String descOperacion, Date fecCorte, Integer usuarioId, Integer tipoOperacionCCId, Integer empresaId, short turnoId, BigDecimal importeTotalTarifa, BigDecimal importeTotalPedagio, BigDecimal importeTotalTasaAbordaje, BigDecimal importeTotalSeguro, BigDecimal importeTotalIngreso, BigDecimal importeTotalEgreso, BigDecimal importeTotalDevolucion, BigDecimal importeTotalTransferencia, BigDecimal importeFinal, boolean corteAutomatico, BigDecimal totalVentaSegOpcional, BigDecimal totalCancSegOpcional, BigDecimal importeTotalEfectivo) throws BusinessException { + try { + + ContaCorrentePtoVta ccPtoVta = new ContaCorrentePtoVta(); + ccPtoVta.setActivo(Boolean.TRUE); + ccPtoVta.setDescOperacion(descOperacion); + ccPtoVta.setEmpresa(new Empresa(empresaId)); + ccPtoVta.setFecmodif(Calendar.getInstance().getTime()); + ccPtoVta.setImporteTotalTarifa(importeTotalTarifa); + ccPtoVta.setImporteTotalPedagio(importeTotalPedagio); + ccPtoVta.setImporteTotalTasaAbordaje(importeTotalTasaAbordaje); + ccPtoVta.setImporteTotalSeguro(importeTotalSeguro); + ccPtoVta.setImporteTotalIngreso(importeTotalIngreso); + ccPtoVta.setImporteTotalEgreso(importeTotalEgreso); + ccPtoVta.setImporteTotalDevolucion(importeTotalDevolucion); + ccPtoVta.setImporteTotalTransferencia(importeTotalTransferencia); + ccPtoVta.setImporte(importeFinal); + ccPtoVta.setImporteTotalEfectivo(importeTotalEfectivo); + ccPtoVta.setPuntoVenta(new PuntoVenta(puntoVentaId)); + ccPtoVta.setTurno(new Turno(turnoId)); + ccPtoVta.setUsuarioModifId(usuarioId); + ccPtoVta.setUsuario(new Usuario(usuarioId)); + ccPtoVta.setTipoOperacionCC(new TipoOperacionCC(tipoOperacionCCId)); + ccPtoVta.setFecCorte(fecCorte); + ccPtoVta.setFecHorOperacion(fecCorte); + ccPtoVta.setTotalVentaSegOpcional(totalVentaSegOpcional); + ccPtoVta.setTotalCancSegOpcional(totalCancSegOpcional); + ccPtoVta.setIndComissao(Boolean.TRUE); + ccPtoVta.setImportetotalDebito(BigDecimal.ZERO); + ccPtoVta.setImportetotalCredito(BigDecimal.ZERO); + + getSession().save(ccPtoVta); + + return ccPtoVta; + + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioDetHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioDetHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioDetHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioDetHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioTransportadoraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioTransportadoraHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioTransportadoraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioTransportadoraHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java index cd3b5ba7f..009871e12 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java @@ -1,1246 +1,1246 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; - -import org.apache.commons.lang.math.NumberUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.Transformers; -import org.hibernate.type.BooleanType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CorridaDAO; -import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaLocalidadeRemovida; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.Corrida.Id; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; -import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; - -/** - * - * @author rodrigo - */ -@SuppressWarnings("unchecked") -@Repository("corridaDAO") -public class CorridaHibernateDAO extends GenericHibernateDAO implements CorridaDAO { - - @Autowired - private SQLBuilder sqlBuilder; - private static final Integer ULTIMA_HORA_DIA = Integer.valueOf(23); - private static final Integer ULTIMO_MINUTO_SEGUNDO = Integer.valueOf(59); - private static final Integer ULTIMO_MILLISEGUNDO = Integer.valueOf(99); - @Autowired - private CorridaTramoDAO corridaTramoDao; - - private static final Logger log = LogManager.getLogger(CorridaHibernateDAO.class); - - @Autowired - public CorridaHibernateDAO(@Qualifier("sessionFactory") final SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public Boolean existe(final Id id) { - - Criteria c = makeCriteria(); - c.setProjection(Projections.rowCount()); - c.add(Restrictions.eq("id", id)); - - Long cant = HibernateFix.count(c.list()); - - return (cant > 0); - } - - @Override - public Boolean existeActivo(final Id id) { - - Criteria c = makeCriteria(); - - c.setProjection(Projections.rowCount()); - c.add(Restrictions.eq("id", id)); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - - Long cant = HibernateFix.count(c.list()); - - return (cant > 0); - } - - @Override - public Corrida suscribir(final Corrida entity) { - - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.GERAR_CAMPO_EQUIVALENCIA_CORRIDA.getDescricao())) { - String sql = "SELECT CORRIDA_EQUIVALENCIA_SEQ.NEXTVAL FROM DUAL"; - Object o = this.getSession().createSQLQuery(sql).uniqueResult(); - entity.setEquivalenciaId(o.toString()); - } - - Corrida corrida = super.suscribir(entity); - this.getSession().flush(); - return corrida; - } - - @Override - public List buscarPorAutobusCorridasFuturas(final DiagramaAutobus diagramaAutobus) { - String hql = " select co from Corrida co, Autobus ab " - + " where ab.autobusId = co.autobus.autobusId " - + " and ab.diagramaAutobus.diagramaautobusId = " + diagramaAutobus.getDiagramaautobusId() - + " and co.id.feccorrida > current_timestamp()"; - - Query sq = getSession().createQuery(hql); - - List lsCorridas = sq.list(); - - return lsCorridas; - } - - @Override - public List buscarPorRolOperativoCorridasFuturas(final DiagramaAutobus diagramaAutobus) { - String hql = " select co from Corrida co, RolOperativo rol " - + " where rol.roloperativoId = co.rolOperativo.roloperativoId " - + " and rol.diagramaAutobus.diagramaautobusId = " + diagramaAutobus.getDiagramaautobusId() - + " and co.id.feccorrida > current_timestamp()"; - - Query sq = getSession().createQuery(hql); - List lsCorridas = sq.list(); - - return lsCorridas; - } - - @Override - public List buscarPorFecCorrida(final Date value) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - - c.add(Restrictions.eq("id.feccorrida", value)); - - return c.list(); - } - - @Override - public Long count(final Ruta ruta) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.setProjection(Projections.rowCount()); - - return HibernateFix.count(c.list()); - - } - - @Override - public List verificarCorridaId(Integer corridaId) { - - StringBuilder hql = new StringBuilder(); - hql.append("select distinct "); - hql.append(" new com.rjconsultores.ventaboletos.entidad.Corrida("); - hql.append(" c.id.corridaId, "); - hql.append(" c.origem, "); - hql.append(" c.destino) "); - hql.append("from "); - hql.append(" Corrida c "); - hql.append("where "); - hql.append(" 1 = 1 "); - hql.append(" and c.activo = 1 "); - hql.append(" and cast(c.id.corridaId as string) like :corridaId "); - hql.append(" group by "); - hql.append(" c.id.corridaId, "); - hql.append(" c.origem, "); - hql.append(" c.destino) "); - - Query sq = getSession().createQuery(hql.toString()); - - if (corridaId != null) { - sq.setParameter("corridaId", corridaId.toString() + '%'); - } else { - sq.setParameter("corridaId", '%'); - } - - return sq.list(); - } - - @Override - public List buscarPorId(final Integer idCorrida) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.add(Restrictions.eq("id.corridaId", idCorrida)); - - return c.list(); - } - - @Override - public List buscarFiltro(final Parada ori, final Parada des, final Date hora, final ClaseServicio cs) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.add(Restrictions.eq("origem", ori)); - c.add(Restrictions.eq("destino", des)); - c.add(Restrictions.between("fechorsalida", getDiaGeracaoHoraIni(hora), getDiaGeracaoHoraFim(hora))); - c.add(Restrictions.eq("claseServicio", cs)); - - return c.list(); - } - - @Override - public boolean count(final Parada ori, final Parada des, final Date hora, - final ClaseServicio cs, final boolean pisoExtra) { - - Criteria c = makeCriteria(); - c.setProjection(Projections.rowCount()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.add(Restrictions.eq("origem", ori)); - c.add(Restrictions.eq("destino", des)); - c.add(Restrictions.between("fechorsalida", getDiaGeracaoHoraIni(hora), getDiaGeracaoHoraFim(hora))); - c.add(Restrictions.eq("claseServicio", cs)); - - // Se for piso extra numPiso = 2 - if (pisoExtra) { - // Corrida Piso Extra - c.add(Restrictions.eq("numPiso", 2)); - } else { - // num piso == null ou diferente de 2 - c.add(Restrictions.or(Restrictions.not(Restrictions.eq("numPiso", 2)), Restrictions.isNull("numPiso"))); - } - - Long cant = HibernateFix.count(c.list()); - - return (cant > 0); - } - - private Date getDiaGeracaoHoraIni(final Date hora) { - Date dataCorreta = new Date(); - - // para pegar a hora e adicionar ao dia da geracao: - GregorianCalendar gAux = new GregorianCalendar(); - gAux.setTime(hora); - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(hora); - gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); - gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); - gcalendar.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); - gcalendar.set(Calendar.MILLISECOND, NumberUtils.INTEGER_ZERO); - - dataCorreta = gcalendar.getTime(); - - return dataCorreta; - } - - private Date getDiaGeracaoHoraFim(final Date hora) { - Date dataCorreta = new Date(); - - // para pegar a hora e adicionar ao dia da geracao: - GregorianCalendar gAux = new GregorianCalendar(); - gAux.setTime(hora); - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(hora); - gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); - gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); - gcalendar.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); - gcalendar.set(Calendar.MILLISECOND, ULTIMA_HORA_DIA); - - dataCorreta = gcalendar.getTime(); - - return dataCorreta; - } - - @Override - public List buscarDistinct(final Parada ori, final Parada des, final Date horaSalidaInicio, - final Date horaSalidaFin, final ClaseServicio cs, final Integer corridaId) { - StringBuilder hql = new StringBuilder(""); - hql.append("select distinct "); - hql.append(" new com.rjconsultores.ventaboletos.entidad.Corrida("); - hql.append(" c.marca, "); - hql.append(" c.id.corridaId, "); - hql.append(" c.origem, "); - hql.append(" c.destino, "); - hql.append(" c.claseServicio, "); - hql.append(" c.corridaCtrl.horario) "); - hql.append("from "); - hql.append(" Corrida c "); - hql.append("where "); - hql.append(" 1 = 1 "); - if (ori != null) { - hql.append(" and c.origem = :origen "); - } - if (des != null) { - hql.append(" and c.destino = :destino"); - } - if (cs != null) { - hql.append(" and c.claseServicio = :claseServicio "); - } - if (corridaId != null) { - hql.append(" and c.id.corridaId = :corridaId "); - } - if (horaSalidaInicio != null) { - - hql.append(" and c.corridaCtrl.horario >= :horaSalidaInicio"); - } - if (horaSalidaFin != null) { - - hql.append(" and c.corridaCtrl.horario <= :horaSalidaFin"); - } - - hql.append(" order by c.id.corridaId,c.corridaCtrl.horario"); - - Query query = getSession().createQuery(hql.toString()); - - if (ori != null) { - query.setParameter("origen", ori); - } - if (des != null) { - query.setParameter("destino", des); - } - if (cs != null) { - query.setParameter("claseServicio", cs); - } - if (corridaId != null) { - query.setParameter("corridaId", corridaId); - } - - if (horaSalidaInicio != null) { - - query.setParameter("horaSalidaInicio", horaSalidaInicio); - } - if (horaSalidaFin != null) { - query.setParameter("horaSalidaFin", horaSalidaFin); - - } - - return query.list(); - } - - @Override - public boolean existe(final Ruta ruta, final Date fecCorrida, final Date horaCorrida, - final ClaseServicio claseServicio, final Marca marca, final boolean pisoExtra) { - Calendar soloFecha = Calendar.getInstance(); - soloFecha.setTime(fecCorrida); - soloFecha.set(Calendar.HOUR, NumberUtils.INTEGER_ZERO); - soloFecha.set(Calendar.MINUTE, NumberUtils.INTEGER_ZERO); - soloFecha.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); - soloFecha.set(Calendar.MILLISECOND, NumberUtils.INTEGER_ZERO); - - Criteria c = makeCriteria(); - c.setProjection(Projections.rowCount()); - c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq("id.feccorrida", soloFecha.getTime())); - c.add(Restrictions.eq("claseServicio", claseServicio)); - c.add(Restrictions.eq("marca", marca)); - - // Se for piso extra numPiso = 2 - if (pisoExtra) { - // Corrida Piso Extra - c.add(Restrictions.eq("numPiso", 2)); - } else { - // num piso == null ou diferente de 2 - c.add(Restrictions.or(Restrictions.not(Restrictions.eq("numPiso", 2)), Restrictions.isNull("numPiso"))); - } - - Criteria cCorridaCtrl = c.createCriteria("corridaCtrl"); - cCorridaCtrl.add(Restrictions.eq("horario", horaCorrida)); - - Long cant = HibernateFix.count(c.list()); - - return (cant > 0); - } - - @Override - public Long cantCorridaGeneradasHoy() { - Calendar cTmp1 = Calendar.getInstance(); - Calendar cTmp2 = Calendar.getInstance(); - - cTmp1.set(Calendar.HOUR_OF_DAY, NumberUtils.INTEGER_ZERO); - cTmp1.set(Calendar.MINUTE, NumberUtils.INTEGER_ZERO); - cTmp1.set(Calendar.MILLISECOND, NumberUtils.INTEGER_ZERO); - cTmp1.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); - - cTmp2.set(Calendar.HOUR_OF_DAY, ULTIMA_HORA_DIA); - cTmp2.set(Calendar.MINUTE, ULTIMO_MINUTO_SEGUNDO); - cTmp2.set(Calendar.SECOND, ULTIMO_MINUTO_SEGUNDO); - cTmp2.set(Calendar.MILLISECOND, ULTIMO_MILLISEGUNDO); - - String sql = "select count(c.fecmodif) from Corrida c where c.fecmodif between :inicio and :fim"; - - Query query = getSession().createQuery(sql); - query.setParameter("inicio", cTmp1.getTime()); - query.setParameter("fim", cTmp2.getTime()); - Long count = HibernateFix.count(query.uniqueResult()); - - return count; - } - - @Override - public List buscarGroupCorrridaId(final Integer corridaId, final Integer origem, final Integer destino, - final Integer ruta, final Integer numRuta, final Date dateInicio, final Date dateFin) { - - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT c.corrida_id "); - sql.append(" FROM corrida c "); - if (numRuta != null) { - sql.append(" INNER JOIN Ruta r ON r.ruta_id=c.ruta_id "); - } - sql.append(" WHERE c.feccorrida BETWEEN :dateInicio AND :dateFin "); - sql.append(" AND c.corrida_id LIKE :corridaId "); - - if (origem != null) { - sql.append(" AND c.ORIGEN_ID=:origem"); - } - if (destino != null) { - sql.append(" AND c.DESTINO_ID=:destino"); - } - if (ruta != null) { - sql.append(" AND c.RUTA_ID=:ruta"); - } - if (numRuta != null) { - sql.append(" AND r.NUMRUTA=:numRuta"); - } - - sql.append(" GROUP BY c.corrida_id "); - - Query sq = getSession().createSQLQuery(sql.toString()); - - if (corridaId != null) { - sq.setParameter("corridaId", corridaId.toString() + '%'); - } else { - sq.setParameter("corridaId", '%'); - } - - if (origem != null) { - sq.setParameter("origem", origem); - } - if (destino != null) { - sq.setParameter("destino", destino); - } - if (ruta != null) { - sq.setParameter("ruta", ruta); - } - if (numRuta != null) { - sq.setParameter("numRuta", numRuta.toString()); - } - - sq.setParameter("dateInicio", dateInicio); - sq.setParameter("dateFin", dateFin); - - List lsObject = sq.list(); - - List lsCorridas = new ArrayList(); - - if (lsObject != null && !lsObject.isEmpty()) { - - for (Object object : lsObject) { - - BigDecimal id = (BigDecimal) object; - - StringBuffer hql = new StringBuffer(); - hql.append(" FROM Corrida "); - hql.append(" WHERE id.corridaId = " + id); - hql.append(origem != null ? " AND origem.paradaId = :origem " : ""); - hql.append(destino != null ? " AND destino.paradaId = :destino " : ""); - hql.append(ruta != null ? " AND ruta.rutaId = :ruta " : ""); - hql.append(numRuta != null ? " AND ruta.numRuta = :numruta " : ""); - - Query squery = getSession().createQuery(hql.toString()); - - if (origem != null) - squery.setParameter("origem", origem); - - if (destino != null) - squery.setParameter("destino", destino); - - if (ruta != null) - squery.setParameter("ruta", ruta); - - if (numRuta != null) - squery.setParameter("numruta", numRuta.toString()); - - squery.setMaxResults(NumberUtils.INTEGER_ONE); - - List lsCorridasAux = squery.list(); - - if (lsCorridasAux != null && !lsCorridasAux.isEmpty()) { - lsCorridas.add(lsCorridasAux.iterator().next()); - } - } - } - - return lsCorridas; - } - - @Override - public List buscarGroupCorrridaId(final Integer corridaId, final Date dateInicio, final Date dateFin) { - - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT c.corrida_id "); - sql.append(" FROM corrida c "); - sql.append(" WHERE c.feccorrida BETWEEN :dateInicio AND :dateFin "); - sql.append(" AND c.corrida_id LIKE :corridaId "); - sql.append(" GROUP BY c.corrida_id "); - - Query sq = getSession().createSQLQuery(sql.toString()); - - if (corridaId != null) { - sq.setParameter("corridaId", corridaId.toString() + '%'); - } else { - sq.setParameter("corridaId", '%'); - } - - sq.setParameter("dateInicio", dateInicio); - sq.setParameter("dateFin", dateFin); - - List lsObject = sq.list(); - - List lsCorridas = new ArrayList(); - - if (lsObject != null && !lsObject.isEmpty()) { - - for (Object object : lsObject) { - - BigDecimal id = (BigDecimal) object; - - StringBuilder hql = new StringBuilder(); - hql.append(" FROM Corrida "); - hql.append(" WHERE id.corridaId = " + id); - hql.append(" and id.feccorrida BETWEEN :dateInicio AND :dateFin"); - - Query squery = getSession().createQuery(hql.toString()); - squery.setParameter("dateInicio", dateInicio); - squery.setParameter("dateFin", dateFin); - squery.setMaxResults(NumberUtils.INTEGER_ONE); - - List lsCorridasAux = squery.list(); - - if (lsCorridasAux != null && !lsCorridasAux.isEmpty()) { - lsCorridas.add(lsCorridasAux.iterator().next()); - } - } - } - - return lsCorridas; - } - - @Override - public void actualizaFecHusoFecVerano(final Corrida corrida) { - - Integer corridaId = corrida.getId().getCorridaId(); - Date feccorrida = corrida.getId().getFeccorrida(); - - Query queryCorrida = getSession().createQuery( - sqlBuilder.getSQLActualizarCorridaFecHusoFecVerano()); - queryCorrida.setInteger("corridaId", corridaId); - queryCorrida.setInteger("corridaId", corridaId); - queryCorrida.setDate("feccorrida", feccorrida); - queryCorrida.executeUpdate(); - - Query queryCorridaTramo = getSession().createQuery( - sqlBuilder.getSQLActualizarCorridaTramoFecHusoFecVerano()); - queryCorridaTramo.setInteger("corridaId", corridaId); - queryCorridaTramo.setDate("feccorrida", feccorrida); - queryCorridaTramo.executeUpdate(); - } - - @SuppressWarnings("deprecation") - @Override - public void actualizaFecHusoFecVerano(final List corridas) { - - for (Corrida corrida : corridas) { - - Date husoHorVeranoLlegadaAnterior = null; - Date fechorSalidaOriginalUpdate = null; - Date fechorsalidaUpdate = null; - Date fechorllegadaUpdate = null; - Integer corridatramoId = 0; - Date fechorSalidaOriginal = null; - Date fechorsalida = null; - Date fechorllegada = null; - Integer tiempoHorHusoOrigem = Integer.valueOf(0); - Integer tiempoHorVeranoOrigem = Integer.valueOf(0); - Integer tiempoHorHusoDestino = Integer.valueOf(0); - Integer tiempoHorVeranoDestino = Integer.valueOf(0); - Date tiempoestancia = null; - - List tramos = buscarTramosCorrida(corrida); - - for (Object[] objeto : tramos) { - corridatramoId = Integer.valueOf(objeto[0].toString()); - fechorSalidaOriginal = (Date) objeto[2]; - fechorsalida = (Date) objeto[3]; - fechorllegada = (Date) objeto[4]; - tiempoHorHusoOrigem = Integer.valueOf(objeto[5].toString()); - tiempoHorVeranoOrigem = Integer.valueOf(objeto[6].toString()); - tiempoHorHusoDestino = Integer.valueOf(objeto[7].toString()); - tiempoHorVeranoDestino = Integer.valueOf(objeto[8].toString()); - tiempoestancia = (Date) objeto[9]; - - if (husoHorVeranoLlegadaAnterior == null) { - fechorSalidaOriginalUpdate = fechorSalidaOriginal; - fechorsalidaUpdate = fechorsalida; - } else { - fechorSalidaOriginalUpdate = husoHorVeranoLlegadaAnterior; - fechorsalidaUpdate = husoHorVeranoLlegadaAnterior; - } - - husoHorVeranoLlegadaAnterior = calcularHusoHorVeranoLlegada( - fechorsalida, - fechorllegada, - fechorsalidaUpdate, - tiempoHorHusoOrigem + tiempoHorVeranoOrigem, - tiempoHorHusoDestino + tiempoHorVeranoDestino); - - if (tiempoestancia != null) { - Calendar aux = Calendar.getInstance(); - aux.setTime(DateUtil.normalizar(husoHorVeranoLlegadaAnterior)); - aux.add(Calendar.MINUTE, tiempoestancia.getMinutes()); - aux.add(Calendar.HOUR_OF_DAY, tiempoestancia.getHours()); - - husoHorVeranoLlegadaAnterior = aux.getTime(); - - Calendar auxFechorsalidaUpdate = Calendar.getInstance(); - auxFechorsalidaUpdate.setTime(DateUtil.normalizar(fechorsalidaUpdate)); - auxFechorsalidaUpdate.add(Calendar.MINUTE, tiempoestancia.getMinutes()); - auxFechorsalidaUpdate.add(Calendar.HOUR_OF_DAY, tiempoestancia.getHours()); - - fechorsalidaUpdate = auxFechorsalidaUpdate.getTime(); - } - - if (husoHorVeranoLlegadaAnterior != null) { - fechorllegadaUpdate = husoHorVeranoLlegadaAnterior; - } else { - fechorllegadaUpdate = fechorllegada; - } - - Query queryCorridaTramo = getSession().createQuery(sqlBuilder.getSQLActualizarCorridaTramoFecHusoFecVerano()); - queryCorridaTramo.setTimestamp("fechorSalidaOriginalH", fechorSalidaOriginalUpdate); - queryCorridaTramo.setTimestamp("fechorsalidaH", fechorsalidaUpdate); - queryCorridaTramo.setTimestamp("fechorllegadaH", fechorllegadaUpdate); - queryCorridaTramo.setInteger("corridatramoId", corridatramoId); - queryCorridaTramo.executeUpdate(); - } - } - } - - private Date calcularHusoHorVeranoLlegada(Date fechorsalida, Date fechorllegada, Date fechorsalidaH, int tiempoOrigen, int tiempoDestino) { - Calendar horLlegada = null; - - // Si los tiempos son distintos, hube cambio de huso horario/horario de verano - - long elapsedMinutes = DateUtil.getElapsedMinutos(fechorsalida, fechorllegada); - - horLlegada = Calendar.getInstance(); - horLlegada.setTime(fechorsalidaH); - horLlegada.add(Calendar.MINUTE, (int) elapsedMinutes); - - if (tiempoOrigen != tiempoDestino) { - horLlegada.add(Calendar.HOUR, difHuso(tiempoOrigen, tiempoDestino)); - - } - - return (horLlegada == null) ? null : horLlegada.getTime(); - } - - private int difHuso(int a, int b) { - return b - a; - } - - @Override - public List buscarPorEstado(final Estado estado, final Date dataInicial, Integer corridaId) { - StringBuilder hql = new StringBuilder(); - - hql.append(" select "); - hql.append(" distinct new com.rjconsultores.ventaboletos.entidad.Corrida").append("("); - hql.append(" ct.corrida.id.corridaId, "); - hql.append(" ct.corrida.id.feccorrida").append(")"); - hql.append(" from CorridaTramo ct "); - hql.append(" left join ct.origem.ciudad.estado eo "); - hql.append(" left join ct.destino.ciudad.estado ed "); - hql.append(" where ct.corrida.activo = :isActivo "); - hql.append(" and ct.corrida.id.feccorrida >= :feccorrida "); - hql.append(" and ( eo.estadoId = :estadoId "); - hql.append(" or ed.estadoId = :estadoId )"); - if (corridaId != null) { - hql.append(" and ct.corrida.id.corridaId = :corridaId )"); - } - hql.append(" group by "); - hql.append(" ct.corrida.id.corridaId, "); - hql.append(" ct.corrida.id.feccorrida "); - - Query query = getSession().createQuery(hql.toString()); - query.setInteger("isActivo", ActivoUtil.ATIVO); - query.setDate("feccorrida", dataInicial); - query.setInteger("estadoId", estado.getEstadoId()); - - if (corridaId != null) { - query.setInteger("corridaId", corridaId); - } - - return query.list(); - } - - @Override - public List buscarPorEstado(final Estado estado, final Date dataInicial) { - return buscarPorEstado(estado, dataInicial, null); - } - - private List buscarTramosCorrida(final Corrida corrida) { - StringBuilder hql = new StringBuilder(); - - hql.append(" select "); - hql.append(" ct.corridatramoId, "); - hql.append(" ct.numsecuencia,"); - hql.append(" ct.fechorSalidaOriginal,"); - hql.append(" ct.fechorsalida,"); - hql.append(" ct.fechorllegada,"); - hql.append(" nvl(estadoO.tiempoHorHuso, 0) as tiempoHorHusoOrigem,"); - hql.append(" nvl( case when "); - hql.append(" ct.fechorSalidaOriginal between "); - hql.append(" estadoO.fecInicioHorVerano "); - hql.append(" and estadoO.fecFinoHorVerano "); - hql.append(" then (estadoO.tiempoHorVerano)"); - hql.append(" else 0 end, 0) as tiempoHorVeranoOrigem,"); - hql.append(" nvl(estadoD.tiempoHorHuso, 0) as tiempoHorHusoDestino,"); - hql.append(" nvl( case when "); - hql.append(" ct.fechorSalidaOriginal between "); - hql.append(" estadoD.fecInicioHorVerano "); - hql.append(" and estadoD.fecFinoHorVerano "); - hql.append(" then (estadoD.tiempoHorVerano)"); - hql.append(" else 0 end, 0) as tiempoHorVeranoDestino,"); - hql.append(" ct.tiempoEstancia "); - hql.append(" from CorridaTramo ct "); - hql.append(" inner join ct.origem origem "); - hql.append(" inner join origem.ciudad ciudadO "); - hql.append(" inner join ciudadO.estado estadoO "); - hql.append(" inner join ct.destino destino "); - hql.append(" inner join destino.ciudad ciudadD "); - hql.append(" inner join ciudadD.estado estadoD "); - - hql.append(" where ct.corrida.activo = :isActivo "); - hql.append(" and ct.activo = :isActivo "); - hql.append(" and ct.corrida.id.corridaId = :corridaId "); - hql.append(" and ct.corrida.id.feccorrida = :feccorrida "); - hql.append(" order by "); - hql.append(" ct.numsecuencia "); - - Query query = getSession().createQuery(hql.toString()); - query.setInteger("isActivo", ActivoUtil.ATIVO); - query.setDate("feccorrida", corrida.getId().getFeccorrida()); - query.setInteger("corridaId", corrida.getId().getCorridaId()); - - return query.list(); - } - - @Override - public Corrida buscaCorrridaFutura(Ruta ruta, Date fecInicio) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.gt("fechorsalida", fecInicio)); - c.addOrder(Order.asc("fechorsalida")); - List lsCorrida = c.list(); - if (!lsCorrida.isEmpty()) { - return lsCorrida.get(0); - } - return null; - } - - @Override - public Boolean editarCorridaPorOutraCorrida(List corridas, Corrida corridaPadrao) { - List tramosPadrao = corridaTramoDao.buscarCorridaTramoPorCorrida(corridaPadrao); - - for (Corrida corrida : corridas) { - List tramos = corridaTramoDao.buscarCorridaTramoPorCorrida(corrida); - - try{ - for (CorridaTramo tramo : tramos) { - - for (CorridaTramo tramoPadrao : tramosPadrao) { - if (tramoPadrao.getNumsecuencia().equals(tramo.getNumsecuencia())) { - tramo.setFechorsalida(mudarData(tramoPadrao.getFechorsalida(), tramo.getFechorsalida())); - tramo.setFechorsalidaH(mudarData(tramoPadrao.getFechorsalidaH(), tramo.getFechorsalidaH())); - tramo.setFechorSalidaOriginal(mudarData(tramoPadrao.getFechorSalidaOriginal(), tramo.getFechorSalidaOriginal())); - tramo.setFechorllegada(mudarData(tramoPadrao.getFechorllegada(), tramo.getFechorllegada())); - tramo.setFechorllegadaH(mudarData(tramoPadrao.getFechorllegadaH(), tramo.getFechorllegadaH())); - corridaTramoDao.actualizacion(tramo); - break; - } - } - } - }catch(Exception e){ - log.error(e.getMessage()); - } - - } - return true; - } - - private Date mudarData(Date dataPadrao, Date dataMudanca) { - try{ - Calendar calPadrao = Calendar.getInstance(); - calPadrao.setTime(dataPadrao); - Calendar calMudanca = Calendar.getInstance(); - calMudanca.setTime(dataMudanca); - - calMudanca.set(calMudanca.get(Calendar.YEAR), calMudanca.get(Calendar.MONTH), calMudanca.get(Calendar.DAY_OF_MONTH), - calPadrao.get(Calendar.HOUR_OF_DAY), calPadrao.get(Calendar.MINUTE), calPadrao.get(Calendar.SECOND)); - return calMudanca.getTime(); - }catch(Exception e){ - return null; - } - } - - @Override - public Corrida buscarPorId(Id id) { - - StringBuilder hql = new StringBuilder(); - - hql.append(" from Corrida corrida "); - hql.append(" where corrida.id.feccorrida = :feccorrida "); - hql.append(" and corrida.id.corridaId = :corridaId )"); - - Query query = getSession().createQuery(hql.toString()); - query.setDate("feccorrida", id.getFeccorrida()); - query.setInteger("corridaId", id.getCorridaId()); - - query.setMaxResults(1); - return (Corrida)query.uniqueResult(); - } - - @Override - public Corrida buscarCorridaAtivaPorId(Id id) { - - StringBuilder hql = new StringBuilder(); - - hql.append(" from Corrida corrida "); - hql.append(" where corrida.id.feccorrida = :feccorrida "); - hql.append(" and corrida.id.corridaId = :corridaId "); - hql.append(" and corrida.activo = 1 "); - hql.append(" and corrida.indstatuscorrida = 'H' "); - - Query query = getSession().createQuery(hql.toString()); - query.setDate("feccorrida", id.getFeccorrida()); - query.setInteger("corridaId", id.getCorridaId()); - - query.setMaxResults(1); - return (Corrida)query.uniqueResult(); - } - - private List buscaCorridaFutura(){ - List corridaList = new ArrayList(); - - return corridaList; - } - - @Override - public List buscarCorridaRelAproveitamento(Parada origem, Parada destino, - Date feccorrida, Integer corridaId) { - - StringBuilder sql = new StringBuilder(); - sql.append(" select "); - sql.append(" c.corrida_id as corrida_id, "); - sql.append(" c.feccorrida as feccorrida, "); - sql.append(" c.fechorsalida as fechorsalida, "); - sql.append(" origen.parada_id as origen_id, "); - sql.append(" origen.descparada as origen, "); - sql.append(" destino.parada_id as destino_id, "); - sql.append(" destino.descparada as destino, "); - sql.append(" r.ruta_id as ruta_id, "); - sql.append(" r.descruta as descruta, "); - sql.append(" cs.claseservicio_id as claseservicio_id, "); - sql.append(" cs.descclase as descclase "); - sql.append(" from corrida c "); - sql.append(" inner join parada origen on c.origen_id = origen.parada_id "); - sql.append(" inner join parada destino on c.destino_id = destino.parada_id "); - sql.append(" inner join ruta r on c.ruta_id = r.ruta_id "); - sql.append(" inner join clase_servicio cs on c.claseservicio_id = cs.claseservicio_id "); - sql.append(" where c.activo <> 0 "); - if (corridaId != null) { - sql.append(" and c.corrida_id = :corridaId "); - } - sql.append(feccorrida == null ? "" : " and c.feccorrida = :feccorrida "); - if (origem != null) { - sql.append(origem == null ? "" : " and c.origen_id = :origen_id "); - } - if (destino != null) { - sql.append(destino == null ? "" : " and c.destino_id = :destino_id "); - } - - Query query = getSession().createSQLQuery(sql.toString()); - if (corridaId != null) { - query.setParameter("corridaId", corridaId); - } - query.setParameter("feccorrida", feccorrida); - if (origem != null) { - query.setParameter("origen_id", origem.getParadaId()); - } - if (destino != null) { - query.setParameter("destino_id", destino.getParadaId()); - } - - List lsObject = query.list(); - - List lsCorridas = new ArrayList(); - - if (lsObject != null && !lsObject.isEmpty()) { - - for (Object object : lsObject) { - if (object != null) { - Object objectArray[] = (Object[]) object; - Id id = new Id(); - id.setCorridaId(((BigDecimal) objectArray[0]).intValue()); - id.setFeccorrida((Timestamp) objectArray[1]); - - Parada o = new Parada(); - o.setParadaId(((BigDecimal) objectArray[3]).intValue()); - o.setDescparada((String) objectArray[4]); - - Parada d = new Parada(); - d.setParadaId(((BigDecimal) objectArray[5]).intValue()); - d.setDescparada((String) objectArray[6]); - - Ruta ruta = new Ruta(); - ruta.setRutaId(((BigDecimal) objectArray[7]).intValue()); - ruta.setDescruta((String) objectArray[8]); - - ClaseServicio claseServicio = new ClaseServicio(); - claseServicio.setClaseservicioId(((BigDecimal) objectArray[9]).intValue()); - claseServicio.setDescclase((String) objectArray[10]); - - Corrida corrida = new Corrida(); - corrida.setId(id); - corrida.setFechorsalida((Timestamp) objectArray[2]); - corrida.setOrigem(o); - corrida.setDestino(d); - corrida.setRuta(ruta); - corrida.setClaseServicio(claseServicio); - - lsCorridas.add(corrida); - } - } - } - return lsCorridas; - } - - @Override - public Boolean existeCorrida(Long id) { - StringBuilder sql = new StringBuilder(); - sql.append("SELECT CORRIDA_ID FROM CORRIDA corrida "); - sql.append("WHERE CORRIDA_ID = " + id + " AND ACTIVO = 1"); - - Query query = getSession().createSQLQuery(sql.toString()); - - return query.list().size() > 0; - } - - @Override - @Transactional(rollbackFor = { BusinessException.class }) - public Integer atualizaCorridasIntegracaoTotvs(Marca marca, Date dataIncial, Date dataFinal, Integer corridaId) throws BusinessException { - - // update caja set integradototvs = 0 where PUNTOVENTA_ID = 269 and FECHORVENTA >= '30/03/2018' and FECHORVENTA <= '01/04/2018'; - StringBuilder sb = new StringBuilder(); - sb.append(" update corrida set integradototvs = 0 "); - sb.append(" where FECCORRIDA >= :fechorInicial "); - sb.append(" and FECCORRIDA <= :fechorFinal "); - sb.append(" and CORRIDA_ID = :corridaId "); - if (marca != null) { - sb.append(" and MARCA_ID = :marcaId "); - } - SQLQuery query = getSession().createSQLQuery(sb.toString()); - if (marca != null) { - query.setInteger("marcaId", marca.getMarcaId()); - } - query.setInteger("corridaId", corridaId); - query.setTimestamp("fechorInicial", dataIncial); - query.setTimestamp("fechorFinal", dataFinal); - Integer result = query.executeUpdate(); - return result; - } - - @Override - public List buscarListaPorIds(List corridaIds){ - - StringBuilder hql = new StringBuilder(); - hql.append(" select co ") - .append(" from Corrida co") - .append(" where co.activo = 1 ") - .append(" and co.id in ( :corridaIds )"); - - Query query = getSession().createQuery(hql.toString()); - query.setParameterList("corridaIds", corridaIds); - List lsCorridas = query.list(); - - List listCorrida = new ArrayList(); - for (Corrida corrida : lsCorridas) { - CorridaVO co = new CorridaVO(corrida); - - preencherTramoSequencia(co, corrida); - - listCorrida.add(co); - } - - return listCorrida; - } - - @Override - public CorridaVO buscarVOPorId(Id corridaId){ - - StringBuilder sb = new StringBuilder(); - sb.append(" select "); - sb.append(" c.corrida_id as corridaId, "); - sb.append(" to_char(c.feccorrida, 'dd/MM/yyyy') as feccorrida, "); - sb.append(" c.corrida_id as numCorrida, "); - sb.append(" to_char(c.fechorsalida, 'dd/MM/yyyy HH24:mi:ss')||'.000' as fechorsalida, "); - sb.append(" c.origen_id as origenId, "); - sb.append(" c.destino_id as destinoId, "); - sb.append(" c.tiposervicio_id as tipoServicioId, "); - sb.append(" c.roloperativo_id as rolOperativoId, "); - sb.append(" c.claseservicio_id as claseServicioId, "); - sb.append(" c.empresacorrida_id as empresaId, "); - sb.append(" mar.marca_id as marcaId, "); - sb.append(" emp.indtabelaprecoembarcada as tarifaEmbarcada, "); - sb.append(" c.ruta_id as rutaId "); - sb.append(" from corrida c "); - sb.append(" JOIN empresa emp ON emp.empresa_id = c.empresacorrida_id "); - sb.append(" JOIN marca mar ON mar.empresa_id = emp.empresa_id "); - sb.append(" AND mar.activo = 1 "); - sb.append(" where c.activo = 1 "); - sb.append(" and C.CORRIDA_ID = :corridaId "); - sb.append(" and C.FECCORRIDA = :feccorrida "); - - Query query = getSession().createSQLQuery(sb.toString()) - .addScalar("corridaId", IntegerType.INSTANCE) - .addScalar("feccorrida", StringType.INSTANCE) - .addScalar("numCorrida", IntegerType.INSTANCE) - .addScalar("fechorsalida", StringType.INSTANCE) - .addScalar("origenId", IntegerType.INSTANCE) - .addScalar("destinoId", IntegerType.INSTANCE) - .addScalar("tipoServicioId", IntegerType.INSTANCE) - .addScalar("rolOperativoId", IntegerType.INSTANCE) - .addScalar("claseServicioId", IntegerType.INSTANCE) - .addScalar("empresaId", IntegerType.INSTANCE) - .addScalar("marcaId", IntegerType.INSTANCE) - .addScalar("tarifaEmbarcada", BooleanType.INSTANCE) - .addScalar("rutaId", IntegerType.INSTANCE) - .setResultTransformer(Transformers.aliasToBean(CorridaVO.class)); - - query.setParameter("corridaId", corridaId.getCorridaId()); - query.setParameter("feccorrida", corridaId.getFeccorrida()); - - return (CorridaVO)query.uniqueResult(); - - } - - private void preencherTramoSequencia(CorridaVO corridaVO, Corrida corrida ) { - - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT"); - sb.append(" CT.NUMSECUENCIA,"); - sb.append(" CT.ORIGEN_ID, "); - sb.append(" CT.DESTINO_ID, "); - sb.append(" CT.TRAMO_ID "); - sb.append(" FROM CORRIDA C"); - sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA"); - sb.append(" WHERE C.CORRIDA_ID = :corridaId AND C.FECCORRIDA = :feccorrida and CT.activo = 1 "); - sb.append(" ORDER BY CT.NUMSECUENCIA "); - - Query query = getSession().createSQLQuery(sb.toString()); - - query.setParameter("corridaId", corrida.getId().getCorridaId()); - query.setParameter("feccorrida", corrida.getId().getFeccorrida()); - - List lsSecuenciaVO = new ArrayList(); - List lsTramoVO = new ArrayList(); - List controle = new ArrayList(); - - List list = query.list(); - - for (Object[] item : list) { - final Integer origensecuencia = Integer.valueOf(item[0].toString()); - final Integer origen_id = Integer.valueOf(item[1].toString()); - - final Integer destinosecuencia = Integer.valueOf(item[0].toString()) + 1; - final Integer destino_id = Integer.valueOf(item[2].toString()); - - adicionarSequencia( - controle, - lsSecuenciaVO, - origensecuencia, - origen_id); - - adicionarSequencia( - controle, - lsSecuenciaVO, - destinosecuencia, - destino_id); - - //adiciona o id do tramo - lsTramoVO.add(Integer.valueOf(item[3].toString())); - } - - corridaVO.setListTramos( lsTramoVO ); - corridaVO.setLsSecuenciaVO( lsSecuenciaVO ); - } - - private void adicionarSequencia(List controle, List lsSecuenciaVO, final Integer numsecuencia, final Integer paradaId) { - final String key = numsecuencia.toString() + "|" + paradaId.toString(); - - if (!controle.contains(key)) { - SecuenciaVO sequencia = new SecuenciaVO(); - sequencia.setSecuencia(numsecuencia); - sequencia.setLocalidadeId(paradaId); - - lsSecuenciaVO.add(sequencia); - - controle.add(key); - } - } - - public Integer buscarOcupacaoCorrida(Corrida corrida) { - try { - if(corrida == null) { - return 0; - } - //TODO: VERIFICAR ERRO NA PESQUISA - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT"); - sb.append(" COUNT(BOLETO_ID) "); - sb.append(" FROM "); - sb.append(" BOLETO "); - sb.append(" WHERE "); - sb.append(" ACTIVO = 1 AND motivocancelacion_id IS NULL AND "); - sb.append(" CORRIDA_ID = :corridaId AND FECCORRIDA = :feccorrida "); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setParameter("corridaId", corrida.getId().getCorridaId()); - query.setParameter("feccorrida", corrida.getId().getFeccorrida()); - - BigDecimal resultado = (BigDecimal) query.uniqueResult(); - - return resultado.intValue(); - } catch (Exception e) { - log.error("Erro ao buscar ocupacao da corrida: " + corrida.getId().getCorridaId() + " - " + corrida.getId().getFeccorrida(), e); - } - - return 0; - } - - @SuppressWarnings("unchecked") - @Override - public List buscarCorridas(Parada ori, Parada des, Date dataInicial, Date dataFinal, ClaseServicio cs, - Ruta linha, Empresa empresa) { - - StringBuilder hql = new StringBuilder(""); - hql.append("select distinct "); - hql.append(" new com.rjconsultores.ventaboletos.entidad.Corrida("); - hql.append(" c.marca, "); - hql.append(" c.id.corridaId, "); - hql.append(" c.id.feccorrida, "); - hql.append(" c.origem, "); - hql.append(" c.destino, "); - hql.append(" c.claseServicio, "); - hql.append(" c.corridaCtrl.horario) "); - hql.append("from "); - hql.append(" Corrida c "); - hql.append(" where c.activo = 1 "); - - if (empresa != null) { - hql.append(" and c.empresa = :empresa "); - } - if (linha != null) { - hql.append(" and c.ruta = :linha "); - } - if (ori != null) { - hql.append(" and c.origem = :origen "); - } - if (des != null) { - hql.append(" and c.destino = :destino"); - } - if (cs != null) { - hql.append(" and c.claseServicio = :claseServicio "); - } - if (dataInicial != null) { - - hql.append(" and c.corridaCtrl.horario >= :horaSalidaInicio"); - } - if (dataFinal != null) { - - hql.append(" and c.corridaCtrl.horario <= :horaSalidaFin"); - } - - hql.append(" order by c.id.corridaId,c.corridaCtrl.horario"); - - Query query = getSession().createQuery(hql.toString()); - - if (empresa != null) { - query.setParameter("empresa", empresa); - } - if (linha != null) { - query.setParameter("linha", linha); - } - if (ori != null) { - query.setParameter("origen", ori); - } - if (des != null) { - query.setParameter("destino", des); - } - if (cs != null) { - query.setParameter("claseServicio", cs); - } - - if (dataInicial != null) { - - query.setParameter("horaSalidaInicio", dataInicial); - } - if (dataFinal != null) { - query.setParameter("horaSalidaFin", dataFinal); - - } - - return query.list(); - } - - @Transactional - public void borrar(Corrida entidad) { - try { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(0); - actualizacion(entidad); - } catch (Exception e) { - log.error("Erro ao inativar Corrida ", e); - } - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; + +import org.apache.commons.lang.math.NumberUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.Transformers; +import org.hibernate.type.BooleanType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CorridaDAO; +import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaLocalidadeRemovida; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.Corrida.Id; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; +import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; + +/** + * + * @author rodrigo + */ +@SuppressWarnings("unchecked") +@Repository("corridaDAO") +public class CorridaHibernateDAO extends GenericHibernateDAO implements CorridaDAO { + + @Autowired + private SQLBuilder sqlBuilder; + private static final Integer ULTIMA_HORA_DIA = Integer.valueOf(23); + private static final Integer ULTIMO_MINUTO_SEGUNDO = Integer.valueOf(59); + private static final Integer ULTIMO_MILLISEGUNDO = Integer.valueOf(99); + @Autowired + private CorridaTramoDAO corridaTramoDao; + + private static final Logger log = LogManager.getLogger(CorridaHibernateDAO.class); + + @Autowired + public CorridaHibernateDAO(@Qualifier("sessionFactory") final SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public Boolean existe(final Id id) { + + Criteria c = makeCriteria(); + c.setProjection(Projections.rowCount()); + c.add(Restrictions.eq("id", id)); + + Long cant = HibernateFix.count(c.list()); + + return (cant > 0); + } + + @Override + public Boolean existeActivo(final Id id) { + + Criteria c = makeCriteria(); + + c.setProjection(Projections.rowCount()); + c.add(Restrictions.eq("id", id)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + + Long cant = HibernateFix.count(c.list()); + + return (cant > 0); + } + + @Override + public Corrida suscribir(final Corrida entity) { + + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.GERAR_CAMPO_EQUIVALENCIA_CORRIDA.getDescricao())) { + String sql = "SELECT CORRIDA_EQUIVALENCIA_SEQ.NEXTVAL FROM DUAL"; + Object o = this.getSession().createSQLQuery(sql).uniqueResult(); + entity.setEquivalenciaId(o.toString()); + } + + Corrida corrida = super.suscribir(entity); + this.getSession().flush(); + return corrida; + } + + @Override + public List buscarPorAutobusCorridasFuturas(final DiagramaAutobus diagramaAutobus) { + String hql = " select co from Corrida co, Autobus ab " + + " where ab.autobusId = co.autobus.autobusId " + + " and ab.diagramaAutobus.diagramaautobusId = " + diagramaAutobus.getDiagramaautobusId() + + " and co.id.feccorrida > current_timestamp()"; + + Query sq = getSession().createQuery(hql); + + List lsCorridas = sq.list(); + + return lsCorridas; + } + + @Override + public List buscarPorRolOperativoCorridasFuturas(final DiagramaAutobus diagramaAutobus) { + String hql = " select co from Corrida co, RolOperativo rol " + + " where rol.roloperativoId = co.rolOperativo.roloperativoId " + + " and rol.diagramaAutobus.diagramaautobusId = " + diagramaAutobus.getDiagramaautobusId() + + " and co.id.feccorrida > current_timestamp()"; + + Query sq = getSession().createQuery(hql); + List lsCorridas = sq.list(); + + return lsCorridas; + } + + @Override + public List buscarPorFecCorrida(final Date value) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + + c.add(Restrictions.eq("id.feccorrida", value)); + + return c.list(); + } + + @Override + public Long count(final Ruta ruta) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("ruta", ruta)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.setProjection(Projections.rowCount()); + + return HibernateFix.count(c.list()); + + } + + @Override + public List verificarCorridaId(Integer corridaId) { + + StringBuilder hql = new StringBuilder(); + hql.append("select distinct "); + hql.append(" new com.rjconsultores.ventaboletos.entidad.Corrida("); + hql.append(" c.id.corridaId, "); + hql.append(" c.origem, "); + hql.append(" c.destino) "); + hql.append("from "); + hql.append(" Corrida c "); + hql.append("where "); + hql.append(" 1 = 1 "); + hql.append(" and c.activo = 1 "); + hql.append(" and cast(c.id.corridaId as string) like :corridaId "); + hql.append(" group by "); + hql.append(" c.id.corridaId, "); + hql.append(" c.origem, "); + hql.append(" c.destino) "); + + Query sq = getSession().createQuery(hql.toString()); + + if (corridaId != null) { + sq.setParameter("corridaId", corridaId.toString() + '%'); + } else { + sq.setParameter("corridaId", '%'); + } + + return sq.list(); + } + + @Override + public List buscarPorId(final Integer idCorrida) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.add(Restrictions.eq("id.corridaId", idCorrida)); + + return c.list(); + } + + @Override + public List buscarFiltro(final Parada ori, final Parada des, final Date hora, final ClaseServicio cs) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.add(Restrictions.eq("origem", ori)); + c.add(Restrictions.eq("destino", des)); + c.add(Restrictions.between("fechorsalida", getDiaGeracaoHoraIni(hora), getDiaGeracaoHoraFim(hora))); + c.add(Restrictions.eq("claseServicio", cs)); + + return c.list(); + } + + @Override + public boolean count(final Parada ori, final Parada des, final Date hora, + final ClaseServicio cs, final boolean pisoExtra) { + + Criteria c = makeCriteria(); + c.setProjection(Projections.rowCount()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.add(Restrictions.eq("origem", ori)); + c.add(Restrictions.eq("destino", des)); + c.add(Restrictions.between("fechorsalida", getDiaGeracaoHoraIni(hora), getDiaGeracaoHoraFim(hora))); + c.add(Restrictions.eq("claseServicio", cs)); + + // Se for piso extra numPiso = 2 + if (pisoExtra) { + // Corrida Piso Extra + c.add(Restrictions.eq("numPiso", 2)); + } else { + // num piso == null ou diferente de 2 + c.add(Restrictions.or(Restrictions.not(Restrictions.eq("numPiso", 2)), Restrictions.isNull("numPiso"))); + } + + Long cant = HibernateFix.count(c.list()); + + return (cant > 0); + } + + private Date getDiaGeracaoHoraIni(final Date hora) { + Date dataCorreta = new Date(); + + // para pegar a hora e adicionar ao dia da geracao: + GregorianCalendar gAux = new GregorianCalendar(); + gAux.setTime(hora); + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(hora); + gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); + gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); + gcalendar.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); + gcalendar.set(Calendar.MILLISECOND, NumberUtils.INTEGER_ZERO); + + dataCorreta = gcalendar.getTime(); + + return dataCorreta; + } + + private Date getDiaGeracaoHoraFim(final Date hora) { + Date dataCorreta = new Date(); + + // para pegar a hora e adicionar ao dia da geracao: + GregorianCalendar gAux = new GregorianCalendar(); + gAux.setTime(hora); + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(hora); + gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); + gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); + gcalendar.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); + gcalendar.set(Calendar.MILLISECOND, ULTIMA_HORA_DIA); + + dataCorreta = gcalendar.getTime(); + + return dataCorreta; + } + + @Override + public List buscarDistinct(final Parada ori, final Parada des, final Date horaSalidaInicio, + final Date horaSalidaFin, final ClaseServicio cs, final Integer corridaId) { + StringBuilder hql = new StringBuilder(""); + hql.append("select distinct "); + hql.append(" new com.rjconsultores.ventaboletos.entidad.Corrida("); + hql.append(" c.marca, "); + hql.append(" c.id.corridaId, "); + hql.append(" c.origem, "); + hql.append(" c.destino, "); + hql.append(" c.claseServicio, "); + hql.append(" c.corridaCtrl.horario) "); + hql.append("from "); + hql.append(" Corrida c "); + hql.append("where "); + hql.append(" 1 = 1 "); + if (ori != null) { + hql.append(" and c.origem = :origen "); + } + if (des != null) { + hql.append(" and c.destino = :destino"); + } + if (cs != null) { + hql.append(" and c.claseServicio = :claseServicio "); + } + if (corridaId != null) { + hql.append(" and c.id.corridaId = :corridaId "); + } + if (horaSalidaInicio != null) { + + hql.append(" and c.corridaCtrl.horario >= :horaSalidaInicio"); + } + if (horaSalidaFin != null) { + + hql.append(" and c.corridaCtrl.horario <= :horaSalidaFin"); + } + + hql.append(" order by c.id.corridaId,c.corridaCtrl.horario"); + + Query query = getSession().createQuery(hql.toString()); + + if (ori != null) { + query.setParameter("origen", ori); + } + if (des != null) { + query.setParameter("destino", des); + } + if (cs != null) { + query.setParameter("claseServicio", cs); + } + if (corridaId != null) { + query.setParameter("corridaId", corridaId); + } + + if (horaSalidaInicio != null) { + + query.setParameter("horaSalidaInicio", horaSalidaInicio); + } + if (horaSalidaFin != null) { + query.setParameter("horaSalidaFin", horaSalidaFin); + + } + + return query.list(); + } + + @Override + public boolean existe(final Ruta ruta, final Date fecCorrida, final Date horaCorrida, + final ClaseServicio claseServicio, final Marca marca, final boolean pisoExtra) { + Calendar soloFecha = Calendar.getInstance(); + soloFecha.setTime(fecCorrida); + soloFecha.set(Calendar.HOUR, NumberUtils.INTEGER_ZERO); + soloFecha.set(Calendar.MINUTE, NumberUtils.INTEGER_ZERO); + soloFecha.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); + soloFecha.set(Calendar.MILLISECOND, NumberUtils.INTEGER_ZERO); + + Criteria c = makeCriteria(); + c.setProjection(Projections.rowCount()); + c.add(Restrictions.eq("ruta", ruta)); + c.add(Restrictions.eq("id.feccorrida", soloFecha.getTime())); + c.add(Restrictions.eq("claseServicio", claseServicio)); + c.add(Restrictions.eq("marca", marca)); + + // Se for piso extra numPiso = 2 + if (pisoExtra) { + // Corrida Piso Extra + c.add(Restrictions.eq("numPiso", 2)); + } else { + // num piso == null ou diferente de 2 + c.add(Restrictions.or(Restrictions.not(Restrictions.eq("numPiso", 2)), Restrictions.isNull("numPiso"))); + } + + Criteria cCorridaCtrl = c.createCriteria("corridaCtrl"); + cCorridaCtrl.add(Restrictions.eq("horario", horaCorrida)); + + Long cant = HibernateFix.count(c.list()); + + return (cant > 0); + } + + @Override + public Long cantCorridaGeneradasHoy() { + Calendar cTmp1 = Calendar.getInstance(); + Calendar cTmp2 = Calendar.getInstance(); + + cTmp1.set(Calendar.HOUR_OF_DAY, NumberUtils.INTEGER_ZERO); + cTmp1.set(Calendar.MINUTE, NumberUtils.INTEGER_ZERO); + cTmp1.set(Calendar.MILLISECOND, NumberUtils.INTEGER_ZERO); + cTmp1.set(Calendar.SECOND, NumberUtils.INTEGER_ZERO); + + cTmp2.set(Calendar.HOUR_OF_DAY, ULTIMA_HORA_DIA); + cTmp2.set(Calendar.MINUTE, ULTIMO_MINUTO_SEGUNDO); + cTmp2.set(Calendar.SECOND, ULTIMO_MINUTO_SEGUNDO); + cTmp2.set(Calendar.MILLISECOND, ULTIMO_MILLISEGUNDO); + + String sql = "select count(c.fecmodif) from Corrida c where c.fecmodif between :inicio and :fim"; + + Query query = getSession().createQuery(sql); + query.setParameter("inicio", cTmp1.getTime()); + query.setParameter("fim", cTmp2.getTime()); + Long count = HibernateFix.count(query.uniqueResult()); + + return count; + } + + @Override + public List buscarGroupCorrridaId(final Integer corridaId, final Integer origem, final Integer destino, + final Integer ruta, final Integer numRuta, final Date dateInicio, final Date dateFin) { + + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT c.corrida_id "); + sql.append(" FROM corrida c "); + if (numRuta != null) { + sql.append(" INNER JOIN Ruta r ON r.ruta_id=c.ruta_id "); + } + sql.append(" WHERE c.feccorrida BETWEEN :dateInicio AND :dateFin "); + sql.append(" AND c.corrida_id LIKE :corridaId "); + + if (origem != null) { + sql.append(" AND c.ORIGEN_ID=:origem"); + } + if (destino != null) { + sql.append(" AND c.DESTINO_ID=:destino"); + } + if (ruta != null) { + sql.append(" AND c.RUTA_ID=:ruta"); + } + if (numRuta != null) { + sql.append(" AND r.NUMRUTA=:numRuta"); + } + + sql.append(" GROUP BY c.corrida_id "); + + Query sq = getSession().createSQLQuery(sql.toString()); + + if (corridaId != null) { + sq.setParameter("corridaId", corridaId.toString() + '%'); + } else { + sq.setParameter("corridaId", '%'); + } + + if (origem != null) { + sq.setParameter("origem", origem); + } + if (destino != null) { + sq.setParameter("destino", destino); + } + if (ruta != null) { + sq.setParameter("ruta", ruta); + } + if (numRuta != null) { + sq.setParameter("numRuta", numRuta.toString()); + } + + sq.setParameter("dateInicio", dateInicio); + sq.setParameter("dateFin", dateFin); + + List lsObject = sq.list(); + + List lsCorridas = new ArrayList(); + + if (lsObject != null && !lsObject.isEmpty()) { + + for (Object object : lsObject) { + + BigDecimal id = (BigDecimal) object; + + StringBuffer hql = new StringBuffer(); + hql.append(" FROM Corrida "); + hql.append(" WHERE id.corridaId = " + id); + hql.append(origem != null ? " AND origem.paradaId = :origem " : ""); + hql.append(destino != null ? " AND destino.paradaId = :destino " : ""); + hql.append(ruta != null ? " AND ruta.rutaId = :ruta " : ""); + hql.append(numRuta != null ? " AND ruta.numRuta = :numruta " : ""); + + Query squery = getSession().createQuery(hql.toString()); + + if (origem != null) + squery.setParameter("origem", origem); + + if (destino != null) + squery.setParameter("destino", destino); + + if (ruta != null) + squery.setParameter("ruta", ruta); + + if (numRuta != null) + squery.setParameter("numruta", numRuta.toString()); + + squery.setMaxResults(NumberUtils.INTEGER_ONE); + + List lsCorridasAux = squery.list(); + + if (lsCorridasAux != null && !lsCorridasAux.isEmpty()) { + lsCorridas.add(lsCorridasAux.iterator().next()); + } + } + } + + return lsCorridas; + } + + @Override + public List buscarGroupCorrridaId(final Integer corridaId, final Date dateInicio, final Date dateFin) { + + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT c.corrida_id "); + sql.append(" FROM corrida c "); + sql.append(" WHERE c.feccorrida BETWEEN :dateInicio AND :dateFin "); + sql.append(" AND c.corrida_id LIKE :corridaId "); + sql.append(" GROUP BY c.corrida_id "); + + Query sq = getSession().createSQLQuery(sql.toString()); + + if (corridaId != null) { + sq.setParameter("corridaId", corridaId.toString() + '%'); + } else { + sq.setParameter("corridaId", '%'); + } + + sq.setParameter("dateInicio", dateInicio); + sq.setParameter("dateFin", dateFin); + + List lsObject = sq.list(); + + List lsCorridas = new ArrayList(); + + if (lsObject != null && !lsObject.isEmpty()) { + + for (Object object : lsObject) { + + BigDecimal id = (BigDecimal) object; + + StringBuilder hql = new StringBuilder(); + hql.append(" FROM Corrida "); + hql.append(" WHERE id.corridaId = " + id); + hql.append(" and id.feccorrida BETWEEN :dateInicio AND :dateFin"); + + Query squery = getSession().createQuery(hql.toString()); + squery.setParameter("dateInicio", dateInicio); + squery.setParameter("dateFin", dateFin); + squery.setMaxResults(NumberUtils.INTEGER_ONE); + + List lsCorridasAux = squery.list(); + + if (lsCorridasAux != null && !lsCorridasAux.isEmpty()) { + lsCorridas.add(lsCorridasAux.iterator().next()); + } + } + } + + return lsCorridas; + } + + @Override + public void actualizaFecHusoFecVerano(final Corrida corrida) { + + Integer corridaId = corrida.getId().getCorridaId(); + Date feccorrida = corrida.getId().getFeccorrida(); + + Query queryCorrida = getSession().createQuery( + sqlBuilder.getSQLActualizarCorridaFecHusoFecVerano()); + queryCorrida.setInteger("corridaId", corridaId); + queryCorrida.setInteger("corridaId", corridaId); + queryCorrida.setDate("feccorrida", feccorrida); + queryCorrida.executeUpdate(); + + Query queryCorridaTramo = getSession().createQuery( + sqlBuilder.getSQLActualizarCorridaTramoFecHusoFecVerano()); + queryCorridaTramo.setInteger("corridaId", corridaId); + queryCorridaTramo.setDate("feccorrida", feccorrida); + queryCorridaTramo.executeUpdate(); + } + + @SuppressWarnings("deprecation") + @Override + public void actualizaFecHusoFecVerano(final List corridas) { + + for (Corrida corrida : corridas) { + + Date husoHorVeranoLlegadaAnterior = null; + Date fechorSalidaOriginalUpdate = null; + Date fechorsalidaUpdate = null; + Date fechorllegadaUpdate = null; + Integer corridatramoId = 0; + Date fechorSalidaOriginal = null; + Date fechorsalida = null; + Date fechorllegada = null; + Integer tiempoHorHusoOrigem = Integer.valueOf(0); + Integer tiempoHorVeranoOrigem = Integer.valueOf(0); + Integer tiempoHorHusoDestino = Integer.valueOf(0); + Integer tiempoHorVeranoDestino = Integer.valueOf(0); + Date tiempoestancia = null; + + List tramos = buscarTramosCorrida(corrida); + + for (Object[] objeto : tramos) { + corridatramoId = Integer.valueOf(objeto[0].toString()); + fechorSalidaOriginal = (Date) objeto[2]; + fechorsalida = (Date) objeto[3]; + fechorllegada = (Date) objeto[4]; + tiempoHorHusoOrigem = Integer.valueOf(objeto[5].toString()); + tiempoHorVeranoOrigem = Integer.valueOf(objeto[6].toString()); + tiempoHorHusoDestino = Integer.valueOf(objeto[7].toString()); + tiempoHorVeranoDestino = Integer.valueOf(objeto[8].toString()); + tiempoestancia = (Date) objeto[9]; + + if (husoHorVeranoLlegadaAnterior == null) { + fechorSalidaOriginalUpdate = fechorSalidaOriginal; + fechorsalidaUpdate = fechorsalida; + } else { + fechorSalidaOriginalUpdate = husoHorVeranoLlegadaAnterior; + fechorsalidaUpdate = husoHorVeranoLlegadaAnterior; + } + + husoHorVeranoLlegadaAnterior = calcularHusoHorVeranoLlegada( + fechorsalida, + fechorllegada, + fechorsalidaUpdate, + tiempoHorHusoOrigem + tiempoHorVeranoOrigem, + tiempoHorHusoDestino + tiempoHorVeranoDestino); + + if (tiempoestancia != null) { + Calendar aux = Calendar.getInstance(); + aux.setTime(DateUtil.normalizar(husoHorVeranoLlegadaAnterior)); + aux.add(Calendar.MINUTE, tiempoestancia.getMinutes()); + aux.add(Calendar.HOUR_OF_DAY, tiempoestancia.getHours()); + + husoHorVeranoLlegadaAnterior = aux.getTime(); + + Calendar auxFechorsalidaUpdate = Calendar.getInstance(); + auxFechorsalidaUpdate.setTime(DateUtil.normalizar(fechorsalidaUpdate)); + auxFechorsalidaUpdate.add(Calendar.MINUTE, tiempoestancia.getMinutes()); + auxFechorsalidaUpdate.add(Calendar.HOUR_OF_DAY, tiempoestancia.getHours()); + + fechorsalidaUpdate = auxFechorsalidaUpdate.getTime(); + } + + if (husoHorVeranoLlegadaAnterior != null) { + fechorllegadaUpdate = husoHorVeranoLlegadaAnterior; + } else { + fechorllegadaUpdate = fechorllegada; + } + + Query queryCorridaTramo = getSession().createQuery(sqlBuilder.getSQLActualizarCorridaTramoFecHusoFecVerano()); + queryCorridaTramo.setTimestamp("fechorSalidaOriginalH", fechorSalidaOriginalUpdate); + queryCorridaTramo.setTimestamp("fechorsalidaH", fechorsalidaUpdate); + queryCorridaTramo.setTimestamp("fechorllegadaH", fechorllegadaUpdate); + queryCorridaTramo.setInteger("corridatramoId", corridatramoId); + queryCorridaTramo.executeUpdate(); + } + } + } + + private Date calcularHusoHorVeranoLlegada(Date fechorsalida, Date fechorllegada, Date fechorsalidaH, int tiempoOrigen, int tiempoDestino) { + Calendar horLlegada = null; + + // Si los tiempos son distintos, hube cambio de huso horario/horario de verano + + long elapsedMinutes = DateUtil.getElapsedMinutos(fechorsalida, fechorllegada); + + horLlegada = Calendar.getInstance(); + horLlegada.setTime(fechorsalidaH); + horLlegada.add(Calendar.MINUTE, (int) elapsedMinutes); + + if (tiempoOrigen != tiempoDestino) { + horLlegada.add(Calendar.HOUR, difHuso(tiempoOrigen, tiempoDestino)); + + } + + return (horLlegada == null) ? null : horLlegada.getTime(); + } + + private int difHuso(int a, int b) { + return b - a; + } + + @Override + public List buscarPorEstado(final Estado estado, final Date dataInicial, Integer corridaId) { + StringBuilder hql = new StringBuilder(); + + hql.append(" select "); + hql.append(" distinct new com.rjconsultores.ventaboletos.entidad.Corrida").append("("); + hql.append(" ct.corrida.id.corridaId, "); + hql.append(" ct.corrida.id.feccorrida").append(")"); + hql.append(" from CorridaTramo ct "); + hql.append(" left join ct.origem.ciudad.estado eo "); + hql.append(" left join ct.destino.ciudad.estado ed "); + hql.append(" where ct.corrida.activo = :isActivo "); + hql.append(" and ct.corrida.id.feccorrida >= :feccorrida "); + hql.append(" and ( eo.estadoId = :estadoId "); + hql.append(" or ed.estadoId = :estadoId )"); + if (corridaId != null) { + hql.append(" and ct.corrida.id.corridaId = :corridaId )"); + } + hql.append(" group by "); + hql.append(" ct.corrida.id.corridaId, "); + hql.append(" ct.corrida.id.feccorrida "); + + Query query = getSession().createQuery(hql.toString()); + query.setInteger("isActivo", ActivoUtil.ATIVO); + query.setDate("feccorrida", dataInicial); + query.setInteger("estadoId", estado.getEstadoId()); + + if (corridaId != null) { + query.setInteger("corridaId", corridaId); + } + + return query.list(); + } + + @Override + public List buscarPorEstado(final Estado estado, final Date dataInicial) { + return buscarPorEstado(estado, dataInicial, null); + } + + private List buscarTramosCorrida(final Corrida corrida) { + StringBuilder hql = new StringBuilder(); + + hql.append(" select "); + hql.append(" ct.corridatramoId, "); + hql.append(" ct.numsecuencia,"); + hql.append(" ct.fechorSalidaOriginal,"); + hql.append(" ct.fechorsalida,"); + hql.append(" ct.fechorllegada,"); + hql.append(" nvl(estadoO.tiempoHorHuso, 0) as tiempoHorHusoOrigem,"); + hql.append(" nvl( case when "); + hql.append(" ct.fechorSalidaOriginal between "); + hql.append(" estadoO.fecInicioHorVerano "); + hql.append(" and estadoO.fecFinoHorVerano "); + hql.append(" then (estadoO.tiempoHorVerano)"); + hql.append(" else 0 end, 0) as tiempoHorVeranoOrigem,"); + hql.append(" nvl(estadoD.tiempoHorHuso, 0) as tiempoHorHusoDestino,"); + hql.append(" nvl( case when "); + hql.append(" ct.fechorSalidaOriginal between "); + hql.append(" estadoD.fecInicioHorVerano "); + hql.append(" and estadoD.fecFinoHorVerano "); + hql.append(" then (estadoD.tiempoHorVerano)"); + hql.append(" else 0 end, 0) as tiempoHorVeranoDestino,"); + hql.append(" ct.tiempoEstancia "); + hql.append(" from CorridaTramo ct "); + hql.append(" inner join ct.origem origem "); + hql.append(" inner join origem.ciudad ciudadO "); + hql.append(" inner join ciudadO.estado estadoO "); + hql.append(" inner join ct.destino destino "); + hql.append(" inner join destino.ciudad ciudadD "); + hql.append(" inner join ciudadD.estado estadoD "); + + hql.append(" where ct.corrida.activo = :isActivo "); + hql.append(" and ct.activo = :isActivo "); + hql.append(" and ct.corrida.id.corridaId = :corridaId "); + hql.append(" and ct.corrida.id.feccorrida = :feccorrida "); + hql.append(" order by "); + hql.append(" ct.numsecuencia "); + + Query query = getSession().createQuery(hql.toString()); + query.setInteger("isActivo", ActivoUtil.ATIVO); + query.setDate("feccorrida", corrida.getId().getFeccorrida()); + query.setInteger("corridaId", corrida.getId().getCorridaId()); + + return query.list(); + } + + @Override + public Corrida buscaCorrridaFutura(Ruta ruta, Date fecInicio) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("ruta", ruta)); + c.add(Restrictions.gt("fechorsalida", fecInicio)); + c.addOrder(Order.asc("fechorsalida")); + List lsCorrida = c.list(); + if (!lsCorrida.isEmpty()) { + return lsCorrida.get(0); + } + return null; + } + + @Override + public Boolean editarCorridaPorOutraCorrida(List corridas, Corrida corridaPadrao) { + List tramosPadrao = corridaTramoDao.buscarCorridaTramoPorCorrida(corridaPadrao); + + for (Corrida corrida : corridas) { + List tramos = corridaTramoDao.buscarCorridaTramoPorCorrida(corrida); + + try{ + for (CorridaTramo tramo : tramos) { + + for (CorridaTramo tramoPadrao : tramosPadrao) { + if (tramoPadrao.getNumsecuencia().equals(tramo.getNumsecuencia())) { + tramo.setFechorsalida(mudarData(tramoPadrao.getFechorsalida(), tramo.getFechorsalida())); + tramo.setFechorsalidaH(mudarData(tramoPadrao.getFechorsalidaH(), tramo.getFechorsalidaH())); + tramo.setFechorSalidaOriginal(mudarData(tramoPadrao.getFechorSalidaOriginal(), tramo.getFechorSalidaOriginal())); + tramo.setFechorllegada(mudarData(tramoPadrao.getFechorllegada(), tramo.getFechorllegada())); + tramo.setFechorllegadaH(mudarData(tramoPadrao.getFechorllegadaH(), tramo.getFechorllegadaH())); + corridaTramoDao.actualizacion(tramo); + break; + } + } + } + }catch(Exception e){ + log.error(e.getMessage()); + } + + } + return true; + } + + private Date mudarData(Date dataPadrao, Date dataMudanca) { + try{ + Calendar calPadrao = Calendar.getInstance(); + calPadrao.setTime(dataPadrao); + Calendar calMudanca = Calendar.getInstance(); + calMudanca.setTime(dataMudanca); + + calMudanca.set(calMudanca.get(Calendar.YEAR), calMudanca.get(Calendar.MONTH), calMudanca.get(Calendar.DAY_OF_MONTH), + calPadrao.get(Calendar.HOUR_OF_DAY), calPadrao.get(Calendar.MINUTE), calPadrao.get(Calendar.SECOND)); + return calMudanca.getTime(); + }catch(Exception e){ + return null; + } + } + + @Override + public Corrida buscarPorId(Id id) { + + StringBuilder hql = new StringBuilder(); + + hql.append(" from Corrida corrida "); + hql.append(" where corrida.id.feccorrida = :feccorrida "); + hql.append(" and corrida.id.corridaId = :corridaId )"); + + Query query = getSession().createQuery(hql.toString()); + query.setDate("feccorrida", id.getFeccorrida()); + query.setInteger("corridaId", id.getCorridaId()); + + query.setMaxResults(1); + return (Corrida)query.uniqueResult(); + } + + @Override + public Corrida buscarCorridaAtivaPorId(Id id) { + + StringBuilder hql = new StringBuilder(); + + hql.append(" from Corrida corrida "); + hql.append(" where corrida.id.feccorrida = :feccorrida "); + hql.append(" and corrida.id.corridaId = :corridaId "); + hql.append(" and corrida.activo = 1 "); + hql.append(" and corrida.indstatuscorrida = 'H' "); + + Query query = getSession().createQuery(hql.toString()); + query.setDate("feccorrida", id.getFeccorrida()); + query.setInteger("corridaId", id.getCorridaId()); + + query.setMaxResults(1); + return (Corrida)query.uniqueResult(); + } + + private List buscaCorridaFutura(){ + List corridaList = new ArrayList(); + + return corridaList; + } + + @Override + public List buscarCorridaRelAproveitamento(Parada origem, Parada destino, + Date feccorrida, Integer corridaId) { + + StringBuilder sql = new StringBuilder(); + sql.append(" select "); + sql.append(" c.corrida_id as corrida_id, "); + sql.append(" c.feccorrida as feccorrida, "); + sql.append(" c.fechorsalida as fechorsalida, "); + sql.append(" origen.parada_id as origen_id, "); + sql.append(" origen.descparada as origen, "); + sql.append(" destino.parada_id as destino_id, "); + sql.append(" destino.descparada as destino, "); + sql.append(" r.ruta_id as ruta_id, "); + sql.append(" r.descruta as descruta, "); + sql.append(" cs.claseservicio_id as claseservicio_id, "); + sql.append(" cs.descclase as descclase "); + sql.append(" from corrida c "); + sql.append(" inner join parada origen on c.origen_id = origen.parada_id "); + sql.append(" inner join parada destino on c.destino_id = destino.parada_id "); + sql.append(" inner join ruta r on c.ruta_id = r.ruta_id "); + sql.append(" inner join clase_servicio cs on c.claseservicio_id = cs.claseservicio_id "); + sql.append(" where c.activo <> 0 "); + if (corridaId != null) { + sql.append(" and c.corrida_id = :corridaId "); + } + sql.append(feccorrida == null ? "" : " and c.feccorrida = :feccorrida "); + if (origem != null) { + sql.append(origem == null ? "" : " and c.origen_id = :origen_id "); + } + if (destino != null) { + sql.append(destino == null ? "" : " and c.destino_id = :destino_id "); + } + + Query query = getSession().createSQLQuery(sql.toString()); + if (corridaId != null) { + query.setParameter("corridaId", corridaId); + } + query.setParameter("feccorrida", feccorrida); + if (origem != null) { + query.setParameter("origen_id", origem.getParadaId()); + } + if (destino != null) { + query.setParameter("destino_id", destino.getParadaId()); + } + + List lsObject = query.list(); + + List lsCorridas = new ArrayList(); + + if (lsObject != null && !lsObject.isEmpty()) { + + for (Object object : lsObject) { + if (object != null) { + Object objectArray[] = (Object[]) object; + Id id = new Id(); + id.setCorridaId(((BigDecimal) objectArray[0]).intValue()); + id.setFeccorrida((Timestamp) objectArray[1]); + + Parada o = new Parada(); + o.setParadaId(((BigDecimal) objectArray[3]).intValue()); + o.setDescparada((String) objectArray[4]); + + Parada d = new Parada(); + d.setParadaId(((BigDecimal) objectArray[5]).intValue()); + d.setDescparada((String) objectArray[6]); + + Ruta ruta = new Ruta(); + ruta.setRutaId(((BigDecimal) objectArray[7]).intValue()); + ruta.setDescruta((String) objectArray[8]); + + ClaseServicio claseServicio = new ClaseServicio(); + claseServicio.setClaseservicioId(((BigDecimal) objectArray[9]).intValue()); + claseServicio.setDescclase((String) objectArray[10]); + + Corrida corrida = new Corrida(); + corrida.setId(id); + corrida.setFechorsalida((Timestamp) objectArray[2]); + corrida.setOrigem(o); + corrida.setDestino(d); + corrida.setRuta(ruta); + corrida.setClaseServicio(claseServicio); + + lsCorridas.add(corrida); + } + } + } + return lsCorridas; + } + + @Override + public Boolean existeCorrida(Long id) { + StringBuilder sql = new StringBuilder(); + sql.append("SELECT CORRIDA_ID FROM CORRIDA corrida "); + sql.append("WHERE CORRIDA_ID = " + id + " AND ACTIVO = 1"); + + Query query = getSession().createSQLQuery(sql.toString()); + + return query.list().size() > 0; + } + + @Override + @Transactional(rollbackFor = { BusinessException.class }) + public Integer atualizaCorridasIntegracaoTotvs(Marca marca, Date dataIncial, Date dataFinal, Integer corridaId) throws BusinessException { + + // update caja set integradototvs = 0 where PUNTOVENTA_ID = 269 and FECHORVENTA >= '30/03/2018' and FECHORVENTA <= '01/04/2018'; + StringBuilder sb = new StringBuilder(); + sb.append(" update corrida set integradototvs = 0 "); + sb.append(" where FECCORRIDA >= :fechorInicial "); + sb.append(" and FECCORRIDA <= :fechorFinal "); + sb.append(" and CORRIDA_ID = :corridaId "); + if (marca != null) { + sb.append(" and MARCA_ID = :marcaId "); + } + SQLQuery query = getSession().createSQLQuery(sb.toString()); + if (marca != null) { + query.setInteger("marcaId", marca.getMarcaId()); + } + query.setInteger("corridaId", corridaId); + query.setTimestamp("fechorInicial", dataIncial); + query.setTimestamp("fechorFinal", dataFinal); + Integer result = query.executeUpdate(); + return result; + } + + @Override + public List buscarListaPorIds(List corridaIds){ + + StringBuilder hql = new StringBuilder(); + hql.append(" select co ") + .append(" from Corrida co") + .append(" where co.activo = 1 ") + .append(" and co.id in ( :corridaIds )"); + + Query query = getSession().createQuery(hql.toString()); + query.setParameterList("corridaIds", corridaIds); + List lsCorridas = query.list(); + + List listCorrida = new ArrayList(); + for (Corrida corrida : lsCorridas) { + CorridaVO co = new CorridaVO(corrida); + + preencherTramoSequencia(co, corrida); + + listCorrida.add(co); + } + + return listCorrida; + } + + @Override + public CorridaVO buscarVOPorId(Id corridaId){ + + StringBuilder sb = new StringBuilder(); + sb.append(" select "); + sb.append(" c.corrida_id as corridaId, "); + sb.append(" to_char(c.feccorrida, 'dd/MM/yyyy') as feccorrida, "); + sb.append(" c.corrida_id as numCorrida, "); + sb.append(" to_char(c.fechorsalida, 'dd/MM/yyyy HH24:mi:ss')||'.000' as fechorsalida, "); + sb.append(" c.origen_id as origenId, "); + sb.append(" c.destino_id as destinoId, "); + sb.append(" c.tiposervicio_id as tipoServicioId, "); + sb.append(" c.roloperativo_id as rolOperativoId, "); + sb.append(" c.claseservicio_id as claseServicioId, "); + sb.append(" c.empresacorrida_id as empresaId, "); + sb.append(" mar.marca_id as marcaId, "); + sb.append(" emp.indtabelaprecoembarcada as tarifaEmbarcada, "); + sb.append(" c.ruta_id as rutaId "); + sb.append(" from corrida c "); + sb.append(" JOIN empresa emp ON emp.empresa_id = c.empresacorrida_id "); + sb.append(" JOIN marca mar ON mar.empresa_id = emp.empresa_id "); + sb.append(" AND mar.activo = 1 "); + sb.append(" where c.activo = 1 "); + sb.append(" and C.CORRIDA_ID = :corridaId "); + sb.append(" and C.FECCORRIDA = :feccorrida "); + + Query query = getSession().createSQLQuery(sb.toString()) + .addScalar("corridaId", IntegerType.INSTANCE) + .addScalar("feccorrida", StringType.INSTANCE) + .addScalar("numCorrida", IntegerType.INSTANCE) + .addScalar("fechorsalida", StringType.INSTANCE) + .addScalar("origenId", IntegerType.INSTANCE) + .addScalar("destinoId", IntegerType.INSTANCE) + .addScalar("tipoServicioId", IntegerType.INSTANCE) + .addScalar("rolOperativoId", IntegerType.INSTANCE) + .addScalar("claseServicioId", IntegerType.INSTANCE) + .addScalar("empresaId", IntegerType.INSTANCE) + .addScalar("marcaId", IntegerType.INSTANCE) + .addScalar("tarifaEmbarcada", BooleanType.INSTANCE) + .addScalar("rutaId", IntegerType.INSTANCE) + .setResultTransformer(Transformers.aliasToBean(CorridaVO.class)); + + query.setParameter("corridaId", corridaId.getCorridaId()); + query.setParameter("feccorrida", corridaId.getFeccorrida()); + + return (CorridaVO)query.uniqueResult(); + + } + + private void preencherTramoSequencia(CorridaVO corridaVO, Corrida corrida ) { + + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT"); + sb.append(" CT.NUMSECUENCIA,"); + sb.append(" CT.ORIGEN_ID, "); + sb.append(" CT.DESTINO_ID, "); + sb.append(" CT.TRAMO_ID "); + sb.append(" FROM CORRIDA C"); + sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA"); + sb.append(" WHERE C.CORRIDA_ID = :corridaId AND C.FECCORRIDA = :feccorrida and CT.activo = 1 "); + sb.append(" ORDER BY CT.NUMSECUENCIA "); + + Query query = getSession().createSQLQuery(sb.toString()); + + query.setParameter("corridaId", corrida.getId().getCorridaId()); + query.setParameter("feccorrida", corrida.getId().getFeccorrida()); + + List lsSecuenciaVO = new ArrayList(); + List lsTramoVO = new ArrayList(); + List controle = new ArrayList(); + + List list = query.list(); + + for (Object[] item : list) { + final Integer origensecuencia = Integer.valueOf(item[0].toString()); + final Integer origen_id = Integer.valueOf(item[1].toString()); + + final Integer destinosecuencia = Integer.valueOf(item[0].toString()) + 1; + final Integer destino_id = Integer.valueOf(item[2].toString()); + + adicionarSequencia( + controle, + lsSecuenciaVO, + origensecuencia, + origen_id); + + adicionarSequencia( + controle, + lsSecuenciaVO, + destinosecuencia, + destino_id); + + //adiciona o id do tramo + lsTramoVO.add(Integer.valueOf(item[3].toString())); + } + + corridaVO.setListTramos( lsTramoVO ); + corridaVO.setLsSecuenciaVO( lsSecuenciaVO ); + } + + private void adicionarSequencia(List controle, List lsSecuenciaVO, final Integer numsecuencia, final Integer paradaId) { + final String key = numsecuencia.toString() + "|" + paradaId.toString(); + + if (!controle.contains(key)) { + SecuenciaVO sequencia = new SecuenciaVO(); + sequencia.setSecuencia(numsecuencia); + sequencia.setLocalidadeId(paradaId); + + lsSecuenciaVO.add(sequencia); + + controle.add(key); + } + } + + public Integer buscarOcupacaoCorrida(Corrida corrida) { + try { + if(corrida == null) { + return 0; + } + //TODO: VERIFICAR ERRO NA PESQUISA + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT"); + sb.append(" COUNT(BOLETO_ID) "); + sb.append(" FROM "); + sb.append(" BOLETO "); + sb.append(" WHERE "); + sb.append(" ACTIVO = 1 AND motivocancelacion_id IS NULL AND "); + sb.append(" CORRIDA_ID = :corridaId AND FECCORRIDA = :feccorrida "); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setParameter("corridaId", corrida.getId().getCorridaId()); + query.setParameter("feccorrida", corrida.getId().getFeccorrida()); + + BigDecimal resultado = (BigDecimal) query.uniqueResult(); + + return resultado.intValue(); + } catch (Exception e) { + log.error("Erro ao buscar ocupacao da corrida: " + corrida.getId().getCorridaId() + " - " + corrida.getId().getFeccorrida(), e); + } + + return 0; + } + + @SuppressWarnings("unchecked") + @Override + public List buscarCorridas(Parada ori, Parada des, Date dataInicial, Date dataFinal, ClaseServicio cs, + Ruta linha, Empresa empresa) { + + StringBuilder hql = new StringBuilder(""); + hql.append("select distinct "); + hql.append(" new com.rjconsultores.ventaboletos.entidad.Corrida("); + hql.append(" c.marca, "); + hql.append(" c.id.corridaId, "); + hql.append(" c.id.feccorrida, "); + hql.append(" c.origem, "); + hql.append(" c.destino, "); + hql.append(" c.claseServicio, "); + hql.append(" c.corridaCtrl.horario) "); + hql.append("from "); + hql.append(" Corrida c "); + hql.append(" where c.activo = 1 "); + + if (empresa != null) { + hql.append(" and c.empresa = :empresa "); + } + if (linha != null) { + hql.append(" and c.ruta = :linha "); + } + if (ori != null) { + hql.append(" and c.origem = :origen "); + } + if (des != null) { + hql.append(" and c.destino = :destino"); + } + if (cs != null) { + hql.append(" and c.claseServicio = :claseServicio "); + } + if (dataInicial != null) { + + hql.append(" and c.corridaCtrl.horario >= :horaSalidaInicio"); + } + if (dataFinal != null) { + + hql.append(" and c.corridaCtrl.horario <= :horaSalidaFin"); + } + + hql.append(" order by c.id.corridaId,c.corridaCtrl.horario"); + + Query query = getSession().createQuery(hql.toString()); + + if (empresa != null) { + query.setParameter("empresa", empresa); + } + if (linha != null) { + query.setParameter("linha", linha); + } + if (ori != null) { + query.setParameter("origen", ori); + } + if (des != null) { + query.setParameter("destino", des); + } + if (cs != null) { + query.setParameter("claseServicio", cs); + } + + if (dataInicial != null) { + + query.setParameter("horaSalidaInicio", dataInicial); + } + if (dataFinal != null) { + query.setParameter("horaSalidaFin", dataFinal); + + } + + return query.list(); + } + + @Transactional + public void borrar(Corrida entidad) { + try { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(0); + actualizacion(entidad); + } catch (Exception e) { + log.error("Erro ao inativar Corrida ", e); + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaInfoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaInfoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaInfoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaInfoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java index 2668a2a60..1863431ba 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaTramoHibernateDAO.java @@ -1,167 +1,167 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.ShortType; -import org.hibernate.type.TimestampType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -@Repository("corridaTramoDAO") -public class CorridaTramoHibernateDAO extends GenericHibernateDAO implements CorridaTramoDAO { - - @Autowired - public CorridaTramoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - private static final long serialVersionUID = 1L; - private static final Logger log = LogManager.getLogger(CorridaTramoHibernateDAO.class); - - @Override - public List obtenerTramoTarjetaEmitida() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.isNotNull("fechortarjetaviaje")); - c.add(Restrictions.isNull("indmanttarjeta")); - c.add(Restrictions.eq("numsecuencia", (short) 1)); - - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - - return c.list(); - } - - public List buscarTarjetaMesmaCorrida(CorridaTramo ct) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.add(Restrictions.eq("corrida", ct.getCorrida())); - - return c.list(); - } - - public List buscarCorridaTramoPorCorrida(Corrida corrida) { - try{ - String queryStr = "select ct.Numsecuencia as Numsecuencia, ct.Fechorsalida as Fechorsalida, ct.FechorsalidaH as FechorsalidaH, ct.FechorSalidaOriginal as FechorSalidaOriginal, ct.Fechorllegada as Fechorllegada, ct.FechorllegadaH as FechorllegadaH from Corrida_Tramo ct where ct.activo = :activo and ct.corrida_id = :corridaId and ct.feccorrida = :feccorrida "; - Query query = getSession().createSQLQuery(queryStr).addScalar("numsecuencia", ShortType.INSTANCE) - .addScalar("fechorsalida", TimestampType.INSTANCE) - .addScalar("fechorsalidaH", TimestampType.INSTANCE) - .addScalar("fechorSalidaOriginal", TimestampType.INSTANCE) - .addScalar("fechorllegada", TimestampType.INSTANCE) - .addScalar("fechorllegadaH", TimestampType.INSTANCE); - - query.setInteger("activo", ActivoUtil.ATIVO); - query.setInteger("corridaId", corrida.getId().getCorridaId()); - query.setDate("feccorrida", corrida.getId().getFeccorrida()); - - query.setResultTransformer(new AliasToBeanResultTransformer(CorridaTramo.class)); - - - return (List)query.list(); - - }catch(HibernateException e){ - log.error(e.getMessage()); - } - return null; - } - - public BigDecimal buscarSumTarjetaMesmaCorrida(CorridaTramo ct) { - - String hql = " select sum(t.kmReal) from CorridaTramo ct, Tramo t " - + " where ct.tramo.tramoId = t.tramoId and ct.activo = 1 " - + " and ct.corrida.id.corridaId = :id " - + " and ct.corrida.id.feccorrida = :data " - + " group by ct.corrida.id.corridaId,ct.corrida.id.feccorrida "; - - Query sq = getSession().createQuery(hql); - sq.setParameter("id", ct.getCorrida().getId().getCorridaId()); - sq.setDate("data", ct.getCorrida().getId().getFeccorrida()); - - BigDecimal km = (BigDecimal) sq.uniqueResult(); - - return km; - } - - public List buscarTramoPorCorridaId(Integer corridaId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.createAlias("corrida", "corrida"); - c.add(Restrictions.eq("corrida.id.corridaId", corridaId)); - c.setProjection(Projections.distinct(Projections.property("tramo"))); - - return c.list(); - } - - @Override - @Transactional - public CorridaTramo buscaCorridaTramoByFecCorridaECorridaIdEdOrigemId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado, Integer paradaId) { - try { - StringBuilder hql = new StringBuilder(); - hql.append(" from CorridaTramo as ct "); - hql.append(" where "); - hql.append(isAutorizaServicoIniciado ? " ct.activo <> 0 " : " ct.activo = 1 "); - hql.append(" and ct.corrida.id.corridaId = :corrida_id "); - hql.append(" and ct.corrida.id.feccorrida = :feccorrida "); - hql.append(" and ct.origem.paradaId = :paradaId "); - hql.append(" order by ct.numsecuencia"); - - Query sq = getSession().createQuery(hql.toString()); - sq.setInteger("corrida_id", corridaId); - sq.setDate("feccorrida", fecCorrida); - sq.setInteger("corrida_id", corridaId); - sq.setInteger("paradaId", paradaId); - return (CorridaTramo) sq.uniqueResult(); - }catch (Exception e) { - log.error("Erro ao obter CorridaTramo para corridaId:" + corridaId + " fecCorrida:" + DateUtil.getStringDate24Hour(fecCorrida) + " paradaId:" + paradaId , e); - } - return null; - } - - @Override - public List buscaCorridaTramoByFecCorridaECorridaId(Date fecCorrida, Integer corridaId, - boolean isAutorizaServicoIniciado) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); - c.createAlias("corrida", "corrida"); - c.add(Restrictions.eq("corrida.id.corridaId", corridaId)); - c.add(Restrictions.eq("corrida.id.feccorrida", fecCorrida)); - //c.setProjection(Projections.distinct(Projections.property("tramo"))); - return c.list(); - - } - - - @Override - @Transactional - public CorridaTramo suscribir(final CorridaTramo entity) { - try { - this.getHibernateTemplate().save(entity); - getHibernateTemplate().flush(); - - return entity; - } catch (final HibernateException ex) { - throw convertHibernateAccessException(ex); - } - - } - - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.ShortType; +import org.hibernate.type.TimestampType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +@Repository("corridaTramoDAO") +public class CorridaTramoHibernateDAO extends GenericHibernateDAO implements CorridaTramoDAO { + + @Autowired + public CorridaTramoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + private static final long serialVersionUID = 1L; + private static final Logger log = LogManager.getLogger(CorridaTramoHibernateDAO.class); + + @Override + public List obtenerTramoTarjetaEmitida() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.isNotNull("fechortarjetaviaje")); + c.add(Restrictions.isNull("indmanttarjeta")); + c.add(Restrictions.eq("numsecuencia", (short) 1)); + + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + + return c.list(); + } + + public List buscarTarjetaMesmaCorrida(CorridaTramo ct) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.add(Restrictions.eq("corrida", ct.getCorrida())); + + return c.list(); + } + + public List buscarCorridaTramoPorCorrida(Corrida corrida) { + try{ + String queryStr = "select ct.Numsecuencia as Numsecuencia, ct.Fechorsalida as Fechorsalida, ct.FechorsalidaH as FechorsalidaH, ct.FechorSalidaOriginal as FechorSalidaOriginal, ct.Fechorllegada as Fechorllegada, ct.FechorllegadaH as FechorllegadaH from Corrida_Tramo ct where ct.activo = :activo and ct.corrida_id = :corridaId and ct.feccorrida = :feccorrida "; + Query query = getSession().createSQLQuery(queryStr).addScalar("numsecuencia", ShortType.INSTANCE) + .addScalar("fechorsalida", TimestampType.INSTANCE) + .addScalar("fechorsalidaH", TimestampType.INSTANCE) + .addScalar("fechorSalidaOriginal", TimestampType.INSTANCE) + .addScalar("fechorllegada", TimestampType.INSTANCE) + .addScalar("fechorllegadaH", TimestampType.INSTANCE); + + query.setInteger("activo", ActivoUtil.ATIVO); + query.setInteger("corridaId", corrida.getId().getCorridaId()); + query.setDate("feccorrida", corrida.getId().getFeccorrida()); + + query.setResultTransformer(new AliasToBeanResultTransformer(CorridaTramo.class)); + + + return (List)query.list(); + + }catch(HibernateException e){ + log.error(e.getMessage()); + } + return null; + } + + public BigDecimal buscarSumTarjetaMesmaCorrida(CorridaTramo ct) { + + String hql = " select sum(t.kmReal) from CorridaTramo ct, Tramo t " + + " where ct.tramo.tramoId = t.tramoId and ct.activo = 1 " + + " and ct.corrida.id.corridaId = :id " + + " and ct.corrida.id.feccorrida = :data " + + " group by ct.corrida.id.corridaId,ct.corrida.id.feccorrida "; + + Query sq = getSession().createQuery(hql); + sq.setParameter("id", ct.getCorrida().getId().getCorridaId()); + sq.setDate("data", ct.getCorrida().getId().getFeccorrida()); + + BigDecimal km = (BigDecimal) sq.uniqueResult(); + + return km; + } + + public List buscarTramoPorCorridaId(Integer corridaId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.createAlias("corrida", "corrida"); + c.add(Restrictions.eq("corrida.id.corridaId", corridaId)); + c.setProjection(Projections.distinct(Projections.property("tramo"))); + + return c.list(); + } + + @Override + @Transactional + public CorridaTramo buscaCorridaTramoByFecCorridaECorridaIdEdOrigemId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado, Integer paradaId) { + try { + StringBuilder hql = new StringBuilder(); + hql.append(" from CorridaTramo as ct "); + hql.append(" where "); + hql.append(isAutorizaServicoIniciado ? " ct.activo <> 0 " : " ct.activo = 1 "); + hql.append(" and ct.corrida.id.corridaId = :corrida_id "); + hql.append(" and ct.corrida.id.feccorrida = :feccorrida "); + hql.append(" and ct.origem.paradaId = :paradaId "); + hql.append(" order by ct.numsecuencia"); + + Query sq = getSession().createQuery(hql.toString()); + sq.setInteger("corrida_id", corridaId); + sq.setDate("feccorrida", fecCorrida); + sq.setInteger("corrida_id", corridaId); + sq.setInteger("paradaId", paradaId); + return (CorridaTramo) sq.uniqueResult(); + }catch (Exception e) { + log.error("Erro ao obter CorridaTramo para corridaId:" + corridaId + " fecCorrida:" + DateUtil.getStringDate24Hour(fecCorrida) + " paradaId:" + paradaId , e); + } + return null; + } + + @Override + public List buscaCorridaTramoByFecCorridaECorridaId(Date fecCorrida, Integer corridaId, + boolean isAutorizaServicoIniciado) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); + c.createAlias("corrida", "corrida"); + c.add(Restrictions.eq("corrida.id.corridaId", corridaId)); + c.add(Restrictions.eq("corrida.id.feccorrida", fecCorrida)); + //c.setProjection(Projections.distinct(Projections.property("tramo"))); + return c.list(); + + } + + + @Override + @Transactional + public CorridaTramo suscribir(final CorridaTramo entity) { + try { + this.getHibernateTemplate().save(entity); + getHibernateTemplate().flush(); + + return entity; + } catch (final HibernateException ex) { + throw convertHibernateAccessException(ex); + } + + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlFechamentoCaixaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlFechamentoCaixaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlFechamentoCaixaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlFechamentoCaixaHibernateDAO.java index 54c40969e..0c98089c5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlFechamentoCaixaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlFechamentoCaixaHibernateDAO.java @@ -1,37 +1,37 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CtrlFechamentoCaixaDAO; -import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -@Repository("ctrlFechamentoCaixaDAO") -public class CtrlFechamentoCaixaHibernateDAO extends GenericHibernateDAO implements CtrlFechamentoCaixaDAO { - - @Autowired - public CtrlFechamentoCaixaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public CtrlFechamentoCaixa obtenerFeccorte(Date feccorte) { - StringBuilder hql = new StringBuilder(); - hql.append(" from CtrlFechamentoCaixa c ") - .append(" where c.activo = 1 ") - .append(" and c.feccorte = TO_DATE(:feccorte,'DD/MM/YYYY') "); - - Query qr = getSession().createQuery(hql.toString()); - qr.setParameter("feccorte", DateUtil.getStringDate(feccorte, "dd/MM/yyyy")); - qr.setMaxResults(1); - - return (CtrlFechamentoCaixa) qr.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CtrlFechamentoCaixaDAO; +import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +@Repository("ctrlFechamentoCaixaDAO") +public class CtrlFechamentoCaixaHibernateDAO extends GenericHibernateDAO implements CtrlFechamentoCaixaDAO { + + @Autowired + public CtrlFechamentoCaixaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public CtrlFechamentoCaixa obtenerFeccorte(Date feccorte) { + StringBuilder hql = new StringBuilder(); + hql.append(" from CtrlFechamentoCaixa c ") + .append(" where c.activo = 1 ") + .append(" and c.feccorte = TO_DATE(:feccorte,'DD/MM/YYYY') "); + + Query qr = getSession().createQuery(hql.toString()); + qr.setParameter("feccorte", DateUtil.getStringDate(feccorte, "dd/MM/yyyy")); + qr.setMaxResults(1); + + return (CtrlFechamentoCaixa) qr.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java index cec9c99d7..b90e84cbc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieBPeHibernateDAO.java @@ -1,160 +1,160 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import javax.sql.DataSource; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CtrlSerieBPeDAO; -import com.rjconsultores.ventaboletos.entidad.CtrlSerieBPe; - -@Repository("ctrlSerieBPeDAO") -public class CtrlSerieBPeHibernateDAO extends GenericHibernateDAO implements CtrlSerieBPeDAO { - private static final Logger log = LogManager.getLogger(CtrlSerieBPeHibernateDAO.class); - - @Autowired - private DataSource dataSource; - - @Autowired - public CtrlSerieBPeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public Boolean gerarSeqSerieBPe(Integer empresaId, String estado, Integer minvalue) throws RuntimeException { - Boolean retorno = Boolean.FALSE; - Connection conn = null; - - log.info(String.format("Gerando sequence empresaId:%s, estado:%s, minvalue:%s",empresaId,estado,minvalue)); - - try { - conn = dataSource.getConnection(); - - StringBuilder seq = new StringBuilder(); - seq.append("SERIE_BPE_"); - seq.append(estado).append("_"); - seq.append(empresaId).append("_"); - seq.append("SEQ"); - - - boolean sequenceExiste = conn.createStatement().executeQuery("select SEQUENCE_NAME from USER_SEQUENCES where SEQUENCE_NAME like '" + seq.toString() + "%'").next(); - - log.info(String.format("sequenceExiste:%s",sequenceExiste)); - - if (!sequenceExiste) { - conn.createStatement().execute("CREATE SEQUENCE " + seq.toString() + " MINVALUE 1 MAXVALUE 999 INCREMENT BY 1 START WITH " + minvalue.toString() + " ORDER NOCACHE"); - - log.info("SEQUENCIA " + seq.toString() + " GERADA COM SUCESSO."); - - retorno = Boolean.TRUE; - } - } catch (SQLException e) { - throw new RuntimeException(e); - } finally { - try { - if (conn != null && !conn.isClosed()) { - conn.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - - return retorno; - } - - public Integer buscarSerieEmb(Integer empresaId, String estadoId) throws RuntimeException { - - log.info(String.format("Conferindo sequence empresaId:%s, estado:%s",empresaId,estadoId)); - - try { - StringBuilder sb = new StringBuilder(); - sb.append("select se.serie "); - sb.append("from CtrlSerieEmbarcada se "); - sb.append("where se.activo = 1 "); - sb.append("and se.empresa.empresaId = :empresaId "); - sb.append("and se.estado.estadoId = :estadoId "); - sb.append(" order by cast(se.serie as integer) DESC "); - - Query qry = getSession().createQuery(sb.toString()); - qry.setLong("empresaId", empresaId); - qry.setString("estadoId", estadoId); - qry.setMaxResults(1); - Integer serie = Integer.valueOf((String) (qry.uniqueResult() == null ? "1" : qry.uniqueResult())); - - return (serie == 0 ? 1 : serie); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return null; - } - - public Integer buscarSequencia(Integer empresaId, String estado) { - Integer retorno = null; - - Connection conn = null; - Statement st = null; - ResultSet rs = null; - - try { - conn = dataSource.getConnection(); - - StringBuilder seq = new StringBuilder(); - seq.append("SERIE_BPE_"); - seq.append(estado).append("_"); - seq.append(empresaId).append("_"); - seq.append("SEQ"); - - StringBuilder sql = new StringBuilder(); - sql.append("select ").append(seq.toString()).append(".nextval from dual"); - - st = conn.createStatement(); - rs = st.executeQuery(sql.toString()); - - rs.next(); - - retorno = rs.getInt(1); - - } catch (SQLException e) { - throw new RuntimeException(e); - } finally { - try { if (rs != null) rs.close(); } catch (Exception e) { log.error("", e); } - try { if (st != null) st.close(); } catch (Exception e) { log.error("", e); } - - try { - if (conn != null && !conn.isClosed()) { - conn.close(); - } - } catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - - return retorno; - } - - public CtrlSerieBPe buscarPorEmpresaEstado(Integer empresaId, Integer estadoId) { - StringBuilder sb = new StringBuilder(); - sb.append("SELECT ctrl "); - sb.append("FROM CtrlSerieBPe ctrl "); - sb.append("WHERE ctrl.activo = 1 AND ctrl.empresa.empresaId = :empresaId AND ctrl.estado.estadoId = :estadoId "); - sb.append(" order by cast(ctrl.serie as integer) DESC "); - - Query qr = getSession().createQuery(sb.toString()); - qr.setInteger("empresaId", empresaId); - qr.setInteger("estadoId", estadoId); - qr.setMaxResults(1); - - return (CtrlSerieBPe) qr.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +import javax.sql.DataSource; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CtrlSerieBPeDAO; +import com.rjconsultores.ventaboletos.entidad.CtrlSerieBPe; + +@Repository("ctrlSerieBPeDAO") +public class CtrlSerieBPeHibernateDAO extends GenericHibernateDAO implements CtrlSerieBPeDAO { + private static final Logger log = LogManager.getLogger(CtrlSerieBPeHibernateDAO.class); + + @Autowired + private DataSource dataSource; + + @Autowired + public CtrlSerieBPeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public Boolean gerarSeqSerieBPe(Integer empresaId, String estado, Integer minvalue) throws RuntimeException { + Boolean retorno = Boolean.FALSE; + Connection conn = null; + + log.info(String.format("Gerando sequence empresaId:%s, estado:%s, minvalue:%s",empresaId,estado,minvalue)); + + try { + conn = dataSource.getConnection(); + + StringBuilder seq = new StringBuilder(); + seq.append("SERIE_BPE_"); + seq.append(estado).append("_"); + seq.append(empresaId).append("_"); + seq.append("SEQ"); + + + boolean sequenceExiste = conn.createStatement().executeQuery("select SEQUENCE_NAME from USER_SEQUENCES where SEQUENCE_NAME like '" + seq.toString() + "%'").next(); + + log.info(String.format("sequenceExiste:%s",sequenceExiste)); + + if (!sequenceExiste) { + conn.createStatement().execute("CREATE SEQUENCE " + seq.toString() + " MINVALUE 1 MAXVALUE 999 INCREMENT BY 1 START WITH " + minvalue.toString() + " ORDER NOCACHE"); + + log.info("SEQUENCIA " + seq.toString() + " GERADA COM SUCESSO."); + + retorno = Boolean.TRUE; + } + } catch (SQLException e) { + throw new RuntimeException(e); + } finally { + try { + if (conn != null && !conn.isClosed()) { + conn.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + + return retorno; + } + + public Integer buscarSerieEmb(Integer empresaId, String estadoId) throws RuntimeException { + + log.info(String.format("Conferindo sequence empresaId:%s, estado:%s",empresaId,estadoId)); + + try { + StringBuilder sb = new StringBuilder(); + sb.append("select se.serie "); + sb.append("from CtrlSerieEmbarcada se "); + sb.append("where se.activo = 1 "); + sb.append("and se.empresa.empresaId = :empresaId "); + sb.append("and se.estado.estadoId = :estadoId "); + sb.append(" order by cast(se.serie as integer) DESC "); + + Query qry = getSession().createQuery(sb.toString()); + qry.setLong("empresaId", empresaId); + qry.setString("estadoId", estadoId); + qry.setMaxResults(1); + Integer serie = Integer.valueOf((String) (qry.uniqueResult() == null ? "1" : qry.uniqueResult())); + + return (serie == 0 ? 1 : serie); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return null; + } + + public Integer buscarSequencia(Integer empresaId, String estado) { + Integer retorno = null; + + Connection conn = null; + Statement st = null; + ResultSet rs = null; + + try { + conn = dataSource.getConnection(); + + StringBuilder seq = new StringBuilder(); + seq.append("SERIE_BPE_"); + seq.append(estado).append("_"); + seq.append(empresaId).append("_"); + seq.append("SEQ"); + + StringBuilder sql = new StringBuilder(); + sql.append("select ").append(seq.toString()).append(".nextval from dual"); + + st = conn.createStatement(); + rs = st.executeQuery(sql.toString()); + + rs.next(); + + retorno = rs.getInt(1); + + } catch (SQLException e) { + throw new RuntimeException(e); + } finally { + try { if (rs != null) rs.close(); } catch (Exception e) { log.error("", e); } + try { if (st != null) st.close(); } catch (Exception e) { log.error("", e); } + + try { + if (conn != null && !conn.isClosed()) { + conn.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + + return retorno; + } + + public CtrlSerieBPe buscarPorEmpresaEstado(Integer empresaId, Integer estadoId) { + StringBuilder sb = new StringBuilder(); + sb.append("SELECT ctrl "); + sb.append("FROM CtrlSerieBPe ctrl "); + sb.append("WHERE ctrl.activo = 1 AND ctrl.empresa.empresaId = :empresaId AND ctrl.estado.estadoId = :estadoId "); + sb.append(" order by cast(ctrl.serie as integer) DESC "); + + Query qr = getSession().createQuery(sb.toString()); + qr.setInteger("empresaId", empresaId); + qr.setInteger("estadoId", estadoId); + qr.setMaxResults(1); + + return (CtrlSerieBPe) qr.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java index d482f211a..83233710b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CtrlSerieEmbarcadaHibernateDAO.java @@ -1,297 +1,297 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Calendar; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.LockOptions; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.transform.AliasToBeanResultTransformer; -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; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CtrlSerieEmbarcadaDAO; -import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; -import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.exception.SerieEmbarcadaNaoDisponivelException; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.embarcada.SerieEmbarcada; - -@Repository("ctrlSerieEmbarcadaDAO") -public class CtrlSerieEmbarcadaHibernateDAO extends GenericHibernateDAO implements CtrlSerieEmbarcadaDAO { - private static final Logger log = LogManager.getLogger(CtrlSerieEmbarcadaHibernateDAO.class); - - private static final Long MAX_NUMFOLIOSISTEMA_BPE = 999999999l; - - @Autowired - public CtrlSerieEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @Transactional - public CtrlSerieEmbarcada suscribir(CtrlSerieEmbarcada entity) { - entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entity.setFecmodif(Calendar.getInstance().getTime()); - - try { - this.getHibernateTemplate().save(entity); - getHibernateTemplate().flush(); - - return entity; - } catch (final HibernateException ex) { - throw convertHibernateAccessException(ex); - } - } - - @Transactional - @Override - public void borrar(CtrlSerieEmbarcada entity) { - entity.setActivo(Boolean.FALSE); - entity.setIndBaixado(Boolean.TRUE); - - actualizacion(entity); - } - - @Override - @Transactional - public CtrlSerieEmbarcada actualizacion(CtrlSerieEmbarcada entity) { - entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entity.setFecmodif(Calendar.getInstance().getTime()); - - entity = getHibernateTemplate().merge(entity); - - getHibernateTemplate().flush(); - - return entity; - } - - public Boolean validaDispositivoEmpresaEstadoCadastrado(DispositivoEmbarcada dispositivo, Empresa empresa, Estado estado) { - StringBuilder sb = new StringBuilder(); - sb.append("select count(se.ctrlSerieEmbarcadaId) "); - sb.append("from CtrlSerieEmbarcada se "); - sb.append("where se.activo = 1 and se.indBaixado = 0 "); - sb.append("and se.dispositivoEmbarcada.dispositivoEmbarcadaId = :dispositivoEmbarcadaId "); - sb.append("and se.empresa.empresaId = :empresaId "); - sb.append("and se.estado.estadoId = :estadoId "); - - Query qry = getSession().createQuery(sb.toString()); - qry.setLong("dispositivoEmbarcadaId", dispositivo.getDispositivoEmbarcadaId()); - qry.setLong("empresaId", empresa.getEmpresaId()); - qry.setLong("estadoId", estado.getEstadoId()); - - Number n = (Number) qry.uniqueResult(); - - if (n == null) { - return false; - } - - return n.longValue() > 0; - } - - @SuppressWarnings("unchecked") - public List buscarSeriesEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) { - StringBuilder sb = new StringBuilder(); - sb.append("select se.ctrlserieembarcada_id as ctrlSerieEmbarcadaId, se.serie as serie, se.numerocorrente + 1 as numero "); - sb.append("from ctrl_serie_embarcada se "); - sb.append("left join ctrl_serie_embarcada seq on seq.ctrlserieembarcadaseq_id = se.ctrlserieembarcada_id "); - sb.append("where se.activo = 1 and se.ind_baixado = 1 and se.ind_reutilizado = 0 and seq.ctrlserieembarcada_id is null and se.empresa_id = :empresaId and se.estado_id = :estadoId "); - sb.append("order by se.serie "); - - Query query = getSession().createSQLQuery(sb.toString()) - .addScalar("ctrlSerieEmbarcadaId", LongType.INSTANCE) - .addScalar("serie", StringType.INSTANCE) - .addScalar("numero", StringType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(SerieEmbarcada.class)); - - query.setInteger("empresaId", empresaId); - query.setInteger("estadoId", estadoId); - - return query.list(); - } - - @SuppressWarnings("unchecked") - public CtrlSerieEmbarcada buscarCtrlSerieEmbarcada(final Long ctrlSerieEmbarcadaId) throws SerieEmbarcadaNaoDisponivelException { - CtrlSerieEmbarcada retorno = null; - - StringBuilder sb = new StringBuilder(); - sb.append("select se "); - sb.append("from CtrlSerieEmbarcada se "); - sb.append("where se.activo = 1 and se.indReutilizado = 0 and se.ctrlSerieEmbarcadaId = :ctrlSerieEmbarcadaId"); - - Session session = null; - - try { - session = getSessionFactory().openSession(); - - Query query = session.createQuery(sb.toString()); - query.setLong("ctrlSerieEmbarcadaId", ctrlSerieEmbarcadaId); - - query.setMaxResults(1); - query.setLockOptions(LockOptions.UPGRADE); - query.setTimeout(20); - - List list = query.list(); - - if (list != null && list.size() > 0) { - retorno = list.get(0); - - session.getTransaction().begin(); - - retorno.setIndReutilizado(Boolean.TRUE); - retorno.setFecmodif(new Date()); - - session.update(retorno); - - session.getTransaction().commit(); - } else { - throw new SerieEmbarcadaNaoDisponivelException(); - } - - } catch (SerieEmbarcadaNaoDisponivelException e) { - throw new SerieEmbarcadaNaoDisponivelException(); - } catch (Exception e) { - log.error("CtrlSerieEmbarcada: " + e.getMessage(), e); - - } finally { - if (session != null) { - session.flush(); - session.close(); - } - } - - return retorno; - } - - @SuppressWarnings("unchecked") - public SerieEmbarcada buscarSerieEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) throws SerieEmbarcadaNaoDisponivelException { - SerieEmbarcada retorno = null; - - StringBuilder sb = new StringBuilder(); - sb.append("select se "); - sb.append("from CtrlSerieEmbarcada se "); - sb.append("where se.indReutilizado = 0 and se.indBaixado = 1 and se.ctrlSerieEmbarcadaId in (:list)"); - sb.append("order by se.serie "); - - Set ids = buscarIdsSeriesEmbarcadaDisponivel(empresaId, estadoId); - - log.info("BuscarSerieEmbarcada :: IDs nao disponiveis"); - - if (ids.isEmpty()) { - throw new SerieEmbarcadaNaoDisponivelException(); - } - - log.info(String.format("BuscarSerieEmbarcada :: IDs teste disponivel %s" , ids.toString())); - - Session session = null; - - try { - session = getSessionFactory().openSession(); - - Query query = session.createQuery(sb.toString()); - query.setParameterList("list", ids); - - query.setLockOptions(LockOptions.UPGRADE); - query.setTimeout(20); - - List list = query.list(); - - if (list != null && list.size() > 0) { - CtrlSerieEmbarcada ctrl = list.get(0); - - session.getTransaction().begin(); - - ctrl.setIndReutilizado(Boolean.TRUE); - ctrl.setFecmodif(new Date()); - - session.update(ctrl); - - session.getTransaction().commit(); - - retorno = new SerieEmbarcada(); - retorno.setCtrlSerieEmbarcada(ctrl); - retorno.setSerie(ctrl.getSerie()); - - Long numero = Long.valueOf(ctrl.getNumeroCorrente()); - - if (!ctrl.getNumeroInicial().equals(ctrl.getNumeroCorrente())) { - numero++; - } - - log.info(String.format("BuscarSerieEmbarcada :: Numero encontrado [%d]", numero)); - - if (numero > MAX_NUMFOLIOSISTEMA_BPE) { - retorno = null; - } else { - retorno.setNumero(String.valueOf(numero)); - } - - } else { - throw new SerieEmbarcadaNaoDisponivelException(); - } - - } catch (SerieEmbarcadaNaoDisponivelException e) { - throw new SerieEmbarcadaNaoDisponivelException(); - } catch (Exception e) { - log.error("CtrlSerieEmbarcada: " + e.getMessage(), e); - } finally { - if (session != null) { - session.flush(); - session.close(); - } - } - - return retorno; - } - - @SuppressWarnings("unchecked") - public Set buscarIdsSeriesEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) { - StringBuilder sb = new StringBuilder(); - sb.append("select se.ctrlserieembarcada_id as ctrlSerieEmbarcadaId "); - sb.append("from ctrl_serie_embarcada se "); - sb.append("left join ctrl_serie_embarcada seq on seq.ctrlserieembarcadaseq_id = se.ctrlserieembarcada_id "); - sb.append("where se.ind_baixado = 1 and se.ind_reutilizado = 0 and seq.ctrlserieembarcada_id is null and se.empresa_id = :empresaId and se.estado_id = :estadoId "); - sb.append("order by se.serie "); - - Query query = getSession().createSQLQuery(sb.toString()) - .addScalar("ctrlSerieEmbarcadaId", LongType.INSTANCE); - - query.setInteger("empresaId", empresaId); - query.setInteger("estadoId", estadoId); - - return new LinkedHashSet(query.list()); - } - - public Boolean validaPossuiDispositivo(Integer empresaId, Integer estadoId, String serie) { - StringBuilder sql = new StringBuilder("") - .append("SELECT COUNT(*) ") - .append("FROM ctrl_serie_embarcada se ") - .append("WHERE se.activo = 1 AND se.empresa_id = :empresaId AND se.estado_id = :estadoId AND se.serie = :serie"); - - Query query = getSession().createSQLQuery(sql.toString()); - query.setInteger("empresaId", empresaId); - query.setInteger("estadoId", estadoId); - query.setString("serie", serie); - - Number n = (Number) query.uniqueResult(); - - if (n == null) { - return false; - } - - return n.longValue() > 0; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Calendar; +import java.util.Date; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.LockOptions; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.transform.AliasToBeanResultTransformer; +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; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CtrlSerieEmbarcadaDAO; +import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; +import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.exception.SerieEmbarcadaNaoDisponivelException; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.embarcada.SerieEmbarcada; + +@Repository("ctrlSerieEmbarcadaDAO") +public class CtrlSerieEmbarcadaHibernateDAO extends GenericHibernateDAO implements CtrlSerieEmbarcadaDAO { + private static final Logger log = LogManager.getLogger(CtrlSerieEmbarcadaHibernateDAO.class); + + private static final Long MAX_NUMFOLIOSISTEMA_BPE = 999999999l; + + @Autowired + public CtrlSerieEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @Transactional + public CtrlSerieEmbarcada suscribir(CtrlSerieEmbarcada entity) { + entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entity.setFecmodif(Calendar.getInstance().getTime()); + + try { + this.getHibernateTemplate().save(entity); + getHibernateTemplate().flush(); + + return entity; + } catch (final HibernateException ex) { + throw convertHibernateAccessException(ex); + } + } + + @Transactional + @Override + public void borrar(CtrlSerieEmbarcada entity) { + entity.setActivo(Boolean.FALSE); + entity.setIndBaixado(Boolean.TRUE); + + actualizacion(entity); + } + + @Override + @Transactional + public CtrlSerieEmbarcada actualizacion(CtrlSerieEmbarcada entity) { + entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entity.setFecmodif(Calendar.getInstance().getTime()); + + entity = getHibernateTemplate().merge(entity); + + getHibernateTemplate().flush(); + + return entity; + } + + public Boolean validaDispositivoEmpresaEstadoCadastrado(DispositivoEmbarcada dispositivo, Empresa empresa, Estado estado) { + StringBuilder sb = new StringBuilder(); + sb.append("select count(se.ctrlSerieEmbarcadaId) "); + sb.append("from CtrlSerieEmbarcada se "); + sb.append("where se.activo = 1 and se.indBaixado = 0 "); + sb.append("and se.dispositivoEmbarcada.dispositivoEmbarcadaId = :dispositivoEmbarcadaId "); + sb.append("and se.empresa.empresaId = :empresaId "); + sb.append("and se.estado.estadoId = :estadoId "); + + Query qry = getSession().createQuery(sb.toString()); + qry.setLong("dispositivoEmbarcadaId", dispositivo.getDispositivoEmbarcadaId()); + qry.setLong("empresaId", empresa.getEmpresaId()); + qry.setLong("estadoId", estado.getEstadoId()); + + Number n = (Number) qry.uniqueResult(); + + if (n == null) { + return false; + } + + return n.longValue() > 0; + } + + @SuppressWarnings("unchecked") + public List buscarSeriesEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) { + StringBuilder sb = new StringBuilder(); + sb.append("select se.ctrlserieembarcada_id as ctrlSerieEmbarcadaId, se.serie as serie, se.numerocorrente + 1 as numero "); + sb.append("from ctrl_serie_embarcada se "); + sb.append("left join ctrl_serie_embarcada seq on seq.ctrlserieembarcadaseq_id = se.ctrlserieembarcada_id "); + sb.append("where se.activo = 1 and se.ind_baixado = 1 and se.ind_reutilizado = 0 and seq.ctrlserieembarcada_id is null and se.empresa_id = :empresaId and se.estado_id = :estadoId "); + sb.append("order by se.serie "); + + Query query = getSession().createSQLQuery(sb.toString()) + .addScalar("ctrlSerieEmbarcadaId", LongType.INSTANCE) + .addScalar("serie", StringType.INSTANCE) + .addScalar("numero", StringType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(SerieEmbarcada.class)); + + query.setInteger("empresaId", empresaId); + query.setInteger("estadoId", estadoId); + + return query.list(); + } + + @SuppressWarnings("unchecked") + public CtrlSerieEmbarcada buscarCtrlSerieEmbarcada(final Long ctrlSerieEmbarcadaId) throws SerieEmbarcadaNaoDisponivelException { + CtrlSerieEmbarcada retorno = null; + + StringBuilder sb = new StringBuilder(); + sb.append("select se "); + sb.append("from CtrlSerieEmbarcada se "); + sb.append("where se.activo = 1 and se.indReutilizado = 0 and se.ctrlSerieEmbarcadaId = :ctrlSerieEmbarcadaId"); + + Session session = null; + + try { + session = getSessionFactory().openSession(); + + Query query = session.createQuery(sb.toString()); + query.setLong("ctrlSerieEmbarcadaId", ctrlSerieEmbarcadaId); + + query.setMaxResults(1); + query.setLockOptions(LockOptions.UPGRADE); + query.setTimeout(20); + + List list = query.list(); + + if (list != null && list.size() > 0) { + retorno = list.get(0); + + session.getTransaction().begin(); + + retorno.setIndReutilizado(Boolean.TRUE); + retorno.setFecmodif(new Date()); + + session.update(retorno); + + session.getTransaction().commit(); + } else { + throw new SerieEmbarcadaNaoDisponivelException(); + } + + } catch (SerieEmbarcadaNaoDisponivelException e) { + throw new SerieEmbarcadaNaoDisponivelException(); + } catch (Exception e) { + log.error("CtrlSerieEmbarcada: " + e.getMessage(), e); + + } finally { + if (session != null) { + session.flush(); + session.close(); + } + } + + return retorno; + } + + @SuppressWarnings("unchecked") + public SerieEmbarcada buscarSerieEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) throws SerieEmbarcadaNaoDisponivelException { + SerieEmbarcada retorno = null; + + StringBuilder sb = new StringBuilder(); + sb.append("select se "); + sb.append("from CtrlSerieEmbarcada se "); + sb.append("where se.indReutilizado = 0 and se.indBaixado = 1 and se.ctrlSerieEmbarcadaId in (:list)"); + sb.append("order by se.serie "); + + Set ids = buscarIdsSeriesEmbarcadaDisponivel(empresaId, estadoId); + + log.info("BuscarSerieEmbarcada :: IDs nao disponiveis"); + + if (ids.isEmpty()) { + throw new SerieEmbarcadaNaoDisponivelException(); + } + + log.info(String.format("BuscarSerieEmbarcada :: IDs teste disponivel %s" , ids.toString())); + + Session session = null; + + try { + session = getSessionFactory().openSession(); + + Query query = session.createQuery(sb.toString()); + query.setParameterList("list", ids); + + query.setLockOptions(LockOptions.UPGRADE); + query.setTimeout(20); + + List list = query.list(); + + if (list != null && list.size() > 0) { + CtrlSerieEmbarcada ctrl = list.get(0); + + session.getTransaction().begin(); + + ctrl.setIndReutilizado(Boolean.TRUE); + ctrl.setFecmodif(new Date()); + + session.update(ctrl); + + session.getTransaction().commit(); + + retorno = new SerieEmbarcada(); + retorno.setCtrlSerieEmbarcada(ctrl); + retorno.setSerie(ctrl.getSerie()); + + Long numero = Long.valueOf(ctrl.getNumeroCorrente()); + + if (!ctrl.getNumeroInicial().equals(ctrl.getNumeroCorrente())) { + numero++; + } + + log.info(String.format("BuscarSerieEmbarcada :: Numero encontrado [%d]", numero)); + + if (numero > MAX_NUMFOLIOSISTEMA_BPE) { + retorno = null; + } else { + retorno.setNumero(String.valueOf(numero)); + } + + } else { + throw new SerieEmbarcadaNaoDisponivelException(); + } + + } catch (SerieEmbarcadaNaoDisponivelException e) { + throw new SerieEmbarcadaNaoDisponivelException(); + } catch (Exception e) { + log.error("CtrlSerieEmbarcada: " + e.getMessage(), e); + } finally { + if (session != null) { + session.flush(); + session.close(); + } + } + + return retorno; + } + + @SuppressWarnings("unchecked") + public Set buscarIdsSeriesEmbarcadaDisponivel(final Integer empresaId, final Integer estadoId) { + StringBuilder sb = new StringBuilder(); + sb.append("select se.ctrlserieembarcada_id as ctrlSerieEmbarcadaId "); + sb.append("from ctrl_serie_embarcada se "); + sb.append("left join ctrl_serie_embarcada seq on seq.ctrlserieembarcadaseq_id = se.ctrlserieembarcada_id "); + sb.append("where se.ind_baixado = 1 and se.ind_reutilizado = 0 and seq.ctrlserieembarcada_id is null and se.empresa_id = :empresaId and se.estado_id = :estadoId "); + sb.append("order by se.serie "); + + Query query = getSession().createSQLQuery(sb.toString()) + .addScalar("ctrlSerieEmbarcadaId", LongType.INSTANCE); + + query.setInteger("empresaId", empresaId); + query.setInteger("estadoId", estadoId); + + return new LinkedHashSet(query.list()); + } + + public Boolean validaPossuiDispositivo(Integer empresaId, Integer estadoId, String serie) { + StringBuilder sql = new StringBuilder("") + .append("SELECT COUNT(*) ") + .append("FROM ctrl_serie_embarcada se ") + .append("WHERE se.activo = 1 AND se.empresa_id = :empresaId AND se.estado_id = :estadoId AND se.serie = :serie"); + + Query query = getSession().createSQLQuery(sql.toString()); + query.setInteger("empresaId", empresaId); + query.setInteger("estadoId", estadoId); + query.setString("serie", serie); + + Number n = (Number) query.uniqueResult(); + + if (n == null) { + return false; + } + + return n.longValue() > 0; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java index 0eb44a34f..4ae9ed91f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.CursoDAO; -import com.rjconsultores.ventaboletos.entidad.Curso; - -@Repository("cursoDAO") -public class CursoHibernateDAO extends GenericHibernateDAO - implements CursoDAO { - - @Autowired - public CursoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("nomcurso")); - - return c.list(); - } - - public List buscar(String nomcurso){ - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("nomcurso", nomcurso)); - c.addOrder(Order.asc("nomcurso")); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.CursoDAO; +import com.rjconsultores.ventaboletos.entidad.Curso; + +@Repository("cursoDAO") +public class CursoHibernateDAO extends GenericHibernateDAO + implements CursoDAO { + + @Autowired + public CursoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("nomcurso")); + + return c.list(); + } + + public List buscar(String nomcurso){ + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("nomcurso", nomcurso)); + c.addOrder(Order.asc("nomcurso")); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoComissaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoComissaoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoComissaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoComissaoHibernateDAO.java index c85f89124..bf73e597f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoComissaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoComissaoHibernateDAO.java @@ -1,45 +1,45 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.DescontoComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.DescontoComissao; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -@Repository("descontoComissaoDAO") -public class DescontoComissaoHibernateDAO extends GenericHibernateDAO implements DescontoComissaoDAO { - - @Autowired - public DescontoComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List buscaDescontoComissao(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo) { - - StringBuilder sql = new StringBuilder(); - sql.append("from DescontoComissao dc "); - sql.append("where activo = 1 "); - sql.append(" and dc.puntoVenta.puntoventaId = :puntoventaId "); - sql.append(" and dc.empresa.empresaId = :empresaId "); - sql.append(" and dc.datainicial <= TO_DATE(:datainicial,'DD/MM/YYYY HH24:MI') "); - sql.append(" and (dc.datafinal >= TO_DATE(:datafinal,'DD/MM/YYYY HH24:MI') or dc.datafinal is null)"); - - Query query = getSession().createQuery(sql.toString()); - query.setInteger("puntoventaId", puntoVentaId); - query.setInteger("empresaId", empresaId); - query.setString("datainicial", DateUtil.getStringDate(inicioPeriodo, "dd/MM/yyyy HH:mm")); - query.setString("datafinal", DateUtil.getStringDate(fimPeriodo, "dd/MM/yyyy HH:mm")); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.DescontoComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.DescontoComissao; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +@Repository("descontoComissaoDAO") +public class DescontoComissaoHibernateDAO extends GenericHibernateDAO implements DescontoComissaoDAO { + + @Autowired + public DescontoComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List buscaDescontoComissao(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo) { + + StringBuilder sql = new StringBuilder(); + sql.append("from DescontoComissao dc "); + sql.append("where activo = 1 "); + sql.append(" and dc.puntoVenta.puntoventaId = :puntoventaId "); + sql.append(" and dc.empresa.empresaId = :empresaId "); + sql.append(" and dc.datainicial <= TO_DATE(:datainicial,'DD/MM/YYYY HH24:MI') "); + sql.append(" and (dc.datafinal >= TO_DATE(:datafinal,'DD/MM/YYYY HH24:MI') or dc.datafinal is null)"); + + Query query = getSession().createQuery(sql.toString()); + query.setInteger("puntoventaId", puntoVentaId); + query.setInteger("empresaId", empresaId); + query.setString("datainicial", DateUtil.getStringDate(inicioPeriodo, "dd/MM/yyyy HH:mm")); + query.setString("datafinal", DateUtil.getStringDate(fimPeriodo, "dd/MM/yyyy HH:mm")); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DetAbastoBoletoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DetAbastoBoletoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DetAbastoBoletoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DetAbastoBoletoHibernateDAO.java index 3a59a3db6..22d73e348 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DetAbastoBoletoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DetAbastoBoletoHibernateDAO.java @@ -1,185 +1,185 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.DetAbastoBoletoDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -@Repository("detAbastoBoletoDAO") -public class DetAbastoBoletoHibernateDAO extends GenericHibernateDAO - implements DetAbastoBoletoDAO { - - @Autowired - public DetAbastoBoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public Long getSecuencia() { - - StringBuffer sql = new StringBuffer(); - sql.append(" select nummovimiento_seq.nextval from dual "); - - Query query = getSession().createSQLQuery(sql.toString()); - - BigDecimal secuencia = (BigDecimal) query.uniqueResult(); - return secuencia.longValue(); - - } - - @Override - public List buscaDetAbastoBoletos(AbastoBoleto abastoBoleto) { - - List detAbastoBoletos = findByCriteria(Restrictions.eq("abastoBoleto", abastoBoleto)); - return detAbastoBoletos; - } - - @Override - public List buscaDetAbastoBoletos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa) { - - StringBuilder queryString = new StringBuilder("from DetAbastoBoleto det where ") - .append(" det.abastoBoleto.estacion.estacionId = :origem") - .append(" and det.numseriepreimpresa = :numseriepreimpresa") - .append(" and (det.numfolioinicial >= :numfolioinicial and det.numfoliofinal <= :numfoliofinal) ") - .append(" order by det.detabastoboletoId"); - - Query query = getSession().createQuery(queryString.toString()); - query.setInteger("origem", origem.getEstacionId()); - query.setString("numseriepreimpresa", numseriepreimpresa); - query.setString("numfolioinicial", numfolioinicial); - query.setString("numfoliofinal", numfoliofinal); - - List detAbastoBoletos = query.list(); - - return detAbastoBoletos; - } - - @Transactional - public void desativaDetAbastos(List detAbastoBoletos) { - Session session = getSessionFactory().getCurrentSession(); - - int count = 0; - - for (DetAbastoBoleto det : detAbastoBoletos) { - det.setActivo(Boolean.FALSE); - session.update(det); - - if (++count % 20 == 0) { - session.flush(); - session.clear(); - } - } - - session.flush(); - session.clear(); - - } - - @Override - public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa) { - - StringBuilder qs = new StringBuilder(); - qs.append(" from DetAbastoBoleto det "); - qs.append(" where det.activo = 1 "); - qs.append(" and det.statusoperacion = 1 "); - qs.append(" and det.abastoBoleto.estacion.estacionId = :estacion "); - qs.append(" and det.numseriepreimpresa = :numseriepreimpresa "); - - Query query = getSession().createQuery(qs.toString()); - query.setInteger("estacion", estacion.getEstacionId()); - query.setString("numseriepreimpresa", numseriepreimpresa); - - List detAbastoBoletos = query.list(); - - return detAbastoBoletos; - } - - @Override - public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(Aidf aidf){ - StringBuilder qs = new StringBuilder(); - - qs.append(" select detabastoboleto_id from det_abasto_boleto dat where (numseriepreimpresa like ( "); - qs.append(" select (case when ( select (coalesce "); - qs.append(" ( "); - qs.append(" (select trim((select to_char( (select aidf_id from aidf where aidf_id = :aidf_id), '000' ) from dual )) from dual) , "); - qs.append(" '-_-_' "); - qs.append(" ) "); - qs.append(" ) from dual) = '-_-_' then '' else concat ((select trim((select to_char( (select aidf_id from aidf where aidf_id = :aidf_id), '000' ) from dual )) from dual) , '%' ) end ) from dual "); - qs.append(" "); - qs.append(" ) OR dat.aidf_id = :aidf_id) and dat.activo = 1 "); - - Query query = getSession().createSQLQuery(qs.toString()); - query.setLong("aidf_id", aidf.getAidfId()); - - return query.list(); - } - - @Override - public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVenta, String folioInicial, String folioFinal) { - - - StringBuilder qs = new StringBuilder(); - qs.append(" from DetAbastoBoleto det "); - qs.append(" where det.activo = 1 "); - qs.append(" and det.abastoBoleto.puntoventa.puntoventaId = :puntoventaId "); - qs.append(" and det.aidf.aidfId = :aidfId "); - qs.append(" and cast(det.numfolioinicial as integer) <= :folioInicial "); - qs.append(" and cast(det.numfoliofinal as integer) >= :folioFinal "); - qs.append(" order by detabastoboletoId "); - - Query query = getSession().createQuery(qs.toString()); - query.setInteger("puntoventaId", puntoVenta); - query.setLong("aidfId", aidfId); - query.setString("folioInicial", folioInicial); - query.setString("folioFinal", folioFinal); - - query.setFetchSize(1); - - List detAbastoBoletos = query.list(); - - if( detAbastoBoletos.isEmpty() ) { - return null; - } - - return detAbastoBoletos.get(0); - } - - @Override - public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem) { - StringBuilder qs = new StringBuilder(); - qs.append(" select distinct det.aidf "); - qs.append(" from DetAbastoBoleto det "); - qs.append(" where det.activo = 1 "); - qs.append(" and det.abastoBoleto.puntoventa.puntoventaId = :origem "); - if( empresa.getEmpresaId() != -1) { - qs.append(" and det.abastoBoleto.empresa.empresaId = :empresa "); - } - - Query query = getSession().createQuery(qs.toString()); - query.setInteger("origem", origem.getPuntoventaId()); - - if( empresa.getEmpresaId() != -1) { - query.setInteger("empresa", empresa.getEmpresaId()); - } - - List aidfs = query.list(); - - return aidfs; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.DetAbastoBoletoDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +@Repository("detAbastoBoletoDAO") +public class DetAbastoBoletoHibernateDAO extends GenericHibernateDAO + implements DetAbastoBoletoDAO { + + @Autowired + public DetAbastoBoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public Long getSecuencia() { + + StringBuffer sql = new StringBuffer(); + sql.append(" select nummovimiento_seq.nextval from dual "); + + Query query = getSession().createSQLQuery(sql.toString()); + + BigDecimal secuencia = (BigDecimal) query.uniqueResult(); + return secuencia.longValue(); + + } + + @Override + public List buscaDetAbastoBoletos(AbastoBoleto abastoBoleto) { + + List detAbastoBoletos = findByCriteria(Restrictions.eq("abastoBoleto", abastoBoleto)); + return detAbastoBoletos; + } + + @Override + public List buscaDetAbastoBoletos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa) { + + StringBuilder queryString = new StringBuilder("from DetAbastoBoleto det where ") + .append(" det.abastoBoleto.estacion.estacionId = :origem") + .append(" and det.numseriepreimpresa = :numseriepreimpresa") + .append(" and (det.numfolioinicial >= :numfolioinicial and det.numfoliofinal <= :numfoliofinal) ") + .append(" order by det.detabastoboletoId"); + + Query query = getSession().createQuery(queryString.toString()); + query.setInteger("origem", origem.getEstacionId()); + query.setString("numseriepreimpresa", numseriepreimpresa); + query.setString("numfolioinicial", numfolioinicial); + query.setString("numfoliofinal", numfoliofinal); + + List detAbastoBoletos = query.list(); + + return detAbastoBoletos; + } + + @Transactional + public void desativaDetAbastos(List detAbastoBoletos) { + Session session = getSessionFactory().getCurrentSession(); + + int count = 0; + + for (DetAbastoBoleto det : detAbastoBoletos) { + det.setActivo(Boolean.FALSE); + session.update(det); + + if (++count % 20 == 0) { + session.flush(); + session.clear(); + } + } + + session.flush(); + session.clear(); + + } + + @Override + public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa) { + + StringBuilder qs = new StringBuilder(); + qs.append(" from DetAbastoBoleto det "); + qs.append(" where det.activo = 1 "); + qs.append(" and det.statusoperacion = 1 "); + qs.append(" and det.abastoBoleto.estacion.estacionId = :estacion "); + qs.append(" and det.numseriepreimpresa = :numseriepreimpresa "); + + Query query = getSession().createQuery(qs.toString()); + query.setInteger("estacion", estacion.getEstacionId()); + query.setString("numseriepreimpresa", numseriepreimpresa); + + List detAbastoBoletos = query.list(); + + return detAbastoBoletos; + } + + @Override + public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(Aidf aidf){ + StringBuilder qs = new StringBuilder(); + + qs.append(" select detabastoboleto_id from det_abasto_boleto dat where (numseriepreimpresa like ( "); + qs.append(" select (case when ( select (coalesce "); + qs.append(" ( "); + qs.append(" (select trim((select to_char( (select aidf_id from aidf where aidf_id = :aidf_id), '000' ) from dual )) from dual) , "); + qs.append(" '-_-_' "); + qs.append(" ) "); + qs.append(" ) from dual) = '-_-_' then '' else concat ((select trim((select to_char( (select aidf_id from aidf where aidf_id = :aidf_id), '000' ) from dual )) from dual) , '%' ) end ) from dual "); + qs.append(" "); + qs.append(" ) OR dat.aidf_id = :aidf_id) and dat.activo = 1 "); + + Query query = getSession().createSQLQuery(qs.toString()); + query.setLong("aidf_id", aidf.getAidfId()); + + return query.list(); + } + + @Override + public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVenta, String folioInicial, String folioFinal) { + + + StringBuilder qs = new StringBuilder(); + qs.append(" from DetAbastoBoleto det "); + qs.append(" where det.activo = 1 "); + qs.append(" and det.abastoBoleto.puntoventa.puntoventaId = :puntoventaId "); + qs.append(" and det.aidf.aidfId = :aidfId "); + qs.append(" and cast(det.numfolioinicial as integer) <= :folioInicial "); + qs.append(" and cast(det.numfoliofinal as integer) >= :folioFinal "); + qs.append(" order by detabastoboletoId "); + + Query query = getSession().createQuery(qs.toString()); + query.setInteger("puntoventaId", puntoVenta); + query.setLong("aidfId", aidfId); + query.setString("folioInicial", folioInicial); + query.setString("folioFinal", folioFinal); + + query.setFetchSize(1); + + List detAbastoBoletos = query.list(); + + if( detAbastoBoletos.isEmpty() ) { + return null; + } + + return detAbastoBoletos.get(0); + } + + @Override + public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem) { + StringBuilder qs = new StringBuilder(); + qs.append(" select distinct det.aidf "); + qs.append(" from DetAbastoBoleto det "); + qs.append(" where det.activo = 1 "); + qs.append(" and det.abastoBoleto.puntoventa.puntoventaId = :origem "); + if( empresa.getEmpresaId() != -1) { + qs.append(" and det.abastoBoleto.empresa.empresaId = :empresa "); + } + + Query query = getSession().createQuery(qs.toString()); + query.setInteger("origem", origem.getPuntoventaId()); + + if( empresa.getEmpresaId() != -1) { + query.setInteger("empresa", empresa.getEmpresaId()); + } + + List aidfs = query.list(); + + return aidfs; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DiagramaAutobusHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DiagramaAutobusHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DiagramaAutobusHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DiagramaAutobusHibernateDAO.java index 19f7e6373..7fb12095f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DiagramaAutobusHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DiagramaAutobusHibernateDAO.java @@ -1,110 +1,110 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.DiagramaAutobusDAO; -import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; - -/** - * - * @author Administrador - */ -@Repository("diagramaAutobusDAO") -public class DiagramaAutobusHibernateDAO extends GenericHibernateDAO - implements DiagramaAutobusDAO { - - private static final Logger log = LogManager.getLogger(DiagramaAutobusHibernateDAO.class); - - @Autowired - public DiagramaAutobusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descDiagrama")); - - return c.list(); - } - - public List buscar(String descDiagrama, Short maxparados, - Short cantasientos) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.add(Restrictions.eq("cantasientos", cantasientos)); - c.add(Restrictions.eq("maxparados", maxparados)); - c.add(Restrictions.eq("descDiagrama", descDiagrama)); - - return c.list(); - } - - public List buscar(String descDiagrama) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.add(Restrictions.eq("descDiagrama", descDiagrama)); - - return c.list(); - } - - @Override - public DiagramaAutobus suscribir(DiagramaAutobus entity) { - try { - this.getHibernateTemplate().save(entity); - getHibernateTemplate().flush(); - updateAsientosVendibles(entity); - - return entity; - } catch (final HibernateException ex) { - - throw convertHibernateAccessException(ex); - } - } - - @Override - public DiagramaAutobus actualizacion(DiagramaAutobus entity) { - entity = getHibernateTemplate().merge(entity); - getHibernateTemplate().flush(); - updateAsientosVendibles(entity); - return entity; - } - - private void updateAsientosVendibles(DiagramaAutobus entity) { - try{ - StringBuilder qry = new StringBuilder(); - qry.append("UPDATE diagrama_autobus "); - qry.append("SET CANTASIENTOSVENDIBLES = (SELECT Count(DD.detdiagramaautobus_id) "); - qry.append(" FROM det_diagrama_autobus DD "); - qry.append(" WHERE "); - qry.append(" DD.diagramaautobus_id = :diagramaautobus_id "); - qry.append(" AND DD.vendible = 1 "); - qry.append(" AND DD.activo = 1) "); - qry.append(" WHERE diagramaautobus_id = :diagramaautobus_id "); - - Query query = getSession().createSQLQuery(qry.toString()); - query.setShort("diagramaautobus_id", entity.getDiagramaautobusId()); - query.executeUpdate(); - } catch (final Exception ex) { - throw new RuntimeException("Erro ao atualizar qtd de assentos disponíveis",ex); - } - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.DiagramaAutobusDAO; +import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; + +/** + * + * @author Administrador + */ +@Repository("diagramaAutobusDAO") +public class DiagramaAutobusHibernateDAO extends GenericHibernateDAO + implements DiagramaAutobusDAO { + + private static final Logger log = LogManager.getLogger(DiagramaAutobusHibernateDAO.class); + + @Autowired + public DiagramaAutobusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descDiagrama")); + + return c.list(); + } + + public List buscar(String descDiagrama, Short maxparados, + Short cantasientos) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.add(Restrictions.eq("cantasientos", cantasientos)); + c.add(Restrictions.eq("maxparados", maxparados)); + c.add(Restrictions.eq("descDiagrama", descDiagrama)); + + return c.list(); + } + + public List buscar(String descDiagrama) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.add(Restrictions.eq("descDiagrama", descDiagrama)); + + return c.list(); + } + + @Override + public DiagramaAutobus suscribir(DiagramaAutobus entity) { + try { + this.getHibernateTemplate().save(entity); + getHibernateTemplate().flush(); + updateAsientosVendibles(entity); + + return entity; + } catch (final HibernateException ex) { + + throw convertHibernateAccessException(ex); + } + } + + @Override + public DiagramaAutobus actualizacion(DiagramaAutobus entity) { + entity = getHibernateTemplate().merge(entity); + getHibernateTemplate().flush(); + updateAsientosVendibles(entity); + return entity; + } + + private void updateAsientosVendibles(DiagramaAutobus entity) { + try{ + StringBuilder qry = new StringBuilder(); + qry.append("UPDATE diagrama_autobus "); + qry.append("SET CANTASIENTOSVENDIBLES = (SELECT Count(DD.detdiagramaautobus_id) "); + qry.append(" FROM det_diagrama_autobus DD "); + qry.append(" WHERE "); + qry.append(" DD.diagramaautobus_id = :diagramaautobus_id "); + qry.append(" AND DD.vendible = 1 "); + qry.append(" AND DD.activo = 1) "); + qry.append(" WHERE diagramaautobus_id = :diagramaautobus_id "); + + Query query = getSession().createSQLQuery(qry.toString()); + query.setShort("diagramaautobus_id", entity.getDiagramaautobusId()); + query.executeUpdate(); + } catch (final Exception ex) { + throw new RuntimeException("Erro ao atualizar qtd de assentos disponíveis",ex); + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DisponibilidadHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DisponibilidadHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DisponibilidadHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DisponibilidadHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java index f80f77da9..04ecf4979 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java @@ -1,200 +1,200 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Property; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.DispositivoEmbarcadaDAO; -import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; -import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; -import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -@SuppressWarnings("unchecked") -@Repository("dispositivoEmbarcadaDAO") -public class DispositivoEmbarcadaHibernateDAO extends GenericHibernateDAO - implements DispositivoEmbarcadaDAO { - - @Autowired - public DispositivoEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descricao")); - - return c.list(); - } - - @Override - public DispositivoEmbarcada buscarVersaoUltimaSinc(String versaoUltimaSinc) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("versaoUltimaSinc", versaoUltimaSinc)); - - return (DispositivoEmbarcada) c.uniqueResult(); - } - - @Override - public List buscarAllVersaoUltimaSinc() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.setProjection(Projections.distinct(Property.forName("versaoUltimaSinc"))); - c.add(Restrictions.isNotNull("versaoUltimaSinc")); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("versaoUltimaSinc")); - - return (List) c.list(); - } - - @Override - public DispositivoEmbarcada buscarImeiDuplicado(String imei){ - StringBuilder sb = new StringBuilder(); - sb.append("select dp "); - sb.append("from DispositivoEmbarcada dp "); - sb.append("where dp.imei = :imei "); - - Query query = getSession().createQuery(sb.toString()); - query.setString("imei", imei); - - List list = query.list(); - - if (list.isEmpty()) { - return null; - } - - return (DispositivoEmbarcada) list.get(0); - - } - - @Override - public DispositivoEmbarcada buscarImei(String imei) { - StringBuilder sb = new StringBuilder(); - sb.append("select dp "); - sb.append("from DispositivoEmbarcada dp "); - sb.append(" inner join fetch dp.series as se "); - sb.append("where se.activo = 1 "); - sb.append(" and se.indBaixado = 0 "); - sb.append("and dp.imei = :imei "); - sb.append("and dp.activo = 1 "); - Query query = getSession().createQuery(sb.toString()); - query.setString("imei", imei); - return (DispositivoEmbarcada) query.uniqueResult(); - - } - - @Override - @Transactional - public DispositivoEmbarcada suscribir(DispositivoEmbarcada entity) { - try { - this.getHibernateTemplate().save(entity); - getHibernateTemplate().flush(); - - return entity; - } catch (final HibernateException ex) { - - throw convertHibernateAccessException(ex); - } - } - - @Override - @Transactional - public DispositivoEmbarcada actualizacion(DispositivoEmbarcada entity) { - entity = getHibernateTemplate().merge(entity); - getHibernateTemplate().flush(); - return entity; - } - - @Override - @Transactional - public DispositivoEmbarcada suscribirActualizar(DispositivoEmbarcada dispositivoEmbarcada) { - if (buscarDispositivoPorId(dispositivoEmbarcada) != null) { - actualizacion(dispositivoEmbarcada); - } else { - suscribir(dispositivoEmbarcada); - } - return dispositivoEmbarcada; - } - - @Override - public DispositivoEmbarcada buscarDispositivoPorId(DispositivoEmbarcada dispositivoEmbarcada) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.add(Restrictions.eq("id", dispositivoEmbarcada.getDispositivoEmbarcadaId())); - - return (DispositivoEmbarcada) c.uniqueResult(); - } - - @Override - public List buscarPorEmpresaPuntoVenta(Empresa empresa, PuntoVenta puntoventa) { - StringBuilder sb = new StringBuilder(); - sb.append("from DispositivoEmbarcada de "); - sb.append("where activo = 1 "); - sb.append("and de.empresaId = :empresaId "); - sb.append("and de.puntoVentaId = :puntoVentaId "); - - Query qry = getSession().createQuery(sb.toString()); - qry.setLong("empresaId", empresa.getEmpresaId()); - qry.setLong("puntoVentaId", puntoventa.getPuntoventaId()); - - return qry.list(); - } - - @Override - public List buscarTodos() { - StringBuilder sb = new StringBuilder(); - sb.append("from DispositivoEmbarcada de "); - sb.append("where activo = 1 "); - - Query qry = getSession().createQuery(sb.toString()); - - return qry.list(); - } - - @Override - public List getListaFormaPago(Integer puntoventaId) { - String queryStr = "from FormaPagoDet fp where fp.activo = true and fp.indEmbarcada = true and fp.puntoVenta.puntoventaId = :puntoventaId"; - - Query query = getSession().createQuery(queryStr); - query.setInteger("puntoventaId", puntoventaId); - - return query.list(); - } - - @Override - public List getListaSeguroTaxaEmbarque(Integer puntoventaId) { - String queryStr = "from PtoVtaSeguro x where x.activo = true and x.puntoventaId.puntoventaId = :puntoventaId"; - - Query query = getSession().createQuery(queryStr); - query.setInteger("puntoventaId", puntoventaId); - - return query.list(); - } - - @Override - public List getListaTiposPassagensBloqueadas(Integer puntoventaId) { - String queryStr = "from PtovtaCatInd x where x.activo = true and x.indEmbarcada = true and x.puntoVenta.puntoventaId = :puntoventaId"; - - Query query = getSession().createQuery(queryStr); - query.setInteger("puntoventaId", puntoventaId); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Property; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.DispositivoEmbarcadaDAO; +import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcada; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; +import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; +import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +@SuppressWarnings("unchecked") +@Repository("dispositivoEmbarcadaDAO") +public class DispositivoEmbarcadaHibernateDAO extends GenericHibernateDAO + implements DispositivoEmbarcadaDAO { + + @Autowired + public DispositivoEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descricao")); + + return c.list(); + } + + @Override + public DispositivoEmbarcada buscarVersaoUltimaSinc(String versaoUltimaSinc) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("versaoUltimaSinc", versaoUltimaSinc)); + + return (DispositivoEmbarcada) c.uniqueResult(); + } + + @Override + public List buscarAllVersaoUltimaSinc() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.setProjection(Projections.distinct(Property.forName("versaoUltimaSinc"))); + c.add(Restrictions.isNotNull("versaoUltimaSinc")); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("versaoUltimaSinc")); + + return (List) c.list(); + } + + @Override + public DispositivoEmbarcada buscarImeiDuplicado(String imei){ + StringBuilder sb = new StringBuilder(); + sb.append("select dp "); + sb.append("from DispositivoEmbarcada dp "); + sb.append("where dp.imei = :imei "); + + Query query = getSession().createQuery(sb.toString()); + query.setString("imei", imei); + + List list = query.list(); + + if (list.isEmpty()) { + return null; + } + + return (DispositivoEmbarcada) list.get(0); + + } + + @Override + public DispositivoEmbarcada buscarImei(String imei) { + StringBuilder sb = new StringBuilder(); + sb.append("select dp "); + sb.append("from DispositivoEmbarcada dp "); + sb.append(" inner join fetch dp.series as se "); + sb.append("where se.activo = 1 "); + sb.append(" and se.indBaixado = 0 "); + sb.append("and dp.imei = :imei "); + sb.append("and dp.activo = 1 "); + Query query = getSession().createQuery(sb.toString()); + query.setString("imei", imei); + return (DispositivoEmbarcada) query.uniqueResult(); + + } + + @Override + @Transactional + public DispositivoEmbarcada suscribir(DispositivoEmbarcada entity) { + try { + this.getHibernateTemplate().save(entity); + getHibernateTemplate().flush(); + + return entity; + } catch (final HibernateException ex) { + + throw convertHibernateAccessException(ex); + } + } + + @Override + @Transactional + public DispositivoEmbarcada actualizacion(DispositivoEmbarcada entity) { + entity = getHibernateTemplate().merge(entity); + getHibernateTemplate().flush(); + return entity; + } + + @Override + @Transactional + public DispositivoEmbarcada suscribirActualizar(DispositivoEmbarcada dispositivoEmbarcada) { + if (buscarDispositivoPorId(dispositivoEmbarcada) != null) { + actualizacion(dispositivoEmbarcada); + } else { + suscribir(dispositivoEmbarcada); + } + return dispositivoEmbarcada; + } + + @Override + public DispositivoEmbarcada buscarDispositivoPorId(DispositivoEmbarcada dispositivoEmbarcada) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.add(Restrictions.eq("id", dispositivoEmbarcada.getDispositivoEmbarcadaId())); + + return (DispositivoEmbarcada) c.uniqueResult(); + } + + @Override + public List buscarPorEmpresaPuntoVenta(Empresa empresa, PuntoVenta puntoventa) { + StringBuilder sb = new StringBuilder(); + sb.append("from DispositivoEmbarcada de "); + sb.append("where activo = 1 "); + sb.append("and de.empresaId = :empresaId "); + sb.append("and de.puntoVentaId = :puntoVentaId "); + + Query qry = getSession().createQuery(sb.toString()); + qry.setLong("empresaId", empresa.getEmpresaId()); + qry.setLong("puntoVentaId", puntoventa.getPuntoventaId()); + + return qry.list(); + } + + @Override + public List buscarTodos() { + StringBuilder sb = new StringBuilder(); + sb.append("from DispositivoEmbarcada de "); + sb.append("where activo = 1 "); + + Query qry = getSession().createQuery(sb.toString()); + + return qry.list(); + } + + @Override + public List getListaFormaPago(Integer puntoventaId) { + String queryStr = "from FormaPagoDet fp where fp.activo = true and fp.indEmbarcada = true and fp.puntoVenta.puntoventaId = :puntoventaId"; + + Query query = getSession().createQuery(queryStr); + query.setInteger("puntoventaId", puntoventaId); + + return query.list(); + } + + @Override + public List getListaSeguroTaxaEmbarque(Integer puntoventaId) { + String queryStr = "from PtoVtaSeguro x where x.activo = true and x.puntoventaId.puntoventaId = :puntoventaId"; + + Query query = getSession().createQuery(queryStr); + query.setInteger("puntoventaId", puntoventaId); + + return query.list(); + } + + @Override + public List getListaTiposPassagensBloqueadas(Integer puntoventaId) { + String queryStr = "from PtovtaCatInd x where x.activo = true and x.indEmbarcada = true and x.puntoVenta.puntoventaId = :puntoventaId"; + + Query query = getSession().createQuery(queryStr); + query.setInteger("puntoventaId", puntoventaId); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHistoricoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHistoricoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHistoricoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHistoricoHibernateDAO.java index 72bcc28e1..ccc477a3a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHistoricoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHistoricoHibernateDAO.java @@ -1,82 +1,82 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.DispositivoEmbarcadaHistoricoDAO; -import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcadaHistorico; - -@Repository("dispositivoEmbarcadaHistoricoDAO") -public class DispositivoEmbarcadaHistoricoHibernateDAO extends GenericHibernateDAO - implements DispositivoEmbarcadaHistoricoDAO { - - private static final Logger log = LogManager.getLogger(DispositivoEmbarcadaHistoricoHibernateDAO.class); - - @Autowired - public DispositivoEmbarcadaHistoricoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descricao")); - - return c.list(); - } - - @Override - @Transactional - public DispositivoEmbarcadaHistorico suscribir(DispositivoEmbarcadaHistorico entity) { - try { - this.getHibernateTemplate().save(entity); - getHibernateTemplate().flush(); - - return entity; - } catch (final HibernateException ex) { - - throw convertHibernateAccessException(ex); - } - } - - @Override - public DispositivoEmbarcadaHistorico actualizacion(DispositivoEmbarcadaHistorico entity) { - entity = getHibernateTemplate().merge(entity); - getHibernateTemplate().flush(); - return entity; - } - - @SuppressWarnings("unchecked") - @Override - public List buscarHistoricoDispositivoPorId(Long dispositivoId) { - // Criteria c = getSession().createCriteria(getPersistentClass()); - // c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - // c.add(Restrictions.eq("dispositivoEmbarcada.dispositivoEmbarcadaId", dispositivoId)); - // c.addOrder(Order.desc("dispositivoEmbarcadaHistId")); - // - // return (List)c.list(); - - // Mantis 16258 - // Query acima continha muitos joins fetchs desnecessários a partir de EMPRESA, que foram criados de forma não explícita. - // Assim a query retornava um número de registros além do real e não conseguia converter para a lista de DispositivoEmbarcadaHistorico - final String hql = "select dh from DispositivoEmbarcadaHistorico dh join fetch dh.dispositivoEmbarcada de where de.dispositivoEmbarcadaId = :dispositivoEmbarcadaId order by dh.dispositivoEmbarcadaHistId"; - Query query = getSession().createQuery(hql); - query.setParameter("dispositivoEmbarcadaId", dispositivoId); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.DispositivoEmbarcadaHistoricoDAO; +import com.rjconsultores.ventaboletos.entidad.DispositivoEmbarcadaHistorico; + +@Repository("dispositivoEmbarcadaHistoricoDAO") +public class DispositivoEmbarcadaHistoricoHibernateDAO extends GenericHibernateDAO + implements DispositivoEmbarcadaHistoricoDAO { + + private static final Logger log = LogManager.getLogger(DispositivoEmbarcadaHistoricoHibernateDAO.class); + + @Autowired + public DispositivoEmbarcadaHistoricoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descricao")); + + return c.list(); + } + + @Override + @Transactional + public DispositivoEmbarcadaHistorico suscribir(DispositivoEmbarcadaHistorico entity) { + try { + this.getHibernateTemplate().save(entity); + getHibernateTemplate().flush(); + + return entity; + } catch (final HibernateException ex) { + + throw convertHibernateAccessException(ex); + } + } + + @Override + public DispositivoEmbarcadaHistorico actualizacion(DispositivoEmbarcadaHistorico entity) { + entity = getHibernateTemplate().merge(entity); + getHibernateTemplate().flush(); + return entity; + } + + @SuppressWarnings("unchecked") + @Override + public List buscarHistoricoDispositivoPorId(Long dispositivoId) { + // Criteria c = getSession().createCriteria(getPersistentClass()); + // c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + // c.add(Restrictions.eq("dispositivoEmbarcada.dispositivoEmbarcadaId", dispositivoId)); + // c.addOrder(Order.desc("dispositivoEmbarcadaHistId")); + // + // return (List)c.list(); + + // Mantis 16258 + // Query acima continha muitos joins fetchs desnecessários a partir de EMPRESA, que foram criados de forma não explícita. + // Assim a query retornava um número de registros além do real e não conseguia converter para a lista de DispositivoEmbarcadaHistorico + final String hql = "select dh from DispositivoEmbarcadaHistorico dh join fetch dh.dispositivoEmbarcada de where de.dispositivoEmbarcadaId = :dispositivoEmbarcadaId order by dh.dispositivoEmbarcadaHistId"; + Query query = getSession().createQuery(hql); + query.setParameter("dispositivoEmbarcadaId", dispositivoId); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java index 8180befb3..d93197900 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.DivisionDAO; -import com.rjconsultores.ventaboletos.entidad.Division; - - -@Repository("divisionDAO") -public class DivisionHibernateDAO extends GenericHibernateDAO -implements DivisionDAO { - - @Autowired - public DivisionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.DivisionDAO; +import com.rjconsultores.ventaboletos.entidad.Division; + + +@Repository("divisionDAO") +public class DivisionHibernateDAO extends GenericHibernateDAO +implements DivisionDAO { + + @Autowired + public DivisionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java index 831adc714..574f42850 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java @@ -1,107 +1,107 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.transform.Transformers; -import org.hibernate.type.BooleanType; -import org.hibernate.type.LongType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmbarcadaDispOperadorDAO; -import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; - -@Repository("embarcadaDispOperadorDAO") -public class EmbarcadaDispOperadorHibernateDAO extends GenericHibernateDAO - implements EmbarcadaDispOperadorDAO { - private static final Logger log = LogManager.getLogger(EmbarcadaDispOperadorHibernateDAO.class); - - @Autowired - public EmbarcadaDispOperadorHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("select EMBARCADADISPOPERADOR_ID as embarcadaDispOperador, ") - .append(" DISPOSITIVOEMBARCADA_ID as dispositivoEmbarcadaId, ") - .append(" USUARIO_ID as usuarioId, ") - .append(" PUNTOVENTA_ID as puntoVentaId, ") - .append(" ACTIVO as activo ") - .append(" from embarcada_disp_operador embdispop ") - .append(" where ") - .append(" embdispop.puntoventa_id = :puntoVentaId ") - .append(" and embdispop.activo = 1 "); - Query qr = getSession().createSQLQuery(sQuery.toString()) - .addScalar("embarcadaDispOperador", new LongType()) - .addScalar("dispositivoEmbarcadaId", new LongType()) - .addScalar("usuarioId", new LongType()) - .addScalar("puntoVentaId", new LongType()) - .addScalar("activo", new BooleanType()) - .setResultTransformer(Transformers.aliasToBean(EmbarcadaDispOperador.class)); - - qr.setLong("puntoVentaId", puntoVentaId); - return (List) qr.list(); - } - - @Transactional - @Override - public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList) { - try { - for (EmbarcadaDispOperador embarcadaDispOperador : embarcadaDisOperadorList) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("delete ") - .append(" from embarcada_disp_operador embdispop ") - .append(" where ") - .append(" embdispop.usuario_id = :usuarioId ") - .append(" and embdispop.dispositivoembarcada_id = :dispositivoEmbarcadaId ") - .append(" and embdispop.activo = 1 "); - Query qr = getSession().createSQLQuery(sQuery.toString()); - qr.setLong("usuarioId", embarcadaDispOperador.getUsuarioId()); - qr.setLong("dispositivoEmbarcadaId", embarcadaDispOperador.getDispositivoEmbarcadaId()); - qr.executeUpdate(); - - } - } catch (Exception e) { - log.error("Erro ao deletar dispositivos usuários"); - return false; - } - return true; - } - - @SuppressWarnings("unchecked") - @Override - public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId) { - StringBuilder sQuery = new StringBuilder(); - sQuery.append("select embdispop.EMBARCADADISPOPERADOR_ID as embarcadaDispOperador, ") - .append(" embdispop.DISPOSITIVOEMBARCADA_ID as dispositivoEmbarcadaId, ") - .append(" embdispop.USUARIO_ID as usuarioId, ") - .append(" embdispop.PUNTOVENTA_ID as puntoVentaId, ") - .append(" embdispop.ACTIVO as activo ") - .append(" from embarcada_disp_operador embdispop ") - .append(" JOIN OPERADOR_EMBARCADA opeEmb ON (embdispop.USUARIO_ID = opeEmb.USUARIO_ID) ") - .append(" where ") - .append(" embdispop.dispositivoembarcada_id = :dispositivoEmbarcadaId ") - .append(" and embdispop.activo = 1 ") - .append(" and opeEmb.activo = 1 "); - Query qr = getSession().createSQLQuery(sQuery.toString()) - .addScalar("embarcadaDispOperador", new LongType()) - .addScalar("dispositivoEmbarcadaId", new LongType()) - .addScalar("usuarioId", new LongType()) - .addScalar("puntoVentaId", new LongType()) - .addScalar("activo", new BooleanType()) - .setResultTransformer(Transformers.aliasToBean(EmbarcadaDispOperador.class)); - - qr.setLong("dispositivoEmbarcadaId", dispositivoEmbarcadaId); - return (List) qr.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; +import org.hibernate.type.BooleanType; +import org.hibernate.type.LongType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmbarcadaDispOperadorDAO; +import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; + +@Repository("embarcadaDispOperadorDAO") +public class EmbarcadaDispOperadorHibernateDAO extends GenericHibernateDAO + implements EmbarcadaDispOperadorDAO { + private static final Logger log = LogManager.getLogger(EmbarcadaDispOperadorHibernateDAO.class); + + @Autowired + public EmbarcadaDispOperadorHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("select EMBARCADADISPOPERADOR_ID as embarcadaDispOperador, ") + .append(" DISPOSITIVOEMBARCADA_ID as dispositivoEmbarcadaId, ") + .append(" USUARIO_ID as usuarioId, ") + .append(" PUNTOVENTA_ID as puntoVentaId, ") + .append(" ACTIVO as activo ") + .append(" from embarcada_disp_operador embdispop ") + .append(" where ") + .append(" embdispop.puntoventa_id = :puntoVentaId ") + .append(" and embdispop.activo = 1 "); + Query qr = getSession().createSQLQuery(sQuery.toString()) + .addScalar("embarcadaDispOperador", new LongType()) + .addScalar("dispositivoEmbarcadaId", new LongType()) + .addScalar("usuarioId", new LongType()) + .addScalar("puntoVentaId", new LongType()) + .addScalar("activo", new BooleanType()) + .setResultTransformer(Transformers.aliasToBean(EmbarcadaDispOperador.class)); + + qr.setLong("puntoVentaId", puntoVentaId); + return (List) qr.list(); + } + + @Transactional + @Override + public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList) { + try { + for (EmbarcadaDispOperador embarcadaDispOperador : embarcadaDisOperadorList) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("delete ") + .append(" from embarcada_disp_operador embdispop ") + .append(" where ") + .append(" embdispop.usuario_id = :usuarioId ") + .append(" and embdispop.dispositivoembarcada_id = :dispositivoEmbarcadaId ") + .append(" and embdispop.activo = 1 "); + Query qr = getSession().createSQLQuery(sQuery.toString()); + qr.setLong("usuarioId", embarcadaDispOperador.getUsuarioId()); + qr.setLong("dispositivoEmbarcadaId", embarcadaDispOperador.getDispositivoEmbarcadaId()); + qr.executeUpdate(); + + } + } catch (Exception e) { + log.error("Erro ao deletar dispositivos usuários"); + return false; + } + return true; + } + + @SuppressWarnings("unchecked") + @Override + public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId) { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("select embdispop.EMBARCADADISPOPERADOR_ID as embarcadaDispOperador, ") + .append(" embdispop.DISPOSITIVOEMBARCADA_ID as dispositivoEmbarcadaId, ") + .append(" embdispop.USUARIO_ID as usuarioId, ") + .append(" embdispop.PUNTOVENTA_ID as puntoVentaId, ") + .append(" embdispop.ACTIVO as activo ") + .append(" from embarcada_disp_operador embdispop ") + .append(" JOIN OPERADOR_EMBARCADA opeEmb ON (embdispop.USUARIO_ID = opeEmb.USUARIO_ID) ") + .append(" where ") + .append(" embdispop.dispositivoembarcada_id = :dispositivoEmbarcadaId ") + .append(" and embdispop.activo = 1 ") + .append(" and opeEmb.activo = 1 "); + Query qr = getSession().createSQLQuery(sQuery.toString()) + .addScalar("embarcadaDispOperador", new LongType()) + .addScalar("dispositivoEmbarcadaId", new LongType()) + .addScalar("usuarioId", new LongType()) + .addScalar("puntoVentaId", new LongType()) + .addScalar("activo", new BooleanType()) + .setResultTransformer(Transformers.aliasToBean(EmbarcadaDispOperador.class)); + + qr.setLong("dispositivoEmbarcadaId", dispositivoEmbarcadaId); + return (List) qr.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java index 04185db47..c2794a167 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmbarqueCatracaRodoviariaDAO; -import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; - -@Repository("embarqueCatracaRodoviariaDAO") -public class EmbarqueCatracaRodoviariaHibernateDAO - extends GenericHibernateDAO implements EmbarqueCatracaRodoviariaDAO { - - @Autowired - public EmbarqueCatracaRodoviariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria criteria = getSession().createCriteria(getPersistentClass()); - criteria.add(Restrictions.eq(ACTIVO, true)); - return criteria.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmbarqueCatracaRodoviariaDAO; +import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; + +@Repository("embarqueCatracaRodoviariaDAO") +public class EmbarqueCatracaRodoviariaHibernateDAO + extends GenericHibernateDAO implements EmbarqueCatracaRodoviariaDAO { + + @Autowired + public EmbarqueCatracaRodoviariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria criteria = getSession().createCriteria(getPersistentClass()); + criteria.add(Restrictions.eq(ACTIVO, true)); + return criteria.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java index cfe2c68eb..24ba86aeb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaAdyenConfigDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; - -@Repository("empresaAdyenConfigDAO") -public class EmpresaAdyenConfigHibernateDAO extends GenericHibernateDAO - implements EmpresaAdyenConfigDAO { - - @Autowired - public EmpresaAdyenConfigHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - - return (EmpresaAdyenConfig) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaAdyenConfigDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; + +@Repository("empresaAdyenConfigDAO") +public class EmpresaAdyenConfigHibernateDAO extends GenericHibernateDAO + implements EmpresaAdyenConfigDAO { + + @Autowired + public EmpresaAdyenConfigHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + + return (EmpresaAdyenConfig) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAsistenciaDeViajeConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAsistenciaDeViajeConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAsistenciaDeViajeConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAsistenciaDeViajeConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCieloLinkHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCieloLinkHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCieloLinkHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCieloLinkHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaConfigLayoutHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaConfigLayoutHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaConfigLayoutHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaConfigLayoutHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaContaBancariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaContaBancariaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaContaBancariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaContaBancariaHibernateDAO.java index 949340afc..25f023c09 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaContaBancariaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaContaBancariaHibernateDAO.java @@ -1,27 +1,27 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaContaBancariaDAO; -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; - -@Repository("empresaContaBancariaDAO") -public class EmpresaContaBancariaHibernateDAO extends GenericHibernateDAO implements EmpresaContaBancariaDAO { - - @Autowired - public EmpresaContaBancariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public EmpresaContaBancaria suscribir(EmpresaContaBancaria entity) throws RuntimeException { - - entity = super.suscribir(entity); - - getSession().flush(); - return entity; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaContaBancariaDAO; +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; + +@Repository("empresaContaBancariaDAO") +public class EmpresaContaBancariaHibernateDAO extends GenericHibernateDAO implements EmpresaContaBancariaDAO { + + @Autowired + public EmpresaContaBancariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public EmpresaContaBancaria suscribir(EmpresaContaBancaria entity) throws RuntimeException { + + entity = super.suscribir(entity); + + getSession().flush(); + return entity; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java index 4cb98bc7c..fba73f4dc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailConfigDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; - -@Repository("empresaEmailConfigDAO") -public class EmpresaEmailConfigHibernateDAO extends GenericHibernateDAO - implements EmpresaEmailConfigDAO { - - @Autowired - public EmpresaEmailConfigHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - - return (EmpresaEmailConfig) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailConfigDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; + +@Repository("empresaEmailConfigDAO") +public class EmpresaEmailConfigHibernateDAO extends GenericHibernateDAO + implements EmpresaEmailConfigDAO { + + @Autowired + public EmpresaEmailConfigHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + + return (EmpresaEmailConfig) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailEComerceHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailEComerceHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailEComerceHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailEComerceHibernateDAO.java index 8a78338fe..8494ed3ec 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailEComerceHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailEComerceHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailEComerceDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; - -@Repository("empresaEmailEComerceDAO") -public class EmpresaEmailEComerceHibernateDAO extends GenericHibernateDAO - implements EmpresaEmailEComerceDAO { - - @Autowired - public EmpresaEmailEComerceHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq("tipoOperacao", tipoOperacao)); - - return (EmpresaEmailEComerce) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailEComerceDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; + +@Repository("empresaEmailEComerceDAO") +public class EmpresaEmailEComerceHibernateDAO extends GenericHibernateDAO + implements EmpresaEmailEComerceDAO { + + @Autowired + public EmpresaEmailEComerceHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + c.add(Restrictions.eq("tipoOperacao", tipoOperacao)); + + return (EmpresaEmailEComerce) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailFlexBusHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailFlexBusHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailFlexBusHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailFlexBusHibernateDAO.java index 6b72ab199..375a5b1e7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailFlexBusHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailFlexBusHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailFlexBusDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; - -@Repository("empresaEmailFlexBusDAO") -public class EmpresaEmailFlexBusHibernateDAO extends GenericHibernateDAO - implements EmpresaEmailFlexBusDAO { - - @Autowired - public EmpresaEmailFlexBusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - - return (EmpresaEmailFlexBus) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailFlexBusDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; + +@Repository("empresaEmailFlexBusDAO") +public class EmpresaEmailFlexBusHibernateDAO extends GenericHibernateDAO + implements EmpresaEmailFlexBusDAO { + + @Autowired + public EmpresaEmailFlexBusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + + return (EmpresaEmailFlexBus) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailHibernateDAO.java index 0c6f2cb4d..381c43823 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailHibernateDAO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; - -@Repository("empresaEmailDAO") -public class EmpresaEmailHibernateDAO extends GenericHibernateDAO - implements EmpresaEmailDAO { - - @Autowired - public EmpresaEmailHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public EmpresaEmail buscarPorEmpresa(Empresa empresa) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - - return (EmpresaEmail) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; + +@Repository("empresaEmailDAO") +public class EmpresaEmailHibernateDAO extends GenericHibernateDAO + implements EmpresaEmailDAO { + + @Autowired + public EmpresaEmailHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public EmpresaEmail buscarPorEmpresa(Empresa empresa) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + + return (EmpresaEmail) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEquivalenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEquivalenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEquivalenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEquivalenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaImpostoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaImpostoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaImpostoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaImpostoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaIziPayHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaIziPayHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaIziPayHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaIziPayHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaNequiConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaNequiConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaNequiConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaNequiConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaPMArtespConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaPMArtespConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaPMArtespConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaPMArtespConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaRecargaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaRecargaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaRecargaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaRecargaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java index 8bef1f4b3..fb14f34ba 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaSaferConfigDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; - -@Repository("empresaSaferConfigDAO") -public class EmpresaSaferConfigHibernateDAO extends GenericHibernateDAO - implements EmpresaSaferConfigDAO { - - @Autowired - public EmpresaSaferConfigHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - - return (EmpresaSaferConfig) c.uniqueResult(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaSaferConfigDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; + +@Repository("empresaSaferConfigDAO") +public class EmpresaSaferConfigHibernateDAO extends GenericHibernateDAO + implements EmpresaSaferConfigDAO { + + @Autowired + public EmpresaSaferConfigHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + + return (EmpresaSaferConfig) c.uniqueResult(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSicfeConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSicfeConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSicfeConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSicfeConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java index b7daa17ac..a1b2a3dc3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EmpresaTrocoSimplesDAO; -import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; - -@Repository("empresaTrocoSimplesDAO") -public class EmpresaTrocoSimplesHibernateDAO extends GenericHibernateDAO implements EmpresaTrocoSimplesDAO { - - @Autowired - public EmpresaTrocoSimplesHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public EmpresaTrocoSimples buscarPorEmpresaId(Integer empresaId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa.empresaId", empresaId)); - - return (EmpresaTrocoSimples) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EmpresaTrocoSimplesDAO; +import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; + +@Repository("empresaTrocoSimplesDAO") +public class EmpresaTrocoSimplesHibernateDAO extends GenericHibernateDAO implements EmpresaTrocoSimplesDAO { + + @Autowired + public EmpresaTrocoSimplesHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public EmpresaTrocoSimples buscarPorEmpresaId(Integer empresaId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa.empresaId", empresaId)); + + return (EmpresaTrocoSimples) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EnderecoApanheHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EnderecoApanheHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EnderecoApanheHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EnderecoApanheHibernateDAO.java index fac252600..1f1b1e3c8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EnderecoApanheHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EnderecoApanheHibernateDAO.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EnderecoApanheDAO; -import com.rjconsultores.ventaboletos.entidad.EnderecoApanhe; - -@Repository("enderecoApanheDAO") -public class EnderecoApanheHibernateDAO extends GenericHibernateDAO implements EnderecoApanheDAO { - - @Autowired - public EnderecoApanheHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public List buscar(Date datapacote, String numoperacion) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - if(datapacote != null) { - c.add(Restrictions.eq("hotel.datapacote", datapacote)); - } - - if(StringUtils.isNotBlank(numoperacion)) { - c.add(Restrictions.eq("hotel.numoperacion", numoperacion)); - } - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EnderecoApanheDAO; +import com.rjconsultores.ventaboletos.entidad.EnderecoApanhe; + +@Repository("enderecoApanheDAO") +public class EnderecoApanheHibernateDAO extends GenericHibernateDAO implements EnderecoApanheDAO { + + @Autowired + public EnderecoApanheHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public List buscar(Date datapacote, String numoperacion) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + if(datapacote != null) { + c.add(Restrictions.eq("hotel.datapacote", datapacote)); + } + + if(StringUtils.isNotBlank(numoperacion)) { + c.add(Restrictions.eq("hotel.numoperacion", numoperacion)); + } + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java index 40e0cdf2d..b445ef7ba 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java @@ -1,46 +1,46 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EscolaDAO; -import com.rjconsultores.ventaboletos.entidad.Ciudad; -import com.rjconsultores.ventaboletos.entidad.Escola; - -@Repository("escolaDAO") -public class EscolaHibernateDAO extends GenericHibernateDAO - implements EscolaDAO { - - @Autowired - public EscolaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("nombescola")); - - return c.list(); - } - - @Override - public List buscar(String nombescola, Ciudad ciudad) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("nombescola", nombescola)); - c.add(Restrictions.eq("ciudad", ciudad)); - c.addOrder(Order.asc("nombescola")); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EscolaDAO; +import com.rjconsultores.ventaboletos.entidad.Ciudad; +import com.rjconsultores.ventaboletos.entidad.Escola; + +@Repository("escolaDAO") +public class EscolaHibernateDAO extends GenericHibernateDAO + implements EscolaDAO { + + @Autowired + public EscolaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("nombescola")); + + return c.list(); + } + + @Override + public List buscar(String nombescola, Ciudad ciudad) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("nombescola", nombescola)); + c.add(Restrictions.eq("ciudad", ciudad)); + c.addOrder(Order.asc("nombescola")); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAsientoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAsientoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAsientoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAsientoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaEmbarqueDesembarqueHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaEmbarqueDesembarqueHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaEmbarqueDesembarqueHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaEmbarqueDesembarqueHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaTramoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaTramoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaTramoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaTramoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java index b1124d1f9..3b0770332 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java @@ -1,181 +1,181 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EstadoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Pais; - -/** - * - * @author MCosso - */ -@Repository("estadoDAO") -public class EstadoHibernateDAO extends GenericHibernateDAO - implements EstadoDAO { - - private static Logger log = LogManager.getLogger(EstadoHibernateDAO.class); - - @Autowired - public EstadoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("nombestado")); - - return c.list(); - } - - public List buscar(String nombestado, Pais pais) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("nombestado", nombestado)); - c.add(Restrictions.eq("pais", pais)); - - return c.list(); - } - - public List buscarNotInEmpresaImposto(Empresa empresa) { - StringBuilder sb = new StringBuilder(); - - sb.append(" select es "); - sb.append(" from Estado es "); - sb.append(" where es.activo = 1 "); - sb.append(" and es.estadoId not in ( "); - sb.append(" select ei.estado.estadoId from EmpresaImposto ei "); - sb.append(" where ei.activo = 1 and ei.empresa.empresaId =:empresaId "); - sb.append(" )"); - sb.append(" order by es.nombestado"); - - Query query = getSession().createQuery(sb.toString()); - query.setParameter("empresaId", empresa.getEmpresaId()); - - List lsEstado = query.list(); - - return lsEstado; - } - - @Override - public List buscarCveEstado(String cveEstado) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("cveestado", cveEstado)); - return c.list(); - } - - @Override - public Map getConfiguracoesFusoVeraoParada(Integer paradaId, Date data) { - return getConfiguracoesFusoVerao(null, paradaId, data); - } - - @Override - public Map getConfiguracoesFusoVeraoPuntoventa(Integer puntoventaId, Date data) { - return getConfiguracoesFusoVerao(puntoventaId, null, data); - } - - @SuppressWarnings("unchecked") - private Map getConfiguracoesFusoVerao(final Integer puntoventaId, final Integer paradaId, final Date data) { - Map retorno = new HashMap(); - - if(puntoventaId == null && paradaId == null) { - return retorno; - } - - Calendar dataServidorFuso = new GregorianCalendar(); - dataServidorFuso.setTime(data); - - final StringBuilder sql = new StringBuilder(); - sql.append(" select e.tiempohorhuso as tiempoHorHuso, e.tiempohorverano as tiempoHorVerano, "); - sql.append(" e.feciniciohorverano as fecInicioHorVerano, e.fecfinohorverano as fecFinoHorVerano "); - sql.append(" from estado e"); - sql.append(" join ciudad c on c.estado_id = e.estado_id"); - - if (puntoventaId != null) { - sql.append(" join colonia o on o.ciudad_id = c.ciudad_id"); - sql.append(" join punto_venta p on p.colonia_id = o.colonia_id"); - } - - if(paradaId != null) { - sql.append(" join parada p on c.ciudad_id = p.ciudad_id"); - } - - sql.append(" where e.activo = 1"); - if (puntoventaId != null) { - sql.append(" and p.puntoventa_id = :puntoventaId"); - } - - if(paradaId != null) { - sql.append(" and p.parada_id = :paradaId"); - } - - try { - Query qr = getSession().createSQLQuery(sql.toString()) - .addScalar("tiempoHorHuso", IntegerType.INSTANCE) - .addScalar("tiempoHorVerano", IntegerType.INSTANCE) - .addScalar("fecInicioHorVerano", DateType.INSTANCE) - .addScalar("fecFinoHorVerano", DateType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(Estado.class)); - if (puntoventaId != null) { - qr.setParameter("puntoventaId", puntoventaId); - } - if(paradaId != null) { - qr.setParameter("paradaId", paradaId); - } - - List resultado = qr.list(); - for (Estado estado : resultado) { - Integer tiempohorhuso = estado.getTiempoHorHuso(); - Integer tiempohorverano = estado.getTiempoHorVerano(); - Date feciniciohorverano = estado.getFecInicioHorVerano(); - Date fecfinohorverano = estado.getFecFinoHorVerano(); - - if (tiempohorhuso != null) { - retorno.put("tiempohorhuso", tiempohorhuso); - } - - if (fecfinohorverano != null && feciniciohorverano != null) { - if ((dataServidorFuso.getTime().equals(feciniciohorverano) - || dataServidorFuso.getTime().after(feciniciohorverano)) - && dataServidorFuso.getTime().before(fecfinohorverano)) { - retorno.put("tiempohorverano", tiempohorverano); - } - } - - break; - } - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EstadoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Pais; + +/** + * + * @author MCosso + */ +@Repository("estadoDAO") +public class EstadoHibernateDAO extends GenericHibernateDAO + implements EstadoDAO { + + private static Logger log = LogManager.getLogger(EstadoHibernateDAO.class); + + @Autowired + public EstadoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("nombestado")); + + return c.list(); + } + + public List buscar(String nombestado, Pais pais) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("nombestado", nombestado)); + c.add(Restrictions.eq("pais", pais)); + + return c.list(); + } + + public List buscarNotInEmpresaImposto(Empresa empresa) { + StringBuilder sb = new StringBuilder(); + + sb.append(" select es "); + sb.append(" from Estado es "); + sb.append(" where es.activo = 1 "); + sb.append(" and es.estadoId not in ( "); + sb.append(" select ei.estado.estadoId from EmpresaImposto ei "); + sb.append(" where ei.activo = 1 and ei.empresa.empresaId =:empresaId "); + sb.append(" )"); + sb.append(" order by es.nombestado"); + + Query query = getSession().createQuery(sb.toString()); + query.setParameter("empresaId", empresa.getEmpresaId()); + + List lsEstado = query.list(); + + return lsEstado; + } + + @Override + public List buscarCveEstado(String cveEstado) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("cveestado", cveEstado)); + return c.list(); + } + + @Override + public Map getConfiguracoesFusoVeraoParada(Integer paradaId, Date data) { + return getConfiguracoesFusoVerao(null, paradaId, data); + } + + @Override + public Map getConfiguracoesFusoVeraoPuntoventa(Integer puntoventaId, Date data) { + return getConfiguracoesFusoVerao(puntoventaId, null, data); + } + + @SuppressWarnings("unchecked") + private Map getConfiguracoesFusoVerao(final Integer puntoventaId, final Integer paradaId, final Date data) { + Map retorno = new HashMap(); + + if(puntoventaId == null && paradaId == null) { + return retorno; + } + + Calendar dataServidorFuso = new GregorianCalendar(); + dataServidorFuso.setTime(data); + + final StringBuilder sql = new StringBuilder(); + sql.append(" select e.tiempohorhuso as tiempoHorHuso, e.tiempohorverano as tiempoHorVerano, "); + sql.append(" e.feciniciohorverano as fecInicioHorVerano, e.fecfinohorverano as fecFinoHorVerano "); + sql.append(" from estado e"); + sql.append(" join ciudad c on c.estado_id = e.estado_id"); + + if (puntoventaId != null) { + sql.append(" join colonia o on o.ciudad_id = c.ciudad_id"); + sql.append(" join punto_venta p on p.colonia_id = o.colonia_id"); + } + + if(paradaId != null) { + sql.append(" join parada p on c.ciudad_id = p.ciudad_id"); + } + + sql.append(" where e.activo = 1"); + if (puntoventaId != null) { + sql.append(" and p.puntoventa_id = :puntoventaId"); + } + + if(paradaId != null) { + sql.append(" and p.parada_id = :paradaId"); + } + + try { + Query qr = getSession().createSQLQuery(sql.toString()) + .addScalar("tiempoHorHuso", IntegerType.INSTANCE) + .addScalar("tiempoHorVerano", IntegerType.INSTANCE) + .addScalar("fecInicioHorVerano", DateType.INSTANCE) + .addScalar("fecFinoHorVerano", DateType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(Estado.class)); + if (puntoventaId != null) { + qr.setParameter("puntoventaId", puntoventaId); + } + if(paradaId != null) { + qr.setParameter("paradaId", paradaId); + } + + List resultado = qr.list(); + for (Estado estado : resultado) { + Integer tiempohorhuso = estado.getTiempoHorHuso(); + Integer tiempohorverano = estado.getTiempoHorVerano(); + Date feciniciohorverano = estado.getFecInicioHorVerano(); + Date fecfinohorverano = estado.getFecFinoHorVerano(); + + if (tiempohorhuso != null) { + retorno.put("tiempohorhuso", tiempohorhuso); + } + + if (fecfinohorverano != null && feciniciohorverano != null) { + if ((dataServidorFuso.getTime().equals(feciniciohorverano) + || dataServidorFuso.getTime().after(feciniciohorverano)) + && dataServidorFuso.getTime().before(fecfinohorverano)) { + retorno.put("tiempohorverano", tiempohorverano); + } + } + + break; + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java index f99823eb7..9759cbb6a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.EventoExtraDAO; -import com.rjconsultores.ventaboletos.entidad.EventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -@Repository("eventoExtraDAO") -public class EventoExtraHibernateDAO extends - GenericHibernateDAO implements EventoExtraDAO { - - @Autowired - public EventoExtraHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("tipoeventoextraId", tipoEventoExtra.getTipoeventoextraId())); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.EventoExtraDAO; +import com.rjconsultores.ventaboletos.entidad.EventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +@Repository("eventoExtraDAO") +public class EventoExtraHibernateDAO extends + GenericHibernateDAO implements EventoExtraDAO { + + @Autowired + public EventoExtraHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("tipoeventoextraId", tipoEventoExtra.getTipoeventoextraId())); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java index ccb2db73a..68d4c7940 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Hibernate; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ExcepcionPeajeDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; - -@Repository("excepcionPeajeDAO") -public class ExcepcionPeajeHibernateDAO extends GenericHibernateDAO -implements ExcepcionPeajeDAO { - - @Autowired - public ExcepcionPeajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List buscar(String descconvenio, String cveconvenio) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("descconvenio", descconvenio)); - c.add(Restrictions.eq("cveconvenio", cveconvenio)); - - c.addOrder(Order.asc("descconvenio")); - - return c.list(); - } - - public List obtenerTodos() { - Session session = getSession(); - session.enableFilter("ativo"); - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - List list = (List)c.list(); - for (ExcepcionPeaje excepcionPeaje : list) { - if(!Hibernate.isInitialized(excepcionPeaje.getLsExcepcionPeajeVigencia())){ - Hibernate.initialize(excepcionPeaje.getLsExcepcionPeajeVigencia()); - } - } - return list; - } - - @Override - public void deletarVigencias(List excepcionPeajeVigencias) { - - for (ExcepcionPeajeVigencia epv : excepcionPeajeVigencias) { - String hql = " update ExcepcionPeajeVigencia set activo = false, fecModif = :fecModif, usuarioId = :usuarioId where excepcionPeajeVigenciaId = " + epv.getExcepcionPeajeVigenciaId(); - Query sq = getSession().createQuery(hql); - sq.setTimestamp("fecModif", epv.getFecmodif()); - sq.setInteger("usuarioId", epv.getUsuarioId()); - sq.executeUpdate(); - } - - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Hibernate; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ExcepcionPeajeDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; + +@Repository("excepcionPeajeDAO") +public class ExcepcionPeajeHibernateDAO extends GenericHibernateDAO +implements ExcepcionPeajeDAO { + + @Autowired + public ExcepcionPeajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List buscar(String descconvenio, String cveconvenio) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("descconvenio", descconvenio)); + c.add(Restrictions.eq("cveconvenio", cveconvenio)); + + c.addOrder(Order.asc("descconvenio")); + + return c.list(); + } + + public List obtenerTodos() { + Session session = getSession(); + session.enableFilter("ativo"); + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + List list = (List)c.list(); + for (ExcepcionPeaje excepcionPeaje : list) { + if(!Hibernate.isInitialized(excepcionPeaje.getLsExcepcionPeajeVigencia())){ + Hibernate.initialize(excepcionPeaje.getLsExcepcionPeajeVigencia()); + } + } + return list; + } + + @Override + public void deletarVigencias(List excepcionPeajeVigencias) { + + for (ExcepcionPeajeVigencia epv : excepcionPeajeVigencias) { + String hql = " update ExcepcionPeajeVigencia set activo = false, fecModif = :fecModif, usuarioId = :usuarioId where excepcionPeajeVigenciaId = " + epv.getExcepcionPeajeVigenciaId(); + Query sq = getSession().createQuery(hql); + sq.setTimestamp("fecModif", epv.getFecmodif()); + sq.setInteger("usuarioId", epv.getUsuarioId()); + sq.executeUpdate(); + } + + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java index 5ac6816d6..6dfe354e1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java @@ -1,75 +1,75 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Calendar; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FechamentoParamgeralDAO; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Repository("fechamentoParamgeralDAO") -public class FechamentoParamgeralHibernateDAO extends GenericHibernateDAO implements FechamentoParamgeralDAO { - - - @Autowired - public FechamentoParamgeralHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscaParametrosPorEmpresas(List empresasId) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.createAlias("empresa", "emp"); - query.add(Restrictions.in("emp.empresaId", empresasId)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)query.list(); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - @Override - public List buscaParametrosPorEmpresa(Integer empresaId) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.createAlias("empresa", "emp"); - query.add(Restrictions.eq("emp.empresaId", empresaId)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)query.list(); - } - - @Override - public void borrar(FechamentoParamgeral entity) { - entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entity.setFecmodif(Calendar.getInstance().getTime()); - entity.setActivo(Boolean.FALSE); - actualizacion(entity); - } - - @Override - public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresaId, String boletoBancoCod) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.createAlias("empresa", "emp"); - query.add(Restrictions.eq("emp.empresaId", empresaId)); - query.add(Restrictions.eq("boletoBancoCod", boletoBancoCod)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (FechamentoParamgeral) query.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Calendar; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FechamentoParamgeralDAO; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Repository("fechamentoParamgeralDAO") +public class FechamentoParamgeralHibernateDAO extends GenericHibernateDAO implements FechamentoParamgeralDAO { + + + @Autowired + public FechamentoParamgeralHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscaParametrosPorEmpresas(List empresasId) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.createAlias("empresa", "emp"); + query.add(Restrictions.in("emp.empresaId", empresasId)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)query.list(); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + @Override + public List buscaParametrosPorEmpresa(Integer empresaId) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.createAlias("empresa", "emp"); + query.add(Restrictions.eq("emp.empresaId", empresaId)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)query.list(); + } + + @Override + public void borrar(FechamentoParamgeral entity) { + entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entity.setFecmodif(Calendar.getInstance().getTime()); + entity.setActivo(Boolean.FALSE); + actualizacion(entity); + } + + @Override + public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresaId, String boletoBancoCod) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.createAlias("empresa", "emp"); + query.add(Restrictions.eq("emp.empresaId", empresaId)); + query.add(Restrictions.eq("boletoBancoCod", boletoBancoCod)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (FechamentoParamgeral) query.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java index 9ac878212..4993fc9ee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java @@ -1,86 +1,86 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Calendar; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FechamentoParamptovtaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Repository("fechamentoParamptovtaDAO") -public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO implements FechamentoParamptovtaDAO { - - - @Autowired - public FechamentoParamptovtaHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscaParametrosPorEmpresas(List empresasId) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.createAlias("empresa", "emp"); - query.add(Restrictions.in("emp.empresaId", empresasId)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)query.list(); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - @Override - public List buscaParametrosPorEmpresa(Integer empresaId) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.createAlias("empresa", "emp"); - query.add(Restrictions.eq("emp.empresaId", empresaId)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)query.list(); - } - - @Override - public void borrar(FechamentoParamptovta entity) { - entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entity.setFecmodif(Calendar.getInstance().getTime()); - entity.setActivo(Boolean.FALSE); - actualizacion(entity); - } - - @Override - public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.add(Restrictions.eq("puntoventa", puntoventa)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - List params = query.list(); - - return params; - } - - @Override - public FechamentoParamptovta buscaParametrosPorPuntoventa(PuntoVenta puntoventa, Empresa empresa) { - Criteria query = getSession().createCriteria(getPersistentClass()); - query.add(Restrictions.eq("puntoventa", puntoventa)); - query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - query.add(Restrictions.eq("empresa", empresa)); - - return (FechamentoParamptovta) query.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Calendar; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FechamentoParamptovtaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Repository("fechamentoParamptovtaDAO") +public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO implements FechamentoParamptovtaDAO { + + + @Autowired + public FechamentoParamptovtaHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscaParametrosPorEmpresas(List empresasId) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.createAlias("empresa", "emp"); + query.add(Restrictions.in("emp.empresaId", empresasId)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)query.list(); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + @Override + public List buscaParametrosPorEmpresa(Integer empresaId) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.createAlias("empresa", "emp"); + query.add(Restrictions.eq("emp.empresaId", empresaId)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)query.list(); + } + + @Override + public void borrar(FechamentoParamptovta entity) { + entity.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entity.setFecmodif(Calendar.getInstance().getTime()); + entity.setActivo(Boolean.FALSE); + actualizacion(entity); + } + + @Override + public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.add(Restrictions.eq("puntoventa", puntoventa)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + List params = query.list(); + + return params; + } + + @Override + public FechamentoParamptovta buscaParametrosPorPuntoventa(PuntoVenta puntoventa, Empresa empresa) { + Criteria query = getSession().createCriteria(getPersistentClass()); + query.add(Restrictions.eq("puntoventa", puntoventa)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + query.add(Restrictions.eq("empresa", empresa)); + + return (FechamentoParamptovta) query.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FeriadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FeriadoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FeriadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FeriadoHibernateDAO.java index 714a9b08b..2e0dbd610 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FeriadoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FeriadoHibernateDAO.java @@ -1,86 +1,86 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Date; -import java.text.SimpleDateFormat; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FeriadoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Feriado; - -@Repository("feriadoDAO") -public class FeriadoHibernateDAO extends GenericHibernateDAO implements FeriadoDAO { - - private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - - @Autowired - public FeriadoHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(Date descferiado) { - String hql = " select new com.rjconsultores.ventaboletos.entidad.Feriado(feriado.feriadoId, feriado.fecferiado,feriado.descferiado) from Feriado feriado" + - " where feriado.activo = 1 and feriado.fecferiado =:data"; - - Query sq = getSession().createQuery(hql); - sq.setParameter("data", descferiado); - List lsFeriado = sq.list(); - return lsFeriado; - } - - @Override - public boolean ehFeriado(Date fecFeriado, Empresa empresa, Estado estadoOrigem) { - - StringBuilder sb = new StringBuilder(""); - - sb.append(" select count(*) "); - sb.append(" from "); - sb.append(" Feriado f "); - sb.append(" where "); - sb.append(" f.activo = 1 "); - sb.append(" and f.fecferiado = TO_DATE(:fecFeriado,'dd/MM/yyyy') "); - sb.append(" and (f.estado is null or f.estado = :estado) "); - sb.append(" and (f.empresa is null or f.empresa = :empresa) "); - - - Query query = this.getSession().createQuery(sb.toString()); - query.setString("fecFeriado", sdf.format(fecFeriado)); - query.setParameter("estado",estadoOrigem); - query.setParameter("empresa",empresa); - - return HibernateFix.count(query.uniqueResult()) > 0; - } - - @Override - public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado) { - Criteria c = getSession().createCriteria(getPersistentClass()); - - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.add(Restrictions.eq("fecferiado", data)); - c.add(Restrictions.eq("estado", estado)); - c.add(Restrictions.eq("empresa", empresa)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Date; +import java.text.SimpleDateFormat; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FeriadoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Feriado; + +@Repository("feriadoDAO") +public class FeriadoHibernateDAO extends GenericHibernateDAO implements FeriadoDAO { + + private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + @Autowired + public FeriadoHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(Date descferiado) { + String hql = " select new com.rjconsultores.ventaboletos.entidad.Feriado(feriado.feriadoId, feriado.fecferiado,feriado.descferiado) from Feriado feriado" + + " where feriado.activo = 1 and feriado.fecferiado =:data"; + + Query sq = getSession().createQuery(hql); + sq.setParameter("data", descferiado); + List lsFeriado = sq.list(); + return lsFeriado; + } + + @Override + public boolean ehFeriado(Date fecFeriado, Empresa empresa, Estado estadoOrigem) { + + StringBuilder sb = new StringBuilder(""); + + sb.append(" select count(*) "); + sb.append(" from "); + sb.append(" Feriado f "); + sb.append(" where "); + sb.append(" f.activo = 1 "); + sb.append(" and f.fecferiado = TO_DATE(:fecFeriado,'dd/MM/yyyy') "); + sb.append(" and (f.estado is null or f.estado = :estado) "); + sb.append(" and (f.empresa is null or f.empresa = :empresa) "); + + + Query query = this.getSession().createQuery(sb.toString()); + query.setString("fecFeriado", sdf.format(fecFeriado)); + query.setParameter("estado",estadoOrigem); + query.setParameter("empresa",empresa); + + return HibernateFix.count(query.uniqueResult()) > 0; + } + + @Override + public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado) { + Criteria c = getSession().createCriteria(getPersistentClass()); + + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.add(Restrictions.eq("fecferiado", data)); + c.add(Restrictions.eq("estado", estado)); + c.add(Restrictions.eq("empresa", empresa)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalAliquotaEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalAliquotaEmpresaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalAliquotaEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalAliquotaEmpresaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index c43cf1e44..e090e0c08 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -1,4488 +1,4488 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.sql.DataSource; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.jdbc.Work; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FiscalDAO; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.StringHelper; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPR; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPRBase; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFBase; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCCF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCFC; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoICF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoPRC; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoBPS; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoDBP; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoPAR; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoRMD; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqBPS; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqDBP; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.DetalhadoFiscal; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.RdiValidacion; -import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.DetalhadoRMD; -import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; -import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Repository("fiscalDAO") -public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO { - private static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; - private static final String DATE_FORMAT_DMY = "dd/MM/yyyy"; - - private static final String CODIGO_INDICADOR_CONTR_PREVIDENCIARIA = "00000060"; - - private static final Logger log = LogManager.getLogger(FiscalHibernateDAO.class); - - @Autowired - private DataSource dataSource; - - @Autowired - public FiscalHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - private boolean isEstadoTodos(Integer estadoId) { - if (estadoId == -1 || estadoId == null) - return true; - else - return false; - } - - @Override - public List buscaDatosFiscaisECFManual(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection, boolean isBoletoHist) throws SQLException { - PreparedStatement stmt = null; - ResultSet rset = null; - - StringBuilder sql = new StringBuilder(); - sql.append("select distinct "); - sql.append(" (case when r2.numserie20 is null then '' else r2.numserie20 end) || imp.numserie20 as numImpressora, "); - sql.append(" coalesce(b.numfoliosistema, (case when r4.caja_id is null then '000001' else r4.coo end)) as coo, "); - sql.append(" to_char(b.feccreacion, 'yyyymmdd') as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" b.caja_id as boletoId, "); - sql.append(" b.empresacorrida_id as empresaId, "); - sql.append(" b.numseriepreimpresa as serie, "); - sql.append(" a.subserie as subSerie, "); - sql.append(" a.docfiscal as aidf, "); - sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoIdOrigen, "); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenId, "); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenUf, "); - sql.append(" (case when s.aliasdestino_id is null then ed.estado_id else eds.estado_id end) as estadoIdDestino, "); - sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoId, "); - sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoUf, "); - sql.append(" imp.numcnpj as cnpjImpressora, "); - sql.append(" imp.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" imp.modelo as modeloImpressora, "); - sql.append(" b.usuario_id as numCaixa, "); - sql.append(" b.preciopagado as importetarifa, "); - sql.append(" cs.descclase AS claseServicio, "); - sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, "); - sql.append(" coalesce(ei.icms, eos.icms) as icms, "); - sql.append(" ei.porctributo as porctributo, "); - sql.append(" case when b.indstatusboleto = 'V' or b.motivocancelacion_id is null THEN 'N' ELSE 'C' END status, "); - sql.append(" r4.indcancelamento AS indcancelamento, "); - sql.append(" b.preciopagado as valorTotal, "); - sql.append(" case b.importetaxaembarque when 0 then null else b.importetaxaembarque end as importetaxaembarque, "); - sql.append(" case b.importepedagio when 0 then null else b.importepedagio end as importepedagio, "); - sql.append(" case b.importeoutros when 0 then null else b.importeoutros end as importeoutros, "); - sql.append(" case b.importeseguro when 0 then null else b.importeseguro end as importeseguro "); - - if (isBoletoHist) - sql.append("from caja_hist b "); - else - sql.append("from caja b "); - - sql.append(" left join fiscal_r4 r4 on r4.caja_id = b.caja_id "); - sql.append(" left join fiscal_r5 r5 on r4.numserie20 = r5.numserie20 and r4.coo = r5.coo and r4.datamov = r5.datamov and r4.contador = r5.contador "); - sql.append(" left join fiscal_impressora imp on imp.numserie = b.serieimpfiscal "); - sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(b.feccreacion, 'YYYYMMDD') "); - sql.append(" left join clase_servicio cs on cs.claseservicio_id = b.claseservicio_id "); - sql.append(" join marca m on b.marca_id = m.marca_id "); - sql.append(" join empresa e on e.empresa_id = m.empresa_id "); - sql.append(" left join aidf a on a.aidf_id = b.aidf_id "); - sql.append(" join punto_venta pv on pv.puntoventa_id = b.puntoventa_id "); - sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id "); - sql.append(" join estado ee on ee.estado_id = ce.estado_id "); - sql.append(" join parada po on po.parada_id = b.origen_id "); - sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append(" join parada pd on pd.parada_id = b.destino_id "); - sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); - sql.append(" join estado ed on ed.estado_id = cd.estado_id "); - sql.append(" left join alias_servico s on s.origen_id = b.origen_id "); - sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); - sql.append(" and s.ruta_id = b.ruta_id and s.activo = 1 "); - sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); - sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); - sql.append(" left join estado ae on ae.estado_id = a.estado_id "); - sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); - sql.append(" and ie.estado_id = (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) and ie.activo = 1 "); - sql.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id "); - sql.append(" left join estado eie on eie.estado_id = cie.estado_id "); - sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id "); - sql.append(" and ei.estado_id = (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) and ei.activo = 1 "); - sql.append("where ((b.tipoventa_id = 3 and b.indstatusboleto in ('V', 'C') and b.indreimpresion = 0) "); - sql.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); - sql.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) "); - sql.append(" and b.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and b.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); - sql.append(" and b.empresacorrida_id = ? "); - sql.append(isEstadoTodos(estadoId) ? "" : " and (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) = ? "); - sql.append("ORDER BY dataEmissao, coo, modeloImpressora "); - - List listManuais = new ArrayList(); - - stmt = connection.prepareStatement(sql.toString()); - stmt.setFetchSize(100); - stmt.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - stmt.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - stmt.setInt(3, empresaId); - - if (!isEstadoTodos(estadoId)) - stmt.setInt(4, estadoId); - - rset = stmt.executeQuery(); - while (rset.next()) { - - ImportacionManualFiscalVO item = new ImportacionManualFiscalVO(); - - item.setNumImpressora(rset.getString("numImpressora")); - item.setCoo(rset.getString("coo")); - item.setBoletoId(rset.getLong("boletoId")); - item.setEmpresaId(rset.getInt("empresaId")); - item.setDataEmissao(rset.getString("dataEmissao")); - item.setValorTotal(rset.getBigDecimal("valorTotal")); - item.setNumItem(rset.getString("numItem")); - item.setCodProduto(rset.getString("codProduto")); - item.setNumpdv(rset.getString("numpdv")); - item.setRepTributado(rset.getString("repTributado")); - item.setTipoPassagem(rset.getString("tipoPassagem")); - item.setValorItem(rset.getBigDecimal("valorItem")); - item.setOrigenId(rset.getInt("origenId")); - - Integer origenIbge = rset.getInt("origenUf"); - item.setOrigenUf(origenIbge == null ? null : origenIbge.toString()); - - item.setDestinoId(rset.getInt("destinoId")); - - Integer destinoIbge = rset.getInt("destinoUf"); - item.setDestinoUf(destinoIbge == null ? null : destinoIbge.toString()); - - item.setModeloImpressora(rset.getString("modeloImpressora")); - item.setNumCaixa(rset.getString("numCaixa")); - item.setStatus(rset.getString("status")); - item.setSerie(rset.getString("serie")); - item.setIcms(rset.getBigDecimal("icms")); - item.setPorctributo(rset.getBigDecimal("porctributo")); - item.setEstadoIdOrigen(rset.getInt("estadoIdOrigen")); - item.setEstadoIdDestino(rset.getInt("estadoIdDestino")); - item.setImportetaxaembarque(rset.getBigDecimal("importetaxaembarque")); - item.setImportepedagio(rset.getBigDecimal("importepedagio")); - item.setImporteoutros(rset.getBigDecimal("importeoutros")); - item.setImporteseguro(rset.getBigDecimal("importeseguro")); - item.setSubSerie(rset.getString("subSerie")); - item.setAidf(rset.getString("aidf")); - item.setClaseServicio(rset.getString("claseServicio")); - - listManuais.add(item); - } - - return listManuais; - - } - - private String sqlFiscaisReducaoZPendencia(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT r2.datamov AS datamov, "); - sql.append(" r2.numreducoes AS numreducoes, "); - sql.append(" r2.crz AS crz, "); - sql.append(" r2.numserie20 AS numserie20, "); - sql.append(" r2.coo AS coo, "); - sql.append(" r2.cro AS cro, "); - sql.append(" r2.cooinicial AS cooinicial, "); - sql.append(" r2.coofinal AS coofinal, "); - sql.append(" r2.vendabrutadiaria AS vendabrutadiaria, "); - sql.append(" r2.datareducao AS datareducao, "); - sql.append(" r2.horareducao AS horareducao, "); - sql.append(" r3.totparcial AS aliquota, "); - sql.append(" r3.valoracumulado AS imposto, "); - sql.append(" ifi.numserie AS numpdv, "); - sql.append(" TRANSLATE(t2.cnpj, ' / - . ', ' ') AS cnpj,"); - sql.append(" r2.totgeral AS gtFinal, "); - sql.append(" anterior.totgeral AS gtInicial, "); - sql.append(" CASE WHEN r3.totparcial = 'Can-T' THEN 'CANCELADO' "); - sql.append(" WHEN r3.totparcial = 'DT' THEN 'DESCONTO' ELSE '' END AS status "); - sql.append("FROM fiscal_r2 r2 "); - sql.append(" inner join fiscal_impressora ifi "); - sql.append(" ON ifi.numserie20 = r2.numserie20 "); - sql.append(" inner join fiscal_r3 r3 "); - sql.append(" ON r3.crz = r2.crz "); - sql.append(" AND r2.numserie20 = r3.numserie20 "); - sql.append(" AND r3.datamov = r2.datamov "); - sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); - sql.append(" inner join fiscal_t2 t2 "); - sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); - sql.append(" inner join empresa e ON ( t2.cnpj = e.cnpjnumero ) or "); - sql.append(" ( t2.cnpj in "); - sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); - sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); - sql.append(" (SELECT numserie20, crz, totgeral "); - sql.append(" FROM fiscal_r2) anterior "); - sql.append("WHERE r2.datamov BETWEEN ? AND ? "); - sql.append(" AND r2.activo = 1 "); - sql.append(" AND e.empresa_id = ? "); - sql.append(isEstadoTodos ? "" : " AND ie.estado_id = ? "); - sql.append(" AND r3.totparcial IN ("); - sql.append("'" + SituacaoTributaria.CANCELADO.getValue() + "'").append(", "); - sql.append("'" + SituacaoTributaria.DESCONTO.getValue() + "'").append(")"); - sql.append(" AND anterior.numserie20 = r2.numserie20 "); - sql.append(" AND anterior.crz = r2.crz - 1 "); - sql.append(" AND (SELECT MAX(fiscalr4_id) FROM fiscal_r4 r4 WHERE r4.numserie20 = r2.numserie20 "); - sql.append(" AND r4.datamov = r2.datamov) IS NOT NULL "); - sql.append("GROUP BY r2.datamov, "); - sql.append(" r2.numreducoes, "); - sql.append(" r2.crz, "); - sql.append(" r2.numserie20, "); - sql.append(" r2.coo, "); - sql.append(" r2.cro, "); - sql.append(" r2.cooinicial, "); - sql.append(" r2.coofinal, "); - sql.append(" r2.vendabrutadiaria, "); - sql.append(" r2.datareducao, "); - sql.append(" r2.horareducao, "); - sql.append(" r3.totparcial, "); - sql.append(" r3.valoracumulado, "); - sql.append(" ifi.numserie, "); - sql.append(" t2.cnpj, "); - sql.append(" r2.totgeral, "); - sql.append(" anterior.totgeral "); - sql.append("ORDER BY r2.datamov, "); - sql.append(" numserie20, "); - sql.append(" crz, "); - sql.append(" r2.numreducoes, "); - sql.append(" r3.totparcial desc "); - return sql.toString(); - } - - private String sqlFiscaisReducaoZPendenciaInconcistencias(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT r2.datamov AS datamov, "); - sql.append(" r2.numreducoes AS numreducoes, "); - sql.append(" r2.crz AS crz, "); - sql.append(" r2.numserie20 AS numserie20, "); - sql.append(" r2.coo AS coo, "); - sql.append(" r2.cro AS cro, "); - sql.append(" r2.cooinicial AS cooinicial, "); - sql.append(" r2.coofinal AS coofinal, "); - sql.append(" r2.vendabrutadiaria AS vendabrutadiaria, "); - sql.append(" r2.datareducao AS datareducao, "); - sql.append(" r2.horareducao AS horareducao, "); - sql.append(" r3.totparcial AS aliquota, "); - sql.append(" r3.valoracumulado AS imposto, "); - sql.append(" ifi.numserie AS numpdv, "); - sql.append(" t2.cnpj AS cnpj,"); - sql.append(" r2.totgeral AS gtFinal, "); - sql.append(" anterior.totgeral AS gtInicial, "); - sql.append(" 'INCONSISTENTE' AS status "); - sql.append("FROM fiscal_r2 r2 "); - sql.append(" inner join fiscal_impressora ifi "); - sql.append(" ON ifi.numserie20 = r2.numserie20 "); - sql.append(" inner join fiscal_r3 r3 "); - sql.append(" ON r3.crz = r2.crz "); - sql.append(" AND r2.numserie20 = r3.numserie20 "); - sql.append(" AND r3.datamov = r2.datamov "); - sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); - sql.append(" inner join fiscal_t2 t2 "); - sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); - sql.append(" inner join empresa e ON ( t2.cnpj = e.cnpjnumero ) or "); - sql.append(" ( t2.cnpj in "); - sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); - sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); - sql.append(" (SELECT numserie20, crz, totgeral "); - sql.append(" FROM fiscal_r2) anterior "); - sql.append("WHERE r2.datamov BETWEEN ? AND ? "); - sql.append(" AND r2.activo = 1 "); - sql.append(" AND e.empresa_id = ? "); - sql.append(isEstadoTodos ? "" : " AND ie.estado_id = ? "); - sql.append(" AND r3.totparcial not in ("); - sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")"); - sql.append(" AND anterior.numserie20 = r2.numserie20 "); - sql.append(" AND anterior.crz = r2.crz - 1 "); - sql.append(" AND (SELECT MAX(fiscalr4_id) FROM fiscal_r4 r4 WHERE r4.numserie20 = r2.numserie20 "); - sql.append(" AND r4.datamov = r2.datamov) IS NULL "); - sql.append("GROUP BY r2.datamov, "); - sql.append(" r2.numreducoes, "); - sql.append(" r2.crz, "); - sql.append(" r2.numserie20, "); - sql.append(" r2.coo, "); - sql.append(" r2.cro, "); - sql.append(" r2.cooinicial, "); - sql.append(" r2.coofinal, "); - sql.append(" r2.vendabrutadiaria, "); - sql.append(" r2.datareducao, "); - sql.append(" r2.horareducao, "); - sql.append(" r3.totparcial, "); - sql.append(" r3.valoracumulado, "); - sql.append(" ifi.numserie, "); - sql.append(" t2.cnpj, "); - sql.append(" r2.totgeral, "); - sql.append(" anterior.totgeral "); - sql.append("ORDER BY r2.datamov, "); - sql.append(" numserie20, "); - sql.append(" crz, "); - sql.append(" r2.numreducoes, "); - sql.append(" r3.totparcial desc "); - return sql.toString(); - } - - private String sqlFiscaisReducaoZ(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT r2.datamov AS datamov, "); - sql.append(" r2.numreducoes AS numreducoes, "); - sql.append(" r2.crz AS crz, "); - sql.append(" r2.numserie20 AS numserie20, "); - sql.append(" r2.coo AS coo, "); - sql.append(" r2.cro AS cro, "); - sql.append(" r2.cooinicial AS cooinicial, "); - sql.append(" r2.coofinal AS coofinal, "); - sql.append(" r2.vendabrutadiaria AS vendabrutadiaria, "); - sql.append(" r2.datareducao AS datareducao, "); - sql.append(" r2.horareducao AS horareducao, "); - sql.append(" r3.totparcial AS aliquota, "); - sql.append(" r3.valoracumulado AS imposto, "); - sql.append(" ifi.numserie AS numpdv, "); - sql.append(" t2.cnpj AS cnpj,"); - sql.append(" r2.totgeral AS gtFinal, "); - sql.append(" anterior.totgeral AS gtInicial, "); - sql.append(" 'NORMAL' AS status "); - sql.append("FROM fiscal_r2 r2 "); - sql.append(" inner join fiscal_impressora ifi "); - sql.append(" ON ifi.numserie20 = r2.numserie20 "); - sql.append(" inner join fiscal_r3 r3 "); - sql.append(" ON r3.crz = r2.crz "); - sql.append(" AND r2.numserie20 = r3.numserie20 "); - sql.append(" AND r3.datamov = r2.datamov "); - sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); - sql.append(" inner join fiscal_t2 t2 "); - sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); - sql.append(" inner join empresa e ON ( t2.cnpj = e.cnpjnumero ) or "); - sql.append(" (t2.cnpj in "); - sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); - sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); - sql.append(" (SELECT numserie20, datamov, crz, totgeral "); - sql.append(" FROM fiscal_r2) anterior "); - sql.append("WHERE r2.datamov BETWEEN ? AND ? "); - sql.append(" AND r2.activo = 1 "); - sql.append(" AND e.empresa_id = ? "); - sql.append(isEstadoTodos ? "" : " AND ie.estado_id = ? "); - sql.append(" AND r3.totparcial not in ("); - sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")"); - sql.append(" AND anterior.numserie20 = r2.numserie20 "); - sql.append(" AND anterior.datamov = r2.datamov - 1 "); - sql.append(" AND to_number(anterior.crz) = to_number(r2.crz) - 1 "); - sql.append(" AND r2.vendabrutadiaria > 0 "); - sql.append("GROUP BY r2.datamov, "); - sql.append(" r2.numreducoes, "); - sql.append(" r2.crz, "); - sql.append(" r2.numserie20, "); - sql.append(" r2.coo, "); - sql.append(" r2.cro, "); - sql.append(" r2.cooinicial, "); - sql.append(" r2.coofinal, "); - sql.append(" r2.vendabrutadiaria, "); - sql.append(" r2.datareducao, "); - sql.append(" r2.horareducao, "); - sql.append(" r3.totparcial, "); - sql.append(" r3.valoracumulado, "); - sql.append(" ifi.numserie, "); - sql.append(" t2.cnpj, "); - sql.append(" r2.totgeral, "); - sql.append(" anterior.totgeral "); - sql.append("ORDER BY r2.datamov, "); - sql.append(" numserie20, "); - sql.append(" crz, "); - sql.append(" r2.numreducoes, "); - // TODO: No ambiente de produção a ordenação so vem correta quando declarado para vir como desc - // contrario aos outros servidores que deve ser asc - sql.append(" r3.totparcial desc "); - return sql.toString(); - } - - @Override - public List buscaDatosFiscaisReducaoZ(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isPendencias, Connection connection) throws SQLException { - if (isPendencias) { - List list = new ArrayList(); - list.addAll(montarItensReducaoZ(inicio, fim, empresaId, estadoId, sqlFiscaisReducaoZPendencia(isEstadoTodos(estadoId)), connection)); - list.addAll(montarItensReducaoZ(inicio, fim, empresaId, estadoId, sqlFiscaisReducaoZPendenciaInconcistencias(isEstadoTodos(estadoId)), connection)); - return list; - - } else { - return montarItensReducaoZ(inicio, fim, empresaId, estadoId, sqlFiscaisReducaoZ(isEstadoTodos(estadoId)), connection); - } - } - - private List montarItensReducaoZ(Date inicio, Date fim, Integer empresaId, Integer estadoId, String sql, Connection connection) throws SQLException { - - List listRedZ = new ArrayList(); - PreparedStatement stmt = connection.prepareStatement(sql); - stmt.setFetchSize(100); - stmt.setInt(1, empresaId); - stmt.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - stmt.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - stmt.setInt(4, empresaId); - - if (!isEstadoTodos(estadoId)) - stmt.setInt(5, estadoId); - - ResultSet rset = stmt.executeQuery(); - while (rset.next()) { - - ImportacionFiscalReducaoZVO item = new ImportacionFiscalReducaoZVO(); - item.setDatamov(rset.getString("datamov")); - item.setNumreducoes(rset.getString("numreducoes")); - item.setCrz(rset.getString("crz")); - item.setNumserie20(rset.getString("numserie20")); - item.setCoo(rset.getString("coo")); - item.setCro(rset.getString("cro")); - item.setCooinicial(rset.getString("cooinicial")); - item.setCoofinal(rset.getString("coofinal")); - item.setVendabrutadiaria(rset.getBigDecimal("vendabrutadiaria")); - item.setDatareducao(rset.getString("datareducao")); - item.setHorareducao(rset.getString("horareducao")); - item.setAliquota(rset.getString("aliquota")); - item.setImposto(rset.getBigDecimal("imposto")); - item.setNumpdv(rset.getString("numpdv")); - item.setCnpj(rset.getString("cnpj")); - item.setGtFinal(rset.getBigDecimal("gtFinal")); - item.setGtInicial(rset.getBigDecimal("gtInicial")); - item.setStatus(rset.getString("status")); - listRedZ.add(item); - } - - return listRedZ; - } - - private String sqlFiscaisECFCancelados(boolean isEstadoTodos, boolean isBoletoHist) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT DISTINCT r4.numserie20 as numImpressora, "); - sql.append(" r4.coo as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); - sql.append(" r4.datamov as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" r4.boleto_id as boletoId, "); - sql.append(" me.empresa_id as empresaId, "); - sql.append(" co.codibge as origenId, "); - sql.append(" eo.codibge as origenUf, "); - sql.append(" cd.codibge as destinoId, "); - sql.append(" ed.codibge as destinoUf, "); - sql.append(" fi.numcnpj as cnpjImpressora, "); - sql.append(" fi.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" fi.modelo as modeloImpressora, "); - sql.append(" r4.usuario_id as numCaixa, "); - sql.append(" cajb.preciopagado as importetarifa, "); - sql.append(" cajb.importetaxaembarque as importetaxaembarque, "); - sql.append(" cajb.importepedagio as importepedagio, "); - sql.append(" cajb.importeseguro as importeseguro, "); - sql.append(" 'C' as status, "); - sql.append(" cajb.motivocancelacion_id as motivocancelacion, "); - sql.append(" ee.impingreso as valorMulta, "); - sql.append(" cs.descclase as claseServicio, "); - sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf "); - - sql.append(" FROM "); - if (isBoletoHist) - sql.append(" caja_hist caj "); - else - sql.append(" caja caj "); - - sql.append(" INNER JOIN "); - if (isBoletoHist) - sql.append(" caja_hist cajb "); - else - sql.append(" caja cajb "); - - sql.append(" on (((cajb.feccorrida = caj.feccorrida) or (cajb.feccorrida is null and caj.feccorrida is null)) "); - sql.append(" and ((cajb.numasiento = caj.numasiento) or (cajb.numasiento is null and caj.numasiento is null)) "); - sql.append(" and cajb.numfoliosistema = caj.numfoliosistema and cajb.origen_id = caj.origen_id and cajb.destino_id=caj.destino_id "); - sql.append(" and ((cajb.tipoventa_id not in (5,12,18,81,41,49) "); - sql.append(" and (cajb.indstatusboleto = 'V' or (cajb.indstatusboleto = 'T' and cajb.indreimpresion=0) )) "); - sql.append(" or (cajb.tipoventa_id in (5,12,18,81,41,49) and cajb.indstatusboleto = 'E')) ) "); - sql.append(" INNER JOIN fiscal_r4 r4 on r4.caja_id = cajb.caja_id "); - sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 and r4.coo = r5.coo "); - sql.append(" and r4.datamov = r5.datamov and r4.contador = r5.contador "); - sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 "); - sql.append(" INNER JOIN marca me ON me.marca_id = cajb.marca_id "); - sql.append(" INNER JOIN clase_servicio cs ON cs.claseservicio_id = cajb.claseservicio_id "); - sql.append(" LEFT JOIN evento_extra ee on ee.boleto_id = r4.boleto_id and ee.tipoeventoextra_id in (42) "); - sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = cajb.origen_id "); - sql.append(" and ase.destino_id = caj.destino_id and ase.ruta_id = cajb.ruta_id and ase.activo = 1 and ase.corrida_id is null "); - sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, cajb.origen_id) = o.parada_id "); - sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); - sql.append(" INNER JOIN estado eo ON eo.estado_id = co.estado_id "); - sql.append(" INNER JOIN parada d ON coalesce(ase.aliasdestino_id, cajb.destino_id) = d.parada_id "); - sql.append(" INNER JOIN ciudad cd ON d.ciudad_id = cd.ciudad_id "); - sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id "); - sql.append(" WHERE caj.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and caj.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); - sql.append(" and me.empresa_id = :EMPRESA_ID "); - sql.append(isEstadoTodos ? "" : " AND eo.estado_id = :ESTADO_ID "); - sql.append(" and caj.motivocancelacion_id IN (31,32,10,37,99,36) "); - sql.append(" and caj.indcancelacion = 1 "); - sql.append(" and caj.indstatusboleto = 'C' "); - sql.append(" and r4.indcancelamento = 'N' "); - sql.append(" and caj.num_bpe is null "); - sql.append(" ORDER BY r4.datamov, "); - sql.append(" r4.numserie20, "); - sql.append(" r4.coo, "); - sql.append(" r5.numitem "); - return sql.toString(); - } - - private String sqlFiscaisECF(boolean isEstadoTodos, boolean isBoletoHist) { - - StringBuilder sql = new StringBuilder(); - sql.append("select distinct "); - sql.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as numImpressora, "); - sql.append(" (case when r4.caja_id is null then '000001' else r4.coo end) as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); - sql.append(" to_char(c.feccreacion, 'yyyymmdd') as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" c.caja_id as boletoId, "); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenId, "); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenUf, "); - sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoId, "); - sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoUf, "); - sql.append(" imp.numcnpj as cnpjImpressora, "); - sql.append(" imp.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" imp.modelo as modeloImpressora, "); - sql.append(" c.usuario_id as numCaixa, "); - sql.append(" c.preciopagado as importetarifa, "); - sql.append(" c.importetaxaembarque as importetaxaembarque, "); - sql.append(" c.importepedagio as importepedagio, "); - sql.append(" c.importeseguro as importeseguro, "); - sql.append(" cs.descclase AS claseServicio, "); - sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, "); - sql.append(" (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as impostoEstado, "); - sql.append(" 'N' as status, "); - sql.append(" r4.indcancelamento AS indcancelamento "); - - if (isBoletoHist) - sql.append(" from caja_hist c "); - else - sql.append(" from caja c "); - - sql.append(" join ruta r on r.ruta_id = c.ruta_id "); - sql.append(" join parada po on po.parada_id = c.origen_id "); - sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append(" join parada pd on pd.parada_id = c.destino_id "); - sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); - sql.append(" join estado ed on ed.estado_id = cd.estado_id "); - sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id "); - sql.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal "); - sql.append(" left join clase_servicio cs on cs.claseservicio_id = c.claseservicio_id "); - sql.append(" left join estado e on e.estado_id = imp.estadolocal_id "); - sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); - sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); - sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); - sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id "); - sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id "); - sql.append(" left join fiscal_r5 r5 on r4.numserie20 = r5.numserie20 and r4.coo = r5.coo and r4.datamov = r5.datamov and r4.contador = r5.contador "); - sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') "); - sql.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1 "); - sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); - sql.append(" and c.serieimpfiscal is not null "); - sql.append(" and c.num_bpe is null "); - sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); - // sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); - // sql.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); - sql.append(" and c.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); - sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); - sql.append(isEstadoTodos ? "" : " and ((case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) = :ESTADO_ID )"); - sql.append("order by dataEmissao, numImpressora, coo, numItem"); - return sql.toString(); - } - - private String sqlFiscaisECFPendenciasDesconto(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT r4.numserie20 as numImpressora, "); - sql.append(" r4.coo as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); - sql.append(" r4.datamov as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" fi.numcnpj as cnpjImpressora, "); - sql.append(" fi.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" fi.modelo as modeloImpressora, "); - sql.append(" r4.usuario_id as numCaixa, "); - sql.append(" r5.impdesconto as desconto, "); - sql.append(" 'DESCONTO' as status"); - sql.append(" FROM fiscal_r4 r4 "); - sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); - sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); - sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); - sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); - sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); - sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); - - sql.append(" INNER JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); - sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); - sql.append(" LEFT JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); - sql.append(" WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); - sql.append(" AND m.empresa_id = :EMPRESA_ID "); - sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); - sql.append(" AND r5.impdesconto <> 0 "); - sql.append(" GROUP BY r4.numserie20, r4.coo, r4.datamov, r4.cpfcnpjcliente, "); - sql.append(" r4.imptotalliquido, fi.numcnpj, fi.numserie, r5.impdesconto, "); - sql.append(" r5.totparcial, r5.imptotalliquido, r5.tipopassagem, "); - sql.append(" r5.numitem, r5.codproduto, fi.modelo, r4.usuario_id "); - sql.append(" ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); - return sql.toString(); - } - - private String sqlFiscaisECFPendenciasCancelado(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT r4.numserie20 as numImpressora, "); - sql.append(" r4.coo as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); - sql.append(" r4.datamov as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" b.boleto_id as boletoId, "); - sql.append(" m.empresa_id as empresaId, "); - sql.append(" fi.numcnpj as cnpjImpressora, "); - sql.append(" fi.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" fi.modelo as modeloImpressora, "); - sql.append(" r4.usuario_id as numCaixa, "); - sql.append(" b.preciopagado as importetarifa, "); - sql.append(" b.importetaxaembarque as importetaxaembarque, "); - sql.append(" b.importepedagio as importepedagio, "); - sql.append(" b.importeseguro as importeseguro, "); - sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf, "); - sql.append(" r4.indcancelamento, "); - sql.append(" 'CANCELADO' as status "); - sql.append("FROM fiscal_r4 r4 "); - sql.append(" INNER JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); - sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); - sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); - sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); - sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); - sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); - sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); - sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); - sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); - sql.append("WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); - sql.append(" AND m.empresa_id = :EMPRESA_ID "); - sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); - sql.append(" AND r4.indcancelamento = 'S' "); - sql.append(" AND (SELECT r3.numserie20 FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20"); - sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T')) IS NOT NULL "); - sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, "); - sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); - sql.append(" b.boleto_id, m.empresa_id, fi.numcnpj, "); - sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); - sql.append(" r5.imptotalliquido, r5.tipopassagem, r5.numitem, "); - sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); - sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); - sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); - sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); - return sql.toString(); - } - - private String sqlFiscaisECFPendenciasGratuidade(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT r4.numserie20 as numImpressora, "); - sql.append(" r4.coo as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); - sql.append(" r4.datamov as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" b.boleto_id as boletoId, "); - sql.append(" m.empresa_id as empresaId, "); - sql.append(" fi.numcnpj as cnpjImpressora, "); - sql.append(" fi.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" fi.modelo as modeloImpressora, "); - sql.append(" r4.usuario_id as numCaixa, "); - sql.append(" b.preciopagado as importetarifa, "); - sql.append(" b.importetaxaembarque as importetaxaembarque, "); - sql.append(" b.importepedagio as importepedagio, "); - sql.append(" b.importeseguro as importeseguro, "); - sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf, "); - sql.append(" r4.indcancelamento, "); - sql.append(" 'GRATUIDADE' as status "); - sql.append("FROM fiscal_r4 r4 "); - sql.append(" INNER JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); - sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); - sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); - sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); - sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); - sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); - sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); - sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); - sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); - sql.append("WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); - sql.append(" AND m.empresa_id = :EMPRESA_ID "); - sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); - sql.append(" AND r5.imptotalliquido = 1 "); - sql.append(" AND b.preciopagado = 0 "); - sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, "); - sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); - sql.append(" b.boleto_id, m.empresa_id, fi.numcnpj, "); - sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); - sql.append(" r5.imptotalliquido, r5.tipopassagem, r5.numitem, "); - sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); - sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); - sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); - sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); - return sql.toString(); - } - - private String sqlFiscaisECFPendenciasInconsistente(boolean isEstadoTodos) { - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT r4.numserie20 as numImpressora, "); - sql.append(" r4.coo as coo, "); - sql.append(" r4.imptotalliquido as valorTotal, "); - sql.append(" r4.datamov as dataEmissao, "); - sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); - sql.append(" b.boleto_id as boletoId, "); - sql.append(" m.empresa_id as empresaId, "); - sql.append(" fi.numcnpj as cnpjImpressora, "); - sql.append(" fi.numserie as numpdv, "); - sql.append(" r5.totparcial as repTributado, "); - sql.append(" r5.imptotalliquido as valorItem, "); - sql.append(" r5.tipopassagem as tipoPassagem, "); - sql.append(" r5.numitem as numItem, "); - sql.append(" r5.codproduto as codProduto, "); - sql.append(" fi.modelo as modeloImpressora, "); - sql.append(" r4.usuario_id as numCaixa, "); - sql.append(" b.preciopagado as importetarifa, "); - sql.append(" b.importetaxaembarque as importetaxaembarque, "); - sql.append(" b.importepedagio as importepedagio, "); - sql.append(" b.importeseguro as importeseguro, "); - sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf, "); - sql.append(" r4.indcancelamento, "); - sql.append(" 'INCONSISTENTE' as status "); - sql.append("FROM fiscal_r4 r4 "); - sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); - sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); - sql.append(" LEFT JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); - sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); - sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); - sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); - sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); - sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); - sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); - sql.append("WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); - sql.append(" AND m.empresa_id = :EMPRESA_ID "); - sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); - sql.append(" AND r4.indcancelamento = 'S' "); - sql.append(" AND (SELECT MAX(r3.numserie20) FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20"); - sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T', 'DT')) IS NULL "); - sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, "); - sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); - sql.append(" b.boleto_id, m.empresa_id, fi.numcnpj, "); - sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); - sql.append(" r5.imptotalliquido, r5.tipopassagem, r5.numitem, "); - sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); - sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); - sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); - sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); - return sql.toString(); - } - - @Override - public List buscaDatosFiscaisECF(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isNormal, boolean isCancelados, boolean isPendencias, Connection connection, boolean isBoletoHist) throws SQLException { - - if (isNormal) { - return montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECF(isEstadoTodos(estadoId), isBoletoHist), true); - - } else if (isCancelados) { - return montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFCancelados(isEstadoTodos(estadoId), isBoletoHist), true); - - } else if (isPendencias) { - - List list = new ArrayList(); - list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasCancelado(isEstadoTodos(estadoId)), false)); - list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasDesconto(isEstadoTodos(estadoId)), false)); - list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasInconsistente(isEstadoTodos(estadoId)), false)); - list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasGratuidade(isEstadoTodos(estadoId)), false)); - return list; - - } - return null; - } - - private List montarItensECF(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection, String sql, boolean isDate) throws SQLException { - - boolean isEstadoTodos = isEstadoTodos(estadoId); - - NamedParameterStatement stmt = new NamedParameterStatement(connection, sql); - stmt.getStatement().setFetchSize(100); - - stmt.setInt("EMPRESA_ID", empresaId); - if (isDate) { - stmt.setString("DATE_INICIO", DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - stmt.setString("DATE_FIM", DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - } else { - stmt.setString("STR_INICIO", DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - stmt.setString("STR_FIM", DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - } - - if (!isEstadoTodos) { - stmt.setInt("ESTADO_ID", estadoId); - } - - List list = new ArrayList(); - ImportacionFiscalVO fiscal = null; - String codProduto = null; - - List columns = new ArrayList(); - ResultSetMetaData rsMetaData = stmt.getStatement().getMetaData(); - for (int i = 1; i <= rsMetaData.getColumnCount(); i++) { - columns.add(rsMetaData.getColumnName(i).toLowerCase()); - } - - ResultSet rset = stmt.executeQuery(); - while (rset.next()) { - - ItemFiscalVO item = new ItemFiscalVO(); - item.setNumImpressora(columns.contains("numimpressora") ? rset.getString("numImpressora") : null); - item.setCoo(columns.contains("coo") ? rset.getString("coo") : null); - item.setBoletoId(columns.contains("boletoid") ? rset.getLong("boletoId") : null); - item.setEmpresaId(columns.contains("empresaid") ? rset.getInt("empresaId") : null); - item.setDataEmissao(columns.contains("dataemissao") ? rset.getString("dataEmissao") : null); - item.setCnpjCliente(columns.contains("cnpjcliente") ? rset.getString("cnpjCliente") : null); - item.setCnpjImpressora(columns.contains("cnpjimpressora") ? rset.getString("cnpjImpressora") : null); - item.setOrigenId(columns.contains("origenid") ? rset.getInt("origenId") : null); - - Integer origenIbge = (columns.contains("origenuf") ? rset.getInt("origenUf") : null); - item.setOrigenUf(origenIbge == null ? null : origenIbge.toString()); - - item.setDestinoId(columns.contains("destinoid") ? rset.getInt("destinoId") : null); - - Integer destinoIbge = (columns.contains("destinouf") ? rset.getInt("destinoUf") : null); - item.setDestinoUf(destinoIbge == null ? null : destinoIbge.toString()); - - item.setNumpdv(columns.contains("numpdv") ? rset.getString("numpdv") : null); - item.setNumItem(columns.contains("numitem") ? rset.getString("numItem") : null); - item.setCodProduto(columns.contains("codproduto") ? rset.getString("codProduto") : null); - item.setRepTributado(columns.contains("reptributado") ? rset.getString("repTributado") : null); - item.setTipoPassagem(columns.contains("tipopassagem") ? rset.getString("tipoPassagem") : null); - item.setModeloImpressora(columns.contains("modeloimpressora") ? rset.getString("modeloImpressora") : null); - item.setNumCaixa(columns.contains("numcaixa") ? rset.getString("numCaixa") : null); - item.setStatus(columns.contains("status") ? rset.getString("status") : null); - item.setClaseServicio(columns.contains("claseservicio") ? rset.getString("claseServicio") : null); - item.setMotivocancelacion(columns.contains("motivocancelacion") ? rset.getInt("motivocancelacion") : null); - item.setValorMulta(columns.contains("valormulta") ? rset.getBigDecimal("valorMulta") : null); - item.setImpostoEstado(columns.contains("impostoestado") ? rset.getBigDecimal("impostoEstado") : null); - item.setDesconto(columns.contains("desconto") ? rset.getBigDecimal("desconto") : null); - item.setIndcancelamento(columns.contains("indcancelamento") ? rset.getString("indcancelamento") : null); - - // TODO: Estes atributos foram criados, por motivo de divergencia no valorTotal com o valor unitario na tabela FISCAL_R5 - item.setValorTarifa(columns.contains("importetarifa") ? rset.getBigDecimal("importetarifa") : null); - item.setValorPedagio(columns.contains("importepedagio") ? rset.getBigDecimal("importepedagio") : null); - item.setValorEmbarque(columns.contains("importetaxaembarque") ? rset.getBigDecimal("importetaxaembarque") : null); - item.setValorSeguro(columns.contains("importeseguro") ? rset.getBigDecimal("importeseguro") : null); - - ImportacionFiscalVO novoFiscal = item; - - codProduto = item.getCodProduto(); - if (codProduto != null) { - codProduto = codProduto.toString().replace("-", "").replace("TA", "").replace("TX", "").replace("PE", "").replace("SE", ""); - } else { - String boleto = item.getBoletoId().toString(); - codProduto = boleto.substring(boleto.length() - 8) + "F" + boleto.substring(boleto.length() - 2); - } - - if (fiscal == null) { - fiscal = item; - } else if (!novoFiscal.equals(fiscal)) { - List itensFiscais = validaItensFiscais(fiscal, codProduto); - fiscal.setItensFiscais(itensFiscais); - list.add(fiscal); - fiscal = item; - } - - fiscal.getItensFiscais().add(item); - - } - - if (fiscal != null) { - List itensFiscais = validaItensFiscais(fiscal, codProduto); - fiscal.setItensFiscais(itensFiscais); - list.add(fiscal); - } - - return list; - } - - private boolean validaValorExiste(BigDecimal valor) { - if (valor == null) { - return Boolean.FALSE; - } else if (valor.equals(BigDecimal.ZERO)) { - return Boolean.FALSE; - } else { - return Boolean.TRUE; - } - } - - private List validaItensFiscais(ImportacionFiscalVO fiscal, String codProduto) { - - boolean temTarifa = validaValorExiste(fiscal.getValorTarifa()); - boolean temPedagio = validaValorExiste(fiscal.getValorPedagio()); - boolean temEmbarque = validaValorExiste(fiscal.getValorEmbarque()); - boolean temSeguro = validaValorExiste(fiscal.getValorSeguro()); - - boolean tarifaCriada = false; - boolean pedagioCriada = false; - boolean embarqueCriada = false; - boolean seguroCriada = false; - - boolean inconsistencia = false; - - List itensFiscais = new ArrayList(); - for (ItemFiscalVO item : fiscal.getItensFiscais()) { - - String codigoProduto = item.getCodProduto(); - if (codigoProduto != null) { - if (codigoProduto.indexOf("TA") >= 0) - tarifaCriada = true; - - if (codigoProduto.indexOf("TX") >= 0) - embarqueCriada = true; - - if (codigoProduto.indexOf("PE") >= 0) - pedagioCriada = true; - - if (codigoProduto.indexOf("SE") >= 0) - seguroCriada = true; - } else { - inconsistencia = true; - break; - } - - itensFiscais.add(item); - } - - int numeroItem = 1; - if (temTarifa && !tarifaCriada) { - ItemFiscalVO novoTarifa = new ItemFiscalVO(fiscal); - novoTarifa.setCodProduto(codProduto + "-TA"); - novoTarifa.setTipoPassagem("E"); - novoTarifa.setValorItem(fiscal.getValorTarifa()); - novoTarifa.setRepTributado("N1"); - novoTarifa.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); - novoTarifa.setInconsistencia(inconsistencia); - itensFiscais.add(novoTarifa); - } - - if (temEmbarque && !embarqueCriada) { - ItemFiscalVO novoEmbarque = new ItemFiscalVO(fiscal); - novoEmbarque.setCodProduto(codProduto + "-TX"); - novoEmbarque.setTipoPassagem("E"); - novoEmbarque.setValorItem(fiscal.getValorEmbarque()); - novoEmbarque.setRepTributado("N1"); - novoEmbarque.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); - novoEmbarque.setInconsistencia(inconsistencia); - itensFiscais.add(novoEmbarque); - } - - if (temPedagio && !pedagioCriada) { - ItemFiscalVO novoPedagio = new ItemFiscalVO(fiscal); - novoPedagio.setCodProduto(codProduto + "-PE"); - novoPedagio.setTipoPassagem("E"); - novoPedagio.setValorItem(fiscal.getValorPedagio()); - novoPedagio.setRepTributado("N1"); - novoPedagio.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); - novoPedagio.setInconsistencia(inconsistencia); - itensFiscais.add(novoPedagio); - } - - if (temSeguro && !seguroCriada) { - ItemFiscalVO novoSeguro = new ItemFiscalVO(fiscal); - novoSeguro.setCodProduto(codProduto + "-SE"); - novoSeguro.setTipoPassagem("E"); - novoSeguro.setValorItem(fiscal.getValorSeguro()); - novoSeguro.setRepTributado("N1"); - novoSeguro.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); - novoSeguro.setInconsistencia(inconsistencia); - itensFiscais.add(novoSeguro); - } - - return itensFiscais; - } - - private int gerarRegistroP2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { - Integer[] idsCorrida = getIdsCorrida(lsEsquemaCorrida); - - StringBuilder sb = new StringBuilder(""); - sb.append(" INSERT INTO FISCAL_P2 (CODPRODUTO,descricao,valorunitario_ta,valorunitario_tx,valorunitario_pe,valorunitario_ot,valorunitario_se,empresa_id,estado_origem,estado_aliascorrida,estado_aliasgeral, ncm) "); - sb.append(" "); - sb.append(" select DISTINCT "); - sb.append(" CODPRODUTO(t.origen_id , t.destino_id , rc.ruta_id) AS CODPRODUTO, "); - sb.append(" concat(concat(concat(concat(concat(po.cveparada, '-'),pd.cveparada),'('),v.nombvia),')') as descricao, "); - sb.append(" tr.precio as valorunitario_ta, "); - sb.append(" tr.importetaxaembarque as valorunitario_tx, "); - sb.append(" tr.importepedagio as valorunitario_pe, "); - sb.append(" tr.importeoutros as valorunitario_ot, "); - sb.append(" tr.importeseguro as valorunitario_se, "); - sb.append(" c.empresacorrida_id as empresa_id, "); - sb.append(" co.estado_id as estado_origem, "); - sb.append(" cas1.estado_id as estado_aliascorrida, "); - sb.append(" cas2.estado_id as estado_aliasgeral, "); - sb.append(" '1040311' as ncm "); - sb.append(" "); - sb.append(" from "); - sb.append(" ruta_combinacion rc "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sb.append(" inner join via v on v.via_id = t.via_id "); - sb.append(" inner join parada po on po.parada_id = t.origen_id "); - sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sb.append(" inner join corrida c on c.ruta_id = rc.ruta_id "); - sb.append(" inner join corrida_tramo cto on cto.corrida_id = c.corrida_id and cto.feccorrida = c.feccorrida and t.origen_id = cto.origen_id "); - sb.append(" inner join corrida_tramo ctd on ctd.corrida_id = c.corrida_id and ctd.feccorrida = c.feccorrida and t.destino_id = ctd.destino_id "); - sb.append(" inner join tarifa tr on tr.ruta_id = rc.ruta_id and tr.origen_id = t.origen_id and tr.destino_id = t.destino_id "); - sb.append(" inner join vigencia_tarifa vt on vt.vigenciatarifa_id = tr.vigenciatarifa_id "); - sb.append(" inner join ciudad co on co.ciudad_id = po.ciudad_id "); - sb.append(" left join alias_servico as1 on as1.corrida_id = as1.corrida_id and as1.origen_id = t.origen_id and as1.destino_id = t.destino_id and as1.ruta_id = rc.ruta_id "); - sb.append(" left join parada pas1 on pas1.parada_id = as1.aliasorigen_id "); - sb.append(" left join ciudad cas1 on cas1.ciudad_id = pas1.ciudad_id "); - sb.append(" left join alias_servico as2 on as2.corrida_id is null and as2.origen_id = t.origen_id and as2.destino_id = t.destino_id and as2.ruta_id = rc.ruta_id "); - sb.append(" left join parada pas2 on pas2.parada_id = as2.aliasorigen_id "); - sb.append(" left join ciudad cas2 on cas2.ciudad_id = pas2.ciudad_id "); - sb.append(" where "); - sb.append(" rc.activo = 1 "); - sb.append(" and cto.activo = 1 "); - sb.append(" and ctd.activo = 1 "); - sb.append(" and tr.activo = 1 "); - sb.append(" and cto.fechorsalida between vt.feciniciovigencia and vt.fecfinvigencia "); - sb.append(" and c.feccorrida between :datIni and :datFim "); - sb.append(" and c.corrida_id in (:corridaId) "); - sb.append(" and CODPRODUTO(t.origen_id , t.destino_id , rc.ruta_id) not in (select codproduto from fiscal_p2) "); - // sb.append(" and ROWNUM < 50 "); - - int qtd = 0; - - Connection connection = null; - try { - connection = dataSource.getConnection(); - - connection.setAutoCommit(false); - - PreparedStatement ps = connection.prepareStatement(sb.toString()); - - ps.setDate(1, new java.sql.Date(dataDe.getTime())); - ps.setDate(2, new java.sql.Date(dataAte.getTime())); - ps.setString(3, StringUtils.join(idsCorrida, ",")); - - qtd = ps.executeUpdate(); - - connection.commit(); - } catch (Throwable t) { - connection.rollback(); - } finally { - if (connection != null) { - connection.close(); - } - } - - return qtd; - - } - - private Integer[] getIdsCorrida(List lsEsquemaCorrida) { - Integer[] idsCorrida = new Integer[lsEsquemaCorrida.size()]; - int i = 0; - for (EsquemaCorrida ec : lsEsquemaCorrida) { - idsCorrida[i] = ec.getNumCorrida(); - i++; - } - return idsCorrida; - } - - private int gerarRegistroF2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { - StringBuilder sb = new StringBuilder(""); - sb.append(" INSERT INTO FISCAL_F2 (cnpj, codigo_local_emissao,identificacao_linha, descricao_linha, data_partida, hora_partida, codigo_tipo_viagem) "); - sb.append(" select distinct oc.cnpj, t.origen_id as codigo_local_emissao, r.prefixo as identificacao_linha, concat(concat(po.cveparada, '-'),pd.cveparada) as descricao, to_char(cto.fechorsalida, 'YYYYMMdd') as data_partida, to_char(cto.fechorsalida, 'hh24miss') as hora_partida, (case nvl(c.tiposervicio_id, 0) when 2 then '01' else '00' end) as codigo_tipo_viagem "); - sb.append(" from "); - sb.append(" ruta_combinacion rc "); - sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id = r.orgaoconcedente_id "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sb.append(" inner join parada po on po.parada_id = t.origen_id "); - sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sb.append(" inner join corrida c on c.ruta_id = rc.ruta_id "); - sb.append(" inner join corrida_tramo cto on cto.corrida_id = c.corrida_id and cto.feccorrida = c.feccorrida and t.origen_id = cto.origen_id "); - sb.append(" inner join corrida_tramo ctd on ctd.corrida_id = c.corrida_id and ctd.feccorrida = c.feccorrida and t.destino_id = ctd.destino_id "); - sb.append(" inner join tarifa tr on tr.ruta_id = rc.ruta_id and tr.origen_id = t.origen_id and tr.destino_id = t.destino_id "); - sb.append(" inner join vigencia_tarifa vt on vt.vigenciatarifa_id = tr.vigenciatarifa_id "); - sb.append(" inner join punto_venta pv on pv.empresa_id = c.empresacorrida_id "); - sb.append(" where "); - sb.append(" rc.activo = 1 "); - sb.append(" and cto.activo = 1 "); - sb.append(" and ctd.activo = 1 "); - sb.append(" and cto.fechorsalida between vt.feciniciovigencia and vt.fecfinvigencia "); - sb.append(" and c.feccorrida between :datIni and :datFim "); - sb.append(" and c.corrida_id in (:corridaId) "); - // sb.append(" and ROWNUM < 2 "); - - Integer[] idsCorrida = getIdsCorrida(lsEsquemaCorrida); - Connection connection = null; - - int qtd = 0; - - try { - connection = dataSource.getConnection(); - - connection.setAutoCommit(false); - - PreparedStatement ps = connection.prepareStatement(sb.toString()); - - ps.setDate(1, new java.sql.Date(dataDe.getTime())); - ps.setDate(2, new java.sql.Date(dataAte.getTime())); - ps.setString(3, StringUtils.join(idsCorrida, ",")); - - qtd = ps.executeUpdate(); - - connection.commit(); - - } catch (Throwable t) { - connection.rollback(); - } finally { - if (connection != null) { - connection.close(); - } - } - - return qtd; - } - - @Override - public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { - int gerarRegistroP2 = this.gerarRegistroP2(lsEsquemaCorrida, dataDe, dataAte); - int gerarRegistroF2 = this.gerarRegistroF2(lsEsquemaCorrida, dataDe, dataAte); - return gerarRegistroP2 + gerarRegistroF2; - } - - @Override - public List buscaDatosNaoFiscais(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection) throws SQLException { - PreparedStatement stmt = null; - ResultSet rset = null; - - StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT TEE.TIPOEVENTOEXTRA_ID AS TIPOEVENTOEXTRAID, TEE.DESCTIPOEVENTO AS DESCTIPOEVENTO, ") - .append(" TRUNC(CD.FECHORVTA) AS FECHORVTA, SUM(CD.PRECIO) AS TOTAL ") - .append("FROM TIPO_EVENTO_EXTRA TEE ") - .append("JOIN EVENTO_EXTRA EE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") - .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = EE.PUNTOVENTA_ID ") - .append("JOIN PARADA PA ON PA.PARADA_ID = PV.PARADA_ID ") - .append("JOIN CIUDAD CI ON CI.CIUDAD_ID = PA.CIUDAD_ID ") - .append("JOIN ESTADO ES ON ES.ESTADO_ID = CI.ESTADO_ID ") - .append("LEFT JOIN CAJA_DIVERSOS CD ON EE.EVENTOEXTRA_ID = CD.EVENTOEXTRA_ID ") - .append("WHERE TEE.ACTIVO = 1 ") - .append("AND EE.EMPRESA_ID = ? ") - .append("AND TRUNC(CD.FECHORVTA) BETWEEN ? AND ? ") - .append(isEstadoTodos(estadoId) ? "" : " AND ES.ESTADO_ID = ? ") - .append("GROUP BY TEE.TIPOEVENTOEXTRA_ID, TEE.DESCTIPOEVENTO, TRUNC(CD.FECHORVTA) ") - .append("ORDER BY TRUNC(CD.FECHORVTA), TEE.DESCTIPOEVENTO "); - - stmt = connection.prepareStatement(sQuery.toString()); - stmt.setInt(1, empresaId); - stmt.setDate(2, new java.sql.Date(inicio.getTime())); - stmt.setDate(3, new java.sql.Date(fim.getTime())); - - if (!isEstadoTodos(estadoId)) - stmt.setInt(4, estadoId); - - rset = stmt.executeQuery(); - List importacionNaoFiscalVOs = new ArrayList(); - while (rset.next()) { - ImportacionNaoFiscalVO importacionNaoFiscal = new ImportacionNaoFiscalVO(); - importacionNaoFiscal.setTipoeventoextraId(rset.getInt("TIPOEVENTOEXTRAID")); - importacionNaoFiscal.setDesctipoevento(rset.getString("DESCTIPOEVENTO")); - importacionNaoFiscal.setFechorvta(rset.getDate("FECHORVTA")); - importacionNaoFiscal.setTotal(rset.getBigDecimal("TOTAL")); - - importacionNaoFiscalVOs.add(importacionNaoFiscal); - } - - return importacionNaoFiscalVOs; - - } - - @Override - public ExportacaoECF buscarRegistroECF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - ExportacaoECF exportacaoECF = new ExportacaoECF(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select distinct"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie as numserie,"); - sb.append(" (case when r2.numserie20 is null then '000001' else r2.cooinicial end) as cooinicial,"); - sb.append(" (case when r2.numserie20 is null then '000001' else r2.coofinal end) as coofinal,"); - sb.append(" (case when r2.numserie20 is null then '000001' else r2.crz end) as crz,"); - sb.append(" (case when r2.numserie20 is null then '000001' else r2.cro end) as cro,"); - sb.append(" (case when r2.numserie20 is null then '000001' else r2.coo end) as r2_coo,"); - sb.append(" to_char(c.feccreacion, 'yyyymmdd') as datamov,"); - sb.append(" (case when r4.caja_id is null then '000001' else r4.coo end) as r4_coo,"); - sb.append(" (case when s.aliasorigen_id is null then ei.codestabelecimento else eis.codestabelecimento end) as codestabelecimento,"); - sb.append(" e.codestabelecimento as codestabelecimentoimpressora,"); - sb.append(" imp.numeroidentificacao as numeroidentificacao,"); - sb.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta,"); - sb.append(" ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado,"); - sb.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipio_origem,"); - sb.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estado_origem,"); - sb.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as municipio_destino,"); - sb.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estado_destino,"); - sb.append(" (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as red_base_calc_icms,"); - sb.append(" (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porc_red_municipal,"); - sb.append(" (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porc_red_estadual,"); - sb.append(" (case when s.aliasorigen_id is null then ei.tributacaoimportacao else eis.tributacaoimportacao end) as tributacao_importacao,"); - sb.append(" coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0) as valortotal,"); - sb.append(" c.numfoliosistema as numfoliosistema,"); - sb.append(" c.caja_id"); - sb.append(" from caja c"); - sb.append(" join ruta r on r.ruta_id = c.ruta_id"); - sb.append(" join parada po on po.parada_id = c.origen_id and po.activo = 1 "); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id and co.activo = 1 "); - sb.append(" join estado eo on eo.estado_id = co.estado_id and eo.activo = 1 "); - sb.append(" join parada pd on pd.parada_id = c.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id and ei.activo = 1 "); - sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); - sb.append(" left join estado e on e.estado_id = imp.estadolocal_id"); - sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); - sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); - sb.append(" where c.activo = 1 "); - sb.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); - sb.append(" and c.serieimpfiscal is not null "); - sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); - sb.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); - sb.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); - sb.append(" and c.feccreacion >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); - sb.append(" and c.empresacorrida_id = ? "); - sb.append(" and c.num_bpe is null "); - sb.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = ?) "); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setLong(3, Long.valueOf(empresaId)); - ps.setString(4, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoECFBase registro = null; - - while (rs.next()) { - BigDecimal valortributado = BigDecimal.ZERO; - BigDecimal valortotal = BigDecimal.ZERO; - - if (rs.getBigDecimal("valortributado") != null) { - valortributado = rs.getBigDecimal("valortributado"); - } - - if (rs.getBigDecimal("valortotal") != null) { - valortotal = rs.getBigDecimal("valortotal"); - } - - registro = new ExportacaoECFBase(); - registro.setEcf(rs.getString("ecf")); - registro.setNumeroSerie(rs.getString("numserie")); - registro.setCooInicial(Integer.valueOf(rs.getString("cooinicial"))); - registro.setCooFinal(Integer.valueOf(rs.getString("coofinal"))); - registro.setContadorReducao(Integer.valueOf(rs.getString("crz"))); - registro.setCro(Integer.valueOf(rs.getString("cro"))); - registro.setCooReducaoZ(Integer.valueOf(rs.getString("r2_coo"))); - registro.setDataEmissao(rs.getString("datamov")); - registro.setCoo(Integer.valueOf(rs.getString("r4_coo"))); - registro.setEstabelecimento(rs.getString("codestabelecimento")); - registro.setEstabelecimentoECF(rs.getString("codestabelecimentoimpressora")); - registro.setNumeroIdentificacaoECF(rs.getString("numeroidentificacao") == null || rs.getString("numeroidentificacao").isEmpty() ? "0" : rs.getString("numeroidentificacao")); - registro.setUfOrigem(rs.getString("estado_origem")); - registro.setMunicipioOrigem(Integer.valueOf(rs.getString("municipio_origem"))); - registro.setMunicipioDestino(Integer.valueOf(rs.getString("municipio_destino"))); - registro.setUfDestino(rs.getString("estado_destino")); - registro.setReducaoBaseCalcICMS(rs.getBigDecimal("red_base_calc_icms")); - registro.setPorcReducaoMunicipal(rs.getBigDecimal("porc_red_municipal")); - registro.setPorcReducaoEstadual(rs.getBigDecimal("porc_red_estadual")); - registro.setTributacaoImportacao(rs.getBigDecimal("tributacao_importacao")); - registro.setNumFolioSistema(rs.getString("numFolioSistema")); - registro.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); - - registro.setIsenta(rs.getInt("isenta")); - registro.setValorTributado(valortributado); - registro.setValorTotal(valortotal); - - exportacaoECF.getListaRegistroECF().add(registro); - } - - rs.close(); - ps.close(); - - exportacaoECF.gerarListas(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return exportacaoECF; - } - - public void limparCache(Connection connection) { - - ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); - Constante contante = constanteService.buscarPorNomeConstante("LIMPA_CACHE_RELATORIOS"); - String command = null; - if ((contante != null && (StringUtils.isNotBlank(contante.getValorconstante())))) { - command = contante.getValorconstante(); - - PreparedStatement pstmt = null; - try { - pstmt = connection.prepareStatement(command); - pstmt.executeBatch(); - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (pstmt != null && !pstmt.isClosed()) { - pstmt.close(); - } - } catch (Exception e) { - log.error("", e); - } - } - } - } - - @Deprecated - @Override - public List buscarRegistroECFTipoCFC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select ecf, numserie, datamov, cooinicial, coofinal, crz, cro, coo, codestabelecimento, codestabelecimentoimpressora, numeroidentificacao, estadoorigem, sum(totalisenta) as totalisenta, sum(vendabrutadiaria) as vendabrutadiaria, sum(totgeral) as totgeral, sum(totalvenda) as totalvenda"); - sb.append(" from ("); - sb.append(" select distinct"); - sb.append(" imp.numserie20 as ecf,"); - sb.append(" imp.numserie as numserie,"); - sb.append(" r2.datamov as datamov,"); - sb.append(" r2.cooinicial as cooinicial,"); - sb.append(" r2.coofinal as coofinal,"); - sb.append(" r2.crz as crz,"); - sb.append(" r2.cro as cro,"); - sb.append(" r2.coo as coo,"); - sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN ei.codestabelecimento ELSE eis.codestabelecimento END as codestabelecimento,"); - sb.append(" e.codestabelecimento as codestabelecimentoimpressora,"); - sb.append(" imp.numeroidentificacao as numeroidentificacao,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estadoorigem,"); - sb.append(" coalesce(("); - sb.append(" select sum((coalesce(to_number(r4i.imptotalliquido), 0) / 100 - coalesce((select sum(to_number(r5x.imptotalliquido) / 100) from fiscal_r5 r5x where r5x.contador = r4i.contador and r5x.numserie20 = r4i.numserie20 and r5x.totparcial like 'N1'), 0)))"); - sb.append(" from fiscal_r4 r4i"); - sb.append(" join caja ci on ci.caja_id = r4i.caja_id"); - sb.append(" join parada poi on poi.parada_id = ci.origen_id"); - sb.append(" join parada pdi on pdi.parada_id = ci.destino_id"); - sb.append(" left join alias_servico si on si.origen_id = ci.origen_id and si.destino_id = ci.destino_id and (si.corrida_id = ci.corrida_id or si.corrida_id is null) and si.ruta_id = ci.ruta_id"); - sb.append(" left join parada posi on posi.parada_id = si.aliasorigen_id"); - sb.append(" left join parada pdsi on pdsi.parada_id = si.aliasdestino_id"); - sb.append(" where r4i.numserie20 = r4.numserie20 and r4i.datamov = r2.datamov"); - sb.append(" and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))"); - sb.append(" ), 0) as totalisenta,"); - sb.append(" to_number(r2.vendabrutadiaria)/100 as vendabrutadiaria,"); - sb.append(" to_number(r2.totgeral)/100 as totgeral,"); - sb.append(" ("); - sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); - sb.append(" coalesce(("); - sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); - sb.append(" from fiscal_r5 r5x"); - sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); - sb.append(" ), 0)"); - sb.append(" ) as totalvenda,"); - sb.append(" b.boleto_id as caja_id"); - sb.append(" from fiscal_r4 r4"); - sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); - sb.append(" join fiscal_impressora imp on imp.numserie20 = r4.numserie20"); - sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = co.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = cos.estado_id"); - sb.append(" left join estado e on e.estado_id = imp.estadolocal_id"); - sb.append(" where b.activo = 1"); - sb.append(" and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); - sb.append(" and coalesce(r4.indcancelamento, 'N') <> 'S'"); - sb.append(" and r4.datamov >= ? and r4.datamov <= ?"); - sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" UNION"); - sb.append(" select distinct"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie as numserie,"); - sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" case when r2.numserie20 is null then '000001' else r2.cooinicial end as cooinicial,"); - sb.append(" case when r2.numserie20 is null then '000001' else r2.coofinal end as coofinal,"); - sb.append(" case when r2.numserie20 is null then '0000' else r2.crz end as crz,"); - sb.append(" case when r2.numserie20 is null then '0000' else r2.cro end as cro,"); - sb.append(" case when r2.numserie20 is null then '000000' else r2.coo end as coo,"); - sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN ei.codestabelecimento ELSE eis.codestabelecimento END as codestabelecimento,"); - sb.append(" e.codestabelecimento as codestabelecimentoimpressora,"); - sb.append(" imp.numeroidentificacao as numeroidentificacao,"); - sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END as estadoorigem,"); - sb.append(" ("); - sb.append(" select nvl(sum(ci.preciopagado), 0)"); - sb.append(" from caja ci"); - sb.append(" join parada poi on poi.parada_id = ci.origen_id"); - sb.append(" join parada pdi on pdi.parada_id = ci.destino_id"); - sb.append(" left join alias_servico si on si.origen_id = ci.origen_id and si.destino_id = ci.destino_id and (si.corrida_id = ci.corrida_id or si.corrida_id is null) and si.ruta_id = ci.ruta_id"); - sb.append(" left join parada posi on posi.parada_id = si.aliasorigen_id"); - sb.append(" left join parada pdsi on pdsi.parada_id = si.aliasdestino_id"); - sb.append(" where ci.caja_id = c.caja_id"); - sb.append(" and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))"); - sb.append(" ) as totalisenta,"); - sb.append(" 0 as vendabrutadiaria,"); - sb.append(" ("); - sb.append(" select nvl(sum(ci.preciopagado + ci.importetaxaembarque + ci.importeseguro + ci.importepedagio + ci.importeoutros), 0)"); - sb.append(" from caja ci"); - sb.append(" where ci.caja_id = c.caja_id"); - sb.append(" ) as totgeral,"); - sb.append(" ("); - sb.append(" select nvl(sum(ci.preciopagado), 0)"); - sb.append(" from caja ci"); - sb.append(" where ci.caja_id = c.caja_id"); - sb.append(" ) as totalvenda,"); - sb.append(" c.caja_id"); - sb.append(" from caja c"); - sb.append(" join parada po on po.parada_id = c.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = co.estado_id"); - sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); - sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = cos.estado_id"); - sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); - sb.append(" left join estado e on e.estado_id = imp.estadolocal_id"); - sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); - sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); - sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); - sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); - sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); - sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); - sb.append(" and c.empresacorrida_id = ?"); - sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" )"); - sb.append(" having sum(totalvenda) > 0"); - sb.append(" group by ecf, numserie, datamov, cooinicial, coofinal, crz, cro, coo, codestabelecimento, codestabelecimentoimpressora, numeroidentificacao, estadoorigem"); - sb.append(" order by datamov"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - ps.setLong(3, Long.valueOf(empresaId)); - ps.setString(4, cveestado); - ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); - ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); - ps.setLong(7, Long.valueOf(empresaId)); - ps.setString(8, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoECFTipoCFC registro = null; - - while (rs.next()) { - BigDecimal totalIsenta = BigDecimal.ZERO; - BigDecimal totalvenda = BigDecimal.ZERO; - - if (rs.getBigDecimal("totalisenta") != null) { - totalIsenta = rs.getBigDecimal("totalisenta"); - } - - if (rs.getBigDecimal("totalvenda") != null) { - totalvenda = rs.getBigDecimal("totalvenda"); - } - - registro = new ExportacaoECFTipoCFC(); - registro.setEstabelecimento(rs.getString("codestabelecimento")); - registro.setDataEmissao(rs.getString("datamov")); - registro.setNumeroIdentificacaoECF(rs.getString("numeroidentificacao") == null || rs.getString("numeroidentificacao").isEmpty() ? "0" : rs.getString("numeroidentificacao")); - registro.setEcf(rs.getString("ecf")); - registro.setCooReducaoZ(Integer.valueOf(rs.getString("coo"))); - registro.setCooInicial(Integer.valueOf(rs.getString("cooinicial"))); - registro.setCooFinal(Integer.valueOf(rs.getString("coofinal"))); - registro.setContadorReducao(Integer.valueOf(rs.getString("crz"))); - registro.setCro(Integer.valueOf(rs.getString("cro"))); - registro.setValorTotal(totalvenda); - registro.setValorIsentas(totalIsenta); - registro.setEstabelecimentoECF(rs.getString("codestabelecimentoimpressora")); - registro.setNumeroSerie(rs.getString("numserie")); - registro.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); - - retorno.add(registro); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Deprecated - @Override - public List buscarRegistroECFTipoCCF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select ecf, datamov, coo, sum(valortarifa) as valortarifa, sum(preciopagado) as preciopagado, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta, numfoliosistema, sum(valortotal) as valortotal"); - sb.append(" from ("); - sb.append(" select distinct"); - sb.append(" r4.numserie20 as ecf,"); - sb.append(" r4.datamov as datamov,"); - sb.append(" r4.coo as coo,"); - sb.append(" ("); - sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); - sb.append(" coalesce(("); - sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); - sb.append(" from fiscal_r5 r5x"); - sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); - sb.append(" ), 0)"); - sb.append(" ) as valortarifa,"); - sb.append(" c.preciopagado as preciopagado,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); - sb.append(" to_number(r4.impsubtotal)/100 as valortotal,"); - sb.append(" b.numfoliosistema as numfoliosistema,"); - sb.append(" b.boleto_id as caja_id"); - sb.append(" from fiscal_r4 r4"); - sb.append(" left join fiscal_r5 r5 on r5.numserie20 = r4.numserie20 and r5.coo = r4.coo and r5.totparcial not like 'N1'"); - sb.append(" left join caja c on c.caja_id = r4.caja_id"); - sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); - sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = b.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" where coalesce(r4.indcancelamento, 'N') <> 'S' and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1 and b.activo = 1 and r4.datamov >= ? and r4.datamov <= ? and b.empresacorrida_id = ? and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" UNION"); - sb.append(" select distinct"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); - sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" '000001' as coo,"); - sb.append(" c.preciopagado as valortarifa,"); - sb.append(" c.preciopagado as preciopagado,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); - sb.append(" c.preciopagado + c.importetaxaembarque + c.importeseguro + c.importepedagio + c.importeoutros as valortotal,"); - sb.append(" c.numfoliosistema as numfoliosistema,"); - sb.append(" c.caja_id"); - sb.append(" from caja c"); - sb.append(" join parada po on po.parada_id = c.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = c.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); - sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); - sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); - sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); - sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); - sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); - sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); - sb.append(" and (c.preciopagado + c.importetaxaembarque + c.importeseguro + c.importepedagio + c.importeoutros) > 0"); - sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); - sb.append(" and c.empresacorrida_id = ?"); - sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" ) "); - sb.append(" group by ecf, datamov, coo, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta, numfoliosistema"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - ps.setLong(3, Long.valueOf(empresaId)); - ps.setString(4, cveestado); - ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); - ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); - ps.setLong(7, Long.valueOf(empresaId)); - ps.setString(8, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoECFTipoCCF registro = null; - - while (rs.next()) { - BigDecimal valorTributado = BigDecimal.ZERO; - - if (rs.getString("valortarifa") != null) { - valorTributado = BigDecimal.valueOf(Double.valueOf(rs.getString("valortarifa"))); - } else { - valorTributado = rs.getBigDecimal("preciopagado"); - - log.info("Tarifa nao encontrada na R5. (ECF: " + rs.getString("ecf") + " / DATAMOV: " + rs.getString("datamov") + " / COO: " + rs.getString("coo") + ")"); - } - - registro = new ExportacaoECFTipoCCF(); - registro.setEcf(rs.getString("ecf")); - registro.setDataEmissao(rs.getString("datamov")); - registro.setCoo(Integer.valueOf(rs.getString("coo"))); - registro.setValorServico(valorTributado); - registro.setDescontoGlobal(null); - registro.setCodigoParticipante(null); - registro.setSituacaoCOO(0); // 0 - Documento Regular; 2 - Documento Cancelado - registro.setAcrescimo(null); - registro.setNumFolioSistema(rs.getString("numFolioSistema")); - - registro.setCodigoSituacaoTribColunaB(null); - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (rs.getInt("isenta") == 1) { - registro.setCodigoSituacaoTribColunaB(40); - } - - registro.setUfOrigem(rs.getString("estado_origem")); - registro.setMunicipioOrigem(Integer.valueOf(rs.getString("municipio_origem"))); - registro.setUfDestino(rs.getString("estado_destino")); - - // IM=5357; serviço IE= 6357 - if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - registro.setCfop(5357); - } else { - registro.setCfop(6357); - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (registro.getCodigoSituacaoTribColunaB() == null) { - registro.setCodigoSituacaoTribColunaB(rs.getInt("red_base_calc_icms") == 0 ? 0 : 20); - } - - // TODO: Mudança para o valor tributado (Email no dia 9 de agosto de 2017 08:28) - BigDecimal valorTotal = valorTributado; // BigDecimal.valueOf(Double.valueOf(rs.getString("valortotal"))); - - BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms"); - // BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal"); - // BigDecimal porc_red_estadual = rs.getBigDecimal("porc_red_estadual"); - BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - if ("30|40|41|50|60".contains(registro.getCodigoSituacaoTribColunaB().toString())) { - tributacao_importacao = BigDecimal.ZERO; - } - - if (red_base_calc_icms != null) { - valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); - } else { - // if (tributacao_importacao != null) { - // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - // if (porc_red_municipal != null) { - // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_municipal.divide(BigDecimal.valueOf(100d)))); - // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); - // } - // } else { - // if (porc_red_estadual != null) { - // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_estadual.divide(BigDecimal.valueOf(100d)))); - // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); - // } - // } - // } - - // Email 17/02/2017 - valorBaseCalculoICMS = valorTotal; - } - - if (rs.getInt("isenta") == 1) { - valorBaseCalculoICMS = null; - } - - registro.setValorTotal(valorTotal); - - // 1 - Demais; 2 - Região Metropolitanao ou seja, quando o campo CSTB for "40", esse campo deve vir "2". Do contrário, deve vir "1" - registro.setTributacaoICMS(registro.getCodigoSituacaoTribColunaB() == 40 ? 2 : 1); - - registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); - registro.setAliquotaICMS(tributacao_importacao); - - if (valorTotal.doubleValue() != 0) { - retorno.add(registro); - } - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Deprecated - @Override - public List buscarRegistroECFTipoICF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select ecf, datamov, coo, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta, sum(valortotal) as valortotal"); - sb.append(" from ("); - sb.append(" select distinct"); - sb.append(" r4.numserie20 as ecf,"); - sb.append(" r4.datamov as datamov,"); - sb.append(" r4.coo as coo,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); - sb.append(" ("); - sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); - sb.append(" coalesce(("); - sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); - sb.append(" from fiscal_r5 r5x"); - sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); - sb.append(" ), 0)"); - sb.append(" ) as valortotal"); - sb.append(" from fiscal_r4 r4"); - sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); - sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = b.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" where coalesce(r4.indcancelamento, 'N') <> 'S' and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1 and b.activo = 1 and r4.datamov >= ? and r4.datamov <= ? and b.empresacorrida_id = ? and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" UNION"); - sb.append(" select distinct"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); - sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" '000001' as coo,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); - sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); - sb.append(" (c.preciopagado) as valortotal"); - sb.append(" from caja c"); - sb.append(" join parada po on po.parada_id = c.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = c.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); - sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); - sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); - sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); - sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); - sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); - sb.append(" and (c.preciopagado) > 0"); - sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); - sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); - sb.append(" and c.empresacorrida_id = ?"); - sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" )"); - sb.append(" group by ecf, datamov, coo, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta"); - sb.append(" order by ecf, datamov"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - ps.setLong(3, Long.valueOf(empresaId)); - ps.setString(4, cveestado); - ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); - ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); - ps.setLong(7, Long.valueOf(empresaId)); - ps.setString(8, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoECFTipoICF registro = null; - - Map group = new HashMap(); - - while (rs.next()) { - BigDecimal valorTotal = rs.getBigDecimal("valortotal"); - - if (valorTotal == null || valorTotal.doubleValue() == 0) { - continue; - } - - BigDecimal red_base_calc_icms = MoneyHelper.instanciar(rs.getBigDecimal("red_base_calc_icms")); - BigDecimal porc_red_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal")); - BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); - BigDecimal tributacao_importacao = MoneyHelper.instanciar(rs.getBigDecimal("tributacao_importacao")); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - if (red_base_calc_icms != null) { - BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); - valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); - } else { - // if (tributacao_importacao != null) { - // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - // if (porc_red_municipal != null) { - // BigDecimal aPorc_red_municipal = MoneyHelper.dividir(porc_red_municipal, BigDecimal.valueOf(100d)); - // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_municipal)); - // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); - // - // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); - // } - // } else { - // if (porc_red_estadual != null) { - // BigDecimal aPorc_red_estadual = MoneyHelper.dividir(porc_red_estadual, BigDecimal.valueOf(100d)); - // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_estadual)); - // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); - // - // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); - // } - // } - // } - - // Email 17/02/2017 - valorBaseCalculoICMS = valorTotal; - } - - BigDecimal valorICMSDebitado = BigDecimal.ZERO; - - if (tributacao_importacao != null) { - BigDecimal aTributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - valorICMSDebitado = MoneyHelper.multiplicar(valorBaseCalculoICMS, aTributacao_importacao); - } - - BigDecimal valorICMSIsento = BigDecimal.ZERO; - BigDecimal valorICMSOutros = MoneyHelper.subtrair(valorTotal, valorBaseCalculoICMS); - - String ecf = rs.getString("ecf"); - String datamov = rs.getString("datamov"); - String ufDestino = ""; - String ufOrigem = ""; - Integer municipioOrigem = 0; - Integer cfop = 0; // IM=5357; serviço IE= 6357 - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - Integer codigoSituacaoTribColunaB = null; - - if (rs.getInt("isenta") == 1) { - codigoSituacaoTribColunaB = 40; - - valorICMSOutros = valorTotal; - } - - ufDestino = rs.getString("estado_destino"); - ufOrigem = rs.getString("estado_origem"); - municipioOrigem = rs.getInt("municipio_origem"); - - // IM=5357; serviço IE= 6357 - if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - cfop = 5357; - } else { - cfop = 6357; - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (codigoSituacaoTribColunaB == null) { - codigoSituacaoTribColunaB = rs.getInt("red_base_calc_icms") == 0 ? 0 : 20; - } - - if (codigoSituacaoTribColunaB == 40) { - tributacao_importacao = BigDecimal.ZERO; - valorBaseCalculoICMS = BigDecimal.ZERO; - valorICMSDebitado = BigDecimal.ZERO; - valorICMSOutros = BigDecimal.ZERO; - - valorICMSIsento = valorTotal; - } - - String key = ecf + "|" + datamov + "|" + ufDestino + "|" + cfop.toString() + "|" + codigoSituacaoTribColunaB.toString(); - - if (group.containsKey(key)) { - registro = group.get(key); - - valorTotal = MoneyHelper.somar(valorTotal, registro.getValorTotal()); - valorBaseCalculoICMS = MoneyHelper.somar(valorBaseCalculoICMS, registro.getValorBaseCalculoICMS()); - valorICMSDebitado = MoneyHelper.somar(valorICMSDebitado, registro.getValorICMSDebitado()); - valorICMSIsento = MoneyHelper.somar(valorICMSIsento, registro.getValorICMSIsento()); - valorICMSOutros = MoneyHelper.somar(valorICMSOutros, registro.getValorICMSOutros()); - } else { - registro = new ExportacaoECFTipoICF(); - registro.setEcf(ecf); - registro.setDataEmissao(datamov); - registro.setUfDestino(ufDestino); - registro.setCfop(cfop); // IM=5357; serviço IE= 6357 - registro.setCodigoSituacaoTribColunaB(codigoSituacaoTribColunaB); // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - registro.setAliquotaICMS(tributacao_importacao); - registro.setUfOrigem(ufOrigem); - registro.setMunicipioOrigem(municipioOrigem); - - registro.setRedutorBaseCalculoIcms(red_base_calc_icms); - registro.setRedutorMunicipalIcms(porc_red_municipal); - registro.setRedutorEstadualIcms(porc_red_estadual); - - group.put(key, registro); - } - - registro.setValorTotal(valorTotal); - registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); - registro.setValorICMSDebitado(valorICMSDebitado); - registro.setValorICMSIsento(valorICMSIsento); - registro.setValorICMSOutros(valorICMSOutros); - } - - for (Map.Entry entry : group.entrySet()) { - retorno.add(entry.getValue()); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Deprecated - @Override - public List buscarRegistroECFTipoPRC(final Connection conn, final Date inicio, final Date fim, final Integer empresaId, final String cveestado) { - final List retorno = new ArrayList(); - - final StringBuilder sb = new StringBuilder(); - sb.append(" select ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, SUM(valortotal) as valortotal"); - sb.append(" from ("); - sb.append(" select distinct"); - sb.append(" r4.coo as coo,"); - sb.append(" r4.numserie20 as ecf,"); - sb.append(" r4.datamov as datamov,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" ("); - sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); - sb.append(" coalesce(("); - sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); - sb.append(" from fiscal_r5 r5x"); - sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); - sb.append(" ), 0)"); - sb.append(" ) as valortotal,"); - sb.append(" b.boleto_id as caja_id"); - sb.append(" from fiscal_r4 r4"); - sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); - sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = b.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" where coalesce(r4.indcancelamento, 'N') <> 'S' and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1 and b.activo = 1 and r4.datamov >= ? and r4.datamov <= ? and b.empresacorrida_id = ? and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" UNION"); - sb.append(" select distinct"); - sb.append(" '000001' as coo,"); - sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); - sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" c.preciopagado as valortotal,"); - sb.append(" c.caja_id"); - sb.append(" from caja c"); - sb.append(" join parada po on po.parada_id = c.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = c.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); - sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); - sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); - sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); - sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); - sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); - sb.append(" and (c.preciopagado) > 0"); - sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); - sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); - sb.append(" and c.empresacorrida_id = ?"); - sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); - sb.append(" ) group by ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao"); - - Session session = null; - - try { - session = getSessionFactory().openSession(); - - session.doWork(new Work() { - @Override - public void execute(Connection connection) throws SQLException { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - ps.setLong(3, Long.valueOf(empresaId)); - ps.setString(4, cveestado); - ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); - ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); - ps.setLong(7, Long.valueOf(empresaId)); - ps.setString(8, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoECFTipoPRC registro = null; - - Map group = new HashMap(); - - while (rs.next()) { - BigDecimal valorTotal = rs.getBigDecimal("valortotal"); - - BigDecimal red_base_calc_icms = MoneyHelper.instanciar(rs.getBigDecimal("red_base_calc_icms")); - // BigDecimal porc_red_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal")); - // BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); - BigDecimal tributacao_importacao = MoneyHelper.instanciar(rs.getBigDecimal("tributacao_importacao")); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - if (tributacao_importacao != null) { - tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - } - - if (red_base_calc_icms != null) { - BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); - valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); - } else { - // if (tributacao_importacao != null) { - // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - // if (porc_red_municipal != null) { - // BigDecimal aPorc_red_municipal = MoneyHelper.dividir(porc_red_municipal, BigDecimal.valueOf(100d)); - // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_municipal)); - // - // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); - // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); - // } - // } else { - // if (porc_red_estadual != null) { - // BigDecimal aPorc_red_estadual = MoneyHelper.dividir(porc_red_estadual, BigDecimal.valueOf(100d)); - // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_estadual)); - // - // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); - // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); - // } - // } - // } - - // Email 17/02/2017 - valorBaseCalculoICMS = valorTotal; - } - - BigDecimal valorICMS = BigDecimal.ZERO; - - if (tributacao_importacao != null) { - valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); - } - - String key = rs.getString("ecf") + "|" + rs.getString("datamov") + "|" + rs.getString("estado_origem") + "|" + rs.getString("municipio_origem"); - - if (group.containsKey(key)) { - registro = group.get(key); - - registro.setValorTotal(MoneyHelper.somar(registro.getValorTotal(), valorTotal)); - registro.setValorBaseCalculoICMS(MoneyHelper.somar(registro.getValorBaseCalculoICMS(), valorBaseCalculoICMS)); - registro.setValorICMS(MoneyHelper.somar(registro.getValorICMS(), valorICMS)); - - } else { - registro = new ExportacaoECFTipoPRC(); - registro.setEcf(rs.getString("ecf")); - registro.setDataEmissao(rs.getString("datamov")); - registro.setUfOrigem(rs.getString("estado_origem")); - registro.setMunicipioOrigem(Integer.valueOf(rs.getString("municipio_origem"))); - registro.setValorTotal(valorTotal); - registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); - registro.setValorICMS(valorICMS); - registro.setTributacao(tributacao_importacao); - } - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - retorno.add(entry.getValue()); - } - - rs.close(); - ps.close(); - } - }); - - } catch (Exception e) { - log.error(e.getMessage(), e); - - } finally { - session.close(); - - } - - return retorno; - } - - @Override - public ExportacaoBPR buscarRegistroBPR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - ExportacaoBPR exportacaoRMD = new ExportacaoBPR(); - - boolean isDif = validaConstanteCustom(empresaId.toString(), "IMPORT_FISCAL_DIF"); - - StringBuilder sb = new StringBuilder(); - sb.append(" select distinct"); - sb.append(" eof.estado_id as codigoParticipantePar,"); - sb.append(" eif.codestabelecimento as codigoEstabelecimentoPar,"); - sb.append(" e.nombempresa as nomeParticipante,"); - sb.append(" eof.cveestado as ufParticipante,"); - sb.append(" ie.cnpj as cnpjParticipante,"); - sb.append(" ie.numinscricaoestadual as ieParticipante,"); - sb.append(" ie.logradouro as logradouro,"); - sb.append(" ie.numero as numero,"); - sb.append(" ie.complemento as complemento,"); - sb.append(" ie.bairro as bairro,"); - sb.append(" ie.cep as cep,"); - sb.append(" cast(f.fechorfolio as date) as dataEmissaoRMD,"); - sb.append(" (case when s.aliasorigen_id is null then eo.estado_id else cos.estado_id end) as codigoParticipante,"); - sb.append(" ei.codestabelecimento as codigoEstabelecimento,"); - sb.append(" coalesce(a.acfiscal, 'X') as numeroAIDF,"); - sb.append(" coalesce(a.serie, 'X') as serieAIDF,"); - sb.append(" a.subserie as subSerieAIDF,"); - sb.append(" f.folio as numeroFormularioBilheteAIDF,"); - sb.append(" (case when coalesce(f.indcancelacion, 0) = 1 then 'S' else 'N' end) as documentoCancelado,"); - sb.append(" (case when (case when s.aliasorigen_id is null then eo.estado_id else cos.estado_id end) = "); - sb.append(" (case when s.aliasorigen_id is null then cd.estado_id else cds.estado_id end) "); - sb.append(" then ei.codigocontabilmunicipal else ei.codigocontabilestadual end) as codigoContabil,"); - sb.append(" b.feccreacion as dataEmissao,"); - sb.append(" b.numfoliopreimpreso as numeroFormulario,"); - sb.append(" r.acfiscal as numeroAIDFRMD,"); - sb.append(" r.serie as serieAIDFRMD,"); - sb.append(" r.subserie as subSerieAIDFRMD,"); - sb.append(" b.foliormd as numeroRMD,"); - sb.append(" (case when ( coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = "); - sb.append(" coalesce(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2) ) then 1 else 0 end) as boletoIsento,"); - sb.append(" (case when b.motivocancelacion_id is not null then 1 else 0 end) as boletoCancelado,"); - sb.append(" b.preciopagado as valorPago,"); - sb.append(" (case when s.aliasorigen_id is null then ed.cveestado else eds.cveestado end) as ufDestino,"); - sb.append(" (case when s.aliasorigen_id is null then cd.codibge else cds.codibge end) as municipioDestino,"); - sb.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as ufOrigem,"); - sb.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); - sb.append(" cie.codibge as municipioOrigemPadrao,"); - sb.append(" (case when ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) ="); - sb.append(" (case when s.aliasorigen_id is null then ed.cveestado else eds.cveestado end)) then 5357 else 6357 end) as cfop,"); - sb.append(" ei.porcredbaseicms as reducaoBaseCalcICMS,"); - sb.append(" ei.porcredmunicipal as porcReducaoMunicipal,"); - sb.append(" ei.porcredestadual as porcReducaoEstadual,"); - sb.append(" ei.tributacaoimportacao as tributacaoImportacao,"); - sb.append(" b.rmd_id,"); - sb.append(" coalesce(b.aidf_id, -1),"); - sb.append(" b.caja_id"); - sb.append(" from folio_consumo_rmd f"); - sb.append(" join estado eof on eof.estado_id = f.estado_id"); - sb.append(" join aidf r on r.aidf_id = f.rmd_id"); - sb.append(" join empresa e on e.empresa_id = f.empresa_id"); - sb.append(" join ciudad c on c.ciudad_id = e.ciudad_id"); - sb.append(" left join empresa_imposto eif on eif.activo = 1 and eif.empresa_id = f.empresa_id and eif.estado_id = eof.estado_id"); - sb.append(" left join inscricao_estadual ie on ie.empresa_id = f.empresa_id and ie.estado_id = eof.estado_id and ie.activo = 1"); - sb.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id"); - sb.append(" left join caja b on b.activo = 1 and b.rmd_id = f.rmd_id and b.empresacorrida_id = f.empresa_id and b.foliormd = f.folio and to_char(b.fechorventa, 'ddmmyyyy') = to_char(f.fechorfolio, 'ddmmyyyy')"); - sb.append(" left join parada po on po.parada_id = b.origen_id and po.activo = 1 "); - sb.append(" left join ciudad co on co.ciudad_id = po.ciudad_id and co.activo = 1 "); - sb.append(" left join estado eo on eo.estado_id = co.estado_id and eo.activo = 1 "); - sb.append(" left join parada pd on pd.parada_id = b.destino_id"); - sb.append(" left join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" left join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" left join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = eof.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id"); - sb.append(" and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id and s.activo = 1 "); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" left join aidf a on a.aidf_id = b.aidf_id"); - sb.append(" where f.activo = 1 "); - sb.append(" and f.indinactivo = 0 "); - sb.append(" and f.indbpr = 1 "); - sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); - sb.append(" and f.empresa_id = ? "); - sb.append(" and eof.cveestado like ? "); - sb.append(" and (f.indcancelacion = 1 or ( "); - - if (isDif) { - sb.append(" ((b.tipoventa_id not in (5,12,18,81,82,49,41) and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); - sb.append(" or (b.tipoventa_id in (5,12,18,81,82,49,41) "); - sb.append(" and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); - sb.append(" and a.aidf_id is not null and b.indcancelacion = 0 "); - sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) )) "); - } else { - sb.append(" ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); - sb.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); - sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) )) "); - } - - sb.append(" order by dataEmissaoRMD "); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setLong(3, Long.valueOf(empresaId)); - ps.setString(4, cveestado); - - ResultSet rs = ps.executeQuery(); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - - ExportacaoBPRBase registro = null; - - while (rs.next()) { - String ufDestino = rs.getString("ufDestino"); - String ufOrigem = rs.getString("ufOrigem"); - Integer municipioOrigem = rs.getInt("municipioOrigem"); - Integer municipioDestino = rs.getInt("municipioDestino"); - Integer municipioOrigemPadrao = rs.getInt("municipioOrigemPadrao"); - Integer cfop = rs.getInt("cfop"); - - if (ufOrigem != null && ufDestino != null) { - if (!ufOrigem.equals(cveestado)) { - if (ufDestino.equals(cveestado)) { - ufOrigem = cveestado; - municipioOrigem = municipioDestino; - } else { - ufOrigem = cveestado; - municipioOrigem = municipioOrigemPadrao; - } - - cfop = (ufOrigem.equals(ufDestino) ? 5357 : 6357); - } - } - - registro = new ExportacaoBPRBase(); - - // PAR - registro.setCodigoParticipantePar(rs.getInt("codigoParticipantePar")); - registro.setCodigoEstabelecimentoPar(rs.getInt("codigoEstabelecimentoPar")); - registro.setNomeParticipante(rs.getString("nomeParticipante")); - registro.setUfParticipante(rs.getString("ufParticipante")); - registro.setCpfParticipante(rs.getString("cnpjParticipante")); - registro.setIeParticipante(rs.getString("ieParticipante")); - registro.setLogradouro(rs.getString("logradouro")); - registro.setNumero(rs.getString("numero")); - registro.setComplemento(rs.getString("complemento")); - registro.setBairro(rs.getString("bairro")); - registro.setCep(rs.getString("cep") == null ? null : Integer.parseInt(rs.getString("cep").replace("-", "").replace(".", ""))); - - // RMD - registro.setDataEmissaoRMD(sdf.format(rs.getDate("dataEmissaoRMD"))); - registro.setCodigoParticipante(rs.getInt("codigoParticipante")); - registro.setCodigoEstabelecimento(rs.getInt("codigoEstabelecimento")); - registro.setNumeroAIDF(rs.getString("numeroAIDF")); - registro.setSerieAIDF(rs.getString("serieAIDF")); - registro.setSubSerieAIDF(rs.getString("subSerieAIDF")); - registro.setNumeroFormularioBilheteAIDF(rs.getLong("numeroFormularioBilheteAIDF")); - registro.setDocumentoCancelado(rs.getString("documentoCancelado").equals("S") ? Boolean.TRUE : Boolean.FALSE); - registro.setCodigoContabil(rs.getString("codigoContabil")); - - // BPS - registro.setDataEmissao(rs.getDate("dataEmissao") == null ? null : sdf.format(rs.getDate("dataEmissao"))); - registro.setNumeroFormulario(rs.getLong("numeroFormulario")); - registro.setNumeroAIDFRMD(rs.getString("numeroAIDFRMD")); - registro.setSerieAIDFRMD(rs.getString("serieAIDFRMD")); - registro.setSubSerieAIDFRMD(rs.getString("subSerieAIDFRMD")); - registro.setNumeroRMD(rs.getInt("numeroRMD")); - registro.setBoletoIsento(rs.getInt("boletoIsento")); - registro.setBoletoCancelado(rs.getInt("boletoCancelado")); - registro.setValorPago(rs.getBigDecimal("valorPago")); - - // DBP - registro.setUfDestino(ufDestino); - registro.setUfOrigem(ufOrigem); - registro.setMunicipioOrigem(municipioOrigem); - registro.setCfop(cfop); - registro.setReducaoBaseCalcICMS(rs.getBigDecimal("reducaoBaseCalcICMS")); - registro.setPorcReducaoMunicipal(rs.getBigDecimal("porcReducaoMunicipal")); - registro.setPorcReducaoEstadual(rs.getBigDecimal("porcReducaoEstadual")); - registro.setTributacaoImportacao(rs.getBigDecimal("tributacaoImportacao")); - - exportacaoRMD.getListaRegistroBPR().add(registro); - } - - rs.close(); - ps.close(); - - exportacaoRMD.gerarListas(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return exportacaoRMD; - } - - @Override - public List buscarRegistroRMDTipoPAR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select"); - sb.append(" c.estado_id as cod_participante,"); - sb.append(" ei.codestabelecimento as cod_estabelecimento,"); - sb.append(" e.nombempresa as nombempresa,"); - sb.append(" ess.cveestado as cveestado,"); - sb.append(" ie.cnpj as cnpj,"); - sb.append(" ie.numinscricaoestadual as numinscricaoestadual,"); - sb.append(" ie.logradouro as logradouro,"); - sb.append(" ie.numero as numero,"); - sb.append(" ie.complemento as complemento,"); - sb.append(" ie.bairro as bairro,"); - sb.append(" ie.cep as cep"); - sb.append(" from empresa e"); - sb.append(" join ciudad c on c.ciudad_id = e.ciudad_id"); - sb.append(" join estado es on es.estado_id = c.estado_id"); - sb.append(" left join estado ess on ess.cveestado = ?"); - sb.append(" left join inscricao_estadual ie on ie.empresa_id = e.empresa_id and ie.estado_id = ess.estado_id and ie.activo = 1"); - sb.append(" left join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = e.empresa_id and ei.estado_id = ess.estado_id"); - sb.append(" where e.empresa_id = ?"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setString(1, cveestado); - ps.setLong(2, Long.valueOf(empresaId)); - - ResultSet rs = ps.executeQuery(); - - ExportacaoRMDTipoPAR registro = null; - - while (rs.next()) { - registro = new ExportacaoRMDTipoPAR(); - registro.setCodigoParticipante(rs.getInt("cod_participante")); - registro.setCodigoEstabelecimento(rs.getInt("cod_estabelecimento")); - registro.setNomeParticipante(rs.getString("nombempresa")); - registro.setUfParticipante(rs.getString("cveestado")); - registro.setCpfParticipante(rs.getString("cnpj")); - registro.setIeParticipante(rs.getString("numinscricaoestadual")); - registro.setLogradouro(rs.getString("logradouro")); - registro.setNumero(rs.getString("numero")); - registro.setComplemento(rs.getString("complemento")); - registro.setBairro(rs.getString("bairro")); - registro.setCep(rs.getString("cep") == null ? null : Integer.parseInt(rs.getString("cep").replace("-", "").replace(".", ""))); - - retorno.add(registro); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Override - public List buscarRegistroRMDTipoRMD(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - - StringBuilder sb = new StringBuilder(); - sb.append(" select"); - sb.append(" ei.codestabelecimento as cod_estabelecimento,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END) as cod_participante,"); - sb.append(" a.acfiscal as num_aidf,"); - sb.append(" a.serie as serie,"); - sb.append(" a.subserie as subserie,"); - sb.append(" b.foliormd as num_bilhete,"); - sb.append(" b.foliormd as num_formulario,"); - sb.append(" trunc(b.feccreacion) as data_emissao,"); - sb.append(" 'N' as doc_cancelado,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN (CASE WHEN co.estado_id = cd.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) ELSE (CASE WHEN cos.estado_id = cds.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) END) as cod_contabil"); - sb.append(" from boleto b"); - sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); - sb.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id and s.activo = 1 "); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" join parada pd on pd.parada_id = b.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = po.ciudad_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" join aidf a on a.aidf_id = b.rmd_id"); - sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN co.estado_id ELSE cos.estado_id END)"); - sb.append(" where"); - sb.append(" b.activo = 1"); - sb.append(" and b.tipoventa_id = 3"); - sb.append(" and (b.indstatusboleto like 'V')"); - sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.feccreacion >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.feccreacion <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); - sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); - sb.append(" group by"); - sb.append(" ei.codestabelecimento,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END),"); - sb.append(" a.acfiscal,"); - sb.append(" a.serie,"); - sb.append(" a.subserie,"); - sb.append(" b.foliormd,"); - sb.append(" trunc(b.feccreacion),"); - sb.append(" 'N',"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN (CASE WHEN co.estado_id = cd.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) ELSE (CASE WHEN cos.estado_id = cds.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) END)"); - sb.append(" UNION"); - sb.append(" select distinct"); - sb.append(" ei.codestabelecimento as cod_estabelecimento,"); - sb.append(" eo.estado_id as cod_participante,"); - sb.append(" a.acfiscal as num_aidf,"); - sb.append(" a.serie as serie,"); - sb.append(" a.subserie as subserie,"); - sb.append(" f.folio as num_bilhete,"); - sb.append(" f.folio as num_formulario,"); - sb.append(" trunc(f.fechorfolio) as data_emissao,"); - sb.append(" 'S' as doc_cancelado,"); - sb.append(" null as cod_contabil"); - sb.append(" from folio_consumo_rmd f"); - sb.append(" join estado eo on eo.estado_id = f.estado_id"); - sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = f.empresa_id and ei.estado_id = eo.estado_id"); - sb.append(" join aidf a on a.aidf_id = f.rmd_id"); - sb.append(" where"); - sb.append(" f.empresa_id = ?"); - sb.append(" and (f.fechorfolio >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and f.fechorfolio <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); - sb.append(" and eo.cveestado like ?"); - sb.append(" and f.indcancelacion = 1 and f.indbpr = 1 and f.activo = 1"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setLong(1, Long.valueOf(empresaId)); - ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setString(4, cveestado); - ps.setLong(5, Long.valueOf(empresaId)); - ps.setString(6, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(7, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setString(8, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoRMDTipoRMD registro = null; - - while (rs.next()) { - registro = new ExportacaoRMDTipoRMD(); - registro.setCodigoEstabelecimento(rs.getInt("cod_estabelecimento")); - registro.setNumeroAIDF(rs.getString("num_aidf")); - registro.setSerieAIDF(rs.getString("serie")); - registro.setSubSerieAIDF(rs.getString("subserie")); - registro.setNumeroBilheteAIDF(rs.getLong("num_bilhete")); - registro.setNumeroFormularioAIDF(rs.getLong("num_formulario")); - registro.setDataEmissao(sdf.format(rs.getDate("data_emissao"))); - registro.setCancelado(rs.getString("doc_cancelado").equals("S") ? Boolean.TRUE : Boolean.FALSE); - registro.setCodigoParticipante(rs.getInt("cod_participante")); - registro.setCodigoContabil(rs.getString("cod_contabil")); - - retorno.add(registro); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Override - @Deprecated - public List buscarRegistroRMDTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - - StringBuilder sb = new StringBuilder(); - sb.append(" select"); - sb.append(" ei.codestabelecimento as cod_estabelecimento,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END) as cod_participante,"); - sb.append(" (CASE WHEN b.indstatusboleto like 'C' THEN 1 ELSE 0 END) as cancelado,"); - sb.append(" a.acfiscal as num_aidf,"); - sb.append(" a.serie as serie,"); - sb.append(" a.subserie as subserie,"); - sb.append(" b.feccreacion as data_emissao,"); - sb.append(" b.numfoliopreimpreso as num_formulario,"); - sb.append(" b.preciopagado as valor_total,"); - sb.append(" r.acfiscal as num_aidf_rmd,"); - sb.append(" r.serie as serie_rmd,"); - sb.append(" r.subserie as subserie_rmd,"); - sb.append(" b.foliormd as num_rmd"); - sb.append(" from boleto b"); - sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); - sb.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - // sb.append(" join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); - sb.append(" join aidf a on a.aidf_id = b.aidf_id"); - sb.append(" join aidf r on r.aidf_id = b.rmd_id"); - sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); - sb.append(" where"); - sb.append(" b.activo = 1"); - sb.append(" and b.tipoventa_id = 3"); - sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); - sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); - sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); - sb.append(" order by b.feccreacion,a.acfiscal,b.numfoliopreimpreso"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setLong(1, Long.valueOf(empresaId)); - ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setString(4, cveestado); - - ResultSet rs = ps.executeQuery(); - - Map group = new HashMap(); - - ExportacaoRMDTipoBPS registro = null; - - Long numeroInicial = null; - Long numeroFinal = null; - - while (rs.next()) { - String key = sdf.format(rs.getDate("data_emissao")) + "|" + rs.getLong("num_aidf") + "|" + rs.getLong("num_formulario"); - - if (group.containsKey(key)) { - registro = group.get(key); - - numeroInicial = rs.getLong("num_formulario"); - numeroFinal = rs.getLong("num_formulario"); - - if (numeroInicial.intValue() > registro.getNumeroInicial().intValue()) { - numeroInicial = registro.getNumeroInicial(); - } - - if (numeroFinal.intValue() < registro.getNumeroFinal().intValue()) { - numeroFinal = registro.getNumeroFinal(); - } - - } else { - registro = new ExportacaoRMDTipoBPS(); - registro.setCodigoEstabelecimento(rs.getInt("cod_estabelecimento")); - registro.setEspecie("BPR"); - registro.setNumeroAIDF(rs.getLong("num_aidf")); - registro.setSerieAIDF(rs.getString("serie")); - registro.setSubSerieAIDF(rs.getString("subserie")); - registro.setNumeroAIDFRMD(rs.getLong("num_aidf_rmd")); - registro.setSerieAIDFRMD(rs.getString("serie_rmd")); - registro.setSubSerieAIDFRMD(rs.getString("subserie_rmd")); - registro.setNumeroRMD(rs.getInt("num_rmd")); - - registro.setDataEmissao(sdf.format(rs.getDate("data_emissao"))); - - registro.setQuantidadeTotal(0); - registro.setQuantidadeCancelados(0); - registro.setValorTotal(BigDecimal.ZERO); - registro.setResumoMovimentoDiario(null); - - numeroInicial = rs.getLong("num_formulario"); - numeroFinal = rs.getLong("num_formulario"); - } - - registro.setNumeroInicial(numeroInicial); - registro.setNumeroFinal(numeroFinal); - - registro.setQuantidadeTotal(registro.getQuantidadeTotal() + 1); - registro.setQuantidadeCancelados(registro.getQuantidadeCancelados() + rs.getInt("cancelado")); - - if (rs.getInt("cancelado") == 0) { - registro.setValorTotal(registro.getValorTotal().add(rs.getBigDecimal("valor_total"))); - } - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - registro = entry.getValue(); - - if (registro.getQuantidadeTotal().intValue() == registro.getQuantidadeCancelados().intValue()) { - registro.setValorTotal(null); - } else { - registro.setResumoMovimentoDiario(Boolean.TRUE); - } - - retorno.add(registro); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Override - @Deprecated - public List buscarRegistroRMDTipoDBP(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List retorno = new ArrayList(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)) THEN 5357 ELSE 6357 END) as cod_operacao,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasorigen_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); - sb.append(" (nvl(b.preciopagado,0) - nvl(b.importetaxaembarque,0) - nvl(b.importepedagio,0) - nvl(b.importeseguro,0) - nvl(b.importeoutros,0)) as valor_tarifa,"); - sb.append(" b.preciopagado as valor_total,"); - sb.append(" (CASE WHEN nvl(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = nvl(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2) THEN 1 ELSE 0 END) as reg_metropolitana"); - sb.append(" from boleto b"); - sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = b.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" left join empresa_imposto eis on eis.activo = 1 and eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" where"); - sb.append(" b.activo = 1"); - sb.append(" and b.tipoventa_id = 3"); - sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); - sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); - sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setLong(1, Long.valueOf(empresaId)); - ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setString(4, cveestado); - - ResultSet rs = ps.executeQuery(); - - ExportacaoRMDTipoDBP registro = null; - - Map group = new HashMap(); - - while (rs.next()) { - String key = rs.getString("estado_destino") + "|" + rs.getInt("cod_operacao") + "|" + rs.getString("estado_origem") + "|" + rs.getInt("municipio_origem"); - - if (group.containsKey(key)) { - registro = group.get(key); - } else { - registro = new ExportacaoRMDTipoDBP(); - registro.setUfDestino(rs.getString("estado_destino")); - registro.setCfop(rs.getInt("cod_operacao")); // IM=5357; serviço IE= 6357 - registro.setUfOrigem(rs.getString("estado_origem")); - registro.setMunicipioOrigem(rs.getInt("municipio_origem")); - - registro.setCodigoSituacaoTribColunaB(null); - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (rs.getInt("isenta") == 1) { - registro.setCodigoSituacaoTribColunaB(40); - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (registro.getCodigoSituacaoTribColunaB() == null) { - registro.setCodigoSituacaoTribColunaB(rs.getInt("red_base_calc_icms") == 0 ? 0 : 20); - } - - registro.setValorBaseCalculoICMS(BigDecimal.ZERO); - registro.setValorTotal(BigDecimal.ZERO); - registro.setValorICMS(BigDecimal.ZERO); - registro.setValorICMSIsento(BigDecimal.ZERO); - registro.setValorICMSOutros(BigDecimal.ZERO); - } - - BigDecimal valorTotal = rs.getBigDecimal("valor_total"); - BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms"); - BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal"); - BigDecimal porc_red_estadual = rs.getBigDecimal("porc_red_estadual"); - BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - BigDecimal valorIsenta = BigDecimal.ZERO; - BigDecimal valorIsentaOutros = BigDecimal.ZERO; - - if (rs.getInt("reg_metropolitana") == 1) { - valorIsenta = valorTotal; - valorTotal = BigDecimal.ZERO; - } else { - if (red_base_calc_icms != null) { - valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); - } else { - // if (tributacao_importacao != null) { - // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - // if (porc_red_municipal != null) { - // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_municipal.divide(BigDecimal.valueOf(100d)))); - // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); - // } - // } else { - // if (porc_red_estadual != null) { - // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_estadual.divide(BigDecimal.valueOf(100d)))); - // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); - // } - // } - // } - - valorBaseCalculoICMS = valorTotal; - } - } - - registro.setAliquotaICMS(tributacao_importacao); - - if (tributacao_importacao == null) { - tributacao_importacao = BigDecimal.ZERO; - } else { - if (red_base_calc_icms != null) { - BigDecimal porc_red = BigDecimal.ZERO; - - if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - if (porc_red_municipal != null) { - porc_red = porc_red_municipal; - } - } else { - if (porc_red_estadual != null) { - porc_red = porc_red_estadual; - } - } - - BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); - valorIsentaOutros = valorTotal.multiply(porc); - } - - tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - } - - BigDecimal valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); - - registro.setValorBaseCalculoICMS(registro.getValorBaseCalculoICMS().add(valorBaseCalculoICMS)); - registro.setValorTotal(registro.getValorTotal().add(valorTotal)); - registro.setValorICMS(registro.getValorICMS().add(valorICMS)); - registro.setValorICMSIsento(registro.getValorICMSIsento().add(valorIsenta)); - registro.setValorICMSOutros(registro.getValorICMSOutros().add(valorIsentaOutros)); - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - retorno.add(entry.getValue()); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return retorno; - } - - @Override - @Deprecated - public List buscarRegistroRMDSeqTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { - List listaBPS = new ArrayList(); - - StringBuilder sb = new StringBuilder(); - sb.append(" select"); - sb.append(" ei.codestabelecimento as cod_estabelecimento,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END) as cod_participante,"); - sb.append(" (CASE WHEN b.indstatusboleto like 'C' THEN 1 ELSE 0 END) as cancelado,"); - sb.append(" b.aidf_id,"); - sb.append(" a.acfiscal as num_aidf,"); - sb.append(" a.serie as serie,"); - sb.append(" a.subserie as subserie,"); - sb.append(" b.feccreacion as data_emissao,"); - sb.append(" b.numfoliopreimpreso as num_formulario,"); - sb.append(" b.preciopagado as valor_total,"); - sb.append(" b.rmd_id,"); - sb.append(" r.acfiscal as num_aidf_rmd,"); - sb.append(" r.serie as serie_rmd,"); - sb.append(" r.subserie as subserie_rmd,"); - sb.append(" b.foliormd as num_rmd,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); - sb.append(" (CASE WHEN ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)) THEN 5357 ELSE 6357 END) as cod_operacao,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); - sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); - sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasorigen_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); - sb.append(" (nvl(b.preciopagado,0) - nvl(b.importetaxaembarque,0) - nvl(b.importepedagio,0) - nvl(b.importeseguro,0) - nvl(b.importeoutros,0)) as valor_tarifa,"); - sb.append(" b.preciopagado as valor_total,"); - sb.append(" (CASE WHEN nvl(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = nvl(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2) THEN 1 ELSE 0 END) as reg_metropolitana"); - sb.append(" from boleto b"); - sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); - sb.append(" join parada po on po.parada_id = b.origen_id"); - sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); - sb.append(" join estado eo on eo.estado_id = co.estado_id"); - sb.append(" join parada pd on pd.parada_id = b.destino_id"); - sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); - sb.append(" join estado ed on ed.estado_id = cd.estado_id"); - sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); - sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); - sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); - sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); - sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); - sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); - sb.append(" left join empresa_imposto eis on eis.activo = 1 and eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); - sb.append(" join aidf a on a.aidf_id = b.aidf_id"); - sb.append(" join aidf r on r.aidf_id = b.rmd_id"); - sb.append(" where"); - sb.append(" b.activo = 1"); - sb.append(" and b.tipoventa_id = 3"); - sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); - sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); - sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); - sb.append(" order by b.fechorventa, b.numfoliopreimpreso, (CASE WHEN ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)) THEN 5357 ELSE 6357 END), (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)"); - - try { - PreparedStatement ps = connection.prepareStatement(sb.toString()); - ps.setLong(1, Long.valueOf(empresaId)); - ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - ps.setString(4, cveestado); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - - ResultSet rs = ps.executeQuery(); - - ExportacaoRMDTipoSeqBPS registroBPS = null; - ExportacaoRMDTipoSeqDBP registroDBP = null; - - Long numeroInicial = 0l; - Long numeroFinal = 0l; - - String dataEmissaoControle = ""; - Integer cfopControle = 0; - - Integer quantidadeTotal = 0; - Integer quantidadeCancelado = 0; - - BigDecimal totalizador = BigDecimal.ZERO; - - while (rs.next()) { - Integer codigoEstabelecimento = rs.getInt("cod_estabelecimento"); - String numeroAIDF = rs.getString("num_aidf"); - String serieAIDF = rs.getString("serie"); - String subSerieAIDF = rs.getString("subserie"); - String numeroAIDFRMD = rs.getString("num_aidf_rmd"); - String serieAIDFRMD = rs.getString("serie_rmd"); - String subSerieAIDFRMD = rs.getString("subserie_rmd"); - Integer numeroRMD = rs.getInt("num_rmd"); - String dataEmissao = sdf.format(rs.getDate("data_emissao")); - Long numeroFormulario = rs.getLong("num_formulario"); - String ufDestino = rs.getString("estado_destino"); - Integer cfop = rs.getInt("cod_operacao"); // IM=5357; serviço IE= 6357 - String ufOrigem = rs.getString("estado_origem"); - Integer municipioOrigem = rs.getInt("municipio_origem"); - Boolean isenta = (rs.getInt("isenta") == 1); - Boolean cancelado = (rs.getInt("cancelado") == 1); - BigDecimal valorTotal = rs.getBigDecimal("valor_total"); - BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms"); - BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal"); - BigDecimal porc_red_estadual = rs.getBigDecimal("porc_red_estadual"); - BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); - - // BPR - if ((numeroFinal + 1) != numeroFormulario || !dataEmissaoControle.equals(dataEmissao) || !cfopControle.equals(cfop)) { - numeroInicial = numeroFormulario; - dataEmissaoControle = dataEmissao; - cfopControle = cfop; - - registroBPS = new ExportacaoRMDTipoSeqBPS(); - registroBPS.setEspecie("BPR"); - registroBPS.setNumeroInicial(numeroInicial); - registroBPS.setCodigoEstabelecimento(codigoEstabelecimento); - registroBPS.setNumeroAIDF(numeroAIDF); - registroBPS.setSerieAIDF(serieAIDF); - registroBPS.setSubSerieAIDF(subSerieAIDF); - registroBPS.setNumeroAIDFRMD(numeroAIDFRMD); - registroBPS.setSerieAIDFRMD(serieAIDFRMD); - registroBPS.setSubSerieAIDFRMD(subSerieAIDFRMD); - registroBPS.setNumeroRMD(numeroRMD); - registroBPS.setDataEmissao(dataEmissao); - registroBPS.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); - - listaBPS.add(registroBPS); - - quantidadeTotal = 0; - quantidadeCancelado = 0; - - totalizador = BigDecimal.ZERO; - } - - quantidadeTotal++; - - if (cancelado) { - quantidadeCancelado++; - } else { - totalizador = MoneyHelper.somar(totalizador, valorTotal); - } - - numeroFinal = numeroFormulario; - - registroBPS.setNumeroFinal(numeroFinal); - - registroBPS.setQuantidadeTotal(quantidadeTotal); - registroBPS.setQuantidadeCancelados(quantidadeCancelado); - registroBPS.setValorTotal(totalizador); - - // DBP - registroDBP = new ExportacaoRMDTipoSeqDBP(ufDestino); - - Integer indice = registroBPS.getListaDBP().indexOf(registroDBP); - - if (indice == -1) { - registroBPS.getListaDBP().add(registroDBP); - - registroDBP.setCfop(cfop); // IM=5357; serviço IE= 6357 - registroDBP.setUfOrigem(ufOrigem); - registroDBP.setMunicipioOrigem(municipioOrigem); - - registroDBP.setCodigoSituacaoTribColunaB(null); - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (isenta) { - registroDBP.setCodigoSituacaoTribColunaB(40); - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (registroDBP.getCodigoSituacaoTribColunaB() == null) { - registroDBP.setCodigoSituacaoTribColunaB(red_base_calc_icms == null || red_base_calc_icms.compareTo(BigDecimal.ZERO) == 0 ? 0 : 20); - } - - registroDBP.setValorBaseCalculoICMS(BigDecimal.ZERO); - registroDBP.setValorTotal(BigDecimal.ZERO); - registroDBP.setValorICMS(BigDecimal.ZERO); - registroDBP.setValorICMSIsento(BigDecimal.ZERO); - registroDBP.setValorICMSOutros(BigDecimal.ZERO); - } else { - registroDBP = registroBPS.getListaDBP().get(indice); - } - - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - BigDecimal valorIsenta = BigDecimal.ZERO; - BigDecimal valorIsentaOutros = BigDecimal.ZERO; - - if (rs.getInt("reg_metropolitana") == 1) { - valorIsenta = valorTotal; - valorTotal = BigDecimal.ZERO; - } else { - if (red_base_calc_icms != null) { - valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); - } else { - valorBaseCalculoICMS = valorTotal; - } - } - - registroDBP.setAliquotaICMS(tributacao_importacao); - - if (tributacao_importacao == null) { - tributacao_importacao = BigDecimal.ZERO; - } else { - if (red_base_calc_icms != null) { - BigDecimal porc_red = BigDecimal.ZERO; - - if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { - if (porc_red_municipal != null) { - porc_red = porc_red_municipal; - } - } else { - if (porc_red_estadual != null) { - porc_red = porc_red_estadual; - } - } - - BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); - valorIsentaOutros = valorTotal.multiply(porc); - } - - tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - } - - BigDecimal valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); - - registroDBP.setValorBaseCalculoICMS(registroDBP.getValorBaseCalculoICMS().add(valorBaseCalculoICMS)); - registroDBP.setValorTotal(registroDBP.getValorTotal().add(valorTotal)); - registroDBP.setValorICMS(registroDBP.getValorICMS().add(valorICMS)); - registroDBP.setValorICMSIsento(registroDBP.getValorICMSIsento().add(valorIsenta)); - registroDBP.setValorICMSOutros(registroDBP.getValorICMSOutros().add(valorIsentaOutros)); - } - - rs.close(); - ps.close(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return listaBPS; - } - - @Override - public void cancelarRMDBoleto(Connection connection, Date inicio, Date fim, Integer empresaId, Estado estado, Aidf aidf, - String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR) { - - List boletos = new ArrayList(); - String boletoAgr = null; - int cont = 0; - - List foliosRmd = new ArrayList(); - - if (isCancela) { - cancelaFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); - } else { - inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); - } - - for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(), - folioInicial, folioFinal, isBPR, isECF, true)) { - - if (!foliosRmd.contains(brp.getFoliormd())) - foliosRmd.add(brp.getFoliormd()); - - if (cont == 999) { - boletos.add(boletoAgr); - boletoAgr = null; - cont = 0; - } - - if (boletoAgr == null) - boletoAgr = brp.getCajaId().toString(); - else - boletoAgr = boletoAgr + " ," + brp.getCajaId(); - - cont++; - } - boletos.add(boletoAgr); - - if (isInativa) { - for (String folio : foliosRmd) { - insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio, - isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null); - } - } - - marcarRMDCaja(connection, boletos, null, null); - } - - private void cancelaFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId, - Long rmdId, String folioInicial, String folioFinal, Date inicio, Date fim) { - - PreparedStatement pstmt = null; - try { - StringBuilder sb = new StringBuilder(); - sb.append(" update folio_consumo_rmd "); - sb.append(" set activo = 1, fecmodif = sysdate, indcancelacion = 1 "); - sb.append(" where activo = 1 "); - sb.append(" and indimpresso = 1 "); - sb.append(" and rmd_id = ? "); - sb.append(" and empresa_id = ? "); - sb.append(" and estado_id = ? "); - sb.append(" and folio between ? and ? "); - sb.append(" and fechorfolio between to_date(?,'dd/MM/yyyy HH24:MI:SS') and to_date(?,'dd/MM/yyyy HH24:MI:SS') "); - - pstmt = connection.prepareStatement(sb.toString()); - pstmt.setInt(1, rmdId.intValue()); - pstmt.setInt(2, empresaId); - pstmt.setInt(3, estadoId); - pstmt.setString(4, folioInicial); - pstmt.setString(5, folioFinal); - pstmt.setString(6, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - pstmt.setString(7, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - - pstmt.executeUpdate(); - - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (pstmt != null && !pstmt.isClosed()) { - pstmt.close(); - } - } catch (Exception e) { - log.error("", e); - } - } - } - - private void inativarFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId, - Long rmdId, String folioInicial, String folioFinal, Date inicio, Date fim) { - - PreparedStatement pstmt = null; - try { - StringBuilder sb = new StringBuilder(); - sb.append(" update folio_consumo_rmd "); - sb.append(" set activo = 0, fecmodif = sysdate "); - sb.append(" where activo = 1 "); - sb.append(" and indimpresso = 1 "); - sb.append(" and rmd_id = ? "); - sb.append(" and empresa_id = ? "); - sb.append(" and estado_id = ? "); - sb.append(" and folio between ? and ? "); - sb.append(" and fechorfolio between to_date(?,'dd/MM/yyyy HH24:MI:SS') and to_date(?,'dd/MM/yyyy HH24:MI:SS') "); - - pstmt = connection.prepareStatement(sb.toString()); - pstmt.setInt(1, rmdId.intValue()); - pstmt.setInt(2, empresaId); - pstmt.setInt(3, estadoId); - pstmt.setString(4, folioInicial); - pstmt.setString(5, folioFinal); - pstmt.setString(6, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); - pstmt.setString(7, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); - - pstmt.executeUpdate(); - - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (pstmt != null && !pstmt.isClosed()) { - pstmt.close(); - } - } catch (Exception e) { - log.error("", e); - } - } - } - - private void insereConsulmoFolioRMD(Connection connection, Date dataBilhete, Integer empresaId, Integer estadoId, Aidf aidf, - String folio, boolean isCancela, boolean isInativa, boolean isImpresso, boolean isECF, boolean isBPR, - BigDecimal valorContabil, BigDecimal baseCalculo, BigDecimal aliquota, BigDecimal isentos, - BigDecimal outros, BigDecimal icms) { - - PreparedStatement pstmt = null; - try { - StringBuilder sb = new StringBuilder(); - sb.append(" insert into FOLIO_CONSUMO_RMD (FOLIOCONSUMORMD_ID, RMD_ID, FOLIO, "); - sb.append(" EMPRESA_ID, ESTADO_ID, INDCANCELACION, INDINACTIVO, INDIMPRESSO, FECHORFOLIO, "); - sb.append(" VALORCONTABIL, BASECALCULO, ALIQUOTA, ISENTOS, OUTROS, ICMS, "); - sb.append(" INDECF, INDBPR, ACTIVO, FECMODIF, USUARIO_ID) "); - sb.append(" values (").append("FOLIO_CONSUMO_RMD_SEQ.NEXTVAL").append(","); - sb.append(aidf.getAidfId()).append(",").append(folio).append(","); - sb.append(empresaId).append(",").append(estadoId).append(","); - - if (isCancela) - sb.append(1).append(",").append(0).append(",").append(0).append(","); - else if (isInativa) - sb.append(0).append(",").append(1).append(",").append(0).append(","); - else if (isImpresso) - sb.append(0).append(",").append(0).append(",").append(1).append(","); - - sb.append("?").append(","); - sb.append("?").append(","); - sb.append("?").append(","); - sb.append("?").append(","); - sb.append("?").append(","); - sb.append("?").append(","); - sb.append("?").append(","); - - if (isECF) - sb.append(1).append(",").append(0).append(","); - else - sb.append(0).append(",").append(1).append(","); - - sb.append(1).append(",").append("SYSDATE").append(",").append(UsuarioLogado.getUsuarioLogado().getUsuarioId()).append(")"); - - pstmt = connection.prepareStatement(sb.toString()); - pstmt.setTimestamp(1, new java.sql.Timestamp(DateUtil.inicioFecha(dataBilhete).getTime())); - pstmt.setBigDecimal(2, MoneyHelper.arredondar(valorContabil)); - pstmt.setBigDecimal(3, MoneyHelper.arredondar(baseCalculo)); - pstmt.setBigDecimal(4, MoneyHelper.arredondar(aliquota)); - pstmt.setBigDecimal(5, MoneyHelper.arredondar(isentos)); - pstmt.setBigDecimal(6, MoneyHelper.arredondar(outros)); - pstmt.setBigDecimal(7, MoneyHelper.arredondar(icms)); - pstmt.executeUpdate(); - - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (pstmt != null && !pstmt.isClosed()) { - pstmt.close(); - } - } catch (Exception e) { - log.error("", e); - } - } - } - - @Override - public void gravarRMDBoleto(Connection connection, List rmds, Aidf aidf, String folio, Integer empresaId, Integer estadoId, boolean isECF, boolean isBPR) { - - int cont = 0; - Integer rmdIterate = Integer.parseInt(folio); - rmdIterate = rmdIterate - 1; - - String boletoAgr = null; - List boletos = new ArrayList(); - int contBolto = 0; - Date dataBilhete = null; - - BigDecimal valorContabil = BigDecimal.ZERO; - BigDecimal baseCalculo = BigDecimal.ZERO; - BigDecimal aliquota = BigDecimal.ZERO; - BigDecimal isentos = BigDecimal.ZERO; - BigDecimal outros = BigDecimal.ZERO; - BigDecimal icms = BigDecimal.ZERO; - - for (ImpressaoRMD imp : rmds) { - - if (dataBilhete == null) - dataBilhete = imp.getData(); - - // Numero maximo de itens na folha do RMD - if (cont == 23 || (!dataBilhete.equals(imp.getData()))) { - - // add primeiro ou ultimo na lista de insercao dos boletos - boletos.add(boletoAgr); - - // incrementa na contagem dos folios na impressao do RMD - rmdIterate++; - cont = 0; - - insereConsulmoFolioRMD(connection, dataBilhete, empresaId, estadoId, aidf, rmdIterate.toString(), false, false, true, isECF, isBPR, - valorContabil, baseCalculo, aliquota, isentos, outros, icms); - - marcarRMDCaja(connection, boletos, aidf.getAidfId(), rmdIterate); - - // limpa a lista de inseções do boleto - boletos = new ArrayList(); - boletoAgr = null; - contBolto = 0; - dataBilhete = imp.getData(); - - valorContabil = BigDecimal.ZERO; - baseCalculo = BigDecimal.ZERO; - aliquota = BigDecimal.ZERO; - isentos = BigDecimal.ZERO; - outros = BigDecimal.ZERO; - icms = BigDecimal.ZERO; - } - - for (DetalhadoRMD det : imp.getDetalhada()) { - - if (contBolto == 999) { - boletos.add(boletoAgr); - boletoAgr = null; - contBolto = 0; - } - - if (boletoAgr == null) - boletoAgr = det.getCajaId().toString(); - else - boletoAgr = boletoAgr + " ," + det.getCajaId(); - - contBolto++; - } - cont++; - - valorContabil = valorContabil.add(imp.getValorContabil()); - baseCalculo = baseCalculo.add(imp.getBaseCalculo()); - aliquota = imp.getAliquota(); - isentos = isentos.add(imp.getIsentos()); - outros = outros.add(imp.getOutros()); - icms = icms.add(imp.getIcms()); - } - - if (boletos.isEmpty()) { - rmdIterate++; - boletos.add(boletoAgr); - insereConsulmoFolioRMD(connection, dataBilhete, empresaId, estadoId, aidf, rmdIterate.toString(), false, false, true, isECF, isBPR, - valorContabil, baseCalculo, aliquota, isentos, outros, icms); - marcarRMDCaja(connection, boletos, aidf.getAidfId(), rmdIterate); - } - } - - private void marcarRMDCaja(Connection connection, List boletos, Long rmdId, Integer folio) { - - for (String bs : boletos) { - StringBuilder sb = new StringBuilder(); - PreparedStatement pstmt = null; - try { - sb.append(" update caja set rmd_id = ").append(rmdId).append(", "); - sb.append(" foliormd = ").append(folio).append(" "); - sb.append(" where caja_id in ( ").append(bs).append(" ) "); - pstmt = connection.prepareStatement(sb.toString()); - pstmt.executeUpdate(); - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (pstmt != null && !pstmt.isClosed()) { - pstmt.close(); - } - } catch (Exception e) { - log.error("", e); - } - } - } - } - - @Override - public List getRegistroImpressaoRMDTipoBPR(Connection connection, Date inicio, Date fim, Integer empresaId, - String cveestado, String rmd, String folio) { - - List list = new ArrayList(); - - // IMPRESSAO RMD MANUAL - Date data = null; - String numPuntoVenta = null; - - ImpressaoRMD impRmd = null; - - for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, cveestado, null, null, null, true, false, false)) { - - if (numPuntoVenta == null) { - impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), - brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", null, null, folio); - numPuntoVenta = brp.getNumPuntoVenta(); - data = brp.getFechorVenta(); - - } else if (!(numPuntoVenta.equals(brp.getNumPuntoVenta()) && data.equals(brp.getFechorVenta()))) { - impRmd.setNumero(brp.getCcf()); - list.add(impRmd); - - impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), - brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", null, null, folio); - numPuntoVenta = brp.getNumPuntoVenta(); - data = brp.getFechorVenta(); - } - - impRmd.getDetalhada().add(brp); - } - - if (impRmd != null) - list.add(impRmd); - - agruparImpressaoRMD(list); - - return list; - } - - @Override - public List getRegistroImpressaoRMDTipoECF(Connection connection, Date inicio, Date fim, Integer empresaId, - String cveestado, String rmd, String folio) { - - List list = new ArrayList(); - - // IMPRESSAO RMD ECF - String serie = null; - String datamov = null; - ImpressaoRMD impRmd = null; - - for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, cveestado, null, null, null, false, true, false)) { - Date dataMovimento = null; - try { - dataMovimento = DateUtil.getDateFromString(brp.getDatamov(), DATE_FORMAT_FISCAL); - } catch (Exception e) { - } - - if (serie == null) { - - impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), - dataMovimento, rmd, "SERVIÇO DE TRANSPORTE", "ECF", brp.getEcf(), brp.getEstadoImpressora(), folio); - serie = brp.getEcf(); - datamov = brp.getDatamov(); - - } else if (!(serie.equals(brp.getEcf()) && datamov.equals(brp.getDatamov()))) { - impRmd.setNumero(brp.getCcf()); - list.add(impRmd); - - impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), - dataMovimento, rmd, "SERVIÇO DE TRANSPORTE", "ECF", brp.getEcf(), brp.getEstadoImpressora(), folio); - serie = brp.getEcf(); - datamov = brp.getDatamov(); - } - - impRmd.getDetalhada().add(brp); - } - - if (impRmd != null) - list.add(impRmd); - - agruparImpressaoRMD(list); - - return list; - } - - private void agruparImpressaoRMD(List list) { - - for (ImpressaoRMD impRmd : list) { - - BigDecimal valorContabil = BigDecimal.ZERO; - BigDecimal baseCalculo = BigDecimal.ZERO; - BigDecimal aliquota = BigDecimal.ZERO; - BigDecimal icms = BigDecimal.ZERO; - BigDecimal isentos = BigDecimal.ZERO; - BigDecimal outros = BigDecimal.ZERO; - String cooFim = null; - - for (DetalhadoRMD brp : impRmd.getDetalhada()) { - - if (brp.getIsenta()) { - isentos = isentos == null ? BigDecimal.ZERO : isentos.add(somarTotalBilhete(brp)); - } else { - valorContabil = valorContabil == null ? BigDecimal.ZERO : valorContabil.add(brp.getTarifa() == null ? BigDecimal.ZERO : brp.getTarifa()); - - BigDecimal redBaseCalcIcms = brp.getRedBaseCalcIcms() == null ? BigDecimal.ZERO : brp.getRedBaseCalcIcms().divide(UtiliteriasFiscal.CEM); - BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms); - baseCalculo = valorContabil.subtract(redutor); - - aliquota = brp.getTributacaoImportacao() == null ? brp.getIcmsInterestadual() : brp.getTributacaoImportacao(); - icms = baseCalculo.multiply(aliquota.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); - outros = valorContabil.subtract(baseCalculo); - } - cooFim = brp.getCoo() == null ? brp.getNumPuntoVenta() : brp.getCoo(); - } - impRmd.setNumero(cooFim); - impRmd.setValorContabil(valorContabil); - impRmd.setBaseCalculo(baseCalculo); - impRmd.setAliquota(aliquota); - impRmd.setIcms(icms); - impRmd.setIsentos(isentos); - impRmd.setOutros(outros); - } - } - - private BigDecimal somarTotalBilhete(DetalhadoRMD brp) { - - BigDecimal total = BigDecimal.ZERO; - total = total.add(brp.getTarifa() == null ? BigDecimal.ZERO : brp.getTarifa()); - total = total.add(brp.getTaxaEmbarque() == null ? BigDecimal.ZERO : brp.getTaxaEmbarque()); - total = total.add(brp.getPedagio() == null ? BigDecimal.ZERO : brp.getPedagio()); - total = total.add(brp.getSeguro() == null ? BigDecimal.ZERO : brp.getSeguro()); - total = total.add(brp.getOutros() == null ? BigDecimal.ZERO : brp.getOutros()); - return total; - } - - public List buscarRegistroImpressaoBPR(Connection connection, Date inicio, Date fim, Integer empresaId, - String cveestado, Long rmdId, String folioInicial, String folioFinal, boolean isManual, boolean isECF, boolean isCancelamento) { - - List list = new ArrayList(); - try { - boolean isDif = validaConstanteCustom(empresaId.toString(), "IMPORT_FISCAL_DIF"); - - String sql = null; - if (isECF && !isCancelamento) { - sql = getSqlImpressaoRMDTipoECF(); - } else if (isManual && !isCancelamento) { - sql = getSqlImpressaoRMDTipoBPR(isDif); - } else if (isCancelamento) { - sql = getSqlImpressaoRMDCancelados(); - } - - NamedParameterStatement ps = new NamedParameterStatement(connection, sql); - ps.getStatement().setFetchSize(100); - ps.setInt("EMPRESA_ID", empresaId); - ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); - ps.setTimestamp("DATE_FIM", new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime())); - - if (isCancelamento) { - ps.setLong("RMD_ID", rmdId); - ps.setLong("FOLIO_INICIAL", NumberUtils.createLong(folioInicial)); - ps.setLong("FOLIO_FINAL", NumberUtils.createLong(folioFinal)); - } else { - ps.setString("CVEESTADO", cveestado); - } - - ResultSet rs = ps.executeQuery(); - while (rs.next()) { - - DetalhadoRMD brp = new DetalhadoRMD(); - brp.setCajaId(rs.getLong("cajaId")); - if (!isCancelamento) { - brp.setNumoperacion(rs.getString("numoperacion")); - brp.setSerie(rs.getString("serieCompl")); - brp.setFolio(rs.getInt("folio")); - brp.setEstadoId(rs.getInt("estadoId")); - brp.setFechorVenta(rs.getDate("fechorVenta")); - brp.setEmpresa(rs.getString("empresa")); - brp.setEnderecoEmpresa(rs.getString("enderecoEmpresa")); - brp.setCnpjEmpresa(rs.getString("cnpjEmpresa")); - brp.setIeEmpresa(rs.getString("ieEmpresa")); - brp.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); - brp.setIcmsIntermunicipal(rs.getBigDecimal("icmsIntermunicipal")); - brp.setEstadoOrigem(rs.getString("estadoOrigem")); - brp.setEstadoDestino(rs.getString("estadoDestino")); - brp.setMunicipioOrigem(rs.getString("municipioOrigem")); - brp.setInterEstadual(rs.getBoolean("isInterEstadual")); - brp.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); - brp.setRedBaseCalcIcms(rs.getBigDecimal("redBaseCalcIcms")); - brp.setPorcRedMunicipal(rs.getBigDecimal("porcRedMunicipal")); - brp.setPorcRedEstadual(rs.getBigDecimal("porcRedEstadual")); - brp.setTributacaoImportacao(rs.getBigDecimal("tributacaoImportacao")); - brp.setIsenta(rs.getBoolean("isenta")); - brp.setTarifa(rs.getBigDecimal("tarifa")); - brp.setTaxaEmbarque(rs.getBigDecimal("taxaEmbarque")); - brp.setPedagio(rs.getBigDecimal("pedagio")); - brp.setSeguro(rs.getBigDecimal("seguro")); - brp.setOutros(rs.getBigDecimal("outros")); - brp.setNombPuntoVenta(rs.getString("nombPuntoVenta")); - brp.setNumPuntoVenta(rs.getString("numPuntoVenta")); - - if (isECF && !isCancelamento) { - brp.setEcf(rs.getString("ecf")); - brp.setDatamov(rs.getString("datamov")); - brp.setCoo(rs.getString("cooredz")); - brp.setCcf(rs.getString("ccf")); - brp.setTotalFiscal(rs.getString("totalFiscal")); - brp.setEstadoImpressora(rs.getString("estadoImpressora")); - } - } else { - brp.setRmdId(rs.getInt("rmd_id")); - brp.setFoliormd(rs.getString("foliormd")); - } - - list.add(brp); - } - - rs.close(); - ps.close(); - - } catch (SQLException e) { - log.error("", e); - } - - return list; - } - - public boolean validaConstanteCustom(String valor, String nomeConstante) { - ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); - Constante contante = constanteService.buscarPorNomeConstante(nomeConstante); - String value = contante == null ? null : contante.getValorconstante(); - - if (StringUtils.isBlank(value)) - return false; - - List valuesList = Arrays.asList(value.split(",", -1)); - return valuesList.contains(valor); - } - - private String getSqlImpressaoRMDTipoBPR(boolean isDif) { - - StringBuilder sql = new StringBuilder(); - sql.append("select distinct "); - sql.append(" b.caja_id as cajaId, "); - sql.append(" b.numoperacion as numoperacion, "); - sql.append(" b.numseriepreimpresa as serieCompl, "); - sql.append(" b.numfoliopreimpreso as folio, "); - sql.append(" a.acfiscal as numAidf, "); - sql.append(" a.serie as serieAidf, "); - sql.append(" a.subserie as subSerieAidf, "); - sql.append(" trunc(b.feccreacion) as fechorVenta, "); - sql.append(" e.nombempresa as empresa, "); - sql.append(" coalesce(ie.cnpj, e.cnpj) as cnpjEmpresa, "); - sql.append(" case when ie.logradouro is null "); - sql.append(" then (e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad "); - sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ) "); - sql.append(" else (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || cie.nombciudad "); - sql.append(" || ' - ' || eie.cveestado || ', ' || ie.cep ) end as enderecoEmpresa, "); - sql.append(" pv.nombpuntoventa as nombPuntoVenta, "); - sql.append(" pv.numpuntoventa as numPuntoVenta, "); - sql.append(" ie.numinscricaoestadual as ieEmpresa, "); - sql.append(" coalesce(ae.estado_id, e_ag.estado_id, eos.estado_id, eo.estado_id) as estadoId, "); - sql.append(" coalesce(ei.icms, eos.icms) as icmsInterestadual, "); - sql.append(" ei.icmsim as icmsIntermunicipal, "); - sql.append(" coalesce(ae.cveestado, e_ag.cveestado, eos.cveestado, eo.cveestado) as estadoOrigem, "); - sql.append(" ed.cveestado as estadoDestino, "); - sql.append(" co.codibge as municipioOrigem, "); - sql.append(" case when((coalesce(ae.cveestado, eos.cveestado)) = ed.cveestado) "); - sql.append(" then 0 else 1 end as isInterEstadual, "); - sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); - sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); - sql.append(" ei.porcredestadual as porcRedEstadual, "); - sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); - sql.append(" case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = "); - sql.append(" coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) "); - sql.append(" then 1 else 0 end as isenta, "); - sql.append(" coalesce(b.preciopagado, 0) as tarifa, "); - sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, "); - sql.append(" coalesce(b.importepedagio, 0) as pedagio, "); - sql.append(" coalesce(b.importeseguro, 0) as seguro, "); - sql.append(" coalesce(b.importeoutros, 0) as outros "); - sql.append("from caja b "); - sql.append(" join marca m on b.marca_id = m.marca_id "); - sql.append(" join empresa e on e.empresa_id = m.empresa_id "); - sql.append(" left join aidf a on a.aidf_id = b.aidf_id "); - sql.append(" left join punto_venta pv on pv.puntoventa_id = b.puntoventa_id "); - sql.append(" left join parada de_ag on de_ag.parada_id = pv.parada_id "); - sql.append(" left join ciudad cd_ag on cd_ag.ciudad_id = de_ag.ciudad_id "); - sql.append(" left join estado e_ag on e_ag.estado_id = cd_ag.estado_id "); - sql.append(" left join ciudad ce on ce.ciudad_id = e.ciudad_id "); - sql.append(" left join estado ee on ee.estado_id = ce.estado_id "); - sql.append(" join parada po on po.parada_id = b.origen_id "); - sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append(" join parada pd on pd.parada_id = b.destino_id "); - sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); - sql.append(" join estado ed on ed.estado_id = cd.estado_id "); - sql.append(" left join alias_servico s on s.origen_id = b.origen_id "); - sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); - sql.append(" and s.ruta_id = b.ruta_id and s.activo = 1 "); - sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); - sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); - sql.append(" left join estado ae on ae.estado_id = a.estado_id "); - sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); - sql.append(" and ie.estado_id = coalesce(ae.estado_id, e_ag.estado_id, eos.estado_id, eo.estado_id) and ie.activo = 1 "); - sql.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id "); - sql.append(" left join estado eie on eie.estado_id = cie.estado_id "); - sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id "); - sql.append(" and ei.estado_id = coalesce(ae.estado_id, e_ag.estado_id, eos.estado_id, eo.estado_id) and ei.activo = 1 "); - sql.append("where "); - - if (isDif) { - sql.append(" ((b.tipoventa_id not in (5,12,18,81,82,49,41) and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); - sql.append(" or (b.tipoventa_id in (5,12,18,81,82,49,41) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); - sql.append(" and a.aidf_id is not null "); - } else { - sql.append(" ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); - sql.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); - } - - sql.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) "); - sql.append(" and b.indcancelacion = 0 "); - sql.append(" and b.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM "); - sql.append(" and coalesce(ae.cveestado, e_ag.cveestado, eos.cveestado, eo.cveestado) = :CVEESTADO "); - sql.append(" and b.rmd_id is null "); - sql.append(" and b.num_bpe is null "); - sql.append("order by estadoId, fechorVenta, nombPuntoVenta, numPuntoVenta "); - - return sql.toString(); - } - - private String getSqlImpressaoRMDTipoECF() { - - StringBuilder sql = new StringBuilder(); - sql.append("select distinct "); - sql.append(" c.caja_id as cajaId, "); - sql.append(" c.numoperacion as numoperacion, "); - sql.append(" c.numseriepreimpresa as serieCompl, "); - sql.append(" c.numfoliopreimpreso as folio, "); - sql.append(" '' as numAidf, "); - sql.append(" '' as serieAidf, "); - sql.append(" '' as subSerieAidf, "); - sql.append(" trunc(c.feccreacion) as fechorVenta, "); - sql.append(" ep.nombempresa as empresa, "); - sql.append(" ie.cnpj as cnpjEmpresa, "); - sql.append(" (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || cie.nombciudad "); - sql.append(" || ' - ' || eie.cveestado || ', ' || ie.cep ) as enderecoEmpresa, "); - sql.append(" '' as nombPuntoVenta, "); - sql.append(" '' as numPuntoVenta, "); - sql.append(" ie.numinscricaoestadual as ieEmpresa, "); - sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoId,"); - sql.append(" (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as icmsInterestadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.icmsim else eis.icmsim end) as icmsIntermunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estadoOrigem,"); - sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,"); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); - sql.append(" case when ( (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = "); - sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) ) then 0 else 1 end as isInterEstadual, "); - sql.append(" (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as redBaseCalcIcms,"); - sql.append(" (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porcRedMunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porcRedEstadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.tributacaoimportacao else eis.tributacaoimportacao end) as tributacaoImportacao,"); - sql.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id "); - sql.append(" else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null "); - sql.append(" then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, "); - sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); - sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); - sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); - sql.append(" coalesce(c.importeseguro, 0) as seguro, "); - sql.append(" coalesce(c.importeoutros, 0) as outros, "); - sql.append(" coalesce(r2.numserie20, imp.numserie20) as ecf, "); - sql.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov, "); - sql.append(" case when r2.numserie20 is null then '000001' else r2.coo end as coo, "); - sql.append(" '000000' as ccf, "); - sql.append(" null as totalFiscal, "); - sql.append(" case when r2.numserie20 is null then '000001' else r2.coo end as cooredz, "); - sql.append(" epv.cveestado as estadoImpressora "); - sql.append(" from caja c "); - sql.append(" join ruta r on r.ruta_id = c.ruta_id "); - sql.append(" join parada po on po.parada_id = c.origen_id "); - sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append(" join parada pd on pd.parada_id = c.destino_id "); - sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); - sql.append(" join estado ed on ed.estado_id = cd.estado_id "); - sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id "); - sql.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal "); - sql.append(" left join estado e on e.estado_id = imp.estadolocal_id "); - sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); - sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); - sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); - sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id "); - sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id "); - sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') "); - sql.append(" join inscricao_estadual ie on c.empresacorrida_id = ie.empresa_id and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 "); - sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); - sql.append(" join estado eie on eie.estado_id = cie.estado_id "); - sql.append(" join marca ma on c.marca_id = ma.marca_id "); - sql.append(" join empresa ep on ep.empresa_id = ma.empresa_id "); - sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id "); - sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id "); - sql.append(" left join estado epv on epv.estado_id = cpv.estado_id "); - sql.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1 "); - sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); - sql.append(" and c.serieimpfiscal is not null "); - sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); - sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); - sql.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); - sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); - sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = :CVEESTADO ) "); - sql.append(" and c.rmd_id is null "); - sql.append(" and c.num_bpe is null "); - sql.append(" order by estadoId, datamov, ecf, coo "); - - return sql.toString(); - } - - private String getSqlImpressaoRMDCancelados() { - - StringBuilder sql = new StringBuilder(); - sql.append("select distinct "); - sql.append(" c.caja_id as cajaId, "); - sql.append(" c.rmd_id as rmd_id, "); - sql.append(" c.foliormd as foliormd "); - sql.append(" from caja c "); - sql.append(" where c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); - sql.append(" and c.rmd_id = :RMD_ID "); - sql.append(" and c.foliormd between :FOLIO_INICIAL and :FOLIO_FINAL "); - - return sql.toString(); - } - - @Override - public List buscarRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, List estados, boolean isReceitaTerceiros) { - - String ufs = null; - for (Estado estado : estados) { - if (ufs == null) - ufs = "'" + estado.getCveestado() + "'"; - else - ufs = ufs + ",'" + estado.getCveestado() + "'"; - } - - List list = montaRelatorioRDI(connection, inicio, fim, empresaId, ufs); - List rdis = calcularRelatorioRDI(list, isReceitaTerceiros); - return agrupaRdi(rdis); - } - - private List agrupaRdi(List list) { - List aux = new ArrayList(); - - FiscalRdi rdi = null; - for (FiscalRdi detail : list) { - - FiscalRdi atual = new FiscalRdi(detail.getEstado(), detail.getTipoViagem(), detail.getTipoReceita()); - if (!aux.contains(atual)) { - rdi = new FiscalRdi(detail.getEstado(), detail.getTipoViagem(), detail.getTipoReceita()); - aux.add(rdi); - } - - int index = aux.indexOf(atual); - FiscalRdi agr = aux.get(index); - montarParametros(agr, detail); - aux.set(index, agr); - } - - List validacion = new ArrayList(); - for (FiscalRdi detail : aux) { - - RdiValidacion rv = new RdiValidacion(detail.getEstado()); - if (!validacion.contains(rv)) { - rv = new RdiValidacion(detail.getEstado()); - validacion.add(rv); - } - - int indice = validacion.indexOf(rv); - RdiValidacion rvAux = validacion.get(indice); - - if (detail.getTipoReceita().equals("REC") && detail.getTipoViagem().equals("IM")) - rvAux.setTemIMRec(true); - - if (detail.getTipoReceita().equals("DEV") && detail.getTipoViagem().equals("IM")) - rvAux.setTemIMDev(true); - - if (detail.getTipoReceita().equals("REC") && detail.getTipoViagem().equals("IE")) - rvAux.setTemIERec(true); - - if (detail.getTipoReceita().equals("DEV") && detail.getTipoViagem().equals("IE")) - rvAux.setTemIEDev(true); - - validacion.set(indice, rvAux); - } - - for (RdiValidacion val : validacion) { - - if (!val.isTemIMRec()) { - FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IM", "REC"); - aux.add(montarParametros(rdiAux, new FiscalRdi())); - } - - if (!val.isTemIMDev()) { - FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IM", "DEV"); - aux.add(montarParametros(rdiAux, new FiscalRdi())); - } - - if (!val.isTemIERec()) { - FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IE", "REC"); - aux.add(montarParametros(rdiAux, new FiscalRdi())); - } - - if (!val.isTemIEDev()) { - FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IE", "DEV"); - aux.add(montarParametros(rdiAux, new FiscalRdi())); - } - } - - Collections.sort(aux); - return aux; - } - - private FiscalRdi montarParametros(FiscalRdi agr, FiscalRdi detail) { - agr.setQuantBilhetes(agr.getQuantBilhetes().add(detail.getTarifa() == null ? BigDecimal.ZERO : BigDecimal.ONE)); - agr.setTarifa(agr.getTarifa().add(detail.getTarifa() == null ? BigDecimal.ZERO : detail.getTarifa())); - agr.setSeguro(agr.getSeguro().add(detail.getSeguro() == null ? BigDecimal.ZERO : detail.getSeguro())); - agr.setTxEmbarque(agr.getTxEmbarque().add(detail.getTxEmbarque() == null ? BigDecimal.ZERO : detail.getTxEmbarque())); - agr.setPedagio(agr.getPedagio().add(detail.getPedagio() == null ? BigDecimal.ZERO : detail.getPedagio())); - agr.setPassagem(agr.getPassagem().add(detail.getPassagem() == null ? BigDecimal.ZERO : detail.getPassagem())); - agr.setIsentos(agr.getIsentos().add(detail.getIsentos() == null ? BigDecimal.ZERO : detail.getIsentos())); - agr.setOutros(agr.getOutros().add(detail.getOutros() == null ? BigDecimal.ZERO : detail.getOutros())); - agr.setRbc(detail.getRbc() == null ? BigDecimal.ZERO : detail.getRbc()); - agr.setBaseCalculo(agr.getBaseCalculo().add(detail.getBaseCalculo() == null ? BigDecimal.ZERO : detail.getBaseCalculo())); - agr.setAliquota(detail.getAliquota() == null ? BigDecimal.ZERO : detail.getAliquota()); - agr.setIcms(agr.getIcms().add(detail.getIcms() == null ? BigDecimal.ZERO : detail.getIcms())); - agr.setCp(detail.getCp() == null ? BigDecimal.ZERO : detail.getCp()); - agr.setCredPres(agr.getCredPres().add(detail.getCredPres() == null ? BigDecimal.ZERO : detail.getCredPres())); - agr.setIcmsRec(agr.getIcmsRec().add(detail.getIcmsRec() == null ? BigDecimal.ZERO : detail.getIcmsRec())); - return agr; - } - - private List calcularRelatorioRDI(List list, boolean isReceitaTerceiros) { - - List rdis = new ArrayList(); - - for (DetalhadoFiscal det : list) { - - BigDecimal passagem = valorPassagem(det, isReceitaTerceiros); - BigDecimal isentos = valorIsenta(det, isReceitaTerceiros); - BigDecimal outros = BigDecimal.ZERO; - BigDecimal rbc = BigDecimal.ZERO; - BigDecimal baseCalculo = BigDecimal.ZERO; - BigDecimal aliquota = BigDecimal.ZERO; - BigDecimal icms = BigDecimal.ZERO; - BigDecimal cp = BigDecimal.ZERO; - BigDecimal credPres = BigDecimal.ZERO; - BigDecimal icmsRec = BigDecimal.ZERO; - - if (det.isInterEstadual()) { - aliquota = det.getTributacaoImportacao() != null ? det.getTributacaoImportacao() : det.getIcmsInterestadual(); - } else { - aliquota = det.getTributacaoImportacao() != null ? det.getTributacaoImportacao() : det.getIcmsIntermunicipal(); - } - - if (det.isInterEstadual()) { - cp = det.getPorcRedEstadual() == null ? BigDecimal.ZERO : det.getPorcRedEstadual(); - } else { - cp = det.getPorcRedMunicipal() == null ? BigDecimal.ZERO : det.getPorcRedMunicipal(); - } - - rbc = det.getRedBaseCalcIcms() == null ? BigDecimal.ZERO : det.getRedBaseCalcIcms().divide(UtiliteriasFiscal.CEM); - - BigDecimal tarifa = valorBaseCalculo(det, isReceitaTerceiros); - BigDecimal redutor = tarifa.multiply(rbc); - baseCalculo = tarifa.subtract(redutor); - - icms = baseCalculo.multiply(aliquota.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); - credPres = icms.multiply(cp.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); - icmsRec = icms.subtract(credPres); - - outros = isentos.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : passagem.subtract(isentos).subtract(baseCalculo); - - String tipoViagem = det.isInterEstadual() ? "IE" : "IM"; - BigDecimal taxaEmbarque = (isReceitaTerceiros && det.getTaxaEmbarque() == null) ? det.getTaxaEmbarque() : BigDecimal.ZERO; - BigDecimal pedagio = (isReceitaTerceiros && det.getPedagio() == null) ? det.getPedagio() : BigDecimal.ZERO; - BigDecimal seguro = (isReceitaTerceiros && det.getSeguro() == null) ? det.getSeguro() : BigDecimal.ZERO; - - rdis.add(new FiscalRdi(det.getEstadoOrigem(), tipoViagem, det.getTipoReceita(), det.getTarifa(), - seguro, taxaEmbarque, pedagio, passagem, isentos, outros, det.getRedBaseCalcIcms(), - baseCalculo, aliquota, icms, cp, credPres, icmsRec)); - } - - return rdis; - } - - private BigDecimal valorBaseCalculo(DetalhadoFiscal det, boolean isReceitaTerceiros) { - BigDecimal total = BigDecimal.ZERO; - total = total.add(det.getTarifa() == null ? BigDecimal.ZERO : det.getTarifa()); - - if (isReceitaTerceiros && (det.isInterEstadual() && det.getIndTxembarqueEstadual() || !det.isInterEstadual() && det.getIndTxembarqueMunicipal())) - total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); - - if (isReceitaTerceiros && (det.isInterEstadual() && det.getIndPedagioEstdual() || !det.isInterEstadual() && det.getIndPedagioMunicipal())) - total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); - - if (isReceitaTerceiros && (det.isInterEstadual() && det.getIndSeguroEstadual() || !det.isInterEstadual() && det.getIndSeguroMunicipal())) - total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); - - return total; - } - - private BigDecimal valorIsenta(DetalhadoFiscal det, boolean isReceitaTerceiros) { - - BigDecimal total = BigDecimal.ZERO; - if (isReceitaTerceiros && (det.isInterEstadual() && !det.getIndTxembarqueEstadual() || !det.isInterEstadual() && !det.getIndTxembarqueMunicipal())) - total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); - - if (isReceitaTerceiros && (det.isInterEstadual() && !det.getIndPedagioEstdual() || !det.isInterEstadual() && !det.getIndPedagioMunicipal())) - total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); - - if (isReceitaTerceiros && (det.isInterEstadual() && !det.getIndSeguroEstadual() || !det.isInterEstadual() && !det.getIndSeguroMunicipal())) - total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); - - return total; - } - - private BigDecimal valorPassagem(DetalhadoFiscal det, boolean isReceitaTerceiros) { - BigDecimal total = BigDecimal.ZERO; - total = total.add(det.getTarifa() == null ? BigDecimal.ZERO : det.getTarifa()); - if (isReceitaTerceiros) { - total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); - total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); - total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); - } - return total; - } - - private List montaRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, String ufs) { - - List list = new ArrayList(); - try { - - StringBuilder sql = new StringBuilder(); - sql.append(sqlRelatorioRDIVendidos(ufs)); - sql.append(" union all "); - sql.append(sqlRelatorioRDICancelados(ufs)); - - NamedParameterStatement ps = new NamedParameterStatement(connection, sql.toString()); - ps.setLong("EMPRESA_ID", Long.valueOf(empresaId)); - - ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); - ps.setTimestamp("DATE_FIM", new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime())); - - ResultSet rs = ps.executeQuery(); - while (rs.next()) { - - DetalhadoFiscal df = new DetalhadoFiscal(); - df.setCajaId(rs.getLong("cajaId")); - df.setTipoReceita(rs.getString("tipoReceita")); - df.setNumoperacion(rs.getString("numoperacion")); - df.setEstadoId(rs.getInt("estadoId")); - df.setFechorVenta(rs.getDate("fechorVenta")); - df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); - df.setIcmsIntermunicipal(rs.getBigDecimal("icmsIntermunicipal")); - df.setEstadoOrigem(rs.getString("estadoOrigem")); - df.setEstadoDestino(rs.getString("estadoDestino")); - df.setMunicipioOrigem(rs.getString("municipioOrigem")); - df.setInterEstadual(rs.getBoolean("isInterEstadual")); - df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); - df.setRedBaseCalcIcms(rs.getBigDecimal("redBaseCalcIcms")); - df.setPorcRedMunicipal(rs.getBigDecimal("porcRedMunicipal")); - df.setPorcRedEstadual(rs.getBigDecimal("porcRedEstadual")); - df.setTributacaoImportacao(rs.getBigDecimal("tributacaoImportacao")); - df.setIndTarifaMunicipal(rs.getBoolean("indtarifamunicipal")); - df.setIndSeguroMunicipal(rs.getBoolean("indseguromunicipal")); - df.setIndTxembarqueMunicipal(rs.getBoolean("indtxembarquemunicipal")); - df.setIndPedagioMunicipal(rs.getBoolean("indpedagiomunicipal")); - df.setIndTarifaEstadual(rs.getBoolean("indtarifaestadual")); - df.setIndSeguroEstadual(rs.getBoolean("indseguroestadual")); - df.setIndTxembarqueEstadual(rs.getBoolean("indtxembarqueestadual")); - df.setIndPedagioEstdual(rs.getBoolean("indpedagioestdual")); - df.setIsenta(rs.getBoolean("isenta")); - df.setTarifa(rs.getBigDecimal("tarifa")); - df.setTaxaEmbarque(rs.getBigDecimal("taxaEmbarque")); - df.setPedagio(rs.getBigDecimal("pedagio")); - df.setSeguro(rs.getBigDecimal("seguro")); - df.setOutros(rs.getBigDecimal("outros")); - df.setDatamov(rs.getString("datamov")); - list.add(df); - } - - rs.close(); - ps.close(); - - } catch (SQLException e) { - log.error("", e); - } - - return list; - } - - private String sqlRelatorioRDIVendidos(String ufs) { - - StringBuilder sql = new StringBuilder(); - - sql.append("select distinct "); - sql.append(" c.caja_id as cajaId, "); - sql.append(" 'REC' as tipoReceita, "); - sql.append(" c.numoperacion as numoperacion, "); - sql.append(" trunc(c.feccreacion) as fechorVenta, "); - sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoId,"); - sql.append(" (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as icmsInterestadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.icmsim else eis.icmsim end) as icmsIntermunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estadoOrigem,"); - sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,"); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); - sql.append(" case when ( (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = "); - sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) ) then 0 else 1 end as isInterEstadual, "); - sql.append(" (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as redBaseCalcIcms,"); - sql.append(" (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porcRedMunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porcRedEstadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indtarifamunicipal else eis.indtarifamunicipal end) as indtarifamunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indseguromunicipal else eis.indseguromunicipal end) as indseguromunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indtxembarquemunicipal else eis.indtxembarquemunicipal end) as indtxembarquemunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indpedagiomunicipal else eis.indpedagiomunicipal end) as indpedagiomunicipal,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indtarifaestadual else eis.indtarifaestadual end) as indtarifaestadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indseguroestadual else eis.indseguroestadual end) as indseguroestadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indtxembarqueestadual else eis.indtxembarqueestadual end) as indtxembarqueestadual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.indpedagioestdual else eis.indpedagioestdual end) as indpedagioestdual,"); - sql.append(" (case when s.aliasorigen_id is null then ei.tributacaoImportacao else eis.tributacaoImportacao end) as tributacaoImportacao,"); - sql.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id "); - sql.append(" else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null "); - sql.append(" then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, "); - sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); - sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); - sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); - sql.append(" coalesce(c.importeseguro, 0) as seguro, "); - sql.append(" coalesce(c.importeoutros, 0) as outros, "); - sql.append(" coalesce(r4.datamov, to_char(trunc(c.feccreacion), 'yyyymmdd')) as datamov "); - sql.append(" "); - sql.append(" from caja c "); - sql.append(" join ruta r on r.ruta_id = c.ruta_id "); - sql.append(" join parada po on po.parada_id = c.origen_id "); - sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append(" join parada pd on pd.parada_id = c.destino_id "); - sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); - sql.append(" join estado ed on ed.estado_id = cd.estado_id "); - sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id "); - sql.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal "); - sql.append(" left join estado e on e.estado_id = imp.estadolocal_id "); - sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); - sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); - sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); - sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id "); - sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id "); - sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') "); - sql.append(" join inscricao_estadual ie on c.empresacorrida_id = ie.empresa_id and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 "); - sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); - sql.append(" join estado eie on eie.estado_id = cie.estado_id "); - sql.append(" join marca ma on c.marca_id = ma.marca_id "); - sql.append(" join empresa ep on ep.empresa_id = ma.empresa_id "); - sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id "); - sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id "); - sql.append(" left join estado epv on epv.estado_id = cpv.estado_id "); - sql.append(" "); - sql.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1 "); - sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); - sql.append(" and c.serieimpfiscal is not null "); - sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); - sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); - sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); - sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and c.num_bpe is null "); - sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) in ( ").append(ufs).append(" )) "); - sql.append(" "); - sql.append("union all "); - sql.append(" "); - sql.append("select distinct "); - sql.append(" c.caja_id as cajaId, "); - sql.append(" 'REC' as tipoReceita, "); - sql.append(" c.numoperacion as numoperacion, "); - sql.append(" trunc(c.feccreacion) as fechorVenta, "); - sql.append(" coalesce(ae.estado_id, (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end)) as estadoId,"); - sql.append(" coalesce(ei.icms, eos.icms) as icmsInterestadual, "); - sql.append(" ei.icmsim as icmsIntermunicipal, "); - sql.append(" coalesce(ae.cveestado,(case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end)) as estadoOrigem,"); - sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,"); - sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); - sql.append(" case when(coalesce(ae.cveestado,(case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end)) = "); - sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) ) then 0 else 1 end as isInterEstadual, "); - sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); - sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); - sql.append(" ei.porcredestadual as porcRedEstadual, "); - sql.append(" ei.indtarifamunicipal as indtarifamunicipal, "); - sql.append(" coalesce(ei.indseguromunicipal, 0) as indseguromunicipal, "); - sql.append(" coalesce(ei.indtxembarquemunicipal, 0) as indtxembarquemunicipal, "); - sql.append(" coalesce(ei.indpedagiomunicipal, 0) as indpedagiomunicipal, "); - sql.append(" coalesce(ei.indtarifaestadual, 0) as indtarifaestadual, "); - sql.append(" coalesce(ei.indseguroestadual, 0) as indseguroestadual, "); - sql.append(" coalesce(ei.indtxembarqueestadual, 0) as indtxembarqueestadual, "); - sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, "); - sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); - sql.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id "); - sql.append(" else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null "); - sql.append(" then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, "); - sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); - sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); - sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); - sql.append(" coalesce(c.importeseguro, 0) as seguro, "); - sql.append(" coalesce(c.importeoutros, 0) as outros, "); - sql.append(" to_char(trunc(c.feccreacion), 'yyyymmdd') as datamov "); - sql.append("from caja c "); - sql.append(" join marca m on c.marca_id = m.marca_id "); - sql.append(" join empresa e on e.empresa_id = m.empresa_id "); - sql.append(" join aidf a on a.aidf_id = c.aidf_id "); - sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id "); - sql.append(" join estado ee on ee.estado_id = ce.estado_id "); - sql.append(" join parada po on po.parada_id = c.origen_id "); - sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); - sql.append(" join estado eo on eo.estado_id = co.estado_id "); - sql.append(" join parada pd on pd.parada_id = c.destino_id "); - sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); - sql.append(" join estado ed on ed.estado_id = cd.estado_id "); - sql.append(" left join alias_servico s on s.origen_id = c.origen_id "); - sql.append(" and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) "); - sql.append(" and s.ruta_id = c.ruta_id and s.activo = 1 "); - sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); - sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); - sql.append(" left join estado ae on ae.estado_id = a.estado_id "); - sql.append(" join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); - sql.append(" and ie.estado_id = coalesce(ae.estado_id, eos.estado_id) and ie.activo = 1 "); - sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); - sql.append(" join estado eie on eie.estado_id = cie.estado_id "); - sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id "); - sql.append(" and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 "); - sql.append("where ((c.tipoventa_id = 3 and c.indstatusboleto = 'V' and c.indreimpresion = 0) "); - sql.append(" or (c.tipoventa_id in (12,18) and c.indstatusboleto = 'E' and c.numfoliosistema = c.numfoliopreimpreso)) "); - sql.append(" and (c.motivocancelacion_id is null or c.motivocancelacion_id <> 35) "); - sql.append(" and c.indcancelacion = 0 "); - sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and c.feccreacion between :DATE_INICIO and :DATE_FIM "); - sql.append(" and c.num_bpe is null "); - sql.append(" and coalesce(ae.cveestado, eos.cveestado) in ( ").append(ufs).append(" ) "); - return sql.toString(); - } - - private String sqlRelatorioRDICancelados(String ufs) { - - StringBuilder sql = new StringBuilder(); - sql.append("select distinct "); - sql.append(" b.boleto_id as cajaId, "); - sql.append(" 'DEV' as tipoReceita, "); - sql.append(" b.numoperacion as numoperacion, "); - sql.append(" trunc(b.feccreacion) as fechorVenta, "); - sql.append(" coalesce(esaidf.estado_id, eos.estado_id, est.estado_id) as estadoId, "); - sql.append(" ei.icms as icmsInterestadual, "); - sql.append(" ei.icmsim as icmsIntermunicipal, "); - sql.append(" coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) as estadoOrigem, "); - sql.append(" coalesce(eds.cveestado, est.cveestado) as estadoDestino, "); - sql.append(" 0 as municipioOrigem, "); - sql.append(" case when (coalesce(cos.estado_id,co.estado_id) <> coalesce(cds.estado_id,cd.estado_id)) then 1 else 0 end as isInterEstadual, "); - sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); - sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); - sql.append(" ei.porcredestadual as porcRedEstadual, "); - sql.append(" coalesce(ei.indtarifamunicipal, 0) as indtarifamunicipal, "); - sql.append(" coalesce(ei.indseguromunicipal, 0) as indseguromunicipal, "); - sql.append(" coalesce(ei.indtxembarquemunicipal, 0) as indtxembarquemunicipal, "); - sql.append(" coalesce(ei.indpedagiomunicipal, 0) as indpedagiomunicipal, "); - sql.append(" coalesce(ei.indtarifaestadual, 0) as indtarifaestadual, "); - sql.append(" coalesce(ei.indseguroestadual, 0) as indseguroestadual, "); - sql.append(" coalesce(ei.indtxembarqueestadual, 0) as indtxembarqueestadual, "); - sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, "); - sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); - sql.append(" case when (coalesce(pos.regionmetropolitana_id, ori.regionmetropolitana_id, -1) = "); - sql.append(" coalesce(pds.regionmetropolitana_id, des.regionmetropolitana_id, -2)) then 1 else 0 end as isenta, "); - sql.append(" coalesce(b.preciopagado, 0) as tarifa, "); - sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, "); - sql.append(" coalesce(b.importepedagio, 0) as pedagio, "); - sql.append(" coalesce(b.importeseguro, 0) as seguro, "); - sql.append(" coalesce(b.importeoutros, 0) as outros, "); - sql.append(" to_char(trunc(b.feccreacion), 'yyyymmdd') as datamov "); - sql.append(" "); - sql.append("from boleto b "); - sql.append("inner join marca m on m.marca_id = b.marca_id and m.activo = 1 "); - sql.append("inner join empresa e on e.empresa_id = m.empresa_id "); - sql.append("inner join punto_venta ptv on ptv.puntoventa_id = b.puntoventa_id "); - sql.append("inner join parada ori on (b.origen_id = ori.parada_id ) "); - sql.append("inner join parada des on (b.destino_id = des.parada_id ) "); - sql.append("inner join ciudad co on (co.ciudad_id = ori.ciudad_id ) "); - sql.append("inner join ciudad cd on (cd.ciudad_id = des.ciudad_id ) "); - sql.append("inner join estado est on est.estado_id = co.estado_id "); - sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = b.ptovtaventa_id "); - sql.append("left join alias_servico s on s.origen_id = b.origen_id "); - sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); - sql.append(" and s.ruta_id = b.ruta_id and s.activo = 1 "); - sql.append("left join parada pos on pos.parada_id = s.aliasorigen_id "); - sql.append("left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); - sql.append("left join estado eos on eos.estado_id = cos.estado_id "); - sql.append("left join parada pds on pds.parada_id = s.aliasdestino_id "); - sql.append("left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); - sql.append("left join estado eds on eds.estado_id = cds.estado_id "); - sql.append("left join aidf aidf on aidf.aidf_id = b.aidf_id and b.tipoventa_id = 3 "); - sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id "); - sql.append("join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); - sql.append(" and ie.estado_id = coalesce(aidf.estado_id, eos.estado_id, est.estado_id) and ie.activo = 1 "); - sql.append("join empresa_imposto ei on ei.empresa_id = e.empresa_id "); - sql.append(" and ei.estado_id = coalesce(aidf.estado_id, eos.estado_id, est.estado_id) and ei.activo = 1 "); - sql.append("where b.motivocancelacion_id in (31,32,10,37,99,36) "); - sql.append(" and b.indstatusboleto = 'C' and b.indcancelacion = 1 "); - sql.append(" and b.numfoliopreimpreso is not null "); - sql.append(" and e.empresa_id = :EMPRESA_ID "); - sql.append(" and b.fechorventa >= :DATE_INICIO "); - sql.append(" and b.fechorventa <= :DATE_FIM "); - sql.append(" and b.categoria_id not in (select valorconstante from constante where nombconstante = 'GRATUIDADE_CRIANCA') "); - sql.append(" and coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) in ( ").append(ufs).append(" ) "); - sql.append(" and b.num_bpe is null "); - sql.append("order by estadoId, isInterEstadual "); - - return sql.toString(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.jdbc.Work; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FiscalDAO; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.utilerias.StringHelper; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPR; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPRBase; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFBase; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCCF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCFC; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoICF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoPRC; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoBPS; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoDBP; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoPAR; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoRMD; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqBPS; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqDBP; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.DetalhadoFiscal; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.RdiValidacion; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.DetalhadoRMD; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Repository("fiscalDAO") +public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO { + private static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; + private static final String DATE_FORMAT_DMY = "dd/MM/yyyy"; + + private static final String CODIGO_INDICADOR_CONTR_PREVIDENCIARIA = "00000060"; + + private static final Logger log = LogManager.getLogger(FiscalHibernateDAO.class); + + @Autowired + private DataSource dataSource; + + @Autowired + public FiscalHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + private boolean isEstadoTodos(Integer estadoId) { + if (estadoId == -1 || estadoId == null) + return true; + else + return false; + } + + @Override + public List buscaDatosFiscaisECFManual(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection, boolean isBoletoHist) throws SQLException { + PreparedStatement stmt = null; + ResultSet rset = null; + + StringBuilder sql = new StringBuilder(); + sql.append("select distinct "); + sql.append(" (case when r2.numserie20 is null then '' else r2.numserie20 end) || imp.numserie20 as numImpressora, "); + sql.append(" coalesce(b.numfoliosistema, (case when r4.caja_id is null then '000001' else r4.coo end)) as coo, "); + sql.append(" to_char(b.feccreacion, 'yyyymmdd') as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" b.caja_id as boletoId, "); + sql.append(" b.empresacorrida_id as empresaId, "); + sql.append(" b.numseriepreimpresa as serie, "); + sql.append(" a.subserie as subSerie, "); + sql.append(" a.docfiscal as aidf, "); + sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoIdOrigen, "); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenId, "); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenUf, "); + sql.append(" (case when s.aliasdestino_id is null then ed.estado_id else eds.estado_id end) as estadoIdDestino, "); + sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoId, "); + sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoUf, "); + sql.append(" imp.numcnpj as cnpjImpressora, "); + sql.append(" imp.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" imp.modelo as modeloImpressora, "); + sql.append(" b.usuario_id as numCaixa, "); + sql.append(" b.preciopagado as importetarifa, "); + sql.append(" cs.descclase AS claseServicio, "); + sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, "); + sql.append(" coalesce(ei.icms, eos.icms) as icms, "); + sql.append(" ei.porctributo as porctributo, "); + sql.append(" case when b.indstatusboleto = 'V' or b.motivocancelacion_id is null THEN 'N' ELSE 'C' END status, "); + sql.append(" r4.indcancelamento AS indcancelamento, "); + sql.append(" b.preciopagado as valorTotal, "); + sql.append(" case b.importetaxaembarque when 0 then null else b.importetaxaembarque end as importetaxaembarque, "); + sql.append(" case b.importepedagio when 0 then null else b.importepedagio end as importepedagio, "); + sql.append(" case b.importeoutros when 0 then null else b.importeoutros end as importeoutros, "); + sql.append(" case b.importeseguro when 0 then null else b.importeseguro end as importeseguro "); + + if (isBoletoHist) + sql.append("from caja_hist b "); + else + sql.append("from caja b "); + + sql.append(" left join fiscal_r4 r4 on r4.caja_id = b.caja_id "); + sql.append(" left join fiscal_r5 r5 on r4.numserie20 = r5.numserie20 and r4.coo = r5.coo and r4.datamov = r5.datamov and r4.contador = r5.contador "); + sql.append(" left join fiscal_impressora imp on imp.numserie = b.serieimpfiscal "); + sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(b.feccreacion, 'YYYYMMDD') "); + sql.append(" left join clase_servicio cs on cs.claseservicio_id = b.claseservicio_id "); + sql.append(" join marca m on b.marca_id = m.marca_id "); + sql.append(" join empresa e on e.empresa_id = m.empresa_id "); + sql.append(" left join aidf a on a.aidf_id = b.aidf_id "); + sql.append(" join punto_venta pv on pv.puntoventa_id = b.puntoventa_id "); + sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id "); + sql.append(" join estado ee on ee.estado_id = ce.estado_id "); + sql.append(" join parada po on po.parada_id = b.origen_id "); + sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append(" join parada pd on pd.parada_id = b.destino_id "); + sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); + sql.append(" join estado ed on ed.estado_id = cd.estado_id "); + sql.append(" left join alias_servico s on s.origen_id = b.origen_id "); + sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); + sql.append(" and s.ruta_id = b.ruta_id and s.activo = 1 "); + sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); + sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); + sql.append(" left join estado ae on ae.estado_id = a.estado_id "); + sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); + sql.append(" and ie.estado_id = (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) and ie.activo = 1 "); + sql.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id "); + sql.append(" left join estado eie on eie.estado_id = cie.estado_id "); + sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id "); + sql.append(" and ei.estado_id = (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) and ei.activo = 1 "); + sql.append("where ((b.tipoventa_id = 3 and b.indstatusboleto in ('V', 'C') and b.indreimpresion = 0) "); + sql.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); + sql.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) "); + sql.append(" and b.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and b.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); + sql.append(" and b.empresacorrida_id = ? "); + sql.append(isEstadoTodos(estadoId) ? "" : " and (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) = ? "); + sql.append("ORDER BY dataEmissao, coo, modeloImpressora "); + + List listManuais = new ArrayList(); + + stmt = connection.prepareStatement(sql.toString()); + stmt.setFetchSize(100); + stmt.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + stmt.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + stmt.setInt(3, empresaId); + + if (!isEstadoTodos(estadoId)) + stmt.setInt(4, estadoId); + + rset = stmt.executeQuery(); + while (rset.next()) { + + ImportacionManualFiscalVO item = new ImportacionManualFiscalVO(); + + item.setNumImpressora(rset.getString("numImpressora")); + item.setCoo(rset.getString("coo")); + item.setBoletoId(rset.getLong("boletoId")); + item.setEmpresaId(rset.getInt("empresaId")); + item.setDataEmissao(rset.getString("dataEmissao")); + item.setValorTotal(rset.getBigDecimal("valorTotal")); + item.setNumItem(rset.getString("numItem")); + item.setCodProduto(rset.getString("codProduto")); + item.setNumpdv(rset.getString("numpdv")); + item.setRepTributado(rset.getString("repTributado")); + item.setTipoPassagem(rset.getString("tipoPassagem")); + item.setValorItem(rset.getBigDecimal("valorItem")); + item.setOrigenId(rset.getInt("origenId")); + + Integer origenIbge = rset.getInt("origenUf"); + item.setOrigenUf(origenIbge == null ? null : origenIbge.toString()); + + item.setDestinoId(rset.getInt("destinoId")); + + Integer destinoIbge = rset.getInt("destinoUf"); + item.setDestinoUf(destinoIbge == null ? null : destinoIbge.toString()); + + item.setModeloImpressora(rset.getString("modeloImpressora")); + item.setNumCaixa(rset.getString("numCaixa")); + item.setStatus(rset.getString("status")); + item.setSerie(rset.getString("serie")); + item.setIcms(rset.getBigDecimal("icms")); + item.setPorctributo(rset.getBigDecimal("porctributo")); + item.setEstadoIdOrigen(rset.getInt("estadoIdOrigen")); + item.setEstadoIdDestino(rset.getInt("estadoIdDestino")); + item.setImportetaxaembarque(rset.getBigDecimal("importetaxaembarque")); + item.setImportepedagio(rset.getBigDecimal("importepedagio")); + item.setImporteoutros(rset.getBigDecimal("importeoutros")); + item.setImporteseguro(rset.getBigDecimal("importeseguro")); + item.setSubSerie(rset.getString("subSerie")); + item.setAidf(rset.getString("aidf")); + item.setClaseServicio(rset.getString("claseServicio")); + + listManuais.add(item); + } + + return listManuais; + + } + + private String sqlFiscaisReducaoZPendencia(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT r2.datamov AS datamov, "); + sql.append(" r2.numreducoes AS numreducoes, "); + sql.append(" r2.crz AS crz, "); + sql.append(" r2.numserie20 AS numserie20, "); + sql.append(" r2.coo AS coo, "); + sql.append(" r2.cro AS cro, "); + sql.append(" r2.cooinicial AS cooinicial, "); + sql.append(" r2.coofinal AS coofinal, "); + sql.append(" r2.vendabrutadiaria AS vendabrutadiaria, "); + sql.append(" r2.datareducao AS datareducao, "); + sql.append(" r2.horareducao AS horareducao, "); + sql.append(" r3.totparcial AS aliquota, "); + sql.append(" r3.valoracumulado AS imposto, "); + sql.append(" ifi.numserie AS numpdv, "); + sql.append(" TRANSLATE(t2.cnpj, ' / - . ', ' ') AS cnpj,"); + sql.append(" r2.totgeral AS gtFinal, "); + sql.append(" anterior.totgeral AS gtInicial, "); + sql.append(" CASE WHEN r3.totparcial = 'Can-T' THEN 'CANCELADO' "); + sql.append(" WHEN r3.totparcial = 'DT' THEN 'DESCONTO' ELSE '' END AS status "); + sql.append("FROM fiscal_r2 r2 "); + sql.append(" inner join fiscal_impressora ifi "); + sql.append(" ON ifi.numserie20 = r2.numserie20 "); + sql.append(" inner join fiscal_r3 r3 "); + sql.append(" ON r3.crz = r2.crz "); + sql.append(" AND r2.numserie20 = r3.numserie20 "); + sql.append(" AND r3.datamov = r2.datamov "); + sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); + sql.append(" inner join fiscal_t2 t2 "); + sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); + sql.append(" inner join empresa e ON ( t2.cnpj = e.cnpjnumero ) or "); + sql.append(" ( t2.cnpj in "); + sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); + sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); + sql.append(" (SELECT numserie20, crz, totgeral "); + sql.append(" FROM fiscal_r2) anterior "); + sql.append("WHERE r2.datamov BETWEEN ? AND ? "); + sql.append(" AND r2.activo = 1 "); + sql.append(" AND e.empresa_id = ? "); + sql.append(isEstadoTodos ? "" : " AND ie.estado_id = ? "); + sql.append(" AND r3.totparcial IN ("); + sql.append("'" + SituacaoTributaria.CANCELADO.getValue() + "'").append(", "); + sql.append("'" + SituacaoTributaria.DESCONTO.getValue() + "'").append(")"); + sql.append(" AND anterior.numserie20 = r2.numserie20 "); + sql.append(" AND anterior.crz = r2.crz - 1 "); + sql.append(" AND (SELECT MAX(fiscalr4_id) FROM fiscal_r4 r4 WHERE r4.numserie20 = r2.numserie20 "); + sql.append(" AND r4.datamov = r2.datamov) IS NOT NULL "); + sql.append("GROUP BY r2.datamov, "); + sql.append(" r2.numreducoes, "); + sql.append(" r2.crz, "); + sql.append(" r2.numserie20, "); + sql.append(" r2.coo, "); + sql.append(" r2.cro, "); + sql.append(" r2.cooinicial, "); + sql.append(" r2.coofinal, "); + sql.append(" r2.vendabrutadiaria, "); + sql.append(" r2.datareducao, "); + sql.append(" r2.horareducao, "); + sql.append(" r3.totparcial, "); + sql.append(" r3.valoracumulado, "); + sql.append(" ifi.numserie, "); + sql.append(" t2.cnpj, "); + sql.append(" r2.totgeral, "); + sql.append(" anterior.totgeral "); + sql.append("ORDER BY r2.datamov, "); + sql.append(" numserie20, "); + sql.append(" crz, "); + sql.append(" r2.numreducoes, "); + sql.append(" r3.totparcial desc "); + return sql.toString(); + } + + private String sqlFiscaisReducaoZPendenciaInconcistencias(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT r2.datamov AS datamov, "); + sql.append(" r2.numreducoes AS numreducoes, "); + sql.append(" r2.crz AS crz, "); + sql.append(" r2.numserie20 AS numserie20, "); + sql.append(" r2.coo AS coo, "); + sql.append(" r2.cro AS cro, "); + sql.append(" r2.cooinicial AS cooinicial, "); + sql.append(" r2.coofinal AS coofinal, "); + sql.append(" r2.vendabrutadiaria AS vendabrutadiaria, "); + sql.append(" r2.datareducao AS datareducao, "); + sql.append(" r2.horareducao AS horareducao, "); + sql.append(" r3.totparcial AS aliquota, "); + sql.append(" r3.valoracumulado AS imposto, "); + sql.append(" ifi.numserie AS numpdv, "); + sql.append(" t2.cnpj AS cnpj,"); + sql.append(" r2.totgeral AS gtFinal, "); + sql.append(" anterior.totgeral AS gtInicial, "); + sql.append(" 'INCONSISTENTE' AS status "); + sql.append("FROM fiscal_r2 r2 "); + sql.append(" inner join fiscal_impressora ifi "); + sql.append(" ON ifi.numserie20 = r2.numserie20 "); + sql.append(" inner join fiscal_r3 r3 "); + sql.append(" ON r3.crz = r2.crz "); + sql.append(" AND r2.numserie20 = r3.numserie20 "); + sql.append(" AND r3.datamov = r2.datamov "); + sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); + sql.append(" inner join fiscal_t2 t2 "); + sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); + sql.append(" inner join empresa e ON ( t2.cnpj = e.cnpjnumero ) or "); + sql.append(" ( t2.cnpj in "); + sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); + sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); + sql.append(" (SELECT numserie20, crz, totgeral "); + sql.append(" FROM fiscal_r2) anterior "); + sql.append("WHERE r2.datamov BETWEEN ? AND ? "); + sql.append(" AND r2.activo = 1 "); + sql.append(" AND e.empresa_id = ? "); + sql.append(isEstadoTodos ? "" : " AND ie.estado_id = ? "); + sql.append(" AND r3.totparcial not in ("); + sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")"); + sql.append(" AND anterior.numserie20 = r2.numserie20 "); + sql.append(" AND anterior.crz = r2.crz - 1 "); + sql.append(" AND (SELECT MAX(fiscalr4_id) FROM fiscal_r4 r4 WHERE r4.numserie20 = r2.numserie20 "); + sql.append(" AND r4.datamov = r2.datamov) IS NULL "); + sql.append("GROUP BY r2.datamov, "); + sql.append(" r2.numreducoes, "); + sql.append(" r2.crz, "); + sql.append(" r2.numserie20, "); + sql.append(" r2.coo, "); + sql.append(" r2.cro, "); + sql.append(" r2.cooinicial, "); + sql.append(" r2.coofinal, "); + sql.append(" r2.vendabrutadiaria, "); + sql.append(" r2.datareducao, "); + sql.append(" r2.horareducao, "); + sql.append(" r3.totparcial, "); + sql.append(" r3.valoracumulado, "); + sql.append(" ifi.numserie, "); + sql.append(" t2.cnpj, "); + sql.append(" r2.totgeral, "); + sql.append(" anterior.totgeral "); + sql.append("ORDER BY r2.datamov, "); + sql.append(" numserie20, "); + sql.append(" crz, "); + sql.append(" r2.numreducoes, "); + sql.append(" r3.totparcial desc "); + return sql.toString(); + } + + private String sqlFiscaisReducaoZ(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT r2.datamov AS datamov, "); + sql.append(" r2.numreducoes AS numreducoes, "); + sql.append(" r2.crz AS crz, "); + sql.append(" r2.numserie20 AS numserie20, "); + sql.append(" r2.coo AS coo, "); + sql.append(" r2.cro AS cro, "); + sql.append(" r2.cooinicial AS cooinicial, "); + sql.append(" r2.coofinal AS coofinal, "); + sql.append(" r2.vendabrutadiaria AS vendabrutadiaria, "); + sql.append(" r2.datareducao AS datareducao, "); + sql.append(" r2.horareducao AS horareducao, "); + sql.append(" r3.totparcial AS aliquota, "); + sql.append(" r3.valoracumulado AS imposto, "); + sql.append(" ifi.numserie AS numpdv, "); + sql.append(" t2.cnpj AS cnpj,"); + sql.append(" r2.totgeral AS gtFinal, "); + sql.append(" anterior.totgeral AS gtInicial, "); + sql.append(" 'NORMAL' AS status "); + sql.append("FROM fiscal_r2 r2 "); + sql.append(" inner join fiscal_impressora ifi "); + sql.append(" ON ifi.numserie20 = r2.numserie20 "); + sql.append(" inner join fiscal_r3 r3 "); + sql.append(" ON r3.crz = r2.crz "); + sql.append(" AND r2.numserie20 = r3.numserie20 "); + sql.append(" AND r3.datamov = r2.datamov "); + sql.append(" AND r3.fiscalimpressora_id = ifi.fiscalimpressora_id "); + sql.append(" inner join fiscal_t2 t2 "); + sql.append(" ON ifi.fiscalimpressora_id = t2.fiscalimpressora_id "); + sql.append(" inner join empresa e ON ( t2.cnpj = e.cnpjnumero ) or "); + sql.append(" (t2.cnpj in "); + sql.append(" (select TRANSLATE(cnpj, ' / - . ', ' ') from inscricao_estadual where empresa_id = ? and activo = 1 )) "); + sql.append(" inner join inscricao_estadual ie ON e.empresa_id = ie.empresa_id, "); + sql.append(" (SELECT numserie20, datamov, crz, totgeral "); + sql.append(" FROM fiscal_r2) anterior "); + sql.append("WHERE r2.datamov BETWEEN ? AND ? "); + sql.append(" AND r2.activo = 1 "); + sql.append(" AND e.empresa_id = ? "); + sql.append(isEstadoTodos ? "" : " AND ie.estado_id = ? "); + sql.append(" AND r3.totparcial not in ("); + sql.append("'" + SituacaoTributaria.NAO_FISCAL.getValue() + "'").append(")"); + sql.append(" AND anterior.numserie20 = r2.numserie20 "); + sql.append(" AND anterior.datamov = r2.datamov - 1 "); + sql.append(" AND to_number(anterior.crz) = to_number(r2.crz) - 1 "); + sql.append(" AND r2.vendabrutadiaria > 0 "); + sql.append("GROUP BY r2.datamov, "); + sql.append(" r2.numreducoes, "); + sql.append(" r2.crz, "); + sql.append(" r2.numserie20, "); + sql.append(" r2.coo, "); + sql.append(" r2.cro, "); + sql.append(" r2.cooinicial, "); + sql.append(" r2.coofinal, "); + sql.append(" r2.vendabrutadiaria, "); + sql.append(" r2.datareducao, "); + sql.append(" r2.horareducao, "); + sql.append(" r3.totparcial, "); + sql.append(" r3.valoracumulado, "); + sql.append(" ifi.numserie, "); + sql.append(" t2.cnpj, "); + sql.append(" r2.totgeral, "); + sql.append(" anterior.totgeral "); + sql.append("ORDER BY r2.datamov, "); + sql.append(" numserie20, "); + sql.append(" crz, "); + sql.append(" r2.numreducoes, "); + // TODO: No ambiente de produção a ordenação so vem correta quando declarado para vir como desc + // contrario aos outros servidores que deve ser asc + sql.append(" r3.totparcial desc "); + return sql.toString(); + } + + @Override + public List buscaDatosFiscaisReducaoZ(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isPendencias, Connection connection) throws SQLException { + if (isPendencias) { + List list = new ArrayList(); + list.addAll(montarItensReducaoZ(inicio, fim, empresaId, estadoId, sqlFiscaisReducaoZPendencia(isEstadoTodos(estadoId)), connection)); + list.addAll(montarItensReducaoZ(inicio, fim, empresaId, estadoId, sqlFiscaisReducaoZPendenciaInconcistencias(isEstadoTodos(estadoId)), connection)); + return list; + + } else { + return montarItensReducaoZ(inicio, fim, empresaId, estadoId, sqlFiscaisReducaoZ(isEstadoTodos(estadoId)), connection); + } + } + + private List montarItensReducaoZ(Date inicio, Date fim, Integer empresaId, Integer estadoId, String sql, Connection connection) throws SQLException { + + List listRedZ = new ArrayList(); + PreparedStatement stmt = connection.prepareStatement(sql); + stmt.setFetchSize(100); + stmt.setInt(1, empresaId); + stmt.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); + stmt.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); + stmt.setInt(4, empresaId); + + if (!isEstadoTodos(estadoId)) + stmt.setInt(5, estadoId); + + ResultSet rset = stmt.executeQuery(); + while (rset.next()) { + + ImportacionFiscalReducaoZVO item = new ImportacionFiscalReducaoZVO(); + item.setDatamov(rset.getString("datamov")); + item.setNumreducoes(rset.getString("numreducoes")); + item.setCrz(rset.getString("crz")); + item.setNumserie20(rset.getString("numserie20")); + item.setCoo(rset.getString("coo")); + item.setCro(rset.getString("cro")); + item.setCooinicial(rset.getString("cooinicial")); + item.setCoofinal(rset.getString("coofinal")); + item.setVendabrutadiaria(rset.getBigDecimal("vendabrutadiaria")); + item.setDatareducao(rset.getString("datareducao")); + item.setHorareducao(rset.getString("horareducao")); + item.setAliquota(rset.getString("aliquota")); + item.setImposto(rset.getBigDecimal("imposto")); + item.setNumpdv(rset.getString("numpdv")); + item.setCnpj(rset.getString("cnpj")); + item.setGtFinal(rset.getBigDecimal("gtFinal")); + item.setGtInicial(rset.getBigDecimal("gtInicial")); + item.setStatus(rset.getString("status")); + listRedZ.add(item); + } + + return listRedZ; + } + + private String sqlFiscaisECFCancelados(boolean isEstadoTodos, boolean isBoletoHist) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT DISTINCT r4.numserie20 as numImpressora, "); + sql.append(" r4.coo as coo, "); + sql.append(" r4.imptotalliquido as valorTotal, "); + sql.append(" r4.datamov as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" r4.boleto_id as boletoId, "); + sql.append(" me.empresa_id as empresaId, "); + sql.append(" co.codibge as origenId, "); + sql.append(" eo.codibge as origenUf, "); + sql.append(" cd.codibge as destinoId, "); + sql.append(" ed.codibge as destinoUf, "); + sql.append(" fi.numcnpj as cnpjImpressora, "); + sql.append(" fi.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" fi.modelo as modeloImpressora, "); + sql.append(" r4.usuario_id as numCaixa, "); + sql.append(" cajb.preciopagado as importetarifa, "); + sql.append(" cajb.importetaxaembarque as importetaxaembarque, "); + sql.append(" cajb.importepedagio as importepedagio, "); + sql.append(" cajb.importeseguro as importeseguro, "); + sql.append(" 'C' as status, "); + sql.append(" cajb.motivocancelacion_id as motivocancelacion, "); + sql.append(" ee.impingreso as valorMulta, "); + sql.append(" cs.descclase as claseServicio, "); + sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf "); + + sql.append(" FROM "); + if (isBoletoHist) + sql.append(" caja_hist caj "); + else + sql.append(" caja caj "); + + sql.append(" INNER JOIN "); + if (isBoletoHist) + sql.append(" caja_hist cajb "); + else + sql.append(" caja cajb "); + + sql.append(" on (((cajb.feccorrida = caj.feccorrida) or (cajb.feccorrida is null and caj.feccorrida is null)) "); + sql.append(" and ((cajb.numasiento = caj.numasiento) or (cajb.numasiento is null and caj.numasiento is null)) "); + sql.append(" and cajb.numfoliosistema = caj.numfoliosistema and cajb.origen_id = caj.origen_id and cajb.destino_id=caj.destino_id "); + sql.append(" and ((cajb.tipoventa_id not in (5,12,18,81,41,49) "); + sql.append(" and (cajb.indstatusboleto = 'V' or (cajb.indstatusboleto = 'T' and cajb.indreimpresion=0) )) "); + sql.append(" or (cajb.tipoventa_id in (5,12,18,81,41,49) and cajb.indstatusboleto = 'E')) ) "); + sql.append(" INNER JOIN fiscal_r4 r4 on r4.caja_id = cajb.caja_id "); + sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 and r4.coo = r5.coo "); + sql.append(" and r4.datamov = r5.datamov and r4.contador = r5.contador "); + sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 "); + sql.append(" INNER JOIN marca me ON me.marca_id = cajb.marca_id "); + sql.append(" INNER JOIN clase_servicio cs ON cs.claseservicio_id = cajb.claseservicio_id "); + sql.append(" LEFT JOIN evento_extra ee on ee.boleto_id = r4.boleto_id and ee.tipoeventoextra_id in (42) "); + sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = cajb.origen_id "); + sql.append(" and ase.destino_id = caj.destino_id and ase.ruta_id = cajb.ruta_id and ase.activo = 1 and ase.corrida_id is null "); + sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, cajb.origen_id) = o.parada_id "); + sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); + sql.append(" INNER JOIN estado eo ON eo.estado_id = co.estado_id "); + sql.append(" INNER JOIN parada d ON coalesce(ase.aliasdestino_id, cajb.destino_id) = d.parada_id "); + sql.append(" INNER JOIN ciudad cd ON d.ciudad_id = cd.ciudad_id "); + sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id "); + sql.append(" WHERE caj.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and caj.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); + sql.append(" and me.empresa_id = :EMPRESA_ID "); + sql.append(isEstadoTodos ? "" : " AND eo.estado_id = :ESTADO_ID "); + sql.append(" and caj.motivocancelacion_id IN (31,32,10,37,99,36) "); + sql.append(" and caj.indcancelacion = 1 "); + sql.append(" and caj.indstatusboleto = 'C' "); + sql.append(" and r4.indcancelamento = 'N' "); + sql.append(" and caj.num_bpe is null "); + sql.append(" ORDER BY r4.datamov, "); + sql.append(" r4.numserie20, "); + sql.append(" r4.coo, "); + sql.append(" r5.numitem "); + return sql.toString(); + } + + private String sqlFiscaisECF(boolean isEstadoTodos, boolean isBoletoHist) { + + StringBuilder sql = new StringBuilder(); + sql.append("select distinct "); + sql.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as numImpressora, "); + sql.append(" (case when r4.caja_id is null then '000001' else r4.coo end) as coo, "); + sql.append(" r4.imptotalliquido as valorTotal, "); + sql.append(" to_char(c.feccreacion, 'yyyymmdd') as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" c.caja_id as boletoId, "); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenId, "); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as origenUf, "); + sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoId, "); + sql.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as destinoUf, "); + sql.append(" imp.numcnpj as cnpjImpressora, "); + sql.append(" imp.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" imp.modelo as modeloImpressora, "); + sql.append(" c.usuario_id as numCaixa, "); + sql.append(" c.preciopagado as importetarifa, "); + sql.append(" c.importetaxaembarque as importetaxaembarque, "); + sql.append(" c.importepedagio as importepedagio, "); + sql.append(" c.importeseguro as importeseguro, "); + sql.append(" cs.descclase AS claseServicio, "); + sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, "); + sql.append(" (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as impostoEstado, "); + sql.append(" 'N' as status, "); + sql.append(" r4.indcancelamento AS indcancelamento "); + + if (isBoletoHist) + sql.append(" from caja_hist c "); + else + sql.append(" from caja c "); + + sql.append(" join ruta r on r.ruta_id = c.ruta_id "); + sql.append(" join parada po on po.parada_id = c.origen_id "); + sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append(" join parada pd on pd.parada_id = c.destino_id "); + sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); + sql.append(" join estado ed on ed.estado_id = cd.estado_id "); + sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id "); + sql.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal "); + sql.append(" left join clase_servicio cs on cs.claseservicio_id = c.claseservicio_id "); + sql.append(" left join estado e on e.estado_id = imp.estadolocal_id "); + sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); + sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); + sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); + sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id "); + sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id "); + sql.append(" left join fiscal_r5 r5 on r4.numserie20 = r5.numserie20 and r4.coo = r5.coo and r4.datamov = r5.datamov and r4.contador = r5.contador "); + sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') "); + sql.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1 "); + sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); + sql.append(" and c.serieimpfiscal is not null "); + sql.append(" and c.num_bpe is null "); + sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); + // sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); + // sql.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); + sql.append(" and c.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); + sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); + sql.append(isEstadoTodos ? "" : " and ((case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) = :ESTADO_ID )"); + sql.append("order by dataEmissao, numImpressora, coo, numItem"); + return sql.toString(); + } + + private String sqlFiscaisECFPendenciasDesconto(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT r4.numserie20 as numImpressora, "); + sql.append(" r4.coo as coo, "); + sql.append(" r4.imptotalliquido as valorTotal, "); + sql.append(" r4.datamov as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" fi.numcnpj as cnpjImpressora, "); + sql.append(" fi.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" fi.modelo as modeloImpressora, "); + sql.append(" r4.usuario_id as numCaixa, "); + sql.append(" r5.impdesconto as desconto, "); + sql.append(" 'DESCONTO' as status"); + sql.append(" FROM fiscal_r4 r4 "); + sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); + sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); + sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); + sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); + sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); + sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); + + sql.append(" INNER JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); + sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); + sql.append(" LEFT JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); + sql.append(" WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); + sql.append(" AND m.empresa_id = :EMPRESA_ID "); + sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); + sql.append(" AND r5.impdesconto <> 0 "); + sql.append(" GROUP BY r4.numserie20, r4.coo, r4.datamov, r4.cpfcnpjcliente, "); + sql.append(" r4.imptotalliquido, fi.numcnpj, fi.numserie, r5.impdesconto, "); + sql.append(" r5.totparcial, r5.imptotalliquido, r5.tipopassagem, "); + sql.append(" r5.numitem, r5.codproduto, fi.modelo, r4.usuario_id "); + sql.append(" ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); + return sql.toString(); + } + + private String sqlFiscaisECFPendenciasCancelado(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT r4.numserie20 as numImpressora, "); + sql.append(" r4.coo as coo, "); + sql.append(" r4.imptotalliquido as valorTotal, "); + sql.append(" r4.datamov as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" b.boleto_id as boletoId, "); + sql.append(" m.empresa_id as empresaId, "); + sql.append(" fi.numcnpj as cnpjImpressora, "); + sql.append(" fi.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" fi.modelo as modeloImpressora, "); + sql.append(" r4.usuario_id as numCaixa, "); + sql.append(" b.preciopagado as importetarifa, "); + sql.append(" b.importetaxaembarque as importetaxaembarque, "); + sql.append(" b.importepedagio as importepedagio, "); + sql.append(" b.importeseguro as importeseguro, "); + sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf, "); + sql.append(" r4.indcancelamento, "); + sql.append(" 'CANCELADO' as status "); + sql.append("FROM fiscal_r4 r4 "); + sql.append(" INNER JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); + sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); + sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); + sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); + sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); + sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); + sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); + sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); + sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); + sql.append("WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); + sql.append(" AND m.empresa_id = :EMPRESA_ID "); + sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); + sql.append(" AND r4.indcancelamento = 'S' "); + sql.append(" AND (SELECT r3.numserie20 FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20"); + sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T')) IS NOT NULL "); + sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, "); + sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); + sql.append(" b.boleto_id, m.empresa_id, fi.numcnpj, "); + sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); + sql.append(" r5.imptotalliquido, r5.tipopassagem, r5.numitem, "); + sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); + sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); + sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); + sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); + return sql.toString(); + } + + private String sqlFiscaisECFPendenciasGratuidade(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT r4.numserie20 as numImpressora, "); + sql.append(" r4.coo as coo, "); + sql.append(" r4.imptotalliquido as valorTotal, "); + sql.append(" r4.datamov as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" b.boleto_id as boletoId, "); + sql.append(" m.empresa_id as empresaId, "); + sql.append(" fi.numcnpj as cnpjImpressora, "); + sql.append(" fi.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" fi.modelo as modeloImpressora, "); + sql.append(" r4.usuario_id as numCaixa, "); + sql.append(" b.preciopagado as importetarifa, "); + sql.append(" b.importetaxaembarque as importetaxaembarque, "); + sql.append(" b.importepedagio as importepedagio, "); + sql.append(" b.importeseguro as importeseguro, "); + sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf, "); + sql.append(" r4.indcancelamento, "); + sql.append(" 'GRATUIDADE' as status "); + sql.append("FROM fiscal_r4 r4 "); + sql.append(" INNER JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); + sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); + sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); + sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); + sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); + sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); + sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); + sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); + sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); + sql.append("WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); + sql.append(" AND m.empresa_id = :EMPRESA_ID "); + sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); + sql.append(" AND r5.imptotalliquido = 1 "); + sql.append(" AND b.preciopagado = 0 "); + sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, "); + sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); + sql.append(" b.boleto_id, m.empresa_id, fi.numcnpj, "); + sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); + sql.append(" r5.imptotalliquido, r5.tipopassagem, r5.numitem, "); + sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); + sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); + sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); + sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); + return sql.toString(); + } + + private String sqlFiscaisECFPendenciasInconsistente(boolean isEstadoTodos) { + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT r4.numserie20 as numImpressora, "); + sql.append(" r4.coo as coo, "); + sql.append(" r4.imptotalliquido as valorTotal, "); + sql.append(" r4.datamov as dataEmissao, "); + sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); + sql.append(" b.boleto_id as boletoId, "); + sql.append(" m.empresa_id as empresaId, "); + sql.append(" fi.numcnpj as cnpjImpressora, "); + sql.append(" fi.numserie as numpdv, "); + sql.append(" r5.totparcial as repTributado, "); + sql.append(" r5.imptotalliquido as valorItem, "); + sql.append(" r5.tipopassagem as tipoPassagem, "); + sql.append(" r5.numitem as numItem, "); + sql.append(" r5.codproduto as codProduto, "); + sql.append(" fi.modelo as modeloImpressora, "); + sql.append(" r4.usuario_id as numCaixa, "); + sql.append(" b.preciopagado as importetarifa, "); + sql.append(" b.importetaxaembarque as importetaxaembarque, "); + sql.append(" b.importepedagio as importepedagio, "); + sql.append(" b.importeseguro as importeseguro, "); + sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf, "); + sql.append(" r4.indcancelamento, "); + sql.append(" 'INCONSISTENTE' as status "); + sql.append("FROM fiscal_r4 r4 "); + sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo "); + sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); + sql.append(" LEFT JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 AND fi.fiscalimpressora_id = r5.fiscalimpressora_id "); + sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id "); + sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id "); + sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id "); + sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null "); + sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id "); + sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id "); + sql.append("WHERE r4.datamov BETWEEN :STR_INICIO AND :STR_FIM "); + sql.append(" AND m.empresa_id = :EMPRESA_ID "); + sql.append(isEstadoTodos ? "" : " AND co.estado_id = :ESTADO_ID "); + sql.append(" AND r4.indcancelamento = 'S' "); + sql.append(" AND (SELECT MAX(r3.numserie20) FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20"); + sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T', 'DT')) IS NULL "); + sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, "); + sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); + sql.append(" b.boleto_id, m.empresa_id, fi.numcnpj, "); + sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); + sql.append(" r5.imptotalliquido, r5.tipopassagem, r5.numitem, "); + sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); + sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); + sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); + sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem "); + return sql.toString(); + } + + @Override + public List buscaDatosFiscaisECF(Date inicio, Date fim, Integer empresaId, Integer estadoId, boolean isNormal, boolean isCancelados, boolean isPendencias, Connection connection, boolean isBoletoHist) throws SQLException { + + if (isNormal) { + return montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECF(isEstadoTodos(estadoId), isBoletoHist), true); + + } else if (isCancelados) { + return montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFCancelados(isEstadoTodos(estadoId), isBoletoHist), true); + + } else if (isPendencias) { + + List list = new ArrayList(); + list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasCancelado(isEstadoTodos(estadoId)), false)); + list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasDesconto(isEstadoTodos(estadoId)), false)); + list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasInconsistente(isEstadoTodos(estadoId)), false)); + list.addAll(montarItensECF(inicio, fim, empresaId, estadoId, connection, sqlFiscaisECFPendenciasGratuidade(isEstadoTodos(estadoId)), false)); + return list; + + } + return null; + } + + private List montarItensECF(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection, String sql, boolean isDate) throws SQLException { + + boolean isEstadoTodos = isEstadoTodos(estadoId); + + NamedParameterStatement stmt = new NamedParameterStatement(connection, sql); + stmt.getStatement().setFetchSize(100); + + stmt.setInt("EMPRESA_ID", empresaId); + if (isDate) { + stmt.setString("DATE_INICIO", DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + stmt.setString("DATE_FIM", DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + } else { + stmt.setString("STR_INICIO", DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); + stmt.setString("STR_FIM", DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); + } + + if (!isEstadoTodos) { + stmt.setInt("ESTADO_ID", estadoId); + } + + List list = new ArrayList(); + ImportacionFiscalVO fiscal = null; + String codProduto = null; + + List columns = new ArrayList(); + ResultSetMetaData rsMetaData = stmt.getStatement().getMetaData(); + for (int i = 1; i <= rsMetaData.getColumnCount(); i++) { + columns.add(rsMetaData.getColumnName(i).toLowerCase()); + } + + ResultSet rset = stmt.executeQuery(); + while (rset.next()) { + + ItemFiscalVO item = new ItemFiscalVO(); + item.setNumImpressora(columns.contains("numimpressora") ? rset.getString("numImpressora") : null); + item.setCoo(columns.contains("coo") ? rset.getString("coo") : null); + item.setBoletoId(columns.contains("boletoid") ? rset.getLong("boletoId") : null); + item.setEmpresaId(columns.contains("empresaid") ? rset.getInt("empresaId") : null); + item.setDataEmissao(columns.contains("dataemissao") ? rset.getString("dataEmissao") : null); + item.setCnpjCliente(columns.contains("cnpjcliente") ? rset.getString("cnpjCliente") : null); + item.setCnpjImpressora(columns.contains("cnpjimpressora") ? rset.getString("cnpjImpressora") : null); + item.setOrigenId(columns.contains("origenid") ? rset.getInt("origenId") : null); + + Integer origenIbge = (columns.contains("origenuf") ? rset.getInt("origenUf") : null); + item.setOrigenUf(origenIbge == null ? null : origenIbge.toString()); + + item.setDestinoId(columns.contains("destinoid") ? rset.getInt("destinoId") : null); + + Integer destinoIbge = (columns.contains("destinouf") ? rset.getInt("destinoUf") : null); + item.setDestinoUf(destinoIbge == null ? null : destinoIbge.toString()); + + item.setNumpdv(columns.contains("numpdv") ? rset.getString("numpdv") : null); + item.setNumItem(columns.contains("numitem") ? rset.getString("numItem") : null); + item.setCodProduto(columns.contains("codproduto") ? rset.getString("codProduto") : null); + item.setRepTributado(columns.contains("reptributado") ? rset.getString("repTributado") : null); + item.setTipoPassagem(columns.contains("tipopassagem") ? rset.getString("tipoPassagem") : null); + item.setModeloImpressora(columns.contains("modeloimpressora") ? rset.getString("modeloImpressora") : null); + item.setNumCaixa(columns.contains("numcaixa") ? rset.getString("numCaixa") : null); + item.setStatus(columns.contains("status") ? rset.getString("status") : null); + item.setClaseServicio(columns.contains("claseservicio") ? rset.getString("claseServicio") : null); + item.setMotivocancelacion(columns.contains("motivocancelacion") ? rset.getInt("motivocancelacion") : null); + item.setValorMulta(columns.contains("valormulta") ? rset.getBigDecimal("valorMulta") : null); + item.setImpostoEstado(columns.contains("impostoestado") ? rset.getBigDecimal("impostoEstado") : null); + item.setDesconto(columns.contains("desconto") ? rset.getBigDecimal("desconto") : null); + item.setIndcancelamento(columns.contains("indcancelamento") ? rset.getString("indcancelamento") : null); + + // TODO: Estes atributos foram criados, por motivo de divergencia no valorTotal com o valor unitario na tabela FISCAL_R5 + item.setValorTarifa(columns.contains("importetarifa") ? rset.getBigDecimal("importetarifa") : null); + item.setValorPedagio(columns.contains("importepedagio") ? rset.getBigDecimal("importepedagio") : null); + item.setValorEmbarque(columns.contains("importetaxaembarque") ? rset.getBigDecimal("importetaxaembarque") : null); + item.setValorSeguro(columns.contains("importeseguro") ? rset.getBigDecimal("importeseguro") : null); + + ImportacionFiscalVO novoFiscal = item; + + codProduto = item.getCodProduto(); + if (codProduto != null) { + codProduto = codProduto.toString().replace("-", "").replace("TA", "").replace("TX", "").replace("PE", "").replace("SE", ""); + } else { + String boleto = item.getBoletoId().toString(); + codProduto = boleto.substring(boleto.length() - 8) + "F" + boleto.substring(boleto.length() - 2); + } + + if (fiscal == null) { + fiscal = item; + } else if (!novoFiscal.equals(fiscal)) { + List itensFiscais = validaItensFiscais(fiscal, codProduto); + fiscal.setItensFiscais(itensFiscais); + list.add(fiscal); + fiscal = item; + } + + fiscal.getItensFiscais().add(item); + + } + + if (fiscal != null) { + List itensFiscais = validaItensFiscais(fiscal, codProduto); + fiscal.setItensFiscais(itensFiscais); + list.add(fiscal); + } + + return list; + } + + private boolean validaValorExiste(BigDecimal valor) { + if (valor == null) { + return Boolean.FALSE; + } else if (valor.equals(BigDecimal.ZERO)) { + return Boolean.FALSE; + } else { + return Boolean.TRUE; + } + } + + private List validaItensFiscais(ImportacionFiscalVO fiscal, String codProduto) { + + boolean temTarifa = validaValorExiste(fiscal.getValorTarifa()); + boolean temPedagio = validaValorExiste(fiscal.getValorPedagio()); + boolean temEmbarque = validaValorExiste(fiscal.getValorEmbarque()); + boolean temSeguro = validaValorExiste(fiscal.getValorSeguro()); + + boolean tarifaCriada = false; + boolean pedagioCriada = false; + boolean embarqueCriada = false; + boolean seguroCriada = false; + + boolean inconsistencia = false; + + List itensFiscais = new ArrayList(); + for (ItemFiscalVO item : fiscal.getItensFiscais()) { + + String codigoProduto = item.getCodProduto(); + if (codigoProduto != null) { + if (codigoProduto.indexOf("TA") >= 0) + tarifaCriada = true; + + if (codigoProduto.indexOf("TX") >= 0) + embarqueCriada = true; + + if (codigoProduto.indexOf("PE") >= 0) + pedagioCriada = true; + + if (codigoProduto.indexOf("SE") >= 0) + seguroCriada = true; + } else { + inconsistencia = true; + break; + } + + itensFiscais.add(item); + } + + int numeroItem = 1; + if (temTarifa && !tarifaCriada) { + ItemFiscalVO novoTarifa = new ItemFiscalVO(fiscal); + novoTarifa.setCodProduto(codProduto + "-TA"); + novoTarifa.setTipoPassagem("E"); + novoTarifa.setValorItem(fiscal.getValorTarifa()); + novoTarifa.setRepTributado("N1"); + novoTarifa.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); + novoTarifa.setInconsistencia(inconsistencia); + itensFiscais.add(novoTarifa); + } + + if (temEmbarque && !embarqueCriada) { + ItemFiscalVO novoEmbarque = new ItemFiscalVO(fiscal); + novoEmbarque.setCodProduto(codProduto + "-TX"); + novoEmbarque.setTipoPassagem("E"); + novoEmbarque.setValorItem(fiscal.getValorEmbarque()); + novoEmbarque.setRepTributado("N1"); + novoEmbarque.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); + novoEmbarque.setInconsistencia(inconsistencia); + itensFiscais.add(novoEmbarque); + } + + if (temPedagio && !pedagioCriada) { + ItemFiscalVO novoPedagio = new ItemFiscalVO(fiscal); + novoPedagio.setCodProduto(codProduto + "-PE"); + novoPedagio.setTipoPassagem("E"); + novoPedagio.setValorItem(fiscal.getValorPedagio()); + novoPedagio.setRepTributado("N1"); + novoPedagio.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); + novoPedagio.setInconsistencia(inconsistencia); + itensFiscais.add(novoPedagio); + } + + if (temSeguro && !seguroCriada) { + ItemFiscalVO novoSeguro = new ItemFiscalVO(fiscal); + novoSeguro.setCodProduto(codProduto + "-SE"); + novoSeguro.setTipoPassagem("E"); + novoSeguro.setValorItem(fiscal.getValorSeguro()); + novoSeguro.setRepTributado("N1"); + novoSeguro.setNumItem(StringHelper.preencherZeroEsquerda((numeroItem++) + "", 3)); + novoSeguro.setInconsistencia(inconsistencia); + itensFiscais.add(novoSeguro); + } + + return itensFiscais; + } + + private int gerarRegistroP2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { + Integer[] idsCorrida = getIdsCorrida(lsEsquemaCorrida); + + StringBuilder sb = new StringBuilder(""); + sb.append(" INSERT INTO FISCAL_P2 (CODPRODUTO,descricao,valorunitario_ta,valorunitario_tx,valorunitario_pe,valorunitario_ot,valorunitario_se,empresa_id,estado_origem,estado_aliascorrida,estado_aliasgeral, ncm) "); + sb.append(" "); + sb.append(" select DISTINCT "); + sb.append(" CODPRODUTO(t.origen_id , t.destino_id , rc.ruta_id) AS CODPRODUTO, "); + sb.append(" concat(concat(concat(concat(concat(po.cveparada, '-'),pd.cveparada),'('),v.nombvia),')') as descricao, "); + sb.append(" tr.precio as valorunitario_ta, "); + sb.append(" tr.importetaxaembarque as valorunitario_tx, "); + sb.append(" tr.importepedagio as valorunitario_pe, "); + sb.append(" tr.importeoutros as valorunitario_ot, "); + sb.append(" tr.importeseguro as valorunitario_se, "); + sb.append(" c.empresacorrida_id as empresa_id, "); + sb.append(" co.estado_id as estado_origem, "); + sb.append(" cas1.estado_id as estado_aliascorrida, "); + sb.append(" cas2.estado_id as estado_aliasgeral, "); + sb.append(" '1040311' as ncm "); + sb.append(" "); + sb.append(" from "); + sb.append(" ruta_combinacion rc "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sb.append(" inner join via v on v.via_id = t.via_id "); + sb.append(" inner join parada po on po.parada_id = t.origen_id "); + sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join corrida c on c.ruta_id = rc.ruta_id "); + sb.append(" inner join corrida_tramo cto on cto.corrida_id = c.corrida_id and cto.feccorrida = c.feccorrida and t.origen_id = cto.origen_id "); + sb.append(" inner join corrida_tramo ctd on ctd.corrida_id = c.corrida_id and ctd.feccorrida = c.feccorrida and t.destino_id = ctd.destino_id "); + sb.append(" inner join tarifa tr on tr.ruta_id = rc.ruta_id and tr.origen_id = t.origen_id and tr.destino_id = t.destino_id "); + sb.append(" inner join vigencia_tarifa vt on vt.vigenciatarifa_id = tr.vigenciatarifa_id "); + sb.append(" inner join ciudad co on co.ciudad_id = po.ciudad_id "); + sb.append(" left join alias_servico as1 on as1.corrida_id = as1.corrida_id and as1.origen_id = t.origen_id and as1.destino_id = t.destino_id and as1.ruta_id = rc.ruta_id "); + sb.append(" left join parada pas1 on pas1.parada_id = as1.aliasorigen_id "); + sb.append(" left join ciudad cas1 on cas1.ciudad_id = pas1.ciudad_id "); + sb.append(" left join alias_servico as2 on as2.corrida_id is null and as2.origen_id = t.origen_id and as2.destino_id = t.destino_id and as2.ruta_id = rc.ruta_id "); + sb.append(" left join parada pas2 on pas2.parada_id = as2.aliasorigen_id "); + sb.append(" left join ciudad cas2 on cas2.ciudad_id = pas2.ciudad_id "); + sb.append(" where "); + sb.append(" rc.activo = 1 "); + sb.append(" and cto.activo = 1 "); + sb.append(" and ctd.activo = 1 "); + sb.append(" and tr.activo = 1 "); + sb.append(" and cto.fechorsalida between vt.feciniciovigencia and vt.fecfinvigencia "); + sb.append(" and c.feccorrida between :datIni and :datFim "); + sb.append(" and c.corrida_id in (:corridaId) "); + sb.append(" and CODPRODUTO(t.origen_id , t.destino_id , rc.ruta_id) not in (select codproduto from fiscal_p2) "); + // sb.append(" and ROWNUM < 50 "); + + int qtd = 0; + + Connection connection = null; + try { + connection = dataSource.getConnection(); + + connection.setAutoCommit(false); + + PreparedStatement ps = connection.prepareStatement(sb.toString()); + + ps.setDate(1, new java.sql.Date(dataDe.getTime())); + ps.setDate(2, new java.sql.Date(dataAte.getTime())); + ps.setString(3, StringUtils.join(idsCorrida, ",")); + + qtd = ps.executeUpdate(); + + connection.commit(); + } catch (Throwable t) { + connection.rollback(); + } finally { + if (connection != null) { + connection.close(); + } + } + + return qtd; + + } + + private Integer[] getIdsCorrida(List lsEsquemaCorrida) { + Integer[] idsCorrida = new Integer[lsEsquemaCorrida.size()]; + int i = 0; + for (EsquemaCorrida ec : lsEsquemaCorrida) { + idsCorrida[i] = ec.getNumCorrida(); + i++; + } + return idsCorrida; + } + + private int gerarRegistroF2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { + StringBuilder sb = new StringBuilder(""); + sb.append(" INSERT INTO FISCAL_F2 (cnpj, codigo_local_emissao,identificacao_linha, descricao_linha, data_partida, hora_partida, codigo_tipo_viagem) "); + sb.append(" select distinct oc.cnpj, t.origen_id as codigo_local_emissao, r.prefixo as identificacao_linha, concat(concat(po.cveparada, '-'),pd.cveparada) as descricao, to_char(cto.fechorsalida, 'YYYYMMdd') as data_partida, to_char(cto.fechorsalida, 'hh24miss') as hora_partida, (case nvl(c.tiposervicio_id, 0) when 2 then '01' else '00' end) as codigo_tipo_viagem "); + sb.append(" from "); + sb.append(" ruta_combinacion rc "); + sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id = r.orgaoconcedente_id "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sb.append(" inner join parada po on po.parada_id = t.origen_id "); + sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join corrida c on c.ruta_id = rc.ruta_id "); + sb.append(" inner join corrida_tramo cto on cto.corrida_id = c.corrida_id and cto.feccorrida = c.feccorrida and t.origen_id = cto.origen_id "); + sb.append(" inner join corrida_tramo ctd on ctd.corrida_id = c.corrida_id and ctd.feccorrida = c.feccorrida and t.destino_id = ctd.destino_id "); + sb.append(" inner join tarifa tr on tr.ruta_id = rc.ruta_id and tr.origen_id = t.origen_id and tr.destino_id = t.destino_id "); + sb.append(" inner join vigencia_tarifa vt on vt.vigenciatarifa_id = tr.vigenciatarifa_id "); + sb.append(" inner join punto_venta pv on pv.empresa_id = c.empresacorrida_id "); + sb.append(" where "); + sb.append(" rc.activo = 1 "); + sb.append(" and cto.activo = 1 "); + sb.append(" and ctd.activo = 1 "); + sb.append(" and cto.fechorsalida between vt.feciniciovigencia and vt.fecfinvigencia "); + sb.append(" and c.feccorrida between :datIni and :datFim "); + sb.append(" and c.corrida_id in (:corridaId) "); + // sb.append(" and ROWNUM < 2 "); + + Integer[] idsCorrida = getIdsCorrida(lsEsquemaCorrida); + Connection connection = null; + + int qtd = 0; + + try { + connection = dataSource.getConnection(); + + connection.setAutoCommit(false); + + PreparedStatement ps = connection.prepareStatement(sb.toString()); + + ps.setDate(1, new java.sql.Date(dataDe.getTime())); + ps.setDate(2, new java.sql.Date(dataAte.getTime())); + ps.setString(3, StringUtils.join(idsCorrida, ",")); + + qtd = ps.executeUpdate(); + + connection.commit(); + + } catch (Throwable t) { + connection.rollback(); + } finally { + if (connection != null) { + connection.close(); + } + } + + return qtd; + } + + @Override + public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { + int gerarRegistroP2 = this.gerarRegistroP2(lsEsquemaCorrida, dataDe, dataAte); + int gerarRegistroF2 = this.gerarRegistroF2(lsEsquemaCorrida, dataDe, dataAte); + return gerarRegistroP2 + gerarRegistroF2; + } + + @Override + public List buscaDatosNaoFiscais(Date inicio, Date fim, Integer empresaId, Integer estadoId, Connection connection) throws SQLException { + PreparedStatement stmt = null; + ResultSet rset = null; + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT TEE.TIPOEVENTOEXTRA_ID AS TIPOEVENTOEXTRAID, TEE.DESCTIPOEVENTO AS DESCTIPOEVENTO, ") + .append(" TRUNC(CD.FECHORVTA) AS FECHORVTA, SUM(CD.PRECIO) AS TOTAL ") + .append("FROM TIPO_EVENTO_EXTRA TEE ") + .append("JOIN EVENTO_EXTRA EE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") + .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = EE.PUNTOVENTA_ID ") + .append("JOIN PARADA PA ON PA.PARADA_ID = PV.PARADA_ID ") + .append("JOIN CIUDAD CI ON CI.CIUDAD_ID = PA.CIUDAD_ID ") + .append("JOIN ESTADO ES ON ES.ESTADO_ID = CI.ESTADO_ID ") + .append("LEFT JOIN CAJA_DIVERSOS CD ON EE.EVENTOEXTRA_ID = CD.EVENTOEXTRA_ID ") + .append("WHERE TEE.ACTIVO = 1 ") + .append("AND EE.EMPRESA_ID = ? ") + .append("AND TRUNC(CD.FECHORVTA) BETWEEN ? AND ? ") + .append(isEstadoTodos(estadoId) ? "" : " AND ES.ESTADO_ID = ? ") + .append("GROUP BY TEE.TIPOEVENTOEXTRA_ID, TEE.DESCTIPOEVENTO, TRUNC(CD.FECHORVTA) ") + .append("ORDER BY TRUNC(CD.FECHORVTA), TEE.DESCTIPOEVENTO "); + + stmt = connection.prepareStatement(sQuery.toString()); + stmt.setInt(1, empresaId); + stmt.setDate(2, new java.sql.Date(inicio.getTime())); + stmt.setDate(3, new java.sql.Date(fim.getTime())); + + if (!isEstadoTodos(estadoId)) + stmt.setInt(4, estadoId); + + rset = stmt.executeQuery(); + List importacionNaoFiscalVOs = new ArrayList(); + while (rset.next()) { + ImportacionNaoFiscalVO importacionNaoFiscal = new ImportacionNaoFiscalVO(); + importacionNaoFiscal.setTipoeventoextraId(rset.getInt("TIPOEVENTOEXTRAID")); + importacionNaoFiscal.setDesctipoevento(rset.getString("DESCTIPOEVENTO")); + importacionNaoFiscal.setFechorvta(rset.getDate("FECHORVTA")); + importacionNaoFiscal.setTotal(rset.getBigDecimal("TOTAL")); + + importacionNaoFiscalVOs.add(importacionNaoFiscal); + } + + return importacionNaoFiscalVOs; + + } + + @Override + public ExportacaoECF buscarRegistroECF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + ExportacaoECF exportacaoECF = new ExportacaoECF(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select distinct"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie as numserie,"); + sb.append(" (case when r2.numserie20 is null then '000001' else r2.cooinicial end) as cooinicial,"); + sb.append(" (case when r2.numserie20 is null then '000001' else r2.coofinal end) as coofinal,"); + sb.append(" (case when r2.numserie20 is null then '000001' else r2.crz end) as crz,"); + sb.append(" (case when r2.numserie20 is null then '000001' else r2.cro end) as cro,"); + sb.append(" (case when r2.numserie20 is null then '000001' else r2.coo end) as r2_coo,"); + sb.append(" to_char(c.feccreacion, 'yyyymmdd') as datamov,"); + sb.append(" (case when r4.caja_id is null then '000001' else r4.coo end) as r4_coo,"); + sb.append(" (case when s.aliasorigen_id is null then ei.codestabelecimento else eis.codestabelecimento end) as codestabelecimento,"); + sb.append(" e.codestabelecimento as codestabelecimentoimpressora,"); + sb.append(" imp.numeroidentificacao as numeroidentificacao,"); + sb.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta,"); + sb.append(" ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado,"); + sb.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipio_origem,"); + sb.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estado_origem,"); + sb.append(" (case when s.aliasdestino_id is null then cd.codibge else cds.codibge end) as municipio_destino,"); + sb.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estado_destino,"); + sb.append(" (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as red_base_calc_icms,"); + sb.append(" (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porc_red_municipal,"); + sb.append(" (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porc_red_estadual,"); + sb.append(" (case when s.aliasorigen_id is null then ei.tributacaoimportacao else eis.tributacaoimportacao end) as tributacao_importacao,"); + sb.append(" coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0) as valortotal,"); + sb.append(" c.numfoliosistema as numfoliosistema,"); + sb.append(" c.caja_id"); + sb.append(" from caja c"); + sb.append(" join ruta r on r.ruta_id = c.ruta_id"); + sb.append(" join parada po on po.parada_id = c.origen_id and po.activo = 1 "); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id and co.activo = 1 "); + sb.append(" join estado eo on eo.estado_id = co.estado_id and eo.activo = 1 "); + sb.append(" join parada pd on pd.parada_id = c.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id and ei.activo = 1 "); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); + sb.append(" left join estado e on e.estado_id = imp.estadolocal_id"); + sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); + sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); + sb.append(" where c.activo = 1 "); + sb.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); + sb.append(" and c.serieimpfiscal is not null "); + sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); + sb.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); + sb.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); + sb.append(" and c.feccreacion >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); + sb.append(" and c.empresacorrida_id = ? "); + sb.append(" and c.num_bpe is null "); + sb.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = ?) "); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setLong(3, Long.valueOf(empresaId)); + ps.setString(4, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoECFBase registro = null; + + while (rs.next()) { + BigDecimal valortributado = BigDecimal.ZERO; + BigDecimal valortotal = BigDecimal.ZERO; + + if (rs.getBigDecimal("valortributado") != null) { + valortributado = rs.getBigDecimal("valortributado"); + } + + if (rs.getBigDecimal("valortotal") != null) { + valortotal = rs.getBigDecimal("valortotal"); + } + + registro = new ExportacaoECFBase(); + registro.setEcf(rs.getString("ecf")); + registro.setNumeroSerie(rs.getString("numserie")); + registro.setCooInicial(Integer.valueOf(rs.getString("cooinicial"))); + registro.setCooFinal(Integer.valueOf(rs.getString("coofinal"))); + registro.setContadorReducao(Integer.valueOf(rs.getString("crz"))); + registro.setCro(Integer.valueOf(rs.getString("cro"))); + registro.setCooReducaoZ(Integer.valueOf(rs.getString("r2_coo"))); + registro.setDataEmissao(rs.getString("datamov")); + registro.setCoo(Integer.valueOf(rs.getString("r4_coo"))); + registro.setEstabelecimento(rs.getString("codestabelecimento")); + registro.setEstabelecimentoECF(rs.getString("codestabelecimentoimpressora")); + registro.setNumeroIdentificacaoECF(rs.getString("numeroidentificacao") == null || rs.getString("numeroidentificacao").isEmpty() ? "0" : rs.getString("numeroidentificacao")); + registro.setUfOrigem(rs.getString("estado_origem")); + registro.setMunicipioOrigem(Integer.valueOf(rs.getString("municipio_origem"))); + registro.setMunicipioDestino(Integer.valueOf(rs.getString("municipio_destino"))); + registro.setUfDestino(rs.getString("estado_destino")); + registro.setReducaoBaseCalcICMS(rs.getBigDecimal("red_base_calc_icms")); + registro.setPorcReducaoMunicipal(rs.getBigDecimal("porc_red_municipal")); + registro.setPorcReducaoEstadual(rs.getBigDecimal("porc_red_estadual")); + registro.setTributacaoImportacao(rs.getBigDecimal("tributacao_importacao")); + registro.setNumFolioSistema(rs.getString("numFolioSistema")); + registro.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); + + registro.setIsenta(rs.getInt("isenta")); + registro.setValorTributado(valortributado); + registro.setValorTotal(valortotal); + + exportacaoECF.getListaRegistroECF().add(registro); + } + + rs.close(); + ps.close(); + + exportacaoECF.gerarListas(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return exportacaoECF; + } + + public void limparCache(Connection connection) { + + ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); + Constante contante = constanteService.buscarPorNomeConstante("LIMPA_CACHE_RELATORIOS"); + String command = null; + if ((contante != null && (StringUtils.isNotBlank(contante.getValorconstante())))) { + command = contante.getValorconstante(); + + PreparedStatement pstmt = null; + try { + pstmt = connection.prepareStatement(command); + pstmt.executeBatch(); + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (pstmt != null && !pstmt.isClosed()) { + pstmt.close(); + } + } catch (Exception e) { + log.error("", e); + } + } + } + } + + @Deprecated + @Override + public List buscarRegistroECFTipoCFC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select ecf, numserie, datamov, cooinicial, coofinal, crz, cro, coo, codestabelecimento, codestabelecimentoimpressora, numeroidentificacao, estadoorigem, sum(totalisenta) as totalisenta, sum(vendabrutadiaria) as vendabrutadiaria, sum(totgeral) as totgeral, sum(totalvenda) as totalvenda"); + sb.append(" from ("); + sb.append(" select distinct"); + sb.append(" imp.numserie20 as ecf,"); + sb.append(" imp.numserie as numserie,"); + sb.append(" r2.datamov as datamov,"); + sb.append(" r2.cooinicial as cooinicial,"); + sb.append(" r2.coofinal as coofinal,"); + sb.append(" r2.crz as crz,"); + sb.append(" r2.cro as cro,"); + sb.append(" r2.coo as coo,"); + sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN ei.codestabelecimento ELSE eis.codestabelecimento END as codestabelecimento,"); + sb.append(" e.codestabelecimento as codestabelecimentoimpressora,"); + sb.append(" imp.numeroidentificacao as numeroidentificacao,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estadoorigem,"); + sb.append(" coalesce(("); + sb.append(" select sum((coalesce(to_number(r4i.imptotalliquido), 0) / 100 - coalesce((select sum(to_number(r5x.imptotalliquido) / 100) from fiscal_r5 r5x where r5x.contador = r4i.contador and r5x.numserie20 = r4i.numserie20 and r5x.totparcial like 'N1'), 0)))"); + sb.append(" from fiscal_r4 r4i"); + sb.append(" join caja ci on ci.caja_id = r4i.caja_id"); + sb.append(" join parada poi on poi.parada_id = ci.origen_id"); + sb.append(" join parada pdi on pdi.parada_id = ci.destino_id"); + sb.append(" left join alias_servico si on si.origen_id = ci.origen_id and si.destino_id = ci.destino_id and (si.corrida_id = ci.corrida_id or si.corrida_id is null) and si.ruta_id = ci.ruta_id"); + sb.append(" left join parada posi on posi.parada_id = si.aliasorigen_id"); + sb.append(" left join parada pdsi on pdsi.parada_id = si.aliasdestino_id"); + sb.append(" where r4i.numserie20 = r4.numserie20 and r4i.datamov = r2.datamov"); + sb.append(" and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))"); + sb.append(" ), 0) as totalisenta,"); + sb.append(" to_number(r2.vendabrutadiaria)/100 as vendabrutadiaria,"); + sb.append(" to_number(r2.totgeral)/100 as totgeral,"); + sb.append(" ("); + sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); + sb.append(" coalesce(("); + sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); + sb.append(" from fiscal_r5 r5x"); + sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); + sb.append(" ), 0)"); + sb.append(" ) as totalvenda,"); + sb.append(" b.boleto_id as caja_id"); + sb.append(" from fiscal_r4 r4"); + sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); + sb.append(" join fiscal_impressora imp on imp.numserie20 = r4.numserie20"); + sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = co.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = cos.estado_id"); + sb.append(" left join estado e on e.estado_id = imp.estadolocal_id"); + sb.append(" where b.activo = 1"); + sb.append(" and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); + sb.append(" and coalesce(r4.indcancelamento, 'N') <> 'S'"); + sb.append(" and r4.datamov >= ? and r4.datamov <= ?"); + sb.append(" and b.empresacorrida_id = ?"); + sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" UNION"); + sb.append(" select distinct"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie as numserie,"); + sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); + sb.append(" case when r2.numserie20 is null then '000001' else r2.cooinicial end as cooinicial,"); + sb.append(" case when r2.numserie20 is null then '000001' else r2.coofinal end as coofinal,"); + sb.append(" case when r2.numserie20 is null then '0000' else r2.crz end as crz,"); + sb.append(" case when r2.numserie20 is null then '0000' else r2.cro end as cro,"); + sb.append(" case when r2.numserie20 is null then '000000' else r2.coo end as coo,"); + sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN ei.codestabelecimento ELSE eis.codestabelecimento END as codestabelecimento,"); + sb.append(" e.codestabelecimento as codestabelecimentoimpressora,"); + sb.append(" imp.numeroidentificacao as numeroidentificacao,"); + sb.append(" CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END as estadoorigem,"); + sb.append(" ("); + sb.append(" select nvl(sum(ci.preciopagado), 0)"); + sb.append(" from caja ci"); + sb.append(" join parada poi on poi.parada_id = ci.origen_id"); + sb.append(" join parada pdi on pdi.parada_id = ci.destino_id"); + sb.append(" left join alias_servico si on si.origen_id = ci.origen_id and si.destino_id = ci.destino_id and (si.corrida_id = ci.corrida_id or si.corrida_id is null) and si.ruta_id = ci.ruta_id"); + sb.append(" left join parada posi on posi.parada_id = si.aliasorigen_id"); + sb.append(" left join parada pdsi on pdsi.parada_id = si.aliasdestino_id"); + sb.append(" where ci.caja_id = c.caja_id"); + sb.append(" and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))"); + sb.append(" ) as totalisenta,"); + sb.append(" 0 as vendabrutadiaria,"); + sb.append(" ("); + sb.append(" select nvl(sum(ci.preciopagado + ci.importetaxaembarque + ci.importeseguro + ci.importepedagio + ci.importeoutros), 0)"); + sb.append(" from caja ci"); + sb.append(" where ci.caja_id = c.caja_id"); + sb.append(" ) as totgeral,"); + sb.append(" ("); + sb.append(" select nvl(sum(ci.preciopagado), 0)"); + sb.append(" from caja ci"); + sb.append(" where ci.caja_id = c.caja_id"); + sb.append(" ) as totalvenda,"); + sb.append(" c.caja_id"); + sb.append(" from caja c"); + sb.append(" join parada po on po.parada_id = c.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = co.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); + sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = cos.estado_id"); + sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); + sb.append(" left join estado e on e.estado_id = imp.estadolocal_id"); + sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); + sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); + sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); + sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); + sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); + sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); + sb.append(" and c.empresacorrida_id = ?"); + sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" )"); + sb.append(" having sum(totalvenda) > 0"); + sb.append(" group by ecf, numserie, datamov, cooinicial, coofinal, crz, cro, coo, codestabelecimento, codestabelecimentoimpressora, numeroidentificacao, estadoorigem"); + sb.append(" order by datamov"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); + ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); + ps.setLong(3, Long.valueOf(empresaId)); + ps.setString(4, cveestado); + ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); + ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); + ps.setLong(7, Long.valueOf(empresaId)); + ps.setString(8, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoECFTipoCFC registro = null; + + while (rs.next()) { + BigDecimal totalIsenta = BigDecimal.ZERO; + BigDecimal totalvenda = BigDecimal.ZERO; + + if (rs.getBigDecimal("totalisenta") != null) { + totalIsenta = rs.getBigDecimal("totalisenta"); + } + + if (rs.getBigDecimal("totalvenda") != null) { + totalvenda = rs.getBigDecimal("totalvenda"); + } + + registro = new ExportacaoECFTipoCFC(); + registro.setEstabelecimento(rs.getString("codestabelecimento")); + registro.setDataEmissao(rs.getString("datamov")); + registro.setNumeroIdentificacaoECF(rs.getString("numeroidentificacao") == null || rs.getString("numeroidentificacao").isEmpty() ? "0" : rs.getString("numeroidentificacao")); + registro.setEcf(rs.getString("ecf")); + registro.setCooReducaoZ(Integer.valueOf(rs.getString("coo"))); + registro.setCooInicial(Integer.valueOf(rs.getString("cooinicial"))); + registro.setCooFinal(Integer.valueOf(rs.getString("coofinal"))); + registro.setContadorReducao(Integer.valueOf(rs.getString("crz"))); + registro.setCro(Integer.valueOf(rs.getString("cro"))); + registro.setValorTotal(totalvenda); + registro.setValorIsentas(totalIsenta); + registro.setEstabelecimentoECF(rs.getString("codestabelecimentoimpressora")); + registro.setNumeroSerie(rs.getString("numserie")); + registro.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); + + retorno.add(registro); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Deprecated + @Override + public List buscarRegistroECFTipoCCF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select ecf, datamov, coo, sum(valortarifa) as valortarifa, sum(preciopagado) as preciopagado, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta, numfoliosistema, sum(valortotal) as valortotal"); + sb.append(" from ("); + sb.append(" select distinct"); + sb.append(" r4.numserie20 as ecf,"); + sb.append(" r4.datamov as datamov,"); + sb.append(" r4.coo as coo,"); + sb.append(" ("); + sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); + sb.append(" coalesce(("); + sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); + sb.append(" from fiscal_r5 r5x"); + sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); + sb.append(" ), 0)"); + sb.append(" ) as valortarifa,"); + sb.append(" c.preciopagado as preciopagado,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); + sb.append(" to_number(r4.impsubtotal)/100 as valortotal,"); + sb.append(" b.numfoliosistema as numfoliosistema,"); + sb.append(" b.boleto_id as caja_id"); + sb.append(" from fiscal_r4 r4"); + sb.append(" left join fiscal_r5 r5 on r5.numserie20 = r4.numserie20 and r5.coo = r4.coo and r5.totparcial not like 'N1'"); + sb.append(" left join caja c on c.caja_id = r4.caja_id"); + sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); + sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = b.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" where coalesce(r4.indcancelamento, 'N') <> 'S' and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1 and b.activo = 1 and r4.datamov >= ? and r4.datamov <= ? and b.empresacorrida_id = ? and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" UNION"); + sb.append(" select distinct"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); + sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); + sb.append(" '000001' as coo,"); + sb.append(" c.preciopagado as valortarifa,"); + sb.append(" c.preciopagado as preciopagado,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); + sb.append(" c.preciopagado + c.importetaxaembarque + c.importeseguro + c.importepedagio + c.importeoutros as valortotal,"); + sb.append(" c.numfoliosistema as numfoliosistema,"); + sb.append(" c.caja_id"); + sb.append(" from caja c"); + sb.append(" join parada po on po.parada_id = c.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = c.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); + sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); + sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); + sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); + sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); + sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); + sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); + sb.append(" and (c.preciopagado + c.importetaxaembarque + c.importeseguro + c.importepedagio + c.importeoutros) > 0"); + sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); + sb.append(" and c.empresacorrida_id = ?"); + sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" ) "); + sb.append(" group by ecf, datamov, coo, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta, numfoliosistema"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); + ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); + ps.setLong(3, Long.valueOf(empresaId)); + ps.setString(4, cveestado); + ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); + ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); + ps.setLong(7, Long.valueOf(empresaId)); + ps.setString(8, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoECFTipoCCF registro = null; + + while (rs.next()) { + BigDecimal valorTributado = BigDecimal.ZERO; + + if (rs.getString("valortarifa") != null) { + valorTributado = BigDecimal.valueOf(Double.valueOf(rs.getString("valortarifa"))); + } else { + valorTributado = rs.getBigDecimal("preciopagado"); + + log.info("Tarifa nao encontrada na R5. (ECF: " + rs.getString("ecf") + " / DATAMOV: " + rs.getString("datamov") + " / COO: " + rs.getString("coo") + ")"); + } + + registro = new ExportacaoECFTipoCCF(); + registro.setEcf(rs.getString("ecf")); + registro.setDataEmissao(rs.getString("datamov")); + registro.setCoo(Integer.valueOf(rs.getString("coo"))); + registro.setValorServico(valorTributado); + registro.setDescontoGlobal(null); + registro.setCodigoParticipante(null); + registro.setSituacaoCOO(0); // 0 - Documento Regular; 2 - Documento Cancelado + registro.setAcrescimo(null); + registro.setNumFolioSistema(rs.getString("numFolioSistema")); + + registro.setCodigoSituacaoTribColunaB(null); + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (rs.getInt("isenta") == 1) { + registro.setCodigoSituacaoTribColunaB(40); + } + + registro.setUfOrigem(rs.getString("estado_origem")); + registro.setMunicipioOrigem(Integer.valueOf(rs.getString("municipio_origem"))); + registro.setUfDestino(rs.getString("estado_destino")); + + // IM=5357; serviço IE= 6357 + if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + registro.setCfop(5357); + } else { + registro.setCfop(6357); + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (registro.getCodigoSituacaoTribColunaB() == null) { + registro.setCodigoSituacaoTribColunaB(rs.getInt("red_base_calc_icms") == 0 ? 0 : 20); + } + + // TODO: Mudança para o valor tributado (Email no dia 9 de agosto de 2017 08:28) + BigDecimal valorTotal = valorTributado; // BigDecimal.valueOf(Double.valueOf(rs.getString("valortotal"))); + + BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms"); + // BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal"); + // BigDecimal porc_red_estadual = rs.getBigDecimal("porc_red_estadual"); + BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + if ("30|40|41|50|60".contains(registro.getCodigoSituacaoTribColunaB().toString())) { + tributacao_importacao = BigDecimal.ZERO; + } + + if (red_base_calc_icms != null) { + valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); + } else { + // if (tributacao_importacao != null) { + // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + // if (porc_red_municipal != null) { + // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_municipal.divide(BigDecimal.valueOf(100d)))); + // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); + // } + // } else { + // if (porc_red_estadual != null) { + // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_estadual.divide(BigDecimal.valueOf(100d)))); + // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); + // } + // } + // } + + // Email 17/02/2017 + valorBaseCalculoICMS = valorTotal; + } + + if (rs.getInt("isenta") == 1) { + valorBaseCalculoICMS = null; + } + + registro.setValorTotal(valorTotal); + + // 1 - Demais; 2 - Região Metropolitanao ou seja, quando o campo CSTB for "40", esse campo deve vir "2". Do contrário, deve vir "1" + registro.setTributacaoICMS(registro.getCodigoSituacaoTribColunaB() == 40 ? 2 : 1); + + registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); + registro.setAliquotaICMS(tributacao_importacao); + + if (valorTotal.doubleValue() != 0) { + retorno.add(registro); + } + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Deprecated + @Override + public List buscarRegistroECFTipoICF(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select ecf, datamov, coo, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta, sum(valortotal) as valortotal"); + sb.append(" from ("); + sb.append(" select distinct"); + sb.append(" r4.numserie20 as ecf,"); + sb.append(" r4.datamov as datamov,"); + sb.append(" r4.coo as coo,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); + sb.append(" ("); + sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); + sb.append(" coalesce(("); + sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); + sb.append(" from fiscal_r5 r5x"); + sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); + sb.append(" ), 0)"); + sb.append(" ) as valortotal"); + sb.append(" from fiscal_r4 r4"); + sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); + sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = b.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" where coalesce(r4.indcancelamento, 'N') <> 'S' and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1 and b.activo = 1 and r4.datamov >= ? and r4.datamov <= ? and b.empresacorrida_id = ? and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" UNION"); + sb.append(" select distinct"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); + sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); + sb.append(" '000001' as coo,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN cd.codibge ELSE cds.codibge END) as municipio_destino,"); + sb.append(" (CASE WHEN s.aliasdestino_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); + sb.append(" (c.preciopagado) as valortotal"); + sb.append(" from caja c"); + sb.append(" join parada po on po.parada_id = c.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = c.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); + sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); + sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); + sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); + sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); + sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); + sb.append(" and (c.preciopagado) > 0"); + sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); + sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); + sb.append(" and c.empresacorrida_id = ?"); + sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" )"); + sb.append(" group by ecf, datamov, coo, municipio_origem, estado_origem, municipio_destino, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, isenta"); + sb.append(" order by ecf, datamov"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); + ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); + ps.setLong(3, Long.valueOf(empresaId)); + ps.setString(4, cveestado); + ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); + ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); + ps.setLong(7, Long.valueOf(empresaId)); + ps.setString(8, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoECFTipoICF registro = null; + + Map group = new HashMap(); + + while (rs.next()) { + BigDecimal valorTotal = rs.getBigDecimal("valortotal"); + + if (valorTotal == null || valorTotal.doubleValue() == 0) { + continue; + } + + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(rs.getBigDecimal("red_base_calc_icms")); + BigDecimal porc_red_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal")); + BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); + BigDecimal tributacao_importacao = MoneyHelper.instanciar(rs.getBigDecimal("tributacao_importacao")); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + if (red_base_calc_icms != null) { + BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); + valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); + } else { + // if (tributacao_importacao != null) { + // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + // if (porc_red_municipal != null) { + // BigDecimal aPorc_red_municipal = MoneyHelper.dividir(porc_red_municipal, BigDecimal.valueOf(100d)); + // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_municipal)); + // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); + // + // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); + // } + // } else { + // if (porc_red_estadual != null) { + // BigDecimal aPorc_red_estadual = MoneyHelper.dividir(porc_red_estadual, BigDecimal.valueOf(100d)); + // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_estadual)); + // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); + // + // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); + // } + // } + // } + + // Email 17/02/2017 + valorBaseCalculoICMS = valorTotal; + } + + BigDecimal valorICMSDebitado = BigDecimal.ZERO; + + if (tributacao_importacao != null) { + BigDecimal aTributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + valorICMSDebitado = MoneyHelper.multiplicar(valorBaseCalculoICMS, aTributacao_importacao); + } + + BigDecimal valorICMSIsento = BigDecimal.ZERO; + BigDecimal valorICMSOutros = MoneyHelper.subtrair(valorTotal, valorBaseCalculoICMS); + + String ecf = rs.getString("ecf"); + String datamov = rs.getString("datamov"); + String ufDestino = ""; + String ufOrigem = ""; + Integer municipioOrigem = 0; + Integer cfop = 0; // IM=5357; serviço IE= 6357 + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + Integer codigoSituacaoTribColunaB = null; + + if (rs.getInt("isenta") == 1) { + codigoSituacaoTribColunaB = 40; + + valorICMSOutros = valorTotal; + } + + ufDestino = rs.getString("estado_destino"); + ufOrigem = rs.getString("estado_origem"); + municipioOrigem = rs.getInt("municipio_origem"); + + // IM=5357; serviço IE= 6357 + if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + cfop = 5357; + } else { + cfop = 6357; + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (codigoSituacaoTribColunaB == null) { + codigoSituacaoTribColunaB = rs.getInt("red_base_calc_icms") == 0 ? 0 : 20; + } + + if (codigoSituacaoTribColunaB == 40) { + tributacao_importacao = BigDecimal.ZERO; + valorBaseCalculoICMS = BigDecimal.ZERO; + valorICMSDebitado = BigDecimal.ZERO; + valorICMSOutros = BigDecimal.ZERO; + + valorICMSIsento = valorTotal; + } + + String key = ecf + "|" + datamov + "|" + ufDestino + "|" + cfop.toString() + "|" + codigoSituacaoTribColunaB.toString(); + + if (group.containsKey(key)) { + registro = group.get(key); + + valorTotal = MoneyHelper.somar(valorTotal, registro.getValorTotal()); + valorBaseCalculoICMS = MoneyHelper.somar(valorBaseCalculoICMS, registro.getValorBaseCalculoICMS()); + valorICMSDebitado = MoneyHelper.somar(valorICMSDebitado, registro.getValorICMSDebitado()); + valorICMSIsento = MoneyHelper.somar(valorICMSIsento, registro.getValorICMSIsento()); + valorICMSOutros = MoneyHelper.somar(valorICMSOutros, registro.getValorICMSOutros()); + } else { + registro = new ExportacaoECFTipoICF(); + registro.setEcf(ecf); + registro.setDataEmissao(datamov); + registro.setUfDestino(ufDestino); + registro.setCfop(cfop); // IM=5357; serviço IE= 6357 + registro.setCodigoSituacaoTribColunaB(codigoSituacaoTribColunaB); // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + registro.setAliquotaICMS(tributacao_importacao); + registro.setUfOrigem(ufOrigem); + registro.setMunicipioOrigem(municipioOrigem); + + registro.setRedutorBaseCalculoIcms(red_base_calc_icms); + registro.setRedutorMunicipalIcms(porc_red_municipal); + registro.setRedutorEstadualIcms(porc_red_estadual); + + group.put(key, registro); + } + + registro.setValorTotal(valorTotal); + registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); + registro.setValorICMSDebitado(valorICMSDebitado); + registro.setValorICMSIsento(valorICMSIsento); + registro.setValorICMSOutros(valorICMSOutros); + } + + for (Map.Entry entry : group.entrySet()) { + retorno.add(entry.getValue()); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Deprecated + @Override + public List buscarRegistroECFTipoPRC(final Connection conn, final Date inicio, final Date fim, final Integer empresaId, final String cveestado) { + final List retorno = new ArrayList(); + + final StringBuilder sb = new StringBuilder(); + sb.append(" select ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, SUM(valortotal) as valortotal"); + sb.append(" from ("); + sb.append(" select distinct"); + sb.append(" r4.coo as coo,"); + sb.append(" r4.numserie20 as ecf,"); + sb.append(" r4.datamov as datamov,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" ("); + sb.append(" (to_number(coalesce(r4.imptotalliquido,'0')) / 100) - "); + sb.append(" coalesce(("); + sb.append(" select sum(to_number(coalesce(r5x.imptotalliquido,'0')) / 100)"); + sb.append(" from fiscal_r5 r5x"); + sb.append(" where r5x.contador = r4.contador and r5x.numserie20 = r4.numserie20 and r5x.totparcial like 'N1'"); + sb.append(" ), 0)"); + sb.append(" ) as valortotal,"); + sb.append(" b.boleto_id as caja_id"); + sb.append(" from fiscal_r4 r4"); + sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov"); + sb.append(" join boleto b on b.boleto_id = r4.boleto_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = b.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" where coalesce(r4.indcancelamento, 'N') <> 'S' and nvl(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1 and b.activo = 1 and r4.datamov >= ? and r4.datamov <= ? and b.empresacorrida_id = ? and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" UNION"); + sb.append(" select distinct"); + sb.append(" '000001' as coo,"); + sb.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as ecf,"); + sb.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" c.preciopagado as valortotal,"); + sb.append(" c.caja_id"); + sb.append(" from caja c"); + sb.append(" join parada po on po.parada_id = c.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = c.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal"); + sb.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id"); + sb.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD')"); + sb.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1"); + sb.append(" and coalesce(CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END, 0) = 1"); + sb.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1))"); + sb.append(" and (c.preciopagado) > 0"); + sb.append(" and c.serieimpfiscal is not null and r4.caja_id is null"); + sb.append(" and c.feccreacion >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS')"); + sb.append(" and c.empresacorrida_id = ?"); + sb.append(" and ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = ?)"); + sb.append(" ) group by ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao"); + + Session session = null; + + try { + session = getSessionFactory().openSession(); + + session.doWork(new Work() { + @Override + public void execute(Connection connection) throws SQLException { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); + ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); + ps.setLong(3, Long.valueOf(empresaId)); + ps.setString(4, cveestado); + ps.setString(5, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY + " 00:00:00")); + ps.setString(6, DateUtil.getStringDate(fim, DATE_FORMAT_DMY + " 23:59:59")); + ps.setLong(7, Long.valueOf(empresaId)); + ps.setString(8, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoECFTipoPRC registro = null; + + Map group = new HashMap(); + + while (rs.next()) { + BigDecimal valorTotal = rs.getBigDecimal("valortotal"); + + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(rs.getBigDecimal("red_base_calc_icms")); + // BigDecimal porc_red_municipal = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_municipal")); + // BigDecimal porc_red_estadual = MoneyHelper.instanciar(rs.getBigDecimal("porc_red_estadual")); + BigDecimal tributacao_importacao = MoneyHelper.instanciar(rs.getBigDecimal("tributacao_importacao")); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + if (tributacao_importacao != null) { + tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + } + + if (red_base_calc_icms != null) { + BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); + valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); + } else { + // if (tributacao_importacao != null) { + // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + // if (porc_red_municipal != null) { + // BigDecimal aPorc_red_municipal = MoneyHelper.dividir(porc_red_municipal, BigDecimal.valueOf(100d)); + // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_municipal)); + // + // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); + // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); + // } + // } else { + // if (porc_red_estadual != null) { + // BigDecimal aPorc_red_estadual = MoneyHelper.dividir(porc_red_estadual, BigDecimal.valueOf(100d)); + // BigDecimal porc = MoneyHelper.subtrair(tributacao_importacao, MoneyHelper.multiplicar(tributacao_importacao, aPorc_red_estadual)); + // + // BigDecimal aPorc = MoneyHelper.dividir(porc, BigDecimal.valueOf(100d)); + // valorBaseCalculoICMS = MoneyHelper.multiplicar(valorTotal, aPorc); + // } + // } + // } + + // Email 17/02/2017 + valorBaseCalculoICMS = valorTotal; + } + + BigDecimal valorICMS = BigDecimal.ZERO; + + if (tributacao_importacao != null) { + valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); + } + + String key = rs.getString("ecf") + "|" + rs.getString("datamov") + "|" + rs.getString("estado_origem") + "|" + rs.getString("municipio_origem"); + + if (group.containsKey(key)) { + registro = group.get(key); + + registro.setValorTotal(MoneyHelper.somar(registro.getValorTotal(), valorTotal)); + registro.setValorBaseCalculoICMS(MoneyHelper.somar(registro.getValorBaseCalculoICMS(), valorBaseCalculoICMS)); + registro.setValorICMS(MoneyHelper.somar(registro.getValorICMS(), valorICMS)); + + } else { + registro = new ExportacaoECFTipoPRC(); + registro.setEcf(rs.getString("ecf")); + registro.setDataEmissao(rs.getString("datamov")); + registro.setUfOrigem(rs.getString("estado_origem")); + registro.setMunicipioOrigem(Integer.valueOf(rs.getString("municipio_origem"))); + registro.setValorTotal(valorTotal); + registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); + registro.setValorICMS(valorICMS); + registro.setTributacao(tributacao_importacao); + } + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + retorno.add(entry.getValue()); + } + + rs.close(); + ps.close(); + } + }); + + } catch (Exception e) { + log.error(e.getMessage(), e); + + } finally { + session.close(); + + } + + return retorno; + } + + @Override + public ExportacaoBPR buscarRegistroBPR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + ExportacaoBPR exportacaoRMD = new ExportacaoBPR(); + + boolean isDif = validaConstanteCustom(empresaId.toString(), "IMPORT_FISCAL_DIF"); + + StringBuilder sb = new StringBuilder(); + sb.append(" select distinct"); + sb.append(" eof.estado_id as codigoParticipantePar,"); + sb.append(" eif.codestabelecimento as codigoEstabelecimentoPar,"); + sb.append(" e.nombempresa as nomeParticipante,"); + sb.append(" eof.cveestado as ufParticipante,"); + sb.append(" ie.cnpj as cnpjParticipante,"); + sb.append(" ie.numinscricaoestadual as ieParticipante,"); + sb.append(" ie.logradouro as logradouro,"); + sb.append(" ie.numero as numero,"); + sb.append(" ie.complemento as complemento,"); + sb.append(" ie.bairro as bairro,"); + sb.append(" ie.cep as cep,"); + sb.append(" cast(f.fechorfolio as date) as dataEmissaoRMD,"); + sb.append(" (case when s.aliasorigen_id is null then eo.estado_id else cos.estado_id end) as codigoParticipante,"); + sb.append(" ei.codestabelecimento as codigoEstabelecimento,"); + sb.append(" coalesce(a.acfiscal, 'X') as numeroAIDF,"); + sb.append(" coalesce(a.serie, 'X') as serieAIDF,"); + sb.append(" a.subserie as subSerieAIDF,"); + sb.append(" f.folio as numeroFormularioBilheteAIDF,"); + sb.append(" (case when coalesce(f.indcancelacion, 0) = 1 then 'S' else 'N' end) as documentoCancelado,"); + sb.append(" (case when (case when s.aliasorigen_id is null then eo.estado_id else cos.estado_id end) = "); + sb.append(" (case when s.aliasorigen_id is null then cd.estado_id else cds.estado_id end) "); + sb.append(" then ei.codigocontabilmunicipal else ei.codigocontabilestadual end) as codigoContabil,"); + sb.append(" b.feccreacion as dataEmissao,"); + sb.append(" b.numfoliopreimpreso as numeroFormulario,"); + sb.append(" r.acfiscal as numeroAIDFRMD,"); + sb.append(" r.serie as serieAIDFRMD,"); + sb.append(" r.subserie as subSerieAIDFRMD,"); + sb.append(" b.foliormd as numeroRMD,"); + sb.append(" (case when ( coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = "); + sb.append(" coalesce(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2) ) then 1 else 0 end) as boletoIsento,"); + sb.append(" (case when b.motivocancelacion_id is not null then 1 else 0 end) as boletoCancelado,"); + sb.append(" b.preciopagado as valorPago,"); + sb.append(" (case when s.aliasorigen_id is null then ed.cveestado else eds.cveestado end) as ufDestino,"); + sb.append(" (case when s.aliasorigen_id is null then cd.codibge else cds.codibge end) as municipioDestino,"); + sb.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as ufOrigem,"); + sb.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); + sb.append(" cie.codibge as municipioOrigemPadrao,"); + sb.append(" (case when ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) ="); + sb.append(" (case when s.aliasorigen_id is null then ed.cveestado else eds.cveestado end)) then 5357 else 6357 end) as cfop,"); + sb.append(" ei.porcredbaseicms as reducaoBaseCalcICMS,"); + sb.append(" ei.porcredmunicipal as porcReducaoMunicipal,"); + sb.append(" ei.porcredestadual as porcReducaoEstadual,"); + sb.append(" ei.tributacaoimportacao as tributacaoImportacao,"); + sb.append(" b.rmd_id,"); + sb.append(" coalesce(b.aidf_id, -1),"); + sb.append(" b.caja_id"); + sb.append(" from folio_consumo_rmd f"); + sb.append(" join estado eof on eof.estado_id = f.estado_id"); + sb.append(" join aidf r on r.aidf_id = f.rmd_id"); + sb.append(" join empresa e on e.empresa_id = f.empresa_id"); + sb.append(" join ciudad c on c.ciudad_id = e.ciudad_id"); + sb.append(" left join empresa_imposto eif on eif.activo = 1 and eif.empresa_id = f.empresa_id and eif.estado_id = eof.estado_id"); + sb.append(" left join inscricao_estadual ie on ie.empresa_id = f.empresa_id and ie.estado_id = eof.estado_id and ie.activo = 1"); + sb.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id"); + sb.append(" left join caja b on b.activo = 1 and b.rmd_id = f.rmd_id and b.empresacorrida_id = f.empresa_id and b.foliormd = f.folio and to_char(b.fechorventa, 'ddmmyyyy') = to_char(f.fechorfolio, 'ddmmyyyy')"); + sb.append(" left join parada po on po.parada_id = b.origen_id and po.activo = 1 "); + sb.append(" left join ciudad co on co.ciudad_id = po.ciudad_id and co.activo = 1 "); + sb.append(" left join estado eo on eo.estado_id = co.estado_id and eo.activo = 1 "); + sb.append(" left join parada pd on pd.parada_id = b.destino_id"); + sb.append(" left join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" left join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" left join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = eof.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id"); + sb.append(" and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id and s.activo = 1 "); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" left join aidf a on a.aidf_id = b.aidf_id"); + sb.append(" where f.activo = 1 "); + sb.append(" and f.indinactivo = 0 "); + sb.append(" and f.indbpr = 1 "); + sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); + sb.append(" and f.empresa_id = ? "); + sb.append(" and eof.cveestado like ? "); + sb.append(" and (f.indcancelacion = 1 or ( "); + + if (isDif) { + sb.append(" ((b.tipoventa_id not in (5,12,18,81,82,49,41) and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); + sb.append(" or (b.tipoventa_id in (5,12,18,81,82,49,41) "); + sb.append(" and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); + sb.append(" and a.aidf_id is not null and b.indcancelacion = 0 "); + sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) )) "); + } else { + sb.append(" ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); + sb.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); + sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) )) "); + } + + sb.append(" order by dataEmissaoRMD "); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setLong(3, Long.valueOf(empresaId)); + ps.setString(4, cveestado); + + ResultSet rs = ps.executeQuery(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + + ExportacaoBPRBase registro = null; + + while (rs.next()) { + String ufDestino = rs.getString("ufDestino"); + String ufOrigem = rs.getString("ufOrigem"); + Integer municipioOrigem = rs.getInt("municipioOrigem"); + Integer municipioDestino = rs.getInt("municipioDestino"); + Integer municipioOrigemPadrao = rs.getInt("municipioOrigemPadrao"); + Integer cfop = rs.getInt("cfop"); + + if (ufOrigem != null && ufDestino != null) { + if (!ufOrigem.equals(cveestado)) { + if (ufDestino.equals(cveestado)) { + ufOrigem = cveestado; + municipioOrigem = municipioDestino; + } else { + ufOrigem = cveestado; + municipioOrigem = municipioOrigemPadrao; + } + + cfop = (ufOrigem.equals(ufDestino) ? 5357 : 6357); + } + } + + registro = new ExportacaoBPRBase(); + + // PAR + registro.setCodigoParticipantePar(rs.getInt("codigoParticipantePar")); + registro.setCodigoEstabelecimentoPar(rs.getInt("codigoEstabelecimentoPar")); + registro.setNomeParticipante(rs.getString("nomeParticipante")); + registro.setUfParticipante(rs.getString("ufParticipante")); + registro.setCpfParticipante(rs.getString("cnpjParticipante")); + registro.setIeParticipante(rs.getString("ieParticipante")); + registro.setLogradouro(rs.getString("logradouro")); + registro.setNumero(rs.getString("numero")); + registro.setComplemento(rs.getString("complemento")); + registro.setBairro(rs.getString("bairro")); + registro.setCep(rs.getString("cep") == null ? null : Integer.parseInt(rs.getString("cep").replace("-", "").replace(".", ""))); + + // RMD + registro.setDataEmissaoRMD(sdf.format(rs.getDate("dataEmissaoRMD"))); + registro.setCodigoParticipante(rs.getInt("codigoParticipante")); + registro.setCodigoEstabelecimento(rs.getInt("codigoEstabelecimento")); + registro.setNumeroAIDF(rs.getString("numeroAIDF")); + registro.setSerieAIDF(rs.getString("serieAIDF")); + registro.setSubSerieAIDF(rs.getString("subSerieAIDF")); + registro.setNumeroFormularioBilheteAIDF(rs.getLong("numeroFormularioBilheteAIDF")); + registro.setDocumentoCancelado(rs.getString("documentoCancelado").equals("S") ? Boolean.TRUE : Boolean.FALSE); + registro.setCodigoContabil(rs.getString("codigoContabil")); + + // BPS + registro.setDataEmissao(rs.getDate("dataEmissao") == null ? null : sdf.format(rs.getDate("dataEmissao"))); + registro.setNumeroFormulario(rs.getLong("numeroFormulario")); + registro.setNumeroAIDFRMD(rs.getString("numeroAIDFRMD")); + registro.setSerieAIDFRMD(rs.getString("serieAIDFRMD")); + registro.setSubSerieAIDFRMD(rs.getString("subSerieAIDFRMD")); + registro.setNumeroRMD(rs.getInt("numeroRMD")); + registro.setBoletoIsento(rs.getInt("boletoIsento")); + registro.setBoletoCancelado(rs.getInt("boletoCancelado")); + registro.setValorPago(rs.getBigDecimal("valorPago")); + + // DBP + registro.setUfDestino(ufDestino); + registro.setUfOrigem(ufOrigem); + registro.setMunicipioOrigem(municipioOrigem); + registro.setCfop(cfop); + registro.setReducaoBaseCalcICMS(rs.getBigDecimal("reducaoBaseCalcICMS")); + registro.setPorcReducaoMunicipal(rs.getBigDecimal("porcReducaoMunicipal")); + registro.setPorcReducaoEstadual(rs.getBigDecimal("porcReducaoEstadual")); + registro.setTributacaoImportacao(rs.getBigDecimal("tributacaoImportacao")); + + exportacaoRMD.getListaRegistroBPR().add(registro); + } + + rs.close(); + ps.close(); + + exportacaoRMD.gerarListas(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return exportacaoRMD; + } + + @Override + public List buscarRegistroRMDTipoPAR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select"); + sb.append(" c.estado_id as cod_participante,"); + sb.append(" ei.codestabelecimento as cod_estabelecimento,"); + sb.append(" e.nombempresa as nombempresa,"); + sb.append(" ess.cveestado as cveestado,"); + sb.append(" ie.cnpj as cnpj,"); + sb.append(" ie.numinscricaoestadual as numinscricaoestadual,"); + sb.append(" ie.logradouro as logradouro,"); + sb.append(" ie.numero as numero,"); + sb.append(" ie.complemento as complemento,"); + sb.append(" ie.bairro as bairro,"); + sb.append(" ie.cep as cep"); + sb.append(" from empresa e"); + sb.append(" join ciudad c on c.ciudad_id = e.ciudad_id"); + sb.append(" join estado es on es.estado_id = c.estado_id"); + sb.append(" left join estado ess on ess.cveestado = ?"); + sb.append(" left join inscricao_estadual ie on ie.empresa_id = e.empresa_id and ie.estado_id = ess.estado_id and ie.activo = 1"); + sb.append(" left join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = e.empresa_id and ei.estado_id = ess.estado_id"); + sb.append(" where e.empresa_id = ?"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setString(1, cveestado); + ps.setLong(2, Long.valueOf(empresaId)); + + ResultSet rs = ps.executeQuery(); + + ExportacaoRMDTipoPAR registro = null; + + while (rs.next()) { + registro = new ExportacaoRMDTipoPAR(); + registro.setCodigoParticipante(rs.getInt("cod_participante")); + registro.setCodigoEstabelecimento(rs.getInt("cod_estabelecimento")); + registro.setNomeParticipante(rs.getString("nombempresa")); + registro.setUfParticipante(rs.getString("cveestado")); + registro.setCpfParticipante(rs.getString("cnpj")); + registro.setIeParticipante(rs.getString("numinscricaoestadual")); + registro.setLogradouro(rs.getString("logradouro")); + registro.setNumero(rs.getString("numero")); + registro.setComplemento(rs.getString("complemento")); + registro.setBairro(rs.getString("bairro")); + registro.setCep(rs.getString("cep") == null ? null : Integer.parseInt(rs.getString("cep").replace("-", "").replace(".", ""))); + + retorno.add(registro); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Override + public List buscarRegistroRMDTipoRMD(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + + StringBuilder sb = new StringBuilder(); + sb.append(" select"); + sb.append(" ei.codestabelecimento as cod_estabelecimento,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END) as cod_participante,"); + sb.append(" a.acfiscal as num_aidf,"); + sb.append(" a.serie as serie,"); + sb.append(" a.subserie as subserie,"); + sb.append(" b.foliormd as num_bilhete,"); + sb.append(" b.foliormd as num_formulario,"); + sb.append(" trunc(b.feccreacion) as data_emissao,"); + sb.append(" 'N' as doc_cancelado,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN (CASE WHEN co.estado_id = cd.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) ELSE (CASE WHEN cos.estado_id = cds.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) END) as cod_contabil"); + sb.append(" from boleto b"); + sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); + sb.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id and s.activo = 1 "); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" join parada pd on pd.parada_id = b.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = po.ciudad_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" join aidf a on a.aidf_id = b.rmd_id"); + sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN co.estado_id ELSE cos.estado_id END)"); + sb.append(" where"); + sb.append(" b.activo = 1"); + sb.append(" and b.tipoventa_id = 3"); + sb.append(" and (b.indstatusboleto like 'V')"); + sb.append(" and b.empresacorrida_id = ?"); + sb.append(" and (b.feccreacion >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.feccreacion <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); + sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); + sb.append(" group by"); + sb.append(" ei.codestabelecimento,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END),"); + sb.append(" a.acfiscal,"); + sb.append(" a.serie,"); + sb.append(" a.subserie,"); + sb.append(" b.foliormd,"); + sb.append(" trunc(b.feccreacion),"); + sb.append(" 'N',"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN (CASE WHEN co.estado_id = cd.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) ELSE (CASE WHEN cos.estado_id = cds.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) END)"); + sb.append(" UNION"); + sb.append(" select distinct"); + sb.append(" ei.codestabelecimento as cod_estabelecimento,"); + sb.append(" eo.estado_id as cod_participante,"); + sb.append(" a.acfiscal as num_aidf,"); + sb.append(" a.serie as serie,"); + sb.append(" a.subserie as subserie,"); + sb.append(" f.folio as num_bilhete,"); + sb.append(" f.folio as num_formulario,"); + sb.append(" trunc(f.fechorfolio) as data_emissao,"); + sb.append(" 'S' as doc_cancelado,"); + sb.append(" null as cod_contabil"); + sb.append(" from folio_consumo_rmd f"); + sb.append(" join estado eo on eo.estado_id = f.estado_id"); + sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = f.empresa_id and ei.estado_id = eo.estado_id"); + sb.append(" join aidf a on a.aidf_id = f.rmd_id"); + sb.append(" where"); + sb.append(" f.empresa_id = ?"); + sb.append(" and (f.fechorfolio >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and f.fechorfolio <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); + sb.append(" and eo.cveestado like ?"); + sb.append(" and f.indcancelacion = 1 and f.indbpr = 1 and f.activo = 1"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setLong(1, Long.valueOf(empresaId)); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setString(4, cveestado); + ps.setLong(5, Long.valueOf(empresaId)); + ps.setString(6, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(7, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setString(8, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoRMDTipoRMD registro = null; + + while (rs.next()) { + registro = new ExportacaoRMDTipoRMD(); + registro.setCodigoEstabelecimento(rs.getInt("cod_estabelecimento")); + registro.setNumeroAIDF(rs.getString("num_aidf")); + registro.setSerieAIDF(rs.getString("serie")); + registro.setSubSerieAIDF(rs.getString("subserie")); + registro.setNumeroBilheteAIDF(rs.getLong("num_bilhete")); + registro.setNumeroFormularioAIDF(rs.getLong("num_formulario")); + registro.setDataEmissao(sdf.format(rs.getDate("data_emissao"))); + registro.setCancelado(rs.getString("doc_cancelado").equals("S") ? Boolean.TRUE : Boolean.FALSE); + registro.setCodigoParticipante(rs.getInt("cod_participante")); + registro.setCodigoContabil(rs.getString("cod_contabil")); + + retorno.add(registro); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Override + @Deprecated + public List buscarRegistroRMDTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + + StringBuilder sb = new StringBuilder(); + sb.append(" select"); + sb.append(" ei.codestabelecimento as cod_estabelecimento,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END) as cod_participante,"); + sb.append(" (CASE WHEN b.indstatusboleto like 'C' THEN 1 ELSE 0 END) as cancelado,"); + sb.append(" a.acfiscal as num_aidf,"); + sb.append(" a.serie as serie,"); + sb.append(" a.subserie as subserie,"); + sb.append(" b.feccreacion as data_emissao,"); + sb.append(" b.numfoliopreimpreso as num_formulario,"); + sb.append(" b.preciopagado as valor_total,"); + sb.append(" r.acfiscal as num_aidf_rmd,"); + sb.append(" r.serie as serie_rmd,"); + sb.append(" r.subserie as subserie_rmd,"); + sb.append(" b.foliormd as num_rmd"); + sb.append(" from boleto b"); + sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); + sb.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + // sb.append(" join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); + sb.append(" join aidf a on a.aidf_id = b.aidf_id"); + sb.append(" join aidf r on r.aidf_id = b.rmd_id"); + sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); + sb.append(" where"); + sb.append(" b.activo = 1"); + sb.append(" and b.tipoventa_id = 3"); + sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); + sb.append(" and b.empresacorrida_id = ?"); + sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); + sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); + sb.append(" order by b.feccreacion,a.acfiscal,b.numfoliopreimpreso"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setLong(1, Long.valueOf(empresaId)); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setString(4, cveestado); + + ResultSet rs = ps.executeQuery(); + + Map group = new HashMap(); + + ExportacaoRMDTipoBPS registro = null; + + Long numeroInicial = null; + Long numeroFinal = null; + + while (rs.next()) { + String key = sdf.format(rs.getDate("data_emissao")) + "|" + rs.getLong("num_aidf") + "|" + rs.getLong("num_formulario"); + + if (group.containsKey(key)) { + registro = group.get(key); + + numeroInicial = rs.getLong("num_formulario"); + numeroFinal = rs.getLong("num_formulario"); + + if (numeroInicial.intValue() > registro.getNumeroInicial().intValue()) { + numeroInicial = registro.getNumeroInicial(); + } + + if (numeroFinal.intValue() < registro.getNumeroFinal().intValue()) { + numeroFinal = registro.getNumeroFinal(); + } + + } else { + registro = new ExportacaoRMDTipoBPS(); + registro.setCodigoEstabelecimento(rs.getInt("cod_estabelecimento")); + registro.setEspecie("BPR"); + registro.setNumeroAIDF(rs.getLong("num_aidf")); + registro.setSerieAIDF(rs.getString("serie")); + registro.setSubSerieAIDF(rs.getString("subserie")); + registro.setNumeroAIDFRMD(rs.getLong("num_aidf_rmd")); + registro.setSerieAIDFRMD(rs.getString("serie_rmd")); + registro.setSubSerieAIDFRMD(rs.getString("subserie_rmd")); + registro.setNumeroRMD(rs.getInt("num_rmd")); + + registro.setDataEmissao(sdf.format(rs.getDate("data_emissao"))); + + registro.setQuantidadeTotal(0); + registro.setQuantidadeCancelados(0); + registro.setValorTotal(BigDecimal.ZERO); + registro.setResumoMovimentoDiario(null); + + numeroInicial = rs.getLong("num_formulario"); + numeroFinal = rs.getLong("num_formulario"); + } + + registro.setNumeroInicial(numeroInicial); + registro.setNumeroFinal(numeroFinal); + + registro.setQuantidadeTotal(registro.getQuantidadeTotal() + 1); + registro.setQuantidadeCancelados(registro.getQuantidadeCancelados() + rs.getInt("cancelado")); + + if (rs.getInt("cancelado") == 0) { + registro.setValorTotal(registro.getValorTotal().add(rs.getBigDecimal("valor_total"))); + } + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + registro = entry.getValue(); + + if (registro.getQuantidadeTotal().intValue() == registro.getQuantidadeCancelados().intValue()) { + registro.setValorTotal(null); + } else { + registro.setResumoMovimentoDiario(Boolean.TRUE); + } + + retorno.add(registro); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Override + @Deprecated + public List buscarRegistroRMDTipoDBP(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List retorno = new ArrayList(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)) THEN 5357 ELSE 6357 END) as cod_operacao,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasorigen_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); + sb.append(" (nvl(b.preciopagado,0) - nvl(b.importetaxaembarque,0) - nvl(b.importepedagio,0) - nvl(b.importeseguro,0) - nvl(b.importeoutros,0)) as valor_tarifa,"); + sb.append(" b.preciopagado as valor_total,"); + sb.append(" (CASE WHEN nvl(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = nvl(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2) THEN 1 ELSE 0 END) as reg_metropolitana"); + sb.append(" from boleto b"); + sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = b.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" left join empresa_imposto eis on eis.activo = 1 and eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" where"); + sb.append(" b.activo = 1"); + sb.append(" and b.tipoventa_id = 3"); + sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); + sb.append(" and b.empresacorrida_id = ?"); + sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); + sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setLong(1, Long.valueOf(empresaId)); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setString(4, cveestado); + + ResultSet rs = ps.executeQuery(); + + ExportacaoRMDTipoDBP registro = null; + + Map group = new HashMap(); + + while (rs.next()) { + String key = rs.getString("estado_destino") + "|" + rs.getInt("cod_operacao") + "|" + rs.getString("estado_origem") + "|" + rs.getInt("municipio_origem"); + + if (group.containsKey(key)) { + registro = group.get(key); + } else { + registro = new ExportacaoRMDTipoDBP(); + registro.setUfDestino(rs.getString("estado_destino")); + registro.setCfop(rs.getInt("cod_operacao")); // IM=5357; serviço IE= 6357 + registro.setUfOrigem(rs.getString("estado_origem")); + registro.setMunicipioOrigem(rs.getInt("municipio_origem")); + + registro.setCodigoSituacaoTribColunaB(null); + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (rs.getInt("isenta") == 1) { + registro.setCodigoSituacaoTribColunaB(40); + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (registro.getCodigoSituacaoTribColunaB() == null) { + registro.setCodigoSituacaoTribColunaB(rs.getInt("red_base_calc_icms") == 0 ? 0 : 20); + } + + registro.setValorBaseCalculoICMS(BigDecimal.ZERO); + registro.setValorTotal(BigDecimal.ZERO); + registro.setValorICMS(BigDecimal.ZERO); + registro.setValorICMSIsento(BigDecimal.ZERO); + registro.setValorICMSOutros(BigDecimal.ZERO); + } + + BigDecimal valorTotal = rs.getBigDecimal("valor_total"); + BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms"); + BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal"); + BigDecimal porc_red_estadual = rs.getBigDecimal("porc_red_estadual"); + BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + BigDecimal valorIsenta = BigDecimal.ZERO; + BigDecimal valorIsentaOutros = BigDecimal.ZERO; + + if (rs.getInt("reg_metropolitana") == 1) { + valorIsenta = valorTotal; + valorTotal = BigDecimal.ZERO; + } else { + if (red_base_calc_icms != null) { + valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); + } else { + // if (tributacao_importacao != null) { + // if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + // if (porc_red_municipal != null) { + // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_municipal.divide(BigDecimal.valueOf(100d)))); + // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); + // } + // } else { + // if (porc_red_estadual != null) { + // BigDecimal porc = tributacao_importacao.subtract(tributacao_importacao.multiply(porc_red_estadual.divide(BigDecimal.valueOf(100d)))); + // valorBaseCalculoICMS = valorTotal.multiply(porc.divide(BigDecimal.valueOf(100d))); + // } + // } + // } + + valorBaseCalculoICMS = valorTotal; + } + } + + registro.setAliquotaICMS(tributacao_importacao); + + if (tributacao_importacao == null) { + tributacao_importacao = BigDecimal.ZERO; + } else { + if (red_base_calc_icms != null) { + BigDecimal porc_red = BigDecimal.ZERO; + + if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + if (porc_red_municipal != null) { + porc_red = porc_red_municipal; + } + } else { + if (porc_red_estadual != null) { + porc_red = porc_red_estadual; + } + } + + BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); + valorIsentaOutros = valorTotal.multiply(porc); + } + + tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + } + + BigDecimal valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); + + registro.setValorBaseCalculoICMS(registro.getValorBaseCalculoICMS().add(valorBaseCalculoICMS)); + registro.setValorTotal(registro.getValorTotal().add(valorTotal)); + registro.setValorICMS(registro.getValorICMS().add(valorICMS)); + registro.setValorICMSIsento(registro.getValorICMSIsento().add(valorIsenta)); + registro.setValorICMSOutros(registro.getValorICMSOutros().add(valorIsentaOutros)); + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + retorno.add(entry.getValue()); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return retorno; + } + + @Override + @Deprecated + public List buscarRegistroRMDSeqTipoBPS(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) { + List listaBPS = new ArrayList(); + + StringBuilder sb = new StringBuilder(); + sb.append(" select"); + sb.append(" ei.codestabelecimento as cod_estabelecimento,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END) as cod_participante,"); + sb.append(" (CASE WHEN b.indstatusboleto like 'C' THEN 1 ELSE 0 END) as cancelado,"); + sb.append(" b.aidf_id,"); + sb.append(" a.acfiscal as num_aidf,"); + sb.append(" a.serie as serie,"); + sb.append(" a.subserie as subserie,"); + sb.append(" b.feccreacion as data_emissao,"); + sb.append(" b.numfoliopreimpreso as num_formulario,"); + sb.append(" b.preciopagado as valor_total,"); + sb.append(" b.rmd_id,"); + sb.append(" r.acfiscal as num_aidf_rmd,"); + sb.append(" r.serie as serie_rmd,"); + sb.append(" r.subserie as subserie_rmd,"); + sb.append(" b.foliormd as num_rmd,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estado_origem,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END) as estado_destino,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN co.codibge ELSE cos.codibge END) as municipio_origem,"); + sb.append(" (CASE WHEN ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)) THEN 5357 ELSE 6357 END) as cod_operacao,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredbaseicms ELSE eis.porcredbaseicms END) as red_base_calc_icms,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredmunicipal ELSE eis.porcredmunicipal END) as porc_red_municipal,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,"); + sb.append(" (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasorigen_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,"); + sb.append(" (nvl(b.preciopagado,0) - nvl(b.importetaxaembarque,0) - nvl(b.importepedagio,0) - nvl(b.importeseguro,0) - nvl(b.importeoutros,0)) as valor_tarifa,"); + sb.append(" b.preciopagado as valor_total,"); + sb.append(" (CASE WHEN nvl(case when s.aliasorigen_id is null then po.regionmetropolitana_id else pos.regionmetropolitana_id end, -1) = nvl(case when s.aliasorigen_id is null then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2) THEN 1 ELSE 0 END) as reg_metropolitana"); + sb.append(" from boleto b"); + sb.append(" join empresa e on e.empresa_id = b.empresacorrida_id"); + sb.append(" join parada po on po.parada_id = b.origen_id"); + sb.append(" join ciudad co on co.ciudad_id = po.ciudad_id"); + sb.append(" join estado eo on eo.estado_id = co.estado_id"); + sb.append(" join parada pd on pd.parada_id = b.destino_id"); + sb.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id"); + sb.append(" join estado ed on ed.estado_id = cd.estado_id"); + sb.append(" left join alias_servico s on s.origen_id = b.origen_id and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) and s.ruta_id = b.ruta_id"); + sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); + sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); + sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); + sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); + sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); + sb.append(" left join estado eds on eds.estado_id = cds.estado_id"); + sb.append(" join empresa_imposto ei on ei.activo = 1 and ei.empresa_id = b.empresacorrida_id and ei.estado_id = eo.estado_id"); + sb.append(" left join empresa_imposto eis on eis.activo = 1 and eis.empresa_id = b.empresacorrida_id and eis.estado_id = eos.estado_id"); + sb.append(" join aidf a on a.aidf_id = b.aidf_id"); + sb.append(" join aidf r on r.aidf_id = b.rmd_id"); + sb.append(" where"); + sb.append(" b.activo = 1"); + sb.append(" and b.tipoventa_id = 3"); + sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); + sb.append(" and b.empresacorrida_id = ?"); + sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); + sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); + sb.append(" order by b.fechorventa, b.numfoliopreimpreso, (CASE WHEN ((CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)) THEN 5357 ELSE 6357 END), (CASE WHEN s.aliasorigen_id IS NULL THEN ed.cveestado ELSE eds.cveestado END)"); + + try { + PreparedStatement ps = connection.prepareStatement(sb.toString()); + ps.setLong(1, Long.valueOf(empresaId)); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + ps.setString(4, cveestado); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + + ResultSet rs = ps.executeQuery(); + + ExportacaoRMDTipoSeqBPS registroBPS = null; + ExportacaoRMDTipoSeqDBP registroDBP = null; + + Long numeroInicial = 0l; + Long numeroFinal = 0l; + + String dataEmissaoControle = ""; + Integer cfopControle = 0; + + Integer quantidadeTotal = 0; + Integer quantidadeCancelado = 0; + + BigDecimal totalizador = BigDecimal.ZERO; + + while (rs.next()) { + Integer codigoEstabelecimento = rs.getInt("cod_estabelecimento"); + String numeroAIDF = rs.getString("num_aidf"); + String serieAIDF = rs.getString("serie"); + String subSerieAIDF = rs.getString("subserie"); + String numeroAIDFRMD = rs.getString("num_aidf_rmd"); + String serieAIDFRMD = rs.getString("serie_rmd"); + String subSerieAIDFRMD = rs.getString("subserie_rmd"); + Integer numeroRMD = rs.getInt("num_rmd"); + String dataEmissao = sdf.format(rs.getDate("data_emissao")); + Long numeroFormulario = rs.getLong("num_formulario"); + String ufDestino = rs.getString("estado_destino"); + Integer cfop = rs.getInt("cod_operacao"); // IM=5357; serviço IE= 6357 + String ufOrigem = rs.getString("estado_origem"); + Integer municipioOrigem = rs.getInt("municipio_origem"); + Boolean isenta = (rs.getInt("isenta") == 1); + Boolean cancelado = (rs.getInt("cancelado") == 1); + BigDecimal valorTotal = rs.getBigDecimal("valor_total"); + BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms"); + BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal"); + BigDecimal porc_red_estadual = rs.getBigDecimal("porc_red_estadual"); + BigDecimal tributacao_importacao = rs.getBigDecimal("tributacao_importacao"); + + // BPR + if ((numeroFinal + 1) != numeroFormulario || !dataEmissaoControle.equals(dataEmissao) || !cfopControle.equals(cfop)) { + numeroInicial = numeroFormulario; + dataEmissaoControle = dataEmissao; + cfopControle = cfop; + + registroBPS = new ExportacaoRMDTipoSeqBPS(); + registroBPS.setEspecie("BPR"); + registroBPS.setNumeroInicial(numeroInicial); + registroBPS.setCodigoEstabelecimento(codigoEstabelecimento); + registroBPS.setNumeroAIDF(numeroAIDF); + registroBPS.setSerieAIDF(serieAIDF); + registroBPS.setSubSerieAIDF(subSerieAIDF); + registroBPS.setNumeroAIDFRMD(numeroAIDFRMD); + registroBPS.setSerieAIDFRMD(serieAIDFRMD); + registroBPS.setSubSerieAIDFRMD(subSerieAIDFRMD); + registroBPS.setNumeroRMD(numeroRMD); + registroBPS.setDataEmissao(dataEmissao); + registroBPS.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); + + listaBPS.add(registroBPS); + + quantidadeTotal = 0; + quantidadeCancelado = 0; + + totalizador = BigDecimal.ZERO; + } + + quantidadeTotal++; + + if (cancelado) { + quantidadeCancelado++; + } else { + totalizador = MoneyHelper.somar(totalizador, valorTotal); + } + + numeroFinal = numeroFormulario; + + registroBPS.setNumeroFinal(numeroFinal); + + registroBPS.setQuantidadeTotal(quantidadeTotal); + registroBPS.setQuantidadeCancelados(quantidadeCancelado); + registroBPS.setValorTotal(totalizador); + + // DBP + registroDBP = new ExportacaoRMDTipoSeqDBP(ufDestino); + + Integer indice = registroBPS.getListaDBP().indexOf(registroDBP); + + if (indice == -1) { + registroBPS.getListaDBP().add(registroDBP); + + registroDBP.setCfop(cfop); // IM=5357; serviço IE= 6357 + registroDBP.setUfOrigem(ufOrigem); + registroDBP.setMunicipioOrigem(municipioOrigem); + + registroDBP.setCodigoSituacaoTribColunaB(null); + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (isenta) { + registroDBP.setCodigoSituacaoTribColunaB(40); + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (registroDBP.getCodigoSituacaoTribColunaB() == null) { + registroDBP.setCodigoSituacaoTribColunaB(red_base_calc_icms == null || red_base_calc_icms.compareTo(BigDecimal.ZERO) == 0 ? 0 : 20); + } + + registroDBP.setValorBaseCalculoICMS(BigDecimal.ZERO); + registroDBP.setValorTotal(BigDecimal.ZERO); + registroDBP.setValorICMS(BigDecimal.ZERO); + registroDBP.setValorICMSIsento(BigDecimal.ZERO); + registroDBP.setValorICMSOutros(BigDecimal.ZERO); + } else { + registroDBP = registroBPS.getListaDBP().get(indice); + } + + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + BigDecimal valorIsenta = BigDecimal.ZERO; + BigDecimal valorIsentaOutros = BigDecimal.ZERO; + + if (rs.getInt("reg_metropolitana") == 1) { + valorIsenta = valorTotal; + valorTotal = BigDecimal.ZERO; + } else { + if (red_base_calc_icms != null) { + valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); + } else { + valorBaseCalculoICMS = valorTotal; + } + } + + registroDBP.setAliquotaICMS(tributacao_importacao); + + if (tributacao_importacao == null) { + tributacao_importacao = BigDecimal.ZERO; + } else { + if (red_base_calc_icms != null) { + BigDecimal porc_red = BigDecimal.ZERO; + + if (rs.getString("estado_origem").equals(rs.getString("estado_destino"))) { + if (porc_red_municipal != null) { + porc_red = porc_red_municipal; + } + } else { + if (porc_red_estadual != null) { + porc_red = porc_red_estadual; + } + } + + BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); + valorIsentaOutros = valorTotal.multiply(porc); + } + + tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + } + + BigDecimal valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); + + registroDBP.setValorBaseCalculoICMS(registroDBP.getValorBaseCalculoICMS().add(valorBaseCalculoICMS)); + registroDBP.setValorTotal(registroDBP.getValorTotal().add(valorTotal)); + registroDBP.setValorICMS(registroDBP.getValorICMS().add(valorICMS)); + registroDBP.setValorICMSIsento(registroDBP.getValorICMSIsento().add(valorIsenta)); + registroDBP.setValorICMSOutros(registroDBP.getValorICMSOutros().add(valorIsentaOutros)); + } + + rs.close(); + ps.close(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return listaBPS; + } + + @Override + public void cancelarRMDBoleto(Connection connection, Date inicio, Date fim, Integer empresaId, Estado estado, Aidf aidf, + String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR) { + + List boletos = new ArrayList(); + String boletoAgr = null; + int cont = 0; + + List foliosRmd = new ArrayList(); + + if (isCancela) { + cancelaFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); + } else { + inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal, inicio, fim); + } + + for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(), + folioInicial, folioFinal, isBPR, isECF, true)) { + + if (!foliosRmd.contains(brp.getFoliormd())) + foliosRmd.add(brp.getFoliormd()); + + if (cont == 999) { + boletos.add(boletoAgr); + boletoAgr = null; + cont = 0; + } + + if (boletoAgr == null) + boletoAgr = brp.getCajaId().toString(); + else + boletoAgr = boletoAgr + " ," + brp.getCajaId(); + + cont++; + } + boletos.add(boletoAgr); + + if (isInativa) { + for (String folio : foliosRmd) { + insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio, + isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null); + } + } + + marcarRMDCaja(connection, boletos, null, null); + } + + private void cancelaFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId, + Long rmdId, String folioInicial, String folioFinal, Date inicio, Date fim) { + + PreparedStatement pstmt = null; + try { + StringBuilder sb = new StringBuilder(); + sb.append(" update folio_consumo_rmd "); + sb.append(" set activo = 1, fecmodif = sysdate, indcancelacion = 1 "); + sb.append(" where activo = 1 "); + sb.append(" and indimpresso = 1 "); + sb.append(" and rmd_id = ? "); + sb.append(" and empresa_id = ? "); + sb.append(" and estado_id = ? "); + sb.append(" and folio between ? and ? "); + sb.append(" and fechorfolio between to_date(?,'dd/MM/yyyy HH24:MI:SS') and to_date(?,'dd/MM/yyyy HH24:MI:SS') "); + + pstmt = connection.prepareStatement(sb.toString()); + pstmt.setInt(1, rmdId.intValue()); + pstmt.setInt(2, empresaId); + pstmt.setInt(3, estadoId); + pstmt.setString(4, folioInicial); + pstmt.setString(5, folioFinal); + pstmt.setString(6, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + pstmt.setString(7, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + + pstmt.executeUpdate(); + + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (pstmt != null && !pstmt.isClosed()) { + pstmt.close(); + } + } catch (Exception e) { + log.error("", e); + } + } + } + + private void inativarFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId, + Long rmdId, String folioInicial, String folioFinal, Date inicio, Date fim) { + + PreparedStatement pstmt = null; + try { + StringBuilder sb = new StringBuilder(); + sb.append(" update folio_consumo_rmd "); + sb.append(" set activo = 0, fecmodif = sysdate "); + sb.append(" where activo = 1 "); + sb.append(" and indimpresso = 1 "); + sb.append(" and rmd_id = ? "); + sb.append(" and empresa_id = ? "); + sb.append(" and estado_id = ? "); + sb.append(" and folio between ? and ? "); + sb.append(" and fechorfolio between to_date(?,'dd/MM/yyyy HH24:MI:SS') and to_date(?,'dd/MM/yyyy HH24:MI:SS') "); + + pstmt = connection.prepareStatement(sb.toString()); + pstmt.setInt(1, rmdId.intValue()); + pstmt.setInt(2, empresaId); + pstmt.setInt(3, estadoId); + pstmt.setString(4, folioInicial); + pstmt.setString(5, folioFinal); + pstmt.setString(6, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00"); + pstmt.setString(7, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59"); + + pstmt.executeUpdate(); + + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (pstmt != null && !pstmt.isClosed()) { + pstmt.close(); + } + } catch (Exception e) { + log.error("", e); + } + } + } + + private void insereConsulmoFolioRMD(Connection connection, Date dataBilhete, Integer empresaId, Integer estadoId, Aidf aidf, + String folio, boolean isCancela, boolean isInativa, boolean isImpresso, boolean isECF, boolean isBPR, + BigDecimal valorContabil, BigDecimal baseCalculo, BigDecimal aliquota, BigDecimal isentos, + BigDecimal outros, BigDecimal icms) { + + PreparedStatement pstmt = null; + try { + StringBuilder sb = new StringBuilder(); + sb.append(" insert into FOLIO_CONSUMO_RMD (FOLIOCONSUMORMD_ID, RMD_ID, FOLIO, "); + sb.append(" EMPRESA_ID, ESTADO_ID, INDCANCELACION, INDINACTIVO, INDIMPRESSO, FECHORFOLIO, "); + sb.append(" VALORCONTABIL, BASECALCULO, ALIQUOTA, ISENTOS, OUTROS, ICMS, "); + sb.append(" INDECF, INDBPR, ACTIVO, FECMODIF, USUARIO_ID) "); + sb.append(" values (").append("FOLIO_CONSUMO_RMD_SEQ.NEXTVAL").append(","); + sb.append(aidf.getAidfId()).append(",").append(folio).append(","); + sb.append(empresaId).append(",").append(estadoId).append(","); + + if (isCancela) + sb.append(1).append(",").append(0).append(",").append(0).append(","); + else if (isInativa) + sb.append(0).append(",").append(1).append(",").append(0).append(","); + else if (isImpresso) + sb.append(0).append(",").append(0).append(",").append(1).append(","); + + sb.append("?").append(","); + sb.append("?").append(","); + sb.append("?").append(","); + sb.append("?").append(","); + sb.append("?").append(","); + sb.append("?").append(","); + sb.append("?").append(","); + + if (isECF) + sb.append(1).append(",").append(0).append(","); + else + sb.append(0).append(",").append(1).append(","); + + sb.append(1).append(",").append("SYSDATE").append(",").append(UsuarioLogado.getUsuarioLogado().getUsuarioId()).append(")"); + + pstmt = connection.prepareStatement(sb.toString()); + pstmt.setTimestamp(1, new java.sql.Timestamp(DateUtil.inicioFecha(dataBilhete).getTime())); + pstmt.setBigDecimal(2, MoneyHelper.arredondar(valorContabil)); + pstmt.setBigDecimal(3, MoneyHelper.arredondar(baseCalculo)); + pstmt.setBigDecimal(4, MoneyHelper.arredondar(aliquota)); + pstmt.setBigDecimal(5, MoneyHelper.arredondar(isentos)); + pstmt.setBigDecimal(6, MoneyHelper.arredondar(outros)); + pstmt.setBigDecimal(7, MoneyHelper.arredondar(icms)); + pstmt.executeUpdate(); + + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (pstmt != null && !pstmt.isClosed()) { + pstmt.close(); + } + } catch (Exception e) { + log.error("", e); + } + } + } + + @Override + public void gravarRMDBoleto(Connection connection, List rmds, Aidf aidf, String folio, Integer empresaId, Integer estadoId, boolean isECF, boolean isBPR) { + + int cont = 0; + Integer rmdIterate = Integer.parseInt(folio); + rmdIterate = rmdIterate - 1; + + String boletoAgr = null; + List boletos = new ArrayList(); + int contBolto = 0; + Date dataBilhete = null; + + BigDecimal valorContabil = BigDecimal.ZERO; + BigDecimal baseCalculo = BigDecimal.ZERO; + BigDecimal aliquota = BigDecimal.ZERO; + BigDecimal isentos = BigDecimal.ZERO; + BigDecimal outros = BigDecimal.ZERO; + BigDecimal icms = BigDecimal.ZERO; + + for (ImpressaoRMD imp : rmds) { + + if (dataBilhete == null) + dataBilhete = imp.getData(); + + // Numero maximo de itens na folha do RMD + if (cont == 23 || (!dataBilhete.equals(imp.getData()))) { + + // add primeiro ou ultimo na lista de insercao dos boletos + boletos.add(boletoAgr); + + // incrementa na contagem dos folios na impressao do RMD + rmdIterate++; + cont = 0; + + insereConsulmoFolioRMD(connection, dataBilhete, empresaId, estadoId, aidf, rmdIterate.toString(), false, false, true, isECF, isBPR, + valorContabil, baseCalculo, aliquota, isentos, outros, icms); + + marcarRMDCaja(connection, boletos, aidf.getAidfId(), rmdIterate); + + // limpa a lista de inseções do boleto + boletos = new ArrayList(); + boletoAgr = null; + contBolto = 0; + dataBilhete = imp.getData(); + + valorContabil = BigDecimal.ZERO; + baseCalculo = BigDecimal.ZERO; + aliquota = BigDecimal.ZERO; + isentos = BigDecimal.ZERO; + outros = BigDecimal.ZERO; + icms = BigDecimal.ZERO; + } + + for (DetalhadoRMD det : imp.getDetalhada()) { + + if (contBolto == 999) { + boletos.add(boletoAgr); + boletoAgr = null; + contBolto = 0; + } + + if (boletoAgr == null) + boletoAgr = det.getCajaId().toString(); + else + boletoAgr = boletoAgr + " ," + det.getCajaId(); + + contBolto++; + } + cont++; + + valorContabil = valorContabil.add(imp.getValorContabil()); + baseCalculo = baseCalculo.add(imp.getBaseCalculo()); + aliquota = imp.getAliquota(); + isentos = isentos.add(imp.getIsentos()); + outros = outros.add(imp.getOutros()); + icms = icms.add(imp.getIcms()); + } + + if (boletos.isEmpty()) { + rmdIterate++; + boletos.add(boletoAgr); + insereConsulmoFolioRMD(connection, dataBilhete, empresaId, estadoId, aidf, rmdIterate.toString(), false, false, true, isECF, isBPR, + valorContabil, baseCalculo, aliquota, isentos, outros, icms); + marcarRMDCaja(connection, boletos, aidf.getAidfId(), rmdIterate); + } + } + + private void marcarRMDCaja(Connection connection, List boletos, Long rmdId, Integer folio) { + + for (String bs : boletos) { + StringBuilder sb = new StringBuilder(); + PreparedStatement pstmt = null; + try { + sb.append(" update caja set rmd_id = ").append(rmdId).append(", "); + sb.append(" foliormd = ").append(folio).append(" "); + sb.append(" where caja_id in ( ").append(bs).append(" ) "); + pstmt = connection.prepareStatement(sb.toString()); + pstmt.executeUpdate(); + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (pstmt != null && !pstmt.isClosed()) { + pstmt.close(); + } + } catch (Exception e) { + log.error("", e); + } + } + } + } + + @Override + public List getRegistroImpressaoRMDTipoBPR(Connection connection, Date inicio, Date fim, Integer empresaId, + String cveestado, String rmd, String folio) { + + List list = new ArrayList(); + + // IMPRESSAO RMD MANUAL + Date data = null; + String numPuntoVenta = null; + + ImpressaoRMD impRmd = null; + + for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, cveestado, null, null, null, true, false, false)) { + + if (numPuntoVenta == null) { + impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), + brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", null, null, folio); + numPuntoVenta = brp.getNumPuntoVenta(); + data = brp.getFechorVenta(); + + } else if (!(numPuntoVenta.equals(brp.getNumPuntoVenta()) && data.equals(brp.getFechorVenta()))) { + impRmd.setNumero(brp.getCcf()); + list.add(impRmd); + + impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), + brp.getFechorVenta(), rmd, "SERVIÇO DE TRANSPORTE", "DVB", null, null, folio); + numPuntoVenta = brp.getNumPuntoVenta(); + data = brp.getFechorVenta(); + } + + impRmd.getDetalhada().add(brp); + } + + if (impRmd != null) + list.add(impRmd); + + agruparImpressaoRMD(list); + + return list; + } + + @Override + public List getRegistroImpressaoRMDTipoECF(Connection connection, Date inicio, Date fim, Integer empresaId, + String cveestado, String rmd, String folio) { + + List list = new ArrayList(); + + // IMPRESSAO RMD ECF + String serie = null; + String datamov = null; + ImpressaoRMD impRmd = null; + + for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, cveestado, null, null, null, false, true, false)) { + Date dataMovimento = null; + try { + dataMovimento = DateUtil.getDateFromString(brp.getDatamov(), DATE_FORMAT_FISCAL); + } catch (Exception e) { + } + + if (serie == null) { + + impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), + dataMovimento, rmd, "SERVIÇO DE TRANSPORTE", "ECF", brp.getEcf(), brp.getEstadoImpressora(), folio); + serie = brp.getEcf(); + datamov = brp.getDatamov(); + + } else if (!(serie.equals(brp.getEcf()) && datamov.equals(brp.getDatamov()))) { + impRmd.setNumero(brp.getCcf()); + list.add(impRmd); + + impRmd = new ImpressaoRMD(brp.getEmpresa(), brp.getEnderecoEmpresa(), brp.getCnpjEmpresa(), brp.getIeEmpresa(), + dataMovimento, rmd, "SERVIÇO DE TRANSPORTE", "ECF", brp.getEcf(), brp.getEstadoImpressora(), folio); + serie = brp.getEcf(); + datamov = brp.getDatamov(); + } + + impRmd.getDetalhada().add(brp); + } + + if (impRmd != null) + list.add(impRmd); + + agruparImpressaoRMD(list); + + return list; + } + + private void agruparImpressaoRMD(List list) { + + for (ImpressaoRMD impRmd : list) { + + BigDecimal valorContabil = BigDecimal.ZERO; + BigDecimal baseCalculo = BigDecimal.ZERO; + BigDecimal aliquota = BigDecimal.ZERO; + BigDecimal icms = BigDecimal.ZERO; + BigDecimal isentos = BigDecimal.ZERO; + BigDecimal outros = BigDecimal.ZERO; + String cooFim = null; + + for (DetalhadoRMD brp : impRmd.getDetalhada()) { + + if (brp.getIsenta()) { + isentos = isentos == null ? BigDecimal.ZERO : isentos.add(somarTotalBilhete(brp)); + } else { + valorContabil = valorContabil == null ? BigDecimal.ZERO : valorContabil.add(brp.getTarifa() == null ? BigDecimal.ZERO : brp.getTarifa()); + + BigDecimal redBaseCalcIcms = brp.getRedBaseCalcIcms() == null ? BigDecimal.ZERO : brp.getRedBaseCalcIcms().divide(UtiliteriasFiscal.CEM); + BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms); + baseCalculo = valorContabil.subtract(redutor); + + aliquota = brp.getTributacaoImportacao() == null ? brp.getIcmsInterestadual() : brp.getTributacaoImportacao(); + icms = baseCalculo.multiply(aliquota.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); + outros = valorContabil.subtract(baseCalculo); + } + cooFim = brp.getCoo() == null ? brp.getNumPuntoVenta() : brp.getCoo(); + } + impRmd.setNumero(cooFim); + impRmd.setValorContabil(valorContabil); + impRmd.setBaseCalculo(baseCalculo); + impRmd.setAliquota(aliquota); + impRmd.setIcms(icms); + impRmd.setIsentos(isentos); + impRmd.setOutros(outros); + } + } + + private BigDecimal somarTotalBilhete(DetalhadoRMD brp) { + + BigDecimal total = BigDecimal.ZERO; + total = total.add(brp.getTarifa() == null ? BigDecimal.ZERO : brp.getTarifa()); + total = total.add(brp.getTaxaEmbarque() == null ? BigDecimal.ZERO : brp.getTaxaEmbarque()); + total = total.add(brp.getPedagio() == null ? BigDecimal.ZERO : brp.getPedagio()); + total = total.add(brp.getSeguro() == null ? BigDecimal.ZERO : brp.getSeguro()); + total = total.add(brp.getOutros() == null ? BigDecimal.ZERO : brp.getOutros()); + return total; + } + + public List buscarRegistroImpressaoBPR(Connection connection, Date inicio, Date fim, Integer empresaId, + String cveestado, Long rmdId, String folioInicial, String folioFinal, boolean isManual, boolean isECF, boolean isCancelamento) { + + List list = new ArrayList(); + try { + boolean isDif = validaConstanteCustom(empresaId.toString(), "IMPORT_FISCAL_DIF"); + + String sql = null; + if (isECF && !isCancelamento) { + sql = getSqlImpressaoRMDTipoECF(); + } else if (isManual && !isCancelamento) { + sql = getSqlImpressaoRMDTipoBPR(isDif); + } else if (isCancelamento) { + sql = getSqlImpressaoRMDCancelados(); + } + + NamedParameterStatement ps = new NamedParameterStatement(connection, sql); + ps.getStatement().setFetchSize(100); + ps.setInt("EMPRESA_ID", empresaId); + ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); + ps.setTimestamp("DATE_FIM", new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime())); + + if (isCancelamento) { + ps.setLong("RMD_ID", rmdId); + ps.setLong("FOLIO_INICIAL", NumberUtils.createLong(folioInicial)); + ps.setLong("FOLIO_FINAL", NumberUtils.createLong(folioFinal)); + } else { + ps.setString("CVEESTADO", cveestado); + } + + ResultSet rs = ps.executeQuery(); + while (rs.next()) { + + DetalhadoRMD brp = new DetalhadoRMD(); + brp.setCajaId(rs.getLong("cajaId")); + if (!isCancelamento) { + brp.setNumoperacion(rs.getString("numoperacion")); + brp.setSerie(rs.getString("serieCompl")); + brp.setFolio(rs.getInt("folio")); + brp.setEstadoId(rs.getInt("estadoId")); + brp.setFechorVenta(rs.getDate("fechorVenta")); + brp.setEmpresa(rs.getString("empresa")); + brp.setEnderecoEmpresa(rs.getString("enderecoEmpresa")); + brp.setCnpjEmpresa(rs.getString("cnpjEmpresa")); + brp.setIeEmpresa(rs.getString("ieEmpresa")); + brp.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); + brp.setIcmsIntermunicipal(rs.getBigDecimal("icmsIntermunicipal")); + brp.setEstadoOrigem(rs.getString("estadoOrigem")); + brp.setEstadoDestino(rs.getString("estadoDestino")); + brp.setMunicipioOrigem(rs.getString("municipioOrigem")); + brp.setInterEstadual(rs.getBoolean("isInterEstadual")); + brp.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); + brp.setRedBaseCalcIcms(rs.getBigDecimal("redBaseCalcIcms")); + brp.setPorcRedMunicipal(rs.getBigDecimal("porcRedMunicipal")); + brp.setPorcRedEstadual(rs.getBigDecimal("porcRedEstadual")); + brp.setTributacaoImportacao(rs.getBigDecimal("tributacaoImportacao")); + brp.setIsenta(rs.getBoolean("isenta")); + brp.setTarifa(rs.getBigDecimal("tarifa")); + brp.setTaxaEmbarque(rs.getBigDecimal("taxaEmbarque")); + brp.setPedagio(rs.getBigDecimal("pedagio")); + brp.setSeguro(rs.getBigDecimal("seguro")); + brp.setOutros(rs.getBigDecimal("outros")); + brp.setNombPuntoVenta(rs.getString("nombPuntoVenta")); + brp.setNumPuntoVenta(rs.getString("numPuntoVenta")); + + if (isECF && !isCancelamento) { + brp.setEcf(rs.getString("ecf")); + brp.setDatamov(rs.getString("datamov")); + brp.setCoo(rs.getString("cooredz")); + brp.setCcf(rs.getString("ccf")); + brp.setTotalFiscal(rs.getString("totalFiscal")); + brp.setEstadoImpressora(rs.getString("estadoImpressora")); + } + } else { + brp.setRmdId(rs.getInt("rmd_id")); + brp.setFoliormd(rs.getString("foliormd")); + } + + list.add(brp); + } + + rs.close(); + ps.close(); + + } catch (SQLException e) { + log.error("", e); + } + + return list; + } + + public boolean validaConstanteCustom(String valor, String nomeConstante) { + ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); + Constante contante = constanteService.buscarPorNomeConstante(nomeConstante); + String value = contante == null ? null : contante.getValorconstante(); + + if (StringUtils.isBlank(value)) + return false; + + List valuesList = Arrays.asList(value.split(",", -1)); + return valuesList.contains(valor); + } + + private String getSqlImpressaoRMDTipoBPR(boolean isDif) { + + StringBuilder sql = new StringBuilder(); + sql.append("select distinct "); + sql.append(" b.caja_id as cajaId, "); + sql.append(" b.numoperacion as numoperacion, "); + sql.append(" b.numseriepreimpresa as serieCompl, "); + sql.append(" b.numfoliopreimpreso as folio, "); + sql.append(" a.acfiscal as numAidf, "); + sql.append(" a.serie as serieAidf, "); + sql.append(" a.subserie as subSerieAidf, "); + sql.append(" trunc(b.feccreacion) as fechorVenta, "); + sql.append(" e.nombempresa as empresa, "); + sql.append(" coalesce(ie.cnpj, e.cnpj) as cnpjEmpresa, "); + sql.append(" case when ie.logradouro is null "); + sql.append(" then (e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad "); + sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ) "); + sql.append(" else (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || cie.nombciudad "); + sql.append(" || ' - ' || eie.cveestado || ', ' || ie.cep ) end as enderecoEmpresa, "); + sql.append(" pv.nombpuntoventa as nombPuntoVenta, "); + sql.append(" pv.numpuntoventa as numPuntoVenta, "); + sql.append(" ie.numinscricaoestadual as ieEmpresa, "); + sql.append(" coalesce(ae.estado_id, e_ag.estado_id, eos.estado_id, eo.estado_id) as estadoId, "); + sql.append(" coalesce(ei.icms, eos.icms) as icmsInterestadual, "); + sql.append(" ei.icmsim as icmsIntermunicipal, "); + sql.append(" coalesce(ae.cveestado, e_ag.cveestado, eos.cveestado, eo.cveestado) as estadoOrigem, "); + sql.append(" ed.cveestado as estadoDestino, "); + sql.append(" co.codibge as municipioOrigem, "); + sql.append(" case when((coalesce(ae.cveestado, eos.cveestado)) = ed.cveestado) "); + sql.append(" then 0 else 1 end as isInterEstadual, "); + sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); + sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); + sql.append(" ei.porcredestadual as porcRedEstadual, "); + sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); + sql.append(" case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = "); + sql.append(" coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) "); + sql.append(" then 1 else 0 end as isenta, "); + sql.append(" coalesce(b.preciopagado, 0) as tarifa, "); + sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, "); + sql.append(" coalesce(b.importepedagio, 0) as pedagio, "); + sql.append(" coalesce(b.importeseguro, 0) as seguro, "); + sql.append(" coalesce(b.importeoutros, 0) as outros "); + sql.append("from caja b "); + sql.append(" join marca m on b.marca_id = m.marca_id "); + sql.append(" join empresa e on e.empresa_id = m.empresa_id "); + sql.append(" left join aidf a on a.aidf_id = b.aidf_id "); + sql.append(" left join punto_venta pv on pv.puntoventa_id = b.puntoventa_id "); + sql.append(" left join parada de_ag on de_ag.parada_id = pv.parada_id "); + sql.append(" left join ciudad cd_ag on cd_ag.ciudad_id = de_ag.ciudad_id "); + sql.append(" left join estado e_ag on e_ag.estado_id = cd_ag.estado_id "); + sql.append(" left join ciudad ce on ce.ciudad_id = e.ciudad_id "); + sql.append(" left join estado ee on ee.estado_id = ce.estado_id "); + sql.append(" join parada po on po.parada_id = b.origen_id "); + sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append(" join parada pd on pd.parada_id = b.destino_id "); + sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); + sql.append(" join estado ed on ed.estado_id = cd.estado_id "); + sql.append(" left join alias_servico s on s.origen_id = b.origen_id "); + sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); + sql.append(" and s.ruta_id = b.ruta_id and s.activo = 1 "); + sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); + sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); + sql.append(" left join estado ae on ae.estado_id = a.estado_id "); + sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); + sql.append(" and ie.estado_id = coalesce(ae.estado_id, e_ag.estado_id, eos.estado_id, eo.estado_id) and ie.activo = 1 "); + sql.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id "); + sql.append(" left join estado eie on eie.estado_id = cie.estado_id "); + sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id "); + sql.append(" and ei.estado_id = coalesce(ae.estado_id, e_ag.estado_id, eos.estado_id, eo.estado_id) and ei.activo = 1 "); + sql.append("where "); + + if (isDif) { + sql.append(" ((b.tipoventa_id not in (5,12,18,81,82,49,41) and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); + sql.append(" or (b.tipoventa_id in (5,12,18,81,82,49,41) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); + sql.append(" and a.aidf_id is not null "); + } else { + sql.append(" ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); + sql.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); + } + + sql.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) "); + sql.append(" and b.indcancelacion = 0 "); + sql.append(" and b.empresacorrida_id = :EMPRESA_ID "); + sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM "); + sql.append(" and coalesce(ae.cveestado, e_ag.cveestado, eos.cveestado, eo.cveestado) = :CVEESTADO "); + sql.append(" and b.rmd_id is null "); + sql.append(" and b.num_bpe is null "); + sql.append("order by estadoId, fechorVenta, nombPuntoVenta, numPuntoVenta "); + + return sql.toString(); + } + + private String getSqlImpressaoRMDTipoECF() { + + StringBuilder sql = new StringBuilder(); + sql.append("select distinct "); + sql.append(" c.caja_id as cajaId, "); + sql.append(" c.numoperacion as numoperacion, "); + sql.append(" c.numseriepreimpresa as serieCompl, "); + sql.append(" c.numfoliopreimpreso as folio, "); + sql.append(" '' as numAidf, "); + sql.append(" '' as serieAidf, "); + sql.append(" '' as subSerieAidf, "); + sql.append(" trunc(c.feccreacion) as fechorVenta, "); + sql.append(" ep.nombempresa as empresa, "); + sql.append(" ie.cnpj as cnpjEmpresa, "); + sql.append(" (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || cie.nombciudad "); + sql.append(" || ' - ' || eie.cveestado || ', ' || ie.cep ) as enderecoEmpresa, "); + sql.append(" '' as nombPuntoVenta, "); + sql.append(" '' as numPuntoVenta, "); + sql.append(" ie.numinscricaoestadual as ieEmpresa, "); + sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoId,"); + sql.append(" (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as icmsInterestadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.icmsim else eis.icmsim end) as icmsIntermunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estadoOrigem,"); + sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,"); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); + sql.append(" case when ( (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = "); + sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) ) then 0 else 1 end as isInterEstadual, "); + sql.append(" (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as redBaseCalcIcms,"); + sql.append(" (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porcRedMunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porcRedEstadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.tributacaoimportacao else eis.tributacaoimportacao end) as tributacaoImportacao,"); + sql.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id "); + sql.append(" else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null "); + sql.append(" then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, "); + sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); + sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); + sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); + sql.append(" coalesce(c.importeseguro, 0) as seguro, "); + sql.append(" coalesce(c.importeoutros, 0) as outros, "); + sql.append(" coalesce(r2.numserie20, imp.numserie20) as ecf, "); + sql.append(" to_char(c.feccreacion, 'YYYYMMDD') as datamov, "); + sql.append(" case when r2.numserie20 is null then '000001' else r2.coo end as coo, "); + sql.append(" '000000' as ccf, "); + sql.append(" null as totalFiscal, "); + sql.append(" case when r2.numserie20 is null then '000001' else r2.coo end as cooredz, "); + sql.append(" epv.cveestado as estadoImpressora "); + sql.append(" from caja c "); + sql.append(" join ruta r on r.ruta_id = c.ruta_id "); + sql.append(" join parada po on po.parada_id = c.origen_id "); + sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append(" join parada pd on pd.parada_id = c.destino_id "); + sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); + sql.append(" join estado ed on ed.estado_id = cd.estado_id "); + sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id "); + sql.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal "); + sql.append(" left join estado e on e.estado_id = imp.estadolocal_id "); + sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); + sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); + sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); + sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id "); + sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id "); + sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') "); + sql.append(" join inscricao_estadual ie on c.empresacorrida_id = ie.empresa_id and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 "); + sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); + sql.append(" join estado eie on eie.estado_id = cie.estado_id "); + sql.append(" join marca ma on c.marca_id = ma.marca_id "); + sql.append(" join empresa ep on ep.empresa_id = ma.empresa_id "); + sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id "); + sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id "); + sql.append(" left join estado epv on epv.estado_id = cpv.estado_id "); + sql.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1 "); + sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); + sql.append(" and c.serieimpfiscal is not null "); + sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); + sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); + sql.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); + sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); + sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = :CVEESTADO ) "); + sql.append(" and c.rmd_id is null "); + sql.append(" and c.num_bpe is null "); + sql.append(" order by estadoId, datamov, ecf, coo "); + + return sql.toString(); + } + + private String getSqlImpressaoRMDCancelados() { + + StringBuilder sql = new StringBuilder(); + sql.append("select distinct "); + sql.append(" c.caja_id as cajaId, "); + sql.append(" c.rmd_id as rmd_id, "); + sql.append(" c.foliormd as foliormd "); + sql.append(" from caja c "); + sql.append(" where c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); + sql.append(" and c.rmd_id = :RMD_ID "); + sql.append(" and c.foliormd between :FOLIO_INICIAL and :FOLIO_FINAL "); + + return sql.toString(); + } + + @Override + public List buscarRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, List estados, boolean isReceitaTerceiros) { + + String ufs = null; + for (Estado estado : estados) { + if (ufs == null) + ufs = "'" + estado.getCveestado() + "'"; + else + ufs = ufs + ",'" + estado.getCveestado() + "'"; + } + + List list = montaRelatorioRDI(connection, inicio, fim, empresaId, ufs); + List rdis = calcularRelatorioRDI(list, isReceitaTerceiros); + return agrupaRdi(rdis); + } + + private List agrupaRdi(List list) { + List aux = new ArrayList(); + + FiscalRdi rdi = null; + for (FiscalRdi detail : list) { + + FiscalRdi atual = new FiscalRdi(detail.getEstado(), detail.getTipoViagem(), detail.getTipoReceita()); + if (!aux.contains(atual)) { + rdi = new FiscalRdi(detail.getEstado(), detail.getTipoViagem(), detail.getTipoReceita()); + aux.add(rdi); + } + + int index = aux.indexOf(atual); + FiscalRdi agr = aux.get(index); + montarParametros(agr, detail); + aux.set(index, agr); + } + + List validacion = new ArrayList(); + for (FiscalRdi detail : aux) { + + RdiValidacion rv = new RdiValidacion(detail.getEstado()); + if (!validacion.contains(rv)) { + rv = new RdiValidacion(detail.getEstado()); + validacion.add(rv); + } + + int indice = validacion.indexOf(rv); + RdiValidacion rvAux = validacion.get(indice); + + if (detail.getTipoReceita().equals("REC") && detail.getTipoViagem().equals("IM")) + rvAux.setTemIMRec(true); + + if (detail.getTipoReceita().equals("DEV") && detail.getTipoViagem().equals("IM")) + rvAux.setTemIMDev(true); + + if (detail.getTipoReceita().equals("REC") && detail.getTipoViagem().equals("IE")) + rvAux.setTemIERec(true); + + if (detail.getTipoReceita().equals("DEV") && detail.getTipoViagem().equals("IE")) + rvAux.setTemIEDev(true); + + validacion.set(indice, rvAux); + } + + for (RdiValidacion val : validacion) { + + if (!val.isTemIMRec()) { + FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IM", "REC"); + aux.add(montarParametros(rdiAux, new FiscalRdi())); + } + + if (!val.isTemIMDev()) { + FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IM", "DEV"); + aux.add(montarParametros(rdiAux, new FiscalRdi())); + } + + if (!val.isTemIERec()) { + FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IE", "REC"); + aux.add(montarParametros(rdiAux, new FiscalRdi())); + } + + if (!val.isTemIEDev()) { + FiscalRdi rdiAux = new FiscalRdi(val.getEstado(), "IE", "DEV"); + aux.add(montarParametros(rdiAux, new FiscalRdi())); + } + } + + Collections.sort(aux); + return aux; + } + + private FiscalRdi montarParametros(FiscalRdi agr, FiscalRdi detail) { + agr.setQuantBilhetes(agr.getQuantBilhetes().add(detail.getTarifa() == null ? BigDecimal.ZERO : BigDecimal.ONE)); + agr.setTarifa(agr.getTarifa().add(detail.getTarifa() == null ? BigDecimal.ZERO : detail.getTarifa())); + agr.setSeguro(agr.getSeguro().add(detail.getSeguro() == null ? BigDecimal.ZERO : detail.getSeguro())); + agr.setTxEmbarque(agr.getTxEmbarque().add(detail.getTxEmbarque() == null ? BigDecimal.ZERO : detail.getTxEmbarque())); + agr.setPedagio(agr.getPedagio().add(detail.getPedagio() == null ? BigDecimal.ZERO : detail.getPedagio())); + agr.setPassagem(agr.getPassagem().add(detail.getPassagem() == null ? BigDecimal.ZERO : detail.getPassagem())); + agr.setIsentos(agr.getIsentos().add(detail.getIsentos() == null ? BigDecimal.ZERO : detail.getIsentos())); + agr.setOutros(agr.getOutros().add(detail.getOutros() == null ? BigDecimal.ZERO : detail.getOutros())); + agr.setRbc(detail.getRbc() == null ? BigDecimal.ZERO : detail.getRbc()); + agr.setBaseCalculo(agr.getBaseCalculo().add(detail.getBaseCalculo() == null ? BigDecimal.ZERO : detail.getBaseCalculo())); + agr.setAliquota(detail.getAliquota() == null ? BigDecimal.ZERO : detail.getAliquota()); + agr.setIcms(agr.getIcms().add(detail.getIcms() == null ? BigDecimal.ZERO : detail.getIcms())); + agr.setCp(detail.getCp() == null ? BigDecimal.ZERO : detail.getCp()); + agr.setCredPres(agr.getCredPres().add(detail.getCredPres() == null ? BigDecimal.ZERO : detail.getCredPres())); + agr.setIcmsRec(agr.getIcmsRec().add(detail.getIcmsRec() == null ? BigDecimal.ZERO : detail.getIcmsRec())); + return agr; + } + + private List calcularRelatorioRDI(List list, boolean isReceitaTerceiros) { + + List rdis = new ArrayList(); + + for (DetalhadoFiscal det : list) { + + BigDecimal passagem = valorPassagem(det, isReceitaTerceiros); + BigDecimal isentos = valorIsenta(det, isReceitaTerceiros); + BigDecimal outros = BigDecimal.ZERO; + BigDecimal rbc = BigDecimal.ZERO; + BigDecimal baseCalculo = BigDecimal.ZERO; + BigDecimal aliquota = BigDecimal.ZERO; + BigDecimal icms = BigDecimal.ZERO; + BigDecimal cp = BigDecimal.ZERO; + BigDecimal credPres = BigDecimal.ZERO; + BigDecimal icmsRec = BigDecimal.ZERO; + + if (det.isInterEstadual()) { + aliquota = det.getTributacaoImportacao() != null ? det.getTributacaoImportacao() : det.getIcmsInterestadual(); + } else { + aliquota = det.getTributacaoImportacao() != null ? det.getTributacaoImportacao() : det.getIcmsIntermunicipal(); + } + + if (det.isInterEstadual()) { + cp = det.getPorcRedEstadual() == null ? BigDecimal.ZERO : det.getPorcRedEstadual(); + } else { + cp = det.getPorcRedMunicipal() == null ? BigDecimal.ZERO : det.getPorcRedMunicipal(); + } + + rbc = det.getRedBaseCalcIcms() == null ? BigDecimal.ZERO : det.getRedBaseCalcIcms().divide(UtiliteriasFiscal.CEM); + + BigDecimal tarifa = valorBaseCalculo(det, isReceitaTerceiros); + BigDecimal redutor = tarifa.multiply(rbc); + baseCalculo = tarifa.subtract(redutor); + + icms = baseCalculo.multiply(aliquota.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); + credPres = icms.multiply(cp.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); + icmsRec = icms.subtract(credPres); + + outros = isentos.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : passagem.subtract(isentos).subtract(baseCalculo); + + String tipoViagem = det.isInterEstadual() ? "IE" : "IM"; + BigDecimal taxaEmbarque = (isReceitaTerceiros && det.getTaxaEmbarque() == null) ? det.getTaxaEmbarque() : BigDecimal.ZERO; + BigDecimal pedagio = (isReceitaTerceiros && det.getPedagio() == null) ? det.getPedagio() : BigDecimal.ZERO; + BigDecimal seguro = (isReceitaTerceiros && det.getSeguro() == null) ? det.getSeguro() : BigDecimal.ZERO; + + rdis.add(new FiscalRdi(det.getEstadoOrigem(), tipoViagem, det.getTipoReceita(), det.getTarifa(), + seguro, taxaEmbarque, pedagio, passagem, isentos, outros, det.getRedBaseCalcIcms(), + baseCalculo, aliquota, icms, cp, credPres, icmsRec)); + } + + return rdis; + } + + private BigDecimal valorBaseCalculo(DetalhadoFiscal det, boolean isReceitaTerceiros) { + BigDecimal total = BigDecimal.ZERO; + total = total.add(det.getTarifa() == null ? BigDecimal.ZERO : det.getTarifa()); + + if (isReceitaTerceiros && (det.isInterEstadual() && det.getIndTxembarqueEstadual() || !det.isInterEstadual() && det.getIndTxembarqueMunicipal())) + total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); + + if (isReceitaTerceiros && (det.isInterEstadual() && det.getIndPedagioEstdual() || !det.isInterEstadual() && det.getIndPedagioMunicipal())) + total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); + + if (isReceitaTerceiros && (det.isInterEstadual() && det.getIndSeguroEstadual() || !det.isInterEstadual() && det.getIndSeguroMunicipal())) + total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); + + return total; + } + + private BigDecimal valorIsenta(DetalhadoFiscal det, boolean isReceitaTerceiros) { + + BigDecimal total = BigDecimal.ZERO; + if (isReceitaTerceiros && (det.isInterEstadual() && !det.getIndTxembarqueEstadual() || !det.isInterEstadual() && !det.getIndTxembarqueMunicipal())) + total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); + + if (isReceitaTerceiros && (det.isInterEstadual() && !det.getIndPedagioEstdual() || !det.isInterEstadual() && !det.getIndPedagioMunicipal())) + total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); + + if (isReceitaTerceiros && (det.isInterEstadual() && !det.getIndSeguroEstadual() || !det.isInterEstadual() && !det.getIndSeguroMunicipal())) + total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); + + return total; + } + + private BigDecimal valorPassagem(DetalhadoFiscal det, boolean isReceitaTerceiros) { + BigDecimal total = BigDecimal.ZERO; + total = total.add(det.getTarifa() == null ? BigDecimal.ZERO : det.getTarifa()); + if (isReceitaTerceiros) { + total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); + total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); + total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); + } + return total; + } + + private List montaRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, String ufs) { + + List list = new ArrayList(); + try { + + StringBuilder sql = new StringBuilder(); + sql.append(sqlRelatorioRDIVendidos(ufs)); + sql.append(" union all "); + sql.append(sqlRelatorioRDICancelados(ufs)); + + NamedParameterStatement ps = new NamedParameterStatement(connection, sql.toString()); + ps.setLong("EMPRESA_ID", Long.valueOf(empresaId)); + + ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); + ps.setTimestamp("DATE_FIM", new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime())); + + ResultSet rs = ps.executeQuery(); + while (rs.next()) { + + DetalhadoFiscal df = new DetalhadoFiscal(); + df.setCajaId(rs.getLong("cajaId")); + df.setTipoReceita(rs.getString("tipoReceita")); + df.setNumoperacion(rs.getString("numoperacion")); + df.setEstadoId(rs.getInt("estadoId")); + df.setFechorVenta(rs.getDate("fechorVenta")); + df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); + df.setIcmsIntermunicipal(rs.getBigDecimal("icmsIntermunicipal")); + df.setEstadoOrigem(rs.getString("estadoOrigem")); + df.setEstadoDestino(rs.getString("estadoDestino")); + df.setMunicipioOrigem(rs.getString("municipioOrigem")); + df.setInterEstadual(rs.getBoolean("isInterEstadual")); + df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); + df.setRedBaseCalcIcms(rs.getBigDecimal("redBaseCalcIcms")); + df.setPorcRedMunicipal(rs.getBigDecimal("porcRedMunicipal")); + df.setPorcRedEstadual(rs.getBigDecimal("porcRedEstadual")); + df.setTributacaoImportacao(rs.getBigDecimal("tributacaoImportacao")); + df.setIndTarifaMunicipal(rs.getBoolean("indtarifamunicipal")); + df.setIndSeguroMunicipal(rs.getBoolean("indseguromunicipal")); + df.setIndTxembarqueMunicipal(rs.getBoolean("indtxembarquemunicipal")); + df.setIndPedagioMunicipal(rs.getBoolean("indpedagiomunicipal")); + df.setIndTarifaEstadual(rs.getBoolean("indtarifaestadual")); + df.setIndSeguroEstadual(rs.getBoolean("indseguroestadual")); + df.setIndTxembarqueEstadual(rs.getBoolean("indtxembarqueestadual")); + df.setIndPedagioEstdual(rs.getBoolean("indpedagioestdual")); + df.setIsenta(rs.getBoolean("isenta")); + df.setTarifa(rs.getBigDecimal("tarifa")); + df.setTaxaEmbarque(rs.getBigDecimal("taxaEmbarque")); + df.setPedagio(rs.getBigDecimal("pedagio")); + df.setSeguro(rs.getBigDecimal("seguro")); + df.setOutros(rs.getBigDecimal("outros")); + df.setDatamov(rs.getString("datamov")); + list.add(df); + } + + rs.close(); + ps.close(); + + } catch (SQLException e) { + log.error("", e); + } + + return list; + } + + private String sqlRelatorioRDIVendidos(String ufs) { + + StringBuilder sql = new StringBuilder(); + + sql.append("select distinct "); + sql.append(" c.caja_id as cajaId, "); + sql.append(" 'REC' as tipoReceita, "); + sql.append(" c.numoperacion as numoperacion, "); + sql.append(" trunc(c.feccreacion) as fechorVenta, "); + sql.append(" (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) as estadoId,"); + sql.append(" (case when s.aliasorigen_id is null then ei.icms else eis.icms end) as icmsInterestadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.icmsim else eis.icmsim end) as icmsIntermunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) as estadoOrigem,"); + sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,"); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); + sql.append(" case when ( (case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = "); + sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) ) then 0 else 1 end as isInterEstadual, "); + sql.append(" (case when s.aliasorigen_id is null then ei.porcredbaseicms else eis.porcredbaseicms end) as redBaseCalcIcms,"); + sql.append(" (case when s.aliasorigen_id is null then ei.porcredmunicipal else eis.porcredmunicipal end) as porcRedMunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then ei.porcredestadual else eis.porcredestadual end) as porcRedEstadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indtarifamunicipal else eis.indtarifamunicipal end) as indtarifamunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indseguromunicipal else eis.indseguromunicipal end) as indseguromunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indtxembarquemunicipal else eis.indtxembarquemunicipal end) as indtxembarquemunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indpedagiomunicipal else eis.indpedagiomunicipal end) as indpedagiomunicipal,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indtarifaestadual else eis.indtarifaestadual end) as indtarifaestadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indseguroestadual else eis.indseguroestadual end) as indseguroestadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indtxembarqueestadual else eis.indtxembarqueestadual end) as indtxembarqueestadual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.indpedagioestdual else eis.indpedagioestdual end) as indpedagioestdual,"); + sql.append(" (case when s.aliasorigen_id is null then ei.tributacaoImportacao else eis.tributacaoImportacao end) as tributacaoImportacao,"); + sql.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id "); + sql.append(" else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null "); + sql.append(" then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, "); + sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); + sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); + sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); + sql.append(" coalesce(c.importeseguro, 0) as seguro, "); + sql.append(" coalesce(c.importeoutros, 0) as outros, "); + sql.append(" coalesce(r4.datamov, to_char(trunc(c.feccreacion), 'yyyymmdd')) as datamov "); + sql.append(" "); + sql.append(" from caja c "); + sql.append(" join ruta r on r.ruta_id = c.ruta_id "); + sql.append(" join parada po on po.parada_id = c.origen_id "); + sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append(" join parada pd on pd.parada_id = c.destino_id "); + sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); + sql.append(" join estado ed on ed.estado_id = cd.estado_id "); + sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = eo.estado_id "); + sql.append(" join fiscal_impressora imp on imp.numserie = c.serieimpfiscal "); + sql.append(" left join estado e on e.estado_id = imp.estadolocal_id "); + sql.append(" left join alias_servico s on s.origen_id = c.origen_id and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) and s.ruta_id = c.ruta_id and s.activo = 1 "); + sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); + sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); + sql.append(" left join empresa_imposto eis on eis.empresa_id = c.empresacorrida_id and eis.estado_id = eos.estado_id "); + sql.append(" left join fiscal_r4 r4 on r4.caja_id = c.caja_id "); + sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(c.feccreacion, 'YYYYMMDD') "); + sql.append(" join inscricao_estadual ie on c.empresacorrida_id = ie.empresa_id and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 "); + sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); + sql.append(" join estado eie on eie.estado_id = cie.estado_id "); + sql.append(" join marca ma on c.marca_id = ma.marca_id "); + sql.append(" join empresa ep on ep.empresa_id = ma.empresa_id "); + sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id "); + sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id "); + sql.append(" left join estado epv on epv.estado_id = cpv.estado_id "); + sql.append(" "); + sql.append(" where c.activo = 1 and po.activo = 1 and co.activo = 1 and eo.activo = 1 and ei.activo = 1 "); + sql.append(" and coalesce(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); + sql.append(" and c.serieimpfiscal is not null "); + sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); + sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); + sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); + sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" and c.num_bpe is null "); + sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) in ( ").append(ufs).append(" )) "); + sql.append(" "); + sql.append("union all "); + sql.append(" "); + sql.append("select distinct "); + sql.append(" c.caja_id as cajaId, "); + sql.append(" 'REC' as tipoReceita, "); + sql.append(" c.numoperacion as numoperacion, "); + sql.append(" trunc(c.feccreacion) as fechorVenta, "); + sql.append(" coalesce(ae.estado_id, (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end)) as estadoId,"); + sql.append(" coalesce(ei.icms, eos.icms) as icmsInterestadual, "); + sql.append(" ei.icmsim as icmsIntermunicipal, "); + sql.append(" coalesce(ae.cveestado,(case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end)) as estadoOrigem,"); + sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) as estadoDestino,"); + sql.append(" (case when s.aliasorigen_id is null then co.codibge else cos.codibge end) as municipioOrigem,"); + sql.append(" case when(coalesce(ae.cveestado,(case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end)) = "); + sql.append(" (case when s.aliasdestino_id is null then ed.cveestado else eds.cveestado end) ) then 0 else 1 end as isInterEstadual, "); + sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); + sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); + sql.append(" ei.porcredestadual as porcRedEstadual, "); + sql.append(" ei.indtarifamunicipal as indtarifamunicipal, "); + sql.append(" coalesce(ei.indseguromunicipal, 0) as indseguromunicipal, "); + sql.append(" coalesce(ei.indtxembarquemunicipal, 0) as indtxembarquemunicipal, "); + sql.append(" coalesce(ei.indpedagiomunicipal, 0) as indpedagiomunicipal, "); + sql.append(" coalesce(ei.indtarifaestadual, 0) as indtarifaestadual, "); + sql.append(" coalesce(ei.indseguroestadual, 0) as indseguroestadual, "); + sql.append(" coalesce(ei.indtxembarqueestadual, 0) as indtxembarqueestadual, "); + sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, "); + sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); + sql.append(" (case when (coalesce(case when s.aliasorigen_id is null then po.regionmetropolitana_id "); + sql.append(" else pos.regionmetropolitana_id end, -1) = coalesce(case when s.aliasorigen_id is null "); + sql.append(" then pd.regionmetropolitana_id else pds.regionmetropolitana_id end, -2)) then 1 else 0 end) as isenta, "); + sql.append(" coalesce(c.preciopagado, 0) as tarifa, "); + sql.append(" coalesce(c.importetaxaembarque, 0) as taxaEmbarque, "); + sql.append(" coalesce(c.importepedagio, 0) as pedagio, "); + sql.append(" coalesce(c.importeseguro, 0) as seguro, "); + sql.append(" coalesce(c.importeoutros, 0) as outros, "); + sql.append(" to_char(trunc(c.feccreacion), 'yyyymmdd') as datamov "); + sql.append("from caja c "); + sql.append(" join marca m on c.marca_id = m.marca_id "); + sql.append(" join empresa e on e.empresa_id = m.empresa_id "); + sql.append(" join aidf a on a.aidf_id = c.aidf_id "); + sql.append(" join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id "); + sql.append(" join estado ee on ee.estado_id = ce.estado_id "); + sql.append(" join parada po on po.parada_id = c.origen_id "); + sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id "); + sql.append(" join estado eo on eo.estado_id = co.estado_id "); + sql.append(" join parada pd on pd.parada_id = c.destino_id "); + sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id "); + sql.append(" join estado ed on ed.estado_id = cd.estado_id "); + sql.append(" left join alias_servico s on s.origen_id = c.origen_id "); + sql.append(" and s.destino_id = c.destino_id and (s.corrida_id = c.corrida_id or s.corrida_id is null) "); + sql.append(" and s.ruta_id = c.ruta_id and s.activo = 1 "); + sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append(" left join estado eos on eos.estado_id = cos.estado_id "); + sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); + sql.append(" left join estado ae on ae.estado_id = a.estado_id "); + sql.append(" join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); + sql.append(" and ie.estado_id = coalesce(ae.estado_id, eos.estado_id) and ie.activo = 1 "); + sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id "); + sql.append(" join estado eie on eie.estado_id = cie.estado_id "); + sql.append(" join empresa_imposto ei on ei.empresa_id = c.empresacorrida_id "); + sql.append(" and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 "); + sql.append("where ((c.tipoventa_id = 3 and c.indstatusboleto = 'V' and c.indreimpresion = 0) "); + sql.append(" or (c.tipoventa_id in (12,18) and c.indstatusboleto = 'E' and c.numfoliosistema = c.numfoliopreimpreso)) "); + sql.append(" and (c.motivocancelacion_id is null or c.motivocancelacion_id <> 35) "); + sql.append(" and c.indcancelacion = 0 "); + sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); + sql.append(" and c.feccreacion between :DATE_INICIO and :DATE_FIM "); + sql.append(" and c.num_bpe is null "); + sql.append(" and coalesce(ae.cveestado, eos.cveestado) in ( ").append(ufs).append(" ) "); + return sql.toString(); + } + + private String sqlRelatorioRDICancelados(String ufs) { + + StringBuilder sql = new StringBuilder(); + sql.append("select distinct "); + sql.append(" b.boleto_id as cajaId, "); + sql.append(" 'DEV' as tipoReceita, "); + sql.append(" b.numoperacion as numoperacion, "); + sql.append(" trunc(b.feccreacion) as fechorVenta, "); + sql.append(" coalesce(esaidf.estado_id, eos.estado_id, est.estado_id) as estadoId, "); + sql.append(" ei.icms as icmsInterestadual, "); + sql.append(" ei.icmsim as icmsIntermunicipal, "); + sql.append(" coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) as estadoOrigem, "); + sql.append(" coalesce(eds.cveestado, est.cveestado) as estadoDestino, "); + sql.append(" 0 as municipioOrigem, "); + sql.append(" case when (coalesce(cos.estado_id,co.estado_id) <> coalesce(cds.estado_id,cd.estado_id)) then 1 else 0 end as isInterEstadual, "); + sql.append(" ei.porcredbaseicms as redBaseCalcIcms, "); + sql.append(" ei.porcredmunicipal as porcRedMunicipal, "); + sql.append(" ei.porcredestadual as porcRedEstadual, "); + sql.append(" coalesce(ei.indtarifamunicipal, 0) as indtarifamunicipal, "); + sql.append(" coalesce(ei.indseguromunicipal, 0) as indseguromunicipal, "); + sql.append(" coalesce(ei.indtxembarquemunicipal, 0) as indtxembarquemunicipal, "); + sql.append(" coalesce(ei.indpedagiomunicipal, 0) as indpedagiomunicipal, "); + sql.append(" coalesce(ei.indtarifaestadual, 0) as indtarifaestadual, "); + sql.append(" coalesce(ei.indseguroestadual, 0) as indseguroestadual, "); + sql.append(" coalesce(ei.indtxembarqueestadual, 0) as indtxembarqueestadual, "); + sql.append(" coalesce(ei.indpedagioestdual, 0) as indpedagioestdual, "); + sql.append(" ei.tributacaoimportacao as tributacaoImportacao, "); + sql.append(" case when (coalesce(pos.regionmetropolitana_id, ori.regionmetropolitana_id, -1) = "); + sql.append(" coalesce(pds.regionmetropolitana_id, des.regionmetropolitana_id, -2)) then 1 else 0 end as isenta, "); + sql.append(" coalesce(b.preciopagado, 0) as tarifa, "); + sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, "); + sql.append(" coalesce(b.importepedagio, 0) as pedagio, "); + sql.append(" coalesce(b.importeseguro, 0) as seguro, "); + sql.append(" coalesce(b.importeoutros, 0) as outros, "); + sql.append(" to_char(trunc(b.feccreacion), 'yyyymmdd') as datamov "); + sql.append(" "); + sql.append("from boleto b "); + sql.append("inner join marca m on m.marca_id = b.marca_id and m.activo = 1 "); + sql.append("inner join empresa e on e.empresa_id = m.empresa_id "); + sql.append("inner join punto_venta ptv on ptv.puntoventa_id = b.puntoventa_id "); + sql.append("inner join parada ori on (b.origen_id = ori.parada_id ) "); + sql.append("inner join parada des on (b.destino_id = des.parada_id ) "); + sql.append("inner join ciudad co on (co.ciudad_id = ori.ciudad_id ) "); + sql.append("inner join ciudad cd on (cd.ciudad_id = des.ciudad_id ) "); + sql.append("inner join estado est on est.estado_id = co.estado_id "); + sql.append("left join punto_venta ptvo on ptvo.puntoventa_id = b.ptovtaventa_id "); + sql.append("left join alias_servico s on s.origen_id = b.origen_id "); + sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) "); + sql.append(" and s.ruta_id = b.ruta_id and s.activo = 1 "); + sql.append("left join parada pos on pos.parada_id = s.aliasorigen_id "); + sql.append("left join ciudad cos on cos.ciudad_id = pos.ciudad_id "); + sql.append("left join estado eos on eos.estado_id = cos.estado_id "); + sql.append("left join parada pds on pds.parada_id = s.aliasdestino_id "); + sql.append("left join ciudad cds on cds.ciudad_id = pds.ciudad_id "); + sql.append("left join estado eds on eds.estado_id = cds.estado_id "); + sql.append("left join aidf aidf on aidf.aidf_id = b.aidf_id and b.tipoventa_id = 3 "); + sql.append("left join estado esaidf on esaidf.estado_id = aidf.estado_id "); + sql.append("join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); + sql.append(" and ie.estado_id = coalesce(aidf.estado_id, eos.estado_id, est.estado_id) and ie.activo = 1 "); + sql.append("join empresa_imposto ei on ei.empresa_id = e.empresa_id "); + sql.append(" and ei.estado_id = coalesce(aidf.estado_id, eos.estado_id, est.estado_id) and ei.activo = 1 "); + sql.append("where b.motivocancelacion_id in (31,32,10,37,99,36) "); + sql.append(" and b.indstatusboleto = 'C' and b.indcancelacion = 1 "); + sql.append(" and b.numfoliopreimpreso is not null "); + sql.append(" and e.empresa_id = :EMPRESA_ID "); + sql.append(" and b.fechorventa >= :DATE_INICIO "); + sql.append(" and b.fechorventa <= :DATE_FIM "); + sql.append(" and b.categoria_id not in (select valorconstante from constante where nombconstante = 'GRATUIDADE_CRIANCA') "); + sql.append(" and coalesce(esaidf.cveestado, eos.cveestado, est.cveestado) in ( ").append(ufs).append(" ) "); + sql.append(" and b.num_bpe is null "); + sql.append("order by estadoId, isInterEstadual "); + + return sql.toString(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java index 1d1d30f0f..8b902f524 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FiscalImpressoraEstadoDAO; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; - -@Repository("fiscalImpressoraEstadoDAO") -public class FiscalImpressoraEstadoHibernateDAO extends GenericHibernateDAO implements FiscalImpressoraEstadoDAO { - - @Autowired - public FiscalImpressoraEstadoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("estado.nombestado")); - - return c.list(); - } - - public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("fiscalImpressora", fiscalImpressora)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FiscalImpressoraEstadoDAO; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; + +@Repository("fiscalImpressoraEstadoDAO") +public class FiscalImpressoraEstadoHibernateDAO extends GenericHibernateDAO implements FiscalImpressoraEstadoDAO { + + @Autowired + public FiscalImpressoraEstadoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("estado.nombestado")); + + return c.list(); + } + + public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("fiscalImpressora", fiscalImpressora)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java index 8b4bf363b..db6e27d3f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java @@ -1,245 +1,245 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FiscalImpressoraDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; -import com.rjconsultores.ventaboletos.entidad.FormaPago; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -@Repository("fiscalImpressoraDAO") -public class FiscalImpressoraHibernateDAO extends GenericHibernateDAO implements FiscalImpressoraDAO { - - @Autowired - public FiscalImpressoraHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId) { - StringBuilder impostoHql = new StringBuilder(); - impostoHql.append(" select e"); - impostoHql.append(" from FiscalTotnaofiscalEmpresa e"); - impostoHql.append(" where e.activo = 1 and e.empresa.id = :empresaEcfId"); - - Query qry = getSession().createQuery(impostoHql.toString()); - qry.setParameter("empresaEcfId", empresaEcfId); - - List list = qry.list(); - - return list; - } - - public List buscarFormaPagoEmpresa(Integer empresaEcfId) { - StringBuilder impostoHql = new StringBuilder(); - impostoHql.append(" select e"); - impostoHql.append(" from FiscalFormapagoEmpresa e"); - impostoHql.append(" where e.activo = 1 and e.empresa.id = :empresaEcfId"); - - Query qry = getSession().createQuery(impostoHql.toString()); - qry.setParameter("empresaEcfId", empresaEcfId); - - List list = qry.list(); - - return list; - } - - public List buscarItensRelgerencialEmpresa(Integer empresaEcfId) { - - StringBuilder impostoHql = new StringBuilder(); - impostoHql.append(" select e"); - impostoHql.append(" from FiscalRelgerencialEmpresa e"); - impostoHql.append(" where e.activo = 1 and e.empresa.id = :empresaEcfId"); - - Query qry = getSession().createQuery(impostoHql.toString()); - qry.setParameter("empresaEcfId", empresaEcfId); - - List list = qry.list(); - - return list; - } - - public List buscarFormaPagoAplicacaoImpfiscal() { - - StringBuilder impostoHql = new StringBuilder(); - impostoHql.append(" select e"); - impostoHql.append(" from FormaPago e"); - impostoHql.append(" where e.activo = 1 and e.impfiscal = 1"); - - Query qry = getSession().createQuery(impostoHql.toString()); - List list = qry.list(); - - return list; - } - - - @Override - public List obtenerTodosTotnaofiscalEmpresa() { - Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - return criteria.list(); - } - - @Override - public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id) { - Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); - - return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa,String tipoTotalizador){ - Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("empresa", empresa)); - criteria.add(Restrictions.eq("tipototalizador", tipoTotalizador)); - - return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa,String tipoTotalizador,String descEcf){ - Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("empresa", empresa)); - criteria.add(Restrictions.eq("tipototalizador", tipoTotalizador)); - criteria.add(Restrictions.eq("descricao", descEcf)); - - return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); - } - @Override - public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa,String tipoTotalizador,String descEcf,TipoEventoExtra tipoeventoextra){ - Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("empresa", empresa)); - criteria.add(Restrictions.eq("tipototalizador", tipoTotalizador)); - criteria.add(Restrictions.eq("descricao", descEcf)); - criteria.add(Restrictions.eq("tipoeventoextra", tipoeventoextra)); - - return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalTotnaofiscalEmpresa suscribirTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) { - getSession().save(entidad); - getSession().flush(); - return entidad ; - } - @Override - public FiscalTotnaofiscalEmpresa actualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) { - getSession().merge(entidad); - return entidad ; - } - - @Override - public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) { - getSession().merge(entidad); - getSession().flush(); - } - - - @Override - public List obtenerTodosFormapagoEmpresa() { - Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - return criteria.list(); - } - - @Override - public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id) { - Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); - - return (FiscalFormapagoEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalFormapagoEmpresa suscribirFormapagoEmpresa(FiscalFormapagoEmpresa entidad) { - getSession().save(entidad); - getSession().flush(); - return entidad ; - } - - @Override - public FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa,String tipoformapago){ - Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("empresa", empresa)); - criteria.add(Restrictions.eq("tipoformapago", tipoformapago)); - - return (FiscalFormapagoEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa,String tipoformapago,String descEcf){ - Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("empresa", empresa)); - criteria.add(Restrictions.eq("descricao", descEcf)); - criteria.add(Restrictions.eq("tipoformapago", tipoformapago)); - - return (FiscalFormapagoEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalRelgerencialEmpresa buscarRelGerencial(Empresa empresa,String tipoRelGerencial){ - Criteria criteria = getSession().createCriteria(FiscalRelgerencialEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("empresa", empresa)); - criteria.add(Restrictions.eq("tiporelgerencial", tipoRelGerencial)); - - return (FiscalRelgerencialEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalFormapagoEmpresa actualizacionFormapagoEmpresa(FiscalFormapagoEmpresa entidad) { - getSession().merge(entidad); - getSession().flush(); - return entidad; - } - - - @Override - public List obtenerTodosRelgerencialEmpresa() { - Criteria criteria = getSession().createCriteria(FiscalRelgerencialEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - return criteria.list(); - } - - @Override - public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id) { - Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq(ACTIVO, true)); - criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); - - return (FiscalRelgerencialEmpresa) criteria.uniqueResult(); - } - - @Override - public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { - getSession().save(entidad); - getSession().flush(); - return entidad ; - } - - @Override - public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { - getSession().merge(entidad); - getSession().flush(); - return entidad; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FiscalImpressoraDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; +import com.rjconsultores.ventaboletos.entidad.FormaPago; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +@Repository("fiscalImpressoraDAO") +public class FiscalImpressoraHibernateDAO extends GenericHibernateDAO implements FiscalImpressoraDAO { + + @Autowired + public FiscalImpressoraHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId) { + StringBuilder impostoHql = new StringBuilder(); + impostoHql.append(" select e"); + impostoHql.append(" from FiscalTotnaofiscalEmpresa e"); + impostoHql.append(" where e.activo = 1 and e.empresa.id = :empresaEcfId"); + + Query qry = getSession().createQuery(impostoHql.toString()); + qry.setParameter("empresaEcfId", empresaEcfId); + + List list = qry.list(); + + return list; + } + + public List buscarFormaPagoEmpresa(Integer empresaEcfId) { + StringBuilder impostoHql = new StringBuilder(); + impostoHql.append(" select e"); + impostoHql.append(" from FiscalFormapagoEmpresa e"); + impostoHql.append(" where e.activo = 1 and e.empresa.id = :empresaEcfId"); + + Query qry = getSession().createQuery(impostoHql.toString()); + qry.setParameter("empresaEcfId", empresaEcfId); + + List list = qry.list(); + + return list; + } + + public List buscarItensRelgerencialEmpresa(Integer empresaEcfId) { + + StringBuilder impostoHql = new StringBuilder(); + impostoHql.append(" select e"); + impostoHql.append(" from FiscalRelgerencialEmpresa e"); + impostoHql.append(" where e.activo = 1 and e.empresa.id = :empresaEcfId"); + + Query qry = getSession().createQuery(impostoHql.toString()); + qry.setParameter("empresaEcfId", empresaEcfId); + + List list = qry.list(); + + return list; + } + + public List buscarFormaPagoAplicacaoImpfiscal() { + + StringBuilder impostoHql = new StringBuilder(); + impostoHql.append(" select e"); + impostoHql.append(" from FormaPago e"); + impostoHql.append(" where e.activo = 1 and e.impfiscal = 1"); + + Query qry = getSession().createQuery(impostoHql.toString()); + List list = qry.list(); + + return list; + } + + + @Override + public List obtenerTodosTotnaofiscalEmpresa() { + Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + return criteria.list(); + } + + @Override + public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id) { + Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); + + return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa,String tipoTotalizador){ + Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("empresa", empresa)); + criteria.add(Restrictions.eq("tipototalizador", tipoTotalizador)); + + return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa,String tipoTotalizador,String descEcf){ + Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("empresa", empresa)); + criteria.add(Restrictions.eq("tipototalizador", tipoTotalizador)); + criteria.add(Restrictions.eq("descricao", descEcf)); + + return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); + } + @Override + public FiscalTotnaofiscalEmpresa buscarTotNaoFiscal(Empresa empresa,String tipoTotalizador,String descEcf,TipoEventoExtra tipoeventoextra){ + Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("empresa", empresa)); + criteria.add(Restrictions.eq("tipototalizador", tipoTotalizador)); + criteria.add(Restrictions.eq("descricao", descEcf)); + criteria.add(Restrictions.eq("tipoeventoextra", tipoeventoextra)); + + return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalTotnaofiscalEmpresa suscribirTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) { + getSession().save(entidad); + getSession().flush(); + return entidad ; + } + @Override + public FiscalTotnaofiscalEmpresa actualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) { + getSession().merge(entidad); + return entidad ; + } + + @Override + public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) { + getSession().merge(entidad); + getSession().flush(); + } + + + @Override + public List obtenerTodosFormapagoEmpresa() { + Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + return criteria.list(); + } + + @Override + public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id) { + Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); + + return (FiscalFormapagoEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalFormapagoEmpresa suscribirFormapagoEmpresa(FiscalFormapagoEmpresa entidad) { + getSession().save(entidad); + getSession().flush(); + return entidad ; + } + + @Override + public FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa,String tipoformapago){ + Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("empresa", empresa)); + criteria.add(Restrictions.eq("tipoformapago", tipoformapago)); + + return (FiscalFormapagoEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalFormapagoEmpresa buscarFormaPago(Empresa empresa,String tipoformapago,String descEcf){ + Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("empresa", empresa)); + criteria.add(Restrictions.eq("descricao", descEcf)); + criteria.add(Restrictions.eq("tipoformapago", tipoformapago)); + + return (FiscalFormapagoEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalRelgerencialEmpresa buscarRelGerencial(Empresa empresa,String tipoRelGerencial){ + Criteria criteria = getSession().createCriteria(FiscalRelgerencialEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("empresa", empresa)); + criteria.add(Restrictions.eq("tiporelgerencial", tipoRelGerencial)); + + return (FiscalRelgerencialEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalFormapagoEmpresa actualizacionFormapagoEmpresa(FiscalFormapagoEmpresa entidad) { + getSession().merge(entidad); + getSession().flush(); + return entidad; + } + + + @Override + public List obtenerTodosRelgerencialEmpresa() { + Criteria criteria = getSession().createCriteria(FiscalRelgerencialEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + return criteria.list(); + } + + @Override + public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id) { + Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); + criteria.add(Restrictions.eq(ACTIVO, true)); + criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); + + return (FiscalRelgerencialEmpresa) criteria.uniqueResult(); + } + + @Override + public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { + getSession().save(entidad); + getSession().flush(); + return entidad ; + } + + @Override + public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { + getSession().merge(entidad); + getSession().flush(); + return entidad; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java index d2f1182d3..f4614b55c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.SessionFactory; -import org.hibernate.jdbc.Work; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FlywayUtilDAO; -import com.rjconsultores.ventaboletos.entidad.EsquemaAgrupacion; - -@Repository("flywayUtilDAO") -public class FlywayUtilHibernateDAO extends GenericHibernateDAO implements FlywayUtilDAO { - - private static Logger log = LogManager.getLogger(FlywayUtilHibernateDAO.class); - - @Autowired - public FlywayUtilHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public boolean existeErroExecucaoScript() { - final List ls = new ArrayList(); - - try { - - getSession().doWork(new Work() { - - @Override - public void execute(Connection conn) throws SQLException { - ResultSet rs = conn.prepareStatement("select count(*) from \"schema_version\" where \"success\"=0").executeQuery(); - if (rs.next()) { - ls.add(rs.getInt(1) > 0); - } - - rs.close(); - } - }); - - } catch (DataAccessResourceFailureException e) { - log.error("", e); - } catch (HibernateException e) { - log.error("", e); - } catch (IllegalStateException e) { - log.error("", e); - } - - return (ls.size()>0 && ls.get(0)); - - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.SessionFactory; +import org.hibernate.jdbc.Work; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FlywayUtilDAO; +import com.rjconsultores.ventaboletos.entidad.EsquemaAgrupacion; + +@Repository("flywayUtilDAO") +public class FlywayUtilHibernateDAO extends GenericHibernateDAO implements FlywayUtilDAO { + + private static Logger log = LogManager.getLogger(FlywayUtilHibernateDAO.class); + + @Autowired + public FlywayUtilHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public boolean existeErroExecucaoScript() { + final List ls = new ArrayList(); + + try { + + getSession().doWork(new Work() { + + @Override + public void execute(Connection conn) throws SQLException { + ResultSet rs = conn.prepareStatement("select count(*) from \"schema_version\" where \"success\"=0").executeQuery(); + if (rs.next()) { + ls.add(rs.getInt(1) > 0); + } + + rs.close(); + } + }); + + } catch (DataAccessResourceFailureException e) { + log.error("", e); + } catch (HibernateException e) { + log.error("", e); + } catch (IllegalStateException e) { + log.error("", e); + } + + return (ls.size()>0 && ls.get(0)); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FolioPreimpresoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FolioPreimpresoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FolioPreimpresoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FolioPreimpresoHibernateDAO.java index 3345f1ccf..44e7cf099 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FolioPreimpresoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FolioPreimpresoHibernateDAO.java @@ -1,43 +1,43 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.apache.commons.lang.math.NumberUtils; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.FolioPreimpresoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; - -@Repository("folioPreimpresoDAO") -public class FolioPreimpresoHibernateDAO extends GenericHibernateDAO implements FolioPreimpresoDAO { - - @Autowired - public FolioPreimpresoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa) { - - StringBuffer hql = new StringBuffer(); - hql.append(" FROM FolioPreimpreso fp "); - hql.append(" WHERE fp.estacion.estacionId = :estacionId "); - hql.append(" AND fp.empresa.empresaId = :empresaId "); - hql.append(" AND fp.activo = :activo "); - hql.append(" ORDER BY fecmodif DESC "); - - Query query = getSession().createQuery(hql.toString()); - query.setParameter("activo", Boolean.TRUE); - query.setParameter("estacionId", estacion.getEstacionId()); - query.setParameter("empresaId", empresa.getEmpresaId()); - - query.setMaxResults(NumberUtils.INTEGER_ONE); - - return (FolioPreimpreso) query.uniqueResult(); - - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.apache.commons.lang.math.NumberUtils; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.FolioPreimpresoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; + +@Repository("folioPreimpresoDAO") +public class FolioPreimpresoHibernateDAO extends GenericHibernateDAO implements FolioPreimpresoDAO { + + @Autowired + public FolioPreimpresoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa) { + + StringBuffer hql = new StringBuffer(); + hql.append(" FROM FolioPreimpreso fp "); + hql.append(" WHERE fp.estacion.estacionId = :estacionId "); + hql.append(" AND fp.empresa.empresaId = :empresaId "); + hql.append(" AND fp.activo = :activo "); + hql.append(" ORDER BY fecmodif DESC "); + + Query query = getSession().createQuery(hql.toString()); + query.setParameter("activo", Boolean.TRUE); + query.setParameter("estacionId", estacion.getEstacionId()); + query.setParameter("empresaId", empresa.getEmpresaId()); + + query.setMaxResults(NumberUtils.INTEGER_ONE); + + return (FolioPreimpreso) query.uniqueResult(); + + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingFormapagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingFormapagoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingFormapagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingFormapagoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHistoricoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHistoricoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHistoricoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHistoricoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java index c5c45779b..92c14d648 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.GrupoCategoriaDAO; -import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; - -@SuppressWarnings("unchecked") -@Repository("grupoCategoriaDAO") -public class GrupoCategoriaHibernateDAO extends GenericHibernateDAO - implements GrupoCategoriaDAO { - - @Autowired - public GrupoCategoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @Override - public List buscar(String descricao) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("descGrupo", descricao)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.GrupoCategoriaDAO; +import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; + +@SuppressWarnings("unchecked") +@Repository("grupoCategoriaDAO") +public class GrupoCategoriaHibernateDAO extends GenericHibernateDAO + implements GrupoCategoriaDAO { + + @Autowired + public GrupoCategoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @Override + public List buscar(String descricao) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("descGrupo", descricao)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/HeaderEsquemaCorridaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HeaderEsquemaCorridaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/HeaderEsquemaCorridaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HeaderEsquemaCorridaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/HibernateFix.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HibernateFix.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/HibernateFix.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HibernateFix.java index 503160679..a206609fc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/HibernateFix.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HibernateFix.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.List; - -public class HibernateFix { - /** - * Usado para garantizar que las dos versiones del hibernate 3.6 y 3.2 realicen de forma correcta el count - * @param list - * @return - */ - public static Long count(List list) { - - Object resultado = list.iterator().next(); - - return count(resultado); - } - /** - * Usado para garantizar que las dos versiones del hibernate 3.6 y 3.2 realicen de forma correcta el count - * @param list - * @return - */ - public static Long count(Object resultado) { - Long cant = 0l; - - if (resultado instanceof Integer) { - cant = Long.valueOf(((Integer) resultado).longValue()); - } else if (resultado instanceof BigDecimal){ - cant= ((BigDecimal)resultado).longValue(); - } else { - cant = (Long) resultado; - } - return cant; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.List; + +public class HibernateFix { + /** + * Usado para garantizar que las dos versiones del hibernate 3.6 y 3.2 realicen de forma correcta el count + * @param list + * @return + */ + public static Long count(List list) { + + Object resultado = list.iterator().next(); + + return count(resultado); + } + /** + * Usado para garantizar que las dos versiones del hibernate 3.6 y 3.2 realicen de forma correcta el count + * @param list + * @return + */ + public static Long count(Object resultado) { + Long cant = 0l; + + if (resultado instanceof Integer) { + cant = Long.valueOf(((Integer) resultado).longValue()); + } else if (resultado instanceof BigDecimal){ + cant= ((BigDecimal)resultado).longValue(); + } else { + cant = (Long) resultado; + } + return cant; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java index 0dc104ffa..bf7946ec5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.InstiFinanceiraDAO; -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; -import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; - -@Repository("ptovtaBancoDAO") -@SuppressWarnings("unchecked") -public class InstiFinanceiraHibernateDAO extends GenericHibernateDAO - implements InstiFinanceiraDAO { - - @Autowired - public InstiFinanceiraHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("nome")); - return c.list(); - } - - public List buscar(String nome) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("nome", nome)); - return c.list(); - } - - @Override - public List buscarContasBancariasPorIdEmpresa(Integer empresaId) { - - Criteria c = getSession().createCriteria(EmpresaContaBancaria.class); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa.empresaId", empresaId)); - - List empresasContaBancarias = (List) c.list(); - return empresasContaBancarias; - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.InstiFinanceiraDAO; +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; +import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; + +@Repository("ptovtaBancoDAO") +@SuppressWarnings("unchecked") +public class InstiFinanceiraHibernateDAO extends GenericHibernateDAO + implements InstiFinanceiraDAO { + + @Autowired + public InstiFinanceiraHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("nome")); + return c.list(); + } + + public List buscar(String nome) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("nome", nome)); + return c.list(); + } + + @Override + public List buscarContasBancariasPorIdEmpresa(Integer empresaId) { + + Criteria c = getSession().createCriteria(EmpresaContaBancaria.class); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa.empresaId", empresaId)); + + List empresasContaBancarias = (List) c.list(); + return empresasContaBancarias; + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoDerPrHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoDerPrHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoDerPrHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoDerPrHibernateDAO.java index babbfa5c9..c6a2f0661 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoDerPrHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoDerPrHibernateDAO.java @@ -1,286 +1,286 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.hibernate.type.TimestampType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.IntegracaoDerPrDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerCabecaVo; -import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; -import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerRodapeVo; - -@Repository("integracaoDerPrDAO") -@SuppressWarnings("unchecked") -public class IntegracaoDerPrHibernateDAO extends GenericHibernateDAO implements IntegracaoDerPrDAO { - - @Autowired - public IntegracaoDerPrHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarDadosImportacaoLinha(Date inicio, Date fim, Empresa empresa, Integer linhaId) { - - StringBuilder sb = new StringBuilder(); - sb.append(" SELECT * "); - sb.append(" FROM "); - sb.append(" ( "); - sb.append(" SELECT "); - sb.append(" e.codder as codemp, "); - sb.append(" r.prefixo as linha, "); - sb.append(" rc.codigoderpr as secao, "); - sb.append(" count( distinct b.boleto_id) AS bilhete, "); - sb.append(" ( CASE "); - sb.append(" WHEN r.indsentidoida = 0 THEN "); - sb.append(" 'VOLTA' "); - sb.append(" ELSE "); - sb.append(" 'IDA' "); - sb.append(" END ) AS sentido, "); - sb.append(" count( distinct CASE "); - sb.append(" WHEN (co.tiposervicio_id = 1 ) THEN "); - sb.append(" b.boleto_id "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS ord, "); - sb.append(" count( distinct CASE "); - sb.append(" WHEN ((b.origen_id = co.origen_id and b.destino_id = co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" b.boleto_id "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS rft, "); - sb.append(" count( distinct CASE "); - sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" b.boleto_id "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS rfp, "); - sb.append(" count( distinct CASE "); - sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" b.corrida_id "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS viagRfp "); - - preencheFrom(sb); - preencheWhere(linhaId, sb); - - sb.append(" GROUP BY "); - sb.append(" r.prefixo, "); - sb.append(" e.codder, "); - sb.append(" rc.codigoderpr, "); - sb.append(" r.indsentidoida "); - sb.append(" ) PIVOT ( "); - sb.append(" sum ( bilhete ) tot, sum( ord) ord, sum( rft ) rft, sum(rfp) rfp "); - sb.append(" FOR sentido IN ( 'IDA', 'VOLTA' ) "); - sb.append(" ) "); - sb.append(" ORDER BY "); - sb.append(" linha, secao "); - - SQLQuery qry = getSession().createSQLQuery(sb.toString()) - .addScalar("codemp", IntegerType.INSTANCE) - .addScalar("linha", StringType.INSTANCE) - .addScalar("secao", StringType.INSTANCE) - .addScalar("'IDA'_TOT", IntegerType.INSTANCE) - .addScalar("'VOLTA'_TOT", IntegerType.INSTANCE) - .addScalar("'IDA'_ORD", IntegerType.INSTANCE) - .addScalar("'VOLTA'_ORD", IntegerType.INSTANCE) - .addScalar("'IDA'_RFT", IntegerType.INSTANCE) - .addScalar("'VOLTA'_RFT", IntegerType.INSTANCE) - .addScalar("'IDA'_RFP", IntegerType.INSTANCE) - .addScalar("'VOLTA'_RFP", IntegerType.INSTANCE) - .addScalar("viagRfp", IntegerType.INSTANCE); - - qry.setParameter("EMPRESA_ID", empresa.getEmpresaId(), IntegerType.INSTANCE); - qry.setParameter("DATA_INICIAL", DateUtil.inicioFecha(inicio), DateType.INSTANCE); - qry.setParameter("DATA_FINAL", DateUtil.inicioFecha(fim), DateType.INSTANCE); - - List retorno = new ArrayList(); - List dados = qry.list(); - - for (Object[] object : dados) { - QdmpDerLinhaVo vo = new QdmpDerLinhaVo(object); - retorno.add(vo); - } - - return retorno; - } - - @Override - public String buscarDadosImportacaoCabeca(Date inicio, Date fim, Empresa empresa, Integer linhaId) { - StringBuilder sb = new StringBuilder(); - sb.append(" SELECT "); - sb.append(" e.codder as codemp, "); - sb.append(" r.prefixo as linha, "); - sb.append(" count(distinct CASE "); - sb.append(" WHEN ((b.origen_id = co.origen_id or b.destino_id = co.destino_id) and co.tiposervicio_id = 1 ) THEN "); - sb.append(" b.corrida_id+ to_char(b.feccorrida, 'ddMMyyyy') "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS viagOrd, "); - sb.append(" sum(distinct CASE "); - sb.append(" WHEN ((b.origen_id = co.origen_id or b.destino_id = co.destino_id) and co.tiposervicio_id = 1 ) THEN "); - sb.append(" da.cantasientos "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS lugOrd, "); - sb.append(" count(distinct CASE "); - sb.append(" WHEN ((b.origen_id = co.origen_id and b.destino_id = co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" b.corrida_id+ to_char(b.feccorrida, 'ddMMyyyy') "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS viagRft, "); - sb.append(" sum(distinct CASE "); - sb.append(" WHEN ((b.origen_id = co.origen_id and b.destino_id = co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" da.cantasientos "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS lugRft, "); - sb.append(" count(distinct CASE "); - sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" b.corrida_id+ to_char(b.feccorrida, 'ddMMyyyy') "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS viagRfp, "); - sb.append(" sum(distinct CASE "); - sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); - sb.append(" da.cantasientos "); - sb.append(" ELSE "); - sb.append(" null "); - sb.append(" END ) AS lugRfp "); - - preencheFrom(sb); - preencheWhere(linhaId, sb); - - sb.append(" GROUP BY "); - sb.append(" r.prefixo, "); - sb.append(" e.codder "); - - SQLQuery qry = getSession().createSQLQuery(sb.toString()) - .addScalar("codEmp", IntegerType.INSTANCE) - .addScalar("linha", StringType.INSTANCE) - .addScalar("viagOrd", IntegerType.INSTANCE) - .addScalar("lugOrd", IntegerType.INSTANCE) - .addScalar("viagRft", IntegerType.INSTANCE) - .addScalar("lugRft", IntegerType.INSTANCE) - .addScalar("viagRfp", IntegerType.INSTANCE) - .addScalar("lugRfp", IntegerType.INSTANCE); - - qry.setParameter("EMPRESA_ID", empresa.getEmpresaId(), IntegerType.INSTANCE); - qry.setParameter("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha(inicio).getTime()), TimestampType.INSTANCE); - qry.setParameter("DATA_FINAL", new Timestamp(DateUtil.inicioFecha(fim).getTime()), TimestampType.INSTANCE); - - Object[] dados = (Object[])qry.uniqueResult(); - QdmpDerCabecaVo cabeca = new QdmpDerCabecaVo(dados); - - return cabeca.toString(); - } - - @Override - public String buscarDadosImportacaoRodape(Date inicio, Date fim, Empresa empresa, Integer linhaId) { - StringBuilder sb = new StringBuilder(); - sb.append(" SELECT "); - sb.append(" e.codder as codemp, "); - sb.append(" r.prefixo as linha, "); - sb.append(" count( distinct b.boleto_id) AS totMov, "); - sb.append(" sum( b.preciopagado ) AS receita, "); - sb.append(" sum((b.preciopagado - (b.preciopagado * coalesce(ei.porcredbaseicms / 100,0))) * est.icms) / 100 AS icms, "); - sb.append(" 0 as iasp "); - - preencheFrom(sb); - preencheWhere(linhaId, sb); - - sb.append(" GROUP BY "); - sb.append(" r.prefixo, "); - sb.append(" e.codder "); - - SQLQuery qry = getSession().createSQLQuery(sb.toString()) - .addScalar("codEmp", IntegerType.INSTANCE) - .addScalar("linha", StringType.INSTANCE) - .addScalar("totMov", IntegerType.INSTANCE) - .addScalar("receita", BigDecimalType.INSTANCE) - .addScalar("icms", BigDecimalType.INSTANCE) - .addScalar("iasp", BigDecimalType.INSTANCE); - - qry.setParameter("EMPRESA_ID", empresa.getEmpresaId(), IntegerType.INSTANCE); - qry.setParameter("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha(inicio).getTime()), TimestampType.INSTANCE); - qry.setParameter("DATA_FINAL", new Timestamp(DateUtil.inicioFecha(fim).getTime()), TimestampType.INSTANCE); - - Object[] dados = (Object[])qry.uniqueResult(); - QdmpDerRodapeVo rodape = new QdmpDerRodapeVo(dados); - - return rodape.toString(); - } - - private void preencheFrom(StringBuilder sb) { - sb.append(" FROM "); - sb.append(" boleto b "); - sb.append(" INNER JOIN corrida co "); - sb.append(" ON b.corrida_id = co.corrida_id "); - sb.append(" AND b.feccorrida = co.feccorrida "); - sb.append(" AND co.activo = 1 "); - sb.append(" INNER JOIN ruta r "); - sb.append(" ON b.ruta_id = r.ruta_id "); - sb.append(" AND r.activo = 1 "); - sb.append(" INNER JOIN marca m "); - sb.append(" ON m.marca_id = b.marca_id "); - sb.append(" AND m.activo = 1 "); - sb.append(" INNER JOIN empresa e "); - sb.append(" ON m.empresa_id = e.empresa_id "); - sb.append(" AND e.activo = 1 "); - sb.append(" LEFT JOIN rol_operativo ro "); - sb.append(" ON ro.roloperativo_id = co.roloperativo_id "); - sb.append(" LEFT JOIN diagrama_autobus da "); - sb.append(" ON ro.diagramaautobus_id = da.diagramaautobus_id "); - sb.append(" LEFT JOIN corrida_tramo ct "); - sb.append(" ON b.corrida_id = ct.corrida_id "); - sb.append(" AND b.feccorrida = ct.feccorrida "); - sb.append(" and b.origen_id = ct.origen_id "); - sb.append(" LEFT JOIN ruta_combinacion rc "); - sb.append(" on rc.tramo_id = ct.tramo_id "); - sb.append(" and rc.ruta_id = b.ruta_id "); - sb.append(" and rc.activo = 1 "); - sb.append(" inner join parada po "); - sb.append(" on po.parada_id = b.origen_id "); - sb.append(" and po.activo = 1 "); - sb.append(" inner join ciudad ciu "); - sb.append(" on ciu.ciudad_id = po.ciudad_id "); - sb.append(" and ciu.activo = 1 "); - sb.append(" inner join estado est "); - sb.append(" on est.estado_id = ciu.estado_id "); - sb.append(" and est.activo = 1 "); - sb.append(" inner join empresa_imposto ei "); - sb.append(" on ei.empresa_id = e.empresa_id "); - sb.append(" and ei.estado_id = est.estado_id "); - sb.append(" and ei.activo = 1 "); - } - - private void preencheWhere(Integer linhaId, StringBuilder sb) { - sb.append(" WHERE b.activo = 1 "); - sb.append(" and m.empresa_id = :EMPRESA_ID "); - sb.append(" and b.feccorrida BETWEEN :DATA_INICIAL AND :DATA_FINAL "); - - if (linhaId != null) { - sb.append(" and b.ruta_id = " + linhaId ); - } - - sb.append(" and b.MOTIVOCANCELACION_ID is null "); - sb.append(" and b.INDSTATUSBOLETO = 'V' "); - } - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.hibernate.type.TimestampType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.IntegracaoDerPrDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerCabecaVo; +import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; +import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerRodapeVo; + +@Repository("integracaoDerPrDAO") +@SuppressWarnings("unchecked") +public class IntegracaoDerPrHibernateDAO extends GenericHibernateDAO implements IntegracaoDerPrDAO { + + @Autowired + public IntegracaoDerPrHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarDadosImportacaoLinha(Date inicio, Date fim, Empresa empresa, Integer linhaId) { + + StringBuilder sb = new StringBuilder(); + sb.append(" SELECT * "); + sb.append(" FROM "); + sb.append(" ( "); + sb.append(" SELECT "); + sb.append(" e.codder as codemp, "); + sb.append(" r.prefixo as linha, "); + sb.append(" rc.codigoderpr as secao, "); + sb.append(" count( distinct b.boleto_id) AS bilhete, "); + sb.append(" ( CASE "); + sb.append(" WHEN r.indsentidoida = 0 THEN "); + sb.append(" 'VOLTA' "); + sb.append(" ELSE "); + sb.append(" 'IDA' "); + sb.append(" END ) AS sentido, "); + sb.append(" count( distinct CASE "); + sb.append(" WHEN (co.tiposervicio_id = 1 ) THEN "); + sb.append(" b.boleto_id "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS ord, "); + sb.append(" count( distinct CASE "); + sb.append(" WHEN ((b.origen_id = co.origen_id and b.destino_id = co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" b.boleto_id "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS rft, "); + sb.append(" count( distinct CASE "); + sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" b.boleto_id "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS rfp, "); + sb.append(" count( distinct CASE "); + sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" b.corrida_id "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS viagRfp "); + + preencheFrom(sb); + preencheWhere(linhaId, sb); + + sb.append(" GROUP BY "); + sb.append(" r.prefixo, "); + sb.append(" e.codder, "); + sb.append(" rc.codigoderpr, "); + sb.append(" r.indsentidoida "); + sb.append(" ) PIVOT ( "); + sb.append(" sum ( bilhete ) tot, sum( ord) ord, sum( rft ) rft, sum(rfp) rfp "); + sb.append(" FOR sentido IN ( 'IDA', 'VOLTA' ) "); + sb.append(" ) "); + sb.append(" ORDER BY "); + sb.append(" linha, secao "); + + SQLQuery qry = getSession().createSQLQuery(sb.toString()) + .addScalar("codemp", IntegerType.INSTANCE) + .addScalar("linha", StringType.INSTANCE) + .addScalar("secao", StringType.INSTANCE) + .addScalar("'IDA'_TOT", IntegerType.INSTANCE) + .addScalar("'VOLTA'_TOT", IntegerType.INSTANCE) + .addScalar("'IDA'_ORD", IntegerType.INSTANCE) + .addScalar("'VOLTA'_ORD", IntegerType.INSTANCE) + .addScalar("'IDA'_RFT", IntegerType.INSTANCE) + .addScalar("'VOLTA'_RFT", IntegerType.INSTANCE) + .addScalar("'IDA'_RFP", IntegerType.INSTANCE) + .addScalar("'VOLTA'_RFP", IntegerType.INSTANCE) + .addScalar("viagRfp", IntegerType.INSTANCE); + + qry.setParameter("EMPRESA_ID", empresa.getEmpresaId(), IntegerType.INSTANCE); + qry.setParameter("DATA_INICIAL", DateUtil.inicioFecha(inicio), DateType.INSTANCE); + qry.setParameter("DATA_FINAL", DateUtil.inicioFecha(fim), DateType.INSTANCE); + + List retorno = new ArrayList(); + List dados = qry.list(); + + for (Object[] object : dados) { + QdmpDerLinhaVo vo = new QdmpDerLinhaVo(object); + retorno.add(vo); + } + + return retorno; + } + + @Override + public String buscarDadosImportacaoCabeca(Date inicio, Date fim, Empresa empresa, Integer linhaId) { + StringBuilder sb = new StringBuilder(); + sb.append(" SELECT "); + sb.append(" e.codder as codemp, "); + sb.append(" r.prefixo as linha, "); + sb.append(" count(distinct CASE "); + sb.append(" WHEN ((b.origen_id = co.origen_id or b.destino_id = co.destino_id) and co.tiposervicio_id = 1 ) THEN "); + sb.append(" b.corrida_id+ to_char(b.feccorrida, 'ddMMyyyy') "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS viagOrd, "); + sb.append(" sum(distinct CASE "); + sb.append(" WHEN ((b.origen_id = co.origen_id or b.destino_id = co.destino_id) and co.tiposervicio_id = 1 ) THEN "); + sb.append(" da.cantasientos "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS lugOrd, "); + sb.append(" count(distinct CASE "); + sb.append(" WHEN ((b.origen_id = co.origen_id and b.destino_id = co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" b.corrida_id+ to_char(b.feccorrida, 'ddMMyyyy') "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS viagRft, "); + sb.append(" sum(distinct CASE "); + sb.append(" WHEN ((b.origen_id = co.origen_id and b.destino_id = co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" da.cantasientos "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS lugRft, "); + sb.append(" count(distinct CASE "); + sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" b.corrida_id+ to_char(b.feccorrida, 'ddMMyyyy') "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS viagRfp, "); + sb.append(" sum(distinct CASE "); + sb.append(" WHEN ((b.origen_id <> co.origen_id or b.destino_id <> co.destino_id) and co.tiposervicio_id = 2 ) THEN "); + sb.append(" da.cantasientos "); + sb.append(" ELSE "); + sb.append(" null "); + sb.append(" END ) AS lugRfp "); + + preencheFrom(sb); + preencheWhere(linhaId, sb); + + sb.append(" GROUP BY "); + sb.append(" r.prefixo, "); + sb.append(" e.codder "); + + SQLQuery qry = getSession().createSQLQuery(sb.toString()) + .addScalar("codEmp", IntegerType.INSTANCE) + .addScalar("linha", StringType.INSTANCE) + .addScalar("viagOrd", IntegerType.INSTANCE) + .addScalar("lugOrd", IntegerType.INSTANCE) + .addScalar("viagRft", IntegerType.INSTANCE) + .addScalar("lugRft", IntegerType.INSTANCE) + .addScalar("viagRfp", IntegerType.INSTANCE) + .addScalar("lugRfp", IntegerType.INSTANCE); + + qry.setParameter("EMPRESA_ID", empresa.getEmpresaId(), IntegerType.INSTANCE); + qry.setParameter("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha(inicio).getTime()), TimestampType.INSTANCE); + qry.setParameter("DATA_FINAL", new Timestamp(DateUtil.inicioFecha(fim).getTime()), TimestampType.INSTANCE); + + Object[] dados = (Object[])qry.uniqueResult(); + QdmpDerCabecaVo cabeca = new QdmpDerCabecaVo(dados); + + return cabeca.toString(); + } + + @Override + public String buscarDadosImportacaoRodape(Date inicio, Date fim, Empresa empresa, Integer linhaId) { + StringBuilder sb = new StringBuilder(); + sb.append(" SELECT "); + sb.append(" e.codder as codemp, "); + sb.append(" r.prefixo as linha, "); + sb.append(" count( distinct b.boleto_id) AS totMov, "); + sb.append(" sum( b.preciopagado ) AS receita, "); + sb.append(" sum((b.preciopagado - (b.preciopagado * coalesce(ei.porcredbaseicms / 100,0))) * est.icms) / 100 AS icms, "); + sb.append(" 0 as iasp "); + + preencheFrom(sb); + preencheWhere(linhaId, sb); + + sb.append(" GROUP BY "); + sb.append(" r.prefixo, "); + sb.append(" e.codder "); + + SQLQuery qry = getSession().createSQLQuery(sb.toString()) + .addScalar("codEmp", IntegerType.INSTANCE) + .addScalar("linha", StringType.INSTANCE) + .addScalar("totMov", IntegerType.INSTANCE) + .addScalar("receita", BigDecimalType.INSTANCE) + .addScalar("icms", BigDecimalType.INSTANCE) + .addScalar("iasp", BigDecimalType.INSTANCE); + + qry.setParameter("EMPRESA_ID", empresa.getEmpresaId(), IntegerType.INSTANCE); + qry.setParameter("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha(inicio).getTime()), TimestampType.INSTANCE); + qry.setParameter("DATA_FINAL", new Timestamp(DateUtil.inicioFecha(fim).getTime()), TimestampType.INSTANCE); + + Object[] dados = (Object[])qry.uniqueResult(); + QdmpDerRodapeVo rodape = new QdmpDerRodapeVo(dados); + + return rodape.toString(); + } + + private void preencheFrom(StringBuilder sb) { + sb.append(" FROM "); + sb.append(" boleto b "); + sb.append(" INNER JOIN corrida co "); + sb.append(" ON b.corrida_id = co.corrida_id "); + sb.append(" AND b.feccorrida = co.feccorrida "); + sb.append(" AND co.activo = 1 "); + sb.append(" INNER JOIN ruta r "); + sb.append(" ON b.ruta_id = r.ruta_id "); + sb.append(" AND r.activo = 1 "); + sb.append(" INNER JOIN marca m "); + sb.append(" ON m.marca_id = b.marca_id "); + sb.append(" AND m.activo = 1 "); + sb.append(" INNER JOIN empresa e "); + sb.append(" ON m.empresa_id = e.empresa_id "); + sb.append(" AND e.activo = 1 "); + sb.append(" LEFT JOIN rol_operativo ro "); + sb.append(" ON ro.roloperativo_id = co.roloperativo_id "); + sb.append(" LEFT JOIN diagrama_autobus da "); + sb.append(" ON ro.diagramaautobus_id = da.diagramaautobus_id "); + sb.append(" LEFT JOIN corrida_tramo ct "); + sb.append(" ON b.corrida_id = ct.corrida_id "); + sb.append(" AND b.feccorrida = ct.feccorrida "); + sb.append(" and b.origen_id = ct.origen_id "); + sb.append(" LEFT JOIN ruta_combinacion rc "); + sb.append(" on rc.tramo_id = ct.tramo_id "); + sb.append(" and rc.ruta_id = b.ruta_id "); + sb.append(" and rc.activo = 1 "); + sb.append(" inner join parada po "); + sb.append(" on po.parada_id = b.origen_id "); + sb.append(" and po.activo = 1 "); + sb.append(" inner join ciudad ciu "); + sb.append(" on ciu.ciudad_id = po.ciudad_id "); + sb.append(" and ciu.activo = 1 "); + sb.append(" inner join estado est "); + sb.append(" on est.estado_id = ciu.estado_id "); + sb.append(" and est.activo = 1 "); + sb.append(" inner join empresa_imposto ei "); + sb.append(" on ei.empresa_id = e.empresa_id "); + sb.append(" and ei.estado_id = est.estado_id "); + sb.append(" and ei.activo = 1 "); + } + + private void preencheWhere(Integer linhaId, StringBuilder sb) { + sb.append(" WHERE b.activo = 1 "); + sb.append(" and m.empresa_id = :EMPRESA_ID "); + sb.append(" and b.feccorrida BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + + if (linhaId != null) { + sb.append(" and b.ruta_id = " + linhaId ); + } + + sb.append(" and b.MOTIVOCANCELACION_ID is null "); + sb.append(" and b.INDSTATUSBOLETO = 'V' "); + } + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoTotvsHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoTotvsHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoTotvsHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoTotvsHibernateDAO.java index 361d25497..bde829d8d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoTotvsHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/IntegracaoTotvsHibernateDAO.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.IntegracaoTotvsDAO; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.IntegracaoTotvs; - -@Repository("integracaoTotvsDAO") -public class IntegracaoTotvsHibernateDAO extends GenericHibernateDAO implements IntegracaoTotvsDAO { - - @Autowired - public IntegracaoTotvsHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public void borrarByCorrida(Corrida corrida) { - - StringBuilder sQuery = new StringBuilder("update INTEGRACAO_TOTVS_CORRIDA set integradototvs = 0 WHERE corrida_Id = :corridaId AND TRUNC(feccorrida) = :feccorrida "); - SQLQuery qrUpdate = getSession().createSQLQuery(sQuery.toString()); - - qrUpdate.setParameter("feccorrida", corrida.getId().getFeccorrida()); - qrUpdate.setParameter("corridaId", corrida.getId().getCorridaId()); - qrUpdate.executeUpdate(); - - - } -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.IntegracaoTotvsDAO; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.IntegracaoTotvs; + +@Repository("integracaoTotvsDAO") +public class IntegracaoTotvsHibernateDAO extends GenericHibernateDAO implements IntegracaoTotvsDAO { + + @Autowired + public IntegracaoTotvsHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public void borrarByCorrida(Corrida corrida) { + + StringBuilder sQuery = new StringBuilder("update INTEGRACAO_TOTVS_CORRIDA set integradototvs = 0 WHERE corrida_Id = :corridaId AND TRUNC(feccorrida) = :feccorrida "); + SQLQuery qrUpdate = getSession().createSQLQuery(sQuery.toString()); + + qrUpdate.setParameter("feccorrida", corrida.getId().getFeccorrida()); + qrUpdate.setParameter("corridaId", corrida.getId().getCorridaId()); + qrUpdate.executeUpdate(); + + + } +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java index 3cbb9ccee..59a6b319a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ItemAdicionalDAO; -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; - -@Repository("itemAdicionalDAO") -public class ItemAdicionalHibernateDAO extends GenericHibernateDAO implements ItemAdicionalDAO { - - @Autowired - public ItemAdicionalHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descitemadicional")); - - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscaItemAdicionalPacote(Pacote pacote) { - - StringBuilder sb = new StringBuilder(); - sb.append(" select pi.itemAdicional "); - sb.append(" from PacoteItem pi "); - sb.append(" where pi.pacote.pacoteId = :pacoteId "); - sb.append(" and pi.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacote.getPacoteId()); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ItemAdicionalDAO; +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; + +@Repository("itemAdicionalDAO") +public class ItemAdicionalHibernateDAO extends GenericHibernateDAO implements ItemAdicionalDAO { + + @Autowired + public ItemAdicionalHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descitemadicional")); + + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscaItemAdicionalPacote(Pacote pacote) { + + StringBuilder sb = new StringBuilder(); + sb.append(" select pi.itemAdicional "); + sb.append(" from PacoteItem pi "); + sb.append(" where pi.pacote.pacoteId = :pacoteId "); + sb.append(" and pi.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacote.getPacoteId()); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java index e095aacdf..77c426002 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ItemDescontoDAO; -import com.rjconsultores.ventaboletos.entidad.ItemDesconto; - -@Repository("itemDescontoDAO") -public class ItemDescontoHibernateDAO extends GenericHibernateDAO implements ItemDescontoDAO { - - @Autowired - public ItemDescontoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List buscarPorNome(String nomitemdesconto) { - StringBuilder sb = new StringBuilder(); - sb.append(" select id ") - .append(" from ItemDesconto id ") - .append(" where id.activo = 1 "); - - if(StringUtils.isNotBlank(nomitemdesconto)) { - sb.append("and id.nomitemdesconto = :nomitemdesconto "); - } - - Query query = getSession().createQuery(sb.toString()); - - if(StringUtils.isNotBlank(nomitemdesconto)) { - query.setString("nomitemdesconto", nomitemdesconto); - } - - return query.list(); - } - - @Override - @SuppressWarnings("unchecked") - public List obtenerTodos() { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ItemDescontoDAO; +import com.rjconsultores.ventaboletos.entidad.ItemDesconto; + +@Repository("itemDescontoDAO") +public class ItemDescontoHibernateDAO extends GenericHibernateDAO implements ItemDescontoDAO { + + @Autowired + public ItemDescontoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List buscarPorNome(String nomitemdesconto) { + StringBuilder sb = new StringBuilder(); + sb.append(" select id ") + .append(" from ItemDesconto id ") + .append(" where id.activo = 1 "); + + if(StringUtils.isNotBlank(nomitemdesconto)) { + sb.append("and id.nomitemdesconto = :nomitemdesconto "); + } + + Query query = getSession().createQuery(sb.toString()); + + if(StringUtils.isNotBlank(nomitemdesconto)) { + query.setString("nomitemdesconto", nomitemdesconto); + } + + return query.list(); + } + + @Override + @SuppressWarnings("unchecked") + public List obtenerTodos() { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/LogAuditoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogAuditoriaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/LogAuditoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogAuditoriaHibernateDAO.java index 1b6fbd940..b24fa0c26 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/LogAuditoriaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogAuditoriaHibernateDAO.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.LogAuditoriaDAO; -import com.rjconsultores.ventaboletos.entidad.LogAuditoria; - -@Repository("LogAuditoriaDAO") -public class LogAuditoriaHibernateDAO extends GenericHibernateDAO implements LogAuditoriaDAO { - - @Autowired - public LogAuditoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List listarTodasAsTelas() { - Query query = getSession().createSQLQuery("select tela from log_auditoria where activo = 1 group by tela"); - List lista = query.list(); - return lista; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.LogAuditoriaDAO; +import com.rjconsultores.ventaboletos.entidad.LogAuditoria; + +@Repository("LogAuditoriaDAO") +public class LogAuditoriaHibernateDAO extends GenericHibernateDAO implements LogAuditoriaDAO { + + @Autowired + public LogAuditoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List listarTodasAsTelas() { + Query query = getSession().createSQLQuery("select tela from log_auditoria where activo = 1 group by tela"); + List lista = query.list(); + return lista; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/LogDespesaReceitaDivHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogDespesaReceitaDivHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/LogDespesaReceitaDivHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogDespesaReceitaDivHibernateDAO.java index 219c7ef03..44cc223f1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/LogDespesaReceitaDivHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogDespesaReceitaDivHibernateDAO.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import javax.sql.DataSource; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.LogDespesaReceitaDivDAO; -import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; - -@Repository("logDespesaReceitaDivDAO") -public class LogDespesaReceitaDivHibernateDAO extends GenericHibernateDAO implements LogDespesaReceitaDivDAO { - @Autowired - private DataSource dataSource; - - @Autowired - public LogDespesaReceitaDivHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.addOrder(Order.desc("dataExecucao")); - - return (List) c.list(); - } - - - public List obterPorPeriodo(Date inicio, Date fim){ - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("dataInicio", inicio)); - c.add(Restrictions.eq("dataFim", fim)); - c.addOrder(Order.desc("dataExecucao")); - - return (List) c.list(); - } - - @Override - public LogDespesaReceitaDiversa suscribir(LogDespesaReceitaDiversa entity) throws RuntimeException { - - entity = super.suscribir(entity); - - - return entity; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import javax.sql.DataSource; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.LogDespesaReceitaDivDAO; +import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; + +@Repository("logDespesaReceitaDivDAO") +public class LogDespesaReceitaDivHibernateDAO extends GenericHibernateDAO implements LogDespesaReceitaDivDAO { + @Autowired + private DataSource dataSource; + + @Autowired + public LogDespesaReceitaDivHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.addOrder(Order.desc("dataExecucao")); + + return (List) c.list(); + } + + + public List obterPorPeriodo(Date inicio, Date fim){ + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("dataInicio", inicio)); + c.add(Restrictions.eq("dataFim", fim)); + c.addOrder(Order.desc("dataExecucao")); + + return (List) c.list(); + } + + @Override + public LogDespesaReceitaDiversa suscribir(LogDespesaReceitaDiversa entity) throws RuntimeException { + + entity = super.suscribir(entity); + + + return entity; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/LogHistoricoContingenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogHistoricoContingenciaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/LogHistoricoContingenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogHistoricoContingenciaHibernateDAO.java index 1b485d9d2..f67bc2834 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/LogHistoricoContingenciaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/LogHistoricoContingenciaHibernateDAO.java @@ -1,42 +1,42 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.LogHistoricoContingenciaDAO; -import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; - -/** - * @author vjcor - * - */ -@Repository("LogHistoricoContingenciaDAO") -@SuppressWarnings("unchecked") -public class LogHistoricoContingenciaHibernateDAO extends GenericHibernateDAO implements LogHistoricoContingenciaDAO { - - @Autowired - public LogHistoricoContingenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarHistorico(Integer empresaID, Integer estadoID) { - String queryStr = "from LogHistoricoContingencia log where log.empresa.empresaId = :empresaId and log.estado.estadoId = :estadoId"; - - Query query = getSession().createQuery(queryStr); - query.setInteger("empresaId", empresaID); - query.setInteger("estadoId", estadoID); - - return (List) query.list(); - } - - -} +/** + * + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.LogHistoricoContingenciaDAO; +import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; + +/** + * @author vjcor + * + */ +@Repository("LogHistoricoContingenciaDAO") +@SuppressWarnings("unchecked") +public class LogHistoricoContingenciaHibernateDAO extends GenericHibernateDAO implements LogHistoricoContingenciaDAO { + + @Autowired + public LogHistoricoContingenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarHistorico(Integer empresaID, Integer estadoID) { + String queryStr = "from LogHistoricoContingencia log where log.empresa.empresaId = :empresaId and log.estado.estadoId = :estadoId"; + + Query query = getSession().createQuery(queryStr); + query.setInteger("empresaId", empresaID); + query.setInteger("estadoId", estadoID); + + return (List) query.list(); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java index 20dbfe562..de23ce902 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java @@ -1,31 +1,31 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MarcaAutobusDAO; -import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; - -@Repository("marcaAutobusDAO") -public class MarcaAutobusHibernateDAO extends GenericHibernateDAO -implements MarcaAutobusDAO { - - @Autowired - public MarcaAutobusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MarcaAutobusDAO; +import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; + +@Repository("marcaAutobusDAO") +public class MarcaAutobusHibernateDAO extends GenericHibernateDAO +implements MarcaAutobusDAO { + + @Autowired + public MarcaAutobusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java index 63455adbb..327ca5375 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java @@ -1,45 +1,45 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MensagemRecusaDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.MensagemRecusa; - -@Repository("MensagemRecusaDAO") -public class MensagemRecusaHibernateDAO extends GenericHibernateDAO implements MensagemRecusaDAO { - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public MensagemRecusaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscarPorCategoriaPadraoAPI(Integer categoriaId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("padraoAPI", Boolean.TRUE)); - c.add(Restrictions.eq("categoria.categoriaId", categoriaId)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MensagemRecusaDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.MensagemRecusa; + +@Repository("MensagemRecusaDAO") +public class MensagemRecusaHibernateDAO extends GenericHibernateDAO implements MensagemRecusaDAO { + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public MensagemRecusaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscarPorCategoriaPadraoAPI(Integer categoriaId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("padraoAPI", Boolean.TRUE)); + c.add(Restrictions.eq("categoria.categoriaId", categoriaId)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java index 4acb55730..ee621f7ff 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java @@ -1,45 +1,45 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MensajeEmpresaDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.Mensaje; -import com.rjconsultores.ventaboletos.entidad.MensajeEmpresa; - -@Repository("MensajeEmpresaDAO") -public class MensajeEmpresaHibernateDAO extends GenericHibernateDAO implements MensajeEmpresaDAO { - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public MensajeEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerPorMensaje(Mensaje mensaje) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("mensaje", mensaje)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MensajeEmpresaDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.Mensaje; +import com.rjconsultores.ventaboletos.entidad.MensajeEmpresa; + +@Repository("MensajeEmpresaDAO") +public class MensajeEmpresaHibernateDAO extends GenericHibernateDAO implements MensajeEmpresaDAO { + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public MensajeEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerPorMensaje(Mensaje mensaje) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("mensaje", mensaje)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java index 9df47d772..fe162f934 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MensajeDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.Mensaje; - -@Repository("MensajeDAO") -public class MensajeHibernateDAO extends GenericHibernateDAO implements MensajeDAO { - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public MensajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MensajeDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.Mensaje; + +@Repository("MensajeDAO") +public class MensajeHibernateDAO extends GenericHibernateDAO implements MensajeDAO { + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public MensajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java index d2f8ca428..610479b3d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java @@ -1,45 +1,45 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MensajePuntoVentaDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.Mensaje; -import com.rjconsultores.ventaboletos.entidad.MensajePuntoVenta; - -@Repository("MensajePuntoVentaDAO") -public class MensajePuntoVentaHibernateDAO extends GenericHibernateDAO implements MensajePuntoVentaDAO { - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public MensajePuntoVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerPorMensaje(Mensaje mensaje) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("mensaje", mensaje)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MensajePuntoVentaDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.Mensaje; +import com.rjconsultores.ventaboletos.entidad.MensajePuntoVenta; + +@Repository("MensajePuntoVentaDAO") +public class MensajePuntoVentaHibernateDAO extends GenericHibernateDAO implements MensajePuntoVentaDAO { + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public MensajePuntoVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerPorMensaje(Mensaje mensaje) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("mensaje", mensaje)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java index 638a96dec..3e13176ba 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java @@ -1,45 +1,45 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MensajeUsuarioDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.Mensaje; -import com.rjconsultores.ventaboletos.entidad.MensajeUsuario; - -@Repository("MensajeUsuarioDAO") -public class MensajeUsuarioHibernateDAO extends GenericHibernateDAO implements MensajeUsuarioDAO { - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public MensajeUsuarioHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerPorMensaje(Mensaje mensaje) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("mensaje", mensaje)); - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MensajeUsuarioDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.Mensaje; +import com.rjconsultores.ventaboletos.entidad.MensajeUsuario; + +@Repository("MensajeUsuarioDAO") +public class MensajeUsuarioHibernateDAO extends GenericHibernateDAO implements MensajeUsuarioDAO { + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public MensajeUsuarioHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerPorMensaje(Mensaje mensaje) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("mensaje", mensaje)); + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MerchantBancarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MerchantBancarioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MerchantBancarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MerchantBancarioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java index bf39862b5..c1c7dc88e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java @@ -1,254 +1,254 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.jdbc.Work; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MonitoramentoCCFDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; - -@Repository("monitoramentoCCFDAO") -public class MonitoramentoCCFHibernateDAO extends GenericHibernateDAO -implements MonitoramentoCCFDAO { - private static final Logger log = LogManager.getLogger(MonitoramentoCCFHibernateDAO.class); - private Connection con; - Boolean jaexiste; - - @Autowired - public MonitoramentoCCFHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - private String getSQL(){ - StringBuilder sql = new StringBuilder(); - - sql.append(" SELECT "); - sql.append(" fi.empresa_id as empresa, "); - sql.append(" fi.numserie20 as numserie20, "); - sql.append(" fi.fiscalimpressora_id as fiscalimpressora_id, "); - sql.append(" fi.estadolocal_id as estado, "); - sql.append(" c.FECCREACION as datamov, "); - sql.append(" fi.puntoventa_id as puntoventa_id, "); - sql.append(" c.usuario_id as usuario_id, "); - sql.append(" r4.contador as ccf, "); - sql.append(" c.caja_id as cajaId, "); - sql.append(" fi.numserie as numserie "); - sql.append(" FROM "); - sql.append(" caja c "); - sql.append(" left join fiscal_r4 R4 on R4.CAJA_ID = c.CAJA_ID "); - sql.append(" inner join fiscal_impressora fi on fi.numserie = c.SERIEIMPFISCAL "); - sql.append(" where "); - sql.append(" fi.numserie = :numserie "); - sql.append(" and trunc(c.FECCREACION) >= :data "); - sql.append(" and c.ccf >= :ccfInicial "); - sql.append(" and fi.activo = 1 "); - sql.append(" and c.activo = 1 "); - sql.append(" and ((c.indreimpresion = 0) or (c.indreimpresion = 1 and c.indstatusboleto in ('E')) or (c.indreimpresion = 1 and c.motivocancelacion_id =(select motivocancelacion_id from motivo_cancelacion where cvesistema = 'CANCELAMENTO_ECF') and c.ccf is not null)) "); - sql.append(" and c.ccf is not null "); - sql.append(" and r4.fiscalr4_id is not null "); - sql.append(" order by c.ccf "); - - return sql.toString(); - } - - private String getSqlImpressorasComCCFInicial(){ - StringBuilder sb = new StringBuilder(); - sb.append(" select "); - sb.append(" SERIEIMPFISCAL, "); - sb.append(" max(ccf) "); - sb.append(" from "); - sb.append(" caja "); - sb.append(" where "); - sb.append(" feccreacion <= :dataMenos2 "); - sb.append(" and SERIEIMPFISCAL in (select distinct c2.SERIEIMPFISCAL "); - sb.append(" from caja c2 where trunc(c2.FECCREACION) = :dataMenos1) "); - sb.append(" group by SERIEIMPFISCAL "); - return sb.toString(); - } - - @Override - public Map obterImpressorasComCCFInicial(Date data){ - Map impressoras = new HashMap(); - NamedParameterStatement stmt = null; - ResultSet rset = null; - try{ - final Calendar c = Calendar.getInstance(); - c.setTime(data); - c.add(Calendar.DAY_OF_MONTH, -1); - stmt = new NamedParameterStatement(con, getSqlImpressorasComCCFInicial()); - stmt.setDate("dataMenos2", new java.sql.Date(c.getTime().getTime())); - stmt.setDate("dataMenos1", new java.sql.Date(data.getTime())); - - rset = stmt.executeQuery(); - - while (rset.next()) { - impressoras.put(rset.getString(1), rset.getInt(2)); - } - } catch (Exception e){ - log.error("", e); - } finally { - if(stmt != null) { - try { stmt.close(); } catch (SQLException e) { log.error("", e); } - } - if(rset != null) { - try { rset.close(); } catch (SQLException e) { log.error("", e); } - } - } - return impressoras; - } - - public List buscaQuebraCCF(final String numserie, final Date data, final Integer ccfInicial){ - final List result = new ArrayList(); - - NamedParameterStatement stmt = null; - ResultSet rset = null; - try{ - stmt = new NamedParameterStatement(con, getSQL()); - stmt.setString("numserie", numserie); - stmt.setDate("data", new java.sql.Date(data.getTime())); - stmt.setInt("ccfInicial", ccfInicial); - - rset = stmt.executeQuery(); - - while (rset.next()) { - Integer empresaId = rset.getInt("empresa"); - Integer estadoId = rset.getInt("estado"); - Date dataMov = rset.getDate("datamov"); - FiscalImpressora fiscalImpressora = new FiscalImpressora(rset.getInt("fiscalimpressora_id")); - Empresa empresa = empresaId != null && empresaId != 0 ? new Empresa(empresaId) : null; - Estado estado = estadoId != null && estadoId != 0 ? new Estado(estadoId) : null; - PuntoVenta puntoVenta = new PuntoVenta(rset.getInt("puntoventa_id")); - Usuario usuario = new Usuario(rset.getInt("usuario_id")); - Integer ccf = rset.getInt("ccf"); - Integer ccf2 = null; - - if (rset.next()){ - ccf2 = rset.getInt("ccf"); - Date aux = dataMov; - if (ccf2 - ccf > 1){ - for (int i = ccf +1; i < ccf2; i++){ - Calendar c = Calendar.getInstance(); - c.setTime(aux); - c.add(Calendar.DATE, +1); - aux = c.getTime(); - - MonitoramentoCCF m = new MonitoramentoCCF(); - m.setDataMonitoramento(new Date()); - m.setDataOcorrencia(dataMov); - m.setDiasAlertaAberto(new Date()); - m.setImpressora(fiscalImpressora); - m.setEmpresa(empresa); - m.setEstadoInstalacao(estado); - m.setPuntoventa(puntoVenta); - m.setSequenciaCCFQuebrada(i); - m.setUsuario(usuario); - result.add(m); - } - } - } - } - } catch (Exception e){ - log.error("", e); - } finally { - if(stmt != null) { - try { stmt.close(); } catch (SQLException e) { log.error("", e); } - } - if(rset != null) { - try { rset.close(); } catch (SQLException e) { log.error("", e); } - } - } - return result; - } - - public List obtenerTodos(){ - StringBuilder hql = new StringBuilder(); - hql.append("SELECT m FROM MonitoramentoCCF m "); - hql.append("left join m.empresa "); - hql.append("ORDER BY m.empresa, m.impressora.numserie20, m.sequenciaCCFQuebrada "); - Query query = getSession().createQuery(hql.toString()); - - return query.list(); - } - - private String getMonitoramentoCCFSQL(){ - StringBuilder sql = new StringBuilder(); - - sql.append(" select count(*) "); - sql.append(" from monitoramento_ccf "); - sql.append(" where SEQUENCIA_CCF_QUEBRADA = :seq and fiscalimpressora_id = :fiscalimpressoraId "); - - return sql.toString(); - } - - @Override - public MonitoramentoCCF suscribir(final MonitoramentoCCF entity){ - jaexiste = false; - try{ - getSession().doWork(new Work() { - public void execute(Connection connection) throws SQLException - { - NamedParameterStatement stmt = null; - ResultSet rset = null; - try{ - log.debug("salvando ccf " + entity.getSequenciaCCFQuebrada() + " para impressora " + entity.getImpressora().getFiscalimpressoraId()); - stmt = new NamedParameterStatement(connection, getMonitoramentoCCFSQL()); - stmt.setInt("seq", entity.getSequenciaCCFQuebrada()); - stmt.setInt("fiscalimpressoraId", entity.getImpressora().getFiscalimpressoraId()); - rset = stmt.executeQuery(); - if (rset.next()){ - if (rset.getInt(1) > 0){ - jaexiste = true; - return; - } - } - } finally { - if(stmt != null) { - stmt.close(); - } - if(rset != null) { - rset.close(); - } - if(connection != null) { - //connection.close(); - } - } - } - }); - if (!jaexiste) { - return super.suscribir(entity); - } else { - return entity; - } - } catch (Exception e){ - log.error("", e); - return entity; - } - } - - @Override - public void setConnection(Connection con) { - this.con = con; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.jdbc.Work; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MonitoramentoCCFDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +@Repository("monitoramentoCCFDAO") +public class MonitoramentoCCFHibernateDAO extends GenericHibernateDAO +implements MonitoramentoCCFDAO { + private static final Logger log = LogManager.getLogger(MonitoramentoCCFHibernateDAO.class); + private Connection con; + Boolean jaexiste; + + @Autowired + public MonitoramentoCCFHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + private String getSQL(){ + StringBuilder sql = new StringBuilder(); + + sql.append(" SELECT "); + sql.append(" fi.empresa_id as empresa, "); + sql.append(" fi.numserie20 as numserie20, "); + sql.append(" fi.fiscalimpressora_id as fiscalimpressora_id, "); + sql.append(" fi.estadolocal_id as estado, "); + sql.append(" c.FECCREACION as datamov, "); + sql.append(" fi.puntoventa_id as puntoventa_id, "); + sql.append(" c.usuario_id as usuario_id, "); + sql.append(" r4.contador as ccf, "); + sql.append(" c.caja_id as cajaId, "); + sql.append(" fi.numserie as numserie "); + sql.append(" FROM "); + sql.append(" caja c "); + sql.append(" left join fiscal_r4 R4 on R4.CAJA_ID = c.CAJA_ID "); + sql.append(" inner join fiscal_impressora fi on fi.numserie = c.SERIEIMPFISCAL "); + sql.append(" where "); + sql.append(" fi.numserie = :numserie "); + sql.append(" and trunc(c.FECCREACION) >= :data "); + sql.append(" and c.ccf >= :ccfInicial "); + sql.append(" and fi.activo = 1 "); + sql.append(" and c.activo = 1 "); + sql.append(" and ((c.indreimpresion = 0) or (c.indreimpresion = 1 and c.indstatusboleto in ('E')) or (c.indreimpresion = 1 and c.motivocancelacion_id =(select motivocancelacion_id from motivo_cancelacion where cvesistema = 'CANCELAMENTO_ECF') and c.ccf is not null)) "); + sql.append(" and c.ccf is not null "); + sql.append(" and r4.fiscalr4_id is not null "); + sql.append(" order by c.ccf "); + + return sql.toString(); + } + + private String getSqlImpressorasComCCFInicial(){ + StringBuilder sb = new StringBuilder(); + sb.append(" select "); + sb.append(" SERIEIMPFISCAL, "); + sb.append(" max(ccf) "); + sb.append(" from "); + sb.append(" caja "); + sb.append(" where "); + sb.append(" feccreacion <= :dataMenos2 "); + sb.append(" and SERIEIMPFISCAL in (select distinct c2.SERIEIMPFISCAL "); + sb.append(" from caja c2 where trunc(c2.FECCREACION) = :dataMenos1) "); + sb.append(" group by SERIEIMPFISCAL "); + return sb.toString(); + } + + @Override + public Map obterImpressorasComCCFInicial(Date data){ + Map impressoras = new HashMap(); + NamedParameterStatement stmt = null; + ResultSet rset = null; + try{ + final Calendar c = Calendar.getInstance(); + c.setTime(data); + c.add(Calendar.DAY_OF_MONTH, -1); + stmt = new NamedParameterStatement(con, getSqlImpressorasComCCFInicial()); + stmt.setDate("dataMenos2", new java.sql.Date(c.getTime().getTime())); + stmt.setDate("dataMenos1", new java.sql.Date(data.getTime())); + + rset = stmt.executeQuery(); + + while (rset.next()) { + impressoras.put(rset.getString(1), rset.getInt(2)); + } + } catch (Exception e){ + log.error("", e); + } finally { + if(stmt != null) { + try { stmt.close(); } catch (SQLException e) { log.error("", e); } + } + if(rset != null) { + try { rset.close(); } catch (SQLException e) { log.error("", e); } + } + } + return impressoras; + } + + public List buscaQuebraCCF(final String numserie, final Date data, final Integer ccfInicial){ + final List result = new ArrayList(); + + NamedParameterStatement stmt = null; + ResultSet rset = null; + try{ + stmt = new NamedParameterStatement(con, getSQL()); + stmt.setString("numserie", numserie); + stmt.setDate("data", new java.sql.Date(data.getTime())); + stmt.setInt("ccfInicial", ccfInicial); + + rset = stmt.executeQuery(); + + while (rset.next()) { + Integer empresaId = rset.getInt("empresa"); + Integer estadoId = rset.getInt("estado"); + Date dataMov = rset.getDate("datamov"); + FiscalImpressora fiscalImpressora = new FiscalImpressora(rset.getInt("fiscalimpressora_id")); + Empresa empresa = empresaId != null && empresaId != 0 ? new Empresa(empresaId) : null; + Estado estado = estadoId != null && estadoId != 0 ? new Estado(estadoId) : null; + PuntoVenta puntoVenta = new PuntoVenta(rset.getInt("puntoventa_id")); + Usuario usuario = new Usuario(rset.getInt("usuario_id")); + Integer ccf = rset.getInt("ccf"); + Integer ccf2 = null; + + if (rset.next()){ + ccf2 = rset.getInt("ccf"); + Date aux = dataMov; + if (ccf2 - ccf > 1){ + for (int i = ccf +1; i < ccf2; i++){ + Calendar c = Calendar.getInstance(); + c.setTime(aux); + c.add(Calendar.DATE, +1); + aux = c.getTime(); + + MonitoramentoCCF m = new MonitoramentoCCF(); + m.setDataMonitoramento(new Date()); + m.setDataOcorrencia(dataMov); + m.setDiasAlertaAberto(new Date()); + m.setImpressora(fiscalImpressora); + m.setEmpresa(empresa); + m.setEstadoInstalacao(estado); + m.setPuntoventa(puntoVenta); + m.setSequenciaCCFQuebrada(i); + m.setUsuario(usuario); + result.add(m); + } + } + } + } + } catch (Exception e){ + log.error("", e); + } finally { + if(stmt != null) { + try { stmt.close(); } catch (SQLException e) { log.error("", e); } + } + if(rset != null) { + try { rset.close(); } catch (SQLException e) { log.error("", e); } + } + } + return result; + } + + public List obtenerTodos(){ + StringBuilder hql = new StringBuilder(); + hql.append("SELECT m FROM MonitoramentoCCF m "); + hql.append("left join m.empresa "); + hql.append("ORDER BY m.empresa, m.impressora.numserie20, m.sequenciaCCFQuebrada "); + Query query = getSession().createQuery(hql.toString()); + + return query.list(); + } + + private String getMonitoramentoCCFSQL(){ + StringBuilder sql = new StringBuilder(); + + sql.append(" select count(*) "); + sql.append(" from monitoramento_ccf "); + sql.append(" where SEQUENCIA_CCF_QUEBRADA = :seq and fiscalimpressora_id = :fiscalimpressoraId "); + + return sql.toString(); + } + + @Override + public MonitoramentoCCF suscribir(final MonitoramentoCCF entity){ + jaexiste = false; + try{ + getSession().doWork(new Work() { + public void execute(Connection connection) throws SQLException + { + NamedParameterStatement stmt = null; + ResultSet rset = null; + try{ + log.debug("salvando ccf " + entity.getSequenciaCCFQuebrada() + " para impressora " + entity.getImpressora().getFiscalimpressoraId()); + stmt = new NamedParameterStatement(connection, getMonitoramentoCCFSQL()); + stmt.setInt("seq", entity.getSequenciaCCFQuebrada()); + stmt.setInt("fiscalimpressoraId", entity.getImpressora().getFiscalimpressoraId()); + rset = stmt.executeQuery(); + if (rset.next()){ + if (rset.getInt(1) > 0){ + jaexiste = true; + return; + } + } + } finally { + if(stmt != null) { + stmt.close(); + } + if(rset != null) { + rset.close(); + } + if(connection != null) { + //connection.close(); + } + } + } + }); + if (!jaexiste) { + return super.suscribir(entity); + } else { + return entity; + } + } catch (Exception e){ + log.error("", e); + return entity; + } + } + + @Override + public void setConnection(Connection con) { + this.con = con; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java index c6b9ee125..f94c0c09b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java @@ -1,244 +1,244 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.jdbc.Work; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.MonitoramentoCRZDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; - -@Repository("monitoramentoCRZDAO") -public class MonitoramentoCRZHibernateDAO extends GenericHibernateDAO -implements MonitoramentoCRZDAO { - private static final Logger log = LogManager.getLogger(MonitoramentoCRZHibernateDAO.class); - Boolean jaexiste; - - @Autowired - public MonitoramentoCRZHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - private String getSQL(){ - StringBuilder sql = new StringBuilder(); - - sql.append(" SELECT "); - sql.append(" * "); - sql.append(" FROM "); - sql.append(" (SELECT "); - sql.append(" R2.crz, "); - sql.append(" R2.numserie20 AS numserie20, "); - sql.append(" fi.numserie AS numserie, "); - sql.append(" fi.fiscalimpressora_id AS fiscalimpressora_id, "); - sql.append(" R2.datamov AS datamov, "); - sql.append(" R2.COOINICIAL AS COOINICIAL, "); - sql.append(" R2.COOFINAL AS COOFINAL, "); - sql.append(" fi.estadolocal_id AS estadolocal_id, "); - sql.append(" fi.empresa_id AS empresa_id, "); - sql.append(" R2.puntoventa_id AS puntoventa_id, "); - sql.append(" R2.USUARIO_ID AS USUARIO_ID "); - sql.append(" FROM "); - sql.append(" FISCAL_R2 R2 "); - sql.append(" inner join fiscal_impressora fi on fi.numserie20 = R2.numserie20 "); - sql.append(" WHERE R2.NUMSERIE20 = :numserie and R2.datamov != '20000000' "); - sql.append(" ORDER BY r2.crz desc) "); - sql.append(" where rownum <= 5 "); - - return sql.toString(); - } - - public List buscaImpressoras(){ - final List result = new ArrayList(); - try{ - getSession().doWork(new Work() { - public void execute(Connection connection) throws SQLException - { - NamedParameterStatement stmt = null; - ResultSet rset = null; - try{ - stmt = new NamedParameterStatement(connection, "select distinct numserie20 from fiscal_impressora where activo = 1"); - - rset = stmt.executeQuery(); - - while (rset.next()) { - result.add(rset.getString(1)); - } - } finally { - if(stmt != null) { - stmt.close(); - } - if(rset != null) { - rset.close(); - } - if(connection != null) { - //connection.close(); - } - } - } - }); - } catch (Exception e){ - log.error("", e); - } - return result; - } - - public List buscaQuebraCRZ(final Date data){ - final List result = new ArrayList(); - final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - try{ - getSession().doWork(new Work() { - public void execute(Connection connection) throws SQLException - { - NamedParameterStatement stmt = null; - ResultSet rset = null; - try{ - stmt = new NamedParameterStatement(connection, getSQL()); - for (String s : buscaImpressoras()){ - stmt.setString("numserie", s); - rset = stmt.executeQuery(); - - while (rset.next()) { - Integer empresaId = rset.getInt("empresa_id"); - Integer estadoId = rset.getInt("estadolocal_id"); - PuntoVenta puntoVenta = new PuntoVenta(rset.getInt("puntoventa_id")); - Usuario usuario = new Usuario(rset.getInt("usuario_id")); - FiscalImpressora fiscalImpressora = new FiscalImpressora(rset.getInt("fiscalimpressora_id")); - Integer crz = rset.getInt("CRZ"); - Date dataRegistro = sdf.parse(rset.getString("datamov")); - Integer crz2 = null; - - - if (rset.next()){ - crz2 = rset.getInt("CRZ"); - Date aux = dataRegistro; - if (crz - crz2 > 1){ // crz é maior que crz2 pois esta ordenado decrescente - for (int i = crz -1; i > crz2; i--){ - Calendar c = Calendar.getInstance(); - c.setTime(aux); - c.add(Calendar.DATE, -1); - aux = c.getTime(); - - MonitoramentoCRZ m = new MonitoramentoCRZ(); - m.setDataMonitoramento(new Date()); - m.setDataReducaoZFaltante(aux); - m.setDiasAlertaAberto(new Date()); - m.setEmpresa(empresaId != null && empresaId != 0 ? new Empresa(empresaId) : null); - m.setEstadoInstalacao(estadoId != null && estadoId != 0 ? new Estado(estadoId) : null); - m.setPuntoventa(puntoVenta); - m.setSequenciaCRZQuebrada(i); - m.setUltimoUsuarioECF(usuario); - m.setImpressora(fiscalImpressora); - result.add(m); - } - } - } - } - } - } catch (ParseException e) { - log.error("", e); - } finally { - if(stmt != null) { - stmt.close(); - } - if(rset != null) { - rset.close(); - } - if(connection != null) { - //connection.close(); - } - } - } - }); - } catch (Exception e){ - log.error("", e); - } - return result; - } - - private String getMonitoramentoCRZSQL(){ - StringBuilder sql = new StringBuilder(); - - sql.append(" select count(*) "); - sql.append(" from monitoramento_crz "); - sql.append(" where SEQUENCIA_CRZ_QUEBRADA = :seq and fiscalimpressora_id = :fiscalimpressoraId "); - - return sql.toString(); - } - - @Override - public MonitoramentoCRZ suscribir(final MonitoramentoCRZ entity){ - jaexiste = false; - try{ - getSession().doWork(new Work() { - public void execute(Connection connection) throws SQLException - { - NamedParameterStatement stmt = null; - ResultSet rset = null; - try{ - log.debug("salvando crz " + entity.getSequenciaCRZQuebrada() + " para impressora " + entity.getImpressora().getFiscalimpressoraId()); - stmt = new NamedParameterStatement(connection, getMonitoramentoCRZSQL()); - stmt.setInt("seq", entity.getSequenciaCRZQuebrada()); - stmt.setInt("fiscalimpressoraId", entity.getImpressora().getFiscalimpressoraId()); - rset = stmt.executeQuery(); - if (rset.next()){ - if (rset.getInt(1) > 0){ - jaexiste = true; - return; - } - } - } finally { - if(stmt != null) { - stmt.close(); - } - if(rset != null) { - rset.close(); - } - if(connection != null) { - //connection.close(); - } - } - } - }); - if (!jaexiste) { - return super.suscribir(entity); - } else { - return entity; - } - } catch (Exception e){ - log.error("", e); - return entity; - } - } - - @Override - public List obtenerTodos(){ - StringBuilder hql = new StringBuilder(); - hql.append("SELECT m FROM MonitoramentoCRZ m "); - hql.append("left join m.empresa "); - hql.append("ORDER BY m.empresa, m.impressora.numserie20, m.sequenciaCRZQuebrada "); - Query query = getSession().createQuery(hql.toString()); - - return query.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.jdbc.Work; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.MonitoramentoCRZDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +@Repository("monitoramentoCRZDAO") +public class MonitoramentoCRZHibernateDAO extends GenericHibernateDAO +implements MonitoramentoCRZDAO { + private static final Logger log = LogManager.getLogger(MonitoramentoCRZHibernateDAO.class); + Boolean jaexiste; + + @Autowired + public MonitoramentoCRZHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + private String getSQL(){ + StringBuilder sql = new StringBuilder(); + + sql.append(" SELECT "); + sql.append(" * "); + sql.append(" FROM "); + sql.append(" (SELECT "); + sql.append(" R2.crz, "); + sql.append(" R2.numserie20 AS numserie20, "); + sql.append(" fi.numserie AS numserie, "); + sql.append(" fi.fiscalimpressora_id AS fiscalimpressora_id, "); + sql.append(" R2.datamov AS datamov, "); + sql.append(" R2.COOINICIAL AS COOINICIAL, "); + sql.append(" R2.COOFINAL AS COOFINAL, "); + sql.append(" fi.estadolocal_id AS estadolocal_id, "); + sql.append(" fi.empresa_id AS empresa_id, "); + sql.append(" R2.puntoventa_id AS puntoventa_id, "); + sql.append(" R2.USUARIO_ID AS USUARIO_ID "); + sql.append(" FROM "); + sql.append(" FISCAL_R2 R2 "); + sql.append(" inner join fiscal_impressora fi on fi.numserie20 = R2.numserie20 "); + sql.append(" WHERE R2.NUMSERIE20 = :numserie and R2.datamov != '20000000' "); + sql.append(" ORDER BY r2.crz desc) "); + sql.append(" where rownum <= 5 "); + + return sql.toString(); + } + + public List buscaImpressoras(){ + final List result = new ArrayList(); + try{ + getSession().doWork(new Work() { + public void execute(Connection connection) throws SQLException + { + NamedParameterStatement stmt = null; + ResultSet rset = null; + try{ + stmt = new NamedParameterStatement(connection, "select distinct numserie20 from fiscal_impressora where activo = 1"); + + rset = stmt.executeQuery(); + + while (rset.next()) { + result.add(rset.getString(1)); + } + } finally { + if(stmt != null) { + stmt.close(); + } + if(rset != null) { + rset.close(); + } + if(connection != null) { + //connection.close(); + } + } + } + }); + } catch (Exception e){ + log.error("", e); + } + return result; + } + + public List buscaQuebraCRZ(final Date data){ + final List result = new ArrayList(); + final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + try{ + getSession().doWork(new Work() { + public void execute(Connection connection) throws SQLException + { + NamedParameterStatement stmt = null; + ResultSet rset = null; + try{ + stmt = new NamedParameterStatement(connection, getSQL()); + for (String s : buscaImpressoras()){ + stmt.setString("numserie", s); + rset = stmt.executeQuery(); + + while (rset.next()) { + Integer empresaId = rset.getInt("empresa_id"); + Integer estadoId = rset.getInt("estadolocal_id"); + PuntoVenta puntoVenta = new PuntoVenta(rset.getInt("puntoventa_id")); + Usuario usuario = new Usuario(rset.getInt("usuario_id")); + FiscalImpressora fiscalImpressora = new FiscalImpressora(rset.getInt("fiscalimpressora_id")); + Integer crz = rset.getInt("CRZ"); + Date dataRegistro = sdf.parse(rset.getString("datamov")); + Integer crz2 = null; + + + if (rset.next()){ + crz2 = rset.getInt("CRZ"); + Date aux = dataRegistro; + if (crz - crz2 > 1){ // crz é maior que crz2 pois esta ordenado decrescente + for (int i = crz -1; i > crz2; i--){ + Calendar c = Calendar.getInstance(); + c.setTime(aux); + c.add(Calendar.DATE, -1); + aux = c.getTime(); + + MonitoramentoCRZ m = new MonitoramentoCRZ(); + m.setDataMonitoramento(new Date()); + m.setDataReducaoZFaltante(aux); + m.setDiasAlertaAberto(new Date()); + m.setEmpresa(empresaId != null && empresaId != 0 ? new Empresa(empresaId) : null); + m.setEstadoInstalacao(estadoId != null && estadoId != 0 ? new Estado(estadoId) : null); + m.setPuntoventa(puntoVenta); + m.setSequenciaCRZQuebrada(i); + m.setUltimoUsuarioECF(usuario); + m.setImpressora(fiscalImpressora); + result.add(m); + } + } + } + } + } + } catch (ParseException e) { + log.error("", e); + } finally { + if(stmt != null) { + stmt.close(); + } + if(rset != null) { + rset.close(); + } + if(connection != null) { + //connection.close(); + } + } + } + }); + } catch (Exception e){ + log.error("", e); + } + return result; + } + + private String getMonitoramentoCRZSQL(){ + StringBuilder sql = new StringBuilder(); + + sql.append(" select count(*) "); + sql.append(" from monitoramento_crz "); + sql.append(" where SEQUENCIA_CRZ_QUEBRADA = :seq and fiscalimpressora_id = :fiscalimpressoraId "); + + return sql.toString(); + } + + @Override + public MonitoramentoCRZ suscribir(final MonitoramentoCRZ entity){ + jaexiste = false; + try{ + getSession().doWork(new Work() { + public void execute(Connection connection) throws SQLException + { + NamedParameterStatement stmt = null; + ResultSet rset = null; + try{ + log.debug("salvando crz " + entity.getSequenciaCRZQuebrada() + " para impressora " + entity.getImpressora().getFiscalimpressoraId()); + stmt = new NamedParameterStatement(connection, getMonitoramentoCRZSQL()); + stmt.setInt("seq", entity.getSequenciaCRZQuebrada()); + stmt.setInt("fiscalimpressoraId", entity.getImpressora().getFiscalimpressoraId()); + rset = stmt.executeQuery(); + if (rset.next()){ + if (rset.getInt(1) > 0){ + jaexiste = true; + return; + } + } + } finally { + if(stmt != null) { + stmt.close(); + } + if(rset != null) { + rset.close(); + } + if(connection != null) { + //connection.close(); + } + } + } + }); + if (!jaexiste) { + return super.suscribir(entity); + } else { + return entity; + } + } catch (Exception e){ + log.error("", e); + return entity; + } + } + + @Override + public List obtenerTodos(){ + StringBuilder hql = new StringBuilder(); + hql.append("SELECT m FROM MonitoramentoCRZ m "); + hql.append("left join m.empresa "); + hql.append("ORDER BY m.empresa, m.impressora.numserie20, m.sequenciaCRZQuebrada "); + Query query = getSession().createQuery(hql.toString()); + + return query.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivocancelacionEquivalenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivocancelacionEquivalenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/MotivocancelacionEquivalenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivocancelacionEquivalenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/NotaCreditoVendaPacoteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/NotaCreditoVendaPacoteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/NotaCreditoVendaPacoteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/NotaCreditoVendaPacoteHibernateDAO.java index cf0af93cd..0a9421d15 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/NotaCreditoVendaPacoteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/NotaCreditoVendaPacoteHibernateDAO.java @@ -1,92 +1,92 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.NotaCreditoVendaPacoteDAO; -import com.rjconsultores.ventaboletos.entidad.CajaDiversos; -import com.rjconsultores.ventaboletos.entidad.CajaDiversosPago; -import com.rjconsultores.ventaboletos.entidad.CajaTarjeta; -import com.rjconsultores.ventaboletos.entidad.NotaCreditoVendaPacote; -import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -@Repository("notaCreditoVendaPacoteDAO") -public class NotaCreditoVendaPacoteHibernateDAO extends GenericHibernateDAO - implements NotaCreditoVendaPacoteDAO { - - @Autowired - public NotaCreditoVendaPacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { - - Map params = new HashMap(); - StringBuilder queryString = new StringBuilder("SELECT n FROM NotaCreditoVendaPacote n "); - queryString.append("LEFT JOIN FETCH n.ocdDatosPagamentoList ") - .append("LEFT JOIN FETCH n.vendapacotecancelamento vpc ") - .append("WHERE 1=1 "); - - if (fecInicial != null) { - queryString.append("AND n.datanotacredito >= :fecInicial "); - params.put("fecInicial", fecInicial); - } - if (fecFinal != null) { - queryString.append("AND n.datanotacredito <= :fecFinal "); - params.put("fecFinal", fecFinal); - } - - if (fecPagamentoInicial != null) { - queryString.append("AND n.datapagamento >= :fecPagamentoInicial "); - params.put("fecPagamentoInicial", fecPagamentoInicial); - } - if (fecPagamentoFinal != null) { - queryString.append("AND n.datapagamento <= :fecPagamentoFinal "); - params.put("fecPagamentoFinal", fecPagamentoFinal); - } - if (indPago != null) { - if (indPago) { - queryString.append("AND n.situacao = :indPago "); - } else { - queryString.append("AND (n.situacao != :indPago OR n.situacao IS NULL) "); - } - params.put("indPago", SituacaoVendaPacote.PAGO.getShortValue()); - } - - Query query = getSession().createQuery(queryString.toString()); - for (String p : query.getNamedParameters()) { - query.setParameter(p, params.get(p)); - } - - List result = new ArrayList(); - List listNotaCredito = query.list(); - for (NotaCreditoVendaPacote notaCredito :listNotaCredito) { - List cajaTarjetaList = new ArrayList(); - List listCajaDiversos = notaCredito.getCajaDiversosList(); - for (CajaDiversos cajaDiversos : listCajaDiversos) { - List listCajaDiversosPago = cajaDiversos.getCajaDiversosPagosList(); - for (CajaDiversosPago cajaDiversosPago : listCajaDiversosPago) { - cajaTarjetaList.add(cajaDiversosPago.getCajaTarjeta()); - } - } - ReembolsoOcdNotaCreditoVO vo = ReembolsoOcdNotaCreditoVO.builder().notaCredito(notaCredito) - .datosPagamento(notaCredito.getOcdDatosPagamentoList()).cajaTarjeta(cajaTarjetaList).build(); - result.add(vo); - } - - return result; - - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.NotaCreditoVendaPacoteDAO; +import com.rjconsultores.ventaboletos.entidad.CajaDiversos; +import com.rjconsultores.ventaboletos.entidad.CajaDiversosPago; +import com.rjconsultores.ventaboletos.entidad.CajaTarjeta; +import com.rjconsultores.ventaboletos.entidad.NotaCreditoVendaPacote; +import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +@Repository("notaCreditoVendaPacoteDAO") +public class NotaCreditoVendaPacoteHibernateDAO extends GenericHibernateDAO + implements NotaCreditoVendaPacoteDAO { + + @Autowired + public NotaCreditoVendaPacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { + + Map params = new HashMap(); + StringBuilder queryString = new StringBuilder("SELECT n FROM NotaCreditoVendaPacote n "); + queryString.append("LEFT JOIN FETCH n.ocdDatosPagamentoList ") + .append("LEFT JOIN FETCH n.vendapacotecancelamento vpc ") + .append("WHERE 1=1 "); + + if (fecInicial != null) { + queryString.append("AND n.datanotacredito >= :fecInicial "); + params.put("fecInicial", fecInicial); + } + if (fecFinal != null) { + queryString.append("AND n.datanotacredito <= :fecFinal "); + params.put("fecFinal", fecFinal); + } + + if (fecPagamentoInicial != null) { + queryString.append("AND n.datapagamento >= :fecPagamentoInicial "); + params.put("fecPagamentoInicial", fecPagamentoInicial); + } + if (fecPagamentoFinal != null) { + queryString.append("AND n.datapagamento <= :fecPagamentoFinal "); + params.put("fecPagamentoFinal", fecPagamentoFinal); + } + if (indPago != null) { + if (indPago) { + queryString.append("AND n.situacao = :indPago "); + } else { + queryString.append("AND (n.situacao != :indPago OR n.situacao IS NULL) "); + } + params.put("indPago", SituacaoVendaPacote.PAGO.getShortValue()); + } + + Query query = getSession().createQuery(queryString.toString()); + for (String p : query.getNamedParameters()) { + query.setParameter(p, params.get(p)); + } + + List result = new ArrayList(); + List listNotaCredito = query.list(); + for (NotaCreditoVendaPacote notaCredito :listNotaCredito) { + List cajaTarjetaList = new ArrayList(); + List listCajaDiversos = notaCredito.getCajaDiversosList(); + for (CajaDiversos cajaDiversos : listCajaDiversos) { + List listCajaDiversosPago = cajaDiversos.getCajaDiversosPagosList(); + for (CajaDiversosPago cajaDiversosPago : listCajaDiversosPago) { + cajaTarjetaList.add(cajaDiversosPago.getCajaTarjeta()); + } + } + ReembolsoOcdNotaCreditoVO vo = ReembolsoOcdNotaCreditoVO.builder().notaCredito(notaCredito) + .datosPagamento(notaCredito.getOcdDatosPagamentoList()).cajaTarjeta(cajaTarjetaList).build(); + result.add(vo); + } + + return result; + + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OCDHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDHibernateDAO.java index 14e368011..ca7689023 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDHibernateDAO.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OCDDAO; -import com.rjconsultores.ventaboletos.entidad.OCD; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -@Repository("ocdHibernateDAO") -public class OCDHibernateDAO extends GenericHibernateDAO - implements OCDDAO { - - @Autowired - public OCDHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { - - Map params = new HashMap(); - String queryString = "SELECT o FROM OCD o " - + "LEFT JOIN FETCH o.boleto b " - + "LEFT JOIN FETCH o.ocdDatosPagamentos " - + "WHERE 1=1 "; - - if (fecInicial != null) { - queryString += "AND o.fecinc >= :fecInicial "; - params.put("fecInicial", fecInicial); - } - if (fecFinal != null) { - queryString += "AND o.fecinc <= :fecFinal "; - params.put("fecFinal", fecFinal); - } - - if (fecPagamentoInicial != null) { - queryString += "AND o.fecpagar >= :fecPagamentoInicial "; - params.put("fecPagamentoInicial", fecPagamentoInicial); - } - if (fecPagamentoFinal != null) { - queryString += "AND o.fecpagar <= :fecPagamentoFinal "; - params.put("fecPagamentoFinal", fecPagamentoFinal); - } - - if (indPago != null) { - queryString += "AND o.indpago = :indPago "; - params.put("indPago", indPago); - } - - Query query = getSession().createQuery(queryString); - for (String p : query.getNamedParameters()) { - query.setParameter(p, params.get(p)); - } - - List listOcd = query.list(); - List result = new ArrayList(); - for (OCD ocd : listOcd) { - ReembolsoOcdNotaCreditoVO vo = ReembolsoOcdNotaCreditoVO.builder().ocd(ocd) - .boleto(ocd.getBoleto()).datosPagamento(ocd.getOcdDatosPagamentos()).build(); - result.add(vo); - } - - return result; - - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OCDDAO; +import com.rjconsultores.ventaboletos.entidad.OCD; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +@Repository("ocdHibernateDAO") +public class OCDHibernateDAO extends GenericHibernateDAO + implements OCDDAO { + + @Autowired + public OCDHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { + + Map params = new HashMap(); + String queryString = "SELECT o FROM OCD o " + + "LEFT JOIN FETCH o.boleto b " + + "LEFT JOIN FETCH o.ocdDatosPagamentos " + + "WHERE 1=1 "; + + if (fecInicial != null) { + queryString += "AND o.fecinc >= :fecInicial "; + params.put("fecInicial", fecInicial); + } + if (fecFinal != null) { + queryString += "AND o.fecinc <= :fecFinal "; + params.put("fecFinal", fecFinal); + } + + if (fecPagamentoInicial != null) { + queryString += "AND o.fecpagar >= :fecPagamentoInicial "; + params.put("fecPagamentoInicial", fecPagamentoInicial); + } + if (fecPagamentoFinal != null) { + queryString += "AND o.fecpagar <= :fecPagamentoFinal "; + params.put("fecPagamentoFinal", fecPagamentoFinal); + } + + if (indPago != null) { + queryString += "AND o.indpago = :indPago "; + params.put("indPago", indPago); + } + + Query query = getSession().createQuery(queryString); + for (String p : query.getNamedParameters()) { + query.setParameter(p, params.get(p)); + } + + List listOcd = query.list(); + List result = new ArrayList(); + for (OCD ocd : listOcd) { + ReembolsoOcdNotaCreditoVO vo = ReembolsoOcdNotaCreditoVO.builder().ocd(ocd) + .boleto(ocd.getBoleto()).datosPagamento(ocd.getOcdDatosPagamentos()).build(); + result.add(vo); + } + + return result; + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java index b20c8cf66..d095f812f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java @@ -1,65 +1,65 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OCDParamDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.ControleEstoqueMigracao; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OCDParam; - -@Repository("ocdParamDAO") -public class OCDParamHibernateDAO extends GenericHibernateDAO implements OCDParamDAO { - - @Autowired - public OCDParamHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - List params = findByCriteria(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return params; - } - - @Override - public OCDParam buscaOCDParamPorEmpresa(Empresa empresa) { - - Criteria c = makeCriteria(); - c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (OCDParam)c.uniqueResult(); - } - - @Override - public List buscaOCDParams(Empresa empresa) { - List params = findByCriteria(Restrictions.eq("empresa", empresa), Restrictions.eq(ACTIVO, Boolean.TRUE)); - return params; - } - - @Override - public OCDParam suscribirActualizar(OCDParam entidad){ - try { - if (entidad.getOcdparamId() != null){ - this.getHibernateTemplate().merge(entidad); - } else { - this.getHibernateTemplate().save(entidad); - } - return entidad; - } catch (final HibernateException ex) { - throw convertHibernateAccessException(ex); - } - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OCDParamDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.ControleEstoqueMigracao; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OCDParam; + +@Repository("ocdParamDAO") +public class OCDParamHibernateDAO extends GenericHibernateDAO implements OCDParamDAO { + + @Autowired + public OCDParamHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + List params = findByCriteria(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return params; + } + + @Override + public OCDParam buscaOCDParamPorEmpresa(Empresa empresa) { + + Criteria c = makeCriteria(); + c.add(Restrictions.eq("empresa", empresa)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (OCDParam)c.uniqueResult(); + } + + @Override + public List buscaOCDParams(Empresa empresa) { + List params = findByCriteria(Restrictions.eq("empresa", empresa), Restrictions.eq(ACTIVO, Boolean.TRUE)); + return params; + } + + @Override + public OCDParam suscribirActualizar(OCDParam entidad){ + try { + if (entidad.getOcdparamId() != null){ + this.getHibernateTemplate().merge(entidad); + } else { + this.getHibernateTemplate().save(entidad); + } + return entidad; + } catch (final HibernateException ex) { + throw convertHibernateAccessException(ex); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java index 2ffe1dade..1446f6c58 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java @@ -1,51 +1,51 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OCDPtoVtaParamDAO; -import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; -import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; - -/** - * @author Thiago - * - */ -@Repository("ocdPtoVtaParamDAO") -public class OCDPtoVtaParamHibernateDAO extends GenericHibernateDAO -implements OCDPtoVtaParamDAO { - - @Autowired - public OCDPtoVtaParamHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("ptoVtaCheckinId")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("ptoVtaCheckinId", id)); - - return c.list(); - } - -} +/** + * + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OCDPtoVtaParamDAO; +import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; +import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; + +/** + * @author Thiago + * + */ +@Repository("ocdPtoVtaParamDAO") +public class OCDPtoVtaParamHibernateDAO extends GenericHibernateDAO +implements OCDPtoVtaParamDAO { + + @Autowired + public OCDPtoVtaParamHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("ptoVtaCheckinId")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("ptoVtaCheckinId", id)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java index c1288d312..6899e9a97 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java @@ -1,95 +1,95 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaDAO; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; - -@Repository("operadorEmbarcadaDAO") -@SuppressWarnings("unchecked") -public class OperadorEmbarcadaHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaDAO { - private static Logger log = LogManager.getLogger(OperadorEmbarcadaHibernateDAO.class); - - @Autowired - public OperadorEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarTodosOperadores() { - start = System.currentTimeMillis(); - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - List retorno = c.list(); - log.debug( printInfo("buscarOperadorEmbarcadaPorUsuario", start)); - return retorno; - } - - @Override - public OperadorEmbarcada burcarOperadorPorId(Long operadorEmbarcadaID) { - start = System.currentTimeMillis(); - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("operadorEmbarcadaId", operadorEmbarcadaID)); - - OperadorEmbarcada retorno = (OperadorEmbarcada) c.uniqueResult(); - log.debug( printInfo("burcarOperadorPorId", start)); - return retorno; - } - - @Override - public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario) { - start = System.currentTimeMillis(); - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("usuario.usuarioId", idUsuario)); - - OperadorEmbarcada op = (OperadorEmbarcada) c.uniqueResult(); - log.debug( printInfo("buscarOperadorEmbarcadaPorUsuario", start)); - return op; - } - - @Override - public PuntoVentaVO getPuntoVentaVO(Integer operador) { - start = System.currentTimeMillis(); - StringBuilder sb = new StringBuilder(); - sb.append(" SELECT "); - sb.append(" PV.PUNTOVENTA_ID AS puntoventaId, "); - sb.append(" PV.NOMBPUNTOVENTA AS nombpuntoventa "); - sb.append(" FROM "); - sb.append(" USUARIO_UBICACION USU "); - sb.append(" INNER JOIN PUNTO_VENTA PV ON USU.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); - sb.append(" WHERE "); - sb.append(" USU.USUARIO_ID = :usuario_id "); - // sb.append(" AND PV.EMPRESA_ID = :empresa_id "); - sb.append(" AND USU.ACTIVO = 1 AND PV.ACTIVO = 1 "); - sb.append( " AND USU.padrao=1 "); - - SQLQuery sql = getSession().createSQLQuery(sb.toString()) - .addScalar("puntoventaId", IntegerType.INSTANCE) - .addScalar("nombpuntoventa", StringType.INSTANCE); - sql.setInteger("usuario_id", operador); - // sql.setInteger("empresa_id", empresa); - sql.setResultTransformer(new AliasToBeanResultTransformer(PuntoVentaVO.class)); - PuntoVentaVO puntoVentaVO = (PuntoVentaVO) sql.uniqueResult(); - - log.debug( printInfo("getPuntoVentaVO", start)); - return puntoVentaVO; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaDAO; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; + +@Repository("operadorEmbarcadaDAO") +@SuppressWarnings("unchecked") +public class OperadorEmbarcadaHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaDAO { + private static Logger log = LogManager.getLogger(OperadorEmbarcadaHibernateDAO.class); + + @Autowired + public OperadorEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarTodosOperadores() { + start = System.currentTimeMillis(); + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + List retorno = c.list(); + log.debug( printInfo("buscarOperadorEmbarcadaPorUsuario", start)); + return retorno; + } + + @Override + public OperadorEmbarcada burcarOperadorPorId(Long operadorEmbarcadaID) { + start = System.currentTimeMillis(); + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("operadorEmbarcadaId", operadorEmbarcadaID)); + + OperadorEmbarcada retorno = (OperadorEmbarcada) c.uniqueResult(); + log.debug( printInfo("burcarOperadorPorId", start)); + return retorno; + } + + @Override + public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario) { + start = System.currentTimeMillis(); + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("usuario.usuarioId", idUsuario)); + + OperadorEmbarcada op = (OperadorEmbarcada) c.uniqueResult(); + log.debug( printInfo("buscarOperadorEmbarcadaPorUsuario", start)); + return op; + } + + @Override + public PuntoVentaVO getPuntoVentaVO(Integer operador) { + start = System.currentTimeMillis(); + StringBuilder sb = new StringBuilder(); + sb.append(" SELECT "); + sb.append(" PV.PUNTOVENTA_ID AS puntoventaId, "); + sb.append(" PV.NOMBPUNTOVENTA AS nombpuntoventa "); + sb.append(" FROM "); + sb.append(" USUARIO_UBICACION USU "); + sb.append(" INNER JOIN PUNTO_VENTA PV ON USU.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); + sb.append(" WHERE "); + sb.append(" USU.USUARIO_ID = :usuario_id "); + // sb.append(" AND PV.EMPRESA_ID = :empresa_id "); + sb.append(" AND USU.ACTIVO = 1 AND PV.ACTIVO = 1 "); + sb.append( " AND USU.padrao=1 "); + + SQLQuery sql = getSession().createSQLQuery(sb.toString()) + .addScalar("puntoventaId", IntegerType.INSTANCE) + .addScalar("nombpuntoventa", StringType.INSTANCE); + sql.setInteger("usuario_id", operador); + // sql.setInteger("empresa_id", empresa); + sql.setResultTransformer(new AliasToBeanResultTransformer(PuntoVentaVO.class)); + PuntoVentaVO puntoVentaVO = (PuntoVentaVO) sql.uniqueResult(); + + log.debug( printInfo("getPuntoVentaVO", start)); + return puntoVentaVO; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java index c11c06a30..f2ac095c8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java @@ -1,75 +1,75 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaLinhaDAO; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; -import com.rjconsultores.ventaboletos.vo.ruta.RutaVO; - -@Repository("operadorEmbarcadaLinhaDAO") -@SuppressWarnings("unchecked") -public class OperadorEmbarcadaLinhaHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaLinhaDAO { - - @Autowired - public OperadorEmbarcadaLinhaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarPorOperador(OperadorEmbarcada operador) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("operadorEmbarcada", operador)); - - return c.list(); - } - - @Override - public List getListaRutaVO(Integer operador) { - StringBuilder sb = new StringBuilder(); - sb.append(" SELECT "); - sb.append(" new com.rjconsultores.ventaboletos.vo.ruta.RutaVO(RT.rutaId, RT.numRuta, RT.prefixo, RT.descruta, ORC.orgaoConcedenteId, ORC.descOrgao, ORC.indValDocObligatorioEmbarcada, RT.indSentidoIda, CLA.claseservicioId, CLA.descclase, RT.indTribTarifa, RT.indTribTaxaEmbarque, RT.indTribPedagio) "); - sb.append(" FROM OperadorEmbarcadaLinha OPL "); - sb.append(" INNER JOIN OPL.ruta RT "); - sb.append(" INNER JOIN OPL.operadorEmbarcada OPE "); - sb.append(" INNER JOIN RT.claseServicio CLA "); - sb.append(" INNER JOIN RT.orgaoConcedente ORC "); - sb.append(" WHERE "); - sb.append(" OPE.usuario = :usuario_id "); - sb.append(" AND OPL.activo = 1 AND RT.activo = 1 AND OPE.activo = 1 AND CLA.activo = 1 AND ORC.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("usuario_id", operador); - - List rutas = (List) query.list(); - return rutas; - } - - @Override - public List getListaResumidaRutaVO(Integer operador) { - StringBuilder sb = new StringBuilder(); - sb.append(" SELECT "); - sb.append(" RT.rutaId "); - sb.append(" FROM OperadorEmbarcadaLinha OPL "); - sb.append(" INNER JOIN OPL.ruta RT "); - sb.append(" INNER JOIN OPL.operadorEmbarcada OPE "); - sb.append(" WHERE "); - sb.append(" OPE.usuario = :usuario_id "); - sb.append(" AND OPL.activo = 1 AND RT.activo = 1 AND OPE.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("usuario_id", operador); - - List rutas = (List) query.list(); - return rutas; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaLinhaDAO; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; +import com.rjconsultores.ventaboletos.vo.ruta.RutaVO; + +@Repository("operadorEmbarcadaLinhaDAO") +@SuppressWarnings("unchecked") +public class OperadorEmbarcadaLinhaHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaLinhaDAO { + + @Autowired + public OperadorEmbarcadaLinhaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarPorOperador(OperadorEmbarcada operador) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("operadorEmbarcada", operador)); + + return c.list(); + } + + @Override + public List getListaRutaVO(Integer operador) { + StringBuilder sb = new StringBuilder(); + sb.append(" SELECT "); + sb.append(" new com.rjconsultores.ventaboletos.vo.ruta.RutaVO(RT.rutaId, RT.numRuta, RT.prefixo, RT.descruta, ORC.orgaoConcedenteId, ORC.descOrgao, ORC.indValDocObligatorioEmbarcada, RT.indSentidoIda, CLA.claseservicioId, CLA.descclase, RT.indTribTarifa, RT.indTribTaxaEmbarque, RT.indTribPedagio) "); + sb.append(" FROM OperadorEmbarcadaLinha OPL "); + sb.append(" INNER JOIN OPL.ruta RT "); + sb.append(" INNER JOIN OPL.operadorEmbarcada OPE "); + sb.append(" INNER JOIN RT.claseServicio CLA "); + sb.append(" INNER JOIN RT.orgaoConcedente ORC "); + sb.append(" WHERE "); + sb.append(" OPE.usuario = :usuario_id "); + sb.append(" AND OPL.activo = 1 AND RT.activo = 1 AND OPE.activo = 1 AND CLA.activo = 1 AND ORC.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("usuario_id", operador); + + List rutas = (List) query.list(); + return rutas; + } + + @Override + public List getListaResumidaRutaVO(Integer operador) { + StringBuilder sb = new StringBuilder(); + sb.append(" SELECT "); + sb.append(" RT.rutaId "); + sb.append(" FROM OperadorEmbarcadaLinha OPL "); + sb.append(" INNER JOIN OPL.ruta RT "); + sb.append(" INNER JOIN OPL.operadorEmbarcada OPE "); + sb.append(" WHERE "); + sb.append(" OPE.usuario = :usuario_id "); + sb.append(" AND OPL.activo = 1 AND RT.activo = 1 AND OPE.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("usuario_id", operador); + + List rutas = (List) query.list(); + return rutas; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java index 59891c242..6e8007af9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java @@ -1,827 +1,827 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.transform.ResultTransformer; -import org.hibernate.transform.Transformers; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.dao.CategoriaDescuentoDAO; -import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaServicoDAO; -import com.rjconsultores.ventaboletos.dao.util.DBUtil; -import com.rjconsultores.ventaboletos.entidad.AliasServico; -import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TarifaMinima; -import com.rjconsultores.ventaboletos.service.AliasServicoService; -import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; -import com.rjconsultores.ventaboletos.vo.corrida.TramoSequenciaVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVO; -import com.rjconsultores.ventaboletos.vo.roloperativo.RolOperativoVO; -import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; -import com.rjconsultores.ventaboletos.vo.tiposervicio.TipoServicioVO; -import com.rjconsultores.ventaboletos.vo.tramo.TramoVO; -import com.rjconsultores.ventaboletos.vo.via.ViaVO; - -@Repository("operadorEmbarcadaServicoDAO") -@SuppressWarnings({"unchecked", "rawtypes"}) -public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaServicoDAO { - - private static final Logger log = LogManager.getLogger(OperadorEmbarcadaServicoHibernateDAO.class); - - @Autowired - private CategoriaDescuentoDAO categoriaDescuentoDAO; - - @Autowired - private ConstanteHibernateDAO constanteDAO; - - @Autowired - private AliasServicoService aliasServicoService; - - - @Autowired - public OperadorEmbarcadaServicoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarPorOperador(OperadorEmbarcada operador) { - StringBuilder sb = new StringBuilder(); - sb.append(" from OperadorEmbarcadaServico oes "); - sb.append(" where oes.operadorEmbarcada.operadorEmbarcadaId = :operadorEmbarcadaId "); - sb.append(" and oes.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setLong("operadorEmbarcadaId", operador.getOperadorEmbarcadaId()); - return query.list(); - } - - @Override - public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta) { - List corridas = getCorridas(operador, empresa, dtIni, dtFim); - - for (CorridaVO corrida : corridas) { - preencherTramosSequencias(corrida, puntoVenta, empresa); - preencherSequencias(corrida); - } - - return corridas; - } - - @Override - public List getListaResumidaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta, Boolean retornaTramos ) throws Exception { - return getCorridasResumido(operador, empresa, dtIni, dtFim, retornaTramos); - } - - @Override - public List getListaCorridaProxyVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim) { - return getCorridas(operador, empresa, dtIni, dtFim); - } - - @Override - public void preencherCorrida(CorridaVO corrida, PuntoVenta puntoVenta, Empresa empresa) { - preencherTramosSequencias(corrida, puntoVenta, empresa); - preencherSequencias(corrida); - } - - private List getCorridas(Integer operador, Empresa empresa, Date dtIni, Date dtFim) { - StringBuilder sb = new StringBuilder(); - - sb.append("select * from (SELECT"); - sb.append(" COR.CORRIDA_ID AS CORRIDAID,"); - sb.append(" ESQ.NUMCORRIDA AS NUMCORRIDA,"); - sb.append(" '' AS DESCSERVICO,"); - sb.append(" COR.FECHORSALIDA AS FECHORSALIDA,"); - sb.append(" COR.TIPOSERVICIO_ID AS TIPOSERVICIOID,"); - sb.append(" TPS.DESCSERVICIO AS DESCSERVICIO,"); - sb.append(" ROL.ROLOPERATIVO_ID AS ROLOPERATIVOID,"); - sb.append(" ROL.DESCROLOPERATIVO AS DESCROLOPERATIVO,"); - sb.append(" COR.RUTA_ID AS RUTA_ID,"); - sb.append(" COR.ORIGEN_ID AS ORIGEMID,"); - sb.append(" ORI.DESCPARADA AS DESCORIGEM,"); - sb.append(" COR.DESTINO_ID AS DESTINOID,"); - sb.append(" DES.DESCPARADA AS DESCDESTINO,"); - sb.append(" ORIEST.CVEESTADO AS ORICVEESTADO,"); - sb.append(" DESEST.CVEESTADO AS DESCVEESTADO,"); - sb.append(" COR.CLASESERVICIO_ID AS CLASESERVICIO_ID,"); - sb.append(" COR.MARCA_ID AS MARCA_ID,"); - sb.append(" to_char(COR.FECCORRIDA, 'dd/MM/YYYY') AS FECCORRIDA,"); - sb.append(" COR.EMPRESACORRIDA_ID AS EMPRESA_ID"); - sb.append(" FROM OPERADOR_EMBARCADA OPE"); - sb.append(" JOIN OPERADOR_EMBARCADA_SERVICO OPS ON OPE.OPERADOR_EMBARCADA_ID = OPS.OPERADOR_EMBARCADA_ID"); - sb.append(" JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = OPS.ESQUEMA_CORRIDA_ID"); - sb.append(" JOIN CORRIDA COR ON COR.ESQUEMACORRIDA_ID = ESQ.ESQUEMACORRIDA_ID"); - sb.append(" JOIN TIPO_SERVICIO TPS ON COR.TIPOSERVICIO_ID = TPS.TIPOSERVICIO_ID"); - sb.append(" JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID"); - sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = COR.ORIGEN_ID"); - sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID"); - sb.append(" JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID"); - sb.append(" JOIN PARADA DES ON DES.PARADA_ID = COR.DESTINO_ID"); - sb.append(" JOIN CIUDAD DESCID ON DESCID.CIUDAD_ID = DES.CIUDAD_ID"); - sb.append(" JOIN ESTADO DESEST ON DESEST.ESTADO_ID = DESCID.ESTADO_ID"); - sb.append(" WHERE OPE.USUARIO_ID = :usuarioId"); - sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId"); - sb.append(" AND COR.FECCORRIDA >= :dtIni"); - sb.append(" AND COR.FECCORRIDA <= :dtFim"); - sb.append(" AND OPS.ACTIVO = 1"); - sb.append(" AND OPE.ACTIVO = 1"); - sb.append(" AND ESQ.ACTIVO = 1"); - sb.append(" AND COR.ACTIVO = 1"); - sb.append(" AND TPS.ACTIVO = 1"); - sb.append(" AND ROL.ACTIVO = 1"); - sb.append(" AND ORI.ACTIVO = 1"); - sb.append(" AND DES.ACTIVO = 1"); - sb.append(" AND COR.INDSTATUSCORRIDA = 'H' "); - sb.append(" ORDER BY"); - sb.append(" COR.FECHORSALIDA,"); - sb.append(" COR.CORRIDA_ID) "); - sb.append(" UNION select * from (SELECT "); - sb.append(" COR.CORRIDA_ID AS CORRIDAID, "); - sb.append(" COR.CORRIDA_ID AS NUMCORRIDA, "); - sb.append(" '' AS DESCSERVICO, "); - sb.append(" COR.FECHORSALIDA AS FECHORSALIDA, "); - sb.append(" COR.TIPOSERVICIO_ID AS TIPOSERVICIOID, "); - sb.append(" TPS.DESCSERVICIO AS DESCSERVICIO, "); - sb.append(" ROL.ROLOPERATIVO_ID AS ROLOPERATIVOID, "); - sb.append(" ROL.DESCROLOPERATIVO AS DESCROLOPERATIVO, "); - sb.append(" COR.RUTA_ID AS RUTA_ID, "); - sb.append(" COR.ORIGEN_ID AS ORIGEMID, "); - sb.append(" ORI.DESCPARADA AS DESCORIGEM, "); - sb.append(" COR.DESTINO_ID AS DESTINOID, "); - sb.append(" DES.DESCPARADA AS DESCDESTINO, "); - sb.append(" ORIEST.CVEESTADO AS ORICVEESTADO, "); - sb.append(" DESEST.CVEESTADO AS DESCVEESTADO, "); - sb.append(" COR.CLASESERVICIO_ID AS CLASESERVICIO_ID, "); - sb.append(" COR.MARCA_ID AS MARCA_ID, "); - sb.append(" to_char(COR.FECCORRIDA, 'dd/MM/YYYY') AS FECCORRIDA, "); - sb.append(" COR.EMPRESACORRIDA_ID AS EMPRESA_ID"); - sb.append(" FROM OPERADOR_EMBARCADA OPE "); - sb.append(" JOIN OPERADOR_EMBARCADA_LINHA OPL ON OPE.OPERADOR_EMBARCADA_ID = OPL.OPERADOR_EMBARCADA_ID "); - sb.append(" left join operador_embarcada_servico ops on ops.operador_embarcada_id = ope.operador_embarcada_id AND ops.operador_embarcada_servico_id is null"); - sb.append(" JOIN CORRIDA COR ON COR.ruta_ID = OPL.ruta_ID "); - sb.append(" LEFT JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = COR.ESQUEMACORRIDA_ID "); - sb.append(" JOIN TIPO_SERVICIO TPS ON COR.TIPOSERVICIO_ID = TPS.TIPOSERVICIO_ID "); - sb.append(" JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID "); - sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = COR.ORIGEN_ID "); - sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID "); - sb.append(" JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID "); - sb.append(" JOIN PARADA DES ON DES.PARADA_ID = COR.DESTINO_ID "); - sb.append(" JOIN CIUDAD DESCID ON DESCID.CIUDAD_ID = DES.CIUDAD_ID "); - sb.append(" JOIN ESTADO DESEST ON DESEST.ESTADO_ID = DESCID.ESTADO_ID "); - sb.append(" WHERE OPE.USUARIO_ID = :usuarioId"); - sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId"); - sb.append(" AND COR.FECCORRIDA >= :dtIni"); - sb.append(" AND COR.FECCORRIDA <= :dtFim"); - sb.append(" AND OPL.ACTIVO = 1 "); - sb.append(" AND OPE.ACTIVO = 1 "); - sb.append(" AND COR.ACTIVO = 1 "); - sb.append(" AND TPS.ACTIVO = 1 "); - sb.append(" AND ROL.ACTIVO = 1 "); - sb.append(" AND ORI.ACTIVO = 1 "); - sb.append(" AND DES.ACTIVO = 1 "); - sb.append(" AND TPS.TIPOSERVICIO_ID = 2 "); - sb.append(" AND COR.INDSTATUSCORRIDA = 'H' "); - sb.append(" ORDER BY "); - sb.append(" COR.FECHORSALIDA, "); - sb.append(" COR.CORRIDA_ID)"); - - Query query = getSession().createSQLQuery(sb.toString()).setResultTransformer(new ResultTransformer() { - private static final long serialVersionUID = -1157217114834593023L; - - private final int CORRIDAID = 0; - private final int NUMCORRIDA = 1; - private final int DESCSERVICO = 2; - private final int FECHORSALIDA = 3; - private final int TIPOSERVICIOID = 4; - private final int DESCSERVICIO = 5; - private final int ROLOPERATIVOID = 6; - private final int DESCROLOPERATIVO = 7; - private final int RUTA_ID = 8; - private final int ORIGEMID = 9; - private final int DESCORIGEM = 10; - private final int DESTINOID = 11; - private final int DESCDESTINO = 12; - private final int ORICVEESTADO = 13; - private final int DESCVEESTADO = 14; - private final int CLASESERVICIO_ID = 15; - private final int MARCA_ID = 16; - private final int FECCORRIDA = 17; - private final int EMPRESAID = 18; - - @Override - public List transformList(List list) { - return list; - } - - @Override - public Object transformTuple(Object[] tuple, String[] aliases) { - CorridaVO corrida = new CorridaVO(); - - corrida.setCorridaId(Integer.valueOf(tuple[CORRIDAID] == null ? null : tuple[CORRIDAID].toString())); - corrida.setNumCorrida(tuple[NUMCORRIDA] == null ? null : Integer.valueOf(tuple[NUMCORRIDA].toString())); - corrida.setDescServico(tuple[DESCSERVICO] == null ? null : tuple[DESCSERVICO].toString()); - corrida.setFechorsalida(tuple[FECHORSALIDA] == null ? null : tuple[FECHORSALIDA].toString()); - corrida.setTipoServicioVO(new TipoServicioVO(tuple[TIPOSERVICIOID] == null ? null : Integer.valueOf(tuple[TIPOSERVICIOID].toString()), tuple[DESCSERVICIO] == null ? null : tuple[DESCSERVICIO].toString())); - corrida.setRolOperativoVO(new RolOperativoVO(tuple[ROLOPERATIVOID] == null ? null : Integer.valueOf(tuple[ROLOPERATIVOID].toString()), tuple[DESCROLOPERATIVO] == null ? null : tuple[DESCROLOPERATIVO].toString())); - corrida.setRutaId(tuple[RUTA_ID] == null ? null : Integer.valueOf(tuple[RUTA_ID].toString())); - corrida.setOrigenId(tuple[ORIGEMID] == null ? null : Integer.valueOf(tuple[ORIGEMID].toString())); - corrida.setDescOrigen(tuple[DESCORIGEM] == null ? null : tuple[DESCORIGEM].toString()); - corrida.setDestinoId(tuple[DESTINOID] == null ? null : Integer.valueOf(tuple[DESTINOID].toString())); - corrida.setDescDestino(tuple[DESCDESTINO] == null ? null : tuple[DESCDESTINO].toString()); - corrida.setOricveestado(tuple[ORICVEESTADO] == null ? null : tuple[ORICVEESTADO].toString()); - corrida.setDescveestado(tuple[DESCVEESTADO] == null ? null : tuple[DESCVEESTADO].toString()); - corrida.setClaseServicioId(tuple[CLASESERVICIO_ID] == null ? null : Integer.valueOf(tuple[CLASESERVICIO_ID].toString())); - corrida.setMarcaId(tuple[MARCA_ID] == null ? null : Integer.valueOf(tuple[MARCA_ID].toString())); - corrida.setFeccorrida(tuple[FECCORRIDA] == null ? null : tuple[FECCORRIDA].toString()); - corrida.setEmpresaId(Integer.valueOf(tuple[EMPRESAID] == null ? null : tuple[EMPRESAID].toString())); - corrida.setLsTramoVO(new ArrayList()); - corrida.setLsSecuenciaVO(new ArrayList()); - - return corrida; - } - }); - - query.setInteger("usuarioId", operador); - query.setInteger("empresaId", empresa.getEmpresaId()); - query.setDate("dtIni", new java.sql.Date(dtIni.getTime())); - query.setDate("dtFim", new java.sql.Date(dtFim.getTime())); - - return query.list(); - } - - private List getCorridasResumido(Integer operador, Empresa empresa, Date dtIni, Date dtFim, Boolean retornaTramos) throws Exception { - StringBuilder sb = new StringBuilder(); - start = System.currentTimeMillis(); - - sb.append("select * from (SELECT"); - sb.append(" cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chaveCorrida, cor.ruta_id AS rutaId "); - sb.append(" FROM OPERADOR_EMBARCADA OPE "); - sb.append(" JOIN OPERADOR_EMBARCADA_SERVICO OPS ON OPE.OPERADOR_EMBARCADA_ID = OPS.OPERADOR_EMBARCADA_ID AND OPS.ACTIVO = 1 "); - sb.append(" JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = OPS.ESQUEMA_CORRIDA_ID AND ESQ.ACTIVO = 1 "); - sb.append(" JOIN CORRIDA COR ON COR.ESQUEMACORRIDA_ID = ESQ.ESQUEMACORRIDA_ID AND COR.ACTIVO = 1 AND COR.INDSTATUSCORRIDA = 'H' "); - sb.append(" WHERE OPE.USUARIO_ID = :usuarioId "); - sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId "); - sb.append(" AND COR.FECCORRIDA >= :dtIni "); - sb.append(" AND COR.FECCORRIDA <= :dtFim "); - sb.append(" AND OPE.ACTIVO = 1 "); - sb.append(" ORDER BY "); - sb.append(" COR.FECHORSALIDA, "); - sb.append(" COR.CORRIDA_ID) "); - sb.append(" UNION select * from (SELECT "); - sb.append(" cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chaveCorrida, cor.ruta_id AS rutaId "); - sb.append(" FROM OPERADOR_EMBARCADA OPE "); - sb.append(" JOIN OPERADOR_EMBARCADA_LINHA OPL ON OPE.OPERADOR_EMBARCADA_ID = OPL.OPERADOR_EMBARCADA_ID AND OPL.ACTIVO = 1 "); - sb.append(" left join operador_embarcada_servico ops on ops.operador_embarcada_id = ope.operador_embarcada_id AND ops.operador_embarcada_servico_id is null "); - sb.append(" JOIN CORRIDA COR ON COR.ruta_ID = OPL.ruta_ID AND COR.ACTIVO = 1 AND COR.INDSTATUSCORRIDA = 'H' "); - sb.append(" LEFT JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = COR.ESQUEMACORRIDA_ID "); - sb.append(" WHERE OPE.USUARIO_ID = :usuarioId "); - sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId "); - sb.append(" AND COR.FECCORRIDA >= :dtIni "); - sb.append(" AND COR.FECCORRIDA <= :dtFim "); - sb.append(" AND cor.tiposervicio_id = 2 "); - sb.append(" AND OPE.ACTIVO = 1 "); - sb.append(" ORDER BY "); - sb.append(" COR.FECHORSALIDA, "); - sb.append(" COR.CORRIDA_ID)"); - - Query query = getSession().createSQLQuery(sb.toString()) - .addScalar("chaveCorrida", StringType.INSTANCE) - .addScalar("rutaId", IntegerType.INSTANCE); - - query.setInteger("usuarioId", operador); - query.setInteger("empresaId", empresa.getEmpresaId()); - query.setDate("dtIni", new java.sql.Date(dtIni.getTime())); - query.setDate("dtFim", new java.sql.Date(dtFim.getTime())); - - List list = query.list(); - if( retornaTramos ) { - List corridas = new ArrayList(); - for (Object[] chave : list) { - CorridaVO co = new CorridaVO(); - co.setChaveCorrida((String)chave[0]); - co.setRutaId((Integer)chave[1] ); - - co.setListTramos( obterListaTramo((String)chave[0], (Integer)chave[1]) ); - corridas.add(co); - } - - log.debug( printInfo("getCorridasResumido", start)); - return corridas; - }else { - List corridasString = new ArrayList(); - for (Object[] chave : list) { - corridasString.add( (String)chave[0] ); - } - - log.debug( printInfo("getCorridasResumido", start)); - return corridasString; - } - } - - private List obterListaTramo( String chave, Integer rutaId ) throws Exception{ - start = System.currentTimeMillis(); - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT"); - sb.append(" TRM.TRAMO_ID "); - sb.append(" FROM RUTA_COMBINACION RC "); - sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = RC.TRAMO_ID AND TRM.activo = 1 "); - sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = :corridaId "); - sb.append(" AND CT.FECCORRIDA = TO_DATE(:feccorrida, 'DDmmYYYY') "); - sb.append(" AND CT.DESTINO_ID = TRM.DESTINO_ID "); - sb.append(" AND CT.activo = 1 "); - sb.append(" WHERE RC.RUTA_ID = :rutaId "); - sb.append(" AND RC.activo = 1 "); - sb.append(" ORDER BY CT.NUMSECUENCIA "); - - Query query = getSession().createSQLQuery(sb.toString()).addScalar("TRAMO_ID", IntegerType.INSTANCE); - - String[] split = chave.split(";"); - - query.setParameter("corridaId", split[0] ); - query.setParameter("feccorrida", split[1] ); - query.setParameter("rutaId", rutaId ); - - List list = query.list(); - log.debug( printInfo("obterListaTramo", start)); - return list; - - } - - private void preencherTramosSequencias(final CorridaVO corrida, PuntoVenta puntoVenta, Empresa empresa) { - boolean isTarifaMinimaHabilitado = Boolean.getBoolean(constanteDAO.buscarPorNomeConstante("isTarifaMinimaHabilitado").getValorconstante()); - CategoriaDescuento categoriaDescuento = categoriaDescuentoDAO.pesquisarPorCategoriaEmpresa(Constantes.CATEGORIA_NORMAL, corrida.getEmpresaId()); - - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT"); - sb.append(" TRM.TRAMO_ID AS tramoId, "); - sb.append(" TRM.DESCTRAMO AS desctramo, "); - sb.append(" TRM.ORIGEN_ID AS origemId,"); - sb.append(" ORI.DESCPARADA AS descOrigem,"); - sb.append(" ORICID.CIUDAD_ID AS cidadeOrigemId,"); - sb.append(" ORICID.NOMBCIUDAD AS nomeCidadeOrigem,"); - sb.append(" ORIEST.ESTADO_ID AS estadoOrigemId,"); - sb.append(" ORIEST.NOMBESTADO AS nomeEstadoOrigem,"); - sb.append(" ORIEST.CVEESTADO AS cveEstadoOrigem,"); - sb.append(" TRM.DESTINO_ID AS destinoId,"); - sb.append(" DES.DESCPARADA AS descDestino,"); - sb.append(" DESCID.CIUDAD_ID AS cidadeDestinoId,"); - sb.append(" DESCID.NOMBCIUDAD AS nomeCidadeDestino,"); - sb.append(" DESEST.ESTADO_ID AS estadoDestinoId,"); - sb.append(" DESEST.NOMBESTADO AS nomeEstadoDestino,"); - sb.append(" DESEST.CVEESTADO AS cveEstadoDestino,"); - sb.append(" TRM.VIA_ID AS viaId,"); - sb.append(" VIA.NOMBVIA AS nomeVia,"); - sb.append(" CRT.NUMSECUENCIA AS sequencia,"); - sb.append(" TA.IMPORTETAXAEMBARQUE AS importeTaxaEmbarque,"); - sb.append(" TA.IMPORTEPEDAGIO AS importePedagio,"); - sb.append(" TA.IMPORTEOUTROS AS importeOutros,"); - sb.append(" TA.IMPORTESEGURO AS importeSeguro,"); - sb.append(" TA.PRECIO AS precio,"); - sb.append(" TA.RUTA_ID as rutaId, "); - - /* - * não aplica tarifa minina quando configurado no tipo de passagem ou quando nao tem a constante - * Mantis #10704 & #20931 - */ - if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) { - sb.append(" ("); - sb.append(" select IMPORTETARIFA"); - sb.append(" from ("); - sb.append(" select"); - sb.append(" tmx.TARIFAMINIMA_ID as TARIFAMINIMA_ID,"); - sb.append(" tmx.ACTIVO as ACTIVO,"); - sb.append(" tmx.CLASESERVICIO_ID as CLASESERVICIO_ID,"); - sb.append(" tmx.COEFICIENTETARIFA_ID as COEFICIENTETARIFA_ID,"); - sb.append(" tmx.DESTINO_ID as DESTINO_ID,"); - sb.append(" tmx.FECMODIF as FECMODIF,"); - sb.append(" tmx.IMPORTETARIFA as IMPORTETARIFA,"); - sb.append(" tmx.MARCA_ID as MARCA_ID,"); - sb.append(" tmx.MONEDA_ID as MONEDA_ID,"); - sb.append(" tmx.ORGAOCONCEDENTE_ID as ORGAOCONCEDENTE_ID,"); - sb.append(" tmx.ORIGEN_ID as ORIGEN_ID,"); - sb.append(" tmx.PLAZA_ID as PLAZA_ID,"); - sb.append(" tmx.REGIONMETROPOLITANA_ID as REGIONMETROPOLITANA_ID,"); - sb.append(" tmx.RUTA_ID as RUTA_ID,"); - sb.append(" tmx.USUARIO_ID as USUARIO_ID,"); - sb.append(" tmx.VIGENCIATARIFA_ID as VIGENCIATARIFA_ID,"); - sb.append(" ocx.ORGAOCONCEDENTE_ID as orgaoConcedenteId,"); - sb.append(" paradaOrigem.PARADA_ID as paradaOrigemId,"); - sb.append(" paradaDestino.PARADA_ID as paradaDestinoId,"); - sb.append(" ruta.ruta_id as rutaId"); - sb.append(" from TARIFA_MINIMA tmx"); - sb.append(" join marca m on m.marca_id = tmx.marca_id "); - sb.append(" join empresa e on e.empresa_id = m.empresa_id "); - sb.append(" join PARADA paradaOrigem on paradaOrigem.activo = 1"); - sb.append(" join PARADA paradaDestino on paradaDestino.activo = 1"); - sb.append(" join RUTA ruta on ruta.activo = 1"); - sb.append(" left outer join ORGAO_CONCEDENTE ocx on tmx.ORGAOCONCEDENTE_ID=ocx.ORGAOCONCEDENTE_ID "); - sb.append(" left outer join TARIFA_MINIMA_CATEGORIA tmcx on tmx.TARIFAMINIMA_ID=tmcx.TARIFAMINIMA_ID and tmcx.ACTIVO = 1 "); - sb.append(" left outer join VIGENCIA_TARIFA vtx on tmx.VIGENCIATARIFA_ID=vtx.VIGENCIATARIFA_ID "); - sb.append(" left outer join REGION_METROPOLITANA rmx on tmx.REGIONMETROPOLITANA_ID=rmx.REGIONMETROPOLITANA_ID "); - sb.append(" left outer join PARADA prmox on rmx.REGIONMETROPOLITANA_ID=prmox.REGIONMETROPOLITANA_ID "); - sb.append(" left outer join PARADA prmdx on rmx.REGIONMETROPOLITANA_ID=prmdx.REGIONMETROPOLITANA_ID "); - sb.append(" where tmx.ACTIVO=1 "); - sb.append(" and (prmox.PARADA_ID in (paradaOrigem.PARADA_ID, -1) or prmox.PARADA_ID is null) "); - sb.append(" and (prmdx.PARADA_ID in (paradaDestino.PARADA_ID, -1) or prmdx.PARADA_ID is null) "); - sb.append(" and (tmx.ORIGEN_ID in (paradaOrigem.PARADA_ID, -1) or tmx.ORIGEN_ID is null) "); - sb.append(" and (tmx.DESTINO_ID in (paradaDestino.PARADA_ID, -1) or tmx.DESTINO_ID is null) "); - sb.append(" and (tmx.PLAZA_ID in (:plazaId, -1)) "); - sb.append(" and (tmx.CLASESERVICIO_ID in (:claseservicioId, -1)) "); - sb.append(" and (e.EMPRESA_ID in (:empresaId, -1)) "); - sb.append(" and (tmcx.TARIFAMINIMACATEGORIA_ID is null or tmcx.CATEGORIA_ID in (:categoriaId, -1)) "); - sb.append(" and tmx.MONEDA_ID=:moneda"); - sb.append(" and (ocx.ORGAOCONCEDENTE_ID is null or ocx.ORGAOCONCEDENTE_ID=-1 or ocx.ORGAOCONCEDENTE_ID=("); - sb.append(" select distinct rx.ORGAOCONCEDENTE_ID"); - sb.append(" from RUTA rx "); - sb.append(" left outer join RUTA_COMBINACION rcx on rx.RUTA_ID=rcx.RUTA_ID "); - sb.append(" left outer join TRAMO tx on rcx.TRAMO_ID=tx.TRAMO_ID "); - sb.append(" left outer join ORGAO_TRAMO otx on tx.TRAMO_ID=otx.TRAMO_ID "); - sb.append(" where"); - sb.append(" rcx.RUTA_ID=ruta.RUTA_ID"); - sb.append(" and ("); - sb.append(" (tmx.COEFICIENTETARIFA_ID in (otx.COEFICIENTETARIFA1_ID,otx.COEFICIENTETARIFA2_ID,otx.COEFICIENTETARIFA3_ID))"); - sb.append(" and tx.ORIGEN_ID=paradaOrigem.parada_id "); - sb.append(" and tx.DESTINO_ID=paradaDestino.parada_id"); - sb.append(" or tmx.COEFICIENTETARIFA_ID is null"); - sb.append(" )"); - sb.append(" )"); - sb.append(" )"); - sb.append(" and (SYSDATE between vtx.FECINICIOVIGENCIA and vtx.FECFINVIGENCIA)"); - sb.append(" order by"); - sb.append(" tmx.PLAZA_ID desc,"); - sb.append(" tmx.ORIGEN_ID desc,"); - sb.append(" tmx.DESTINO_ID desc,"); - sb.append(" tmx.CLASESERVICIO_ID desc,"); - sb.append(" tmx.MARCA_ID desc"); - sb.append(" )"); - sb.append(" where"); - sb.append(" paradaOrigemId = TRM.ORIGEN_ID"); - sb.append(" and paradaDestinoId = TRM.DESTINO_ID"); - sb.append(" and rutaId = TA.RUTA_ID"); - sb.append(" and rownum = 1"); - sb.append(" ) as tarifaMinima "); - }else { - sb.append(" 0 as tarifaMinima "); - } - - sb.append(" FROM RUTA_COMBINACION RC"); - sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = RC.TRAMO_ID"); - sb.append(" JOIN CORRIDA_TRAMO CRT ON CRT.DESTINO_ID = TRM.DESTINO_ID AND CRT.CORRIDA_ID = :corridaId AND CRT.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS')"); - sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = TRM.ORIGEN_ID"); - sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID"); - sb.append(" JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID"); - sb.append(" JOIN PARADA DES ON DES.PARADA_ID = TRM.DESTINO_ID"); - sb.append(" JOIN CIUDAD DESCID ON DESCID.CIUDAD_ID = DES.CIUDAD_ID"); - sb.append(" JOIN ESTADO DESEST ON DESEST.ESTADO_ID = DESCID.ESTADO_ID"); - sb.append(" JOIN VIA VIA ON VIA.VIA_ID = TRM.VIA_ID"); - sb.append(" JOIN empresa emp ON emp.empresa_id = :empresaId "); - sb.append(" JOIN marca mar on mar.empresa_id = emp.empresa_id "); - if (empresa.getIndTabelaPrecoEmbarcada() != null && empresa.getIndTabelaPrecoEmbarcada()) { - sb.append(" JOIN TARIFA_EMBARCADA TA ON TA.MARCA_ID = mar.marca_Id AND TA.TRAMO_ID = TRM.TRAMO_ID AND TA.RUTA_ID = RC.RUTA_ID"); - } else { - sb.append(" JOIN TARIFA TA ON TA.MARCA_ID = mar.marca_Id AND TA.TRAMO_ID = TRM.TRAMO_ID AND TA.RUTA_ID = RC.RUTA_ID"); - } - sb.append(" JOIN VIGENCIA_TARIFA VT ON VT.VIGENCIATARIFA_ID = TA.VIGENCIATARIFA_ID"); - sb.append(" WHERE "); - sb.append(" RC.ACTIVO = 1"); - sb.append(" AND TRM.ACTIVO = 1"); - sb.append(" AND CRT.ACTIVO = 1"); - sb.append(" AND VIA.ACTIVO = 1"); - sb.append(" AND TA.ACTIVO = 1"); - sb.append(" AND VT.ACTIVO = 1"); - sb.append(" AND mar.ACTIVO = 1"); - sb.append(" AND coalesce(RC.INDVENTA,0) = 1"); - sb.append(" AND RC.RUTA_ID = :rutaId "); - sb.append(" AND TRM.ORIGEN_ID IN (SELECT X.ORIGEN_ID FROM CORRIDA_TRAMO X WHERE X.CORRIDA_ID = :corridaId AND X.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS'))"); - sb.append(" AND TRM.DESTINO_ID IN (SELECT X.DESTINO_ID FROM CORRIDA_TRAMO X WHERE X.CORRIDA_ID = :corridaId AND X.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS'))"); - sb.append(" AND (SYSDATE BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA AND VT.ACTIVO = 1)"); - - Query query = getSession().createSQLQuery(sb.toString()) - .addScalar("tramoId", IntegerType.INSTANCE) - .addScalar("desctramo", StringType.INSTANCE) - .addScalar("origemId", IntegerType.INSTANCE) - .addScalar("descOrigem", StringType.INSTANCE) - .addScalar("cidadeOrigemId", IntegerType.INSTANCE) - .addScalar("nomeCidadeOrigem", StringType.INSTANCE) - .addScalar("estadoOrigemId", IntegerType.INSTANCE) - .addScalar("nomeEstadoOrigem", StringType.INSTANCE) - .addScalar("cveEstadoOrigem", StringType.INSTANCE) - .addScalar("destinoId", IntegerType.INSTANCE) - .addScalar("descDestino", StringType.INSTANCE) - .addScalar("cidadeDestinoId", IntegerType.INSTANCE) - .addScalar("nomeCidadeDestino", StringType.INSTANCE) - .addScalar("estadoDestinoId", IntegerType.INSTANCE) - .addScalar("nomeEstadoDestino", StringType.INSTANCE) - .addScalar("cveEstadoDestino", StringType.INSTANCE) - .addScalar("viaId", IntegerType.INSTANCE) - .addScalar("nomeVia", StringType.INSTANCE) - .addScalar("sequencia", IntegerType.INSTANCE) - .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) - .addScalar("importePedagio", BigDecimalType.INSTANCE) - .addScalar("importeOutros", BigDecimalType.INSTANCE) - .addScalar("importeSeguro", BigDecimalType.INSTANCE) - .addScalar("precio", BigDecimalType.INSTANCE) - .addScalar("tarifaMinima", BigDecimalType.INSTANCE) - .setResultTransformer(Transformers.aliasToBean(TramoSequenciaVO.class)); - - query.setParameter("empresaId", corrida.getEmpresaId()); - query.setParameter("rutaId", corrida.getRutaId()); - query.setParameter("corridaId", corrida.getCorridaId()); - query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00"); - - if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) { - query.setParameter("plazaId", puntoVenta.getColonia().getCiudad().getPlaza().getPlazaId()); - query.setParameter("claseservicioId", corrida.getClaseServicioId()); - query.setParameter("categoriaId", Constantes.CATEGORIA_NORMAL); - query.setParameter("moneda", puntoVenta.getMoneda().getMonedaId()); - } - - List tramosequencia = query.list(); - - HashSet setTramo = new HashSet(); - - List aliasLs = aliasServicoService.buscarPorRuta(corrida.getRutaId()); - - for (TramoSequenciaVO ts : tramosequencia) { - final ParadaVO origem = new ParadaVO( - ts.getOrigemId(), - ts.getDescOrigem(), - ts.getCidadeOrigemId(), - ts.getNomeCidadeOrigem(), - ts.getEstadoOrigemId(), - ts.getNomeEstadoOrigem(), - ts.getCveEstadoOrigem()); - - final ParadaVO destino = new ParadaVO( - ts.getDestinoId(), - ts.getDescDestino(), - ts.getCidadeDestinoId(), - ts.getNomeCidadeDestino(), - ts.getEstadoDestinoId(), - ts.getNomeEstadoDestino(), - ts.getCveEstadoDestino()); - - ViaVO via = new ViaVO( - ts.getViaId(), - ts.getNomeVia()); - - BigDecimal tarifaMinima = ts.getTarifaMinima(); - - TramoVO tramo = new TramoVO( - ts.getTramoId(), - ts.getDesctramo(), - origem, - destino, - via, - ts.getSequencia(), - ts.getPrecio().compareTo(tarifaMinima) < 0 ? tarifaMinima : ts.getPrecio(), - ts.getImporteTaxaEmbarque()!=null?ts.getImporteTaxaEmbarque():BigDecimal.ZERO, - ts.getImporteSeguro()!=null?ts.getImporteSeguro():BigDecimal.ZERO, - ts.getImportePedagio()!=null?ts.getImportePedagio():BigDecimal.ZERO, - ts.getImporteOutros()!=null?ts.getImporteOutros():BigDecimal.ZERO); - - AliasServico aC = null; - try { - aC = (AliasServico) CollectionUtils.find(aliasLs, new Predicate() { - - @Override - public boolean evaluate(Object arg0) { - AliasServico alias = (AliasServico)arg0; - - return alias.getCorridaId() != null && alias.getCorridaId().equals(corrida.getCorridaId()) - && alias.getOrigen().getParadaId().equals(origem.getParadaId()) - && alias.getDestino().getParadaId().equals(destino.getParadaId()); - } - }); - - if(aC == null) { - aC = (AliasServico) CollectionUtils.find(aliasLs, new Predicate() { - - @Override - public boolean evaluate(Object arg0) { - AliasServico alias = (AliasServico)arg0; - - return alias.getOrigen().getParadaId().equals(origem.getParadaId()) - && alias.getDestino().getParadaId().equals(destino.getParadaId()) - && alias.getCorridaId() == null; - } - }); - } - }catch(Throwable th) { - log.error("erro ao carrgar o alias",th); - } - - if (aC != null) { - tramo.setAliasdestinoId(aC.getAliasDestino().getParadaId()); - tramo.setAliasorigenId(aC.getAliasOrigen().getParadaId()); - tramo.setDescAliasdestino(aC.getAliasDestino().getDescparada()); - tramo.setDescAliasorigen(aC.getAliasOrigen().getDescparada()); - } - setTramo.add(tramo); - } - - List lsTramo = new ArrayList(setTramo); - corrida.setLsTramoVO(lsTramo); - } - - public BigDecimal obtenerTarifaMinima(Integer claseServicioId, Integer marcaId, Integer origenConsultaId, - Integer destinoConsultaId, PuntoVenta miPuntoVenta, Integer rutaId, Integer categoriaId, Boolean indnaoaplicatarifaminima) { - BigDecimal tarifaMinima = BigDecimal.ZERO; - - /* - * não aplica tarifa minina quando configurado no tipo de passagem - * Mantis #10704 - */ - if(indnaoaplicatarifaminima != null && indnaoaplicatarifaminima) { - return tarifaMinima; - } - - //PuntoVenta miPuntoVenta = PuntoVentaDao.getInstance().findById(puntoVentaId); - - StringBuilder hql = new StringBuilder("select tm from TarifaMinima tm ") - .append("left join tm.orgaoConcedente oc ") - .append("left join tm.tarifaMinimaCategorias tmc ") - .append("left join tm.vigenciaTarifa vige ") - .append("left join tm.regionMetropolitana.paradaList ori ") - .append("left join tm.regionMetropolitana.paradaList des ") - .append("where tm.activo = 1 ").append("and tm.plaza.plazaId in (:plazaId, -1) ") - .append("and tm.claseServicio.claseservicioId in (:claseServId, -1) ") - .append("and tm.marca.marcaId in (:marcaId, -1) ") - .append("and (ori.paradaId in (:origenId, -1) or ori.paradaId is null ) ") - .append("and (des.paradaId in (:destinoId,-1) or des.paradaId is null ) ") - .append("and (tm.origem.paradaId in (:origenId, -1) or tm.origem.paradaId is null) ") - .append("and (tm.destino.paradaId in (:destinoId, -1) or tm.destino.paradaId is null) "); - - if (categoriaId != null) { - hql.append("and (tmc is null or tmc.categoria.categoriaId in (:categoriaId, -1)) "); - } - - hql.append("and tm.moneda.monedaId = :monedaId ") - .append("and (oc is null or oc.orgaoConcedenteId = -1 or oc.orgaoConcedenteId = ") - .append("(select distinct r.orgaoConcedente.orgaoConcedenteId from Ruta r") - .append(" left join r.rutaCombinacionList rc") - .append(" left join rc.tramo tr") - .append(" left join tr.lsOrgaoTramo ot") - .append(" where rc.ruta.rutaId = :rutaId") - .append(" and (tm.coeficienteTarifa.coeficienteId in ") - .append(" (ot.coeficienteTarifa1.coeficienteId, ot.coeficienteTarifa2.coeficienteId, ot.coeficienteTarifa3.coeficienteId ) ") - .append(" and tr.origem.paradaId = :origenId ") - .append(" and tr.destino.paradaId = :destinoId ") - .append(" or tm.coeficienteTarifa is null ) )) ") - .append(" and " + DBUtil.getInstance().dbSysdate() + " between vige.feciniciovigencia and vige.fecfinvigencia ") - - .append("order by tm.plaza.plazaId desc, tm.origem.paradaId desc, ") - .append("tm.destino.paradaId desc, tm.claseServicio.claseservicioId desc, ") - .append("tm.marca.marcaId desc"); - - Query miQry = getSession().createQuery(hql.toString()); - miQry.setInteger("plazaId", miPuntoVenta.getColonia().getCiudad().getPlaza().getPlazaId()); - miQry.setInteger("claseServId", claseServicioId); - miQry.setInteger("marcaId", marcaId); - miQry.setInteger("origenId", origenConsultaId); - miQry.setInteger("destinoId", destinoConsultaId); - miQry.setInteger("monedaId", miPuntoVenta.getMoneda().getMonedaId()); - miQry.setInteger("rutaId", rutaId); - - if (categoriaId != null) { - miQry.setInteger("categoriaId", categoriaId); - } - - List listTarifaMinima = miQry.list(); - if (!listTarifaMinima.isEmpty()) { - tarifaMinima = listTarifaMinima.get(0).getImportetarifa(); - } - - return tarifaMinima; - } - - private void preencherSequencias(CorridaVO corrida) { - final int NUMSECUENCIA = 0; - final int ORIGEN_ID = 1; - final int ORIGENCVEPARADA = 2; - final int ORIGENDESCPARADA = 3; - final int ORIGENCIUDAD_ID = 4; - final int ORIGENNOMBCIUDAD = 5; - final int ORIGENESTADO_ID = 6; - final int ORIGENNOMBESTADO = 7; - final int ORIGENCVEESTADO = 8; - final int DESTINO_ID = 9; - final int DESTINOCVEPARADA = 10; - final int DESTINODESCPARADA = 11; - final int DESTINOCIUDAD_ID = 12; - final int DESTINONOMBCIUDAD = 13; - final int DESTINOESTADO_ID = 14; - final int DESTINONOMBESTADO = 15; - final int DESTINOCVEESTADO = 16; - - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT"); - sb.append(" CT.NUMSECUENCIA,"); - sb.append(" CT.ORIGEN_ID , PO.CVEPARADA as PO_CVEPARADA, PO.DESCPARADA as PO_DESCPARADA, CO.CIUDAD_ID as CO_CIUDAD_ID, CO.NOMBCIUDAD as CO_NOMBCIUDAD, EO.ESTADO_ID as EO_ESTADO_ID, EO.NOMBESTADO as EO_NOMBESTADO, EO.CVEESTADO as EO_CVEESTADO,"); - sb.append(" CT.DESTINO_ID, PD.CVEPARADA as PD_CVEPARADA, PD.DESCPARADA as PD_DESCPARADA, CD.CIUDAD_ID as CD_CIUDAD_ID, CD.NOMBCIUDAD as CD_NOMBCIUDAD, ED.ESTADO_ID as ED_ESTADO_ID, ED.NOMBESTADO as ED_NOMBESTADO, ED.CVEESTADO as ED_CVEESTADO"); - sb.append(" FROM CORRIDA C"); - sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA"); - sb.append(" JOIN PARADA PO ON PO.PARADA_ID = CT.ORIGEN_ID"); - sb.append(" JOIN CIUDAD CO ON CO.CIUDAD_ID = PO.CIUDAD_ID"); - sb.append(" JOIN ESTADO EO ON EO.ESTADO_ID = CO.ESTADO_ID"); - sb.append(" JOIN PARADA PD ON PD.PARADA_ID = CT.DESTINO_ID"); - sb.append(" JOIN CIUDAD CD ON CD.CIUDAD_ID = PD.CIUDAD_ID"); - sb.append(" JOIN ESTADO ED ON ED.ESTADO_ID = CD.ESTADO_ID"); - sb.append(" WHERE C.CORRIDA_ID = :corridaId AND C.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS') and CT.activo = 1 "); - sb.append(" ORDER BY CT.NUMSECUENCIA"); - - Query query = getSession().createSQLQuery(sb.toString()); - - query.setParameter("corridaId", corrida.getCorridaId()); - query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00"); - - List lsSecuenciaVO = new ArrayList(); - List controle = new ArrayList(0); - - List list = query.list(); - - for (Object[] item : list) { - final Integer origensecuencia = Integer.valueOf(item[NUMSECUENCIA].toString()); - final Integer origen_id = Integer.valueOf(item[ORIGEN_ID].toString()); - item[ORIGENCVEPARADA].toString(); - final String origendescparada = item[ORIGENDESCPARADA].toString(); - final Integer origenciudad_id = Integer.valueOf(item[ORIGENCIUDAD_ID].toString()); - final String origennombciudad = item[ORIGENNOMBCIUDAD].toString(); - final Integer origenestado_id = Integer.valueOf(item[ORIGENESTADO_ID].toString()); - final String origennombestado = item[ORIGENNOMBESTADO].toString(); - final String origencveestado = item[ORIGENCVEESTADO].toString(); - - final Integer destinosecuencia = Integer.valueOf(item[NUMSECUENCIA].toString()) + 1; - final Integer destino_id = Integer.valueOf(item[DESTINO_ID].toString()); - item[DESTINOCVEPARADA].toString(); - final String destinodescparada = item[DESTINODESCPARADA].toString(); - final Integer destinociudad_id = Integer.valueOf(item[DESTINOCIUDAD_ID].toString()); - final String destinonombciudad = item[DESTINONOMBCIUDAD].toString(); - final Integer destinoestado_id = Integer.valueOf(item[DESTINOESTADO_ID].toString()); - final String destinonombestado = item[DESTINONOMBESTADO].toString(); - final String destinocveestado = item[DESTINOCVEESTADO].toString(); - - adicionarSequencia( - controle, - lsSecuenciaVO, - origensecuencia, - origen_id, - origendescparada, - origenciudad_id, - origennombciudad, - origenestado_id, - origennombestado, - origencveestado); - - adicionarSequencia( - controle, - lsSecuenciaVO, - destinosecuencia, - destino_id, - destinodescparada, - destinociudad_id, - destinonombciudad, - destinoestado_id, - destinonombestado, - destinocveestado); - } - - corrida.setLsSecuenciaVO(lsSecuenciaVO); - } - - private void adicionarSequencia(List controle, List lsSecuenciaVO, final Integer numsecuencia, final Integer paradaId, final String descParada, final Integer ciudadId, final String nombCiudad, final Integer estadoId, final String nombEstado, final String cveEstado) { - final String key = numsecuencia.toString() + "|" + paradaId.toString(); - - if (!controle.contains(key)) { - SecuenciaVO sequencia = new SecuenciaVO( - numsecuencia, - new ParadaVO(paradaId, descParada, ciudadId, nombCiudad, estadoId, nombEstado, cveEstado)); - - lsSecuenciaVO.add(sequencia); - - controle.add(key); - } - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.Predicate; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.transform.ResultTransformer; +import org.hibernate.transform.Transformers; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.dao.CategoriaDescuentoDAO; +import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaServicoDAO; +import com.rjconsultores.ventaboletos.dao.util.DBUtil; +import com.rjconsultores.ventaboletos.entidad.AliasServico; +import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.TarifaMinima; +import com.rjconsultores.ventaboletos.service.AliasServicoService; +import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; +import com.rjconsultores.ventaboletos.vo.corrida.TramoSequenciaVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVO; +import com.rjconsultores.ventaboletos.vo.roloperativo.RolOperativoVO; +import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; +import com.rjconsultores.ventaboletos.vo.tiposervicio.TipoServicioVO; +import com.rjconsultores.ventaboletos.vo.tramo.TramoVO; +import com.rjconsultores.ventaboletos.vo.via.ViaVO; + +@Repository("operadorEmbarcadaServicoDAO") +@SuppressWarnings({"unchecked", "rawtypes"}) +public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaServicoDAO { + + private static final Logger log = LogManager.getLogger(OperadorEmbarcadaServicoHibernateDAO.class); + + @Autowired + private CategoriaDescuentoDAO categoriaDescuentoDAO; + + @Autowired + private ConstanteHibernateDAO constanteDAO; + + @Autowired + private AliasServicoService aliasServicoService; + + + @Autowired + public OperadorEmbarcadaServicoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarPorOperador(OperadorEmbarcada operador) { + StringBuilder sb = new StringBuilder(); + sb.append(" from OperadorEmbarcadaServico oes "); + sb.append(" where oes.operadorEmbarcada.operadorEmbarcadaId = :operadorEmbarcadaId "); + sb.append(" and oes.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setLong("operadorEmbarcadaId", operador.getOperadorEmbarcadaId()); + return query.list(); + } + + @Override + public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta) { + List corridas = getCorridas(operador, empresa, dtIni, dtFim); + + for (CorridaVO corrida : corridas) { + preencherTramosSequencias(corrida, puntoVenta, empresa); + preencherSequencias(corrida); + } + + return corridas; + } + + @Override + public List getListaResumidaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta, Boolean retornaTramos ) throws Exception { + return getCorridasResumido(operador, empresa, dtIni, dtFim, retornaTramos); + } + + @Override + public List getListaCorridaProxyVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim) { + return getCorridas(operador, empresa, dtIni, dtFim); + } + + @Override + public void preencherCorrida(CorridaVO corrida, PuntoVenta puntoVenta, Empresa empresa) { + preencherTramosSequencias(corrida, puntoVenta, empresa); + preencherSequencias(corrida); + } + + private List getCorridas(Integer operador, Empresa empresa, Date dtIni, Date dtFim) { + StringBuilder sb = new StringBuilder(); + + sb.append("select * from (SELECT"); + sb.append(" COR.CORRIDA_ID AS CORRIDAID,"); + sb.append(" ESQ.NUMCORRIDA AS NUMCORRIDA,"); + sb.append(" '' AS DESCSERVICO,"); + sb.append(" COR.FECHORSALIDA AS FECHORSALIDA,"); + sb.append(" COR.TIPOSERVICIO_ID AS TIPOSERVICIOID,"); + sb.append(" TPS.DESCSERVICIO AS DESCSERVICIO,"); + sb.append(" ROL.ROLOPERATIVO_ID AS ROLOPERATIVOID,"); + sb.append(" ROL.DESCROLOPERATIVO AS DESCROLOPERATIVO,"); + sb.append(" COR.RUTA_ID AS RUTA_ID,"); + sb.append(" COR.ORIGEN_ID AS ORIGEMID,"); + sb.append(" ORI.DESCPARADA AS DESCORIGEM,"); + sb.append(" COR.DESTINO_ID AS DESTINOID,"); + sb.append(" DES.DESCPARADA AS DESCDESTINO,"); + sb.append(" ORIEST.CVEESTADO AS ORICVEESTADO,"); + sb.append(" DESEST.CVEESTADO AS DESCVEESTADO,"); + sb.append(" COR.CLASESERVICIO_ID AS CLASESERVICIO_ID,"); + sb.append(" COR.MARCA_ID AS MARCA_ID,"); + sb.append(" to_char(COR.FECCORRIDA, 'dd/MM/YYYY') AS FECCORRIDA,"); + sb.append(" COR.EMPRESACORRIDA_ID AS EMPRESA_ID"); + sb.append(" FROM OPERADOR_EMBARCADA OPE"); + sb.append(" JOIN OPERADOR_EMBARCADA_SERVICO OPS ON OPE.OPERADOR_EMBARCADA_ID = OPS.OPERADOR_EMBARCADA_ID"); + sb.append(" JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = OPS.ESQUEMA_CORRIDA_ID"); + sb.append(" JOIN CORRIDA COR ON COR.ESQUEMACORRIDA_ID = ESQ.ESQUEMACORRIDA_ID"); + sb.append(" JOIN TIPO_SERVICIO TPS ON COR.TIPOSERVICIO_ID = TPS.TIPOSERVICIO_ID"); + sb.append(" JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID"); + sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = COR.ORIGEN_ID"); + sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID"); + sb.append(" JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID"); + sb.append(" JOIN PARADA DES ON DES.PARADA_ID = COR.DESTINO_ID"); + sb.append(" JOIN CIUDAD DESCID ON DESCID.CIUDAD_ID = DES.CIUDAD_ID"); + sb.append(" JOIN ESTADO DESEST ON DESEST.ESTADO_ID = DESCID.ESTADO_ID"); + sb.append(" WHERE OPE.USUARIO_ID = :usuarioId"); + sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId"); + sb.append(" AND COR.FECCORRIDA >= :dtIni"); + sb.append(" AND COR.FECCORRIDA <= :dtFim"); + sb.append(" AND OPS.ACTIVO = 1"); + sb.append(" AND OPE.ACTIVO = 1"); + sb.append(" AND ESQ.ACTIVO = 1"); + sb.append(" AND COR.ACTIVO = 1"); + sb.append(" AND TPS.ACTIVO = 1"); + sb.append(" AND ROL.ACTIVO = 1"); + sb.append(" AND ORI.ACTIVO = 1"); + sb.append(" AND DES.ACTIVO = 1"); + sb.append(" AND COR.INDSTATUSCORRIDA = 'H' "); + sb.append(" ORDER BY"); + sb.append(" COR.FECHORSALIDA,"); + sb.append(" COR.CORRIDA_ID) "); + sb.append(" UNION select * from (SELECT "); + sb.append(" COR.CORRIDA_ID AS CORRIDAID, "); + sb.append(" COR.CORRIDA_ID AS NUMCORRIDA, "); + sb.append(" '' AS DESCSERVICO, "); + sb.append(" COR.FECHORSALIDA AS FECHORSALIDA, "); + sb.append(" COR.TIPOSERVICIO_ID AS TIPOSERVICIOID, "); + sb.append(" TPS.DESCSERVICIO AS DESCSERVICIO, "); + sb.append(" ROL.ROLOPERATIVO_ID AS ROLOPERATIVOID, "); + sb.append(" ROL.DESCROLOPERATIVO AS DESCROLOPERATIVO, "); + sb.append(" COR.RUTA_ID AS RUTA_ID, "); + sb.append(" COR.ORIGEN_ID AS ORIGEMID, "); + sb.append(" ORI.DESCPARADA AS DESCORIGEM, "); + sb.append(" COR.DESTINO_ID AS DESTINOID, "); + sb.append(" DES.DESCPARADA AS DESCDESTINO, "); + sb.append(" ORIEST.CVEESTADO AS ORICVEESTADO, "); + sb.append(" DESEST.CVEESTADO AS DESCVEESTADO, "); + sb.append(" COR.CLASESERVICIO_ID AS CLASESERVICIO_ID, "); + sb.append(" COR.MARCA_ID AS MARCA_ID, "); + sb.append(" to_char(COR.FECCORRIDA, 'dd/MM/YYYY') AS FECCORRIDA, "); + sb.append(" COR.EMPRESACORRIDA_ID AS EMPRESA_ID"); + sb.append(" FROM OPERADOR_EMBARCADA OPE "); + sb.append(" JOIN OPERADOR_EMBARCADA_LINHA OPL ON OPE.OPERADOR_EMBARCADA_ID = OPL.OPERADOR_EMBARCADA_ID "); + sb.append(" left join operador_embarcada_servico ops on ops.operador_embarcada_id = ope.operador_embarcada_id AND ops.operador_embarcada_servico_id is null"); + sb.append(" JOIN CORRIDA COR ON COR.ruta_ID = OPL.ruta_ID "); + sb.append(" LEFT JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = COR.ESQUEMACORRIDA_ID "); + sb.append(" JOIN TIPO_SERVICIO TPS ON COR.TIPOSERVICIO_ID = TPS.TIPOSERVICIO_ID "); + sb.append(" JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID "); + sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = COR.ORIGEN_ID "); + sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID "); + sb.append(" JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID "); + sb.append(" JOIN PARADA DES ON DES.PARADA_ID = COR.DESTINO_ID "); + sb.append(" JOIN CIUDAD DESCID ON DESCID.CIUDAD_ID = DES.CIUDAD_ID "); + sb.append(" JOIN ESTADO DESEST ON DESEST.ESTADO_ID = DESCID.ESTADO_ID "); + sb.append(" WHERE OPE.USUARIO_ID = :usuarioId"); + sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId"); + sb.append(" AND COR.FECCORRIDA >= :dtIni"); + sb.append(" AND COR.FECCORRIDA <= :dtFim"); + sb.append(" AND OPL.ACTIVO = 1 "); + sb.append(" AND OPE.ACTIVO = 1 "); + sb.append(" AND COR.ACTIVO = 1 "); + sb.append(" AND TPS.ACTIVO = 1 "); + sb.append(" AND ROL.ACTIVO = 1 "); + sb.append(" AND ORI.ACTIVO = 1 "); + sb.append(" AND DES.ACTIVO = 1 "); + sb.append(" AND TPS.TIPOSERVICIO_ID = 2 "); + sb.append(" AND COR.INDSTATUSCORRIDA = 'H' "); + sb.append(" ORDER BY "); + sb.append(" COR.FECHORSALIDA, "); + sb.append(" COR.CORRIDA_ID)"); + + Query query = getSession().createSQLQuery(sb.toString()).setResultTransformer(new ResultTransformer() { + private static final long serialVersionUID = -1157217114834593023L; + + private final int CORRIDAID = 0; + private final int NUMCORRIDA = 1; + private final int DESCSERVICO = 2; + private final int FECHORSALIDA = 3; + private final int TIPOSERVICIOID = 4; + private final int DESCSERVICIO = 5; + private final int ROLOPERATIVOID = 6; + private final int DESCROLOPERATIVO = 7; + private final int RUTA_ID = 8; + private final int ORIGEMID = 9; + private final int DESCORIGEM = 10; + private final int DESTINOID = 11; + private final int DESCDESTINO = 12; + private final int ORICVEESTADO = 13; + private final int DESCVEESTADO = 14; + private final int CLASESERVICIO_ID = 15; + private final int MARCA_ID = 16; + private final int FECCORRIDA = 17; + private final int EMPRESAID = 18; + + @Override + public List transformList(List list) { + return list; + } + + @Override + public Object transformTuple(Object[] tuple, String[] aliases) { + CorridaVO corrida = new CorridaVO(); + + corrida.setCorridaId(Integer.valueOf(tuple[CORRIDAID] == null ? null : tuple[CORRIDAID].toString())); + corrida.setNumCorrida(tuple[NUMCORRIDA] == null ? null : Integer.valueOf(tuple[NUMCORRIDA].toString())); + corrida.setDescServico(tuple[DESCSERVICO] == null ? null : tuple[DESCSERVICO].toString()); + corrida.setFechorsalida(tuple[FECHORSALIDA] == null ? null : tuple[FECHORSALIDA].toString()); + corrida.setTipoServicioVO(new TipoServicioVO(tuple[TIPOSERVICIOID] == null ? null : Integer.valueOf(tuple[TIPOSERVICIOID].toString()), tuple[DESCSERVICIO] == null ? null : tuple[DESCSERVICIO].toString())); + corrida.setRolOperativoVO(new RolOperativoVO(tuple[ROLOPERATIVOID] == null ? null : Integer.valueOf(tuple[ROLOPERATIVOID].toString()), tuple[DESCROLOPERATIVO] == null ? null : tuple[DESCROLOPERATIVO].toString())); + corrida.setRutaId(tuple[RUTA_ID] == null ? null : Integer.valueOf(tuple[RUTA_ID].toString())); + corrida.setOrigenId(tuple[ORIGEMID] == null ? null : Integer.valueOf(tuple[ORIGEMID].toString())); + corrida.setDescOrigen(tuple[DESCORIGEM] == null ? null : tuple[DESCORIGEM].toString()); + corrida.setDestinoId(tuple[DESTINOID] == null ? null : Integer.valueOf(tuple[DESTINOID].toString())); + corrida.setDescDestino(tuple[DESCDESTINO] == null ? null : tuple[DESCDESTINO].toString()); + corrida.setOricveestado(tuple[ORICVEESTADO] == null ? null : tuple[ORICVEESTADO].toString()); + corrida.setDescveestado(tuple[DESCVEESTADO] == null ? null : tuple[DESCVEESTADO].toString()); + corrida.setClaseServicioId(tuple[CLASESERVICIO_ID] == null ? null : Integer.valueOf(tuple[CLASESERVICIO_ID].toString())); + corrida.setMarcaId(tuple[MARCA_ID] == null ? null : Integer.valueOf(tuple[MARCA_ID].toString())); + corrida.setFeccorrida(tuple[FECCORRIDA] == null ? null : tuple[FECCORRIDA].toString()); + corrida.setEmpresaId(Integer.valueOf(tuple[EMPRESAID] == null ? null : tuple[EMPRESAID].toString())); + corrida.setLsTramoVO(new ArrayList()); + corrida.setLsSecuenciaVO(new ArrayList()); + + return corrida; + } + }); + + query.setInteger("usuarioId", operador); + query.setInteger("empresaId", empresa.getEmpresaId()); + query.setDate("dtIni", new java.sql.Date(dtIni.getTime())); + query.setDate("dtFim", new java.sql.Date(dtFim.getTime())); + + return query.list(); + } + + private List getCorridasResumido(Integer operador, Empresa empresa, Date dtIni, Date dtFim, Boolean retornaTramos) throws Exception { + StringBuilder sb = new StringBuilder(); + start = System.currentTimeMillis(); + + sb.append("select * from (SELECT"); + sb.append(" cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chaveCorrida, cor.ruta_id AS rutaId "); + sb.append(" FROM OPERADOR_EMBARCADA OPE "); + sb.append(" JOIN OPERADOR_EMBARCADA_SERVICO OPS ON OPE.OPERADOR_EMBARCADA_ID = OPS.OPERADOR_EMBARCADA_ID AND OPS.ACTIVO = 1 "); + sb.append(" JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = OPS.ESQUEMA_CORRIDA_ID AND ESQ.ACTIVO = 1 "); + sb.append(" JOIN CORRIDA COR ON COR.ESQUEMACORRIDA_ID = ESQ.ESQUEMACORRIDA_ID AND COR.ACTIVO = 1 AND COR.INDSTATUSCORRIDA = 'H' "); + sb.append(" WHERE OPE.USUARIO_ID = :usuarioId "); + sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId "); + sb.append(" AND COR.FECCORRIDA >= :dtIni "); + sb.append(" AND COR.FECCORRIDA <= :dtFim "); + sb.append(" AND OPE.ACTIVO = 1 "); + sb.append(" ORDER BY "); + sb.append(" COR.FECHORSALIDA, "); + sb.append(" COR.CORRIDA_ID) "); + sb.append(" UNION select * from (SELECT "); + sb.append(" cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chaveCorrida, cor.ruta_id AS rutaId "); + sb.append(" FROM OPERADOR_EMBARCADA OPE "); + sb.append(" JOIN OPERADOR_EMBARCADA_LINHA OPL ON OPE.OPERADOR_EMBARCADA_ID = OPL.OPERADOR_EMBARCADA_ID AND OPL.ACTIVO = 1 "); + sb.append(" left join operador_embarcada_servico ops on ops.operador_embarcada_id = ope.operador_embarcada_id AND ops.operador_embarcada_servico_id is null "); + sb.append(" JOIN CORRIDA COR ON COR.ruta_ID = OPL.ruta_ID AND COR.ACTIVO = 1 AND COR.INDSTATUSCORRIDA = 'H' "); + sb.append(" LEFT JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = COR.ESQUEMACORRIDA_ID "); + sb.append(" WHERE OPE.USUARIO_ID = :usuarioId "); + sb.append(" AND COR.EMPRESACORRIDA_ID = :empresaId "); + sb.append(" AND COR.FECCORRIDA >= :dtIni "); + sb.append(" AND COR.FECCORRIDA <= :dtFim "); + sb.append(" AND cor.tiposervicio_id = 2 "); + sb.append(" AND OPE.ACTIVO = 1 "); + sb.append(" ORDER BY "); + sb.append(" COR.FECHORSALIDA, "); + sb.append(" COR.CORRIDA_ID)"); + + Query query = getSession().createSQLQuery(sb.toString()) + .addScalar("chaveCorrida", StringType.INSTANCE) + .addScalar("rutaId", IntegerType.INSTANCE); + + query.setInteger("usuarioId", operador); + query.setInteger("empresaId", empresa.getEmpresaId()); + query.setDate("dtIni", new java.sql.Date(dtIni.getTime())); + query.setDate("dtFim", new java.sql.Date(dtFim.getTime())); + + List list = query.list(); + if( retornaTramos ) { + List corridas = new ArrayList(); + for (Object[] chave : list) { + CorridaVO co = new CorridaVO(); + co.setChaveCorrida((String)chave[0]); + co.setRutaId((Integer)chave[1] ); + + co.setListTramos( obterListaTramo((String)chave[0], (Integer)chave[1]) ); + corridas.add(co); + } + + log.debug( printInfo("getCorridasResumido", start)); + return corridas; + }else { + List corridasString = new ArrayList(); + for (Object[] chave : list) { + corridasString.add( (String)chave[0] ); + } + + log.debug( printInfo("getCorridasResumido", start)); + return corridasString; + } + } + + private List obterListaTramo( String chave, Integer rutaId ) throws Exception{ + start = System.currentTimeMillis(); + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT"); + sb.append(" TRM.TRAMO_ID "); + sb.append(" FROM RUTA_COMBINACION RC "); + sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = RC.TRAMO_ID AND TRM.activo = 1 "); + sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = :corridaId "); + sb.append(" AND CT.FECCORRIDA = TO_DATE(:feccorrida, 'DDmmYYYY') "); + sb.append(" AND CT.DESTINO_ID = TRM.DESTINO_ID "); + sb.append(" AND CT.activo = 1 "); + sb.append(" WHERE RC.RUTA_ID = :rutaId "); + sb.append(" AND RC.activo = 1 "); + sb.append(" ORDER BY CT.NUMSECUENCIA "); + + Query query = getSession().createSQLQuery(sb.toString()).addScalar("TRAMO_ID", IntegerType.INSTANCE); + + String[] split = chave.split(";"); + + query.setParameter("corridaId", split[0] ); + query.setParameter("feccorrida", split[1] ); + query.setParameter("rutaId", rutaId ); + + List list = query.list(); + log.debug( printInfo("obterListaTramo", start)); + return list; + + } + + private void preencherTramosSequencias(final CorridaVO corrida, PuntoVenta puntoVenta, Empresa empresa) { + boolean isTarifaMinimaHabilitado = Boolean.getBoolean(constanteDAO.buscarPorNomeConstante("isTarifaMinimaHabilitado").getValorconstante()); + CategoriaDescuento categoriaDescuento = categoriaDescuentoDAO.pesquisarPorCategoriaEmpresa(Constantes.CATEGORIA_NORMAL, corrida.getEmpresaId()); + + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT"); + sb.append(" TRM.TRAMO_ID AS tramoId, "); + sb.append(" TRM.DESCTRAMO AS desctramo, "); + sb.append(" TRM.ORIGEN_ID AS origemId,"); + sb.append(" ORI.DESCPARADA AS descOrigem,"); + sb.append(" ORICID.CIUDAD_ID AS cidadeOrigemId,"); + sb.append(" ORICID.NOMBCIUDAD AS nomeCidadeOrigem,"); + sb.append(" ORIEST.ESTADO_ID AS estadoOrigemId,"); + sb.append(" ORIEST.NOMBESTADO AS nomeEstadoOrigem,"); + sb.append(" ORIEST.CVEESTADO AS cveEstadoOrigem,"); + sb.append(" TRM.DESTINO_ID AS destinoId,"); + sb.append(" DES.DESCPARADA AS descDestino,"); + sb.append(" DESCID.CIUDAD_ID AS cidadeDestinoId,"); + sb.append(" DESCID.NOMBCIUDAD AS nomeCidadeDestino,"); + sb.append(" DESEST.ESTADO_ID AS estadoDestinoId,"); + sb.append(" DESEST.NOMBESTADO AS nomeEstadoDestino,"); + sb.append(" DESEST.CVEESTADO AS cveEstadoDestino,"); + sb.append(" TRM.VIA_ID AS viaId,"); + sb.append(" VIA.NOMBVIA AS nomeVia,"); + sb.append(" CRT.NUMSECUENCIA AS sequencia,"); + sb.append(" TA.IMPORTETAXAEMBARQUE AS importeTaxaEmbarque,"); + sb.append(" TA.IMPORTEPEDAGIO AS importePedagio,"); + sb.append(" TA.IMPORTEOUTROS AS importeOutros,"); + sb.append(" TA.IMPORTESEGURO AS importeSeguro,"); + sb.append(" TA.PRECIO AS precio,"); + sb.append(" TA.RUTA_ID as rutaId, "); + + /* + * não aplica tarifa minina quando configurado no tipo de passagem ou quando nao tem a constante + * Mantis #10704 & #20931 + */ + if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) { + sb.append(" ("); + sb.append(" select IMPORTETARIFA"); + sb.append(" from ("); + sb.append(" select"); + sb.append(" tmx.TARIFAMINIMA_ID as TARIFAMINIMA_ID,"); + sb.append(" tmx.ACTIVO as ACTIVO,"); + sb.append(" tmx.CLASESERVICIO_ID as CLASESERVICIO_ID,"); + sb.append(" tmx.COEFICIENTETARIFA_ID as COEFICIENTETARIFA_ID,"); + sb.append(" tmx.DESTINO_ID as DESTINO_ID,"); + sb.append(" tmx.FECMODIF as FECMODIF,"); + sb.append(" tmx.IMPORTETARIFA as IMPORTETARIFA,"); + sb.append(" tmx.MARCA_ID as MARCA_ID,"); + sb.append(" tmx.MONEDA_ID as MONEDA_ID,"); + sb.append(" tmx.ORGAOCONCEDENTE_ID as ORGAOCONCEDENTE_ID,"); + sb.append(" tmx.ORIGEN_ID as ORIGEN_ID,"); + sb.append(" tmx.PLAZA_ID as PLAZA_ID,"); + sb.append(" tmx.REGIONMETROPOLITANA_ID as REGIONMETROPOLITANA_ID,"); + sb.append(" tmx.RUTA_ID as RUTA_ID,"); + sb.append(" tmx.USUARIO_ID as USUARIO_ID,"); + sb.append(" tmx.VIGENCIATARIFA_ID as VIGENCIATARIFA_ID,"); + sb.append(" ocx.ORGAOCONCEDENTE_ID as orgaoConcedenteId,"); + sb.append(" paradaOrigem.PARADA_ID as paradaOrigemId,"); + sb.append(" paradaDestino.PARADA_ID as paradaDestinoId,"); + sb.append(" ruta.ruta_id as rutaId"); + sb.append(" from TARIFA_MINIMA tmx"); + sb.append(" join marca m on m.marca_id = tmx.marca_id "); + sb.append(" join empresa e on e.empresa_id = m.empresa_id "); + sb.append(" join PARADA paradaOrigem on paradaOrigem.activo = 1"); + sb.append(" join PARADA paradaDestino on paradaDestino.activo = 1"); + sb.append(" join RUTA ruta on ruta.activo = 1"); + sb.append(" left outer join ORGAO_CONCEDENTE ocx on tmx.ORGAOCONCEDENTE_ID=ocx.ORGAOCONCEDENTE_ID "); + sb.append(" left outer join TARIFA_MINIMA_CATEGORIA tmcx on tmx.TARIFAMINIMA_ID=tmcx.TARIFAMINIMA_ID and tmcx.ACTIVO = 1 "); + sb.append(" left outer join VIGENCIA_TARIFA vtx on tmx.VIGENCIATARIFA_ID=vtx.VIGENCIATARIFA_ID "); + sb.append(" left outer join REGION_METROPOLITANA rmx on tmx.REGIONMETROPOLITANA_ID=rmx.REGIONMETROPOLITANA_ID "); + sb.append(" left outer join PARADA prmox on rmx.REGIONMETROPOLITANA_ID=prmox.REGIONMETROPOLITANA_ID "); + sb.append(" left outer join PARADA prmdx on rmx.REGIONMETROPOLITANA_ID=prmdx.REGIONMETROPOLITANA_ID "); + sb.append(" where tmx.ACTIVO=1 "); + sb.append(" and (prmox.PARADA_ID in (paradaOrigem.PARADA_ID, -1) or prmox.PARADA_ID is null) "); + sb.append(" and (prmdx.PARADA_ID in (paradaDestino.PARADA_ID, -1) or prmdx.PARADA_ID is null) "); + sb.append(" and (tmx.ORIGEN_ID in (paradaOrigem.PARADA_ID, -1) or tmx.ORIGEN_ID is null) "); + sb.append(" and (tmx.DESTINO_ID in (paradaDestino.PARADA_ID, -1) or tmx.DESTINO_ID is null) "); + sb.append(" and (tmx.PLAZA_ID in (:plazaId, -1)) "); + sb.append(" and (tmx.CLASESERVICIO_ID in (:claseservicioId, -1)) "); + sb.append(" and (e.EMPRESA_ID in (:empresaId, -1)) "); + sb.append(" and (tmcx.TARIFAMINIMACATEGORIA_ID is null or tmcx.CATEGORIA_ID in (:categoriaId, -1)) "); + sb.append(" and tmx.MONEDA_ID=:moneda"); + sb.append(" and (ocx.ORGAOCONCEDENTE_ID is null or ocx.ORGAOCONCEDENTE_ID=-1 or ocx.ORGAOCONCEDENTE_ID=("); + sb.append(" select distinct rx.ORGAOCONCEDENTE_ID"); + sb.append(" from RUTA rx "); + sb.append(" left outer join RUTA_COMBINACION rcx on rx.RUTA_ID=rcx.RUTA_ID "); + sb.append(" left outer join TRAMO tx on rcx.TRAMO_ID=tx.TRAMO_ID "); + sb.append(" left outer join ORGAO_TRAMO otx on tx.TRAMO_ID=otx.TRAMO_ID "); + sb.append(" where"); + sb.append(" rcx.RUTA_ID=ruta.RUTA_ID"); + sb.append(" and ("); + sb.append(" (tmx.COEFICIENTETARIFA_ID in (otx.COEFICIENTETARIFA1_ID,otx.COEFICIENTETARIFA2_ID,otx.COEFICIENTETARIFA3_ID))"); + sb.append(" and tx.ORIGEN_ID=paradaOrigem.parada_id "); + sb.append(" and tx.DESTINO_ID=paradaDestino.parada_id"); + sb.append(" or tmx.COEFICIENTETARIFA_ID is null"); + sb.append(" )"); + sb.append(" )"); + sb.append(" )"); + sb.append(" and (SYSDATE between vtx.FECINICIOVIGENCIA and vtx.FECFINVIGENCIA)"); + sb.append(" order by"); + sb.append(" tmx.PLAZA_ID desc,"); + sb.append(" tmx.ORIGEN_ID desc,"); + sb.append(" tmx.DESTINO_ID desc,"); + sb.append(" tmx.CLASESERVICIO_ID desc,"); + sb.append(" tmx.MARCA_ID desc"); + sb.append(" )"); + sb.append(" where"); + sb.append(" paradaOrigemId = TRM.ORIGEN_ID"); + sb.append(" and paradaDestinoId = TRM.DESTINO_ID"); + sb.append(" and rutaId = TA.RUTA_ID"); + sb.append(" and rownum = 1"); + sb.append(" ) as tarifaMinima "); + }else { + sb.append(" 0 as tarifaMinima "); + } + + sb.append(" FROM RUTA_COMBINACION RC"); + sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = RC.TRAMO_ID"); + sb.append(" JOIN CORRIDA_TRAMO CRT ON CRT.DESTINO_ID = TRM.DESTINO_ID AND CRT.CORRIDA_ID = :corridaId AND CRT.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS')"); + sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = TRM.ORIGEN_ID"); + sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID"); + sb.append(" JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID"); + sb.append(" JOIN PARADA DES ON DES.PARADA_ID = TRM.DESTINO_ID"); + sb.append(" JOIN CIUDAD DESCID ON DESCID.CIUDAD_ID = DES.CIUDAD_ID"); + sb.append(" JOIN ESTADO DESEST ON DESEST.ESTADO_ID = DESCID.ESTADO_ID"); + sb.append(" JOIN VIA VIA ON VIA.VIA_ID = TRM.VIA_ID"); + sb.append(" JOIN empresa emp ON emp.empresa_id = :empresaId "); + sb.append(" JOIN marca mar on mar.empresa_id = emp.empresa_id "); + if (empresa.getIndTabelaPrecoEmbarcada() != null && empresa.getIndTabelaPrecoEmbarcada()) { + sb.append(" JOIN TARIFA_EMBARCADA TA ON TA.MARCA_ID = mar.marca_Id AND TA.TRAMO_ID = TRM.TRAMO_ID AND TA.RUTA_ID = RC.RUTA_ID"); + } else { + sb.append(" JOIN TARIFA TA ON TA.MARCA_ID = mar.marca_Id AND TA.TRAMO_ID = TRM.TRAMO_ID AND TA.RUTA_ID = RC.RUTA_ID"); + } + sb.append(" JOIN VIGENCIA_TARIFA VT ON VT.VIGENCIATARIFA_ID = TA.VIGENCIATARIFA_ID"); + sb.append(" WHERE "); + sb.append(" RC.ACTIVO = 1"); + sb.append(" AND TRM.ACTIVO = 1"); + sb.append(" AND CRT.ACTIVO = 1"); + sb.append(" AND VIA.ACTIVO = 1"); + sb.append(" AND TA.ACTIVO = 1"); + sb.append(" AND VT.ACTIVO = 1"); + sb.append(" AND mar.ACTIVO = 1"); + sb.append(" AND coalesce(RC.INDVENTA,0) = 1"); + sb.append(" AND RC.RUTA_ID = :rutaId "); + sb.append(" AND TRM.ORIGEN_ID IN (SELECT X.ORIGEN_ID FROM CORRIDA_TRAMO X WHERE X.CORRIDA_ID = :corridaId AND X.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS'))"); + sb.append(" AND TRM.DESTINO_ID IN (SELECT X.DESTINO_ID FROM CORRIDA_TRAMO X WHERE X.CORRIDA_ID = :corridaId AND X.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS'))"); + sb.append(" AND (SYSDATE BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA AND VT.ACTIVO = 1)"); + + Query query = getSession().createSQLQuery(sb.toString()) + .addScalar("tramoId", IntegerType.INSTANCE) + .addScalar("desctramo", StringType.INSTANCE) + .addScalar("origemId", IntegerType.INSTANCE) + .addScalar("descOrigem", StringType.INSTANCE) + .addScalar("cidadeOrigemId", IntegerType.INSTANCE) + .addScalar("nomeCidadeOrigem", StringType.INSTANCE) + .addScalar("estadoOrigemId", IntegerType.INSTANCE) + .addScalar("nomeEstadoOrigem", StringType.INSTANCE) + .addScalar("cveEstadoOrigem", StringType.INSTANCE) + .addScalar("destinoId", IntegerType.INSTANCE) + .addScalar("descDestino", StringType.INSTANCE) + .addScalar("cidadeDestinoId", IntegerType.INSTANCE) + .addScalar("nomeCidadeDestino", StringType.INSTANCE) + .addScalar("estadoDestinoId", IntegerType.INSTANCE) + .addScalar("nomeEstadoDestino", StringType.INSTANCE) + .addScalar("cveEstadoDestino", StringType.INSTANCE) + .addScalar("viaId", IntegerType.INSTANCE) + .addScalar("nomeVia", StringType.INSTANCE) + .addScalar("sequencia", IntegerType.INSTANCE) + .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) + .addScalar("importePedagio", BigDecimalType.INSTANCE) + .addScalar("importeOutros", BigDecimalType.INSTANCE) + .addScalar("importeSeguro", BigDecimalType.INSTANCE) + .addScalar("precio", BigDecimalType.INSTANCE) + .addScalar("tarifaMinima", BigDecimalType.INSTANCE) + .setResultTransformer(Transformers.aliasToBean(TramoSequenciaVO.class)); + + query.setParameter("empresaId", corrida.getEmpresaId()); + query.setParameter("rutaId", corrida.getRutaId()); + query.setParameter("corridaId", corrida.getCorridaId()); + query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00"); + + if(isTarifaMinimaHabilitado && categoriaDescuento !=null && !categoriaDescuento.getIndnaoaplicatarifaminima()) { + query.setParameter("plazaId", puntoVenta.getColonia().getCiudad().getPlaza().getPlazaId()); + query.setParameter("claseservicioId", corrida.getClaseServicioId()); + query.setParameter("categoriaId", Constantes.CATEGORIA_NORMAL); + query.setParameter("moneda", puntoVenta.getMoneda().getMonedaId()); + } + + List tramosequencia = query.list(); + + HashSet setTramo = new HashSet(); + + List aliasLs = aliasServicoService.buscarPorRuta(corrida.getRutaId()); + + for (TramoSequenciaVO ts : tramosequencia) { + final ParadaVO origem = new ParadaVO( + ts.getOrigemId(), + ts.getDescOrigem(), + ts.getCidadeOrigemId(), + ts.getNomeCidadeOrigem(), + ts.getEstadoOrigemId(), + ts.getNomeEstadoOrigem(), + ts.getCveEstadoOrigem()); + + final ParadaVO destino = new ParadaVO( + ts.getDestinoId(), + ts.getDescDestino(), + ts.getCidadeDestinoId(), + ts.getNomeCidadeDestino(), + ts.getEstadoDestinoId(), + ts.getNomeEstadoDestino(), + ts.getCveEstadoDestino()); + + ViaVO via = new ViaVO( + ts.getViaId(), + ts.getNomeVia()); + + BigDecimal tarifaMinima = ts.getTarifaMinima(); + + TramoVO tramo = new TramoVO( + ts.getTramoId(), + ts.getDesctramo(), + origem, + destino, + via, + ts.getSequencia(), + ts.getPrecio().compareTo(tarifaMinima) < 0 ? tarifaMinima : ts.getPrecio(), + ts.getImporteTaxaEmbarque()!=null?ts.getImporteTaxaEmbarque():BigDecimal.ZERO, + ts.getImporteSeguro()!=null?ts.getImporteSeguro():BigDecimal.ZERO, + ts.getImportePedagio()!=null?ts.getImportePedagio():BigDecimal.ZERO, + ts.getImporteOutros()!=null?ts.getImporteOutros():BigDecimal.ZERO); + + AliasServico aC = null; + try { + aC = (AliasServico) CollectionUtils.find(aliasLs, new Predicate() { + + @Override + public boolean evaluate(Object arg0) { + AliasServico alias = (AliasServico)arg0; + + return alias.getCorridaId() != null && alias.getCorridaId().equals(corrida.getCorridaId()) + && alias.getOrigen().getParadaId().equals(origem.getParadaId()) + && alias.getDestino().getParadaId().equals(destino.getParadaId()); + } + }); + + if(aC == null) { + aC = (AliasServico) CollectionUtils.find(aliasLs, new Predicate() { + + @Override + public boolean evaluate(Object arg0) { + AliasServico alias = (AliasServico)arg0; + + return alias.getOrigen().getParadaId().equals(origem.getParadaId()) + && alias.getDestino().getParadaId().equals(destino.getParadaId()) + && alias.getCorridaId() == null; + } + }); + } + }catch(Throwable th) { + log.error("erro ao carrgar o alias",th); + } + + if (aC != null) { + tramo.setAliasdestinoId(aC.getAliasDestino().getParadaId()); + tramo.setAliasorigenId(aC.getAliasOrigen().getParadaId()); + tramo.setDescAliasdestino(aC.getAliasDestino().getDescparada()); + tramo.setDescAliasorigen(aC.getAliasOrigen().getDescparada()); + } + setTramo.add(tramo); + } + + List lsTramo = new ArrayList(setTramo); + corrida.setLsTramoVO(lsTramo); + } + + public BigDecimal obtenerTarifaMinima(Integer claseServicioId, Integer marcaId, Integer origenConsultaId, + Integer destinoConsultaId, PuntoVenta miPuntoVenta, Integer rutaId, Integer categoriaId, Boolean indnaoaplicatarifaminima) { + BigDecimal tarifaMinima = BigDecimal.ZERO; + + /* + * não aplica tarifa minina quando configurado no tipo de passagem + * Mantis #10704 + */ + if(indnaoaplicatarifaminima != null && indnaoaplicatarifaminima) { + return tarifaMinima; + } + + //PuntoVenta miPuntoVenta = PuntoVentaDao.getInstance().findById(puntoVentaId); + + StringBuilder hql = new StringBuilder("select tm from TarifaMinima tm ") + .append("left join tm.orgaoConcedente oc ") + .append("left join tm.tarifaMinimaCategorias tmc ") + .append("left join tm.vigenciaTarifa vige ") + .append("left join tm.regionMetropolitana.paradaList ori ") + .append("left join tm.regionMetropolitana.paradaList des ") + .append("where tm.activo = 1 ").append("and tm.plaza.plazaId in (:plazaId, -1) ") + .append("and tm.claseServicio.claseservicioId in (:claseServId, -1) ") + .append("and tm.marca.marcaId in (:marcaId, -1) ") + .append("and (ori.paradaId in (:origenId, -1) or ori.paradaId is null ) ") + .append("and (des.paradaId in (:destinoId,-1) or des.paradaId is null ) ") + .append("and (tm.origem.paradaId in (:origenId, -1) or tm.origem.paradaId is null) ") + .append("and (tm.destino.paradaId in (:destinoId, -1) or tm.destino.paradaId is null) "); + + if (categoriaId != null) { + hql.append("and (tmc is null or tmc.categoria.categoriaId in (:categoriaId, -1)) "); + } + + hql.append("and tm.moneda.monedaId = :monedaId ") + .append("and (oc is null or oc.orgaoConcedenteId = -1 or oc.orgaoConcedenteId = ") + .append("(select distinct r.orgaoConcedente.orgaoConcedenteId from Ruta r") + .append(" left join r.rutaCombinacionList rc") + .append(" left join rc.tramo tr") + .append(" left join tr.lsOrgaoTramo ot") + .append(" where rc.ruta.rutaId = :rutaId") + .append(" and (tm.coeficienteTarifa.coeficienteId in ") + .append(" (ot.coeficienteTarifa1.coeficienteId, ot.coeficienteTarifa2.coeficienteId, ot.coeficienteTarifa3.coeficienteId ) ") + .append(" and tr.origem.paradaId = :origenId ") + .append(" and tr.destino.paradaId = :destinoId ") + .append(" or tm.coeficienteTarifa is null ) )) ") + .append(" and " + DBUtil.getInstance().dbSysdate() + " between vige.feciniciovigencia and vige.fecfinvigencia ") + + .append("order by tm.plaza.plazaId desc, tm.origem.paradaId desc, ") + .append("tm.destino.paradaId desc, tm.claseServicio.claseservicioId desc, ") + .append("tm.marca.marcaId desc"); + + Query miQry = getSession().createQuery(hql.toString()); + miQry.setInteger("plazaId", miPuntoVenta.getColonia().getCiudad().getPlaza().getPlazaId()); + miQry.setInteger("claseServId", claseServicioId); + miQry.setInteger("marcaId", marcaId); + miQry.setInteger("origenId", origenConsultaId); + miQry.setInteger("destinoId", destinoConsultaId); + miQry.setInteger("monedaId", miPuntoVenta.getMoneda().getMonedaId()); + miQry.setInteger("rutaId", rutaId); + + if (categoriaId != null) { + miQry.setInteger("categoriaId", categoriaId); + } + + List listTarifaMinima = miQry.list(); + if (!listTarifaMinima.isEmpty()) { + tarifaMinima = listTarifaMinima.get(0).getImportetarifa(); + } + + return tarifaMinima; + } + + private void preencherSequencias(CorridaVO corrida) { + final int NUMSECUENCIA = 0; + final int ORIGEN_ID = 1; + final int ORIGENCVEPARADA = 2; + final int ORIGENDESCPARADA = 3; + final int ORIGENCIUDAD_ID = 4; + final int ORIGENNOMBCIUDAD = 5; + final int ORIGENESTADO_ID = 6; + final int ORIGENNOMBESTADO = 7; + final int ORIGENCVEESTADO = 8; + final int DESTINO_ID = 9; + final int DESTINOCVEPARADA = 10; + final int DESTINODESCPARADA = 11; + final int DESTINOCIUDAD_ID = 12; + final int DESTINONOMBCIUDAD = 13; + final int DESTINOESTADO_ID = 14; + final int DESTINONOMBESTADO = 15; + final int DESTINOCVEESTADO = 16; + + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT"); + sb.append(" CT.NUMSECUENCIA,"); + sb.append(" CT.ORIGEN_ID , PO.CVEPARADA as PO_CVEPARADA, PO.DESCPARADA as PO_DESCPARADA, CO.CIUDAD_ID as CO_CIUDAD_ID, CO.NOMBCIUDAD as CO_NOMBCIUDAD, EO.ESTADO_ID as EO_ESTADO_ID, EO.NOMBESTADO as EO_NOMBESTADO, EO.CVEESTADO as EO_CVEESTADO,"); + sb.append(" CT.DESTINO_ID, PD.CVEPARADA as PD_CVEPARADA, PD.DESCPARADA as PD_DESCPARADA, CD.CIUDAD_ID as CD_CIUDAD_ID, CD.NOMBCIUDAD as CD_NOMBCIUDAD, ED.ESTADO_ID as ED_ESTADO_ID, ED.NOMBESTADO as ED_NOMBESTADO, ED.CVEESTADO as ED_CVEESTADO"); + sb.append(" FROM CORRIDA C"); + sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA"); + sb.append(" JOIN PARADA PO ON PO.PARADA_ID = CT.ORIGEN_ID"); + sb.append(" JOIN CIUDAD CO ON CO.CIUDAD_ID = PO.CIUDAD_ID"); + sb.append(" JOIN ESTADO EO ON EO.ESTADO_ID = CO.ESTADO_ID"); + sb.append(" JOIN PARADA PD ON PD.PARADA_ID = CT.DESTINO_ID"); + sb.append(" JOIN CIUDAD CD ON CD.CIUDAD_ID = PD.CIUDAD_ID"); + sb.append(" JOIN ESTADO ED ON ED.ESTADO_ID = CD.ESTADO_ID"); + sb.append(" WHERE C.CORRIDA_ID = :corridaId AND C.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS') and CT.activo = 1 "); + sb.append(" ORDER BY CT.NUMSECUENCIA"); + + Query query = getSession().createSQLQuery(sb.toString()); + + query.setParameter("corridaId", corrida.getCorridaId()); + query.setParameter("feccorrida", corrida.getFeccorrida() + " 00:00:00"); + + List lsSecuenciaVO = new ArrayList(); + List controle = new ArrayList(0); + + List list = query.list(); + + for (Object[] item : list) { + final Integer origensecuencia = Integer.valueOf(item[NUMSECUENCIA].toString()); + final Integer origen_id = Integer.valueOf(item[ORIGEN_ID].toString()); + item[ORIGENCVEPARADA].toString(); + final String origendescparada = item[ORIGENDESCPARADA].toString(); + final Integer origenciudad_id = Integer.valueOf(item[ORIGENCIUDAD_ID].toString()); + final String origennombciudad = item[ORIGENNOMBCIUDAD].toString(); + final Integer origenestado_id = Integer.valueOf(item[ORIGENESTADO_ID].toString()); + final String origennombestado = item[ORIGENNOMBESTADO].toString(); + final String origencveestado = item[ORIGENCVEESTADO].toString(); + + final Integer destinosecuencia = Integer.valueOf(item[NUMSECUENCIA].toString()) + 1; + final Integer destino_id = Integer.valueOf(item[DESTINO_ID].toString()); + item[DESTINOCVEPARADA].toString(); + final String destinodescparada = item[DESTINODESCPARADA].toString(); + final Integer destinociudad_id = Integer.valueOf(item[DESTINOCIUDAD_ID].toString()); + final String destinonombciudad = item[DESTINONOMBCIUDAD].toString(); + final Integer destinoestado_id = Integer.valueOf(item[DESTINOESTADO_ID].toString()); + final String destinonombestado = item[DESTINONOMBESTADO].toString(); + final String destinocveestado = item[DESTINOCVEESTADO].toString(); + + adicionarSequencia( + controle, + lsSecuenciaVO, + origensecuencia, + origen_id, + origendescparada, + origenciudad_id, + origennombciudad, + origenestado_id, + origennombestado, + origencveestado); + + adicionarSequencia( + controle, + lsSecuenciaVO, + destinosecuencia, + destino_id, + destinodescparada, + destinociudad_id, + destinonombciudad, + destinoestado_id, + destinonombestado, + destinocveestado); + } + + corrida.setLsSecuenciaVO(lsSecuenciaVO); + } + + private void adicionarSequencia(List controle, List lsSecuenciaVO, final Integer numsecuencia, final Integer paradaId, final String descParada, final Integer ciudadId, final String nombCiudad, final Integer estadoId, final String nombEstado, final String cveEstado) { + final String key = numsecuencia.toString() + "|" + paradaId.toString(); + + if (!controle.contains(key)) { + SecuenciaVO sequencia = new SecuenciaVO( + numsecuencia, + new ParadaVO(paradaId, descParada, ciudadId, nombCiudad, estadoId, nombEstado, cveEstado)); + + lsSecuenciaVO.add(sequencia); + + controle.add(key); + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoCancelacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoCancelacionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoCancelacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoCancelacionHibernateDAO.java index e9a010a92..04fc1c092 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoCancelacionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoCancelacionHibernateDAO.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OrgaoCancelacionDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -@Repository("orgaoCancelacionDAO") -public class OrgaoCancelacionHibernateDAO extends GenericHibernateDAO implements OrgaoCancelacionDAO { - - @Autowired - public OrgaoCancelacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descOrgao")); - - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodosIds() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setProjection(Projections.property("orgaoCancelacionId")); - - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscarPorOrgao(OrgaoConcedente orgaoConcedente) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.like("orgao", orgaoConcedente)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OrgaoCancelacionDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +@Repository("orgaoCancelacionDAO") +public class OrgaoCancelacionHibernateDAO extends GenericHibernateDAO implements OrgaoCancelacionDAO { + + @Autowired + public OrgaoCancelacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descOrgao")); + + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodosIds() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setProjection(Projections.property("orgaoCancelacionId")); + + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscarPorOrgao(OrgaoConcedente orgaoConcedente) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.like("orgao", orgaoConcedente)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java index 9f97c59f3..b2bb1a815 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java @@ -1,70 +1,70 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -@SuppressWarnings("unchecked") -@Repository("orgaoConcedenteDAO") -public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO implements OrgaoConcedenteDAO { - - @Autowired - public OrgaoConcedenteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descOrgao")); - - return c.list(); - } - - public List obtenerTodosExceto(Integer... id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descOrgao")); - c.add(Restrictions.not(Restrictions.in("orgaoConcedenteId", id))); - - return c.list(); - } - - @Override - public List obtenerTodosIds() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setProjection(Projections.property("orgaoConcedenteId")); - - return c.list(); - } - - @Override - public List buscar(String desc) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.like("descOrgao", desc)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public List buscarListaPorIds(List orgaoConcedenteIds) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.in("orgaoConcedenteId", orgaoConcedenteIds)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +@SuppressWarnings("unchecked") +@Repository("orgaoConcedenteDAO") +public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO implements OrgaoConcedenteDAO { + + @Autowired + public OrgaoConcedenteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descOrgao")); + + return c.list(); + } + + public List obtenerTodosExceto(Integer... id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descOrgao")); + c.add(Restrictions.not(Restrictions.in("orgaoConcedenteId", id))); + + return c.list(); + } + + @Override + public List obtenerTodosIds() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setProjection(Projections.property("orgaoConcedenteId")); + + return c.list(); + } + + @Override + public List buscar(String desc) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.like("descOrgao", desc)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public List buscarListaPorIds(List orgaoConcedenteIds) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.in("orgaoConcedenteId", orgaoConcedenteIds)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java index 69e771d24..77d079b78 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OrgaoEmpParamDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; - -@Repository("orgaoEmpParamDAO") -public class OrgaoEmpParamHibernateDAO extends GenericHibernateDAO implements OrgaoEmpParamDAO { - - @Autowired - public OrgaoEmpParamHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obterPorOrgao(Integer orgaoConcedenteId) { - Criteria criteria = createCriteria(); - criteria.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId)); - - return criteria.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List obterPorEmpresa(Integer empresaId) { - Criteria criteria = createCriteria(); - criteria.add(Restrictions.eq("empresa.empresaId", empresaId)); - - return criteria.list(); - } - - @Override - public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId) { - Criteria criteria = createCriteria(); - criteria.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId)); - criteria.add(Restrictions.eq("empresa.empresaId", empresaId)); - - return (OrgaoEmpParam) criteria.uniqueResult(); - } - - private Criteria createCriteria() { - Criteria criteria = getSession().createCriteria(getPersistentClass()); - criteria.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return criteria; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OrgaoEmpParamDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; + +@Repository("orgaoEmpParamDAO") +public class OrgaoEmpParamHibernateDAO extends GenericHibernateDAO implements OrgaoEmpParamDAO { + + @Autowired + public OrgaoEmpParamHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obterPorOrgao(Integer orgaoConcedenteId) { + Criteria criteria = createCriteria(); + criteria.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId)); + + return criteria.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List obterPorEmpresa(Integer empresaId) { + Criteria criteria = createCriteria(); + criteria.add(Restrictions.eq("empresa.empresaId", empresaId)); + + return criteria.list(); + } + + @Override + public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId) { + Criteria criteria = createCriteria(); + criteria.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId)); + criteria.add(Restrictions.eq("empresa.empresaId", empresaId)); + + return (OrgaoEmpParam) criteria.uniqueResult(); + } + + private Criteria createCriteria() { + Criteria criteria = getSession().createCriteria(getPersistentClass()); + criteria.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return criteria; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoTramoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoTramoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoTramoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoTramoHibernateDAO.java index 2ac9eeca4..d2f07c143 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoTramoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoTramoHibernateDAO.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.FetchMode; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.OrgaoTramoDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoTramo; - -@Repository("orgaoTramoDAO") -public class OrgaoTramoHibernateDAO extends GenericHibernateDAO implements OrgaoTramoDAO { - - @Autowired - public OrgaoTramoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public OrgaoTramo buscar(Integer origenId, Integer destinoId, Integer viaId, Integer orgaoConcedenteId, Integer claseServicioId) { - Criteria c = makeCriteria(); - Criteria cTramo = c.createCriteria("tramo"); - cTramo.add(Restrictions.eq("origem.paradaId", origenId)); - cTramo.add(Restrictions.eq("destino.paradaId", destinoId)); - cTramo.add(Restrictions.eq("via.viaId", viaId)); - cTramo.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId)); - c.add(Restrictions.eq("claseServicio.claseservicioId", claseServicioId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - c.setFetchMode("tramo", FetchMode.SELECT); - - List list = c.list(); - - if (list.size() > 1) { - throw new RuntimeException("Erro ao consultar os dados do coeficiente por trecho. Retornou mais de um resultado"); - } - - if (!list.isEmpty()) { - return list.get(0); - } - - return null; - } - - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.FetchMode; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.OrgaoTramoDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoTramo; + +@Repository("orgaoTramoDAO") +public class OrgaoTramoHibernateDAO extends GenericHibernateDAO implements OrgaoTramoDAO { + + @Autowired + public OrgaoTramoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public OrgaoTramo buscar(Integer origenId, Integer destinoId, Integer viaId, Integer orgaoConcedenteId, Integer claseServicioId) { + Criteria c = makeCriteria(); + Criteria cTramo = c.createCriteria("tramo"); + cTramo.add(Restrictions.eq("origem.paradaId", origenId)); + cTramo.add(Restrictions.eq("destino.paradaId", destinoId)); + cTramo.add(Restrictions.eq("via.viaId", viaId)); + cTramo.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId)); + c.add(Restrictions.eq("claseServicio.claseservicioId", claseServicioId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + c.setFetchMode("tramo", FetchMode.SELECT); + + List list = c.list(); + + if (list.size() > 1) { + throw new RuntimeException("Erro ao consultar os dados do coeficiente por trecho. Retornou mais de um resultado"); + } + + if (!list.isEmpty()) { + return list.get(0); + } + + return null; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteConvenioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteConvenioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteConvenioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteConvenioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteDescontoBilheteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteDescontoBilheteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteDescontoBilheteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteDescontoBilheteHibernateDAO.java index f4a203205..5ca64a656 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteDescontoBilheteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteDescontoBilheteHibernateDAO.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PacoteDescontoBilheteDAO; -import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; - -@Repository("pacoteDescontoBilheteDAO") -public class PacoteDescontoBilheteHibernateDAO extends GenericHibernateDAO implements PacoteDescontoBilheteDAO { - - private static Logger log = LogManager.getLogger(PacoteDescontoBilheteHibernateDAO.class); - - @Autowired - public PacoteDescontoBilheteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List obtenerTodos(Integer pacoteId) { - StringBuilder sb = new StringBuilder(); - sb.append(" from PacoteDescontoBilhete pdb "); - sb.append(" where pdb.pacote.pacoteId = :pacoteId "); - sb.append(" and pdb.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacoteId); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PacoteDescontoBilheteDAO; +import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; + +@Repository("pacoteDescontoBilheteDAO") +public class PacoteDescontoBilheteHibernateDAO extends GenericHibernateDAO implements PacoteDescontoBilheteDAO { + + private static Logger log = LogManager.getLogger(PacoteDescontoBilheteHibernateDAO.class); + + @Autowired + public PacoteDescontoBilheteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List obtenerTodos(Integer pacoteId) { + StringBuilder sb = new StringBuilder(); + sb.append(" from PacoteDescontoBilhete pdb "); + sb.append(" where pdb.pacote.pacoteId = :pacoteId "); + sb.append(" and pdb.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacoteId); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java index 945c4e819..0b926c385 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PacoteDAO; -import com.rjconsultores.ventaboletos.entidad.Pacote; - -@Repository("pacoteDAO") -public class PacoteHibernateDAO extends GenericHibernateDAO implements PacoteDAO { - - @Autowired - public PacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List obtenerTodos() { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PacoteDAO; +import com.rjconsultores.ventaboletos.entidad.Pacote; + +@Repository("pacoteDAO") +public class PacoteHibernateDAO extends GenericHibernateDAO implements PacoteDAO { + + @Autowired + public PacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List obtenerTodos() { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteItemHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteItemHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteItemHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteItemHibernateDAO.java index d6def7222..f60e3856b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteItemHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteItemHibernateDAO.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PacoteItemDAO; -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteItem; - -@Repository("pacoteItemDAO") -public class PacoteItemHibernateDAO extends GenericHibernateDAO implements PacoteItemDAO { - - @Autowired - public PacoteItemHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item) { - - StringBuilder sb = new StringBuilder(); - sb.append(" from PacoteItem pi "); - sb.append(" where pi.pacote.pacoteId = :pacoteId "); - sb.append(" and pi.itemAdicional.itemadicionalId = :itemadicionalId "); - sb.append(" and pi.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacote.getPacoteId()); - query.setInteger("itemadicionalId", item.getItemadicionalId()); - - return (PacoteItem) query.uniqueResult(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscaItensPacote(Pacote pacote) { - - StringBuilder sb = new StringBuilder(); - sb.append(" from PacoteItem pi "); - sb.append(" where pi.pacote.pacoteId = :pacoteId "); - sb.append(" and pi.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacote.getPacoteId()); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PacoteItemDAO; +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteItem; + +@Repository("pacoteItemDAO") +public class PacoteItemHibernateDAO extends GenericHibernateDAO implements PacoteItemDAO { + + @Autowired + public PacoteItemHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item) { + + StringBuilder sb = new StringBuilder(); + sb.append(" from PacoteItem pi "); + sb.append(" where pi.pacote.pacoteId = :pacoteId "); + sb.append(" and pi.itemAdicional.itemadicionalId = :itemadicionalId "); + sb.append(" and pi.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacote.getPacoteId()); + query.setInteger("itemadicionalId", item.getItemadicionalId()); + + return (PacoteItem) query.uniqueResult(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscaItensPacote(Pacote pacote) { + + StringBuilder sb = new StringBuilder(); + sb.append(" from PacoteItem pi "); + sb.append(" where pi.pacote.pacoteId = :pacoteId "); + sb.append(" and pi.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacote.getPacoteId()); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteTarifaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteTarifaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteTarifaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteTarifaHibernateDAO.java index aac48e171..9521d7d73 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteTarifaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteTarifaHibernateDAO.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PacoteTarifaDAO; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -@Repository("pacoteTarifaDAO") -public class PacoteTarifaHibernateDAO extends GenericHibernateDAO implements PacoteTarifaDAO { - - @Autowired - public PacoteTarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote) { - - StringBuilder sb = new StringBuilder(); - sb.append(" from PacoteTarifa pt "); - sb.append(" where pt.pacote.pacoteId = :pacoteId "); - sb.append(" and pt.tipoTarifaPacote.tipotarifapacoteId = :tipotarifapacoteId "); - sb.append(" and pt.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacote.getPacoteId()); - query.setInteger("tipotarifapacoteId", tipoTarifaPacote.getTipotarifapacoteId()); - - return (PacoteTarifa) query.uniqueResult(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscaTarifasPacote(Pacote pacote) { - - StringBuilder sb = new StringBuilder(); - sb.append(" from PacoteTarifa pt "); - sb.append(" where pt.pacote.pacoteId = :pacoteId "); - sb.append(" and pt.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacote.getPacoteId()); - - return query.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PacoteTarifaDAO; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +@Repository("pacoteTarifaDAO") +public class PacoteTarifaHibernateDAO extends GenericHibernateDAO implements PacoteTarifaDAO { + + @Autowired + public PacoteTarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote) { + + StringBuilder sb = new StringBuilder(); + sb.append(" from PacoteTarifa pt "); + sb.append(" where pt.pacote.pacoteId = :pacoteId "); + sb.append(" and pt.tipoTarifaPacote.tipotarifapacoteId = :tipotarifapacoteId "); + sb.append(" and pt.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacote.getPacoteId()); + query.setInteger("tipotarifapacoteId", tipoTarifaPacote.getTipotarifapacoteId()); + + return (PacoteTarifa) query.uniqueResult(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscaTarifasPacote(Pacote pacote) { + + StringBuilder sb = new StringBuilder(); + sb.append(" from PacoteTarifa pt "); + sb.append(" where pt.pacote.pacoteId = :pacoteId "); + sb.append(" and pt.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacote.getPacoteId()); + + return query.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java index 05ad4c9da..10f83e8af 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaCodOrgaoConcedenteHibernateDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ParadaCodOrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; - -@Repository("paradaCodOrgaoConcedenteDAO") -public class ParadaCodOrgaoConcedenteHibernateDAO extends GenericHibernateDAO - implements ParadaCodOrgaoConcedenteDAO { - - @Autowired - public ParadaCodOrgaoConcedenteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ParadaCodOrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; + +@Repository("paradaCodOrgaoConcedenteDAO") +public class ParadaCodOrgaoConcedenteHibernateDAO extends GenericHibernateDAO + implements ParadaCodOrgaoConcedenteDAO { + + @Autowired + public ParadaCodOrgaoConcedenteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java index 6f759b8a3..e03c8f66a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ParamArticuloDAO; -import com.rjconsultores.ventaboletos.entidad.ParamArticulo; - -@Repository("paramArticuloDAO") -public class ParamArticuloHibernateDAO extends - GenericHibernateDAO implements ParamArticuloDAO { - - @Autowired - public ParamArticuloHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - // c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ParamArticuloDAO; +import com.rjconsultores.ventaboletos.entidad.ParamArticulo; + +@Repository("paramArticuloDAO") +public class ParamArticuloHibernateDAO extends + GenericHibernateDAO implements ParamArticuloDAO { + + @Autowired + public ParamArticuloHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + // c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamConexionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamConexionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamConexionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamConexionHibernateDAO.java index db64fbd08..bff14e960 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamConexionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamConexionHibernateDAO.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ParamConexionDAO; -import com.rjconsultores.ventaboletos.entidad.ParamConexion; - -@Repository("paramConexionDAO") -public class ParamConexionHibernateDAO extends GenericHibernateDAO implements ParamConexionDAO { - @Autowired - public ParamConexionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ParamConexionDAO; +import com.rjconsultores.ventaboletos.entidad.ParamConexion; + +@Repository("paramConexionDAO") +public class ParamConexionHibernateDAO extends GenericHibernateDAO implements ParamConexionDAO { + @Autowired + public ParamConexionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamRecoleccionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamRecoleccionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ParamRecoleccionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamRecoleccionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PeajeHibernateDao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PeajeHibernateDao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PeajeHibernateDao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PeajeHibernateDao.java index 0f5423fbc..a4d293e69 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PeajeHibernateDao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PeajeHibernateDao.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PeajeDao; -import com.rjconsultores.ventaboletos.entidad.Peaje; - - -@Repository("peajeDao") -public class PeajeHibernateDao extends GenericHibernateDAO implements PeajeDao { - - @Autowired - public PeajeHibernateDao(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PeajeDao; +import com.rjconsultores.ventaboletos.entidad.Peaje; + + +@Repository("peajeDao") +public class PeajeHibernateDao extends GenericHibernateDAO implements PeajeDao { + + @Autowired + public PeajeHibernateDao(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioVentajaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioVentajaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioVentajaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioVentajaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java index 5bb2b4eff..3b5231ad4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java @@ -1,51 +1,51 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingClasseTarifariaDAO; -import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; - -@Repository("pricingClasseTarifariaDAO") -public class PricingClasseTarifariaHibernateDAO extends GenericHibernateDAO - implements PricingClasseTarifariaDAO { - - @Autowired - public PricingClasseTarifariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public Boolean validacionSigla(String sigla) { - - StringBuffer hql = new StringBuffer(); - hql.append(" FROM PricingClasseTarifaria pct "); - hql.append(" WHERE pct.sigla = :sigla "); - hql.append(" AND pct.activo = :activo "); - - Query query = getSession().createQuery(hql.toString()); - query.setParameter("activo", Boolean.TRUE); - query.setParameter("sigla", sigla); - - if (query.list().isEmpty()) - return true; - else - return false; - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingClasseTarifariaDAO; +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; + +@Repository("pricingClasseTarifariaDAO") +public class PricingClasseTarifariaHibernateDAO extends GenericHibernateDAO + implements PricingClasseTarifariaDAO { + + @Autowired + public PricingClasseTarifariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public Boolean validacionSigla(String sigla) { + + StringBuffer hql = new StringBuffer(); + hql.append(" FROM PricingClasseTarifaria pct "); + hql.append(" WHERE pct.sigla = :sigla "); + hql.append(" AND pct.activo = :activo "); + + Query query = getSession().createQuery(hql.toString()); + query.setParameter("activo", Boolean.TRUE); + query.setParameter("sigla", sigla); + + if (query.list().isEmpty()) + return true; + else + return false; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java index bb0666732..7abf9fa90 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.PricingCtrl; - -@Repository("pricingCtrlDAO") -public class PricingCtrlHibernateDAO extends GenericHibernateDAO implements PricingCtrlDAO { - - @Autowired - public PricingCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List obtenerTodos() { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return c.list(); - } - - @Override - public PricingCtrl obtenerPricingCtrl() { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setMaxResults(1); - return (PricingCtrl) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.PricingCtrl; + +@Repository("pricingCtrlDAO") +public class PricingCtrlHibernateDAO extends GenericHibernateDAO implements PricingCtrlDAO { + + @Autowired + public PricingCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List obtenerTodos() { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return c.list(); + } + + @Override + public PricingCtrl obtenerPricingCtrl() { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setMaxResults(1); + return (PricingCtrl) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java index 8f6e954e3..a3b23a271 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoAgenciaDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; - - -@Repository("pricingEspecificoAgenciaDAO") -public class PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO implements PricingEspecificoAgenciaDAO { - - @Autowired - public PricingEspecificoAgenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - @SuppressWarnings("unchecked") - @Override - public Boolean isDuplicado(PricingEspecificoAgencia entidad) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("puntoVenta.puntoventaId", entidad.getPuntoVenta().getPuntoventaId())); - - return c.list().isEmpty(); - } -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoAgenciaDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; + + +@Repository("pricingEspecificoAgenciaDAO") +public class PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO implements PricingEspecificoAgenciaDAO { + + @Autowired + public PricingEspecificoAgenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + @SuppressWarnings("unchecked") + @Override + public Boolean isDuplicado(PricingEspecificoAgencia entidad) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("puntoVenta.puntoventaId", entidad.getPuntoVenta().getPuntoventaId())); + + return c.list().isEmpty(); + } +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCanalVendasHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCanalVendasHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCanalVendasHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCanalVendasHibernateDAO.java index ce252bdcc..aa4f75ca9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCanalVendasHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCanalVendasHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoCanalVendasDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; - - -@Repository("pricingEspecificoCanalVendasDAO") -public class PricingEspecificoCanalVendasHibernateDAO extends GenericHibernateDAO implements PricingEspecificoCanalVendasDAO { - - @Autowired - public PricingEspecificoCanalVendasHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - @SuppressWarnings("unchecked") - @Override - public Boolean isDuplicado(PricingEspecificoCanalVendas entidad) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("tipoPtovta.tipoptovtaId", entidad.getTipoPtovta().getTipoptovtaId())); - - return c.list().isEmpty(); - } -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoCanalVendasDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; + + +@Repository("pricingEspecificoCanalVendasDAO") +public class PricingEspecificoCanalVendasHibernateDAO extends GenericHibernateDAO implements PricingEspecificoCanalVendasDAO { + + @Autowired + public PricingEspecificoCanalVendasHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + @SuppressWarnings("unchecked") + @Override + public Boolean isDuplicado(PricingEspecificoCanalVendas entidad) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("tipoPtovta.tipoptovtaId", entidad.getTipoPtovta().getTipoptovtaId())); + + return c.list().isEmpty(); + } +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java index c63af2fcf..c5a9e923e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoCategoriaDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; - -@Repository("pricingEspecificoCategoriaDAO") -public class PricingEspecificoCategoriaHibernateDAO extends GenericHibernateDAO implements PricingEspecificoCategoriaDAO { - - @Autowired - public PricingEspecificoCategoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public Boolean isDuplicado(PricingEspecificoCategoria entidad) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("categoria.categoriaId", entidad.getCategoria().getCategoriaId())); - - return c.list().isEmpty(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoCategoriaDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; + +@Repository("pricingEspecificoCategoriaDAO") +public class PricingEspecificoCategoriaHibernateDAO extends GenericHibernateDAO implements PricingEspecificoCategoriaDAO { + + @Autowired + public PricingEspecificoCategoriaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public Boolean isDuplicado(PricingEspecificoCategoria entidad) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("categoria.categoriaId", entidad.getCategoria().getCategoriaId())); + + return c.list().isEmpty(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java index 96bdc73ee..d1b21316f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoOcupacionDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; - - -@Repository("pricingEspecificoOcupacionDAO") -public class PricingEspecificoOcupacionHibernateDAO extends GenericHibernateDAO implements PricingEspecificoOcupacionDAO { - - @Autowired - public PricingEspecificoOcupacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoOcupacionDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; + + +@Repository("pricingEspecificoOcupacionDAO") +public class PricingEspecificoOcupacionHibernateDAO extends GenericHibernateDAO implements PricingEspecificoOcupacionDAO { + + @Autowired + public PricingEspecificoOcupacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingFormapagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingFormapagoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingFormapagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingFormapagoHibernateDAO.java index 17e36bc40..b51f067a2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingFormapagoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingFormapagoHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PricingFormapagoDAO; -import com.rjconsultores.ventaboletos.entidad.PricingFormapago; - -@Repository("pricingFormapagoDAO") -public class PricingFormapagoHibernateDAO extends GenericHibernateDAO implements PricingFormapagoDAO { - - @Autowired - public PricingFormapagoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PricingFormapagoDAO; +import com.rjconsultores.ventaboletos.entidad.PricingFormapago; + +@Repository("pricingFormapagoDAO") +public class PricingFormapagoHibernateDAO extends GenericHibernateDAO implements PricingFormapagoDAO { + + @Autowired + public PricingFormapagoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdClaseServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdClaseServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdClaseServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdClaseServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java index 903d201e8..b24dcf73d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java @@ -1,43 +1,43 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtoVtaCheckinDAO; -import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; - -@Repository("ptoVtaCheckinDAO") -public class PtoVtaCheckinHibernateDAO extends GenericHibernateDAO - implements PtoVtaCheckinDAO { - - @Autowired - public PtoVtaCheckinHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("ptoVtaCheckinId")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("ptoVtaCheckinId", id)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtoVtaCheckinDAO; +import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; + +@Repository("ptoVtaCheckinDAO") +public class PtoVtaCheckinHibernateDAO extends GenericHibernateDAO + implements PtoVtaCheckinDAO { + + @Autowired + public PtoVtaCheckinHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("ptoVtaCheckinId")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("ptoVtaCheckinId", id)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java index b5af5b346..8f8e6a830 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java @@ -1,43 +1,43 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtoVtaSeguroDAO; -import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; - -@Repository("ptoVtaSeguroDAO") -public class PtoVtaSeguroHibernateDAO extends GenericHibernateDAO - implements PtoVtaSeguroDAO { - - @Autowired - public PtoVtaSeguroHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("ptoVtaSeguroId")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("ptoVtaSeguroId", id)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtoVtaSeguroDAO; +import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; + +@Repository("ptoVtaSeguroDAO") +public class PtoVtaSeguroHibernateDAO extends GenericHibernateDAO + implements PtoVtaSeguroDAO { + + @Autowired + public PtoVtaSeguroHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("ptoVtaSeguroId")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("ptoVtaSeguroId", id)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java index b93235840..c51490e09 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaAgenciaDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; -import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; - -@Repository("ptovtaAgenciaBancariaDAO") -public class PtovtaAgenciaHibernateDAO extends GenericHibernateDAO - implements PtovtaAgenciaDAO { - - @Autowired - public PtovtaAgenciaHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("numagencia")); - - return c.list(); - } - - public List buscar(String numagencia) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("numagencia", numagencia)); - - - return c.list(); - } - - public void borrarFisico(PtovtaAgencia pto) { - String hql = " delete from PtovtaAgencia " - + " where ptovtaAgenciaId = " + pto.getPtovtaAgenciaId(); - Query sq = getSession().createQuery(hql); - sq.executeUpdate(); - } -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaAgenciaDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; +import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; + +@Repository("ptovtaAgenciaBancariaDAO") +public class PtovtaAgenciaHibernateDAO extends GenericHibernateDAO + implements PtovtaAgenciaDAO { + + @Autowired + public PtovtaAgenciaHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("numagencia")); + + return c.list(); + } + + public List buscar(String numagencia) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("numagencia", numagencia)); + + + return c.list(); + } + + public void borrarFisico(PtovtaAgencia pto) { + String hql = " delete from PtovtaAgencia " + + " where ptovtaAgenciaId = " + pto.getPtovtaAgenciaId(); + Query sq = getSession().createQuery(hql); + sq.executeUpdate(); + } +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java index a5bb93f0c..a378a0136 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaAntecipacomissaoDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; - -@Repository("ptovtaAntecipacomissaoDAO") -public class PtovtaAntecipacomissaoHibernateDAO extends GenericHibernateDAO - implements PtovtaAntecipacomissaoDAO { - - @Autowired - public PtovtaAntecipacomissaoHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("id", id)); - - - return c.list(); - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaAntecipacomissaoDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; + +@Repository("ptovtaAntecipacomissaoDAO") +public class PtovtaAntecipacomissaoHibernateDAO extends GenericHibernateDAO + implements PtovtaAntecipacomissaoDAO { + + @Autowired + public PtovtaAntecipacomissaoHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("id", id)); + + + return c.list(); + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntifraudeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntifraudeHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntifraudeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntifraudeHibernateDAO.java index 391c482c6..7b2998b78 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntifraudeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntifraudeHibernateDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaAntifraudeDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; - -@Repository("ptovtaAntifraudeHibernateDAO") -public class PtovtaAntifraudeHibernateDAO extends GenericHibernateDAO implements PtovtaAntifraudeDAO { - - @Autowired - public PtovtaAntifraudeHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaAntifraudeDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; + +@Repository("ptovtaAntifraudeHibernateDAO") +public class PtovtaAntifraudeHibernateDAO extends GenericHibernateDAO implements PtovtaAntifraudeDAO { + + @Autowired + public PtovtaAntifraudeHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaCatIndHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaCatIndHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaCatIndHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaCatIndHibernateDAO.java index 63a0ae323..5ed010c2f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaCatIndHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaCatIndHibernateDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaCatIndDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; - -@Repository("ptovtaCatIndDAO") -public class PtovtaCatIndHibernateDAO extends GenericHibernateDAO - implements PtovtaCatIndDAO { - - @Autowired - public PtovtaCatIndHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaCatIndDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; + +@Repository("ptovtaCatIndDAO") +public class PtovtaCatIndHibernateDAO extends GenericHibernateDAO + implements PtovtaCatIndDAO { + + @Autowired + public PtovtaCatIndHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java index ac21accd1..591487440 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java @@ -1,66 +1,66 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -@Repository("ptovtaComissaoDAO") -public class PtovtaComissaoHibernateDAO extends GenericHibernateDAO - implements PtovtaComissaoDAO { - - @Autowired - public PtovtaComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("id", id)); - - return c.list(); - } - - public List buscarByPuntaVenta(PuntoVenta puntaVenta) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("puntoventaId", puntaVenta)); - - c.addOrder(Order.asc("empresaId")); - - return c.list(); - } - - @Override - public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("puntoventaId", new PuntoVenta(puntaVentaId))); - c.add(Restrictions.eq("empresaId", new Empresa(empresaId))); - c.setMaxResults(1); - - return (PtovtaComissao) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +@Repository("ptovtaComissaoDAO") +public class PtovtaComissaoHibernateDAO extends GenericHibernateDAO + implements PtovtaComissaoDAO { + + @Autowired + public PtovtaComissaoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("id", id)); + + return c.list(); + } + + public List buscarByPuntaVenta(PuntoVenta puntaVenta) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("puntoventaId", puntaVenta)); + + c.addOrder(Order.asc("empresaId")); + + return c.list(); + } + + @Override + public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("puntoventaId", new PuntoVenta(puntaVentaId))); + c.add(Restrictions.eq("empresaId", new Empresa(empresaId))); + c.setMaxResults(1); + + return (PtovtaComissao) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaContaMDHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaContaMDHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaContaMDHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaContaMDHibernateDAO.java index 3bd9f88b0..e737333a1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaContaMDHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaContaMDHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaContaMDDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; - -@Repository("PtovtaContaMDDAO") -public class PtovtaContaMDHibernateDAO extends GenericHibernateDAO implements PtovtaContaMDDAO { - - - @Autowired - public PtovtaContaMDHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public boolean contemItem(PtovtaContaMD ptovtaContaMD) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("empresaId", ptovtaContaMD.getEmpresaId())); - c.add(Restrictions.eq("contaId", ptovtaContaMD.getContaId())); - c.add(Restrictions.eq("puntoventaId", ptovtaContaMD.getPuntoventaId())); - return !c.list().isEmpty(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaContaMDDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; + +@Repository("PtovtaContaMDDAO") +public class PtovtaContaMDHibernateDAO extends GenericHibernateDAO implements PtovtaContaMDDAO { + + + @Autowired + public PtovtaContaMDHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public boolean contemItem(PtovtaContaMD ptovtaContaMD) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("empresaId", ptovtaContaMD.getEmpresaId())); + c.add(Restrictions.eq("contaId", ptovtaContaMD.getContaId())); + c.add(Restrictions.eq("puntoventaId", ptovtaContaMD.getPuntoventaId())); + return !c.list().isEmpty(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java index 421468a38..defb4b222 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaDiversosDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; - - -@Repository("ptovtaDiversosDAO") -public class PtovtaDiversosHibernateDAO extends GenericHibernateDAO - implements PtovtaDiversosDAO { - - @Autowired - public PtovtaDiversosHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("id", id)); - - - return c.list(); - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaDiversosDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; + + +@Repository("ptovtaDiversosDAO") +public class PtovtaDiversosHibernateDAO extends GenericHibernateDAO + implements PtovtaDiversosDAO { + + @Autowired + public PtovtaDiversosHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("id", id)); + + + return c.list(); + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java index 596e4ac38..452c473c6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaDiversosDAO; -import com.rjconsultores.ventaboletos.dao.PtovtaEmpresaBloqueadaDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; -import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; - -@Repository("ptovtaEmpresaBloqueadaDAO") -public class PtovtaEmpresaBloqueadaHibernateDAO extends GenericHibernateDAO - implements PtovtaEmpresaBloqueadaDAO { - - @Autowired - public PtovtaEmpresaBloqueadaHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("ptovtaempbloqueadaId")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("ptovtaempbloqueadaId", id)); - - - return c.list(); - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaDiversosDAO; +import com.rjconsultores.ventaboletos.dao.PtovtaEmpresaBloqueadaDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; + +@Repository("ptovtaEmpresaBloqueadaDAO") +public class PtovtaEmpresaBloqueadaHibernateDAO extends GenericHibernateDAO + implements PtovtaEmpresaBloqueadaDAO { + + @Autowired + public PtovtaEmpresaBloqueadaHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("ptovtaempbloqueadaId")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("ptovtaempbloqueadaId", id)); + + + return c.list(); + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java index 4b281e4cd..5ef386370 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaEstoqueDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; - - -@Repository("ptovtaEstoqueDAO") -public class PtovtaEstoqueHibernateDAO extends GenericHibernateDAO - implements PtovtaEstoqueDAO { - - @Autowired - public PtovtaEstoqueHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("id", id)); - - - return c.list(); - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaEstoqueDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; + + +@Repository("ptovtaEstoqueDAO") +public class PtovtaEstoqueHibernateDAO extends GenericHibernateDAO + implements PtovtaEstoqueDAO { + + @Autowired + public PtovtaEstoqueHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("id", id)); + + + return c.list(); + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaExcecaoMultaCancHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaExcecaoMultaCancHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaExcecaoMultaCancHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaExcecaoMultaCancHibernateDAO.java index d855ebe6a..d5aa7ae7a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaExcecaoMultaCancHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaExcecaoMultaCancHibernateDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaExcecaoMultaCancDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; - -@Repository("ptovtaExcecaoMultaCancHibernateDAO") -public class PtovtaExcecaoMultaCancHibernateDAO extends GenericHibernateDAO implements PtovtaExcecaoMultaCancDAO { - - @Autowired - public PtovtaExcecaoMultaCancHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaExcecaoMultaCancDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; + +@Repository("ptovtaExcecaoMultaCancHibernateDAO") +public class PtovtaExcecaoMultaCancHibernateDAO extends GenericHibernateDAO implements PtovtaExcecaoMultaCancDAO { + + @Autowired + public PtovtaExcecaoMultaCancHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java index 23cc320a2..03baef28a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java @@ -1,50 +1,50 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaEstoqueDAO; -import com.rjconsultores.ventaboletos.dao.PtovtaHorarioDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; -import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; - - -@Repository("ptovtaHorarioDAO") -public class PtovtaHorarioHibernateDAO extends GenericHibernateDAO - implements PtovtaHorarioDAO { - - @Autowired - public PtovtaHorarioHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("id", id)); - - - return c.list(); - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaEstoqueDAO; +import com.rjconsultores.ventaboletos.dao.PtovtaHorarioDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; +import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; + + +@Repository("ptovtaHorarioDAO") +public class PtovtaHorarioHibernateDAO extends GenericHibernateDAO + implements PtovtaHorarioDAO { + + @Autowired + public PtovtaHorarioHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("id", id)); + + + return c.list(); + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTipoEstoqueHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTipoEstoqueHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTipoEstoqueHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTipoEstoqueHibernateDAO.java index 0c30b7253..96dedf72f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTipoEstoqueHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTipoEstoqueHibernateDAO.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaTipoEstoqueDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaTipoEstoque; - -@Repository("ptovtaTipoEstoqueDAO") -public class PtovtaTipoEstoqueHibernateDAO extends GenericHibernateDAO implements PtovtaTipoEstoqueDAO { - - @Autowired - public PtovtaTipoEstoqueHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public PtovtaTipoEstoque buscarTipoSuprimento() { - PtovtaTipoEstoque tipo = buscarTipo(PtovtaTipoEstoque.TIPO_SUMINISTRO); - return tipo; - } - - @Override - public PtovtaTipoEstoque buscarTipoContabilidade() { - PtovtaTipoEstoque tipo = buscarTipo(PtovtaTipoEstoque.TIPO_CONTABILIDAD); - return tipo; - } - - @Override - public PtovtaTipoEstoque buscarTipoNormal() { - PtovtaTipoEstoque tipo = buscarTipo(PtovtaTipoEstoque.TIPO_NORMAL); - return tipo; - } - - private PtovtaTipoEstoque buscarTipo(int tipo) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("ptovtatipoestId", tipo)); - - return (PtovtaTipoEstoque) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaTipoEstoqueDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaTipoEstoque; + +@Repository("ptovtaTipoEstoqueDAO") +public class PtovtaTipoEstoqueHibernateDAO extends GenericHibernateDAO implements PtovtaTipoEstoqueDAO { + + @Autowired + public PtovtaTipoEstoqueHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public PtovtaTipoEstoque buscarTipoSuprimento() { + PtovtaTipoEstoque tipo = buscarTipo(PtovtaTipoEstoque.TIPO_SUMINISTRO); + return tipo; + } + + @Override + public PtovtaTipoEstoque buscarTipoContabilidade() { + PtovtaTipoEstoque tipo = buscarTipo(PtovtaTipoEstoque.TIPO_CONTABILIDAD); + return tipo; + } + + @Override + public PtovtaTipoEstoque buscarTipoNormal() { + PtovtaTipoEstoque tipo = buscarTipo(PtovtaTipoEstoque.TIPO_NORMAL); + return tipo; + } + + private PtovtaTipoEstoque buscarTipo(int tipo) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("ptovtatipoestId", tipo)); + + return (PtovtaTipoEstoque) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java index fa4a16b8d..31ca78119 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java @@ -1,49 +1,49 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.PtovtaTitularDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; - - - -@Repository("ptovtaTitularDAO") -public class PtovtaTitularHibernateDAO extends GenericHibernateDAO - implements PtovtaTitularDAO { - - @Autowired - public PtovtaTitularHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("id")); - - return c.list(); - } - - public List buscar(int id) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("id", id)); - - - return c.list(); - } - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaTitularDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; + + + +@Repository("ptovtaTitularDAO") +public class PtovtaTitularHibernateDAO extends GenericHibernateDAO + implements PtovtaTitularDAO { + + @Autowired + public PtovtaTitularHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("id")); + + return c.list(); + } + + public List buscar(int id) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("id", id)); + + + return c.list(); + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java index 761beff25..f9d3d0cbc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java @@ -1,438 +1,438 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.sql.DataSource; - -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; -import com.rjconsultores.ventaboletos.dao.ReceitaDespesaDAO; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; - -@Repository("receitaDespesaDAO") -public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO { - - private static final Logger log = LogManager.getLogger(ReceitaDespesaHibernateDAO.class); - - @Autowired - private DataSource dataSourceRead; - - private Map parametrosFiltro; - - @Override - public List getRelatorioDetalhado(Map parametros) throws BusinessException { - Connection con = null; - try { - con = dataSourceRead.getConnection(); - - StringBuilder sql = new StringBuilder(); - sql.append(" SELECT ") - .append("LISTAGG(fp.cvepago||' /'||CAST(cfp.IMPORTE AS VARCHAR(10)),';') WITHIN GROUP( ORDER BY 1 DESC ) AS descpago,") - .append(" C.FECHORVTA, P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ") - .append(" C.NUMSERIEPREIMPRESA, C.NUMFOLIOPREIMPRESO, E.NUMDOCUMENTO,E.EVENTOEXTRA_ID, TE.CVETIPOEVENTO, E.BOLETO_ID, E.DESCINFO ") - .append(" FROM CAJA_DIVERSOS C ") - .append(" JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") - .append(" JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") - .append(" JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") - .append(" JOIN CAJA_DIVERSOS_PAGO cfp ON ( c.cajadiversos_id = cfp.cajadiversos_id)") - .append(" JOIN FORMA_PAGO fp ON ( cfp.formapago_id = fp.formapago_id )") - .append(" LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") - .append("WHERE C.ACTIVO = 1 "); - - adicionarFiltros(sql, parametros); - - sql.append(" GROUP BY ") - .append("c.fechorvta, ") - .append("p.puntoventa_id, ") - .append("p.nombpuntoventa, ") - .append("p.numpuntoventa, ") - .append("te.tipoeventoextra_id, ") - .append("te.desctipoevento, ") - .append("c.numseriepreimpresa, ") - .append("c.numfoliopreimpreso, ") - .append("e.numdocumento, ") - .append("e.eventoextra_id, ") - .append("te.cvetipoevento, ") - .append("e.boleto_id, ") - .append("e.descinfo "); - - sql.append("ORDER BY C.FECHORVTA, TE.DESCTIPOEVENTO, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA"); - - NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); - setParametros(stmt); - - HashSet tiposEventosSubstituir = new HashSet(); - tiposEventosSubstituir.add(TipoEventoExtra.TARIFA_SAFER.toString()); - - ResultSet resultSet = stmt.executeQuery(); - List lsBean = new ArrayList(); - while (resultSet.next()) { - RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); - bean.setDescTipoEvento(resultSet.getString("DESCTIPOEVENTO")); - bean.setFecHorVta(resultSet.getDate("FECHORVTA")); - bean.setTipoEventoExtraId(resultSet.getString("TIPOEVENTOEXTRA_ID")); - bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); - bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); - bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); - bean.setFormaPagamento(resultSet.getString("DESCPAGO")); - bean.setNumSeriePreImpresa(resultSet.getString("NUMSERIEPREIMPRESA")); - bean.setNumFolioPreImpreso(resultSet.getString("NUMFOLIOPREIMPRESO")); - bean.setCveTipoEvento(resultSet.getString("CVETIPOEVENTO")); - bean.setDescricao(resultSet.getString("DESCINFO")); - - if (bean.getCveTipoEvento() != null && tiposEventosSubstituir.contains(bean.getCveTipoEvento())) { - bean.setNumDocumento(resultSet.getString("BOLETO_ID")); - } else { - bean.setNumDocumento(resultSet.getString("NUMDOCUMENTO")); - } - - setFormasDePagamento(bean); - setValorFormaPagamento(bean); - - bean.setIndtipo(MoneyHelper.isMaiorIgual(bean.getPrecio(), BigDecimal.ZERO) ? 1 : 0); - lsBean.add(bean); - } - - return lsBean; - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - }finally { - try { - if (con != null && !con.isClosed()) { - con.close(); - } - } - catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public List getRelatorioSintetico(Map parametros) throws BusinessException { - Connection con = null; - try { - con = dataSourceRead.getConnection(); - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, CDP.IMPORTE ") - .append("FROM CAJA_DIVERSOS C ") - .append("JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") - .append("JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") - .append("JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") - .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOS_ID = C.CAJADIVERSOS_ID ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") - .append("WHERE C.ACTIVO = 1 "); - - adicionarFiltros(sql, parametros); - - sql.append("ORDER BY P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA"); - - NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); - setParametros(stmt); - - ResultSet resultSet = stmt.executeQuery(); - Map map = new HashMap(); - while (resultSet.next()) { - RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); - bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); - bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); - bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); - - if(map.containsKey(bean.getPuntoVentaId())) { - bean = map.get(bean.getPuntoVentaId()); - } - - BigDecimal precio = resultSet.getBigDecimal("IMPORTE"); - if(MoneyHelper.isMaiorIgual(precio, BigDecimal.ZERO)) { - bean.setReceita(MoneyHelper.somar(bean.getReceita(), precio)); - } else { - bean.setDespesa(MoneyHelper.somar(bean.getDespesa(), precio)); - } - - map.put(bean.getPuntoVentaId(), bean); - } - List lsBean = new ArrayList(map.values()); - - return lsBean; - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - }finally { - try { - if (con != null && !con.isClosed()) { - con.close(); - } - } - catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public List getRelatorioAgencia(Map parametros) throws BusinessException { - Connection con = null; - try { - con = dataSourceRead.getConnection(); - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ") - .append("SUM(CDP.IMPORTE) PRECIO ") - .append("FROM CAJA_DIVERSOS C ") - .append("JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") - .append("JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") - .append("JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") - .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOS_ID = C.CAJADIVERSOS_ID ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") - .append("WHERE C.ACTIVO = 1 "); - - adicionarFiltros(sql, parametros); - - sql.append("GROUP BY P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO ") - .append("ORDER BY P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.DESCTIPOEVENTO"); - - NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); - setParametros(stmt); - - ResultSet resultSet = stmt.executeQuery(); - List lsBean = new ArrayList(); - while (resultSet.next()) { - RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); - bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); - bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); - bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); - bean.setPrecio(resultSet.getBigDecimal("PRECIO")); - bean.setIndtipo(MoneyHelper.isMaiorIgual(bean.getPrecio(), BigDecimal.ZERO) ? 1 : 0); - bean.setTipoEventoExtraId(resultSet.getString("TIPOEVENTOEXTRA_ID")); - bean.setDescTipoEvento(resultSet.getString("DESCTIPOEVENTO")); - lsBean.add(bean); - } - - return lsBean; - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - }finally { - try { - if (con != null && !con.isClosed()) { - con.close(); - } - } - catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @Override - public List getRelatorioEvento(Map parametros) throws BusinessException { - Connection con = null; - try { - con = dataSourceRead.getConnection(); - - StringBuilder sql = new StringBuilder(); - sql.append("SELECT P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ") - .append("SUM(CDP.IMPORTE) PRECIO ") - .append("FROM CAJA_DIVERSOS C ") - .append("JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") - .append("JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") - .append("JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") - .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOS_ID = C.CAJADIVERSOS_ID ") - .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") - .append("WHERE C.ACTIVO = 1 "); - - adicionarFiltros(sql, parametros); - - sql.append("GROUP BY P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO ") - .append("ORDER BY TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, P.NOMBPUNTOVENTA"); - - NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); - setParametros(stmt); - - ResultSet resultSet = stmt.executeQuery(); - List lsBean = new ArrayList(); - while (resultSet.next()) { - RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); - bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); - bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); - bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); - bean.setPrecio(resultSet.getBigDecimal("PRECIO")); - bean.setIndtipo(MoneyHelper.isMaiorIgual(bean.getPrecio(), BigDecimal.ZERO) ? 1 : 0); - bean.setTipoEventoExtraId(resultSet.getString("TIPOEVENTOEXTRA_ID")); - bean.setDescTipoEvento(resultSet.getString("DESCTIPOEVENTO")); - lsBean.add(bean); - } - - return lsBean; - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - }finally { - try { - if (con != null && !con.isClosed()) { - con.close(); - } - } - catch (SQLException e) { - log.error(e.getMessage(), e); - } - } - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - private void adicionarFiltros(StringBuilder sql, Map parametros) { - parametrosFiltro = new HashMap(); - sql.append(" AND (E.BOLETO_ID IS NULL OR E.BOLETO_ID = B.BOLETO_ID) "); - - if(parametros.containsKey("empresaId")) { - sql.append("AND E.EMPRESA_ID = :empresaId "); - parametrosFiltro.put("empresaId", parametros.get("empresaId")); - } - - boolean isDataFechamentoCaixa = parametros.get("isDataFechamentoCaixa") != null ? BooleanUtils.toBoolean(parametros.get("isDataFechamentoCaixa").toString()) : false; - - if(isDataFechamentoCaixa) { - if(parametros.containsKey("fecInicio")) { - sql.append("AND C.FECCORTE >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI:SS') "); - parametrosFiltro.put("fecInicio", parametros.get("fecInicio")); - } - - if(parametros.containsKey("fecFinal")) { - sql.append("AND C.FECCORTE <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI:SS') "); - parametrosFiltro.put("fecFinal", parametros.get("fecFinal")); - } - } else { - if(parametros.containsKey("fecInicio")) { - sql.append("AND C.FECHORVTA >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI:SS') "); - parametrosFiltro.put("fecInicio", parametros.get("fecInicio")); - } - - if(parametros.containsKey("fecFinal")) { - sql.append("AND C.FECHORVTA <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI:SS') "); - parametrosFiltro.put("fecFinal", parametros.get("fecFinal")); - } - } - - if(parametros.containsKey("numDocumento")) { - sql.append("AND E.NUMDOCUMENTO = :numDocumento "); - parametrosFiltro.put("numDocumento", parametros.get("numDocumento")); - } - - if(parametros.containsKey("indTipo")) { - sql.append("AND TE.INDTIPO = :indTipo "); - parametrosFiltro.put("indTipo", parametros.get("indTipo")); - } - - if(parametros.containsKey("lsPuntoVenta")) { - List values = parametros.get("lsPuntoVenta") instanceof Collection ? new ArrayList((Collection) parametros.get("lsPuntoVenta")) : new ArrayList(((List) parametros.get("lsPuntoVenta"))); - int size = values.size(); - Integer[] ls = new Integer[size]; - for (int i = 0; i < size; i++) { - ls[i] = Integer.valueOf((values.get(i).toString())); - } - sql.append("AND C.PUNTOVENTA_ID IN (" + StringUtils.join(ls, ',') + ") "); - } - - if(parametros.containsKey("lsEventosExtra")) { - List values = parametros.get("lsEventosExtra") instanceof Collection ? new ArrayList((Collection) parametros.get("lsEventosExtra")) : new ArrayList(((List) parametros.get("lsEventosExtra"))); - int size = values.size(); - Integer[] ls = new Integer[size]; - for (int i = 0; i < size; i++) { - ls[i] = Integer.valueOf((values.get(i).toString())); - } - sql.append("AND TE.TIPOEVENTOEXTRA_ID IN (" + StringUtils.join(ls, ',') + ") "); - } - } - - private void setParametros(NamedParameterStatement stmt) throws SQLException { - for (Entry parametro : parametrosFiltro.entrySet()) { - stmt.setObject(parametro.getKey(), parametro.getValue()); - } - } - - private void setFormasDePagamento(RelatorioFinanceiroReceitasDespesasBean bean) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { - String formasPagamento = bean.getFormaPagamento(); - if (formasPagamento != null) { - - final String[] formaPagamento = formasPagamento.split("\\;") ; - if (formaPagamento.length > 1) { - int contador = 0; - while (contador < formaPagamento.length) { - final Class cls = bean.getClass(); - final String metodo = "setFormaPagamento" + (contador+1); - Method meth = cls.getMethod(metodo, String.class); - meth.invoke(bean, formatarFormaDePagamento(formaPagamento[contador])); - contador++; - } - } else { - bean.setFormaPagamento1(formatarFormaDePagamento(formaPagamento[0])); - } - } - } - - - private void setValorFormaPagamento(RelatorioFinanceiroReceitasDespesasBean bean) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { - String formasPagamento = bean.getFormaPagamento(); - if (formasPagamento != null) { - - final String[] formaPagamento = formasPagamento.split("\\;") ; - if (formaPagamento.length > 1) { - int contador = 0; - while (contador < formaPagamento.length) { - final Class cls = bean.getClass(); - final String metodo = "setValorFormaPagamento" + (contador+1); - Method meth = cls.getMethod(metodo, BigDecimal.class); - meth.invoke(bean, formatarValorFormaDePagamento(formaPagamento[contador])); - contador++; - } - } else { - bean.setValorFormaPagamento1(formatarValorFormaDePagamento(formaPagamento[0])); - } - } - - bean.setPrecio(MoneyHelper.somar(bean.getValorFormaPagamento1(), bean.getValorFormaPagamento2(), bean.getValorFormaPagamento3())); - } - - private String formatarFormaDePagamento(String formaDePagamento){ - if(formaDePagamento!=null){ - final String[] formaPagamentoAuxilar = formaDePagamento.split("\\/") ; - return formaPagamentoAuxilar[0]; - } - return null; - } - - private BigDecimal formatarValorFormaDePagamento(String formaDePagamento){ - if(formaDePagamento!=null){ - final String[] formaPagamentoAuxilar = formaDePagamento.split("\\/") ; - return formaPagamentoAuxilar.length>1? new BigDecimal(formaPagamentoAuxilar[1].replace(",", ".").trim()):new BigDecimal("0.0"); - } - return null; - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.sql.DataSource; + +import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; +import com.rjconsultores.ventaboletos.dao.ReceitaDespesaDAO; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +@Repository("receitaDespesaDAO") +public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO { + + private static final Logger log = LogManager.getLogger(ReceitaDespesaHibernateDAO.class); + + @Autowired + private DataSource dataSourceRead; + + private Map parametrosFiltro; + + @Override + public List getRelatorioDetalhado(Map parametros) throws BusinessException { + Connection con = null; + try { + con = dataSourceRead.getConnection(); + + StringBuilder sql = new StringBuilder(); + sql.append(" SELECT ") + .append("LISTAGG(fp.cvepago||' /'||CAST(cfp.IMPORTE AS VARCHAR(10)),';') WITHIN GROUP( ORDER BY 1 DESC ) AS descpago,") + .append(" C.FECHORVTA, P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ") + .append(" C.NUMSERIEPREIMPRESA, C.NUMFOLIOPREIMPRESO, E.NUMDOCUMENTO,E.EVENTOEXTRA_ID, TE.CVETIPOEVENTO, E.BOLETO_ID, E.DESCINFO ") + .append(" FROM CAJA_DIVERSOS C ") + .append(" JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") + .append(" JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") + .append(" JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") + .append(" JOIN CAJA_DIVERSOS_PAGO cfp ON ( c.cajadiversos_id = cfp.cajadiversos_id)") + .append(" JOIN FORMA_PAGO fp ON ( cfp.formapago_id = fp.formapago_id )") + .append(" LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") + .append("WHERE C.ACTIVO = 1 "); + + adicionarFiltros(sql, parametros); + + sql.append(" GROUP BY ") + .append("c.fechorvta, ") + .append("p.puntoventa_id, ") + .append("p.nombpuntoventa, ") + .append("p.numpuntoventa, ") + .append("te.tipoeventoextra_id, ") + .append("te.desctipoevento, ") + .append("c.numseriepreimpresa, ") + .append("c.numfoliopreimpreso, ") + .append("e.numdocumento, ") + .append("e.eventoextra_id, ") + .append("te.cvetipoevento, ") + .append("e.boleto_id, ") + .append("e.descinfo "); + + sql.append("ORDER BY C.FECHORVTA, TE.DESCTIPOEVENTO, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA"); + + NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); + setParametros(stmt); + + HashSet tiposEventosSubstituir = new HashSet(); + tiposEventosSubstituir.add(TipoEventoExtra.TARIFA_SAFER.toString()); + + ResultSet resultSet = stmt.executeQuery(); + List lsBean = new ArrayList(); + while (resultSet.next()) { + RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); + bean.setDescTipoEvento(resultSet.getString("DESCTIPOEVENTO")); + bean.setFecHorVta(resultSet.getDate("FECHORVTA")); + bean.setTipoEventoExtraId(resultSet.getString("TIPOEVENTOEXTRA_ID")); + bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); + bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); + bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); + bean.setFormaPagamento(resultSet.getString("DESCPAGO")); + bean.setNumSeriePreImpresa(resultSet.getString("NUMSERIEPREIMPRESA")); + bean.setNumFolioPreImpreso(resultSet.getString("NUMFOLIOPREIMPRESO")); + bean.setCveTipoEvento(resultSet.getString("CVETIPOEVENTO")); + bean.setDescricao(resultSet.getString("DESCINFO")); + + if (bean.getCveTipoEvento() != null && tiposEventosSubstituir.contains(bean.getCveTipoEvento())) { + bean.setNumDocumento(resultSet.getString("BOLETO_ID")); + } else { + bean.setNumDocumento(resultSet.getString("NUMDOCUMENTO")); + } + + setFormasDePagamento(bean); + setValorFormaPagamento(bean); + + bean.setIndtipo(MoneyHelper.isMaiorIgual(bean.getPrecio(), BigDecimal.ZERO) ? 1 : 0); + lsBean.add(bean); + } + + return lsBean; + + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + }finally { + try { + if (con != null && !con.isClosed()) { + con.close(); + } + } + catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @Override + public List getRelatorioSintetico(Map parametros) throws BusinessException { + Connection con = null; + try { + con = dataSourceRead.getConnection(); + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, CDP.IMPORTE ") + .append("FROM CAJA_DIVERSOS C ") + .append("JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") + .append("JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") + .append("JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") + .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOS_ID = C.CAJADIVERSOS_ID ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") + .append("WHERE C.ACTIVO = 1 "); + + adicionarFiltros(sql, parametros); + + sql.append("ORDER BY P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA"); + + NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); + setParametros(stmt); + + ResultSet resultSet = stmt.executeQuery(); + Map map = new HashMap(); + while (resultSet.next()) { + RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); + bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); + bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); + bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); + + if(map.containsKey(bean.getPuntoVentaId())) { + bean = map.get(bean.getPuntoVentaId()); + } + + BigDecimal precio = resultSet.getBigDecimal("IMPORTE"); + if(MoneyHelper.isMaiorIgual(precio, BigDecimal.ZERO)) { + bean.setReceita(MoneyHelper.somar(bean.getReceita(), precio)); + } else { + bean.setDespesa(MoneyHelper.somar(bean.getDespesa(), precio)); + } + + map.put(bean.getPuntoVentaId(), bean); + } + List lsBean = new ArrayList(map.values()); + + return lsBean; + + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + }finally { + try { + if (con != null && !con.isClosed()) { + con.close(); + } + } + catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @Override + public List getRelatorioAgencia(Map parametros) throws BusinessException { + Connection con = null; + try { + con = dataSourceRead.getConnection(); + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ") + .append("SUM(CDP.IMPORTE) PRECIO ") + .append("FROM CAJA_DIVERSOS C ") + .append("JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") + .append("JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") + .append("JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") + .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOS_ID = C.CAJADIVERSOS_ID ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") + .append("WHERE C.ACTIVO = 1 "); + + adicionarFiltros(sql, parametros); + + sql.append("GROUP BY P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO ") + .append("ORDER BY P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.DESCTIPOEVENTO"); + + NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); + setParametros(stmt); + + ResultSet resultSet = stmt.executeQuery(); + List lsBean = new ArrayList(); + while (resultSet.next()) { + RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); + bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); + bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); + bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); + bean.setPrecio(resultSet.getBigDecimal("PRECIO")); + bean.setIndtipo(MoneyHelper.isMaiorIgual(bean.getPrecio(), BigDecimal.ZERO) ? 1 : 0); + bean.setTipoEventoExtraId(resultSet.getString("TIPOEVENTOEXTRA_ID")); + bean.setDescTipoEvento(resultSet.getString("DESCTIPOEVENTO")); + lsBean.add(bean); + } + + return lsBean; + + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + }finally { + try { + if (con != null && !con.isClosed()) { + con.close(); + } + } + catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @Override + public List getRelatorioEvento(Map parametros) throws BusinessException { + Connection con = null; + try { + con = dataSourceRead.getConnection(); + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, ") + .append("SUM(CDP.IMPORTE) PRECIO ") + .append("FROM CAJA_DIVERSOS C ") + .append("JOIN EVENTO_EXTRA E ON E.EVENTOEXTRA_ID = C.EVENTOEXTRA_ID ") + .append("JOIN TIPO_EVENTO_EXTRA TE ON TE.TIPOEVENTOEXTRA_ID = E.TIPOEVENTOEXTRA_ID ") + .append("JOIN PUNTO_VENTA P ON P.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") + .append("JOIN CAJA_DIVERSOS_PAGO CDP ON CDP.CAJADIVERSOS_ID = C.CAJADIVERSOS_ID ") + .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = E.BOLETO_ID ") + .append("WHERE C.ACTIVO = 1 "); + + adicionarFiltros(sql, parametros); + + sql.append("GROUP BY P.PUNTOVENTA_ID, P.NOMBPUNTOVENTA, P.NUMPUNTOVENTA, TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO ") + .append("ORDER BY TE.TIPOEVENTOEXTRA_ID, TE.DESCTIPOEVENTO, P.NOMBPUNTOVENTA"); + + NamedParameterStatement stmt = new NamedParameterStatement(con, sql.toString()); + setParametros(stmt); + + ResultSet resultSet = stmt.executeQuery(); + List lsBean = new ArrayList(); + while (resultSet.next()) { + RelatorioFinanceiroReceitasDespesasBean bean = new RelatorioFinanceiroReceitasDespesasBean(); + bean.setPuntoVentaId(resultSet.getInt("PUNTOVENTA_ID")); + bean.setNombPuntoVenta(resultSet.getString("NOMBPUNTOVENTA")); + bean.setNumPuntoVenta(resultSet.getString("NUMPUNTOVENTA")); + bean.setPrecio(resultSet.getBigDecimal("PRECIO")); + bean.setIndtipo(MoneyHelper.isMaiorIgual(bean.getPrecio(), BigDecimal.ZERO) ? 1 : 0); + bean.setTipoEventoExtraId(resultSet.getString("TIPOEVENTOEXTRA_ID")); + bean.setDescTipoEvento(resultSet.getString("DESCTIPOEVENTO")); + lsBean.add(bean); + } + + return lsBean; + + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + }finally { + try { + if (con != null && !con.isClosed()) { + con.close(); + } + } + catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + private void adicionarFiltros(StringBuilder sql, Map parametros) { + parametrosFiltro = new HashMap(); + sql.append(" AND (E.BOLETO_ID IS NULL OR E.BOLETO_ID = B.BOLETO_ID) "); + + if(parametros.containsKey("empresaId")) { + sql.append("AND E.EMPRESA_ID = :empresaId "); + parametrosFiltro.put("empresaId", parametros.get("empresaId")); + } + + boolean isDataFechamentoCaixa = parametros.get("isDataFechamentoCaixa") != null ? BooleanUtils.toBoolean(parametros.get("isDataFechamentoCaixa").toString()) : false; + + if(isDataFechamentoCaixa) { + if(parametros.containsKey("fecInicio")) { + sql.append("AND C.FECCORTE >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI:SS') "); + parametrosFiltro.put("fecInicio", parametros.get("fecInicio")); + } + + if(parametros.containsKey("fecFinal")) { + sql.append("AND C.FECCORTE <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI:SS') "); + parametrosFiltro.put("fecFinal", parametros.get("fecFinal")); + } + } else { + if(parametros.containsKey("fecInicio")) { + sql.append("AND C.FECHORVTA >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI:SS') "); + parametrosFiltro.put("fecInicio", parametros.get("fecInicio")); + } + + if(parametros.containsKey("fecFinal")) { + sql.append("AND C.FECHORVTA <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI:SS') "); + parametrosFiltro.put("fecFinal", parametros.get("fecFinal")); + } + } + + if(parametros.containsKey("numDocumento")) { + sql.append("AND E.NUMDOCUMENTO = :numDocumento "); + parametrosFiltro.put("numDocumento", parametros.get("numDocumento")); + } + + if(parametros.containsKey("indTipo")) { + sql.append("AND TE.INDTIPO = :indTipo "); + parametrosFiltro.put("indTipo", parametros.get("indTipo")); + } + + if(parametros.containsKey("lsPuntoVenta")) { + List values = parametros.get("lsPuntoVenta") instanceof Collection ? new ArrayList((Collection) parametros.get("lsPuntoVenta")) : new ArrayList(((List) parametros.get("lsPuntoVenta"))); + int size = values.size(); + Integer[] ls = new Integer[size]; + for (int i = 0; i < size; i++) { + ls[i] = Integer.valueOf((values.get(i).toString())); + } + sql.append("AND C.PUNTOVENTA_ID IN (" + StringUtils.join(ls, ',') + ") "); + } + + if(parametros.containsKey("lsEventosExtra")) { + List values = parametros.get("lsEventosExtra") instanceof Collection ? new ArrayList((Collection) parametros.get("lsEventosExtra")) : new ArrayList(((List) parametros.get("lsEventosExtra"))); + int size = values.size(); + Integer[] ls = new Integer[size]; + for (int i = 0; i < size; i++) { + ls[i] = Integer.valueOf((values.get(i).toString())); + } + sql.append("AND TE.TIPOEVENTOEXTRA_ID IN (" + StringUtils.join(ls, ',') + ") "); + } + } + + private void setParametros(NamedParameterStatement stmt) throws SQLException { + for (Entry parametro : parametrosFiltro.entrySet()) { + stmt.setObject(parametro.getKey(), parametro.getValue()); + } + } + + private void setFormasDePagamento(RelatorioFinanceiroReceitasDespesasBean bean) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { + String formasPagamento = bean.getFormaPagamento(); + if (formasPagamento != null) { + + final String[] formaPagamento = formasPagamento.split("\\;") ; + if (formaPagamento.length > 1) { + int contador = 0; + while (contador < formaPagamento.length) { + final Class cls = bean.getClass(); + final String metodo = "setFormaPagamento" + (contador+1); + Method meth = cls.getMethod(metodo, String.class); + meth.invoke(bean, formatarFormaDePagamento(formaPagamento[contador])); + contador++; + } + } else { + bean.setFormaPagamento1(formatarFormaDePagamento(formaPagamento[0])); + } + } + } + + + private void setValorFormaPagamento(RelatorioFinanceiroReceitasDespesasBean bean) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { + String formasPagamento = bean.getFormaPagamento(); + if (formasPagamento != null) { + + final String[] formaPagamento = formasPagamento.split("\\;") ; + if (formaPagamento.length > 1) { + int contador = 0; + while (contador < formaPagamento.length) { + final Class cls = bean.getClass(); + final String metodo = "setValorFormaPagamento" + (contador+1); + Method meth = cls.getMethod(metodo, BigDecimal.class); + meth.invoke(bean, formatarValorFormaDePagamento(formaPagamento[contador])); + contador++; + } + } else { + bean.setValorFormaPagamento1(formatarValorFormaDePagamento(formaPagamento[0])); + } + } + + bean.setPrecio(MoneyHelper.somar(bean.getValorFormaPagamento1(), bean.getValorFormaPagamento2(), bean.getValorFormaPagamento3())); + } + + private String formatarFormaDePagamento(String formaDePagamento){ + if(formaDePagamento!=null){ + final String[] formaPagamentoAuxilar = formaDePagamento.split("\\/") ; + return formaPagamentoAuxilar[0]; + } + return null; + } + + private BigDecimal formatarValorFormaDePagamento(String formaDePagamento){ + if(formaDePagamento!=null){ + final String[] formaPagamentoAuxilar = formaDePagamento.split("\\/") ; + return formaPagamentoAuxilar.length>1? new BigDecimal(formaPagamentoAuxilar[1].replace(",", ".").trim()):new BigDecimal("0.0"); + } + return null; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RecuperarSenhaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RecuperarSenhaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RecuperarSenhaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RecuperarSenhaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java index 90b69fdc1..67575040e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.RegionMetropolitanaDAO; -import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; - -@Repository("regionMetropolitanaDAO") -public class RegionMetropolitanaHibernateDAO extends GenericHibernateDAO - implements RegionMetropolitanaDAO { - - @Autowired - public RegionMetropolitanaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.RegionMetropolitanaDAO; +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; + +@Repository("regionMetropolitanaDAO") +public class RegionMetropolitanaHibernateDAO extends GenericHibernateDAO + implements RegionMetropolitanaDAO { + + @Autowired + public RegionMetropolitanaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RelatorioAgepanHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RelatorioAgepanHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RelatorioAgepanHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RelatorioAgepanHibernateDAO.java index d702af569..050e0d2b7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RelatorioAgepanHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RelatorioAgepanHibernateDAO.java @@ -1,141 +1,141 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; -import java.util.Map; - -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.BigDecimalType; -import org.hibernate.type.DateType; -import org.hibernate.type.IntegerType; -import org.hibernate.type.StringType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.RelatorioAgepanDAO; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; - -@Repository("relatorioAgepanDAO") -public class RelatorioAgepanHibernateDAO extends HibernateDaoSupport implements RelatorioAgepanDAO { - -// public static int ORGAOCONCEDENTE_ID_AGEPAN = 4; - - @Autowired - public RelatorioAgepanHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List listar(Map parametros) throws BusinessException { - try { - - String fecInicioVenda = null; - if (parametros.get("fecInicioVenda") != null) { - fecInicioVenda = parametros.get("fecInicioVenda").toString() + " 00:00"; - } - String fecFinalVenda = null; - if (parametros.get("fecFinalVenda") != null) { - fecFinalVenda = parametros.get("fecFinalVenda").toString() + " 23:59"; - } - - String tipGratuIds = parametros.get("tipGratuIds").toString(); - String linhaIds = parametros.get("linhaIds").toString(); - Integer empresa = parametros.get("empresa") != null ? Integer.valueOf(parametros.get("empresa").toString()) : null; - Integer orgaoConcendenteAgepanId = parametros.get("orgaoConcendenteAgepanId") != null ? Integer.valueOf(parametros.get("orgaoConcendenteAgepanId").toString()) : null; - - - String sQuery = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tipGratuIds, empresa); - - Query qr = getSession().createSQLQuery(sQuery) - .addScalar("numBpe", StringType.INSTANCE) - .addScalar("fechorventa", DateType.INSTANCE) - .addScalar("origenId", IntegerType.INSTANCE) - .addScalar("puntoventaId", IntegerType.INSTANCE) - .addScalar("origem", StringType.INSTANCE) - .addScalar("destino", StringType.INSTANCE) - .addScalar("dhemb", StringType.INSTANCE) - .addScalar("nombpasajero", StringType.INSTANCE) - .addScalar("desctipodoc", StringType.INSTANCE) - .addScalar("descnumdoc", StringType.INSTANCE) - .addScalar("desctipodoc2", StringType.INSTANCE) - .addScalar("descnumdoc2", StringType.INSTANCE) - .addScalar("corridaextra", StringType.INSTANCE) - .addScalar("tiposervicobpe", StringType.INSTANCE) - .addScalar("fechorviaje", DateType.INSTANCE) - .addScalar("prefixo", StringType.INSTANCE) - .addScalar("numasiento", StringType.INSTANCE) - .addScalar("totalbilhete", BigDecimalType.INSTANCE) - .addScalar("totalbase", BigDecimalType.INSTANCE) - .addScalar("descontobpe", StringType.INSTANCE) - .addScalar("chbpe", StringType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(RelatorioGratuidadeAgepanVO.class)); - - - qr.setParameter("agepanId", orgaoConcendenteAgepanId); - qr.setParameter("fecInicioVenda", fecInicioVenda); - qr.setParameter("fecFinalVenda", fecFinalVenda); - if (empresa != null){ - qr.setParameter("empresaId", empresa); - } - - List retorno = qr.list(); - if(retorno == null || retorno.isEmpty()) { - throw new BusinessException("MSG.ningunRegistroRelatorio"); - } - - return retorno; - - } catch (BusinessException e) { - throw e; - } catch (Exception e) { - throw new BusinessException(e.getMessage(), e); - } - - } - - private String getSql(String fecInicioVenda, String fecFinalVenda, String linha, String tipoGratu, Integer empresa) { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT b.num_bpe numBpe, COALESCE(b.fechorventa_h,b.fechorventa) fechorventa, b.origen_id origenId, b.puntoventa_id puntoventaId, "); - sb.append("ori.descparada origem, des.descparada destino, bpe.dhemb, b.nombpasajero, b.desctipodoc, b.descnumdoc, b.desctipodoc2, b.descnumdoc2, "); - sb.append("CASE WHEN co.tiposervicio_id = 2 THEN '00' ELSE '01' END corridaextra, cs.tiposervicobpe, b.fechorviaje, r.prefixo, "); - sb.append("CASE WHEN b.numasiento like 'P%' THEN '0' ELSE b.numasiento END numasiento, "); - sb.append("NVL(b.preciobase,0) + NVL(b.importetaxaembarque,0) + NVL(b.importeseguro,0) + NVL(b.importeoutros,0) + NVL(b.importepedagio,0) as totalbase, "); - sb.append("NVL(b.preciopagado,0) + NVL(b.importetaxaembarque,0) + NVL(b.importeseguro,0) + NVL(b.importeoutros,0) + NVL(b.importepedagio,0) as totalbilhete, "); - sb.append("cat.descontobpe, bpe.chbpe "); - sb.append("from boleto b "); - sb.append("join bpe bpe on bpe.boleto_id = b.boleto_id "); - sb.append("join parada ori on ori.parada_id = b.origen_id "); - sb.append("join parada des on des.parada_id = b.destino_id "); - sb.append("join corrida co on co.corrida_id = b.corrida_id and co.feccorrida = b.feccorrida "); - sb.append("join clase_servicio cs on cs.claseservicio_id = co.claseservicio_id "); - sb.append("join ruta r on r.ruta_id = co.ruta_id "); - sb.append("join categoria cat on cat.categoria_id = b.categoria_id "); - sb.append("join marca m on m.marca_id = b.marca_id "); - sb.append("WHERE b.activo = 1 "); - sb.append("AND COALESCE(b.fechorventa_h,b.fechorventa) BETWEEN to_date(:fecInicioVenda,'dd/mm/yyyy hh24:mi') AND to_date(:fecFinalVenda,'dd/mm/yyyy hh24:mi') "); - sb.append("AND r.orgaoconcedente_id = :agepanId "); - sb.append("AND b.motivocancelacion_id is null "); - sb.append("AND bpe.codstat in ('100','102','150','-1') "); - - if( tipoGratu != null ) { - sb.append(" AND b.categoria_id in (").append(tipoGratu).append(") "); - } - - if( linha != null && !linha.equals("Todas")) { - sb.append(" AND r.ruta_id in (").append(linha).append(") "); - } - - if (empresa != null){ - sb.append("AND m.empresa_id = :empresaId "); - } - - return sb.toString(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; +import java.util.Map; + +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.BigDecimalType; +import org.hibernate.type.DateType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.StringType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.RelatorioAgepanDAO; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; + +@Repository("relatorioAgepanDAO") +public class RelatorioAgepanHibernateDAO extends HibernateDaoSupport implements RelatorioAgepanDAO { + +// public static int ORGAOCONCEDENTE_ID_AGEPAN = 4; + + @Autowired + public RelatorioAgepanHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List listar(Map parametros) throws BusinessException { + try { + + String fecInicioVenda = null; + if (parametros.get("fecInicioVenda") != null) { + fecInicioVenda = parametros.get("fecInicioVenda").toString() + " 00:00"; + } + String fecFinalVenda = null; + if (parametros.get("fecFinalVenda") != null) { + fecFinalVenda = parametros.get("fecFinalVenda").toString() + " 23:59"; + } + + String tipGratuIds = parametros.get("tipGratuIds").toString(); + String linhaIds = parametros.get("linhaIds").toString(); + Integer empresa = parametros.get("empresa") != null ? Integer.valueOf(parametros.get("empresa").toString()) : null; + Integer orgaoConcendenteAgepanId = parametros.get("orgaoConcendenteAgepanId") != null ? Integer.valueOf(parametros.get("orgaoConcendenteAgepanId").toString()) : null; + + + String sQuery = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tipGratuIds, empresa); + + Query qr = getSession().createSQLQuery(sQuery) + .addScalar("numBpe", StringType.INSTANCE) + .addScalar("fechorventa", DateType.INSTANCE) + .addScalar("origenId", IntegerType.INSTANCE) + .addScalar("puntoventaId", IntegerType.INSTANCE) + .addScalar("origem", StringType.INSTANCE) + .addScalar("destino", StringType.INSTANCE) + .addScalar("dhemb", StringType.INSTANCE) + .addScalar("nombpasajero", StringType.INSTANCE) + .addScalar("desctipodoc", StringType.INSTANCE) + .addScalar("descnumdoc", StringType.INSTANCE) + .addScalar("desctipodoc2", StringType.INSTANCE) + .addScalar("descnumdoc2", StringType.INSTANCE) + .addScalar("corridaextra", StringType.INSTANCE) + .addScalar("tiposervicobpe", StringType.INSTANCE) + .addScalar("fechorviaje", DateType.INSTANCE) + .addScalar("prefixo", StringType.INSTANCE) + .addScalar("numasiento", StringType.INSTANCE) + .addScalar("totalbilhete", BigDecimalType.INSTANCE) + .addScalar("totalbase", BigDecimalType.INSTANCE) + .addScalar("descontobpe", StringType.INSTANCE) + .addScalar("chbpe", StringType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(RelatorioGratuidadeAgepanVO.class)); + + + qr.setParameter("agepanId", orgaoConcendenteAgepanId); + qr.setParameter("fecInicioVenda", fecInicioVenda); + qr.setParameter("fecFinalVenda", fecFinalVenda); + if (empresa != null){ + qr.setParameter("empresaId", empresa); + } + + List retorno = qr.list(); + if(retorno == null || retorno.isEmpty()) { + throw new BusinessException("MSG.ningunRegistroRelatorio"); + } + + return retorno; + + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw new BusinessException(e.getMessage(), e); + } + + } + + private String getSql(String fecInicioVenda, String fecFinalVenda, String linha, String tipoGratu, Integer empresa) { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT b.num_bpe numBpe, COALESCE(b.fechorventa_h,b.fechorventa) fechorventa, b.origen_id origenId, b.puntoventa_id puntoventaId, "); + sb.append("ori.descparada origem, des.descparada destino, bpe.dhemb, b.nombpasajero, b.desctipodoc, b.descnumdoc, b.desctipodoc2, b.descnumdoc2, "); + sb.append("CASE WHEN co.tiposervicio_id = 2 THEN '00' ELSE '01' END corridaextra, cs.tiposervicobpe, b.fechorviaje, r.prefixo, "); + sb.append("CASE WHEN b.numasiento like 'P%' THEN '0' ELSE b.numasiento END numasiento, "); + sb.append("NVL(b.preciobase,0) + NVL(b.importetaxaembarque,0) + NVL(b.importeseguro,0) + NVL(b.importeoutros,0) + NVL(b.importepedagio,0) as totalbase, "); + sb.append("NVL(b.preciopagado,0) + NVL(b.importetaxaembarque,0) + NVL(b.importeseguro,0) + NVL(b.importeoutros,0) + NVL(b.importepedagio,0) as totalbilhete, "); + sb.append("cat.descontobpe, bpe.chbpe "); + sb.append("from boleto b "); + sb.append("join bpe bpe on bpe.boleto_id = b.boleto_id "); + sb.append("join parada ori on ori.parada_id = b.origen_id "); + sb.append("join parada des on des.parada_id = b.destino_id "); + sb.append("join corrida co on co.corrida_id = b.corrida_id and co.feccorrida = b.feccorrida "); + sb.append("join clase_servicio cs on cs.claseservicio_id = co.claseservicio_id "); + sb.append("join ruta r on r.ruta_id = co.ruta_id "); + sb.append("join categoria cat on cat.categoria_id = b.categoria_id "); + sb.append("join marca m on m.marca_id = b.marca_id "); + sb.append("WHERE b.activo = 1 "); + sb.append("AND COALESCE(b.fechorventa_h,b.fechorventa) BETWEEN to_date(:fecInicioVenda,'dd/mm/yyyy hh24:mi') AND to_date(:fecFinalVenda,'dd/mm/yyyy hh24:mi') "); + sb.append("AND r.orgaoconcedente_id = :agepanId "); + sb.append("AND b.motivocancelacion_id is null "); + sb.append("AND bpe.codstat in ('100','102','150','-1') "); + + if( tipoGratu != null ) { + sb.append(" AND b.categoria_id in (").append(tipoGratu).append(") "); + } + + if( linha != null && !linha.equals("Todas")) { + sb.append(" AND r.ruta_id in (").append(linha).append(") "); + } + + if (empresa != null){ + sb.append("AND m.empresa_id = :empresaId "); + } + + return sb.toString(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java index 81a17ce69..953165a22 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java @@ -1,2067 +1,2067 @@ -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; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.BooleanType; -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; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.ArquivoRemessa; -import com.rjconsultores.ventaboletos.ArquivoRemessaItem; -import com.rjconsultores.ventaboletos.ArquivoRemessaItemInteface; -import com.rjconsultores.ventaboletos.blocos.DetalheMulta; -import com.rjconsultores.ventaboletos.blocos.DetalheObrigatorio; -import com.rjconsultores.ventaboletos.blocos.DetalheRetorno; -import com.rjconsultores.ventaboletos.blocos.RodapeRemessaPadrao; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.ArquivoRemessaBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.CabecalhoLoteRemessaBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.CabecalhoRemessaBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.DetalheObrigatorioDadosPagadorBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.DetalheObrigatorioDadosTitulosBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.RodapeRemessaBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bancobrasil.RodapeRemessaLoteBancoBrasil; -import com.rjconsultores.ventaboletos.blocos.bradesco.ArquivoRemessaBradesco; -import com.rjconsultores.ventaboletos.blocos.bradesco.CabecalhoRemessaBradesco; -import com.rjconsultores.ventaboletos.blocos.bradesco.DetalheObrigatorioBradesco; -import com.rjconsultores.ventaboletos.blocos.caixa.ArquivoRemessaCaixa; -import com.rjconsultores.ventaboletos.blocos.caixa.CabecalhoRemessaCaixa; -import com.rjconsultores.ventaboletos.blocos.caixa.DetalheObrigatorioCaixa; -import com.rjconsultores.ventaboletos.blocos.itau.ArquivoRemessaItau; -import com.rjconsultores.ventaboletos.blocos.itau.CabecalhoRemessaItau; -import com.rjconsultores.ventaboletos.blocos.itau.DetalheObrigatorioItau; -import com.rjconsultores.ventaboletos.blocos.mercantil.ArquivoRemessaMercantil; -import com.rjconsultores.ventaboletos.blocos.mercantil.CabecalhoRemessaMercantil; -import com.rjconsultores.ventaboletos.blocos.mercantil.DetalheObrigatorioMercantil; -import com.rjconsultores.ventaboletos.blocos.safra.ArquivoRemessaSafra; -import com.rjconsultores.ventaboletos.blocos.safra.CabecalhoRemessaSafra; -import com.rjconsultores.ventaboletos.blocos.safra.DetalheObrigatorioSafra; -import com.rjconsultores.ventaboletos.blocos.safra.RodapeRemessaSafra; -import com.rjconsultores.ventaboletos.blocos.santander.ArquivoRemessaSantander; -import com.rjconsultores.ventaboletos.blocos.santander.CabecalhoRemessaSantander; -import com.rjconsultores.ventaboletos.blocos.santander.DetalheObrigatorioSantander; -import com.rjconsultores.ventaboletos.blocos.sicoob.ArquivoRemessaSicoob; -import com.rjconsultores.ventaboletos.blocos.sicoob.CabecalhoLoteRemessaSicoob; -import com.rjconsultores.ventaboletos.blocos.sicoob.CabecalhoRemessaSicoob; -import com.rjconsultores.ventaboletos.blocos.sicoob.DetalheObrigatorioDadosPagadorSicoob; -import com.rjconsultores.ventaboletos.blocos.sicoob.DetalheObrigatorioSicoob; -import com.rjconsultores.ventaboletos.blocos.sicoob.RodapeRemessaLoteSicoob; -import com.rjconsultores.ventaboletos.blocos.sicoob.RodapeRemessaSicoob; -import com.rjconsultores.ventaboletos.dao.RemessaCNABBancosDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; -import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.enuns.Aceite; -import com.rjconsultores.ventaboletos.enuns.BancoLayout; -import com.rjconsultores.ventaboletos.enuns.TipoInscricaoPagador; -import com.rjconsultores.ventaboletos.exception.ComissaoException; -import com.rjconsultores.ventaboletos.exception.ValidacaoRemessaException; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -@Repository("remessaCNABBancosDAO") -@SuppressWarnings({"unchecked"}) -public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO implements RemessaCNABBancosDAO{ - - private static final String NUMERAIS = "[^0-9]+"; - private static final String DATA_ATE = "dataAte"; - private static final String DATA_DE = "dataDe"; - private static final String EMPRESA_ID = "empresaId"; - private static final String ZERO_ESQUERDA = "00000000"; - private static final Logger log = LogManager.getLogger(RemessaCNABBancosHibernateDAO.class); - - @Autowired - public RemessaCNABBancosHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public String findBanco(Empresa empresa){ - - StringBuilder sb = new StringBuilder(); - sb.append("SELECT DISTINCT fp.BOLETO_BANCO_COD "); - sb.append("FROM "); - sb.append("FECHAMENTO_PARAMGERAL fp "); - sb.append("WHERE fp.activo = 1 AND "); - sb.append("fp.EMPRESA_ID = " + empresa.getEmpresaId()); - - Query query = getSession().createSQLQuery(sb.toString()); - - return (String) query.list().get(0); - } - - public ArquivoRemessa remessaBradesco(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); - sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); - sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); - sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); - sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); - sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append("fb.VALORDOCUMENTO AS \"valor\", "); - sb.append("'01' AS \"especieTitulo\", "); - sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append("'00' AS \"instrucao1\", "); - sb.append("'00' AS \"instrucao2\", "); - sb.append("fb.MORA AS \"valorAtraso\", "); - sb.append("fb.DESCONTOS AS \"valorDesconto\", "); - sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append("'cnpj' as \"tipoInscricaoPagador\", "); - sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO || ', ' || pl.NOMBPLAZA || ', ' || ci.NOMBCIUDAD || ', ' || es.NOMBESTADO AS \"enderecoCompletoPagador\", "); - sb.append("pv.CODPOSTAL AS \"cepPagador\", "); - sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", "); - sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\" "); - - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.BRADESCO_400_Envio); - - String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaBradesco cabecalhoRemessaBradesco = null; - - boolean constanteValidacao = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_VALIDAR_CONSTANTE_REMESSA.getDescricao()); - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - String codEmpresaBanco = tupla[2] != null ? tupla[2].toString() : "0"; - String nomeEmpresa = tupla[3].toString(); - - if(!tupla[8].toString().contains("-")){ - log.error( String.format( "NossoNumero não está no formato correto: %s1 . Ignorando o registro FechamentoBoletoId = %s2 " , tupla[0].toString())); - continue; - } - - if(cabecalhoRemessaBradesco == null || !cabecalhoRemessaBradesco.getCodigoEmpresa().equals(codEmpresaBanco) ){ - cabecalhoRemessaBradesco = new CabecalhoRemessaBradesco(); - cabecalhoRemessaBradesco.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaBradesco.setDataGravacao(new Date()); - cabecalhoRemessaBradesco.setCodigoEmpresa(codEmpresaBanco); - cabecalhoRemessaBradesco.setNomeEmpresa(nomeEmpresa); - - arquivoRemessaItem = new ArquivoRemessaBradesco(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaBradesco); - arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); - - arquivoRemessa.addItem(arquivoRemessaItem); - } - - DetalheObrigatorioBradesco detalhe = new DetalheObrigatorioBradesco(); - - String []doc = tupla[8].toString().split("-"); - - detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - detalhe.setCarteira(tupla[7].toString()); - detalhe.setAgencia(tupla[4].toString()); - detalhe.setContacorrente(tupla[5].toString()); - detalhe.setDvConta(tupla[6].toString()); - detalhe.setNumeroControleDoParticipante(tupla[0].toString()); - detalhe.setNossoNumeroComDigito(doc[0] + doc[1]); - detalhe.setCodigoDeOcorrencia(0); - detalhe.setDataOcorrencia(null); - detalhe.setNumeroDoDocumento(StringUtils.right(doc[0], 10)); - detalhe.setVencimento((Date) tupla[9]); - detalhe.setValor(new BigDecimal(tupla[10].toString().replace(",", "."))); - detalhe.setEmissao((Date) tupla[12]); - detalhe.setPercentualMulta( (BigDecimal) tupla[24] ); - - if (!constanteValidacao) { - detalhe.setEspecieDeTitulo("01"); - detalhe.setInstrucao1("00"); - detalhe.setInstrucao2("00"); - }else { - detalhe.setEspecieDeTitulo(tupla[11].toString()); - detalhe.setInstrucao1(tupla[13].toString()); - detalhe.setInstrucao2(tupla[14].toString()); - } - - detalhe.setDataLimiteDesconto(null); - detalhe.setValorIOF(BigDecimal.ZERO); - detalhe.setTipoInscricaoPagador(TipoInscricaoPagador.CNPJ); - detalhe.setNomePagador(tupla[20].toString()); - detalhe.setSacador_Avalista_Mensagem2(""); - detalhe.setMensagem1(""); - - try{ - if( tupla[15] != null ) { - detalhe.setValorAtraso(new BigDecimal(tupla[15].toString().replace(",", "."))); - }else if( tupla[23] != null ) { - detalhe.setValorAtraso( calculaValorMora( (BigDecimal) tupla[23], new BigDecimal(tupla[10].toString().replaceAll(",", ".") )) ); - }else { - detalhe.setValorAtraso( BigDecimal.ZERO ); - } - - }catch(Exception e){ - throw new ValidacaoRemessaException("Erro ao setar o valor de atraso do boleto "+tupla[0]+", favor entrar em contato com o suporte! "); - } - - try{ - detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replace(",", "."))); - }catch(Exception e){ - } - - try{ - detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replace(",", "."))); - }catch(Exception e){ - } - - try{ - detalhe.setNumeroInscricaoPagador(tupla[19].toString().replaceAll(NUMERAIS, "")); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setEnderecoCompletoPagador(tupla[21].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Endereço do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - String cep = tupla[22].toString(); - detalhe.setCEP_Prefixo(cep.substring(0,5)); - detalhe.setCEP_Sufixo(cep.substring(5)); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - arquivoRemessaItem.addTitulo(detalhe); - - arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(arquivoRemessa.getItens().size()); - - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - - } - - public ArquivoRemessa remessaSafra(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); - sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append("emp.CNPJ AS \"cnpj\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); - sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); - sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append("fb.VALORDOCUMENTO AS \"valor\", "); - sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append("'01' AS \"instrucao1\", "); - sb.append("'01' AS \"instrucao2\", "); - sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\", "); - sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", "); - sb.append("fb.MORA AS \"valorAtraso\", "); - sb.append("fb.DESCONTOS AS \"valorDesconto\", "); - sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); - sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); - sb.append("pv.CODPOSTAL AS \"cepPagador\", "); - sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); - sb.append("es.CVEESTADO AS \"estadoPagador\" "); - - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.SAFRA_400_Envio); - - String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); - - int variavel = 0; - int seqRegistro = 0; - int qtdeTitulos = 0; - - BigDecimal valorTitulos = BigDecimal.ZERO; - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaSafra cabecalho = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - BigDecimal valor = new BigDecimal(tupla[9].toString().replace(",", ".")); - - qtdeTitulos++; - valorTitulos = valorTitulos.add( valor ); - String nomeEmpresa = tupla[2].toString(); - String agencia = tupla[4].toString(); - String conta = tupla[5].toString(); - String digiConta = tupla[6].toString(); - Date vencimento = (Date) tupla[8]; - - if(!tupla[7].toString().contains("-")){ - log.error(String.format( "NossoNumero não está no formato correto: %s1 . Ignorando o registro FechamentoBoletoId = %s2 " , tupla[7], tupla[0])); - continue; - } - - if(cabecalho == null ){ - variavel = idRemessa; - - cabecalho = new CabecalhoRemessaSafra(); - cabecalho.setNumAgencia(agencia); - cabecalho.setNumContaCorrente(conta); - cabecalho.setDigContaCorrente(digiConta); - cabecalho.setNomeEmpresa(nomeEmpresa); - cabecalho.setDataGravacao(new Date()); - cabecalho.setNumeroSequencialRemessa(idRemessa); - cabecalho.setNumeroSequencialRegistro(++seqRegistro); - - arquivoRemessaItem = new ArquivoRemessaSafra(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalho); - - arquivoRemessa.addItem(arquivoRemessaItem); - } - - DetalheObrigatorioSafra detalhe = new DetalheObrigatorioSafra(); - - detalhe.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - detalhe.setNumCpfCnpj(tupla[3].toString()); - detalhe.setNumAgencia(agencia); - detalhe.setNumContaCorrente(conta); - detalhe.setDigContaCorrente(digiConta); - detalhe.setNossoNumero(tupla[7].toString()); - detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - detalhe.setVencimento(vencimento); - detalhe.setValor(valor); - detalhe.setAceite(Aceite.ACEITE); - detalhe.setDataEmissao((Date) tupla[10]); - detalhe.setInstrucao1(tupla[11].toString()); - detalhe.setInstrucao2(tupla[12].toString()); - try{ - detalhe.setPercMulta( new BigDecimal(tupla[13].toString().replace(",", ".") ) ); - if( tupla[15] != null ) { - detalhe.setJurosDeMora(new BigDecimal(tupla[15].toString().replace(",", "."))); - }else { - detalhe.setJurosDeMora( calculaValorMora( (BigDecimal) tupla[14], valor )); - } - detalhe.setDataMulta(vencimento); - }catch(NullPointerException e){ - detalhe.setPercMulta(BigDecimal.ZERO); - detalhe.setDataMulta(vencimento); - detalhe.setJurosDeMora(BigDecimal.ZERO); - } - - try{ - detalhe.setDataLimiteDesconto(vencimento); - detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replace(",", "."))); - }catch(NullPointerException e){ - detalhe.setDataLimiteDesconto(vencimento); - detalhe.setValorDesconto(BigDecimal.ZERO); - } - - detalhe.setValorIOF(BigDecimal.ZERO); - - try{ - detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replace(",", "."))); - }catch(NullPointerException e){ - detalhe.setValorAbatimentoConcedido(BigDecimal.ZERO); - } - - detalhe.setTipoInscricaoPagador(TipoInscricaoPagador.CNPJ); - - try{ - detalhe.setNumeroInscricaoPagador(tupla[18].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); - } - - detalhe.setNomePagador(tupla[19].toString()); - - try{ - detalhe.setEnderecoPagador(tupla[20].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Logradouro do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setBairroPagador(tupla[21].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); - } - - detalhe.setCepPagador(tupla[22].toString()); - - try{ - detalhe.setCidadePagador(tupla[23].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setEstadoPagador(tupla[24].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); - } - - detalhe.setSacadorAvalista(""); - detalhe.setNumeroSequencialRemessa(idRemessa); - detalhe.setNumeroSequencialRegistro(++seqRegistro); - - arquivoRemessaItem.addTitulo(detalhe); - - } - - if(arquivoRemessaItem != null){ - - RodapeRemessaSafra rodape = new RodapeRemessaSafra(); - rodape.setQtdTitulos(qtdeTitulos); - rodape.setValorTotalTitulos(valorTitulos); - - rodape.setNumeroSequencialRemessa(variavel); - rodape.setNumeroSequencialRegistro(++seqRegistro); - - arquivoRemessaItem.setRodapeRemessa(rodape); - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - - } - - public ArquivoRemessa remessaSantander(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append(" fb.FECHAMENTOBOLETO_ID AS \"id\", "); //0 - sb.append(" (NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); //1 - sb.append(" fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); //2 - sb.append(" emp.NOMBEMPRESA AS \"nomeEmpresa\", "); //3 - sb.append(" fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); //4 - sb.append(" fp.BOLETO_BANCO_CONTA AS \"conta\", "); //5 - sb.append(" fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); //6 - sb.append(" fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); //7 - sb.append(" fb.NOSSONUMERO AS \"nossoNumero\", "); //8 - sb.append(" fb.FECVENCIMENTO AS \"vencimento\", "); //9 - sb.append(" fb.VALORDOCUMENTO AS \"valor\", "); //10 - sb.append(" '01' AS \"especieTitulo\", "); //11 - sb.append(" fb.FECDOCUMENTO AS \"dataEmissao\", ");//12 - sb.append(" '00' AS \"instrucao1\", ");//13 - sb.append(" '00' AS \"instrucao2\", ");//14 - sb.append(" fb.MORA AS \"valorAtraso\", ");//15 - sb.append(" fb.DESCONTOS AS \"valorDesconto\", ");//16 - sb.append(" fb.DEDUCOES AS \"valorAbatimento\", ");//17 - sb.append(" 'cnpj' as \"tipoInscricaoPagador\", ");//18 - sb.append(" pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", ");//19 - sb.append(" pv.NOMBPUNTOVENTA AS \"nomePagador\", ");//20 - sb.append(" pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO as endereco,");//21 - sb.append(" pl.NOMBPLAZA as bairro, ");//22 - sb.append(" ci.NOMBCIUDAD AS cidade, ");//23 - sb.append(" es.CVEESTADO AS estado, ");//24 - sb.append(" pv.CODPOSTAL AS \"cepPagador\", "); //25 - sb.append(" ecb.NUMINTEGRACION AS \"codigoTransmissao\", "); //26 - sb.append(" fp.BOLETO_BANCO_AGENCIA_DIGITO AS \"agenciaDigito\", "); //27 - sb.append(" emp.CNPJ AS \"numeroInscricaoSacado\", "); //28 - sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", ");//29 - sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\" ");//30 - - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.SANTANDER_400_Envio); - - String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaSantander cabecalhoRemessaSantander = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - String codEmpresaBanco = tupla[2] != null ? tupla[2].toString() : "0"; - String nomeEmpresa = tupla[3].toString(); - Integer codigoTransmissao = tupla[26] != null ? Integer.valueOf(tupla[26].toString()) : 0; - - if(!tupla[8].toString().contains("-")){ - log.error("NossoNumero não está no formato correto: " + tupla[8].toString() + ". Ignorando o registro FechamentoBoletoId = " + tupla[0].toString()); - continue; - } - - if(cabecalhoRemessaSantander == null){ - cabecalhoRemessaSantander = new CabecalhoRemessaSantander(); - cabecalhoRemessaSantander.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaSantander.setCodigoTransmissao(gerarCodigoTransmissao(tupla[4].toString(), tupla[27].toString(), codEmpresaBanco, tupla[5].toString(), tupla[6].toString())); - cabecalhoRemessaSantander.setDataGravacao(new Date()); - cabecalhoRemessaSantander.setCodigoEmpresa(codEmpresaBanco); - cabecalhoRemessaSantander.setNomeEmpresa(nomeEmpresa); - - arquivoRemessaItem = new ArquivoRemessaSantander(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaSantander); - arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); - - arquivoRemessa.addItem(arquivoRemessaItem); - - }else if(!cabecalhoRemessaSantander.getCodigoEmpresa().equals(codEmpresaBanco)){ - cabecalhoRemessaSantander = new CabecalhoRemessaSantander(); - cabecalhoRemessaSantander.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaSantander.setDataGravacao(new Date()); - cabecalhoRemessaSantander.setCodigoEmpresa(codEmpresaBanco); - cabecalhoRemessaSantander.setNomeEmpresa(nomeEmpresa); - - arquivoRemessaItem = new ArquivoRemessaSantander(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaSantander); - arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); - - arquivoRemessa.addItem(arquivoRemessaItem); - } - - DetalheObrigatorioSantander detalhe = new DetalheObrigatorioSantander(); - - String []doc = tupla[8].toString().split("-"); - detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - detalhe.setTipoInscricao(TipoInscricaoPagador.CNPJ); - detalhe.setCodigoTransmissao(codigoTransmissao.toString()); - - detalhe.setCarteira(tupla[7].toString()); - detalhe.setAgencia(tupla[4].toString()); - detalhe.setAgenciaCobradora(tupla[4].toString()); - detalhe.setContacorrente(tupla[5].toString()); - detalhe.setDvConta(tupla[6].toString()); - detalhe.setNumControleDoParticipante(tupla[0].toString()); - detalhe.setNossoNumeroComDigito(doc[0] + doc[1]); - detalhe.setCodigoDeOcorrencia(0); - detalhe.setDataOcorrencia(null); - detalhe.setNumeroDoDocumento(doc[0] + doc[1]); - detalhe.setVencimento((Date) tupla[9]); - detalhe.setValor(new BigDecimal(tupla[10].toString().replaceAll(",", "."))); - detalhe.setEspecieDeTitulo("01"); - detalhe.setEmissao((Date) tupla[12]); - detalhe.setInstrucao1("00"); - detalhe.setInstrucao2("00"); - detalhe.setDataLimiteDesconto(null); - detalhe.setDvAgencia(tupla[27].toString()); - detalhe.setCodigoEmpresa(codEmpresaBanco); - detalhe.setCodigoTransmissao(gerarCodigoTransmissao(tupla[4].toString(), tupla[27].toString(), codEmpresaBanco, tupla[5].toString(), tupla[6].toString())); - detalhe.setValorIOF(BigDecimal.ZERO); - detalhe.setNomeSacado(tupla[20].toString()); - detalhe.setMensagem1(""); - detalhe.setSacadorAvalista(""); - detalhe.setPercentualMulta( (BigDecimal) tupla[30] ); - - try{ - if( tupla[15] != null ) { - detalhe.setValorAtraso(new BigDecimal(tupla[15].toString().replaceAll(",", "."))); - }else if( tupla[29] != null ) { - detalhe.setValorAtraso( calculaValorMora( (BigDecimal) tupla[29], new BigDecimal(tupla[10].toString().replaceAll(",", ".") )) ); - }else { - detalhe.setValorAtraso( BigDecimal.ZERO ); - } - - }catch(Exception e){ - throw new ValidacaoRemessaException("Erro ao setar o valor de atraso do boleto "+tupla[0]+", favor entrar em contato com o suporte! "); - } - - try{ - detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replaceAll(",", "."))); - }catch(Exception e){} - - try{ - detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replaceAll(",", "."))); - }catch(Exception e){} - - try{ - detalhe.setNumeroInscricao(tupla[19].toString().replaceAll(NUMERAIS, "")); - }catch(Exception e){ - throw new ValidacaoRemessaException("A inscrição do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setNumeroInscricaoSacado(tupla[28].toString().replaceAll(NUMERAIS, "")); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setEnderecoSacado(tupla[21].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Endereco do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setBairroSacado(tupla[22].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setCidade(tupla[23].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("A Cidade do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setEstado(tupla[24].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - String cep = tupla[25].toString(); - detalhe.setCepSacado(cep.substring(0,5)); - detalhe.setComplementoCepSacado(cep.substring(5)); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - arquivoRemessaItem.addTitulo(detalhe); - - arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(arquivoRemessa.getItens().size()); - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - - } - - public ArquivoRemessa remessaMercantil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ - - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT "); - sb.append(" fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append(" (NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); - sb.append(" fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); - sb.append(" emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append(" fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append(" fp.BOLETO_BANCO_CONTA AS \"conta\", "); - sb.append(" fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); - sb.append(" fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); - sb.append(" fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append(" fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append(" fb.VALORDOCUMENTO AS \"valor\", "); - sb.append(" '01' AS \"especieTitulo\", "); - sb.append(" fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append(" '00' AS \"instrucao1\", "); - sb.append(" '00' AS \"instrucao2\", "); - sb.append(" fb.MORA AS \"valorAtraso\", "); - sb.append(" fb.DESCONTOS AS \"valorDesconto\", "); - sb.append(" fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append(" 'cnpj' as \"tipoInscricaoPagador\", "); - sb.append(" pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append(" pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append(" pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO as endereco,"); - sb.append(" pl.NOMBPLAZA as bairro, "); - sb.append(" ci.NOMBCIUDAD AS cidade, "); - sb.append(" es.CVEESTADO AS estado, "); - sb.append(" pv.CODPOSTAL AS \"cepPagador\", "); - sb.append(" ecb.NUMINTEGRACION AS \"numeroContrato\" "); - - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.MERCANTIL_400_Envio); - - String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaMercantil cabecalhoRemessaMercantil = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - String codEmpresaBanco = tupla[2] != null ? tupla[2].toString() : "0"; - String nomeEmpresa = tupla[3].toString(); - - if(!tupla[8].toString().contains("-")){ - log.error("NossoNumero não está no formato correto: " + tupla[8].toString() + ". Ignorando o registro FechamentoBoletoId = " + tupla[0].toString()); - continue; - } - - if(cabecalhoRemessaMercantil == null){ - cabecalhoRemessaMercantil = new CabecalhoRemessaMercantil(); - cabecalhoRemessaMercantil.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaMercantil.setAgenciaOrigem(tupla[4].toString()); - cabecalhoRemessaMercantil.setCnpj(Long.valueOf(tupla[19].toString().replaceAll(NUMERAIS, ""))); - cabecalhoRemessaMercantil.setDataGravacao(new Date()); - cabecalhoRemessaMercantil.setCodigoEmpresa(codEmpresaBanco); - cabecalhoRemessaMercantil.setNomeEmpresa(nomeEmpresa); - - arquivoRemessaItem = new ArquivoRemessaMercantil(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaMercantil); - arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); - - arquivoRemessa.addItem(arquivoRemessaItem); - - }else if(!cabecalhoRemessaMercantil.getCodigoEmpresa().equals(codEmpresaBanco)){ - cabecalhoRemessaMercantil = new CabecalhoRemessaMercantil(); - cabecalhoRemessaMercantil.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaMercantil.setDataGravacao(new Date()); - cabecalhoRemessaMercantil.setCodigoEmpresa(codEmpresaBanco); - cabecalhoRemessaMercantil.setNomeEmpresa(nomeEmpresa); - - arquivoRemessaItem = new ArquivoRemessaMercantil(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaMercantil); - arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); - - arquivoRemessa.addItem(arquivoRemessaItem); - } - - DetalheObrigatorioMercantil detalhe = new DetalheObrigatorioMercantil(); - - String []doc = tupla[8].toString().split("-"); - detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - detalhe.setNumeroContrato(Integer.valueOf(tupla[26].toString())); - detalhe.setAgenciaOrigem(tupla[4].toString()); - detalhe.setSeuNumero(Integer.valueOf(tupla[0].toString())); - detalhe.setNossoNumero(doc[0]); - detalhe.setDigitoVerificador(doc[1]); - detalhe.setCodigoDeOcorrencia(0); - detalhe.setDataOcorrencia(null); - detalhe.setNumeroDoDocumento(StringUtils.right(doc[0], 10)); - detalhe.setVencimento((Date) tupla[9]); - detalhe.setValorTitulo(new BigDecimal(tupla[10].toString().replaceAll(",", "."))); - detalhe.setEspecieDeTitulo(tupla[11].toString()); - detalhe.setEmissao((Date) tupla[12]); - detalhe.setInstrucao1(tupla[13].toString()); - detalhe.setInstrucao2(tupla[14].toString()); - detalhe.setDataLimiteDesconto(null); - detalhe.setMensagem1(""); - detalhe.setSacadorAvalistaMensagem2(""); - detalhe.setValorIOF(BigDecimal.ZERO); - detalhe.setNomePagador(tupla[20].toString()); - - try{ - detalhe.setValorAtraso(new BigDecimal(tupla[15].toString().replaceAll(",", "."))); - }catch(Exception e){} - - try{ - detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replaceAll(",", "."))); - }catch(Exception e){} - - try{ - detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replaceAll(",", "."))); - }catch(Exception e){} - - - try{ - detalhe.setEnderecoCompletoPagador(tupla[21].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Endereço do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setBairro(tupla[22].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setCidade(tupla[23].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setEstado(tupla[24].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setCnpj(Long.valueOf(tupla[19].toString().replaceAll(NUMERAIS, ""))); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - try{ - String cep = tupla[25].toString(); - detalhe.setCepPrefixo(cep.substring(0,5)); - detalhe.setCepSufixo(cep.substring(5)); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); - } - - arquivoRemessaItem.addTitulo(detalhe); - - arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(arquivoRemessa.getItens().size()); - - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - - } - - @Override - public ArquivoRemessa remessaItau(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); - sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); - sb.append("emp.CNPJ AS \"cnpj\", "); - sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); - sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); - sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); - sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append("fb.VALORDOCUMENTO AS \"valor\", "); - sb.append("99 AS \"especieTitulo\", "); - sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append("' ' AS \"instrucao1\", "); - sb.append("' ' AS \"instrucao2\", "); - sb.append("fb.MORA AS \"valorAtraso\", "); - sb.append("fb.DESCONTOS AS \"valorDesconto\", "); - sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append("'cnpj' as \"tipoInscricaoPagador\", "); - sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); - sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); - sb.append("pv.CODPOSTAL AS \"cepPagador\", "); - sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); - sb.append("es.cveestado AS \"estadoPagador\", "); - sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", "); - sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\" "); - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.ITAU_400_Envio); - - String nomeArquivo = "RE" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - int contador = 1; - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaItau cabecalhoRemessaItau = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - Integer codEmpresaBanco = Integer.valueOf(tupla[5].toString() + tupla[6].toString()); - String nomeEmpresa = tupla[4].toString(); - - if(cabecalhoRemessaItau == null){ - cabecalhoRemessaItau = new CabecalhoRemessaItau(); - cabecalhoRemessaItau.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaItau.setNumeroSequencialRegistro(contador); - cabecalhoRemessaItau.setDataGeracao(new Date()); - cabecalhoRemessaItau.setAgencia(Integer.valueOf(tupla[5].toString())); - cabecalhoRemessaItau.setConta(Integer.valueOf(tupla[6].toString())); - cabecalhoRemessaItau.setDacConta(Integer.valueOf(tupla[7].toString())); - cabecalhoRemessaItau.setNomeEmpresa(nomeEmpresa); - - arquivoRemessaItem = new ArquivoRemessaItau(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaItau); - arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); - - arquivoRemessa.addItem(arquivoRemessaItem); - } - - DetalheObrigatorioItau detalhe = new DetalheObrigatorioItau(); - - String []doc = tupla[9].toString().split("-"); - - detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - detalhe.setNumeroInscricao(codEmpresaBanco); - detalhe.setAgencia(Integer.valueOf(tupla[5].toString())); - detalhe.setConta(Integer.valueOf(tupla[6].toString())); - detalhe.setDacConta(Integer.valueOf(tupla[7].toString())); - detalhe.setInstrucaoAlegacao(0000); - detalhe.setNossoNumero(Integer.valueOf(doc[0])); - detalhe.setNumCpfCnpj(tupla[3].toString()); - detalhe.setQtdMoeda(BigDecimal.ZERO); - detalhe.setNrCarteira(Integer.valueOf(tupla[8].toString())); - detalhe.setCodigoDeOcorrencia(01); - detalhe.setNumeroDoDocumento(tupla[0].toString()); - detalhe.setVencimento((Date) tupla[10]); - detalhe.setValor(new BigDecimal(tupla[11].toString().replace(",", "."))); - detalhe.setAgenciaCobradora(0); - detalhe.setEspecieDeTitulo("99"); - detalhe.setAceite("A"); - detalhe.setEmissao((Date) tupla[13]); - detalhe.setInstrucao1("05"); - detalhe.setInstrucao1("00"); - detalhe.setDataDesconto(null); - detalhe.setIOF_Devido(BigDecimal.ZERO); - detalhe.setNomeSacado(tupla[21].toString()); - detalhe.setTipoInscricaoSacado(TipoInscricaoPagador.CNPJ); - detalhe.setPrazo(00); - detalhe.setNumeroSequencialRegistro(++contador); - detalhe.setSacadorAvalista(tupla[21].toString()); - - try{ - BigDecimal percentualMulta = new BigDecimal(tupla[28].toString().replace(",", ".")); - if( percentualMulta.compareTo(BigDecimal.ZERO) > 0) { - DetalheMulta multa = new DetalheMulta(); - multa.setCodigoMulta("2"); - multa.setDataMulta(DateUtil.somarDias((Date) tupla[10], 1)); - multa.setPercentualMulta(percentualMulta); - multa.setNumeroSequencial(++contador); - detalhe.setDetalheMulta(multa); - } - }catch(Exception e){ - log.error("Erro ao gerar detalhe muulta para remessaId=" + tupla[1].toString() , e); - } - - try{ - detalhe.setJurosDeMora(new BigDecimal(tupla[27].toString().replace(",", "."))); - detalhe.setDataDeMora(DateUtil.somarDias((Date) tupla[10], 1)); - }catch(Exception e){ - detalhe.setJurosDeMora(BigDecimal.ZERO); - detalhe.setDataDeMora(null); - } - - try{ - detalhe.setDescontoConcedido(new BigDecimal(tupla[17].toString().replace(",", "."))); - }catch(Exception e){ - detalhe.setDescontoConcedido(BigDecimal.ZERO); - } - - try{ - detalhe.setAbatimentoConcedido(new BigDecimal(tupla[18].toString().replace(",", "."))); - }catch(Exception e){ - detalhe.setAbatimentoConcedido(BigDecimal.ZERO); - } - - try{ - detalhe.setNumeroInscricaoSacado(Long.valueOf(tupla[20].toString())); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setLogradouroSacado(tupla[22].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Logradouro do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setBairroSacado(tupla[23].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setCepSacado(tupla[24].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setCidade(tupla[25].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); - } - - try{ - detalhe.setEstado(tupla[26].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); - } - - arquivoRemessaItem.addTitulo(detalhe); - } - if(arquivoRemessaItem!=null && arquivoRemessaItem.getRodapeRemessa()!=null) { - arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(++contador); - } - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - } - - @Override - public ArquivoRemessa remessaBancoBrasil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); - sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); - sb.append("emp.CNPJ AS \"cnpj\", "); - sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); - sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); - sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); - sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append("fb.VALORDOCUMENTO AS \"valor\", "); - sb.append("99 AS \"especieTitulo\", "); - sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append("' ' AS \"instrucao1\", "); - sb.append("' ' AS \"instrucao2\", "); - sb.append("fb.MORA AS \"valorAtraso\", "); - sb.append("fb.DESCONTOS AS \"valorDesconto\", "); - sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append("'cnpj' as \"tipoInscricaoPagador\", "); - sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); - sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); - sb.append("pv.CODPOSTAL AS \"cepPagador\", "); - sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); - sb.append("es.NOMBESTADO AS \"estadoPagador\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA_DIGITO AS \"digitoAgencia\", "); - sb.append("fp.BOLETO_BANCO_CARTEIRA_VARIAVEL AS \"variavelCarteira\" "); - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.BB_240_Envio); - - String nomeArquivo = "BB" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaBancoBrasil cabecalhoRemessaBancoBrasil = null; - CabecalhoLoteRemessaBancoBrasil cabecalhoLoteRemessaBancoBrasil = null; - RodapeRemessaLoteBancoBrasil rodapeRemessaLoteBancoBrasil = null; - RodapeRemessaBancoBrasil rodapeRemessaBancoBrasil = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - String codEmpresaBanco = ((BigDecimal) tupla[2]).toString(); - codEmpresaBanco = StringUtils.right("000000000" + codEmpresaBanco, 9); - String nomeEmpresa = tupla[4].toString(); - - DateFormat df = new SimpleDateFormat("HHmmss"); - - if(cabecalhoRemessaBancoBrasil == null || - !(cabecalhoRemessaBancoBrasil.getNumConvenio()).equals(codEmpresaBanco)){ - cabecalhoRemessaBancoBrasil = new CabecalhoRemessaBancoBrasil(); - cabecalhoRemessaBancoBrasil.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaBancoBrasil.setDataGeracao(new Date()); - cabecalhoRemessaBancoBrasil.setHoraGeracao(Integer.parseInt(df.format(new Date()))); - cabecalhoRemessaBancoBrasil.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - cabecalhoRemessaBancoBrasil.setNumCpfCnpj(tupla[3].toString()); - cabecalhoRemessaBancoBrasil.setDensidadeArquivo("00000"); - cabecalhoRemessaBancoBrasil.setNumAgencia(tupla[5].toString()); - cabecalhoRemessaBancoBrasil.setDigAgencia(((BigDecimal) tupla[27]).toString()); - cabecalhoRemessaBancoBrasil.setDigAgenciaConta(" "); - cabecalhoRemessaBancoBrasil.setNumContaCorrente(tupla[6].toString()); - cabecalhoRemessaBancoBrasil.setDigContaCorrente(tupla[7].toString()); - cabecalhoRemessaBancoBrasil.setNumCarteira(tupla[8].toString()); - cabecalhoRemessaBancoBrasil.setNomeEmpresa(nomeEmpresa); - cabecalhoRemessaBancoBrasil.setNumConvenio(codEmpresaBanco); - - cabecalhoLoteRemessaBancoBrasil = new CabecalhoLoteRemessaBancoBrasil(); - cabecalhoLoteRemessaBancoBrasil.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - cabecalhoLoteRemessaBancoBrasil.setNumCpfCnpj(tupla[3].toString()); - cabecalhoLoteRemessaBancoBrasil.setNumAgencia(tupla[5].toString()); - cabecalhoLoteRemessaBancoBrasil.setDigAgencia(((BigDecimal) tupla[27]).toString()); - cabecalhoLoteRemessaBancoBrasil.setDigAgenciaConta(" "); - cabecalhoLoteRemessaBancoBrasil.setNumContaCorrente(tupla[6].toString()); - cabecalhoLoteRemessaBancoBrasil.setDigContaCorrente(tupla[7].toString()); - cabecalhoLoteRemessaBancoBrasil.setNumCarteira(tupla[8].toString()); - cabecalhoLoteRemessaBancoBrasil.setNomeEmpresa(nomeEmpresa); - cabecalhoLoteRemessaBancoBrasil.setNumConvenio(codEmpresaBanco); - cabecalhoLoteRemessaBancoBrasil.setDataGeracao(new Date()); - cabecalhoLoteRemessaBancoBrasil.setNumeroRemessa(idRemessa); - - try{ - cabecalhoRemessaBancoBrasil.setNumVarCarteira(((BigDecimal) tupla[28]).toString()); - cabecalhoLoteRemessaBancoBrasil.setNumVarCarteira(((BigDecimal) tupla[28]).toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException( - String.format( - "A Variação Carteira da empresa %s está fora do padrão, favor corrigir", - nomeEmpresa) - ); - } - - cabecalhoRemessaBancoBrasil.setCabecalhoLoteRemessaBancoBrasil(cabecalhoLoteRemessaBancoBrasil); - - arquivoRemessaItem = new ArquivoRemessaBancoBrasil(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaBancoBrasil); - - arquivoRemessa.addItem(arquivoRemessaItem); - } - - String []doc = tupla[9].toString().split("-"); - - DetalheObrigatorioDadosTitulosBancoBrasil titulosBancoBrasil = new DetalheObrigatorioDadosTitulosBancoBrasil(); - titulosBancoBrasil.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - titulosBancoBrasil.setNumAgencia(tupla[5].toString()); - titulosBancoBrasil.setDigAgencia(((BigDecimal) tupla[27]).toString()); - titulosBancoBrasil.setNumContaCorrente(tupla[6].toString()); - titulosBancoBrasil.setDigContaCorrente(tupla[7].toString()); - titulosBancoBrasil.setDigAgenciaConta(" "); - titulosBancoBrasil.setNossoNumeroBB(doc[0]); - titulosBancoBrasil.setCodCarteira(7); - titulosBancoBrasil.setFormaCadTituloBanco(" "); - titulosBancoBrasil.setTipoDocumento(" "); - titulosBancoBrasil.setIdentEmissaoBloqueto(" "); - titulosBancoBrasil.setIdentDistribuicao(" "); - titulosBancoBrasil.setNumeroDoDocumento(tupla[0].toString()); - titulosBancoBrasil.setVencimento((Date) tupla[10]); - titulosBancoBrasil.setValor(new BigDecimal(tupla[11].toString().replace(",", "."))); - titulosBancoBrasil.setAgenciaCobradora(null); - titulosBancoBrasil.setDigAgenciaCobradora(null); - titulosBancoBrasil.setAceite(Aceite.NAO_ACEITE); - titulosBancoBrasil.setEmissao((Date) tupla[13]); - try{ - titulosBancoBrasil.setCodMora(1); - titulosBancoBrasil.setJurosDeMora(new BigDecimal(tupla[16].toString().replace(",", "."))); - titulosBancoBrasil.setDataMora((Date) tupla[10]); - }catch(NullPointerException e){ - titulosBancoBrasil.setCodMora(1); - titulosBancoBrasil.setDataMora((Date) tupla[10]); - titulosBancoBrasil.setJurosDeMora(BigDecimal.ZERO); - } - - try{ - BigDecimal desconto = new BigDecimal(tupla[17].toString().replace(",", ".")); - if(desconto.equals(BigDecimal.ZERO)) { - zerarDesconto(titulosBancoBrasil); - } - - titulosBancoBrasil.setCodigoDesconto(1); - titulosBancoBrasil.setDataDesconto((Date) tupla[10]); - titulosBancoBrasil.setDescontoConcedido(desconto); - }catch(NullPointerException e){ - zerarDesconto(titulosBancoBrasil); - } - - titulosBancoBrasil.setIOF_Devido(BigDecimal.ZERO); - try{ - titulosBancoBrasil.setAbatimentoConcedido(new BigDecimal(tupla[18].toString().replace(",", "."))); - }catch(NullPointerException e){ - titulosBancoBrasil.setAbatimentoConcedido(BigDecimal.ZERO); - } - - titulosBancoBrasil.setNossoNumeroEmp(""); - titulosBancoBrasil.setCodigoProtesto(3); - titulosBancoBrasil.setDiasProtesto(0); - titulosBancoBrasil.setCodigoBaixa(2); - titulosBancoBrasil.setDiasBaixa(0); - titulosBancoBrasil.setNumeroContrato(0); - - DetalheObrigatorioDadosPagadorBancoBrasil pagadorBancoBrasil = new DetalheObrigatorioDadosPagadorBancoBrasil(); - pagadorBancoBrasil.setTipoInscricaoSacado(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - String ptoVenda = tupla[21].toString(); - pagadorBancoBrasil.setNomeSacado(ptoVenda); - String cep = ""; - try{ - cep = StringUtils.right(ZERO_ESQUERDA + tupla[24].toString(), 8); - }catch(Exception e){ - cep = ZERO_ESQUERDA; - } - int cepPrefix = Integer.parseInt(cep.substring(0, 5)); - int cepSufix = Integer.parseInt(cep.substring(5)); - pagadorBancoBrasil.setCepSacado(cepPrefix); - pagadorBancoBrasil.setSufixoCep(cepSufix); - pagadorBancoBrasil.setNossoNumeroNoBancoCorresp(""); - - try{ - pagadorBancoBrasil.setNumeroInscricaoSacado(tupla[20].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException( - String.format( - "O CNPJ do ponto de venda %s está fora do padrão, favor corrigir", - ptoVenda) - ); - } - - try{ - pagadorBancoBrasil.setLogradouroSacado(tupla[22].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException( - String.format( - "O Logradouro do ponto de venda %s está fora do padrão, favor corrigir", - ptoVenda) - ); - } - - try{ - pagadorBancoBrasil.setBairroSacado(tupla[23].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException( - String.format( - "O Bairro do ponto de venda %s está fora do padrão, favor corrigir", - ptoVenda) - ); - } - - try{ - pagadorBancoBrasil.setCidade(tupla[25].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException( - String.format( - "A cidade do ponto de venda %s está fora do padrão, favor corrigir", - ptoVenda) - ); - } - - try{ - pagadorBancoBrasil.setEstado(tupla[26].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException( - String.format( - "O Estado do ponto de venda %s está fora do padrão, favor corrigir", - ptoVenda) - ); - } - - titulosBancoBrasil.setDetalheObrigatorioDadosPagadorBancoBrasil(pagadorBancoBrasil); - - arquivoRemessaItem.addTitulo(titulosBancoBrasil); - - } - - if(true && arquivoRemessaItem != null){ - rodapeRemessaLoteBancoBrasil = new RodapeRemessaLoteBancoBrasil(); - //rodapeRemessaLoteBancoBrasil.setLoteServico(loteCount); - - rodapeRemessaBancoBrasil = new RodapeRemessaBancoBrasil(); - //rodapeRemessaBancoBrasil.setLoteServico(9999); - rodapeRemessaBancoBrasil.setQtdContas(0); - - rodapeRemessaBancoBrasil.setRodapeRemessaLoteBancoBrasil(rodapeRemessaLoteBancoBrasil); - - arquivoRemessaItem.setRodapeRemessa(rodapeRemessaBancoBrasil); - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - } - - @Override - public ArquivoRemessa remessaSicoob(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append("(NVL(fp.COUNT_REMESSA, 1) + 1) AS \"idRemessa\", "); - sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); - sb.append("emp.CNPJ AS \"cnpj\", "); - sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); - sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); - sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); - sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append("fb.VALORDOCUMENTO AS \"valor\", "); - sb.append("99 AS \"especieTitulo\", "); - sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append("' ' AS \"instrucao1\", "); - sb.append("' ' AS \"instrucao2\", "); - sb.append("fb.MORA AS \"valorAtraso\", "); - sb.append("fb.DESCONTOS AS \"valorDesconto\", "); - sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append("'cnpj' as \"tipoInscricaoPagador\", "); - sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); - sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); - sb.append("pv.CODPOSTAL AS \"cepPagador\", "); - sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); - sb.append("es.NOMBESTADO AS \"estadoPagador\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA_DIGITO AS \"digitoAgencia\", "); - sb.append("fp.BOLETO_BANCO_CARTEIRA_VARIAVEL AS \"variavelCarteira\", "); - sb.append("es.CVEESTADO AS \"cveEstado\" "); - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.SICOOB_240_Envio); - - String nomeArquivo = "Sicoob" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - int seqRegistro = 1; - int qtdeTitulos = 0; - BigDecimal valorTitulos = BigDecimal.ZERO; - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaSicoob cabecalhoRemessaSicoob = null; - CabecalhoLoteRemessaSicoob cabecalhoLoteRemessaSicoob = null; - RodapeRemessaLoteSicoob rodapeRemessaLoteSicoob = null; - RodapeRemessaSicoob rodapeRemessaSicoob = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - String codEmpresaBanco = tupla[2] == null ? "" : ((BigDecimal) tupla[2]).toString(); - codEmpresaBanco = StringUtils.right("000000000" + codEmpresaBanco, 9); - String nomeEmpresa = tupla[4].toString(); - BigDecimal valor = new BigDecimal(tupla[11].toString().replace(",", ".")); - - qtdeTitulos++; - valorTitulos.add( valor ); - - if(cabecalhoRemessaSicoob == null ){ - cabecalhoRemessaSicoob = new CabecalhoRemessaSicoob(); - cabecalhoRemessaSicoob.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaSicoob.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - cabecalhoRemessaSicoob.setNumCpfCnpj(tupla[3].toString()); - cabecalhoRemessaSicoob.setNumAgencia(tupla[5].toString()); - cabecalhoRemessaSicoob.setDigAgencia(((BigDecimal) tupla[27]).toString()); - cabecalhoRemessaSicoob.setNumContaCorrente(tupla[6].toString()); - cabecalhoRemessaSicoob.setDigContaCorrente(tupla[7].toString()); - cabecalhoRemessaSicoob.setNomeEmpresa(nomeEmpresa); - cabecalhoRemessaSicoob.setNumRemessa(idRemessa); - cabecalhoRemessaSicoob.setDataGravacao(new Date()); - cabecalhoRemessaSicoob.setNumConvenio(codEmpresaBanco); - - cabecalhoLoteRemessaSicoob = new CabecalhoLoteRemessaSicoob(); - cabecalhoLoteRemessaSicoob.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - cabecalhoLoteRemessaSicoob.setNumCpfCnpj(tupla[3].toString()); - cabecalhoLoteRemessaSicoob.setNumAgencia(tupla[5].toString()); - cabecalhoLoteRemessaSicoob.setDigAgencia(((BigDecimal) tupla[27]).toString()); - cabecalhoLoteRemessaSicoob.setNumContaCorrente(tupla[6].toString()); - cabecalhoLoteRemessaSicoob.setDigContaCorrente(tupla[7].toString()); - cabecalhoLoteRemessaSicoob.setNomeEmpresa(nomeEmpresa); - cabecalhoLoteRemessaSicoob.setNumeroRemessa(idRemessa); - cabecalhoLoteRemessaSicoob.setDataGeracao(new Date()); - cabecalhoRemessaSicoob.setCabecalhoLoteRemessaSicoob(cabecalhoLoteRemessaSicoob); - - arquivoRemessaItem = new ArquivoRemessaSicoob(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaSicoob); - - arquivoRemessa.addItem(arquivoRemessaItem); - }else { - try{ - if( !(cabecalhoRemessaSicoob.getNumConvenio()).equals(codEmpresaBanco)) { - throw new ValidacaoRemessaException(Labels.getLabel("relatorioRemessaCNAB.exception.ValidacaoRemessaConvenioException")); - } - }catch(Exception e){ - throw new ValidacaoRemessaException(Labels.getLabel("relatorioRemessaCNAB.exception.ValidacaoRemessaMontagemCabecalhoException")); - } - } - - String []doc = tupla[9].toString().split("-"); - - DetalheObrigatorioSicoob titulosSicoob = new DetalheObrigatorioSicoob(); - titulosSicoob.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - titulosSicoob.setNumSeqRegistro( seqRegistro++ ); - titulosSicoob.setNumAgencia(tupla[5].toString()); - titulosSicoob.setDigAgencia(((BigDecimal) tupla[27]).toString()); - titulosSicoob.setNumContaCorrente(tupla[6].toString()); - titulosSicoob.setDigContaCorrente(tupla[7].toString()); - titulosSicoob.setNossoNumero(doc[0]); - titulosSicoob.setNumeroDoDocumento(tupla[0].toString()); - titulosSicoob.setVencimento((Date) tupla[10]); - titulosSicoob.setValor( valor ); - titulosSicoob.setEmissao((Date) tupla[13]); - titulosSicoob.setCodCarteira(Integer.valueOf(tupla[8].toString())); - try{ - titulosSicoob.setCodMora(1); - titulosSicoob.setJurosDeMora(new BigDecimal(tupla[16].toString().replaceAll(",", "."))); - titulosSicoob.setDataMora(DateUtil.somarDias((Date) tupla[10], 1)); - }catch(NullPointerException e){ - titulosSicoob.setCodMora(BigDecimal.ZERO.intValue()); - titulosSicoob.setDataMora(null); - titulosSicoob.setJurosDeMora(BigDecimal.ZERO); - } - - try{ - titulosSicoob.setCodigoDesconto(1); - titulosSicoob.setDataDesconto((Date) tupla[10]); - titulosSicoob.setDescontoConcedido(new BigDecimal(tupla[17].toString().replaceAll(",", "."))); - }catch(NullPointerException e){ - titulosSicoob.setCodigoDesconto(BigDecimal.ZERO.intValue()); - titulosSicoob.setDataDesconto(null); - titulosSicoob.setDescontoConcedido(BigDecimal.ZERO); - } - - titulosSicoob.setIofDevido(BigDecimal.ZERO); - try{ - titulosSicoob.setAbatimentoConcedido(new BigDecimal(tupla[18].toString().replaceAll(",", "."))); - }catch(NullPointerException e){ - titulosSicoob.setAbatimentoConcedido(BigDecimal.ZERO); - } - titulosSicoob.setNossoNumeroEmp(tupla[0].toString()); - titulosSicoob.setCodigoProtesto(1); - titulosSicoob.setDiasProtesto(1); - titulosSicoob.setCodigoBaixa(2); - titulosSicoob.setDiasBaixa(000); - titulosSicoob.setNumeroContrato(Integer.parseInt(tupla[0].toString())); - - DetalheObrigatorioDadosPagadorSicoob pagadorSicoob = new DetalheObrigatorioDadosPagadorSicoob(); - pagadorSicoob.setNumeroSequencialRegistro( seqRegistro++ ); - pagadorSicoob.setTipoInscricaoSacado(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); - pagadorSicoob.setNomeSacado(tupla[21].toString()); - String cep = ""; - try{ - cep = StringUtils.right(ZERO_ESQUERDA + tupla[24].toString(), 8); - }catch(Exception e){ - cep = ZERO_ESQUERDA; - } - int cepPrefix = Integer.parseInt(cep.substring(0, 5)); - int cepSufix = Integer.parseInt(cep.substring(5)); - pagadorSicoob.setCepSacado(cepPrefix); - pagadorSicoob.setSufixoCep(cepSufix); - pagadorSicoob.setCodBancoCorresp(0); - pagadorSicoob.setNossoNumeroNoBancoCorresp(""); - - try{ - pagadorSicoob.setNumeroInscricaoSacado(tupla[20].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaCNPJException", null, tupla[20]); - } - - try{ - pagadorSicoob.setLogradouroSacado(tupla[22].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaLogradouroException", null, tupla[22]); - } - - try{ - pagadorSicoob.setBairroSacado(tupla[23].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaBairroException", null, tupla[23]); - } - - try{ - pagadorSicoob.setCidade(tupla[25].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaCidadeException", null, tupla[25]); - } - - try{ - pagadorSicoob.setEstado(tupla[26].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaEstadoException", null, tupla[26]); - } - - try{ - pagadorSicoob.setCveEstado(tupla[29].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaCVEEstadoException", null, tupla[29]); - } - - titulosSicoob.setDetalheObrigatorioDadosPagadorSicoob(pagadorSicoob); - - arquivoRemessaItem.addTitulo(titulosSicoob); - - } - - if(arquivoRemessaItem != null){ - rodapeRemessaLoteSicoob = new RodapeRemessaLoteSicoob(); - rodapeRemessaLoteSicoob.setNumeroSequencialRegistro(qtdeTitulos); - rodapeRemessaLoteSicoob.setValorRegistros( valorTitulos ); - - rodapeRemessaSicoob = new RodapeRemessaSicoob(); - rodapeRemessaSicoob.setQtdLotes(1); - rodapeRemessaSicoob.setQtdArquivos(qtdeTitulos); - rodapeRemessaSicoob.setQtdContas(0); - - rodapeRemessaSicoob.setRodapeRemessaLoteSicoob(rodapeRemessaLoteSicoob); - - arquivoRemessaItem.setRodapeRemessa(rodapeRemessaSicoob); - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - } - - @Override - public ArquivoRemessa remessaCaixa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { - - StringBuilder sb = new StringBuilder(); - - sb.append("SELECT "); - sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); - sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); - sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); - sb.append("emp.CNPJ AS \"cnpj\", "); - sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); - sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); - sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); - sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); - sb.append("fb.VALORDOCUMENTO AS \"valor\", "); - sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); - sb.append("(nvl(fb.porc_mora, 0)) AS \"porcMora\", "); - sb.append("fb.DESCONTOS AS \"valorDesconto\", "); - sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); - sb.append("'cnpj' as \"tipoInscricaoPagador\", "); - sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); - sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); - sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); - sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); - sb.append("pv.CODPOSTAL AS \"cepPagador\", "); - sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); - sb.append("es.NOMBESTADO AS \"estadoPagador\" "); - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - List list = query.list(); - - ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.CAIXA_400_Envio); - - String nomeArquivo = "CEF" + new SimpleDateFormat("ddMM").format(new Date()); - int variavel = 0; - int seqRegistro = 0; - int qtdeTitulos = 0; - - ArquivoRemessaItem arquivoRemessaItem = null; - CabecalhoRemessaCaixa cabecalhoRemessaCaixa = null; - RodapeRemessaPadrao rodape = null; - - for(Object[] tupla : list){ - - Integer idRemessa = Integer.valueOf(tupla[1].toString()); - variavel = idRemessa; - String codEmpresaBanco = tupla[2] == null ? "" : ((BigDecimal) tupla[2]).toString(); - String versao = codEmpresaBanco.length() >6 ?"007":""; - codEmpresaBanco = StringUtils.right("0000000" + codEmpresaBanco, 7); - String nomeEmpresa = tupla[4].toString(); - BigDecimal valor = new BigDecimal(tupla[8].toString().replaceAll(",", ".")); - - qtdeTitulos++; - - if(cabecalhoRemessaCaixa == null ){ - cabecalhoRemessaCaixa = new CabecalhoRemessaCaixa(); - - cabecalhoRemessaCaixa.setAgenciaBeneficiario(tupla[5].toString()); - cabecalhoRemessaCaixa.setCodigoEmpresa(codEmpresaBanco); - cabecalhoRemessaCaixa.setNomeEmpresa(nomeEmpresa); - cabecalhoRemessaCaixa.setDataGravacao(new Date()); - cabecalhoRemessaCaixa.setNumeroSequencialRemessa(idRemessa); - cabecalhoRemessaCaixa.setVersaoLayout(versao); - - arquivoRemessaItem = new ArquivoRemessaCaixa(); - arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaCaixa); - arquivoRemessa.addItem(arquivoRemessaItem); - - } - - DetalheObrigatorioCaixa titulosCaixa = new DetalheObrigatorioCaixa(); - titulosCaixa.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); - - titulosCaixa.setNumeroSequencialRegistro( seqRegistro++ ); - titulosCaixa.setNossoNumero(tupla[6].toString()); - titulosCaixa.setNumeroDoDocumento(tupla[0].toString()); - titulosCaixa.setVencimento((Date) tupla[7]); - titulosCaixa.setValor( valor ); - titulosCaixa.setEmissao((Date) tupla[9]); - - try{ - titulosCaixa.setValorAtraso( calculaValorMora( new BigDecimal(tupla[10].toString().replaceAll(",", ".") ), valor )); - }catch(NullPointerException e){ - titulosCaixa.setValorAtraso(BigDecimal.ZERO); - } - - try{ - titulosCaixa.setDataLimiteDesconto((Date) tupla[7]); - titulosCaixa.setValorDesconto(new BigDecimal(tupla[11].toString().replaceAll(",", "."))); - }catch(NullPointerException e){ - titulosCaixa.setDataLimiteDesconto((Date) tupla[7]); - titulosCaixa.setValorDesconto(BigDecimal.ZERO); - } - - titulosCaixa.setValorIOF(BigDecimal.ZERO); - try{ - titulosCaixa.setValorAbatimentoConcedido(new BigDecimal(tupla[12].toString().replaceAll(",", "."))); - }catch(NullPointerException e){ - titulosCaixa.setValorAbatimentoConcedido(BigDecimal.ZERO); - } - - titulosCaixa.setNomeSacado(tupla[15].toString()); - titulosCaixa.setTipoInscricaoPagador(TipoInscricaoPagador.CNPJ); - - try{ - titulosCaixa.setNumeroInscricao(tupla[3].toString().replaceAll(NUMERAIS, "")); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); - } - - String cep = ""; - try{ - cep = StringUtils.right(ZERO_ESQUERDA + tupla[18].toString(), 8); - }catch(Exception e){ - cep = ZERO_ESQUERDA; - } - - titulosCaixa.setCepSacado(cep); - - try{ - titulosCaixa.setNumeroInscricaoSacado(tupla[14].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); - } - - try{ - titulosCaixa.setEnderecoSacado(tupla[16].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Logradouro do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); - } - - try{ - titulosCaixa.setBairroSacado(tupla[17].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); - } - - try{ - titulosCaixa.setCidade(tupla[19].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); - } - - try{ - titulosCaixa.setEstado(tupla[20].toString()); - }catch(Exception e){ - throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); - } - - titulosCaixa.setSacadorAvalista(""); - - arquivoRemessaItem.addTitulo(titulosCaixa); - - } - - if(rodape == null){ - rodape = new RodapeRemessaPadrao(); - rodape.setNumeroSequencialRegistro(qtdeTitulos); - arquivoRemessaItem.setRodapeRemessa(rodape); - } - - nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; - arquivoRemessa.setNomeArquivo(nomeArquivo); - - return arquivoRemessa; - } - - private void writeFROMClause(StringBuilder sb, boolean hasDate, Boolean reenviar) { - 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(" INNER JOIN PUNTO_VENTA pv on pv.PUNTOVENTA_ID = fc.PUNTOVENTA_ID AND pv.ACTIVO = 1 "); - sb.append(" INNER JOIN EMPRESA emp on emp.EMPRESA_ID = fc.EMPRESA_ID AND emp.ACTIVO = 1 "); - sb.append(" INNER JOIN FECHAMENTO_PARAMGERAL fp on fp.EMPRESA_ID = emp.EMPRESA_ID AND fp.ACTIVO = 1 "); - sb.append(" INNER JOIN FECHAMENTO_PARAMPTOVTA fppv on fppv.EMPRESA_ID = emp.EMPRESA_ID AND fppv.ACTIVO = 1 and pv.PUNTOVENTA_ID = fppv.PUNTOVENTA_ID AND fppv.TIPOPAGAMENTO = 'B' "); - sb.append(" LEFT JOIN INSTI_FINANCEIRA ifi ON ifi.CODIGO = fp.BOLETO_BANCO_COD "); - sb.append(" LEFT JOIN PARADA pa on pa.PARADA_ID = pv.PARADA_ID AND pa.ACTIVO = 1 "); - sb.append(" LEFT JOIN CIUDAD ci on ci.CIUDAD_ID = pa.CIUDAD_ID AND ci.ACTIVO = 1 "); - sb.append(" LEFT JOIN PLAZA pl on pl.PLAZA_ID = ci.PLAZA_ID AND pl.ACTIVO = 1 "); - sb.append(" LEFT JOIN ESTADO es on es.ESTADO_ID = ci.ESTADO_ID AND es.ACTIVO = 1 "); - sb.append(" LEFT JOIN EMPRESA_CONTABANCARIA ecb ON emp.EMPRESA_ID = ecb.EMPRESA_ID AND ifi.INSTIFINANCEIRA_ID = ecb.INSTIFINANCEIRA_ID AND ecb.ACTIVO = 1 "); - sb.append(" WHERE fb.activo = 1 "); - - if(!reenviar){ - sb.append(" AND fb.REMESSA_ID IS NULL "); - } - - sb.append(" AND fp.EMPRESA_ID = :empresaId "); - - if(hasDate){ - sb.append(" AND fb.FECDOCUMENTO BETWEEN :dataDe AND :dataAte "); - } - - sb.append(" ORDER BY "); - sb.append(" fb.FECMODIF, fb.FECDOCUMENTO "); - - } - - @Override - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) { - - 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, "); - sb.append(" fb.REMESSA_ID as remessaId, "); - sb.append(" fc.FECHAMENTOCNTCORRENTE_ID as fcId, "); - sb.append(" emp.NOMBEMPRESA, "); - sb.append(" pv.NOMBPUNTOVENTA, "); - sb.append(" emp.EMPRESA_ID AS codEmpresaBanco, "); - sb.append(" pv.PUNTOVENTA_ID "); - - writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); - - if(dataDe != null && dataAte != null){ - query.setDate(DATA_DE, dataDe); - query.setDate(DATA_ATE, dataAte); - } - - List list = query.list(); - List retorno = new ArrayList(); - - for(Object[] tupla : list){ - FechamentoBoleto fb = new FechamentoBoleto(); - fb.setFechamentoboletoId( Long.valueOf(tupla[0].toString())); - fb.setNossonumero( tupla[1].toString()); - fb.setFecdocumento( (Date)tupla[2]); - fb.setFecvencimento( (Date)tupla[3]); - fb.setValordocumento( (BigDecimal)tupla[4]); - fb.setStatus( tupla[5].toString() ); - fb.setRemessaId( tupla[6]==null?null:Long.valueOf(tupla[6].toString()) ); - - FechamentoCntcorrente fcc = new FechamentoCntcorrente(); - fcc.setFechamentocntcorrenteId( Long.valueOf(tupla[7].toString())); - - Integer codEmpresaBanco = tupla[10] != null ? Integer.valueOf(tupla[10].toString()) : 0; - fcc.setEmpresa( new Empresa(codEmpresaBanco, tupla[8].toString())); - - Integer codPuntoVenta = tupla[11] != null ? Integer.valueOf(tupla[11].toString()) : 0; - fcc.setPuntoventa( new PuntoVenta(codPuntoVenta, tupla[9].toString())); - - fb.setFechamentoCntcorrente(fcc); - - retorno.add(fb); - } - - return retorno; - } - - @Override - public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception { - - if(arquivoRemessa == null || arquivoRemessa.getItens() == null) { - return false; - } - - String ids = ""; - int count = 0; - int seqRemessa = 0; - - @SuppressWarnings("deprecation") - Connection con = getSession().connection(); - Statement stmt = con.createStatement(); - con.setAutoCommit(false); - - for(ArquivoRemessaItemInteface ar : arquivoRemessa.getItens()){ - - for(DetalheObrigatorio boleto : ar.getTitulos()){ - - if(count == 50){ - ids = ids.substring(1); - stmt.addBatch("UPDATE FECHAMENTO_BOLETO SET REMESSA_ID = " + seqRemessa + " WHERE FECHAMENTOBOLETO_ID IN ( " + ids + " )"); - count = 0; - ids = ""; - } - - ids += "," + boleto.getIdBoletoFechamento(); - seqRemessa = ar.getCabecalhoRemessa().getNumeroSequencialRemessa(); - - count++; - } - } - - if(count <= 50){ - ids = ids.substring(1); - stmt.addBatch("UPDATE FECHAMENTO_BOLETO SET REMESSA_ID = " + seqRemessa + " WHERE FECHAMENTOBOLETO_ID IN ( " + ids + " )"); - count = 0; - ids = ""; - } - - stmt.addBatch("UPDATE FECHAMENTO_PARAMGERAL SET COUNT_REMESSA = " + seqRemessa + " WHERE EMPRESA_ID = " + empresa.getEmpresaId()); - - stmt.executeBatch(); - con.commit(); - stmt.close(); - - - - return Boolean.TRUE; - } - - public String buscarConstante(String nombre) { - StringBuilder HQL = new StringBuilder(); - HQL.append(" select "); - HQL.append(" valorconstante "); - HQL.append(" from "); - HQL.append(" Constante "); - HQL.append(" where "); - HQL.append(" nombconstante = :nombre "); - HQL.append(" and activo = 1 "); - Query query = getSession().createQuery(HQL.toString()); - query.setParameter("nombre", nombre); - return (String) query.uniqueResult(); - } - - @Override - public List getEmpresas() { - - Query query = getSession().createQuery("SELECT param.empresa FROM FechamentoParamgeral param WHERE param.activo = 1 AND param.empresa.activo = 1"); - - return (List) query.list(); - } - - private String gerarCodigoTransmissao(String agencia, String agenciaDigito, String numeroConvenio, String numeroConta, String contaDigito) { - - StringBuilder sb = new StringBuilder(); - sb.append(StringUtils.leftPad(agencia, 4, '0')); - sb.append(StringUtils.leftPad(numeroConvenio, 8, '0')); - sb.append(StringUtils.leftPad(numeroConta.substring(0,numeroConta.length()-1), 8,'0')); // 2271 01152386 01300052 - - - return sb.toString(); - } - - private BigDecimal calculaValorMora( BigDecimal mora, BigDecimal valor ) { - if( mora != null && mora.compareTo(BigDecimal.ZERO) > 0 ) { - BigDecimal valorMora = (valor.multiply(mora)).divide( new BigDecimal("100")); - return valorMora.setScale(2, RoundingMode.HALF_UP); - }else { - return BigDecimal.ZERO; - } - } - - @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(" 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", LongType.INSTANCE) - .addScalar("indBoletoQuitado", BooleanType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(FechamentoBoleto.class)); - - query.setString("nossoNumero", nossoNumero); - query.setInteger(EMPRESA_ID, empresaId); - - FechamentoBoleto retorno = (FechamentoBoleto)query.uniqueResult(); - - return retorno; - } - - @Override - public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId, DetalheRetorno detalhe) 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(" , FECBAIXA = TO_DATE('"); - qry.append( detalhe.getDataBaixa()); - qry.append("', 'DDMMYY')"); - - if( detalhe.getValorJuros() != null) { - qry.append(" , VALOR_JUROS = ").append(detalhe.getValorJuros()); - }else { - qry.append(" , VALOR_JUROS = 0 "); - } - - qry.append(" where FECHAMENTOBOLETO_ID = ").append(fechamentoboletoId); - qry.append(" AND ACTIVO = 1 "); - - - int qtd = stmt.executeUpdate(qry.toString()); - con.commit(); - stmt.close(); - con.close(); - - return qtd==1; - } - - @Override - public boolean quitarFechamentoBoleto(DetalheRetorno detalhe,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(" , FECBAIXA = TO_DATE('"); - qry.append( detalhe.getDataBaixa()); - qry.append("', 'DDMMYY')"); - - if( detalhe.getValorJuros() != null) { - qry.append(" , VALOR_JUROS = ").append(detalhe.getValorJuros()); - }else { - qry.append(" , VALOR_JUROS = 0 "); - } - - qry.append(" where FECHAMENTOBOLETO_ID = ").append(detalhe.getIdBoletoFechamento()); - qry.append(" AND ACTIVO = 1 "); - - int qtd = stmt.executeUpdate(qry.toString()); - con.commit(); - stmt.close(); - con.close(); - - return qtd==1; - } - - private void zerarDesconto(DetalheObrigatorioDadosTitulosBancoBrasil titulo) { - titulo.setCodigoDesconto(0); - titulo.setDataDesconto(null); - titulo.setDescontoConcedido(BigDecimal.ZERO); - } - - @Override - public FechamentoBoleto obtenerFechamentoBoletoPorId(Integer idBoletoFechamento) { - 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 "); - sb.append(" ON fb.FECHAMENTOCNTCORRENTE_ID = fc.FECHAMENTOCNTCORRENTE_ID "); - sb.append(" AND fc.ACTIVO = 1 "); - sb.append(" WHERE fb.activo = 1 "); - sb.append(" AND fb.FECHAMENTOBOLETO_ID = :idFechamentoBoleto "); - - Query query = getSession().createSQLQuery(sb.toString()) - .addScalar("fechamentoboletoId", LongType.INSTANCE) - .addScalar("nossonumero", StringType.INSTANCE) - .addScalar("status", StringType.INSTANCE) - .addScalar("remessaId", LongType.INSTANCE) - .addScalar("indBoletoQuitado", BooleanType.INSTANCE) - .setResultTransformer(new AliasToBeanResultTransformer(FechamentoBoleto.class)); - - query.setInteger("idFechamentoBoleto", idBoletoFechamento); - - FechamentoBoleto retorno = (FechamentoBoleto)query.uniqueResult(); - - return retorno; - } - -} +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; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.BooleanType; +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; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.ArquivoRemessa; +import com.rjconsultores.ventaboletos.ArquivoRemessaItem; +import com.rjconsultores.ventaboletos.ArquivoRemessaItemInteface; +import com.rjconsultores.ventaboletos.blocos.DetalheMulta; +import com.rjconsultores.ventaboletos.blocos.DetalheObrigatorio; +import com.rjconsultores.ventaboletos.blocos.DetalheRetorno; +import com.rjconsultores.ventaboletos.blocos.RodapeRemessaPadrao; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.ArquivoRemessaBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.CabecalhoLoteRemessaBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.CabecalhoRemessaBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.DetalheObrigatorioDadosPagadorBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.DetalheObrigatorioDadosTitulosBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.RodapeRemessaBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bancobrasil.RodapeRemessaLoteBancoBrasil; +import com.rjconsultores.ventaboletos.blocos.bradesco.ArquivoRemessaBradesco; +import com.rjconsultores.ventaboletos.blocos.bradesco.CabecalhoRemessaBradesco; +import com.rjconsultores.ventaboletos.blocos.bradesco.DetalheObrigatorioBradesco; +import com.rjconsultores.ventaboletos.blocos.caixa.ArquivoRemessaCaixa; +import com.rjconsultores.ventaboletos.blocos.caixa.CabecalhoRemessaCaixa; +import com.rjconsultores.ventaboletos.blocos.caixa.DetalheObrigatorioCaixa; +import com.rjconsultores.ventaboletos.blocos.itau.ArquivoRemessaItau; +import com.rjconsultores.ventaboletos.blocos.itau.CabecalhoRemessaItau; +import com.rjconsultores.ventaboletos.blocos.itau.DetalheObrigatorioItau; +import com.rjconsultores.ventaboletos.blocos.mercantil.ArquivoRemessaMercantil; +import com.rjconsultores.ventaboletos.blocos.mercantil.CabecalhoRemessaMercantil; +import com.rjconsultores.ventaboletos.blocos.mercantil.DetalheObrigatorioMercantil; +import com.rjconsultores.ventaboletos.blocos.safra.ArquivoRemessaSafra; +import com.rjconsultores.ventaboletos.blocos.safra.CabecalhoRemessaSafra; +import com.rjconsultores.ventaboletos.blocos.safra.DetalheObrigatorioSafra; +import com.rjconsultores.ventaboletos.blocos.safra.RodapeRemessaSafra; +import com.rjconsultores.ventaboletos.blocos.santander.ArquivoRemessaSantander; +import com.rjconsultores.ventaboletos.blocos.santander.CabecalhoRemessaSantander; +import com.rjconsultores.ventaboletos.blocos.santander.DetalheObrigatorioSantander; +import com.rjconsultores.ventaboletos.blocos.sicoob.ArquivoRemessaSicoob; +import com.rjconsultores.ventaboletos.blocos.sicoob.CabecalhoLoteRemessaSicoob; +import com.rjconsultores.ventaboletos.blocos.sicoob.CabecalhoRemessaSicoob; +import com.rjconsultores.ventaboletos.blocos.sicoob.DetalheObrigatorioDadosPagadorSicoob; +import com.rjconsultores.ventaboletos.blocos.sicoob.DetalheObrigatorioSicoob; +import com.rjconsultores.ventaboletos.blocos.sicoob.RodapeRemessaLoteSicoob; +import com.rjconsultores.ventaboletos.blocos.sicoob.RodapeRemessaSicoob; +import com.rjconsultores.ventaboletos.dao.RemessaCNABBancosDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; +import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.enuns.Aceite; +import com.rjconsultores.ventaboletos.enuns.BancoLayout; +import com.rjconsultores.ventaboletos.enuns.TipoInscricaoPagador; +import com.rjconsultores.ventaboletos.exception.ComissaoException; +import com.rjconsultores.ventaboletos.exception.ValidacaoRemessaException; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +@Repository("remessaCNABBancosDAO") +@SuppressWarnings({"unchecked"}) +public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO implements RemessaCNABBancosDAO{ + + private static final String NUMERAIS = "[^0-9]+"; + private static final String DATA_ATE = "dataAte"; + private static final String DATA_DE = "dataDe"; + private static final String EMPRESA_ID = "empresaId"; + private static final String ZERO_ESQUERDA = "00000000"; + private static final Logger log = LogManager.getLogger(RemessaCNABBancosHibernateDAO.class); + + @Autowired + public RemessaCNABBancosHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public String findBanco(Empresa empresa){ + + StringBuilder sb = new StringBuilder(); + sb.append("SELECT DISTINCT fp.BOLETO_BANCO_COD "); + sb.append("FROM "); + sb.append("FECHAMENTO_PARAMGERAL fp "); + sb.append("WHERE fp.activo = 1 AND "); + sb.append("fp.EMPRESA_ID = " + empresa.getEmpresaId()); + + Query query = getSession().createSQLQuery(sb.toString()); + + return (String) query.list().get(0); + } + + public ArquivoRemessa remessaBradesco(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); + sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); + sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); + sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); + sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); + sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append("fb.VALORDOCUMENTO AS \"valor\", "); + sb.append("'01' AS \"especieTitulo\", "); + sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append("'00' AS \"instrucao1\", "); + sb.append("'00' AS \"instrucao2\", "); + sb.append("fb.MORA AS \"valorAtraso\", "); + sb.append("fb.DESCONTOS AS \"valorDesconto\", "); + sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append("'cnpj' as \"tipoInscricaoPagador\", "); + sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO || ', ' || pl.NOMBPLAZA || ', ' || ci.NOMBCIUDAD || ', ' || es.NOMBESTADO AS \"enderecoCompletoPagador\", "); + sb.append("pv.CODPOSTAL AS \"cepPagador\", "); + sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", "); + sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\" "); + + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.BRADESCO_400_Envio); + + String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaBradesco cabecalhoRemessaBradesco = null; + + boolean constanteValidacao = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_VALIDAR_CONSTANTE_REMESSA.getDescricao()); + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + String codEmpresaBanco = tupla[2] != null ? tupla[2].toString() : "0"; + String nomeEmpresa = tupla[3].toString(); + + if(!tupla[8].toString().contains("-")){ + log.error( String.format( "NossoNumero não está no formato correto: %s1 . Ignorando o registro FechamentoBoletoId = %s2 " , tupla[0].toString())); + continue; + } + + if(cabecalhoRemessaBradesco == null || !cabecalhoRemessaBradesco.getCodigoEmpresa().equals(codEmpresaBanco) ){ + cabecalhoRemessaBradesco = new CabecalhoRemessaBradesco(); + cabecalhoRemessaBradesco.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaBradesco.setDataGravacao(new Date()); + cabecalhoRemessaBradesco.setCodigoEmpresa(codEmpresaBanco); + cabecalhoRemessaBradesco.setNomeEmpresa(nomeEmpresa); + + arquivoRemessaItem = new ArquivoRemessaBradesco(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaBradesco); + arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); + + arquivoRemessa.addItem(arquivoRemessaItem); + } + + DetalheObrigatorioBradesco detalhe = new DetalheObrigatorioBradesco(); + + String []doc = tupla[8].toString().split("-"); + + detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + detalhe.setCarteira(tupla[7].toString()); + detalhe.setAgencia(tupla[4].toString()); + detalhe.setContacorrente(tupla[5].toString()); + detalhe.setDvConta(tupla[6].toString()); + detalhe.setNumeroControleDoParticipante(tupla[0].toString()); + detalhe.setNossoNumeroComDigito(doc[0] + doc[1]); + detalhe.setCodigoDeOcorrencia(0); + detalhe.setDataOcorrencia(null); + detalhe.setNumeroDoDocumento(StringUtils.right(doc[0], 10)); + detalhe.setVencimento((Date) tupla[9]); + detalhe.setValor(new BigDecimal(tupla[10].toString().replace(",", "."))); + detalhe.setEmissao((Date) tupla[12]); + detalhe.setPercentualMulta( (BigDecimal) tupla[24] ); + + if (!constanteValidacao) { + detalhe.setEspecieDeTitulo("01"); + detalhe.setInstrucao1("00"); + detalhe.setInstrucao2("00"); + }else { + detalhe.setEspecieDeTitulo(tupla[11].toString()); + detalhe.setInstrucao1(tupla[13].toString()); + detalhe.setInstrucao2(tupla[14].toString()); + } + + detalhe.setDataLimiteDesconto(null); + detalhe.setValorIOF(BigDecimal.ZERO); + detalhe.setTipoInscricaoPagador(TipoInscricaoPagador.CNPJ); + detalhe.setNomePagador(tupla[20].toString()); + detalhe.setSacador_Avalista_Mensagem2(""); + detalhe.setMensagem1(""); + + try{ + if( tupla[15] != null ) { + detalhe.setValorAtraso(new BigDecimal(tupla[15].toString().replace(",", "."))); + }else if( tupla[23] != null ) { + detalhe.setValorAtraso( calculaValorMora( (BigDecimal) tupla[23], new BigDecimal(tupla[10].toString().replaceAll(",", ".") )) ); + }else { + detalhe.setValorAtraso( BigDecimal.ZERO ); + } + + }catch(Exception e){ + throw new ValidacaoRemessaException("Erro ao setar o valor de atraso do boleto "+tupla[0]+", favor entrar em contato com o suporte! "); + } + + try{ + detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replace(",", "."))); + }catch(Exception e){ + } + + try{ + detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replace(",", "."))); + }catch(Exception e){ + } + + try{ + detalhe.setNumeroInscricaoPagador(tupla[19].toString().replaceAll(NUMERAIS, "")); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setEnderecoCompletoPagador(tupla[21].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Endereço do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + String cep = tupla[22].toString(); + detalhe.setCEP_Prefixo(cep.substring(0,5)); + detalhe.setCEP_Sufixo(cep.substring(5)); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + arquivoRemessaItem.addTitulo(detalhe); + + arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(arquivoRemessa.getItens().size()); + + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + + } + + public ArquivoRemessa remessaSafra(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); + sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append("emp.CNPJ AS \"cnpj\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); + sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); + sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append("fb.VALORDOCUMENTO AS \"valor\", "); + sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append("'01' AS \"instrucao1\", "); + sb.append("'01' AS \"instrucao2\", "); + sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\", "); + sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", "); + sb.append("fb.MORA AS \"valorAtraso\", "); + sb.append("fb.DESCONTOS AS \"valorDesconto\", "); + sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); + sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); + sb.append("pv.CODPOSTAL AS \"cepPagador\", "); + sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); + sb.append("es.CVEESTADO AS \"estadoPagador\" "); + + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.SAFRA_400_Envio); + + String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); + + int variavel = 0; + int seqRegistro = 0; + int qtdeTitulos = 0; + + BigDecimal valorTitulos = BigDecimal.ZERO; + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaSafra cabecalho = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + BigDecimal valor = new BigDecimal(tupla[9].toString().replace(",", ".")); + + qtdeTitulos++; + valorTitulos = valorTitulos.add( valor ); + String nomeEmpresa = tupla[2].toString(); + String agencia = tupla[4].toString(); + String conta = tupla[5].toString(); + String digiConta = tupla[6].toString(); + Date vencimento = (Date) tupla[8]; + + if(!tupla[7].toString().contains("-")){ + log.error(String.format( "NossoNumero não está no formato correto: %s1 . Ignorando o registro FechamentoBoletoId = %s2 " , tupla[7], tupla[0])); + continue; + } + + if(cabecalho == null ){ + variavel = idRemessa; + + cabecalho = new CabecalhoRemessaSafra(); + cabecalho.setNumAgencia(agencia); + cabecalho.setNumContaCorrente(conta); + cabecalho.setDigContaCorrente(digiConta); + cabecalho.setNomeEmpresa(nomeEmpresa); + cabecalho.setDataGravacao(new Date()); + cabecalho.setNumeroSequencialRemessa(idRemessa); + cabecalho.setNumeroSequencialRegistro(++seqRegistro); + + arquivoRemessaItem = new ArquivoRemessaSafra(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalho); + + arquivoRemessa.addItem(arquivoRemessaItem); + } + + DetalheObrigatorioSafra detalhe = new DetalheObrigatorioSafra(); + + detalhe.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + detalhe.setNumCpfCnpj(tupla[3].toString()); + detalhe.setNumAgencia(agencia); + detalhe.setNumContaCorrente(conta); + detalhe.setDigContaCorrente(digiConta); + detalhe.setNossoNumero(tupla[7].toString()); + detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + detalhe.setVencimento(vencimento); + detalhe.setValor(valor); + detalhe.setAceite(Aceite.ACEITE); + detalhe.setDataEmissao((Date) tupla[10]); + detalhe.setInstrucao1(tupla[11].toString()); + detalhe.setInstrucao2(tupla[12].toString()); + try{ + detalhe.setPercMulta( new BigDecimal(tupla[13].toString().replace(",", ".") ) ); + if( tupla[15] != null ) { + detalhe.setJurosDeMora(new BigDecimal(tupla[15].toString().replace(",", "."))); + }else { + detalhe.setJurosDeMora( calculaValorMora( (BigDecimal) tupla[14], valor )); + } + detalhe.setDataMulta(vencimento); + }catch(NullPointerException e){ + detalhe.setPercMulta(BigDecimal.ZERO); + detalhe.setDataMulta(vencimento); + detalhe.setJurosDeMora(BigDecimal.ZERO); + } + + try{ + detalhe.setDataLimiteDesconto(vencimento); + detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replace(",", "."))); + }catch(NullPointerException e){ + detalhe.setDataLimiteDesconto(vencimento); + detalhe.setValorDesconto(BigDecimal.ZERO); + } + + detalhe.setValorIOF(BigDecimal.ZERO); + + try{ + detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replace(",", "."))); + }catch(NullPointerException e){ + detalhe.setValorAbatimentoConcedido(BigDecimal.ZERO); + } + + detalhe.setTipoInscricaoPagador(TipoInscricaoPagador.CNPJ); + + try{ + detalhe.setNumeroInscricaoPagador(tupla[18].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); + } + + detalhe.setNomePagador(tupla[19].toString()); + + try{ + detalhe.setEnderecoPagador(tupla[20].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Logradouro do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setBairroPagador(tupla[21].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); + } + + detalhe.setCepPagador(tupla[22].toString()); + + try{ + detalhe.setCidadePagador(tupla[23].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setEstadoPagador(tupla[24].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[18]+" está fora do padrão, favor corrigir"); + } + + detalhe.setSacadorAvalista(""); + detalhe.setNumeroSequencialRemessa(idRemessa); + detalhe.setNumeroSequencialRegistro(++seqRegistro); + + arquivoRemessaItem.addTitulo(detalhe); + + } + + if(arquivoRemessaItem != null){ + + RodapeRemessaSafra rodape = new RodapeRemessaSafra(); + rodape.setQtdTitulos(qtdeTitulos); + rodape.setValorTotalTitulos(valorTitulos); + + rodape.setNumeroSequencialRemessa(variavel); + rodape.setNumeroSequencialRegistro(++seqRegistro); + + arquivoRemessaItem.setRodapeRemessa(rodape); + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + + } + + public ArquivoRemessa remessaSantander(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append(" fb.FECHAMENTOBOLETO_ID AS \"id\", "); //0 + sb.append(" (NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); //1 + sb.append(" fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); //2 + sb.append(" emp.NOMBEMPRESA AS \"nomeEmpresa\", "); //3 + sb.append(" fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); //4 + sb.append(" fp.BOLETO_BANCO_CONTA AS \"conta\", "); //5 + sb.append(" fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); //6 + sb.append(" fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); //7 + sb.append(" fb.NOSSONUMERO AS \"nossoNumero\", "); //8 + sb.append(" fb.FECVENCIMENTO AS \"vencimento\", "); //9 + sb.append(" fb.VALORDOCUMENTO AS \"valor\", "); //10 + sb.append(" '01' AS \"especieTitulo\", "); //11 + sb.append(" fb.FECDOCUMENTO AS \"dataEmissao\", ");//12 + sb.append(" '00' AS \"instrucao1\", ");//13 + sb.append(" '00' AS \"instrucao2\", ");//14 + sb.append(" fb.MORA AS \"valorAtraso\", ");//15 + sb.append(" fb.DESCONTOS AS \"valorDesconto\", ");//16 + sb.append(" fb.DEDUCOES AS \"valorAbatimento\", ");//17 + sb.append(" 'cnpj' as \"tipoInscricaoPagador\", ");//18 + sb.append(" pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", ");//19 + sb.append(" pv.NOMBPUNTOVENTA AS \"nomePagador\", ");//20 + sb.append(" pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO as endereco,");//21 + sb.append(" pl.NOMBPLAZA as bairro, ");//22 + sb.append(" ci.NOMBCIUDAD AS cidade, ");//23 + sb.append(" es.CVEESTADO AS estado, ");//24 + sb.append(" pv.CODPOSTAL AS \"cepPagador\", "); //25 + sb.append(" ecb.NUMINTEGRACION AS \"codigoTransmissao\", "); //26 + sb.append(" fp.BOLETO_BANCO_AGENCIA_DIGITO AS \"agenciaDigito\", "); //27 + sb.append(" emp.CNPJ AS \"numeroInscricaoSacado\", "); //28 + sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", ");//29 + sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\" ");//30 + + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.SANTANDER_400_Envio); + + String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaSantander cabecalhoRemessaSantander = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + String codEmpresaBanco = tupla[2] != null ? tupla[2].toString() : "0"; + String nomeEmpresa = tupla[3].toString(); + Integer codigoTransmissao = tupla[26] != null ? Integer.valueOf(tupla[26].toString()) : 0; + + if(!tupla[8].toString().contains("-")){ + log.error("NossoNumero não está no formato correto: " + tupla[8].toString() + ". Ignorando o registro FechamentoBoletoId = " + tupla[0].toString()); + continue; + } + + if(cabecalhoRemessaSantander == null){ + cabecalhoRemessaSantander = new CabecalhoRemessaSantander(); + cabecalhoRemessaSantander.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaSantander.setCodigoTransmissao(gerarCodigoTransmissao(tupla[4].toString(), tupla[27].toString(), codEmpresaBanco, tupla[5].toString(), tupla[6].toString())); + cabecalhoRemessaSantander.setDataGravacao(new Date()); + cabecalhoRemessaSantander.setCodigoEmpresa(codEmpresaBanco); + cabecalhoRemessaSantander.setNomeEmpresa(nomeEmpresa); + + arquivoRemessaItem = new ArquivoRemessaSantander(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaSantander); + arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); + + arquivoRemessa.addItem(arquivoRemessaItem); + + }else if(!cabecalhoRemessaSantander.getCodigoEmpresa().equals(codEmpresaBanco)){ + cabecalhoRemessaSantander = new CabecalhoRemessaSantander(); + cabecalhoRemessaSantander.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaSantander.setDataGravacao(new Date()); + cabecalhoRemessaSantander.setCodigoEmpresa(codEmpresaBanco); + cabecalhoRemessaSantander.setNomeEmpresa(nomeEmpresa); + + arquivoRemessaItem = new ArquivoRemessaSantander(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaSantander); + arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); + + arquivoRemessa.addItem(arquivoRemessaItem); + } + + DetalheObrigatorioSantander detalhe = new DetalheObrigatorioSantander(); + + String []doc = tupla[8].toString().split("-"); + detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + detalhe.setTipoInscricao(TipoInscricaoPagador.CNPJ); + detalhe.setCodigoTransmissao(codigoTransmissao.toString()); + + detalhe.setCarteira(tupla[7].toString()); + detalhe.setAgencia(tupla[4].toString()); + detalhe.setAgenciaCobradora(tupla[4].toString()); + detalhe.setContacorrente(tupla[5].toString()); + detalhe.setDvConta(tupla[6].toString()); + detalhe.setNumControleDoParticipante(tupla[0].toString()); + detalhe.setNossoNumeroComDigito(doc[0] + doc[1]); + detalhe.setCodigoDeOcorrencia(0); + detalhe.setDataOcorrencia(null); + detalhe.setNumeroDoDocumento(doc[0] + doc[1]); + detalhe.setVencimento((Date) tupla[9]); + detalhe.setValor(new BigDecimal(tupla[10].toString().replaceAll(",", "."))); + detalhe.setEspecieDeTitulo("01"); + detalhe.setEmissao((Date) tupla[12]); + detalhe.setInstrucao1("00"); + detalhe.setInstrucao2("00"); + detalhe.setDataLimiteDesconto(null); + detalhe.setDvAgencia(tupla[27].toString()); + detalhe.setCodigoEmpresa(codEmpresaBanco); + detalhe.setCodigoTransmissao(gerarCodigoTransmissao(tupla[4].toString(), tupla[27].toString(), codEmpresaBanco, tupla[5].toString(), tupla[6].toString())); + detalhe.setValorIOF(BigDecimal.ZERO); + detalhe.setNomeSacado(tupla[20].toString()); + detalhe.setMensagem1(""); + detalhe.setSacadorAvalista(""); + detalhe.setPercentualMulta( (BigDecimal) tupla[30] ); + + try{ + if( tupla[15] != null ) { + detalhe.setValorAtraso(new BigDecimal(tupla[15].toString().replaceAll(",", "."))); + }else if( tupla[29] != null ) { + detalhe.setValorAtraso( calculaValorMora( (BigDecimal) tupla[29], new BigDecimal(tupla[10].toString().replaceAll(",", ".") )) ); + }else { + detalhe.setValorAtraso( BigDecimal.ZERO ); + } + + }catch(Exception e){ + throw new ValidacaoRemessaException("Erro ao setar o valor de atraso do boleto "+tupla[0]+", favor entrar em contato com o suporte! "); + } + + try{ + detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replaceAll(",", "."))); + }catch(Exception e){} + + try{ + detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replaceAll(",", "."))); + }catch(Exception e){} + + try{ + detalhe.setNumeroInscricao(tupla[19].toString().replaceAll(NUMERAIS, "")); + }catch(Exception e){ + throw new ValidacaoRemessaException("A inscrição do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setNumeroInscricaoSacado(tupla[28].toString().replaceAll(NUMERAIS, "")); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setEnderecoSacado(tupla[21].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Endereco do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setBairroSacado(tupla[22].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setCidade(tupla[23].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("A Cidade do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setEstado(tupla[24].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + String cep = tupla[25].toString(); + detalhe.setCepSacado(cep.substring(0,5)); + detalhe.setComplementoCepSacado(cep.substring(5)); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + arquivoRemessaItem.addTitulo(detalhe); + + arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(arquivoRemessa.getItens().size()); + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + + } + + public ArquivoRemessa remessaMercantil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception{ + + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT "); + sb.append(" fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append(" (NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); + sb.append(" fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); + sb.append(" emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append(" fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append(" fp.BOLETO_BANCO_CONTA AS \"conta\", "); + sb.append(" fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); + sb.append(" fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); + sb.append(" fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append(" fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append(" fb.VALORDOCUMENTO AS \"valor\", "); + sb.append(" '01' AS \"especieTitulo\", "); + sb.append(" fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append(" '00' AS \"instrucao1\", "); + sb.append(" '00' AS \"instrucao2\", "); + sb.append(" fb.MORA AS \"valorAtraso\", "); + sb.append(" fb.DESCONTOS AS \"valorDesconto\", "); + sb.append(" fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append(" 'cnpj' as \"tipoInscricaoPagador\", "); + sb.append(" pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append(" pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append(" pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO as endereco,"); + sb.append(" pl.NOMBPLAZA as bairro, "); + sb.append(" ci.NOMBCIUDAD AS cidade, "); + sb.append(" es.CVEESTADO AS estado, "); + sb.append(" pv.CODPOSTAL AS \"cepPagador\", "); + sb.append(" ecb.NUMINTEGRACION AS \"numeroContrato\" "); + + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.MERCANTIL_400_Envio); + + String nomeArquivo = "CB" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaMercantil cabecalhoRemessaMercantil = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + String codEmpresaBanco = tupla[2] != null ? tupla[2].toString() : "0"; + String nomeEmpresa = tupla[3].toString(); + + if(!tupla[8].toString().contains("-")){ + log.error("NossoNumero não está no formato correto: " + tupla[8].toString() + ". Ignorando o registro FechamentoBoletoId = " + tupla[0].toString()); + continue; + } + + if(cabecalhoRemessaMercantil == null){ + cabecalhoRemessaMercantil = new CabecalhoRemessaMercantil(); + cabecalhoRemessaMercantil.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaMercantil.setAgenciaOrigem(tupla[4].toString()); + cabecalhoRemessaMercantil.setCnpj(Long.valueOf(tupla[19].toString().replaceAll(NUMERAIS, ""))); + cabecalhoRemessaMercantil.setDataGravacao(new Date()); + cabecalhoRemessaMercantil.setCodigoEmpresa(codEmpresaBanco); + cabecalhoRemessaMercantil.setNomeEmpresa(nomeEmpresa); + + arquivoRemessaItem = new ArquivoRemessaMercantil(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaMercantil); + arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); + + arquivoRemessa.addItem(arquivoRemessaItem); + + }else if(!cabecalhoRemessaMercantil.getCodigoEmpresa().equals(codEmpresaBanco)){ + cabecalhoRemessaMercantil = new CabecalhoRemessaMercantil(); + cabecalhoRemessaMercantil.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaMercantil.setDataGravacao(new Date()); + cabecalhoRemessaMercantil.setCodigoEmpresa(codEmpresaBanco); + cabecalhoRemessaMercantil.setNomeEmpresa(nomeEmpresa); + + arquivoRemessaItem = new ArquivoRemessaMercantil(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaMercantil); + arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); + + arquivoRemessa.addItem(arquivoRemessaItem); + } + + DetalheObrigatorioMercantil detalhe = new DetalheObrigatorioMercantil(); + + String []doc = tupla[8].toString().split("-"); + detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + detalhe.setNumeroContrato(Integer.valueOf(tupla[26].toString())); + detalhe.setAgenciaOrigem(tupla[4].toString()); + detalhe.setSeuNumero(Integer.valueOf(tupla[0].toString())); + detalhe.setNossoNumero(doc[0]); + detalhe.setDigitoVerificador(doc[1]); + detalhe.setCodigoDeOcorrencia(0); + detalhe.setDataOcorrencia(null); + detalhe.setNumeroDoDocumento(StringUtils.right(doc[0], 10)); + detalhe.setVencimento((Date) tupla[9]); + detalhe.setValorTitulo(new BigDecimal(tupla[10].toString().replaceAll(",", "."))); + detalhe.setEspecieDeTitulo(tupla[11].toString()); + detalhe.setEmissao((Date) tupla[12]); + detalhe.setInstrucao1(tupla[13].toString()); + detalhe.setInstrucao2(tupla[14].toString()); + detalhe.setDataLimiteDesconto(null); + detalhe.setMensagem1(""); + detalhe.setSacadorAvalistaMensagem2(""); + detalhe.setValorIOF(BigDecimal.ZERO); + detalhe.setNomePagador(tupla[20].toString()); + + try{ + detalhe.setValorAtraso(new BigDecimal(tupla[15].toString().replaceAll(",", "."))); + }catch(Exception e){} + + try{ + detalhe.setValorDesconto(new BigDecimal(tupla[16].toString().replaceAll(",", "."))); + }catch(Exception e){} + + try{ + detalhe.setValorAbatimentoConcedido(new BigDecimal(tupla[17].toString().replaceAll(",", "."))); + }catch(Exception e){} + + + try{ + detalhe.setEnderecoCompletoPagador(tupla[21].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Endereço do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setBairro(tupla[22].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setCidade(tupla[23].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setEstado(tupla[24].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setCnpj(Long.valueOf(tupla[19].toString().replaceAll(NUMERAIS, ""))); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + try{ + String cep = tupla[25].toString(); + detalhe.setCepPrefixo(cep.substring(0,5)); + detalhe.setCepSufixo(cep.substring(5)); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[20]+" está fora do padrão, favor corrigir"); + } + + arquivoRemessaItem.addTitulo(detalhe); + + arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(arquivoRemessa.getItens().size()); + + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + + } + + @Override + public ArquivoRemessa remessaItau(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); + sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); + sb.append("emp.CNPJ AS \"cnpj\", "); + sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); + sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); + sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); + sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append("fb.VALORDOCUMENTO AS \"valor\", "); + sb.append("99 AS \"especieTitulo\", "); + sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append("' ' AS \"instrucao1\", "); + sb.append("' ' AS \"instrucao2\", "); + sb.append("fb.MORA AS \"valorAtraso\", "); + sb.append("fb.DESCONTOS AS \"valorDesconto\", "); + sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append("'cnpj' as \"tipoInscricaoPagador\", "); + sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); + sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); + sb.append("pv.CODPOSTAL AS \"cepPagador\", "); + sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); + sb.append("es.cveestado AS \"estadoPagador\", "); + sb.append("nvl(fb.porc_mora, 0) AS \"porcentagemMora\", "); + sb.append("nvl(fb.porc_multa, 0) AS \"porcentagemMulta\" "); + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.ITAU_400_Envio); + + String nomeArquivo = "RE" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + int contador = 1; + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaItau cabecalhoRemessaItau = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + Integer codEmpresaBanco = Integer.valueOf(tupla[5].toString() + tupla[6].toString()); + String nomeEmpresa = tupla[4].toString(); + + if(cabecalhoRemessaItau == null){ + cabecalhoRemessaItau = new CabecalhoRemessaItau(); + cabecalhoRemessaItau.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaItau.setNumeroSequencialRegistro(contador); + cabecalhoRemessaItau.setDataGeracao(new Date()); + cabecalhoRemessaItau.setAgencia(Integer.valueOf(tupla[5].toString())); + cabecalhoRemessaItau.setConta(Integer.valueOf(tupla[6].toString())); + cabecalhoRemessaItau.setDacConta(Integer.valueOf(tupla[7].toString())); + cabecalhoRemessaItau.setNomeEmpresa(nomeEmpresa); + + arquivoRemessaItem = new ArquivoRemessaItau(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaItau); + arquivoRemessaItem.setRodapeRemessa(new RodapeRemessaPadrao()); + + arquivoRemessa.addItem(arquivoRemessaItem); + } + + DetalheObrigatorioItau detalhe = new DetalheObrigatorioItau(); + + String []doc = tupla[9].toString().split("-"); + + detalhe.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + detalhe.setNumeroInscricao(codEmpresaBanco); + detalhe.setAgencia(Integer.valueOf(tupla[5].toString())); + detalhe.setConta(Integer.valueOf(tupla[6].toString())); + detalhe.setDacConta(Integer.valueOf(tupla[7].toString())); + detalhe.setInstrucaoAlegacao(0000); + detalhe.setNossoNumero(Integer.valueOf(doc[0])); + detalhe.setNumCpfCnpj(tupla[3].toString()); + detalhe.setQtdMoeda(BigDecimal.ZERO); + detalhe.setNrCarteira(Integer.valueOf(tupla[8].toString())); + detalhe.setCodigoDeOcorrencia(01); + detalhe.setNumeroDoDocumento(tupla[0].toString()); + detalhe.setVencimento((Date) tupla[10]); + detalhe.setValor(new BigDecimal(tupla[11].toString().replace(",", "."))); + detalhe.setAgenciaCobradora(0); + detalhe.setEspecieDeTitulo("99"); + detalhe.setAceite("A"); + detalhe.setEmissao((Date) tupla[13]); + detalhe.setInstrucao1("05"); + detalhe.setInstrucao1("00"); + detalhe.setDataDesconto(null); + detalhe.setIOF_Devido(BigDecimal.ZERO); + detalhe.setNomeSacado(tupla[21].toString()); + detalhe.setTipoInscricaoSacado(TipoInscricaoPagador.CNPJ); + detalhe.setPrazo(00); + detalhe.setNumeroSequencialRegistro(++contador); + detalhe.setSacadorAvalista(tupla[21].toString()); + + try{ + BigDecimal percentualMulta = new BigDecimal(tupla[28].toString().replace(",", ".")); + if( percentualMulta.compareTo(BigDecimal.ZERO) > 0) { + DetalheMulta multa = new DetalheMulta(); + multa.setCodigoMulta("2"); + multa.setDataMulta(DateUtil.somarDias((Date) tupla[10], 1)); + multa.setPercentualMulta(percentualMulta); + multa.setNumeroSequencial(++contador); + detalhe.setDetalheMulta(multa); + } + }catch(Exception e){ + log.error("Erro ao gerar detalhe muulta para remessaId=" + tupla[1].toString() , e); + } + + try{ + detalhe.setJurosDeMora(new BigDecimal(tupla[27].toString().replace(",", "."))); + detalhe.setDataDeMora(DateUtil.somarDias((Date) tupla[10], 1)); + }catch(Exception e){ + detalhe.setJurosDeMora(BigDecimal.ZERO); + detalhe.setDataDeMora(null); + } + + try{ + detalhe.setDescontoConcedido(new BigDecimal(tupla[17].toString().replace(",", "."))); + }catch(Exception e){ + detalhe.setDescontoConcedido(BigDecimal.ZERO); + } + + try{ + detalhe.setAbatimentoConcedido(new BigDecimal(tupla[18].toString().replace(",", "."))); + }catch(Exception e){ + detalhe.setAbatimentoConcedido(BigDecimal.ZERO); + } + + try{ + detalhe.setNumeroInscricaoSacado(Long.valueOf(tupla[20].toString())); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setLogradouroSacado(tupla[22].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Logradouro do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setBairroSacado(tupla[23].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setCepSacado(tupla[24].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CEP do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setCidade(tupla[25].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); + } + + try{ + detalhe.setEstado(tupla[26].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[21]+" está fora do padrão, favor corrigir"); + } + + arquivoRemessaItem.addTitulo(detalhe); + } + if(arquivoRemessaItem!=null && arquivoRemessaItem.getRodapeRemessa()!=null) { + arquivoRemessaItem.getRodapeRemessa().setNumeroSequencialRegistro(++contador); + } + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + } + + @Override + public ArquivoRemessa remessaBancoBrasil(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); + sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); + sb.append("emp.CNPJ AS \"cnpj\", "); + sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); + sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); + sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); + sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append("fb.VALORDOCUMENTO AS \"valor\", "); + sb.append("99 AS \"especieTitulo\", "); + sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append("' ' AS \"instrucao1\", "); + sb.append("' ' AS \"instrucao2\", "); + sb.append("fb.MORA AS \"valorAtraso\", "); + sb.append("fb.DESCONTOS AS \"valorDesconto\", "); + sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append("'cnpj' as \"tipoInscricaoPagador\", "); + sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); + sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); + sb.append("pv.CODPOSTAL AS \"cepPagador\", "); + sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); + sb.append("es.NOMBESTADO AS \"estadoPagador\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA_DIGITO AS \"digitoAgencia\", "); + sb.append("fp.BOLETO_BANCO_CARTEIRA_VARIAVEL AS \"variavelCarteira\" "); + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.BB_240_Envio); + + String nomeArquivo = "BB" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaBancoBrasil cabecalhoRemessaBancoBrasil = null; + CabecalhoLoteRemessaBancoBrasil cabecalhoLoteRemessaBancoBrasil = null; + RodapeRemessaLoteBancoBrasil rodapeRemessaLoteBancoBrasil = null; + RodapeRemessaBancoBrasil rodapeRemessaBancoBrasil = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + String codEmpresaBanco = ((BigDecimal) tupla[2]).toString(); + codEmpresaBanco = StringUtils.right("000000000" + codEmpresaBanco, 9); + String nomeEmpresa = tupla[4].toString(); + + DateFormat df = new SimpleDateFormat("HHmmss"); + + if(cabecalhoRemessaBancoBrasil == null || + !(cabecalhoRemessaBancoBrasil.getNumConvenio()).equals(codEmpresaBanco)){ + cabecalhoRemessaBancoBrasil = new CabecalhoRemessaBancoBrasil(); + cabecalhoRemessaBancoBrasil.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaBancoBrasil.setDataGeracao(new Date()); + cabecalhoRemessaBancoBrasil.setHoraGeracao(Integer.parseInt(df.format(new Date()))); + cabecalhoRemessaBancoBrasil.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + cabecalhoRemessaBancoBrasil.setNumCpfCnpj(tupla[3].toString()); + cabecalhoRemessaBancoBrasil.setDensidadeArquivo("00000"); + cabecalhoRemessaBancoBrasil.setNumAgencia(tupla[5].toString()); + cabecalhoRemessaBancoBrasil.setDigAgencia(((BigDecimal) tupla[27]).toString()); + cabecalhoRemessaBancoBrasil.setDigAgenciaConta(" "); + cabecalhoRemessaBancoBrasil.setNumContaCorrente(tupla[6].toString()); + cabecalhoRemessaBancoBrasil.setDigContaCorrente(tupla[7].toString()); + cabecalhoRemessaBancoBrasil.setNumCarteira(tupla[8].toString()); + cabecalhoRemessaBancoBrasil.setNomeEmpresa(nomeEmpresa); + cabecalhoRemessaBancoBrasil.setNumConvenio(codEmpresaBanco); + + cabecalhoLoteRemessaBancoBrasil = new CabecalhoLoteRemessaBancoBrasil(); + cabecalhoLoteRemessaBancoBrasil.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + cabecalhoLoteRemessaBancoBrasil.setNumCpfCnpj(tupla[3].toString()); + cabecalhoLoteRemessaBancoBrasil.setNumAgencia(tupla[5].toString()); + cabecalhoLoteRemessaBancoBrasil.setDigAgencia(((BigDecimal) tupla[27]).toString()); + cabecalhoLoteRemessaBancoBrasil.setDigAgenciaConta(" "); + cabecalhoLoteRemessaBancoBrasil.setNumContaCorrente(tupla[6].toString()); + cabecalhoLoteRemessaBancoBrasil.setDigContaCorrente(tupla[7].toString()); + cabecalhoLoteRemessaBancoBrasil.setNumCarteira(tupla[8].toString()); + cabecalhoLoteRemessaBancoBrasil.setNomeEmpresa(nomeEmpresa); + cabecalhoLoteRemessaBancoBrasil.setNumConvenio(codEmpresaBanco); + cabecalhoLoteRemessaBancoBrasil.setDataGeracao(new Date()); + cabecalhoLoteRemessaBancoBrasil.setNumeroRemessa(idRemessa); + + try{ + cabecalhoRemessaBancoBrasil.setNumVarCarteira(((BigDecimal) tupla[28]).toString()); + cabecalhoLoteRemessaBancoBrasil.setNumVarCarteira(((BigDecimal) tupla[28]).toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException( + String.format( + "A Variação Carteira da empresa %s está fora do padrão, favor corrigir", + nomeEmpresa) + ); + } + + cabecalhoRemessaBancoBrasil.setCabecalhoLoteRemessaBancoBrasil(cabecalhoLoteRemessaBancoBrasil); + + arquivoRemessaItem = new ArquivoRemessaBancoBrasil(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaBancoBrasil); + + arquivoRemessa.addItem(arquivoRemessaItem); + } + + String []doc = tupla[9].toString().split("-"); + + DetalheObrigatorioDadosTitulosBancoBrasil titulosBancoBrasil = new DetalheObrigatorioDadosTitulosBancoBrasil(); + titulosBancoBrasil.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + titulosBancoBrasil.setNumAgencia(tupla[5].toString()); + titulosBancoBrasil.setDigAgencia(((BigDecimal) tupla[27]).toString()); + titulosBancoBrasil.setNumContaCorrente(tupla[6].toString()); + titulosBancoBrasil.setDigContaCorrente(tupla[7].toString()); + titulosBancoBrasil.setDigAgenciaConta(" "); + titulosBancoBrasil.setNossoNumeroBB(doc[0]); + titulosBancoBrasil.setCodCarteira(7); + titulosBancoBrasil.setFormaCadTituloBanco(" "); + titulosBancoBrasil.setTipoDocumento(" "); + titulosBancoBrasil.setIdentEmissaoBloqueto(" "); + titulosBancoBrasil.setIdentDistribuicao(" "); + titulosBancoBrasil.setNumeroDoDocumento(tupla[0].toString()); + titulosBancoBrasil.setVencimento((Date) tupla[10]); + titulosBancoBrasil.setValor(new BigDecimal(tupla[11].toString().replace(",", "."))); + titulosBancoBrasil.setAgenciaCobradora(null); + titulosBancoBrasil.setDigAgenciaCobradora(null); + titulosBancoBrasil.setAceite(Aceite.NAO_ACEITE); + titulosBancoBrasil.setEmissao((Date) tupla[13]); + try{ + titulosBancoBrasil.setCodMora(1); + titulosBancoBrasil.setJurosDeMora(new BigDecimal(tupla[16].toString().replace(",", "."))); + titulosBancoBrasil.setDataMora((Date) tupla[10]); + }catch(NullPointerException e){ + titulosBancoBrasil.setCodMora(1); + titulosBancoBrasil.setDataMora((Date) tupla[10]); + titulosBancoBrasil.setJurosDeMora(BigDecimal.ZERO); + } + + try{ + BigDecimal desconto = new BigDecimal(tupla[17].toString().replace(",", ".")); + if(desconto.equals(BigDecimal.ZERO)) { + zerarDesconto(titulosBancoBrasil); + } + + titulosBancoBrasil.setCodigoDesconto(1); + titulosBancoBrasil.setDataDesconto((Date) tupla[10]); + titulosBancoBrasil.setDescontoConcedido(desconto); + }catch(NullPointerException e){ + zerarDesconto(titulosBancoBrasil); + } + + titulosBancoBrasil.setIOF_Devido(BigDecimal.ZERO); + try{ + titulosBancoBrasil.setAbatimentoConcedido(new BigDecimal(tupla[18].toString().replace(",", "."))); + }catch(NullPointerException e){ + titulosBancoBrasil.setAbatimentoConcedido(BigDecimal.ZERO); + } + + titulosBancoBrasil.setNossoNumeroEmp(""); + titulosBancoBrasil.setCodigoProtesto(3); + titulosBancoBrasil.setDiasProtesto(0); + titulosBancoBrasil.setCodigoBaixa(2); + titulosBancoBrasil.setDiasBaixa(0); + titulosBancoBrasil.setNumeroContrato(0); + + DetalheObrigatorioDadosPagadorBancoBrasil pagadorBancoBrasil = new DetalheObrigatorioDadosPagadorBancoBrasil(); + pagadorBancoBrasil.setTipoInscricaoSacado(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + String ptoVenda = tupla[21].toString(); + pagadorBancoBrasil.setNomeSacado(ptoVenda); + String cep = ""; + try{ + cep = StringUtils.right(ZERO_ESQUERDA + tupla[24].toString(), 8); + }catch(Exception e){ + cep = ZERO_ESQUERDA; + } + int cepPrefix = Integer.parseInt(cep.substring(0, 5)); + int cepSufix = Integer.parseInt(cep.substring(5)); + pagadorBancoBrasil.setCepSacado(cepPrefix); + pagadorBancoBrasil.setSufixoCep(cepSufix); + pagadorBancoBrasil.setNossoNumeroNoBancoCorresp(""); + + try{ + pagadorBancoBrasil.setNumeroInscricaoSacado(tupla[20].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException( + String.format( + "O CNPJ do ponto de venda %s está fora do padrão, favor corrigir", + ptoVenda) + ); + } + + try{ + pagadorBancoBrasil.setLogradouroSacado(tupla[22].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException( + String.format( + "O Logradouro do ponto de venda %s está fora do padrão, favor corrigir", + ptoVenda) + ); + } + + try{ + pagadorBancoBrasil.setBairroSacado(tupla[23].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException( + String.format( + "O Bairro do ponto de venda %s está fora do padrão, favor corrigir", + ptoVenda) + ); + } + + try{ + pagadorBancoBrasil.setCidade(tupla[25].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException( + String.format( + "A cidade do ponto de venda %s está fora do padrão, favor corrigir", + ptoVenda) + ); + } + + try{ + pagadorBancoBrasil.setEstado(tupla[26].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException( + String.format( + "O Estado do ponto de venda %s está fora do padrão, favor corrigir", + ptoVenda) + ); + } + + titulosBancoBrasil.setDetalheObrigatorioDadosPagadorBancoBrasil(pagadorBancoBrasil); + + arquivoRemessaItem.addTitulo(titulosBancoBrasil); + + } + + if(true && arquivoRemessaItem != null){ + rodapeRemessaLoteBancoBrasil = new RodapeRemessaLoteBancoBrasil(); + //rodapeRemessaLoteBancoBrasil.setLoteServico(loteCount); + + rodapeRemessaBancoBrasil = new RodapeRemessaBancoBrasil(); + //rodapeRemessaBancoBrasil.setLoteServico(9999); + rodapeRemessaBancoBrasil.setQtdContas(0); + + rodapeRemessaBancoBrasil.setRodapeRemessaLoteBancoBrasil(rodapeRemessaLoteBancoBrasil); + + arquivoRemessaItem.setRodapeRemessa(rodapeRemessaBancoBrasil); + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + } + + @Override + public ArquivoRemessa remessaSicoob(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append("(NVL(fp.COUNT_REMESSA, 1) + 1) AS \"idRemessa\", "); + sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); + sb.append("emp.CNPJ AS \"cnpj\", "); + sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append("fp.BOLETO_BANCO_CONTA AS \"conta\", "); + sb.append("fp.BOLETO_BANCO_CONTA_DIGITO AS \"dac\", "); + sb.append("fp.BOLETO_BANCO_CARTEIRA AS \"carteira\", "); + sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append("fb.VALORDOCUMENTO AS \"valor\", "); + sb.append("99 AS \"especieTitulo\", "); + sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append("' ' AS \"instrucao1\", "); + sb.append("' ' AS \"instrucao2\", "); + sb.append("fb.MORA AS \"valorAtraso\", "); + sb.append("fb.DESCONTOS AS \"valorDesconto\", "); + sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append("'cnpj' as \"tipoInscricaoPagador\", "); + sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); + sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); + sb.append("pv.CODPOSTAL AS \"cepPagador\", "); + sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); + sb.append("es.NOMBESTADO AS \"estadoPagador\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA_DIGITO AS \"digitoAgencia\", "); + sb.append("fp.BOLETO_BANCO_CARTEIRA_VARIAVEL AS \"variavelCarteira\", "); + sb.append("es.CVEESTADO AS \"cveEstado\" "); + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.SICOOB_240_Envio); + + String nomeArquivo = "Sicoob" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + int seqRegistro = 1; + int qtdeTitulos = 0; + BigDecimal valorTitulos = BigDecimal.ZERO; + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaSicoob cabecalhoRemessaSicoob = null; + CabecalhoLoteRemessaSicoob cabecalhoLoteRemessaSicoob = null; + RodapeRemessaLoteSicoob rodapeRemessaLoteSicoob = null; + RodapeRemessaSicoob rodapeRemessaSicoob = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + String codEmpresaBanco = tupla[2] == null ? "" : ((BigDecimal) tupla[2]).toString(); + codEmpresaBanco = StringUtils.right("000000000" + codEmpresaBanco, 9); + String nomeEmpresa = tupla[4].toString(); + BigDecimal valor = new BigDecimal(tupla[11].toString().replace(",", ".")); + + qtdeTitulos++; + valorTitulos.add( valor ); + + if(cabecalhoRemessaSicoob == null ){ + cabecalhoRemessaSicoob = new CabecalhoRemessaSicoob(); + cabecalhoRemessaSicoob.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaSicoob.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + cabecalhoRemessaSicoob.setNumCpfCnpj(tupla[3].toString()); + cabecalhoRemessaSicoob.setNumAgencia(tupla[5].toString()); + cabecalhoRemessaSicoob.setDigAgencia(((BigDecimal) tupla[27]).toString()); + cabecalhoRemessaSicoob.setNumContaCorrente(tupla[6].toString()); + cabecalhoRemessaSicoob.setDigContaCorrente(tupla[7].toString()); + cabecalhoRemessaSicoob.setNomeEmpresa(nomeEmpresa); + cabecalhoRemessaSicoob.setNumRemessa(idRemessa); + cabecalhoRemessaSicoob.setDataGravacao(new Date()); + cabecalhoRemessaSicoob.setNumConvenio(codEmpresaBanco); + + cabecalhoLoteRemessaSicoob = new CabecalhoLoteRemessaSicoob(); + cabecalhoLoteRemessaSicoob.setCpfCnpj(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + cabecalhoLoteRemessaSicoob.setNumCpfCnpj(tupla[3].toString()); + cabecalhoLoteRemessaSicoob.setNumAgencia(tupla[5].toString()); + cabecalhoLoteRemessaSicoob.setDigAgencia(((BigDecimal) tupla[27]).toString()); + cabecalhoLoteRemessaSicoob.setNumContaCorrente(tupla[6].toString()); + cabecalhoLoteRemessaSicoob.setDigContaCorrente(tupla[7].toString()); + cabecalhoLoteRemessaSicoob.setNomeEmpresa(nomeEmpresa); + cabecalhoLoteRemessaSicoob.setNumeroRemessa(idRemessa); + cabecalhoLoteRemessaSicoob.setDataGeracao(new Date()); + cabecalhoRemessaSicoob.setCabecalhoLoteRemessaSicoob(cabecalhoLoteRemessaSicoob); + + arquivoRemessaItem = new ArquivoRemessaSicoob(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaSicoob); + + arquivoRemessa.addItem(arquivoRemessaItem); + }else { + try{ + if( !(cabecalhoRemessaSicoob.getNumConvenio()).equals(codEmpresaBanco)) { + throw new ValidacaoRemessaException(Labels.getLabel("relatorioRemessaCNAB.exception.ValidacaoRemessaConvenioException")); + } + }catch(Exception e){ + throw new ValidacaoRemessaException(Labels.getLabel("relatorioRemessaCNAB.exception.ValidacaoRemessaMontagemCabecalhoException")); + } + } + + String []doc = tupla[9].toString().split("-"); + + DetalheObrigatorioSicoob titulosSicoob = new DetalheObrigatorioSicoob(); + titulosSicoob.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + titulosSicoob.setNumSeqRegistro( seqRegistro++ ); + titulosSicoob.setNumAgencia(tupla[5].toString()); + titulosSicoob.setDigAgencia(((BigDecimal) tupla[27]).toString()); + titulosSicoob.setNumContaCorrente(tupla[6].toString()); + titulosSicoob.setDigContaCorrente(tupla[7].toString()); + titulosSicoob.setNossoNumero(doc[0]); + titulosSicoob.setNumeroDoDocumento(tupla[0].toString()); + titulosSicoob.setVencimento((Date) tupla[10]); + titulosSicoob.setValor( valor ); + titulosSicoob.setEmissao((Date) tupla[13]); + titulosSicoob.setCodCarteira(Integer.valueOf(tupla[8].toString())); + try{ + titulosSicoob.setCodMora(1); + titulosSicoob.setJurosDeMora(new BigDecimal(tupla[16].toString().replaceAll(",", "."))); + titulosSicoob.setDataMora(DateUtil.somarDias((Date) tupla[10], 1)); + }catch(NullPointerException e){ + titulosSicoob.setCodMora(BigDecimal.ZERO.intValue()); + titulosSicoob.setDataMora(null); + titulosSicoob.setJurosDeMora(BigDecimal.ZERO); + } + + try{ + titulosSicoob.setCodigoDesconto(1); + titulosSicoob.setDataDesconto((Date) tupla[10]); + titulosSicoob.setDescontoConcedido(new BigDecimal(tupla[17].toString().replaceAll(",", "."))); + }catch(NullPointerException e){ + titulosSicoob.setCodigoDesconto(BigDecimal.ZERO.intValue()); + titulosSicoob.setDataDesconto(null); + titulosSicoob.setDescontoConcedido(BigDecimal.ZERO); + } + + titulosSicoob.setIofDevido(BigDecimal.ZERO); + try{ + titulosSicoob.setAbatimentoConcedido(new BigDecimal(tupla[18].toString().replaceAll(",", "."))); + }catch(NullPointerException e){ + titulosSicoob.setAbatimentoConcedido(BigDecimal.ZERO); + } + titulosSicoob.setNossoNumeroEmp(tupla[0].toString()); + titulosSicoob.setCodigoProtesto(1); + titulosSicoob.setDiasProtesto(1); + titulosSicoob.setCodigoBaixa(2); + titulosSicoob.setDiasBaixa(000); + titulosSicoob.setNumeroContrato(Integer.parseInt(tupla[0].toString())); + + DetalheObrigatorioDadosPagadorSicoob pagadorSicoob = new DetalheObrigatorioDadosPagadorSicoob(); + pagadorSicoob.setNumeroSequencialRegistro( seqRegistro++ ); + pagadorSicoob.setTipoInscricaoSacado(Integer.parseInt(TipoInscricaoPagador.CNPJ.getId())); + pagadorSicoob.setNomeSacado(tupla[21].toString()); + String cep = ""; + try{ + cep = StringUtils.right(ZERO_ESQUERDA + tupla[24].toString(), 8); + }catch(Exception e){ + cep = ZERO_ESQUERDA; + } + int cepPrefix = Integer.parseInt(cep.substring(0, 5)); + int cepSufix = Integer.parseInt(cep.substring(5)); + pagadorSicoob.setCepSacado(cepPrefix); + pagadorSicoob.setSufixoCep(cepSufix); + pagadorSicoob.setCodBancoCorresp(0); + pagadorSicoob.setNossoNumeroNoBancoCorresp(""); + + try{ + pagadorSicoob.setNumeroInscricaoSacado(tupla[20].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaCNPJException", null, tupla[20]); + } + + try{ + pagadorSicoob.setLogradouroSacado(tupla[22].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaLogradouroException", null, tupla[22]); + } + + try{ + pagadorSicoob.setBairroSacado(tupla[23].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaBairroException", null, tupla[23]); + } + + try{ + pagadorSicoob.setCidade(tupla[25].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaCidadeException", null, tupla[25]); + } + + try{ + pagadorSicoob.setEstado(tupla[26].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaEstadoException", null, tupla[26]); + } + + try{ + pagadorSicoob.setCveEstado(tupla[29].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("relatorioRemessaCNAB.exception.ValidacaoRemessaCVEEstadoException", null, tupla[29]); + } + + titulosSicoob.setDetalheObrigatorioDadosPagadorSicoob(pagadorSicoob); + + arquivoRemessaItem.addTitulo(titulosSicoob); + + } + + if(arquivoRemessaItem != null){ + rodapeRemessaLoteSicoob = new RodapeRemessaLoteSicoob(); + rodapeRemessaLoteSicoob.setNumeroSequencialRegistro(qtdeTitulos); + rodapeRemessaLoteSicoob.setValorRegistros( valorTitulos ); + + rodapeRemessaSicoob = new RodapeRemessaSicoob(); + rodapeRemessaSicoob.setQtdLotes(1); + rodapeRemessaSicoob.setQtdArquivos(qtdeTitulos); + rodapeRemessaSicoob.setQtdContas(0); + + rodapeRemessaSicoob.setRodapeRemessaLoteSicoob(rodapeRemessaLoteSicoob); + + arquivoRemessaItem.setRodapeRemessa(rodapeRemessaSicoob); + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + } + + @Override + public ArquivoRemessa remessaCaixa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) throws Exception { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT "); + sb.append("fb.FECHAMENTOBOLETO_ID AS \"id\", "); + sb.append("(NVL(fp.COUNT_REMESSA, 0) + 1) AS \"idRemessa\", "); + sb.append("fp.COD_EMP_BANCO AS \"codEmpresaBanco\", "); + sb.append("emp.CNPJ AS \"cnpj\", "); + sb.append("emp.NOMBEMPRESA AS \"nomeEmpresa\", "); + sb.append("fp.BOLETO_BANCO_AGENCIA AS \"agencia\", "); + sb.append("fb.NOSSONUMERO AS \"nossoNumero\", "); + sb.append("fb.FECVENCIMENTO AS \"vencimento\", "); + sb.append("fb.VALORDOCUMENTO AS \"valor\", "); + sb.append("fb.FECDOCUMENTO AS \"dataEmissao\", "); + sb.append("(nvl(fb.porc_mora, 0)) AS \"porcMora\", "); + sb.append("fb.DESCONTOS AS \"valorDesconto\", "); + sb.append("fb.DEDUCOES AS \"valorAbatimento\", "); + sb.append("'cnpj' as \"tipoInscricaoPagador\", "); + sb.append("pv.NUMDOCPUNTOVENTA AS \"numeroInscricaoPagador\", "); + sb.append("pv.NOMBPUNTOVENTA AS \"nomePagador\", "); + sb.append("pv.DIRECCIONCALLE || ', ' || pv.DIRECCIONNUMERO AS \"logradouroPagador\", "); + sb.append("pl.NOMBPLAZA AS \"bairroPagador\", "); + sb.append("pv.CODPOSTAL AS \"cepPagador\", "); + sb.append("ci.NOMBCIUDAD AS \"cidadePagador\", "); + sb.append("es.NOMBESTADO AS \"estadoPagador\" "); + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + List list = query.list(); + + ArquivoRemessa arquivoRemessa = new ArquivoRemessa(BancoLayout.CAIXA_400_Envio); + + String nomeArquivo = "CEF" + new SimpleDateFormat("ddMM").format(new Date()); + int variavel = 0; + int seqRegistro = 0; + int qtdeTitulos = 0; + + ArquivoRemessaItem arquivoRemessaItem = null; + CabecalhoRemessaCaixa cabecalhoRemessaCaixa = null; + RodapeRemessaPadrao rodape = null; + + for(Object[] tupla : list){ + + Integer idRemessa = Integer.valueOf(tupla[1].toString()); + variavel = idRemessa; + String codEmpresaBanco = tupla[2] == null ? "" : ((BigDecimal) tupla[2]).toString(); + String versao = codEmpresaBanco.length() >6 ?"007":""; + codEmpresaBanco = StringUtils.right("0000000" + codEmpresaBanco, 7); + String nomeEmpresa = tupla[4].toString(); + BigDecimal valor = new BigDecimal(tupla[8].toString().replaceAll(",", ".")); + + qtdeTitulos++; + + if(cabecalhoRemessaCaixa == null ){ + cabecalhoRemessaCaixa = new CabecalhoRemessaCaixa(); + + cabecalhoRemessaCaixa.setAgenciaBeneficiario(tupla[5].toString()); + cabecalhoRemessaCaixa.setCodigoEmpresa(codEmpresaBanco); + cabecalhoRemessaCaixa.setNomeEmpresa(nomeEmpresa); + cabecalhoRemessaCaixa.setDataGravacao(new Date()); + cabecalhoRemessaCaixa.setNumeroSequencialRemessa(idRemessa); + cabecalhoRemessaCaixa.setVersaoLayout(versao); + + arquivoRemessaItem = new ArquivoRemessaCaixa(); + arquivoRemessaItem.setCabecalhoRemessa(cabecalhoRemessaCaixa); + arquivoRemessa.addItem(arquivoRemessaItem); + + } + + DetalheObrigatorioCaixa titulosCaixa = new DetalheObrigatorioCaixa(); + titulosCaixa.setIdBoletoFechamento(Integer.valueOf(tupla[0].toString())); + + titulosCaixa.setNumeroSequencialRegistro( seqRegistro++ ); + titulosCaixa.setNossoNumero(tupla[6].toString()); + titulosCaixa.setNumeroDoDocumento(tupla[0].toString()); + titulosCaixa.setVencimento((Date) tupla[7]); + titulosCaixa.setValor( valor ); + titulosCaixa.setEmissao((Date) tupla[9]); + + try{ + titulosCaixa.setValorAtraso( calculaValorMora( new BigDecimal(tupla[10].toString().replaceAll(",", ".") ), valor )); + }catch(NullPointerException e){ + titulosCaixa.setValorAtraso(BigDecimal.ZERO); + } + + try{ + titulosCaixa.setDataLimiteDesconto((Date) tupla[7]); + titulosCaixa.setValorDesconto(new BigDecimal(tupla[11].toString().replaceAll(",", "."))); + }catch(NullPointerException e){ + titulosCaixa.setDataLimiteDesconto((Date) tupla[7]); + titulosCaixa.setValorDesconto(BigDecimal.ZERO); + } + + titulosCaixa.setValorIOF(BigDecimal.ZERO); + try{ + titulosCaixa.setValorAbatimentoConcedido(new BigDecimal(tupla[12].toString().replaceAll(",", "."))); + }catch(NullPointerException e){ + titulosCaixa.setValorAbatimentoConcedido(BigDecimal.ZERO); + } + + titulosCaixa.setNomeSacado(tupla[15].toString()); + titulosCaixa.setTipoInscricaoPagador(TipoInscricaoPagador.CNPJ); + + try{ + titulosCaixa.setNumeroInscricao(tupla[3].toString().replaceAll(NUMERAIS, "")); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); + } + + String cep = ""; + try{ + cep = StringUtils.right(ZERO_ESQUERDA + tupla[18].toString(), 8); + }catch(Exception e){ + cep = ZERO_ESQUERDA; + } + + titulosCaixa.setCepSacado(cep); + + try{ + titulosCaixa.setNumeroInscricaoSacado(tupla[14].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O CNPJ do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); + } + + try{ + titulosCaixa.setEnderecoSacado(tupla[16].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Logradouro do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); + } + + try{ + titulosCaixa.setBairroSacado(tupla[17].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Bairro do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); + } + + try{ + titulosCaixa.setCidade(tupla[19].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("A cidade do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); + } + + try{ + titulosCaixa.setEstado(tupla[20].toString()); + }catch(Exception e){ + throw new ValidacaoRemessaException("O Estado do ponto de venda "+tupla[15]+" está fora do padrão, favor corrigir"); + } + + titulosCaixa.setSacadorAvalista(""); + + arquivoRemessaItem.addTitulo(titulosCaixa); + + } + + if(rodape == null){ + rodape = new RodapeRemessaPadrao(); + rodape.setNumeroSequencialRegistro(qtdeTitulos); + arquivoRemessaItem.setRodapeRemessa(rodape); + } + + nomeArquivo = nomeArquivo + new DecimalFormat("##").format(variavel) + ".REM"; + arquivoRemessa.setNomeArquivo(nomeArquivo); + + return arquivoRemessa; + } + + private void writeFROMClause(StringBuilder sb, boolean hasDate, Boolean reenviar) { + 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(" INNER JOIN PUNTO_VENTA pv on pv.PUNTOVENTA_ID = fc.PUNTOVENTA_ID AND pv.ACTIVO = 1 "); + sb.append(" INNER JOIN EMPRESA emp on emp.EMPRESA_ID = fc.EMPRESA_ID AND emp.ACTIVO = 1 "); + sb.append(" INNER JOIN FECHAMENTO_PARAMGERAL fp on fp.EMPRESA_ID = emp.EMPRESA_ID AND fp.ACTIVO = 1 "); + sb.append(" INNER JOIN FECHAMENTO_PARAMPTOVTA fppv on fppv.EMPRESA_ID = emp.EMPRESA_ID AND fppv.ACTIVO = 1 and pv.PUNTOVENTA_ID = fppv.PUNTOVENTA_ID AND fppv.TIPOPAGAMENTO = 'B' "); + sb.append(" LEFT JOIN INSTI_FINANCEIRA ifi ON ifi.CODIGO = fp.BOLETO_BANCO_COD "); + sb.append(" LEFT JOIN PARADA pa on pa.PARADA_ID = pv.PARADA_ID AND pa.ACTIVO = 1 "); + sb.append(" LEFT JOIN CIUDAD ci on ci.CIUDAD_ID = pa.CIUDAD_ID AND ci.ACTIVO = 1 "); + sb.append(" LEFT JOIN PLAZA pl on pl.PLAZA_ID = ci.PLAZA_ID AND pl.ACTIVO = 1 "); + sb.append(" LEFT JOIN ESTADO es on es.ESTADO_ID = ci.ESTADO_ID AND es.ACTIVO = 1 "); + sb.append(" LEFT JOIN EMPRESA_CONTABANCARIA ecb ON emp.EMPRESA_ID = ecb.EMPRESA_ID AND ifi.INSTIFINANCEIRA_ID = ecb.INSTIFINANCEIRA_ID AND ecb.ACTIVO = 1 "); + sb.append(" WHERE fb.activo = 1 "); + + if(!reenviar){ + sb.append(" AND fb.REMESSA_ID IS NULL "); + } + + sb.append(" AND fp.EMPRESA_ID = :empresaId "); + + if(hasDate){ + sb.append(" AND fb.FECDOCUMENTO BETWEEN :dataDe AND :dataAte "); + } + + sb.append(" ORDER BY "); + sb.append(" fb.FECMODIF, fb.FECDOCUMENTO "); + + } + + @Override + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) { + + 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, "); + sb.append(" fb.REMESSA_ID as remessaId, "); + sb.append(" fc.FECHAMENTOCNTCORRENTE_ID as fcId, "); + sb.append(" emp.NOMBEMPRESA, "); + sb.append(" pv.NOMBPUNTOVENTA, "); + sb.append(" emp.EMPRESA_ID AS codEmpresaBanco, "); + sb.append(" pv.PUNTOVENTA_ID "); + + writeFROMClause(sb, dataDe != null && dataAte != null, reenviar); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setInteger(EMPRESA_ID, empresa.getEmpresaId()); + + if(dataDe != null && dataAte != null){ + query.setDate(DATA_DE, dataDe); + query.setDate(DATA_ATE, dataAte); + } + + List list = query.list(); + List retorno = new ArrayList(); + + for(Object[] tupla : list){ + FechamentoBoleto fb = new FechamentoBoleto(); + fb.setFechamentoboletoId( Long.valueOf(tupla[0].toString())); + fb.setNossonumero( tupla[1].toString()); + fb.setFecdocumento( (Date)tupla[2]); + fb.setFecvencimento( (Date)tupla[3]); + fb.setValordocumento( (BigDecimal)tupla[4]); + fb.setStatus( tupla[5].toString() ); + fb.setRemessaId( tupla[6]==null?null:Long.valueOf(tupla[6].toString()) ); + + FechamentoCntcorrente fcc = new FechamentoCntcorrente(); + fcc.setFechamentocntcorrenteId( Long.valueOf(tupla[7].toString())); + + Integer codEmpresaBanco = tupla[10] != null ? Integer.valueOf(tupla[10].toString()) : 0; + fcc.setEmpresa( new Empresa(codEmpresaBanco, tupla[8].toString())); + + Integer codPuntoVenta = tupla[11] != null ? Integer.valueOf(tupla[11].toString()) : 0; + fcc.setPuntoventa( new PuntoVenta(codPuntoVenta, tupla[9].toString())); + + fb.setFechamentoCntcorrente(fcc); + + retorno.add(fb); + } + + return retorno; + } + + @Override + public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception { + + if(arquivoRemessa == null || arquivoRemessa.getItens() == null) { + return false; + } + + String ids = ""; + int count = 0; + int seqRemessa = 0; + + @SuppressWarnings("deprecation") + Connection con = getSession().connection(); + Statement stmt = con.createStatement(); + con.setAutoCommit(false); + + for(ArquivoRemessaItemInteface ar : arquivoRemessa.getItens()){ + + for(DetalheObrigatorio boleto : ar.getTitulos()){ + + if(count == 50){ + ids = ids.substring(1); + stmt.addBatch("UPDATE FECHAMENTO_BOLETO SET REMESSA_ID = " + seqRemessa + " WHERE FECHAMENTOBOLETO_ID IN ( " + ids + " )"); + count = 0; + ids = ""; + } + + ids += "," + boleto.getIdBoletoFechamento(); + seqRemessa = ar.getCabecalhoRemessa().getNumeroSequencialRemessa(); + + count++; + } + } + + if(count <= 50){ + ids = ids.substring(1); + stmt.addBatch("UPDATE FECHAMENTO_BOLETO SET REMESSA_ID = " + seqRemessa + " WHERE FECHAMENTOBOLETO_ID IN ( " + ids + " )"); + count = 0; + ids = ""; + } + + stmt.addBatch("UPDATE FECHAMENTO_PARAMGERAL SET COUNT_REMESSA = " + seqRemessa + " WHERE EMPRESA_ID = " + empresa.getEmpresaId()); + + stmt.executeBatch(); + con.commit(); + stmt.close(); + + + + return Boolean.TRUE; + } + + public String buscarConstante(String nombre) { + StringBuilder HQL = new StringBuilder(); + HQL.append(" select "); + HQL.append(" valorconstante "); + HQL.append(" from "); + HQL.append(" Constante "); + HQL.append(" where "); + HQL.append(" nombconstante = :nombre "); + HQL.append(" and activo = 1 "); + Query query = getSession().createQuery(HQL.toString()); + query.setParameter("nombre", nombre); + return (String) query.uniqueResult(); + } + + @Override + public List getEmpresas() { + + Query query = getSession().createQuery("SELECT param.empresa FROM FechamentoParamgeral param WHERE param.activo = 1 AND param.empresa.activo = 1"); + + return (List) query.list(); + } + + private String gerarCodigoTransmissao(String agencia, String agenciaDigito, String numeroConvenio, String numeroConta, String contaDigito) { + + StringBuilder sb = new StringBuilder(); + sb.append(StringUtils.leftPad(agencia, 4, '0')); + sb.append(StringUtils.leftPad(numeroConvenio, 8, '0')); + sb.append(StringUtils.leftPad(numeroConta.substring(0,numeroConta.length()-1), 8,'0')); // 2271 01152386 01300052 + + + return sb.toString(); + } + + private BigDecimal calculaValorMora( BigDecimal mora, BigDecimal valor ) { + if( mora != null && mora.compareTo(BigDecimal.ZERO) > 0 ) { + BigDecimal valorMora = (valor.multiply(mora)).divide( new BigDecimal("100")); + return valorMora.setScale(2, RoundingMode.HALF_UP); + }else { + return BigDecimal.ZERO; + } + } + + @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(" 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", LongType.INSTANCE) + .addScalar("indBoletoQuitado", BooleanType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(FechamentoBoleto.class)); + + query.setString("nossoNumero", nossoNumero); + query.setInteger(EMPRESA_ID, empresaId); + + FechamentoBoleto retorno = (FechamentoBoleto)query.uniqueResult(); + + return retorno; + } + + @Override + public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId, DetalheRetorno detalhe) 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(" , FECBAIXA = TO_DATE('"); + qry.append( detalhe.getDataBaixa()); + qry.append("', 'DDMMYY')"); + + if( detalhe.getValorJuros() != null) { + qry.append(" , VALOR_JUROS = ").append(detalhe.getValorJuros()); + }else { + qry.append(" , VALOR_JUROS = 0 "); + } + + qry.append(" where FECHAMENTOBOLETO_ID = ").append(fechamentoboletoId); + qry.append(" AND ACTIVO = 1 "); + + + int qtd = stmt.executeUpdate(qry.toString()); + con.commit(); + stmt.close(); + con.close(); + + return qtd==1; + } + + @Override + public boolean quitarFechamentoBoleto(DetalheRetorno detalhe,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(" , FECBAIXA = TO_DATE('"); + qry.append( detalhe.getDataBaixa()); + qry.append("', 'DDMMYY')"); + + if( detalhe.getValorJuros() != null) { + qry.append(" , VALOR_JUROS = ").append(detalhe.getValorJuros()); + }else { + qry.append(" , VALOR_JUROS = 0 "); + } + + qry.append(" where FECHAMENTOBOLETO_ID = ").append(detalhe.getIdBoletoFechamento()); + qry.append(" AND ACTIVO = 1 "); + + int qtd = stmt.executeUpdate(qry.toString()); + con.commit(); + stmt.close(); + con.close(); + + return qtd==1; + } + + private void zerarDesconto(DetalheObrigatorioDadosTitulosBancoBrasil titulo) { + titulo.setCodigoDesconto(0); + titulo.setDataDesconto(null); + titulo.setDescontoConcedido(BigDecimal.ZERO); + } + + @Override + public FechamentoBoleto obtenerFechamentoBoletoPorId(Integer idBoletoFechamento) { + 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 "); + sb.append(" ON fb.FECHAMENTOCNTCORRENTE_ID = fc.FECHAMENTOCNTCORRENTE_ID "); + sb.append(" AND fc.ACTIVO = 1 "); + sb.append(" WHERE fb.activo = 1 "); + sb.append(" AND fb.FECHAMENTOBOLETO_ID = :idFechamentoBoleto "); + + Query query = getSession().createSQLQuery(sb.toString()) + .addScalar("fechamentoboletoId", LongType.INSTANCE) + .addScalar("nossonumero", StringType.INSTANCE) + .addScalar("status", StringType.INSTANCE) + .addScalar("remessaId", LongType.INSTANCE) + .addScalar("indBoletoQuitado", BooleanType.INSTANCE) + .setResultTransformer(new AliasToBeanResultTransformer(FechamentoBoleto.class)); + + query.setInteger("idFechamentoBoleto", idBoletoFechamento); + + FechamentoBoleto retorno = (FechamentoBoleto)query.uniqueResult(); + + return retorno; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RequisicionBoletoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RequisicionBoletoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RequisicionBoletoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RequisicionBoletoHibernateDAO.java index c294df34a..ce0bfa8c2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RequisicionBoletoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RequisicionBoletoHibernateDAO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.RequisicionBoletoDAO; -import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; - -@Repository("requisicionBoletoDAO") -public class RequisicionBoletoHibernateDAO extends GenericHibernateDAO - implements RequisicionBoletoDAO { - - @Autowired - public RequisicionBoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.RequisicionBoletoDAO; +import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; + +@Repository("requisicionBoletoDAO") +public class RequisicionBoletoHibernateDAO extends GenericHibernateDAO + implements RequisicionBoletoDAO { + + @Autowired + public RequisicionBoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservaEspecialClienteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservaEspecialClienteHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservaEspecialClienteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservaEspecialClienteHibernateDAO.java index 66680eef7..872f2af8b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservaEspecialClienteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservaEspecialClienteHibernateDAO.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ReservaEspecialClienteDAO; -import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; - -@Repository("reservaEspecialClienteDAO") -public class ReservaEspecialClienteHibernateDAO extends GenericHibernateDAO - implements ReservaEspecialClienteDAO { - - private static final String FIELD_ACTIVO = "activo"; - - @Autowired - public ReservaEspecialClienteHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List bucarReservaEspecialByClienteId(Long clienteId) { - Criteria c = getCriteriaClienteActivo(); - c.add(Restrictions.eq("clienteId", clienteId)); - c.addOrder(Order.asc("reservaEspecialClienteId")); - - return c.list(); - } - - - - private Criteria getCriteriaClienteActivo() { - Criteria criteria = getSession().createCriteria(getPersistentClass()); - criteria.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); - return criteria; - } - - @Override - public List bucarReservaEspecialByCorridaId(Long corridaId) { - Criteria c = getCriteriaClienteActivo(); - c.add(Restrictions.eq("corridaId", corridaId)); - c.addOrder(Order.asc("reservaEspecialClienteId")); - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ReservaEspecialClienteDAO; +import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; + +@Repository("reservaEspecialClienteDAO") +public class ReservaEspecialClienteHibernateDAO extends GenericHibernateDAO + implements ReservaEspecialClienteDAO { + + private static final String FIELD_ACTIVO = "activo"; + + @Autowired + public ReservaEspecialClienteHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List bucarReservaEspecialByClienteId(Long clienteId) { + Criteria c = getCriteriaClienteActivo(); + c.add(Restrictions.eq("clienteId", clienteId)); + c.addOrder(Order.asc("reservaEspecialClienteId")); + + return c.list(); + } + + + + private Criteria getCriteriaClienteActivo() { + Criteria criteria = getSession().createCriteria(getPersistentClass()); + criteria.add(Restrictions.eq(FIELD_ACTIVO, Boolean.TRUE)); + return criteria; + } + + @Override + public List bucarReservaEspecialByCorridaId(Long corridaId) { + Criteria c = getCriteriaClienteActivo(); + c.add(Restrictions.eq("corridaId", corridaId)); + c.addOrder(Order.asc("reservaEspecialClienteId")); + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionPuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionPuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RevenueConfigHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RevenueConfigHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RevenueConfigHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RevenueConfigHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCasetaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCasetaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCasetaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCasetaHibernateDAO.java index f55531991..dfce09e0f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCasetaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCasetaHibernateDAO.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.RutaCasetaDAO; -import com.rjconsultores.ventaboletos.entidad.RutaCaseta; - -@Repository("rutaCasetaDAO") -public class RutaCasetaHibernateDAO extends GenericHibernateDAO -implements RutaCasetaDAO { - - @Autowired - public RutaCasetaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public void deletarRutaCasetasFromRutaSecuenciaId(Integer id){ - this.getSession().createQuery("DELETE from RutaCaseta rc WHERE rc.rutaSecuencia.rutasecuenciaId = "+id+" ").executeUpdate(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.RutaCasetaDAO; +import com.rjconsultores.ventaboletos.entidad.RutaCaseta; + +@Repository("rutaCasetaDAO") +public class RutaCasetaHibernateDAO extends GenericHibernateDAO +implements RutaCasetaDAO { + + @Autowired + public RutaCasetaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public void deletarRutaCasetasFromRutaSecuenciaId(Integer id){ + this.getSession().createQuery("DELETE from RutaCaseta rc WHERE rc.rutaSecuencia.rutasecuenciaId = "+id+" ").executeUpdate(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java index 3ce2d2d09..b7713bd4b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java @@ -1,1029 +1,1029 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SQLQuery; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.RutaCombinacionDAO; -import com.rjconsultores.ventaboletos.dao.TramoDAO; -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaCombinacion; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.tarifa.TarifaEscalaGroupVO; -import com.rjconsultores.ventaboletos.vo.tarifa.TarifaEscalaVO; -import com.rjconsultores.ventaboletos.vo.tarifa.TarifaOficialEscalaGroupVO; -import com.rjconsultores.ventaboletos.vo.tarifa.TarifaOficialEscalaVO; - -/** - * - * @author Rafius - */ -@Repository("rutaCombinacionDAO") -public class RutaCombinacionHibernateDAO extends GenericHibernateDAO implements RutaCombinacionDAO { - - private static Logger log = LogManager.getLogger(RutaCombinacionHibernateDAO.class); - @Autowired - private TramoDAO tramoDAO; - - @Autowired - public RutaCombinacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public boolean busquedaRutaTramo(Ruta ruta, Tramo tramo, Boolean ativo) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - - if (ativo) { - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - } else { - c.add(Restrictions.eq(ACTIVO, Boolean.FALSE)); - } - - c.setProjection(Projections.rowCount()); - - c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq("tramo", tramo)); - - return HibernateFix.count(c.list()) > 0; - } - - public RutaCombinacion busquedaTramoRutaTramo(Ruta ruta, Tramo trBuscaOrigemDestino) { - - 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) { - rc = (RutaCombinacion) sq.list().get(sq.list().size() - 1); - } - - return rc; - } - - public Tramo busqueda(Ruta ruta, Parada origen, Parada destino) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - Criteria c2 = c.createCriteria("tramo"); - c2.add(Restrictions.eq("origem", origen)); - c2.add(Restrictions.eq("destino", destino)); - c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - List list = c.list(); - - if (list.size() != 1) { - return null; - } - return list.get(0).getTramo(); - } - - public RutaCombinacion busquedaTramoRutaOrigemDestino(Ruta ruta, Parada origem, Parada destino) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("ruta", ruta)); - - Criteria c2 = c.createCriteria("tramo"); - c2.add(Restrictions.eq("origem", origem)); - c2.add(Restrictions.eq("destino", destino)); - c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - if (c.list().size() > 0) { - return (RutaCombinacion) c.list().get(0); - } - - return null; - - } - - public RutaCombinacion busquedaTramoRutaOrigemDestino(Integer rutaId, Integer origemId, Integer destinoId) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("ruta.rutaId", rutaId)); - - Criteria c2 = c.createCriteria("tramo"); - c2.add(Restrictions.eq("origem.paradaId", origemId)); - c2.add(Restrictions.eq("destino.paradaId", destinoId)); - c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - if (c.list().size() > 0) { - return (RutaCombinacion) c.list().get(0); - } - - return null; - - } - - public List obtenerPorRuta(Ruta ruta) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public boolean buscarRutaCombinacionExisteTramo(Tramo tramo) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("tramo", tramo)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - if (c.list().isEmpty()) { - return false; - } else { - return true; - } - - - } - - @Override - public List tramosFaltantes(Integer rutaId) { - Session session = getSession(); - List lsTramoFaltantes = new ArrayList(); - - StringBuilder sb = new StringBuilder(""); - sb.append(" select t.origen_id, "); - sb.append(" rs.numsecuencia "); - sb.append(" from ruta_secuencia rs "); - sb.append(" inner join tramo t on t.tramo_id = rs.tramo_id "); - sb.append(" where rs.activo = 1 and "); - sb.append(" t.activo = 1 and "); - sb.append(" rs.ruta_id = :rutaId "); - sb.append(" union "); - sb.append(" select t.destino_id, "); - sb.append(" rs.numsecuencia "); - sb.append(" from ruta_secuencia rs "); - sb.append(" inner join tramo t on t.tramo_id = rs.tramo_id "); - sb.append(" where rs.activo = 1 and "); - sb.append(" t.activo = 1 and "); - sb.append(" rs.ruta_id = :rutaId and "); - sb.append(" rs.numsecuencia = "); - sb.append(" (select max(rs.numsecuencia) from "); - sb.append(" ruta_secuencia rs inner join tramo t on "); - sb.append(" t.tramo_id = rs.tramo_id where rs.activo = "); - sb.append(" 1 and t.activo = 1 and rs.ruta_id = :rutaId ) "); - sb.append(" order by 2 "); - - - SQLQuery sqlQuery = session.createSQLQuery(sb.toString()); - sqlQuery.setInteger("rutaId", rutaId); - - List lsParadas = sqlQuery.list(); - Integer origenId = null; - Integer destinoId = null; - for (int i = 0; i < lsParadas.size(); i++) { - origenId = ((BigDecimal) lsParadas.get(i)[0]).intValue(); - for (int j = i + 1; j < lsParadas.size(); j++) { - destinoId = ((BigDecimal) lsParadas.get(j)[0]).intValue(); - - log.debug(origenId + " - " + destinoId); - - sb = new StringBuilder(); - sb.append(" select count(*) "); - sb.append(" from ruta_combinacion rc "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sb.append(" where "); - sb.append(" rc.ruta_id = :rutaId "); - sb.append(" and rc.activo = 1 "); - sb.append(" and t.activo = 1 "); - sb.append(" and t.origen_id = :origenId "); - sb.append(" and t.destino_id = :destinoId "); - - - SQLQuery sqlQueryExists = session.createSQLQuery(sb.toString()); - sqlQueryExists.setInteger("rutaId", rutaId); - sqlQueryExists.setInteger("origenId", origenId); - sqlQueryExists.setInteger("destinoId", destinoId); - - Long count = HibernateFix.count(sqlQueryExists.list()); - - if (count == 0) { - log.info("No existe combinacion " + origenId + " - " + destinoId); - - - Parada paradaOrigem = new Parada(); - paradaOrigem.setParadaId(origenId); - - Parada paradaDestino = new Parada(); - paradaDestino.setParadaId(destinoId); - - List list = tramoDAO.obtenerListPorOrigemDestino(paradaOrigem, paradaDestino); - - if (list.size() == 0) { - log.info("No existe tramo " + origenId + " - " + destinoId); - } else { - lsTramoFaltantes.add(list.get(0)); - } - - } - } - - } - - return lsTramoFaltantes; - } - - public int borrarCombinaciones(Ruta ruta) { - Query query = this.getSession().createQuery("UPDATE RutaCombinacion set activo = false, fecmodif = current_timestamp(), usuarioId= :usuario where ruta = :ruta"); - query.setParameter("ruta", ruta); - query.setParameter("usuario", UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - return query.executeUpdate(); - } - - public void activar(Ruta ruta, Tramo trBuscaOrigemDestino) { - String sql = " select rc.rutacombinacionId 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(); - - getSession().createQuery("update RutaCombinacion set activo = true where rutacombinacionId in (" + sql + " )").executeUpdate(); - } - - public List pesquisaTarifaObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa, List lsOrgaoConcedente) { - - StringBuilder hql = new StringBuilder(" "); - hql.append(" SELECT "); - hql.append(" T.TARIFA_ID,"); // 0 - hql.append(" TRA.DESCTRAMO, "); // 1 - hql.append(" ORI.DESCPARADA as origem,"); // 2 - hql.append(" DES.DESCPARADA as destino, "); // 3 - hql.append(" R.DESCRUTA,"); // 4 - hql.append(" M.DESCMARCA, "); // 5 - hql.append(" CS.DESCCLASE,"); // 6 - hql.append(" VT.feciniciovigencia, "); // 7 - hql.append(" VT.fecfinvigencia,"); // 8 - hql.append(" MON.descmoneda, "); // 9 - hql.append(" T.preciooriginal, "); // 10 - hql.append(" T.PRECIO,"); // 11 - hql.append(" R.RUTA_ID,"); // 12 - hql.append(" MON.moneda_id,"); // 13 - hql.append(" VT.VIGENCIATARIFA_ID,"); // 14 - hql.append(" M.MARCA_ID, "); // 15 - hql.append(" T.IMPORTEPEDAGIO, "); // 16 - hql.append(" OCONC.DESCORGAO, "); // 17 - hql.append(" T.IMPORTETAXAEMBARQUE, "); // 18 - hql.append(" T.IMPORTESEGURO, "); // 19 - hql.append(" T.IMPORTETPP,"); //20 - hql.append(" R.NUMRUTA, "); // 21 - hql.append(" R.PREFIXO, "); // 22 - hql.append(" R.INDSENTIDOIDA, "); // 23 - hql.append(" RC.INDVENTA, "); // 24 - hql.append(" TRA.ORIGEN_ID ||'-'|| TRA.DESTINO_ID ||'-'|| M.EMPRESA_ID ||'-'|| R.RUTA_ID ||'-'|| CS.CLASESERVICIO_ID, "); // 25 - hql.append(" EMP.INDPRECOPORDEMANDA ");// 26 - - - hql.append(" FROM "); - hql.append(" RUTA_COMBINACION RC "); - hql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); - hql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); - hql.append(" inner join ORGAO_CONCEDENTE OCONC on (R.ORGAOCONCEDENTE_ID = OCONC.ORGAOCONCEDENTE_ID) "); - hql.append(" , TARIFA T "); - if (!lsEmpresa.isEmpty()) { - hql.append(" , RUTA_EMPRESA RE "); - } - hql.append(" , MARCA M, EMPRESA EMP, MONEDA MON, VIGENCIA_TARIFA VT "); - hql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); - hql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND R.activo = 1 "); - if (!lsEmpresa.isEmpty()) { - hql.append(" AND RE.activo = 1 AND RC.RUTA_ID = RE.RUTA_ID "); - } - hql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); - hql.append(" AND T.MARCA_ID = M.MARCA_ID "); - hql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); - hql.append(" AND T.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID "); - hql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); - hql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); - hql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); - hql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); - hql.append(" AND T.RUTA_ID = R.RUTA_ID "); - hql.append(" AND M.EMPRESA_ID = EMP.EMPRESA_ID "); - - if (!lsVigenciaTarifa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (VigenciaTarifa vt : lsVigenciaTarifa) { - sb.append(vt.getVigenciatarifaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND VT.VIGENCIATARIFA_ID in (").append(listInt).append(")"); - } - if (!lsEmpresa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Empresa vt : lsEmpresa) { - sb.append(vt.getEmpresaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); - } - if (!lsRuta.isEmpty() && !lsRuta.toString().contains("TODAS")) { - StringBuilder sb = new StringBuilder(""); - for (Ruta vt : lsRuta) { - sb.append(vt.getRutaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); - } - if (!lsMarca.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Marca vt : lsMarca) { - sb.append(vt.getMarcaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); - } - if (!lsMoneda.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Moneda vt : lsMoneda) { - sb.append(vt.getMonedaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); - } - if (!lsClaseServicio.isEmpty() && !lsClaseServicio.toString().contains("TODAS")) { - StringBuilder sb = new StringBuilder(""); - for (ClaseServicio cs : lsClaseServicio) { - sb.append(cs.getClaseservicioId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); - } - if (!lsOrgaoConcedente.isEmpty() && !lsOrgaoConcedente.toString().contains("TODOS")) { - StringBuilder sb = new StringBuilder(""); - for (OrgaoConcedente oc : lsOrgaoConcedente) { - sb.append(oc.getOrgaoConcedenteId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND OCONC.ORGAOCONCEDENTE_ID in (").append(listInt).append(") "); - } - - hql.append(" order by R.NUMRUTA, R.RUTA_ID, VT.VIGENCIATARIFA_ID, M.DESCMARCA,ORI.DESCPARADA,DES.DESCPARADA "); - - System.out.println(hql.toString()); - - List lsObj = this.getSession().createSQLQuery(hql.toString()).list(); - - return lsObj; - } - - public List pesquisaTarifaOficialObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsEmpresa, List lsRuta, List lsVigenciaTarifa) { - - StringBuilder hql = new StringBuilder(" "); - hql.append(" SELECT "); - hql.append(" T.TARIFAOFICIAL_ID, "); - hql.append(" TRA.DESCTRAMO, "); - hql.append(" ORI.DESCPARADA as origem, "); - hql.append(" DES.DESCPARADA as destino, "); - hql.append(" R.DESCRUTA,"); - hql.append(" M.DESCMARCA, "); - hql.append(" CS.DESCCLASE,'' as feciniciovigencia, "); - hql.append(" '' as fecfinvigencia, "); - hql.append(" MON.descmoneda, "); - hql.append(" T.preciooriginal, "); - hql.append(" T.PRECIO,R.RUTA_ID, "); - hql.append(" MON.moneda_id,'' AS VIGENCIATARIFA_ID, "); - hql.append(" M.MARCA_ID, "); - hql.append(" T.IMPORTETAXAEMBARQUE, "); - hql.append(" T.IMPORTESEGURO, "); - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.EXIBE_TPP.getDescricao())) { - hql.append(" T.IMPORTETPP, "); - } - hql.append(" T.IMPORTEPEDAGIO, "); - hql.append("T.IMPORTEOUTROS "); - hql.append(" FROM "); - hql.append(" RUTA_COMBINACION RC "); - hql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); - hql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); - hql.append(" , TARIFA_OFICIAL T "); - if (!lsEmpresa.isEmpty()) { - hql.append(" , RUTA_EMPRESA RE "); - } - hql.append(" , MARCA M, MONEDA MON"); - hql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); - hql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND R.activo = 1 "); - if (!lsEmpresa.isEmpty()) { - hql.append(" AND RE.activo = 1 AND RC.RUTA_ID = RE.RUTA_ID "); - } - hql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); - hql.append(" AND T.MARCA_ID = M.MARCA_ID "); - hql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); - hql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); - hql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); - hql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); - hql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); - - if (!lsEmpresa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Empresa vt : lsEmpresa) { - sb.append(vt.getEmpresaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); - } - if (!lsRuta.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Ruta vt : lsRuta) { - sb.append(vt.getRutaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - if (!listInt.contains("-1")){ - hql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); - } - } - if (!lsMarca.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Marca vt : lsMarca) { - sb.append(vt.getMarcaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); - } - if (!lsMoneda.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Moneda vt : lsMoneda) { - sb.append(vt.getMonedaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); - } - if (!lsClaseServicio.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (ClaseServicio cs : lsClaseServicio) { - sb.append(cs.getClaseservicioId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - //Tratando caso de conter opção TODAS - if(!listInt.contains("-1")) { - hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); - } - } - - hql.append(" order by R.DESCRUTA, R.RUTA_ID, RC.RUTACOMBINACION_ID,t.TARIFAOFICIAL_id "); - - List lsObj = this.getSession().createSQLQuery(hql.toString()).list(); - - return lsObj; - } - - public List pesquisaTarifaGroupObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa) { - - StringBuilder sql = new StringBuilder(" "); - sql.append(" SELECT R.descruta, "); - sql.append(" R.RUTA_ID, "); - sql.append(" MON.moneda_id, "); - sql.append(" '' AS VIGENCIATARIFA_ID, "); - sql.append(" M.MARCA_ID, "); - sql.append(" mon.descmoneda, "); - sql.append(" vt.FECINICIOVIGENCIA, "); - sql.append(" vt.FECFINVIGENCIA, "); - sql.append(" M.descmarca, "); - sql.append(" CS.descclase "); - sql.append(" FROM "); - sql.append(" RUTA_COMBINACION RC "); - sql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); - sql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); - sql.append(" , TARIFA_OFICIAL T , "); - sql.append(" RUTA_EMPRESA RE "); - sql.append(" , MARCA M, "); - sql.append(" MONEDA MON,"); - sql.append(" , CLASE_SERVICIO CS , "); - sql.append(" PARADA ORI, "); - sql.append(" PARADA DES "); - sql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND RE.activo = 1 AND R.activo = 1 "); - sql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); - sql.append(" AND RC.RUTA_ID = RE.RUTA_ID "); - sql.append(" AND T.MARCA_ID = M.MARCA_ID "); - sql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); - sql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); - sql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); - sql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); - sql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); - - if (!lsEmpresa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Empresa vt : lsEmpresa) { - sb.append(vt.getEmpresaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - sql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); - } - if (!lsRuta.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Ruta vt : lsRuta) { - sb.append(vt.getRutaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - sql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); - } - if (!lsMarca.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Marca vt : lsMarca) { - sb.append(vt.getMarcaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - sql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); - } - if (!lsMoneda.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Moneda vt : lsMoneda) { - sb.append(vt.getMonedaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - sql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); - } - if (!lsClaseServicio.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (ClaseServicio cs : lsClaseServicio) { - sb.append(cs.getClaseservicioId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - sql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); - } - - sql.append(" GROUP by R.descruta,R.RUTA_ID,MON.moneda_id,VT.VIGENCIATARIFA_ID,M.MARCA_ID,mon.descmoneda,vt.FECINICIOVIGENCIA,vt.FECFINVIGENCIA, M.descmarca,CS.descclase "); - sql.append(" ORDER by R.descruta,R.RUTA_ID,MON.moneda_id,VT.VIGENCIATARIFA_ID,M.MARCA_ID"); - - SQLQuery query = getSession().createSQLQuery(sql.toString()); - query.setResultTransformer(new AliasToBeanResultTransformer(TarifaEscalaGroupVO.class)); - - return query.list(); - } - - public List pesquisaTarifaEscalaObj(String rutaId, String monedaId, String vigenciaId, String marcaId) { - - StringBuilder sql = new StringBuilder(" "); - sql.append("select distinct po.cveparada as cveOrigem,po.descparada as descOrigem, "); - sql.append(" pd.cveparada as cveDestino,pd.descparada as descDestino,tmp.numsecuencia as NUMSECORIGEM,tmp2.numsecuencia as NUMSECDESTINO, "); - sql.append(" ta.PRECIO as precio,ruta.ruta_id as rutaId,ruta.descruta as descruta "); - sql.append("from "); - sql.append(" ruta_combinacion rc "); - sql.append(" inner join ruta on (ruta.ruta_id = rc.ruta_id) "); - sql.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sql.append(" inner join parada po on po.parada_id = t.origen_id "); - sql.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sql.append(" inner join ( "); - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1 "); - sql.append(" and rownum =1 "); - sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); - sql.append(" "); - sql.append(" union "); - - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1) "); - sql.append(" ) tmp on tmp.parada_id = po.parada_id "); - - sql.append("left join ( "); - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1 "); - sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); - sql.append(" union "); - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1) "); - sql.append(" ) tmp2 on tmp2.parada_id = pd.parada_id "); - sql.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sql.append(" left join tarifa ta on ta.TRAMO_ID = rc.tramo_id and ta.claseservicio_id = r.claseservicio_id and ta.MONEDA_ID = ").append(monedaId).append(" and ta.activo = 1 "); - sql.append(" where "); - sql.append(" rc.ruta_id = ").append(rutaId); - sql.append(" and rc.activo = 1 "); - sql.append(" and ta.MARCA_ID = ").append(marcaId); - sql.append(" and ta.VIGENCIATARIFA_ID = ").append(vigenciaId); - sql.append(" and ta.moneda_id = ").append(monedaId); - sql.append(" order by ruta.ruta_id ,tmp.numsecuencia,tmp2.numsecuencia "); - - - SQLQuery query = getSession().createSQLQuery(sql.toString()); - query.setResultTransformer(new AliasToBeanResultTransformer(TarifaEscalaVO.class)); - - return query.list(); - } - - public List pesquisaTarifaOficialGroupObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsEmpresa, List lsRuta, List lsVigenciaTarifa) { - - StringBuilder sql = new StringBuilder(" "); - sql.append(" SELECT R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID,mon.descmoneda, M.descmarca,CS.descclase "); - sql.append(" FROM "); - sql.append(" RUTA_COMBINACION RC "); - sql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); - sql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); - sql.append(" , TARIFA_OFICIAL T , RUTA_EMPRESA RE "); - sql.append(" , MARCA M, MONEDA MON"); - sql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); - sql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND RE.activo = 1 AND R.activo = 1 "); - sql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); - sql.append(" AND RC.RUTA_ID = RE.RUTA_ID "); - sql.append(" AND T.MARCA_ID = M.MARCA_ID "); - sql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); - sql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); - sql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); - sql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); - sql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); - - if (!lsEmpresa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Empresa vt : lsEmpresa) { - sb.append(vt.getEmpresaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - if(!listInt.contains("-1")){ - sql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); - } - } - if (!lsRuta.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Ruta vt : lsRuta) { - sb.append(vt.getRutaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - if(!listInt.contains("-1")){ - sql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); - } - } - if (!lsMarca.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Marca vt : lsMarca) { - sb.append(vt.getMarcaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - if(!listInt.contains("-1")){ - sql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); - } - } - if (!lsMoneda.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Moneda vt : lsMoneda) { - sb.append(vt.getMonedaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - if(!listInt.contains("-1")){ - sql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); - } - } - if (!lsClaseServicio.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (ClaseServicio cs : lsClaseServicio) { - sb.append(cs.getClaseservicioId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - if(!listInt.contains("-1")){ - sql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); - } - } - - sql.append(" GROUP by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID,mon.descmoneda, M.descmarca,CS.descclase "); - sql.append(" ORDER by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID"); - - SQLQuery query = getSession().createSQLQuery(sql.toString()); - query.setResultTransformer(new AliasToBeanResultTransformer(TarifaOficialEscalaGroupVO.class)); - - return query.list(); - } - - public List pesquisaTarifaOficialEscalaObj(String rutaId, String monedaId, String vigenciaId, String marcaId) { - - StringBuilder sql = new StringBuilder(" "); - sql.append("select distinct po.cveparada as cveOrigem,po.descparada as descOrigem, "); - sql.append(" pd.cveparada as cveDestino,pd.descparada as descDestino,tmp.numsecuencia as NUMSECORIGEM,tmp2.numsecuencia as NUMSECDESTINO, "); - sql.append(" ta.PRECIO as precio,IMPORTETAXAEMBARQUE as TAXAEMBARQUE, IMPORTEPEDAGIO AS PEDAGIO,IMPORTEOUTROS AS OUTROS,IMPORTESEGURO AS SEGURO,ruta.ruta_id as rutaId,ruta.descruta as descruta "); - sql.append("from "); - sql.append(" ruta_combinacion rc "); - sql.append(" inner join ruta on (ruta.ruta_id = rc.ruta_id) "); - sql.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sql.append(" inner join parada po on po.parada_id = t.origen_id "); - sql.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sql.append(" inner join ( "); - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1 "); - sql.append(" and rownum =1 "); - sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); - sql.append(" "); - sql.append(" union "); - - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1) "); - sql.append(" ) tmp on tmp.parada_id = po.parada_id "); - - sql.append("left join ( "); - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1 "); - sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); - sql.append(" union "); - sql.append(" (SELECT "); - sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); - sql.append(" FROM "); - sql.append(" ruta_secuencia rs "); - sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); - sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); - sql.append(" WHERE "); - sql.append(" rs.ruta_id = ").append(rutaId); - sql.append(" AND rs.activo = 1) "); - sql.append(" ) tmp2 on tmp2.parada_id = pd.parada_id "); - sql.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sql.append(" left join tarifa_oficial ta on ta.TRAMO_ID = rc.tramo_id and ta.claseservicio_id = r.claseservicio_id and ta.MONEDA_ID = ").append(monedaId).append(" and ta.activo = 1 "); - sql.append(" where "); - sql.append(" rc.ruta_id = ").append(rutaId); - sql.append(" and rc.activo = 1 "); - sql.append(" and ta.MARCA_ID = ").append(marcaId); - // sql.append(" and ta.VIGENCIATARIFA_ID = ").append(vigenciaId); - sql.append(" and ta.moneda_id = ").append(monedaId); - sql.append(" order by ruta.ruta_id ,tmp.numsecuencia,tmp2.numsecuencia "); - - - SQLQuery query = getSession().createSQLQuery(sql.toString()); - query.setResultTransformer(new AliasToBeanResultTransformer(TarifaOficialEscalaVO.class)); - - return query.list(); - } - @Override - public boolean existeTramo(Tramo tramo) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("tramo", tramo)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setProjection(Projections.rowCount()); - - return HibernateFix.count(c.list()) > 0l; - - } - - @Override - public boolean existeTramo(Tramo tramo, ClaseServicio claseServicio) { - Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("tramo", tramo)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setProjection(Projections.rowCount()); - - Criteria cRuta = c.createCriteria("ruta"); - cRuta.add(Restrictions.eq("claseServicio", claseServicio)); - cRuta.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return HibernateFix.count(c.list()) > 0l; - - } - - @Override - public boolean isRutaCombinacionVenda(Integer rutaId, Integer origenId, Integer destinoId) { - if(rutaId == null || origenId == null || destinoId == null) { - return false; - } - - StringBuilder sQuery = new StringBuilder(); - sQuery.append("select rc.rutacombinacion_id ") - .append("from ruta_combinacion rc ") - .append("join tramo t on t.tramo_id = rc.tramo_id ") - .append("where rc.activo = 1 ") - .append("and rc.indventa = 1 ") - .append("and t.activo = 1 ") - .append("and rc.ruta_id = :rutaId ") - .append("and t.origen_id = :origenId ") - .append("and t.destino_id = :destinoId "); - - Query qr = getSession().createSQLQuery(sQuery.toString()); - qr.setParameter("rutaId", rutaId); - qr.setParameter("origenId", origenId); - qr.setParameter("destinoId", destinoId); - - return !qr.list().isEmpty(); - } - - @SuppressWarnings("unchecked") - @Override - public Set rutasCombinacionVenda(List rutas) { - if(rutas == null || rutas.isEmpty()) { - return new HashSet(); - } - - List rutasIN = new ArrayList(); - for(Ruta r : rutas) { - rutasIN.add(r.getRutaId()); - } - - StringBuilder sQuery = new StringBuilder(); - sQuery.append("select rc.ruta_id || '-' || t.origen_id || '-' || t.destino_id ") - .append("from ruta_combinacion rc ") - .append("join tramo t on t.tramo_id = rc.tramo_id ") - .append("where rc.activo = 1 ") - .append("and rc.indventa = 1 ") - .append("and t.activo = 1 ") - .append("and rc.ruta_id in (:rutas) "); - - Query qr = getSession().createSQLQuery(sQuery.toString()); - - qr.setParameterList("rutas", rutasIN); - - List lista = qr.list(); - - return new HashSet(lista); - } - - @Override - public List pesquisaTarifaEmbObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa, List lsOrgaoConcedente) { - - StringBuilder hql = new StringBuilder(" "); - hql.append(" SELECT "); - hql.append(" T.TARIFAEMBARCADA_ID,"); // 0 - hql.append(" TRA.DESCTRAMO, "); // 1 - hql.append(" ORI.DESCPARADA as origem,"); // 2 - hql.append(" DES.DESCPARADA as destino, "); // 3 - hql.append(" R.DESCRUTA,"); // 4 - hql.append(" M.DESCMARCA, "); // 5 - hql.append(" CS.DESCCLASE,"); // 6 - hql.append(" VT.feciniciovigencia, "); // 7 - hql.append(" VT.fecfinvigencia,"); // 8 - hql.append(" MON.descmoneda, "); // 9 - hql.append(" T.preciooriginal, "); // 10 - hql.append(" T.PRECIO,"); // 11 - hql.append(" R.RUTA_ID,"); // 12 - hql.append(" MON.moneda_id,"); // 13 - hql.append(" VT.VIGENCIATARIFA_ID,"); // 14 - hql.append(" M.MARCA_ID, "); // 15 - hql.append(" T.IMPORTEPEDAGIO, "); // 16 - hql.append(" OCONC.DESCORGAO, "); // 17 - hql.append(" T.IMPORTETAXAEMBARQUE, "); // 18 - hql.append(" T.IMPORTESEGURO, "); // 19 - hql.append(" T.IMPORTETPP,"); //20 - hql.append(" R.NUMRUTA, "); // 21 - hql.append(" R.PREFIXO, "); // 22 - hql.append(" R.INDSENTIDOIDA, "); // 23 - hql.append(" RC.INDVENTA, "); // 24 - hql.append(" TRA.ORIGEN_ID ||'-'|| TRA.DESTINO_ID ||'-'|| M.EMPRESA_ID ||'-'|| R.RUTA_ID ||'-'|| CS.CLASESERVICIO_ID, "); // 25 - hql.append(" EMP.INDPRECOPORDEMANDA ");// 26 - - - hql.append(" FROM "); - hql.append(" RUTA_COMBINACION RC "); - hql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); - hql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); - hql.append(" inner join ORGAO_CONCEDENTE OCONC on (R.ORGAOCONCEDENTE_ID = OCONC.ORGAOCONCEDENTE_ID) "); - hql.append(" , TARIFA_EMBARCADA T "); - if (!lsEmpresa.isEmpty()) { - hql.append(" , RUTA_EMPRESA RE "); - } - hql.append(" , MARCA M, EMPRESA EMP, MONEDA MON, VIGENCIA_TARIFA VT "); - hql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); - hql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND R.activo = 1 "); - if (!lsEmpresa.isEmpty()) { - hql.append(" AND RE.activo = 1 AND RC.RUTA_ID = RE.RUTA_ID "); - } - hql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); - hql.append(" AND T.MARCA_ID = M.MARCA_ID "); - hql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); - hql.append(" AND T.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID "); - hql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); - hql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); - hql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); - hql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); - hql.append(" AND T.RUTA_ID = R.RUTA_ID "); - hql.append(" AND M.EMPRESA_ID = EMP.EMPRESA_ID "); - - if (!lsVigenciaTarifa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (VigenciaTarifa vt : lsVigenciaTarifa) { - sb.append(vt.getVigenciatarifaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND VT.VIGENCIATARIFA_ID in (").append(listInt).append(")"); - } - if (!lsEmpresa.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Empresa vt : lsEmpresa) { - sb.append(vt.getEmpresaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); - } - if (!lsRuta.isEmpty() && !lsRuta.toString().contains("TODAS")) { - StringBuilder sb = new StringBuilder(""); - for (Ruta vt : lsRuta) { - sb.append(vt.getRutaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); - } - if (!lsMarca.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Marca vt : lsMarca) { - sb.append(vt.getMarcaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); - } - if (!lsMoneda.isEmpty()) { - StringBuilder sb = new StringBuilder(""); - for (Moneda vt : lsMoneda) { - sb.append(vt.getMonedaId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); - } - if (!lsClaseServicio.isEmpty() && !lsClaseServicio.toString().contains("TODAS")) { - StringBuilder sb = new StringBuilder(""); - for (ClaseServicio cs : lsClaseServicio) { - sb.append(cs.getClaseservicioId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); - } - if (!lsOrgaoConcedente.isEmpty() && !lsOrgaoConcedente.toString().contains("TODOS")) { - StringBuilder sb = new StringBuilder(""); - for (OrgaoConcedente oc : lsOrgaoConcedente) { - sb.append(oc.getOrgaoConcedenteId()).append(","); - } - String listInt = sb.toString().substring(0, sb.toString().length() - 1); - hql.append(" AND OCONC.ORGAOCONCEDENTE_ID in (").append(listInt).append(") "); - } - - hql.append(" order by R.NUMRUTA, R.RUTA_ID, VT.VIGENCIATARIFA_ID, M.DESCMARCA,ORI.DESCPARADA,DES.DESCPARADA "); - - System.out.println(hql.toString()); - - List lsObj = this.getSession().createSQLQuery(hql.toString()).list(); - - return lsObj; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SQLQuery; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.RutaCombinacionDAO; +import com.rjconsultores.ventaboletos.dao.TramoDAO; +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaCombinacion; +import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.tarifa.TarifaEscalaGroupVO; +import com.rjconsultores.ventaboletos.vo.tarifa.TarifaEscalaVO; +import com.rjconsultores.ventaboletos.vo.tarifa.TarifaOficialEscalaGroupVO; +import com.rjconsultores.ventaboletos.vo.tarifa.TarifaOficialEscalaVO; + +/** + * + * @author Rafius + */ +@Repository("rutaCombinacionDAO") +public class RutaCombinacionHibernateDAO extends GenericHibernateDAO implements RutaCombinacionDAO { + + private static Logger log = LogManager.getLogger(RutaCombinacionHibernateDAO.class); + @Autowired + private TramoDAO tramoDAO; + + @Autowired + public RutaCombinacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public boolean busquedaRutaTramo(Ruta ruta, Tramo tramo, Boolean ativo) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + + if (ativo) { + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + } else { + c.add(Restrictions.eq(ACTIVO, Boolean.FALSE)); + } + + c.setProjection(Projections.rowCount()); + + c.add(Restrictions.eq("ruta", ruta)); + c.add(Restrictions.eq("tramo", tramo)); + + return HibernateFix.count(c.list()) > 0; + } + + public RutaCombinacion busquedaTramoRutaTramo(Ruta ruta, Tramo trBuscaOrigemDestino) { + + 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) { + rc = (RutaCombinacion) sq.list().get(sq.list().size() - 1); + } + + return rc; + } + + public Tramo busqueda(Ruta ruta, Parada origen, Parada destino) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("ruta", ruta)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + Criteria c2 = c.createCriteria("tramo"); + c2.add(Restrictions.eq("origem", origen)); + c2.add(Restrictions.eq("destino", destino)); + c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + List list = c.list(); + + if (list.size() != 1) { + return null; + } + return list.get(0).getTramo(); + } + + public RutaCombinacion busquedaTramoRutaOrigemDestino(Ruta ruta, Parada origem, Parada destino) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("ruta", ruta)); + + Criteria c2 = c.createCriteria("tramo"); + c2.add(Restrictions.eq("origem", origem)); + c2.add(Restrictions.eq("destino", destino)); + c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + if (c.list().size() > 0) { + return (RutaCombinacion) c.list().get(0); + } + + return null; + + } + + public RutaCombinacion busquedaTramoRutaOrigemDestino(Integer rutaId, Integer origemId, Integer destinoId) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("ruta.rutaId", rutaId)); + + Criteria c2 = c.createCriteria("tramo"); + c2.add(Restrictions.eq("origem.paradaId", origemId)); + c2.add(Restrictions.eq("destino.paradaId", destinoId)); + c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + if (c.list().size() > 0) { + return (RutaCombinacion) c.list().get(0); + } + + return null; + + } + + public List obtenerPorRuta(Ruta ruta) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("ruta", ruta)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public boolean buscarRutaCombinacionExisteTramo(Tramo tramo) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("tramo", tramo)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + if (c.list().isEmpty()) { + return false; + } else { + return true; + } + + + } + + @Override + public List tramosFaltantes(Integer rutaId) { + Session session = getSession(); + List lsTramoFaltantes = new ArrayList(); + + StringBuilder sb = new StringBuilder(""); + sb.append(" select t.origen_id, "); + sb.append(" rs.numsecuencia "); + sb.append(" from ruta_secuencia rs "); + sb.append(" inner join tramo t on t.tramo_id = rs.tramo_id "); + sb.append(" where rs.activo = 1 and "); + sb.append(" t.activo = 1 and "); + sb.append(" rs.ruta_id = :rutaId "); + sb.append(" union "); + sb.append(" select t.destino_id, "); + sb.append(" rs.numsecuencia "); + sb.append(" from ruta_secuencia rs "); + sb.append(" inner join tramo t on t.tramo_id = rs.tramo_id "); + sb.append(" where rs.activo = 1 and "); + sb.append(" t.activo = 1 and "); + sb.append(" rs.ruta_id = :rutaId and "); + sb.append(" rs.numsecuencia = "); + sb.append(" (select max(rs.numsecuencia) from "); + sb.append(" ruta_secuencia rs inner join tramo t on "); + sb.append(" t.tramo_id = rs.tramo_id where rs.activo = "); + sb.append(" 1 and t.activo = 1 and rs.ruta_id = :rutaId ) "); + sb.append(" order by 2 "); + + + SQLQuery sqlQuery = session.createSQLQuery(sb.toString()); + sqlQuery.setInteger("rutaId", rutaId); + + List lsParadas = sqlQuery.list(); + Integer origenId = null; + Integer destinoId = null; + for (int i = 0; i < lsParadas.size(); i++) { + origenId = ((BigDecimal) lsParadas.get(i)[0]).intValue(); + for (int j = i + 1; j < lsParadas.size(); j++) { + destinoId = ((BigDecimal) lsParadas.get(j)[0]).intValue(); + + log.debug(origenId + " - " + destinoId); + + sb = new StringBuilder(); + sb.append(" select count(*) "); + sb.append(" from ruta_combinacion rc "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sb.append(" where "); + sb.append(" rc.ruta_id = :rutaId "); + sb.append(" and rc.activo = 1 "); + sb.append(" and t.activo = 1 "); + sb.append(" and t.origen_id = :origenId "); + sb.append(" and t.destino_id = :destinoId "); + + + SQLQuery sqlQueryExists = session.createSQLQuery(sb.toString()); + sqlQueryExists.setInteger("rutaId", rutaId); + sqlQueryExists.setInteger("origenId", origenId); + sqlQueryExists.setInteger("destinoId", destinoId); + + Long count = HibernateFix.count(sqlQueryExists.list()); + + if (count == 0) { + log.info("No existe combinacion " + origenId + " - " + destinoId); + + + Parada paradaOrigem = new Parada(); + paradaOrigem.setParadaId(origenId); + + Parada paradaDestino = new Parada(); + paradaDestino.setParadaId(destinoId); + + List list = tramoDAO.obtenerListPorOrigemDestino(paradaOrigem, paradaDestino); + + if (list.size() == 0) { + log.info("No existe tramo " + origenId + " - " + destinoId); + } else { + lsTramoFaltantes.add(list.get(0)); + } + + } + } + + } + + return lsTramoFaltantes; + } + + public int borrarCombinaciones(Ruta ruta) { + Query query = this.getSession().createQuery("UPDATE RutaCombinacion set activo = false, fecmodif = current_timestamp(), usuarioId= :usuario where ruta = :ruta"); + query.setParameter("ruta", ruta); + query.setParameter("usuario", UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + return query.executeUpdate(); + } + + public void activar(Ruta ruta, Tramo trBuscaOrigemDestino) { + String sql = " select rc.rutacombinacionId 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(); + + getSession().createQuery("update RutaCombinacion set activo = true where rutacombinacionId in (" + sql + " )").executeUpdate(); + } + + public List pesquisaTarifaObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa, List lsOrgaoConcedente) { + + StringBuilder hql = new StringBuilder(" "); + hql.append(" SELECT "); + hql.append(" T.TARIFA_ID,"); // 0 + hql.append(" TRA.DESCTRAMO, "); // 1 + hql.append(" ORI.DESCPARADA as origem,"); // 2 + hql.append(" DES.DESCPARADA as destino, "); // 3 + hql.append(" R.DESCRUTA,"); // 4 + hql.append(" M.DESCMARCA, "); // 5 + hql.append(" CS.DESCCLASE,"); // 6 + hql.append(" VT.feciniciovigencia, "); // 7 + hql.append(" VT.fecfinvigencia,"); // 8 + hql.append(" MON.descmoneda, "); // 9 + hql.append(" T.preciooriginal, "); // 10 + hql.append(" T.PRECIO,"); // 11 + hql.append(" R.RUTA_ID,"); // 12 + hql.append(" MON.moneda_id,"); // 13 + hql.append(" VT.VIGENCIATARIFA_ID,"); // 14 + hql.append(" M.MARCA_ID, "); // 15 + hql.append(" T.IMPORTEPEDAGIO, "); // 16 + hql.append(" OCONC.DESCORGAO, "); // 17 + hql.append(" T.IMPORTETAXAEMBARQUE, "); // 18 + hql.append(" T.IMPORTESEGURO, "); // 19 + hql.append(" T.IMPORTETPP,"); //20 + hql.append(" R.NUMRUTA, "); // 21 + hql.append(" R.PREFIXO, "); // 22 + hql.append(" R.INDSENTIDOIDA, "); // 23 + hql.append(" RC.INDVENTA, "); // 24 + hql.append(" TRA.ORIGEN_ID ||'-'|| TRA.DESTINO_ID ||'-'|| M.EMPRESA_ID ||'-'|| R.RUTA_ID ||'-'|| CS.CLASESERVICIO_ID, "); // 25 + hql.append(" EMP.INDPRECOPORDEMANDA ");// 26 + + + hql.append(" FROM "); + hql.append(" RUTA_COMBINACION RC "); + hql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); + hql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); + hql.append(" inner join ORGAO_CONCEDENTE OCONC on (R.ORGAOCONCEDENTE_ID = OCONC.ORGAOCONCEDENTE_ID) "); + hql.append(" , TARIFA T "); + if (!lsEmpresa.isEmpty()) { + hql.append(" , RUTA_EMPRESA RE "); + } + hql.append(" , MARCA M, EMPRESA EMP, MONEDA MON, VIGENCIA_TARIFA VT "); + hql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); + hql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND R.activo = 1 "); + if (!lsEmpresa.isEmpty()) { + hql.append(" AND RE.activo = 1 AND RC.RUTA_ID = RE.RUTA_ID "); + } + hql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); + hql.append(" AND T.MARCA_ID = M.MARCA_ID "); + hql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); + hql.append(" AND T.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID "); + hql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); + hql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); + hql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); + hql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); + hql.append(" AND T.RUTA_ID = R.RUTA_ID "); + hql.append(" AND M.EMPRESA_ID = EMP.EMPRESA_ID "); + + if (!lsVigenciaTarifa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (VigenciaTarifa vt : lsVigenciaTarifa) { + sb.append(vt.getVigenciatarifaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND VT.VIGENCIATARIFA_ID in (").append(listInt).append(")"); + } + if (!lsEmpresa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Empresa vt : lsEmpresa) { + sb.append(vt.getEmpresaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); + } + if (!lsRuta.isEmpty() && !lsRuta.toString().contains("TODAS")) { + StringBuilder sb = new StringBuilder(""); + for (Ruta vt : lsRuta) { + sb.append(vt.getRutaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); + } + if (!lsMarca.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Marca vt : lsMarca) { + sb.append(vt.getMarcaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); + } + if (!lsMoneda.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Moneda vt : lsMoneda) { + sb.append(vt.getMonedaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); + } + if (!lsClaseServicio.isEmpty() && !lsClaseServicio.toString().contains("TODAS")) { + StringBuilder sb = new StringBuilder(""); + for (ClaseServicio cs : lsClaseServicio) { + sb.append(cs.getClaseservicioId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); + } + if (!lsOrgaoConcedente.isEmpty() && !lsOrgaoConcedente.toString().contains("TODOS")) { + StringBuilder sb = new StringBuilder(""); + for (OrgaoConcedente oc : lsOrgaoConcedente) { + sb.append(oc.getOrgaoConcedenteId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND OCONC.ORGAOCONCEDENTE_ID in (").append(listInt).append(") "); + } + + hql.append(" order by R.NUMRUTA, R.RUTA_ID, VT.VIGENCIATARIFA_ID, M.DESCMARCA,ORI.DESCPARADA,DES.DESCPARADA "); + + System.out.println(hql.toString()); + + List lsObj = this.getSession().createSQLQuery(hql.toString()).list(); + + return lsObj; + } + + public List pesquisaTarifaOficialObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsEmpresa, List lsRuta, List lsVigenciaTarifa) { + + StringBuilder hql = new StringBuilder(" "); + hql.append(" SELECT "); + hql.append(" T.TARIFAOFICIAL_ID, "); + hql.append(" TRA.DESCTRAMO, "); + hql.append(" ORI.DESCPARADA as origem, "); + hql.append(" DES.DESCPARADA as destino, "); + hql.append(" R.DESCRUTA,"); + hql.append(" M.DESCMARCA, "); + hql.append(" CS.DESCCLASE,'' as feciniciovigencia, "); + hql.append(" '' as fecfinvigencia, "); + hql.append(" MON.descmoneda, "); + hql.append(" T.preciooriginal, "); + hql.append(" T.PRECIO,R.RUTA_ID, "); + hql.append(" MON.moneda_id,'' AS VIGENCIATARIFA_ID, "); + hql.append(" M.MARCA_ID, "); + hql.append(" T.IMPORTETAXAEMBARQUE, "); + hql.append(" T.IMPORTESEGURO, "); + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.EXIBE_TPP.getDescricao())) { + hql.append(" T.IMPORTETPP, "); + } + hql.append(" T.IMPORTEPEDAGIO, "); + hql.append("T.IMPORTEOUTROS "); + hql.append(" FROM "); + hql.append(" RUTA_COMBINACION RC "); + hql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); + hql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); + hql.append(" , TARIFA_OFICIAL T "); + if (!lsEmpresa.isEmpty()) { + hql.append(" , RUTA_EMPRESA RE "); + } + hql.append(" , MARCA M, MONEDA MON"); + hql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); + hql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND R.activo = 1 "); + if (!lsEmpresa.isEmpty()) { + hql.append(" AND RE.activo = 1 AND RC.RUTA_ID = RE.RUTA_ID "); + } + hql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); + hql.append(" AND T.MARCA_ID = M.MARCA_ID "); + hql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); + hql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); + hql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); + hql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); + hql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); + + if (!lsEmpresa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Empresa vt : lsEmpresa) { + sb.append(vt.getEmpresaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); + } + if (!lsRuta.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Ruta vt : lsRuta) { + sb.append(vt.getRutaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + if (!listInt.contains("-1")){ + hql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); + } + } + if (!lsMarca.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Marca vt : lsMarca) { + sb.append(vt.getMarcaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); + } + if (!lsMoneda.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Moneda vt : lsMoneda) { + sb.append(vt.getMonedaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); + } + if (!lsClaseServicio.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (ClaseServicio cs : lsClaseServicio) { + sb.append(cs.getClaseservicioId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + //Tratando caso de conter opção TODAS + if(!listInt.contains("-1")) { + hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); + } + } + + hql.append(" order by R.DESCRUTA, R.RUTA_ID, RC.RUTACOMBINACION_ID,t.TARIFAOFICIAL_id "); + + List lsObj = this.getSession().createSQLQuery(hql.toString()).list(); + + return lsObj; + } + + public List pesquisaTarifaGroupObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa) { + + StringBuilder sql = new StringBuilder(" "); + sql.append(" SELECT R.descruta, "); + sql.append(" R.RUTA_ID, "); + sql.append(" MON.moneda_id, "); + sql.append(" '' AS VIGENCIATARIFA_ID, "); + sql.append(" M.MARCA_ID, "); + sql.append(" mon.descmoneda, "); + sql.append(" vt.FECINICIOVIGENCIA, "); + sql.append(" vt.FECFINVIGENCIA, "); + sql.append(" M.descmarca, "); + sql.append(" CS.descclase "); + sql.append(" FROM "); + sql.append(" RUTA_COMBINACION RC "); + sql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); + sql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); + sql.append(" , TARIFA_OFICIAL T , "); + sql.append(" RUTA_EMPRESA RE "); + sql.append(" , MARCA M, "); + sql.append(" MONEDA MON,"); + sql.append(" , CLASE_SERVICIO CS , "); + sql.append(" PARADA ORI, "); + sql.append(" PARADA DES "); + sql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND RE.activo = 1 AND R.activo = 1 "); + sql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); + sql.append(" AND RC.RUTA_ID = RE.RUTA_ID "); + sql.append(" AND T.MARCA_ID = M.MARCA_ID "); + sql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); + sql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); + sql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); + sql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); + sql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); + + if (!lsEmpresa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Empresa vt : lsEmpresa) { + sb.append(vt.getEmpresaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + sql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); + } + if (!lsRuta.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Ruta vt : lsRuta) { + sb.append(vt.getRutaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + sql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); + } + if (!lsMarca.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Marca vt : lsMarca) { + sb.append(vt.getMarcaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + sql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); + } + if (!lsMoneda.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Moneda vt : lsMoneda) { + sb.append(vt.getMonedaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + sql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); + } + if (!lsClaseServicio.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (ClaseServicio cs : lsClaseServicio) { + sb.append(cs.getClaseservicioId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + sql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); + } + + sql.append(" GROUP by R.descruta,R.RUTA_ID,MON.moneda_id,VT.VIGENCIATARIFA_ID,M.MARCA_ID,mon.descmoneda,vt.FECINICIOVIGENCIA,vt.FECFINVIGENCIA, M.descmarca,CS.descclase "); + sql.append(" ORDER by R.descruta,R.RUTA_ID,MON.moneda_id,VT.VIGENCIATARIFA_ID,M.MARCA_ID"); + + SQLQuery query = getSession().createSQLQuery(sql.toString()); + query.setResultTransformer(new AliasToBeanResultTransformer(TarifaEscalaGroupVO.class)); + + return query.list(); + } + + public List pesquisaTarifaEscalaObj(String rutaId, String monedaId, String vigenciaId, String marcaId) { + + StringBuilder sql = new StringBuilder(" "); + sql.append("select distinct po.cveparada as cveOrigem,po.descparada as descOrigem, "); + sql.append(" pd.cveparada as cveDestino,pd.descparada as descDestino,tmp.numsecuencia as NUMSECORIGEM,tmp2.numsecuencia as NUMSECDESTINO, "); + sql.append(" ta.PRECIO as precio,ruta.ruta_id as rutaId,ruta.descruta as descruta "); + sql.append("from "); + sql.append(" ruta_combinacion rc "); + sql.append(" inner join ruta on (ruta.ruta_id = rc.ruta_id) "); + sql.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sql.append(" inner join parada po on po.parada_id = t.origen_id "); + sql.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sql.append(" inner join ( "); + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1 "); + sql.append(" and rownum =1 "); + sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); + sql.append(" "); + sql.append(" union "); + + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1) "); + sql.append(" ) tmp on tmp.parada_id = po.parada_id "); + + sql.append("left join ( "); + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1 "); + sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); + sql.append(" union "); + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1) "); + sql.append(" ) tmp2 on tmp2.parada_id = pd.parada_id "); + sql.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sql.append(" left join tarifa ta on ta.TRAMO_ID = rc.tramo_id and ta.claseservicio_id = r.claseservicio_id and ta.MONEDA_ID = ").append(monedaId).append(" and ta.activo = 1 "); + sql.append(" where "); + sql.append(" rc.ruta_id = ").append(rutaId); + sql.append(" and rc.activo = 1 "); + sql.append(" and ta.MARCA_ID = ").append(marcaId); + sql.append(" and ta.VIGENCIATARIFA_ID = ").append(vigenciaId); + sql.append(" and ta.moneda_id = ").append(monedaId); + sql.append(" order by ruta.ruta_id ,tmp.numsecuencia,tmp2.numsecuencia "); + + + SQLQuery query = getSession().createSQLQuery(sql.toString()); + query.setResultTransformer(new AliasToBeanResultTransformer(TarifaEscalaVO.class)); + + return query.list(); + } + + public List pesquisaTarifaOficialGroupObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsEmpresa, List lsRuta, List lsVigenciaTarifa) { + + StringBuilder sql = new StringBuilder(" "); + sql.append(" SELECT R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID,mon.descmoneda, M.descmarca,CS.descclase "); + sql.append(" FROM "); + sql.append(" RUTA_COMBINACION RC "); + sql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); + sql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); + sql.append(" , TARIFA_OFICIAL T , RUTA_EMPRESA RE "); + sql.append(" , MARCA M, MONEDA MON"); + sql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); + sql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND RE.activo = 1 AND R.activo = 1 "); + sql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); + sql.append(" AND RC.RUTA_ID = RE.RUTA_ID "); + sql.append(" AND T.MARCA_ID = M.MARCA_ID "); + sql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); + sql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); + sql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); + sql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); + sql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); + + if (!lsEmpresa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Empresa vt : lsEmpresa) { + sb.append(vt.getEmpresaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + if(!listInt.contains("-1")){ + sql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); + } + } + if (!lsRuta.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Ruta vt : lsRuta) { + sb.append(vt.getRutaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + if(!listInt.contains("-1")){ + sql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); + } + } + if (!lsMarca.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Marca vt : lsMarca) { + sb.append(vt.getMarcaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + if(!listInt.contains("-1")){ + sql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); + } + } + if (!lsMoneda.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Moneda vt : lsMoneda) { + sb.append(vt.getMonedaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + if(!listInt.contains("-1")){ + sql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); + } + } + if (!lsClaseServicio.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (ClaseServicio cs : lsClaseServicio) { + sb.append(cs.getClaseservicioId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + if(!listInt.contains("-1")){ + sql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); + } + } + + sql.append(" GROUP by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID,mon.descmoneda, M.descmarca,CS.descclase "); + sql.append(" ORDER by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID"); + + SQLQuery query = getSession().createSQLQuery(sql.toString()); + query.setResultTransformer(new AliasToBeanResultTransformer(TarifaOficialEscalaGroupVO.class)); + + return query.list(); + } + + public List pesquisaTarifaOficialEscalaObj(String rutaId, String monedaId, String vigenciaId, String marcaId) { + + StringBuilder sql = new StringBuilder(" "); + sql.append("select distinct po.cveparada as cveOrigem,po.descparada as descOrigem, "); + sql.append(" pd.cveparada as cveDestino,pd.descparada as descDestino,tmp.numsecuencia as NUMSECORIGEM,tmp2.numsecuencia as NUMSECDESTINO, "); + sql.append(" ta.PRECIO as precio,IMPORTETAXAEMBARQUE as TAXAEMBARQUE, IMPORTEPEDAGIO AS PEDAGIO,IMPORTEOUTROS AS OUTROS,IMPORTESEGURO AS SEGURO,ruta.ruta_id as rutaId,ruta.descruta as descruta "); + sql.append("from "); + sql.append(" ruta_combinacion rc "); + sql.append(" inner join ruta on (ruta.ruta_id = rc.ruta_id) "); + sql.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sql.append(" inner join parada po on po.parada_id = t.origen_id "); + sql.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sql.append(" inner join ( "); + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1 "); + sql.append(" and rownum =1 "); + sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); + sql.append(" "); + sql.append(" union "); + + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1) "); + sql.append(" ) tmp on tmp.parada_id = po.parada_id "); + + sql.append("left join ( "); + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia+1 as numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.destino_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1 "); + sql.append(" and rs.numsecuencia = (select max(numsecuencia) from ruta_secuencia where activo = 1 and ruta_id = rs.ruta_id)) "); + sql.append(" union "); + sql.append(" (SELECT "); + sql.append(" p.parada_id,p.cveparada,rs.numsecuencia,rs.ruta_id "); + sql.append(" FROM "); + sql.append(" ruta_secuencia rs "); + sql.append(" INNER JOIN tramo t ON t.tramo_id = rs.tramo_id "); + sql.append(" INNER JOIN parada p ON p.parada_id = t.origen_id "); + sql.append(" WHERE "); + sql.append(" rs.ruta_id = ").append(rutaId); + sql.append(" AND rs.activo = 1) "); + sql.append(" ) tmp2 on tmp2.parada_id = pd.parada_id "); + sql.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sql.append(" left join tarifa_oficial ta on ta.TRAMO_ID = rc.tramo_id and ta.claseservicio_id = r.claseservicio_id and ta.MONEDA_ID = ").append(monedaId).append(" and ta.activo = 1 "); + sql.append(" where "); + sql.append(" rc.ruta_id = ").append(rutaId); + sql.append(" and rc.activo = 1 "); + sql.append(" and ta.MARCA_ID = ").append(marcaId); + // sql.append(" and ta.VIGENCIATARIFA_ID = ").append(vigenciaId); + sql.append(" and ta.moneda_id = ").append(monedaId); + sql.append(" order by ruta.ruta_id ,tmp.numsecuencia,tmp2.numsecuencia "); + + + SQLQuery query = getSession().createSQLQuery(sql.toString()); + query.setResultTransformer(new AliasToBeanResultTransformer(TarifaOficialEscalaVO.class)); + + return query.list(); + } + @Override + public boolean existeTramo(Tramo tramo) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("tramo", tramo)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setProjection(Projections.rowCount()); + + return HibernateFix.count(c.list()) > 0l; + + } + + @Override + public boolean existeTramo(Tramo tramo, ClaseServicio claseServicio) { + Criteria c = this.makeCriteria(); + c.add(Restrictions.eq("tramo", tramo)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setProjection(Projections.rowCount()); + + Criteria cRuta = c.createCriteria("ruta"); + cRuta.add(Restrictions.eq("claseServicio", claseServicio)); + cRuta.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return HibernateFix.count(c.list()) > 0l; + + } + + @Override + public boolean isRutaCombinacionVenda(Integer rutaId, Integer origenId, Integer destinoId) { + if(rutaId == null || origenId == null || destinoId == null) { + return false; + } + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("select rc.rutacombinacion_id ") + .append("from ruta_combinacion rc ") + .append("join tramo t on t.tramo_id = rc.tramo_id ") + .append("where rc.activo = 1 ") + .append("and rc.indventa = 1 ") + .append("and t.activo = 1 ") + .append("and rc.ruta_id = :rutaId ") + .append("and t.origen_id = :origenId ") + .append("and t.destino_id = :destinoId "); + + Query qr = getSession().createSQLQuery(sQuery.toString()); + qr.setParameter("rutaId", rutaId); + qr.setParameter("origenId", origenId); + qr.setParameter("destinoId", destinoId); + + return !qr.list().isEmpty(); + } + + @SuppressWarnings("unchecked") + @Override + public Set rutasCombinacionVenda(List rutas) { + if(rutas == null || rutas.isEmpty()) { + return new HashSet(); + } + + List rutasIN = new ArrayList(); + for(Ruta r : rutas) { + rutasIN.add(r.getRutaId()); + } + + StringBuilder sQuery = new StringBuilder(); + sQuery.append("select rc.ruta_id || '-' || t.origen_id || '-' || t.destino_id ") + .append("from ruta_combinacion rc ") + .append("join tramo t on t.tramo_id = rc.tramo_id ") + .append("where rc.activo = 1 ") + .append("and rc.indventa = 1 ") + .append("and t.activo = 1 ") + .append("and rc.ruta_id in (:rutas) "); + + Query qr = getSession().createSQLQuery(sQuery.toString()); + + qr.setParameterList("rutas", rutasIN); + + List lista = qr.list(); + + return new HashSet(lista); + } + + @Override + public List pesquisaTarifaEmbObj(List lsMoneda, List lsMarca, List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa, List lsOrgaoConcedente) { + + StringBuilder hql = new StringBuilder(" "); + hql.append(" SELECT "); + hql.append(" T.TARIFAEMBARCADA_ID,"); // 0 + hql.append(" TRA.DESCTRAMO, "); // 1 + hql.append(" ORI.DESCPARADA as origem,"); // 2 + hql.append(" DES.DESCPARADA as destino, "); // 3 + hql.append(" R.DESCRUTA,"); // 4 + hql.append(" M.DESCMARCA, "); // 5 + hql.append(" CS.DESCCLASE,"); // 6 + hql.append(" VT.feciniciovigencia, "); // 7 + hql.append(" VT.fecfinvigencia,"); // 8 + hql.append(" MON.descmoneda, "); // 9 + hql.append(" T.preciooriginal, "); // 10 + hql.append(" T.PRECIO,"); // 11 + hql.append(" R.RUTA_ID,"); // 12 + hql.append(" MON.moneda_id,"); // 13 + hql.append(" VT.VIGENCIATARIFA_ID,"); // 14 + hql.append(" M.MARCA_ID, "); // 15 + hql.append(" T.IMPORTEPEDAGIO, "); // 16 + hql.append(" OCONC.DESCORGAO, "); // 17 + hql.append(" T.IMPORTETAXAEMBARQUE, "); // 18 + hql.append(" T.IMPORTESEGURO, "); // 19 + hql.append(" T.IMPORTETPP,"); //20 + hql.append(" R.NUMRUTA, "); // 21 + hql.append(" R.PREFIXO, "); // 22 + hql.append(" R.INDSENTIDOIDA, "); // 23 + hql.append(" RC.INDVENTA, "); // 24 + hql.append(" TRA.ORIGEN_ID ||'-'|| TRA.DESTINO_ID ||'-'|| M.EMPRESA_ID ||'-'|| R.RUTA_ID ||'-'|| CS.CLASESERVICIO_ID, "); // 25 + hql.append(" EMP.INDPRECOPORDEMANDA ");// 26 + + + hql.append(" FROM "); + hql.append(" RUTA_COMBINACION RC "); + hql.append(" inner join RUTA R on (RC.RUTA_ID = R.RUTA_ID) "); + hql.append(" inner join TRAMO TRA on (RC.TRAMO_ID = TRA.TRAMO_ID) "); + hql.append(" inner join ORGAO_CONCEDENTE OCONC on (R.ORGAOCONCEDENTE_ID = OCONC.ORGAOCONCEDENTE_ID) "); + hql.append(" , TARIFA_EMBARCADA T "); + if (!lsEmpresa.isEmpty()) { + hql.append(" , RUTA_EMPRESA RE "); + } + hql.append(" , MARCA M, EMPRESA EMP, MONEDA MON, VIGENCIA_TARIFA VT "); + hql.append(" , CLASE_SERVICIO CS , PARADA ORI, PARADA DES "); + hql.append(" WHERE T.activo = 1 AND RC.activo = 1 AND R.activo = 1 "); + if (!lsEmpresa.isEmpty()) { + hql.append(" AND RE.activo = 1 AND RC.RUTA_ID = RE.RUTA_ID "); + } + hql.append(" AND T.TRAMO_ID = TRA.TRAMO_ID "); + hql.append(" AND T.MARCA_ID = M.MARCA_ID "); + hql.append(" AND T.MONEDA_ID = MON.MONEDA_ID "); + hql.append(" AND T.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID "); + hql.append(" AND T.CLASESERVICIO_ID = CS.CLASESERVICIO_ID "); + hql.append(" AND T.CLASESERVICIO_ID = R.CLASESERVICIO_ID "); + hql.append(" AND TRA.ORIGEN_ID = ORI.PARADA_ID "); + hql.append(" AND TRA.DESTINO_ID = DES.PARADA_ID "); + hql.append(" AND T.RUTA_ID = R.RUTA_ID "); + hql.append(" AND M.EMPRESA_ID = EMP.EMPRESA_ID "); + + if (!lsVigenciaTarifa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (VigenciaTarifa vt : lsVigenciaTarifa) { + sb.append(vt.getVigenciatarifaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND VT.VIGENCIATARIFA_ID in (").append(listInt).append(")"); + } + if (!lsEmpresa.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Empresa vt : lsEmpresa) { + sb.append(vt.getEmpresaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); + } + if (!lsRuta.isEmpty() && !lsRuta.toString().contains("TODAS")) { + StringBuilder sb = new StringBuilder(""); + for (Ruta vt : lsRuta) { + sb.append(vt.getRutaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND RC.RUTA_ID in (").append(listInt).append(")"); + } + if (!lsMarca.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Marca vt : lsMarca) { + sb.append(vt.getMarcaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); + } + if (!lsMoneda.isEmpty()) { + StringBuilder sb = new StringBuilder(""); + for (Moneda vt : lsMoneda) { + sb.append(vt.getMonedaId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); + } + if (!lsClaseServicio.isEmpty() && !lsClaseServicio.toString().contains("TODAS")) { + StringBuilder sb = new StringBuilder(""); + for (ClaseServicio cs : lsClaseServicio) { + sb.append(cs.getClaseservicioId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); + } + if (!lsOrgaoConcedente.isEmpty() && !lsOrgaoConcedente.toString().contains("TODOS")) { + StringBuilder sb = new StringBuilder(""); + for (OrgaoConcedente oc : lsOrgaoConcedente) { + sb.append(oc.getOrgaoConcedenteId()).append(","); + } + String listInt = sb.toString().substring(0, sb.toString().length() - 1); + hql.append(" AND OCONC.ORGAOCONCEDENTE_ID in (").append(listInt).append(") "); + } + + hql.append(" order by R.NUMRUTA, R.RUTA_ID, VT.VIGENCIATARIFA_ID, M.DESCMARCA,ORI.DESCPARADA,DES.DESCPARADA "); + + System.out.println(hql.toString()); + + List lsObj = this.getSession().createSQLQuery(hql.toString()).list(); + + return lsObj; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaIcmsExcepcionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaIcmsExcepcionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaIcmsExcepcionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaIcmsExcepcionHibernateDAO.java index 2777c65e2..a8b97b4ea 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaIcmsExcepcionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaIcmsExcepcionHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.RutaIcmsExcepcionDAO; -import com.rjconsultores.ventaboletos.entidad.RutaIcmsExcepcion; - -@Repository("rutaIcmsExcepcionDAO") -public class RutaIcmsExcepcionHibernateDAO extends GenericHibernateDAO implements RutaIcmsExcepcionDAO { - - @Autowired - public RutaIcmsExcepcionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.RutaIcmsExcepcionDAO; +import com.rjconsultores.ventaboletos.entidad.RutaIcmsExcepcion; + +@Repository("rutaIcmsExcepcionDAO") +public class RutaIcmsExcepcionHibernateDAO extends GenericHibernateDAO implements RutaIcmsExcepcionDAO { + + @Autowired + public RutaIcmsExcepcionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaEmpresaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaEmpresaHibernateDAO.java index 40355a811..1fb0c0c30 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaEmpresaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaEmpresaHibernateDAO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.SecretariaEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.Secretaria; -import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; - -@Repository("secretariaEmpresaDAO") -public class SecretariaEmpresaHibernateDAO extends GenericHibernateDAO - implements SecretariaEmpresaDAO { - - @Autowired - public SecretariaEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List buscarPorSecretaria(Secretaria secretaria) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("secretaria", secretaria)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.SecretariaEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.Secretaria; +import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; + +@Repository("secretariaEmpresaDAO") +public class SecretariaEmpresaHibernateDAO extends GenericHibernateDAO + implements SecretariaEmpresaDAO { + + @Autowired + public SecretariaEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List buscarPorSecretaria(Secretaria secretaria) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("secretaria", secretaria)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java index bd61e96d6..271ff2190 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java @@ -1,38 +1,38 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.SeguradoraEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; - -@Repository("seguradoraEmpresaDAO") -public class SeguradoraEmpresaHibernateDAO extends GenericHibernateDAO implements SeguradoraEmpresaDAO { - - @Autowired - public SeguradoraEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List obtenerTodos() { - Criteria c = makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public boolean existe(Empresa empresa, String serie){ - Criteria c = makeCriteria(); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq("serie", serie)); - return !c.list().isEmpty(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.SeguradoraEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; + +@Repository("seguradoraEmpresaDAO") +public class SeguradoraEmpresaHibernateDAO extends GenericHibernateDAO implements SeguradoraEmpresaDAO { + + @Autowired + public SeguradoraEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List obtenerTodos() { + Criteria c = makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public boolean existe(Empresa empresa, String serie){ + Criteria c = makeCriteria(); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + c.add(Restrictions.eq("serie", serie)); + return !c.list().isEmpty(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java index dad30a9b0..157f6444c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import java.util.List; -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.SeguroKmDAO; -import com.rjconsultores.ventaboletos.entidad.SeguroKm; - -@Repository("seguroKmDAO") -public class SeguroKmHibernateDAO extends GenericHibernateDAO implements SeguroKmDAO { - - @Autowired - public SeguroKmHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public boolean existe(Integer orgaoConcedenteId) { - Criteria c = makeCriteria(); - c.add(Restrictions.eq("orgaoconcedente.orgaoConcedenteId", orgaoConcedenteId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setProjection(Projections.rowCount()); - - - return HibernateFix.count(c.list()) > 0; - } - - public List buscarPorOrgao(OrgaoConcedente orgao) { - Criteria c = makeCriteria(); - c.add(Restrictions.eq("orgaoconcedente", orgao)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import java.util.List; +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.SeguroKmDAO; +import com.rjconsultores.ventaboletos.entidad.SeguroKm; + +@Repository("seguroKmDAO") +public class SeguroKmHibernateDAO extends GenericHibernateDAO implements SeguroKmDAO { + + @Autowired + public SeguroKmHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public boolean existe(Integer orgaoConcedenteId) { + Criteria c = makeCriteria(); + c.add(Restrictions.eq("orgaoconcedente.orgaoConcedenteId", orgaoConcedenteId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setProjection(Projections.rowCount()); + + + return HibernateFix.count(c.list()) > 0; + } + + public List buscarPorOrgao(OrgaoConcedente orgao) { + Criteria c = makeCriteria(); + c.add(Restrictions.eq("orgaoconcedente", orgao)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java index 90e3e99f7..555678a3e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.SeguroTarifaDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; -import java.util.List; - -@Repository("seguroTarifaDAO") -public class SeguroTarifaHibernateDAO extends GenericHibernateDAO implements SeguroTarifaDAO { - - @Autowired - public SeguroTarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public boolean existe(Integer orgaoConcedenteId) { - Criteria c = makeCriteria(); - c.add(Restrictions.eq("orgaoconcedente.orgaoConcedenteId", orgaoConcedenteId)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.setProjection(Projections.rowCount()); - - - return HibernateFix.count(c.list()) > 0; - } - - public List buscarPorOrgao(OrgaoConcedente orgao) { - Criteria c = makeCriteria(); - c.add(Restrictions.eq("orgaoconcedente", orgao)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.SeguroTarifaDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; +import java.util.List; + +@Repository("seguroTarifaDAO") +public class SeguroTarifaHibernateDAO extends GenericHibernateDAO implements SeguroTarifaDAO { + + @Autowired + public SeguroTarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public boolean existe(Integer orgaoConcedenteId) { + Criteria c = makeCriteria(); + c.add(Restrictions.eq("orgaoconcedente.orgaoConcedenteId", orgaoConcedenteId)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.setProjection(Projections.rowCount()); + + + return HibernateFix.count(c.list()) > 0; + } + + public List buscarPorOrgao(OrgaoConcedente orgao) { + Criteria c = makeCriteria(); + c.add(Restrictions.eq("orgaoconcedente", orgao)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java index f37686ea8..428eaaa78 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SisdapHibernateDAO.java @@ -1,980 +1,980 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -import javax.sql.DataSource; - -import org.apache.commons.dbutils.QueryRunner; -import org.apache.commons.dbutils.ResultSetHandler; -import org.apache.commons.dbutils.handlers.BeanListHandler; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.SisdapDAO; -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.relatorios.MovimentoLinha; -import com.rjconsultores.ventaboletos.relatorios.MovimentoSecoes; -import com.rjconsultores.ventaboletos.relatorios.PrefixoAntt; - -@Repository("sisdapDAO") -public class SisdapHibernateDAO implements SisdapDAO { - - private static String HYPHEN = "-"; - private static final Logger log = LogManager.getLogger(SisdapHibernateDAO.class); - - @Autowired - private DataSource dataSourceRead; - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId) { - - List list = consultaMovimentoLinhas(fecInicio, fecFinal, empresaId); - - List result = new ArrayList(); - - for (MovimentoLinha movimentoLinha : list) { - boolean insert = agrupaMovimentoLinhas(result, movimentoLinha); - if (insert) - result.add(movimentoLinha); - } - - List periodos = new ArrayList(); - for (MovimentoLinha movimentoLinha : result) { - String periodo = movimentoLinha.getAno() + HYPHEN + movimentoLinha.getMes(); - if (!periodos.contains(periodo)) { - periodos.add(periodo); - } - } - - List prefixos = buscaPrefixoEmpresa(empresaId); - - HashMap> periodosPrefixos = new HashMap>(); - for (String pd : periodos) { - periodosPrefixos.put(pd, prefixos); - } - - for (MovimentoLinha movimentoLinha : result) { - String periodo = movimentoLinha.getAno() + HYPHEN + movimentoLinha.getMes(); - - PrefixoAntt prefixoAntt = new PrefixoAntt(); - prefixoAntt.setAntt(movimentoLinha.getAntt()); - prefixoAntt.setPrefixo(movimentoLinha.getPrefixo()); - - if (periodosPrefixos.get(periodo).contains(prefixoAntt)) { - periodosPrefixos.get(periodo).remove(prefixoAntt); - } - } - - for (String key : periodosPrefixos.keySet()) { - String[] periodo = key.split(HYPHEN); - Integer ano = Integer.parseInt(periodo[0]); - Integer mes = Integer.parseInt(periodo[1]); - - for (PrefixoAntt prefixoAntt : periodosPrefixos.get(key)) { - MovimentoLinha linha = new MovimentoLinha(); - linha.setAno(ano); - linha.setMes(mes); - linha.setAntt(prefixoAntt.getAntt()); - linha.setPrefixo(prefixoAntt.getPrefixo()); - linha.setLugaresIda(NumberUtils.INTEGER_ZERO); - linha.setLugaresVolta(NumberUtils.INTEGER_ZERO); - linha.setViagensIda(NumberUtils.INTEGER_ZERO); - linha.setViagensVolta(NumberUtils.INTEGER_ZERO); - - result.add(linha); - } - } - - Collections.sort(result, new Comparator() { - public int compare(Object o1, Object o2) { - MovimentoLinha c1 = (MovimentoLinha) o1; - MovimentoLinha c2 = (MovimentoLinha) o2; - - int result = c1.getAno().compareTo(c2.getAno()); - if (result == 0) { - result = c1.getMes().compareTo(c2.getMes()); - } - if (result == 0) { - result = c1.getAntt().compareToIgnoreCase(c2.getAntt()); - } - if (result == 0) { - return c1.getPrefixo().compareToIgnoreCase(c2.getPrefixo()); - } - return result; - } - }); - - List movimentoLinhas = new ArrayList(); - movimentoLinhas.add("empresa;prefixo;mes;ano;viagem_ida;viagem_volta;lugar_ida;lugar_volta"); - for (MovimentoLinha movimentoLinha : result) { - movimentoLinhas.add(movimentoLinha.toString()); - } - - return movimentoLinhas; - } - - private List consultaMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId) { - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - StringBuilder sb = new StringBuilder(); - sb.append("select e.codantt antt, r.prefixo prefixo, "); - sb.append(" to_char(c.feccorrida, 'MM') mes, to_char(c.feccorrida, 'yyyy') ano, "); - sb.append(" nvl(case r.indsentidoida when 1 then count(r.prefixo) end, 0) viagensida, "); - sb.append(" nvl(case r.indsentidoida when 0 then count(r.prefixo) end, 0) viagensvolta, "); - sb.append(" nvl(case r.indsentidoida when 1 then sum(da.cantasientos) end, 0) lugaresida, "); - sb.append(" nvl(case r.indsentidoida when 0 then sum(da.cantasientos) end, 0) lugaresvolta "); - sb.append("from ruta_empresa re "); - sb.append(" left join empresa e on e.empresa_id = re.empresa_id "); - sb.append(" left join ruta r on re.ruta_id = r.ruta_id "); - sb.append(" left join corrida c on c.ruta_id = r.ruta_id "); - sb.append(" left outer join rol_operativo ro on c.roloperativo_id = ro.roloperativo_id "); - sb.append(" left outer join diagrama_autobus da on da.diagramaautobus_id = ro.diagramaautobus_id "); - sb.append("where e.empresa_id = ? and re.activo = 1 and r.activo = 1 and e.activo = 1 "); - sb.append(" and r.orgaoconcedente_id = 3 and e.codantt is not null "); - sb.append(" and c.feccorrida between to_date(?, 'DD/MM/YYYY') and "); - sb.append(" to_date(?, 'DD/MM/YYYY') "); - sb.append("group by e.codantt, r.prefixo, r.indsentidoida, "); - sb.append(" to_char(c.feccorrida, 'MM'), to_char(c.feccorrida, 'yyyy') "); - sb.append("order by mes, ano, e.codantt, r.prefixo, viagensida, viagensvolta "); - - QueryRunner queryRunner = new QueryRunner(dataSourceRead); - ResultSetHandler> handler = new BeanListHandler(MovimentoLinha.class); - List returnedList = new ArrayList(); - - try { - returnedList = queryRunner.query(sb.toString(), handler, empresaId, sdf.format(fecInicio), sdf.format(fecFinal)); - } catch (SQLException e) { - log.error("",e); - } - - return returnedList; - } - - private List buscaPrefixoEmpresa(Integer empresaId) { - - StringBuilder sb = new StringBuilder(); - sb.append(" select e.codantt antt, r.prefixo prefixo "); - sb.append(" from ruta_empresa re "); - sb.append(" left join marca m on m.empresa_id = re.empresa_id "); - sb.append(" left join empresa e on m.empresa_id = e.empresa_id "); - sb.append(" left join ruta r on re.ruta_id = r.ruta_id "); - sb.append(" where re.empresa_id = ? and r.orgaoconcedente_id = 3 "); - sb.append(" and re.activo = 1 and r.activo = 1 and e.activo = 1 "); - sb.append(" group by e.codantt, r.prefixo "); - sb.append(" order by e.codantt, r.prefixo "); - - - QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); - ResultSetHandler> handler = new BeanListHandler(PrefixoAntt.class); - List returnedList = new ArrayList(); - - try { - returnedList = queryRunner.query(sb.toString(), handler, empresaId); - } catch (SQLException e) { - log.error("",e); - } - - return returnedList; - } - - private boolean agrupaMovimentoLinhas(List resul, MovimentoLinha movimentoLinha) { - - if (resul.isEmpty()) { - return true; - } else { - for (MovimentoLinha ml : resul) { - if (ml.getPrefixo().equals(movimentoLinha.getPrefixo()) && ml.getMes().equals(movimentoLinha.getMes()) - && ml.getAno().equals(movimentoLinha.getAno())) { - - if (movimentoLinha.getViagensVolta() > 0) { - ml.setLugaresVolta(movimentoLinha.getLugaresVolta()); - ml.setViagensVolta(movimentoLinha.getViagensVolta()); - } - - if (movimentoLinha.getViagensIda() > 0) { - ml.setLugaresIda(movimentoLinha.getLugaresIda()); - ml.setViagensIda(movimentoLinha.getViagensIda()); - } - return false; - } - } - } - - return true; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaGratuidadeIdoso, List pesquisaDescontoIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem) { - List listResultConsulta = consultaMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaDescontoIdoso, pesquisaGratuidadeIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem); - List listResultIdaVoltaInvertida = new ArrayList(); - List listVoltasSemIda = new ArrayList(); - - for (MovimentoSecoes ms : listResultConsulta) { - - Boolean achou = Boolean.FALSE; - if(isIda(ms)) { - for (MovimentoSecoes ms2 : listResultConsulta) { - if(ms != null && ms2 != null && ms.getLocalOrigem() != null && ms2.getLocalOrigem() != null && - ms.getLocalOrigem().equals(ms2.getLocalDestino()) && ms2.getLocalOrigem().equals(ms.getLocalDestino()) && !isIda(ms2) && ms2.getPrefixo().equals(ms.getPrefixo())) { - ms.setDescontoIdosoVolta(ms2.getDescontoIdosoVolta()); - ms.setGratuidadeIdosoVolta(ms2.getGratuidadeIdosoVolta()); - ms.setGratuidadePasseLivreVolta(ms2.getGratuidadePasseLivreVolta()); - ms.setPassageirosVolta(ms2.getPassageirosVolta()); - ms.setGratuidadeJovenVolta(ms2.getGratuidadeJovenVolta()); - ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); - ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); - listResultIdaVoltaInvertida.add(ms); - achou = Boolean.TRUE; - break; - } - } - - if(!achou) { - listResultIdaVoltaInvertida.add(ms); - } - } else { - listVoltasSemIda.add(ms); - } - } - - for (MovimentoSecoes volta : listVoltasSemIda) { - - Boolean achou = Boolean.FALSE; - - for (MovimentoSecoes idaVolta : listResultIdaVoltaInvertida) { - if(idaVolta != null && idaVolta.getLocalOrigem() != null && volta != null && volta.getLocalOrigem() != null && volta.getPrefixo() != null && - idaVolta.getLocalOrigem().equals(volta.getLocalDestino()) && volta.getLocalOrigem().equals(idaVolta.getLocalDestino()) && volta.getPrefixo().equals(idaVolta.getPrefixo())) { - achou = Boolean.TRUE; - break; - } - } - - if(!achou) { - String origem = volta.getLocalOrigem(); - String destino = volta.getLocalDestino(); - - volta.setLocalDestino(origem); - volta.setLocalOrigem(destino); - listResultIdaVoltaInvertida.add(volta); - } - } - - List periodos = new ArrayList(); - for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { - String periodo = ms.getAno() + HYPHEN + ms.getMes(); - if (!periodos.contains(periodo)) { - periodos.add(periodo); - } - } - - List prefixos = buscaPrefixoEmpresaOrigenDestino(empresaId); - - HashMap> periodosPrefixos = new HashMap>(); - for (String pd : periodos) { - periodosPrefixos.put(pd, prefixos); - } - - for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { - String periodo = ms.getAno() + HYPHEN + ms.getMes(); - - PrefixoAntt prefixoAntt = new PrefixoAntt(); - prefixoAntt.setAntt(ms.getAntt()); - prefixoAntt.setPrefixo(ms.getPrefixo()); - prefixoAntt.setLocalDestino(ms.getLocalDestino()); - prefixoAntt.setLocalOrigem(ms.getLocalOrigem()); - - if (periodosPrefixos.get(periodo).contains(prefixoAntt)) { - periodosPrefixos.get(periodo).remove(prefixoAntt); - } - } - - for (String key : periodosPrefixos.keySet()) { - String[] periodo = key.split(HYPHEN); - Integer ano = Integer.parseInt(periodo[0]); - Integer mes = Integer.parseInt(periodo[1]); - - for (PrefixoAntt prefixoAntt : periodosPrefixos.get(key)) { - MovimentoSecoes ms = new MovimentoSecoes(); - ms.setAno(ano); - ms.setMes(mes); - - ms.setAntt(prefixoAntt.getAntt()); - ms.setPrefixo(prefixoAntt.getPrefixo()); - ms.setLocalDestino(prefixoAntt.getLocalDestino()); - ms.setLocalOrigem(prefixoAntt.getLocalOrigem()); - - ms.setDescontoIdosoIda(NumberUtils.INTEGER_ZERO); - ms.setDescontoIdosoVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeIdosoIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeIdosoVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeJovenIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeJovenVolta(NumberUtils.INTEGER_ZERO); - ms.setDescontoJovenIda(NumberUtils.INTEGER_ZERO); - ms.setDescontoJovenVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadePasseLivreIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadePasseLivreVolta(NumberUtils.INTEGER_ZERO); - ms.setPassageirosIda(NumberUtils.INTEGER_ZERO); - ms.setPassageirosVolta(NumberUtils.INTEGER_ZERO); - - listResultIdaVoltaInvertida.add(ms); - } - } - - Collections.sort(listResultIdaVoltaInvertida, new Comparator() { - public int compare(Object o1, Object o2) { - MovimentoSecoes c1 = (MovimentoSecoes) o1; - MovimentoSecoes c2 = (MovimentoSecoes) o2; - - int result = c1.getAno().compareTo(c2.getAno()); - if (result == 0) { - result = c1.getMes().compareTo(c2.getMes()); - } - if (result == 0) { - result = c1.getAntt().compareToIgnoreCase(c2.getAntt()); - } - if (result == 0) { - return c1.getPrefixo().compareToIgnoreCase(c2.getPrefixo()); - } - if (result == 0) { - return c1.getLocalOrigem().compareToIgnoreCase(c2.getLocalOrigem()); - } - if (result == 0) { - return c1.getLocalDestino().compareToIgnoreCase(c2.getLocalDestino()); - } - return result; - } - }); - - List movimentosSecoes = new ArrayList(); - movimentosSecoes.add("empresa;prefixo;local_origem;local_destino;mes;ano;passageiro_ida;passageiro_volta;gratuidade_ida;gratuidade_volta;idoso_ida;idoso_volta;desconto_ida;desconto_volta;gratuidade_jovem_ida;gratuidade_jovem_volta;gratuidade_jovem_desconto_ida;gratuidade_jovem_desconto_volta"); - - for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { - movimentosSecoes.add(ms.toStringSisdap()); - } - - return movimentosSecoes; - } - - private boolean isIda(MovimentoSecoes ms) { - Integer somaVolta = (ms.getDescontoIdosoVolta() + ms.getGratuidadeIdosoVolta() + ms.getGratuidadePasseLivreVolta() + ms.getPassageirosVolta()); - Integer somaIda = (ms.getDescontoIdosoIda() + ms.getGratuidadeIdosoIda() + ms.getGratuidadePasseLivreIda() + ms.getPassageirosIda()); - return (somaVolta.intValue() == 0) && (somaIda.intValue() > 0); - } - - private List consultaMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem) { - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - - String gratuidade = ""; - for (Object categoria : pesquisaGratuidade) { - gratuidade += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidade = gratuidade.substring(0, gratuidade.length()-1); - - String gratuidadeIdoso = ""; - for (Object categoria : pesquisaGratuidadeIdoso) { - gratuidadeIdoso += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidadeIdoso = gratuidadeIdoso.substring(0, gratuidadeIdoso.length()-1); - - String descontoIdoso = ""; - for (Object categoria : pesquisaDescontoIdoso) { - descontoIdoso += ((Categoria) categoria).getCategoriaId() + ","; - } - descontoIdoso = descontoIdoso.substring(0, descontoIdoso.length()-1); - - String gratuidadeJovem = ""; - for (Object categoria : pesquisaGratuidadeJovem) { - gratuidadeJovem += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidadeJovem = gratuidadeJovem.substring(0, gratuidadeJovem.length()-1); - - String descontoJovem = ""; - for (Object categoria : pesquisaDescontoJovem) { - descontoJovem += ((Categoria) categoria).getCategoriaId() + ","; - } - descontoJovem = descontoJovem.substring(0, descontoJovem.length()-1); - - StringBuilder sb = new StringBuilder(); - sb.append("SELECT subAlias.antt, "); - sb.append(" subAlias.prefixo, "); - sb.append(" subAlias.mes, "); - sb.append(" subAlias.ano, "); - sb.append(" po.codantt localOrigem, "); - sb.append(" pd.codantt localDestino, "); - sb.append(" sum(subAlias.passageirosida) as passageirosida, "); - sb.append(" sum(subAlias.passageirosvolta) as passageirosvolta, "); - sb.append(" sum(subAlias.gratuidadepasselivreida) as gratuidadepasselivreida, "); - sb.append(" sum(subAlias.gratuidadepasselivrevolta) as gratuidadepasselivrevolta, "); - sb.append(" sum(subAlias.gratuidadeidosoida) as gratuidadeidosoida, "); - sb.append(" sum(subAlias.gratuidadeidosovolta) as gratuidadeidosovolta, "); - sb.append(" sum(subAlias.descontoidosoida) as descontoidosoida, "); - sb.append(" sum(subAlias.descontoidosovolta) as descontoidosovolta, "); - - sb.append(" sum(subAlias.gratuidadejovenida) as gratuidadejovenida, "); - sb.append(" sum(subAlias.gratuidadejovenvolta) as gratuidadejovenvolta, "); - sb.append(" sum(subAlias.descontojovenida) as descontojovenida, "); - sb.append(" sum(subAlias.descontojovenvolta) as descontojovenvolta "); - - sb.append("FROM (SELECT subResp.antt antt, "); - sb.append(" subResp.prefixo prefixo, "); - sb.append(" subResp.mes mes, "); - sb.append(" subResp.ano ano, "); - sb.append(" coalesce(ase.aliasorigen_id, subResp.localorigem) aliasorigen, "); - sb.append(" coalesce(ase.aliasdestino_id, subResp.localdestino) aliasdestino, "); - sb.append(" subResp.passageirosida passageirosida, "); - sb.append(" subResp.passageirosvolta passageirosvolta, "); - sb.append(" subResp.gratuidadepasselivreida gratuidadepasselivreida, "); - sb.append(" subResp.gratuidadepasselivrevolta gratuidadepasselivrevolta, "); - sb.append(" subResp.gratuidadeidosoida gratuidadeidosoida, "); - sb.append(" subResp.gratuidadeidosovolta gratuidadeidosovolta, "); - sb.append(" subResp.descontoidosoida descontoidosoida, "); - sb.append(" subResp.descontoidosovolta descontoidosovolta, "); - - sb.append(" subResp.gratuidadejovenida gratuidadejovenida, "); - sb.append(" subResp.gratuidadejovenvolta gratuidadejovenvolta, "); - sb.append(" subResp.descontojovenida descontojovenida, "); - sb.append(" subResp.descontojovenvolta descontojovenvolta "); - - sb.append(" FROM (SELECT distinct r.ruta_id ruta_id, "); - sb.append(" e.codantt antt, "); - sb.append(" r.prefixo prefixo, "); - sb.append(" To_char(c.feccorrida, 'MM') mes, "); - sb.append(" To_char(c.feccorrida, 'yyyy') ano, "); - sb.append(" po.parada_id localorigem, "); - sb.append(" pd.parada_id localdestino, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosvolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivreida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivrevolta, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosoida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosovolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosoida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosovolta, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenvolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenvolta "); - - sb.append(" FROM ruta_empresa re "); - sb.append(" left join empresa e ON e.empresa_id = re.empresa_id "); - sb.append(" left join ruta r ON re.ruta_id = r.ruta_id "); - sb.append(" left join corrida c ON c.ruta_id = r.ruta_id "); - sb.append(" left outer join boleto b ON c.corrida_id = b.corrida_id AND c.feccorrida = b.feccorrida "); - sb.append(" left outer join parada po ON po.parada_id = b.origen_id "); - sb.append(" left outer join parada pd ON pd.parada_id = b.destino_id "); - - sb.append(" WHERE e.empresa_id = ? "); - sb.append(" AND re.activo = 1 "); - sb.append(" AND r.activo = 1 "); - sb.append(" AND e.activo = 1 "); - sb.append(" AND r.orgaoconcedente_id = 3 "); - sb.append(" AND b.numasiento IS NOT NULL "); - sb.append(" AND b.motivocancelacion_id IS NULL "); - sb.append(" AND b.indstatusoperacion = 'F' "); - sb.append(" AND b.activo = 1 "); - sb.append(" AND e.codantt IS NOT NULL "); - sb.append(" AND c.feccorrida BETWEEN To_date(?, 'dd/MM/yyyy') AND To_date (?, 'dd/MM/yyyy') "); - sb.append(" AND b.categoria_id <> (select valorconstante from constante where NOMBCONSTANTE = 'GRATUIDADE_CRIANCA')"); - sb.append(" GROUP BY e.codantt, "); - sb.append(" r.prefixo, "); - sb.append(" To_char(c.feccorrida, 'MM'), "); - sb.append(" To_char(c.feccorrida, 'yyyy'), "); - sb.append(" po.parada_id, "); - sb.append(" pd.parada_id, "); - sb.append(" r.indsentidoida, "); - sb.append(" b.categoria_id, "); - sb.append(" r.ruta_id "); - sb.append( " ORDER BY e.codantt, "); - sb.append( " r.prefixo) subResp "); - - sb.append(" left join alias_servico ase ON ( subResp.localorigem = ase.origen_id AND subResp.localdestino = ase.destino_id and ase.ruta_id = subResp.ruta_id and ase.activo = 1) "); - - sb.append( " ORDER BY subResp.antt,"); - sb.append( " subResp.prefixo"); - sb.append( " ) subAlias"); - - sb.append(" inner join parada po ON ( subAlias.aliasorigen = po.parada_id ) "); - sb.append(" inner join parada pd ON ( subAlias.aliasdestino = pd.parada_id ) "); - sb.append("GROUP BY mes, "); - sb.append(" ano, "); - sb.append(" antt, "); - sb.append(" prefixo, "); - sb.append(" po.codantt, "); - sb.append(" pd.codantt "); - - sb.append("ORDER BY mes, "); - sb.append(" ano, "); - sb.append(" antt, "); - sb.append(" prefixo, "); - sb.append(" localOrigem, "); - sb.append(" localDestino "); - - QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); - ResultSetHandler> handler = new BeanListHandler(MovimentoSecoes.class); - List returnedList = new ArrayList(); - - try { - returnedList = queryRunner.query(sb.toString(), handler, empresaId, sdf.format(fecInicio), sdf.format(fecFinal)); - - } catch (SQLException e) { - log.error("",e); - } - - return returnedList; - } - - private List consultaMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, List pesquisaGratuidadeEstudante, List pesquisaGratuidadeProfessor) { - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - - String gratuidade = ""; - for (Object categoria : pesquisaGratuidade) { - gratuidade += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidade = gratuidade.substring(0, gratuidade.length()-1); - - String gratuidadeIdoso = ""; - for (Object categoria : pesquisaGratuidadeIdoso) { - gratuidadeIdoso += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidadeIdoso = gratuidadeIdoso.substring(0, gratuidadeIdoso.length()-1); - - String descontoIdoso = ""; - for (Object categoria : pesquisaDescontoIdoso) { - descontoIdoso += ((Categoria) categoria).getCategoriaId() + ","; - } - descontoIdoso = descontoIdoso.substring(0, descontoIdoso.length()-1); - - String gratuidadeJovem = ""; - for (Object categoria : pesquisaGratuidadeJovem) { - gratuidadeJovem += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidadeJovem = gratuidadeJovem.substring(0, gratuidadeJovem.length()-1); - - String descontoJovem = ""; - for (Object categoria : pesquisaDescontoJovem) { - descontoJovem += ((Categoria) categoria).getCategoriaId() + ","; - } - descontoJovem = descontoJovem.substring(0, descontoJovem.length()-1); - - String gratuidadeProfessor = ""; - for (Object categoria : pesquisaGratuidadeProfessor) { - gratuidadeProfessor += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidadeProfessor = gratuidadeProfessor.substring(0, gratuidadeProfessor.length()-1); - - String gratuidadeEstudante = ""; - for (Object categoria : pesquisaGratuidadeEstudante) { - gratuidadeEstudante += ((Categoria) categoria).getCategoriaId() + ","; - } - gratuidadeEstudante = gratuidadeEstudante.substring(0, gratuidade.length()-1); - - StringBuilder sb = new StringBuilder(); - sb.append("SELECT subAlias.antt, "); - sb.append(" subAlias.prefixo, "); - sb.append(" subAlias.mes, "); - sb.append(" subAlias.ano, "); - sb.append(" po.codantt localOrigem, "); - sb.append(" pd.codantt localDestino, "); - sb.append(" sum(subAlias.passageirosida) as passageirosida, "); - sb.append(" sum(subAlias.passageirosvolta) as passageirosvolta, "); - sb.append(" sum(subAlias.gratuidadepasselivreida) as gratuidadepasselivreida, "); - sb.append(" sum(subAlias.gratuidadepasselivrevolta) as gratuidadepasselivrevolta, "); - sb.append(" sum(subAlias.gratuidadeidosoida) as gratuidadeidosoida, "); - sb.append(" sum(subAlias.gratuidadeidosovolta) as gratuidadeidosovolta, "); - sb.append(" sum(subAlias.descontoidosoida) as descontoidosoida, "); - sb.append(" sum(subAlias.descontoidosovolta) as descontoidosovolta, "); - - sb.append(" sum(subAlias.gratuidadejovenida) as gratuidadejovenida, "); - sb.append(" sum(subAlias.gratuidadejovenvolta) as gratuidadejovenvolta, "); - sb.append(" sum(subAlias.descontojovenida) as descontojovenida, "); - sb.append(" sum(subAlias.descontojovenvolta) as descontojovenvolta, "); - - sb.append(" sum(subAlias.gratuidadeestudanteida) as gratuidadeestudanteida, "); - sb.append(" sum(subAlias.gratuidadeestudantevolta) as gratuidadeestudantevolta, "); - sb.append(" sum(subAlias.gratuidadeprofessorida) as gratuidadeprofessorida, "); - sb.append(" sum(subAlias.gratuidadeprofessorvolta) as gratuidadeprofessorvolta "); - - - - sb.append("FROM (SELECT subResp.antt antt, "); - sb.append(" subResp.prefixo prefixo, "); - sb.append(" subResp.mes mes, "); - sb.append(" subResp.ano ano, "); - sb.append(" coalesce(ase.aliasorigen_id, subResp.localorigem) aliasorigen, "); - sb.append(" coalesce(ase.aliasdestino_id, subResp.localdestino) aliasdestino, "); - sb.append(" subResp.passageirosida passageirosida, "); - sb.append(" subResp.passageirosvolta passageirosvolta, "); - sb.append(" subResp.gratuidadepasselivreida gratuidadepasselivreida, "); - sb.append(" subResp.gratuidadepasselivrevolta gratuidadepasselivrevolta, "); - sb.append(" subResp.gratuidadeidosoida gratuidadeidosoida, "); - sb.append(" subResp.gratuidadeidosovolta gratuidadeidosovolta, "); - sb.append(" subResp.descontoidosoida descontoidosoida, "); - sb.append(" subResp.descontoidosovolta descontoidosovolta, "); - - sb.append(" subResp.gratuidadejovenida gratuidadejovenida, "); - sb.append(" subResp.gratuidadejovenvolta gratuidadejovenvolta, "); - sb.append(" subResp.descontojovenida descontojovenida, "); - sb.append(" subResp.descontojovenvolta descontojovenvolta, "); - - sb.append(" subResp.gratuidadeestudanteida gratuidadeestudanteida, "); - sb.append(" subResp.gratuidadeestudantevolta gratuidadeestudantevolta, "); - sb.append(" subResp.gratuidadeprofessorida gratuidadeprofessorida, "); - sb.append(" subResp.gratuidadeprofessorvolta gratuidadeprofessorvolta "); - - sb.append(" FROM (SELECT distinct r.ruta_id ruta_id, "); - sb.append(" e.codantt antt, "); - sb.append(" r.prefixo prefixo, "); - sb.append(" To_char(c.feccorrida, 'MM') mes, "); - sb.append(" To_char(c.feccorrida, 'yyyy') ano, "); - sb.append(" po.parada_id localorigem, "); - sb.append(" pd.parada_id localdestino, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosvolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivreida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivrevolta, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosoida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosovolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosoida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosovolta, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenvolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenvolta, "); - - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeEstudante + " ) THEN Count(*) END, 0) gratuidadeestudanteida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeEstudante + " ) THEN Count(*) END, 0) gratuidadeestudantevolta, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeProfessor + " ) THEN Count(*) END, 0) gratuidadeprofessorida, "); - sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeProfessor + " ) THEN Count(*) END, 0) gratuidadeprofessorvolta "); - - - sb.append(" FROM ruta_empresa re "); - sb.append(" left join empresa e ON e.empresa_id = re.empresa_id "); - sb.append(" left join ruta r ON re.ruta_id = r.ruta_id "); - sb.append(" left join corrida c ON c.ruta_id = r.ruta_id "); - sb.append(" left outer join boleto b ON c.corrida_id = b.corrida_id AND c.feccorrida = b.feccorrida "); - sb.append(" left outer join parada po ON po.parada_id = b.origen_id "); - sb.append(" left outer join parada pd ON pd.parada_id = b.destino_id "); - - sb.append(" WHERE e.empresa_id = ? "); - sb.append(" AND re.activo = 1 "); - sb.append(" AND r.activo = 1 "); - sb.append(" AND e.activo = 1 "); - sb.append(" AND r.orgaoconcedente_id = 3 "); - sb.append(" AND b.numasiento IS NOT NULL "); - sb.append(" AND b.motivocancelacion_id IS NULL "); - sb.append(" AND b.indstatusoperacion = 'F' "); - sb.append(" AND b.activo = 1 "); - sb.append(" AND e.codantt IS NOT NULL "); - sb.append(" AND c.feccorrida BETWEEN To_date(?, 'dd/MM/yyyy') AND To_date (?, 'dd/MM/yyyy') "); - sb.append(" AND b.categoria_id <> (select valorconstante from constante where NOMBCONSTANTE = 'GRATUIDADE_CRIANCA')"); - sb.append(" GROUP BY e.codantt, "); - sb.append(" r.prefixo, "); - sb.append(" To_char(c.feccorrida, 'MM'), "); - sb.append(" To_char(c.feccorrida, 'yyyy'), "); - sb.append(" po.parada_id, "); - sb.append(" pd.parada_id, "); - sb.append(" r.indsentidoida, "); - sb.append(" b.categoria_id, "); - sb.append(" r.ruta_id "); - sb.append( " ORDER BY e.codantt, "); - sb.append( " r.prefixo) subResp "); - - sb.append(" left join alias_servico ase ON ( subResp.localorigem = ase.origen_id AND subResp.localdestino = ase.destino_id and ase.ruta_id = subResp.ruta_id and ase.activo = 1) "); - - sb.append( " ORDER BY subResp.antt,"); - sb.append( " subResp.prefixo"); - sb.append( " ) subAlias"); - - sb.append(" inner join parada po ON ( subAlias.aliasorigen = po.parada_id ) "); - sb.append(" inner join parada pd ON ( subAlias.aliasdestino = pd.parada_id ) "); - sb.append("GROUP BY mes, "); - sb.append(" ano, "); - sb.append(" antt, "); - sb.append(" prefixo, "); - sb.append(" po.codantt, "); - sb.append(" pd.codantt "); - - sb.append("ORDER BY mes, "); - sb.append(" ano, "); - sb.append(" antt, "); - sb.append(" prefixo, "); - sb.append(" localOrigem, "); - sb.append(" localDestino "); - QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); - ResultSetHandler> handler = new BeanListHandler(MovimentoSecoes.class); - List returnedList = new ArrayList(); - - try { - returnedList = queryRunner.query(sb.toString(), handler, empresaId, sdf.format(fecInicio), sdf.format(fecFinal)); - - } catch (SQLException e) { - log.error("",e); - } - - return returnedList; - } - - private List buscaPrefixoEmpresaOrigenDestino(Integer empresaId) { - - StringBuilder sb = new StringBuilder(); - - sb.append(" SELECT DISTINCT "); - sb.append(" subAlias.antt, "); - sb.append(" subAlias.prefixo, "); - sb.append(" CASE WHEN subAlias.indIda = 1 THEN po.codantt ELSE pd.codantt END localOrigem, "); - sb.append(" CASE WHEN subAlias.indIda = 1 THEN pd.codantt ELSE po.codantt END localDestino "); - sb.append(" FROM (SELECT distinct subResp.antt antt, "); - sb.append(" subResp.prefixo prefixo, "); - sb.append(" ase.aliasorigen_id aliasorigen, "); - sb.append(" ase.aliasdestino_id aliasdestino, "); - sb.append(" subResp.indIda indIda "); - - sb.append(" FROM (SELECT distinct r.ruta_id ruta_id, "); - sb.append(" e.codantt antt, "); - sb.append(" r.prefixo prefixo, "); - sb.append(" po.parada_id localorigem, "); - sb.append(" pd.parada_id localdestino, "); - sb.append(" r.INDSENTIDOIDA indIda "); - sb.append(" FROM ruta_empresa re "); - sb.append(" join empresa e ON re.empresa_id = e.empresa_id "); - sb.append(" join ruta r ON re.ruta_id = r.ruta_id "); - sb.append(" join RUTA_COMBINACION rc on rc.RUTA_ID = r.ruta_id "); - sb.append(" join tramo tr on tr.TRAMO_ID = rc.TRAMO_ID "); - sb.append(" join parada po ON po.parada_id = tr.origen_id "); - sb.append(" join parada pd ON pd.parada_id = tr.destino_id "); - - sb.append(" WHERE e.empresa_id = ? "); - sb.append(" AND re.activo = 1 "); - sb.append(" AND r.activo = 1 "); - sb.append(" AND r.orgaoconcedente_id = 3 "); - sb.append(" AND e.codantt IS NOT NULL "); - sb.append(" GROUP BY e.codantt, "); - sb.append(" r.prefixo, "); - sb.append(" po.parada_id, "); - sb.append(" pd.parada_id, "); - sb.append(" r.ruta_id, "); - sb.append(" r.INDSENTIDOIDA "); - sb.append(" ORDER BY e.codantt, "); - sb.append(" r.prefixo) subResp "); - - sb.append(" join alias_servico ase ON ( subResp.localorigem = ase.origen_id AND subResp.localdestino = ase.destino_id and ase.ruta_id = subResp.ruta_id) "); - - sb.append(" ORDER BY subResp.antt, "); - sb.append(" subResp.prefixo ) subAlias "); - - sb.append(" join parada po ON ( subAlias.aliasorigen = po.parada_id ) "); - sb.append(" join parada pd ON ( subAlias.aliasdestino = pd.parada_id ) "); - - sb.append(" WHERE po.codantt <> pd.codantt "); - - sb.append(" GROUP BY antt, "); - sb.append(" prefixo, "); - sb.append(" po.codantt, "); - sb.append(" pd.codantt , "); - sb.append(" indIda "); - sb.append(" ORDER BY antt, "); - sb.append(" prefixo, "); - sb.append(" localOrigem, "); - sb.append(" localDestino "); - - QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); - ResultSetHandler> handler = new BeanListHandler(PrefixoAntt.class); - - List returnedList = new ArrayList(); - - try { - returnedList = queryRunner.query(sb.toString(), handler, empresaId); - } catch (SQLException e) { - log.error("",e); - } - return returnedList; - } - - @Override - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, - List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, - List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, - List pesquisaGratuidadeEstudante, List pesquisaGratuidadeProfessor) { - - List listResultConsulta = consultaMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaDescontoIdoso, pesquisaGratuidadeIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem, - pesquisaGratuidadeEstudante, pesquisaGratuidadeProfessor); - List listResultIdaVoltaInvertida = new ArrayList(); - List listVoltasSemIda = new ArrayList(); - - for (MovimentoSecoes ms : listResultConsulta) { - - Boolean achou = Boolean.FALSE; - if(isIda(ms)) { - for (MovimentoSecoes ms2 : listResultConsulta) { - if(ms != null && ms2 != null && ms.getLocalOrigem() != null && ms2.getLocalOrigem() != null && - ms.getLocalOrigem().equals(ms2.getLocalDestino()) && ms2.getLocalOrigem().equals(ms.getLocalDestino()) && !isIda(ms2) && ms2.getPrefixo().equals(ms.getPrefixo())) { - ms.setDescontoIdosoVolta(ms2.getDescontoIdosoVolta()); - ms.setGratuidadeIdosoVolta(ms2.getGratuidadeIdosoVolta()); - ms.setGratuidadePasseLivreVolta(ms2.getGratuidadePasseLivreVolta()); - ms.setPassageirosVolta(ms2.getPassageirosVolta()); - ms.setGratuidadeJovenVolta(ms2.getGratuidadeJovenVolta()); - ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); - ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); - ms.setGratuidadeEstudanteIda(ms2.getGratuidadeEstudanteIda()); - ms.setGratuidadeEstudanteVolta(ms2.getGratuidadeEstudanteVolta()); - ms.setGratuidadeProfessorIda(ms2.getGratuidadeProfessorIda()); - ms.setGratuidadeProfessorVolta(ms2.getGratuidadeProfessorVolta()); - listResultIdaVoltaInvertida.add(ms); - achou = Boolean.TRUE; - break; - } - } - - if(!achou) { - listResultIdaVoltaInvertida.add(ms); - } - } else { - listVoltasSemIda.add(ms); - } - } - - for (MovimentoSecoes volta : listVoltasSemIda) { - - Boolean achou = Boolean.FALSE; - - for (MovimentoSecoes idaVolta : listResultIdaVoltaInvertida) { - if(idaVolta != null && idaVolta.getLocalOrigem() != null && volta != null && volta.getLocalOrigem() != null && volta.getPrefixo() != null && - idaVolta.getLocalOrigem().equals(volta.getLocalDestino()) && volta.getLocalOrigem().equals(idaVolta.getLocalDestino()) && volta.getPrefixo().equals(idaVolta.getPrefixo())) { - achou = Boolean.TRUE; - break; - } - } - - if(!achou) { - String origem = volta.getLocalOrigem(); - String destino = volta.getLocalDestino(); - - volta.setLocalDestino(origem); - volta.setLocalOrigem(destino); - listResultIdaVoltaInvertida.add(volta); - } - } - - List periodos = new ArrayList(); - for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { - String periodo = ms.getAno() + HYPHEN + ms.getMes(); - if (!periodos.contains(periodo)) { - periodos.add(periodo); - } - } - - List prefixos = buscaPrefixoEmpresaOrigenDestino(empresaId); - - HashMap> periodosPrefixos = new HashMap>(); - for (String pd : periodos) { - periodosPrefixos.put(pd, prefixos); - } - - for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { - String periodo = ms.getAno() + HYPHEN + ms.getMes(); - - PrefixoAntt prefixoAntt = new PrefixoAntt(); - prefixoAntt.setAntt(ms.getAntt()); - prefixoAntt.setPrefixo(ms.getPrefixo()); - prefixoAntt.setLocalDestino(ms.getLocalDestino()); - prefixoAntt.setLocalOrigem(ms.getLocalOrigem()); - - if (periodosPrefixos.get(periodo).contains(prefixoAntt)) { - periodosPrefixos.get(periodo).remove(prefixoAntt); - } - } - - for (String key : periodosPrefixos.keySet()) { - String[] periodo = key.split(HYPHEN); - Integer ano = Integer.parseInt(periodo[0]); - Integer mes = Integer.parseInt(periodo[1]); - - for (PrefixoAntt prefixoAntt : periodosPrefixos.get(key)) { - MovimentoSecoes ms = new MovimentoSecoes(); - ms.setAno(ano); - ms.setMes(mes); - - ms.setAntt(prefixoAntt.getAntt()); - ms.setPrefixo(prefixoAntt.getPrefixo()); - ms.setLocalDestino(prefixoAntt.getLocalDestino()); - ms.setLocalOrigem(prefixoAntt.getLocalOrigem()); - - ms.setDescontoIdosoIda(NumberUtils.INTEGER_ZERO); - ms.setDescontoIdosoVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeIdosoIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeIdosoVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeJovenIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeJovenVolta(NumberUtils.INTEGER_ZERO); - ms.setDescontoJovenIda(NumberUtils.INTEGER_ZERO); - ms.setDescontoJovenVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadePasseLivreIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadePasseLivreVolta(NumberUtils.INTEGER_ZERO); - ms.setPassageirosIda(NumberUtils.INTEGER_ZERO); - ms.setPassageirosVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeEstudanteIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeEstudanteVolta(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeProfessorIda(NumberUtils.INTEGER_ZERO); - ms.setGratuidadeProfessorVolta(NumberUtils.INTEGER_ZERO); - - - listResultIdaVoltaInvertida.add(ms); - } - } - - Collections.sort(listResultIdaVoltaInvertida, new Comparator() { - public int compare(Object o1, Object o2) { - MovimentoSecoes c1 = (MovimentoSecoes) o1; - MovimentoSecoes c2 = (MovimentoSecoes) o2; - - int result = c1.getAno().compareTo(c2.getAno()); - if (result == 0) { - result = c1.getMes().compareTo(c2.getMes()); - } - if (result == 0) { - result = c1.getAntt().compareToIgnoreCase(c2.getAntt()); - } - if (result == 0) { - return c1.getPrefixo().compareToIgnoreCase(c2.getPrefixo()); - } - if (result == 0) { - return c1.getLocalOrigem().compareToIgnoreCase(c2.getLocalOrigem()); - } - if (result == 0) { - return c1.getLocalDestino().compareToIgnoreCase(c2.getLocalDestino()); - } - return result; - } - }); - - List movimentosSecoes = new ArrayList(); - movimentosSecoes.add("empresa;prefixo;local_origem;local_destino;mes;ano;passageiro_ida;passageiro_volta;gratuidade_ida;gratuidade_volta;idoso_ida;idoso_volta;desconto_ida;desconto_volta;gratuidade_jovem_ida;gratuidade_jovem_volta;gratuidade_jovem_desconto_ida;gratuidade_jovem_desconto_volta;gratuidade_estudante_ida;gratuidade_estudante_volta;gratuidade_professoe_ida;gratuidade_professor_volta"); - - - for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { - movimentosSecoes.add(ms.toString()); - } - - return movimentosSecoes; - } - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +import javax.sql.DataSource; + +import org.apache.commons.dbutils.QueryRunner; +import org.apache.commons.dbutils.ResultSetHandler; +import org.apache.commons.dbutils.handlers.BeanListHandler; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.SisdapDAO; +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.relatorios.MovimentoLinha; +import com.rjconsultores.ventaboletos.relatorios.MovimentoSecoes; +import com.rjconsultores.ventaboletos.relatorios.PrefixoAntt; + +@Repository("sisdapDAO") +public class SisdapHibernateDAO implements SisdapDAO { + + private static String HYPHEN = "-"; + private static final Logger log = LogManager.getLogger(SisdapHibernateDAO.class); + + @Autowired + private DataSource dataSourceRead; + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId) { + + List list = consultaMovimentoLinhas(fecInicio, fecFinal, empresaId); + + List result = new ArrayList(); + + for (MovimentoLinha movimentoLinha : list) { + boolean insert = agrupaMovimentoLinhas(result, movimentoLinha); + if (insert) + result.add(movimentoLinha); + } + + List periodos = new ArrayList(); + for (MovimentoLinha movimentoLinha : result) { + String periodo = movimentoLinha.getAno() + HYPHEN + movimentoLinha.getMes(); + if (!periodos.contains(periodo)) { + periodos.add(periodo); + } + } + + List prefixos = buscaPrefixoEmpresa(empresaId); + + HashMap> periodosPrefixos = new HashMap>(); + for (String pd : periodos) { + periodosPrefixos.put(pd, prefixos); + } + + for (MovimentoLinha movimentoLinha : result) { + String periodo = movimentoLinha.getAno() + HYPHEN + movimentoLinha.getMes(); + + PrefixoAntt prefixoAntt = new PrefixoAntt(); + prefixoAntt.setAntt(movimentoLinha.getAntt()); + prefixoAntt.setPrefixo(movimentoLinha.getPrefixo()); + + if (periodosPrefixos.get(periodo).contains(prefixoAntt)) { + periodosPrefixos.get(periodo).remove(prefixoAntt); + } + } + + for (String key : periodosPrefixos.keySet()) { + String[] periodo = key.split(HYPHEN); + Integer ano = Integer.parseInt(periodo[0]); + Integer mes = Integer.parseInt(periodo[1]); + + for (PrefixoAntt prefixoAntt : periodosPrefixos.get(key)) { + MovimentoLinha linha = new MovimentoLinha(); + linha.setAno(ano); + linha.setMes(mes); + linha.setAntt(prefixoAntt.getAntt()); + linha.setPrefixo(prefixoAntt.getPrefixo()); + linha.setLugaresIda(NumberUtils.INTEGER_ZERO); + linha.setLugaresVolta(NumberUtils.INTEGER_ZERO); + linha.setViagensIda(NumberUtils.INTEGER_ZERO); + linha.setViagensVolta(NumberUtils.INTEGER_ZERO); + + result.add(linha); + } + } + + Collections.sort(result, new Comparator() { + public int compare(Object o1, Object o2) { + MovimentoLinha c1 = (MovimentoLinha) o1; + MovimentoLinha c2 = (MovimentoLinha) o2; + + int result = c1.getAno().compareTo(c2.getAno()); + if (result == 0) { + result = c1.getMes().compareTo(c2.getMes()); + } + if (result == 0) { + result = c1.getAntt().compareToIgnoreCase(c2.getAntt()); + } + if (result == 0) { + return c1.getPrefixo().compareToIgnoreCase(c2.getPrefixo()); + } + return result; + } + }); + + List movimentoLinhas = new ArrayList(); + movimentoLinhas.add("empresa;prefixo;mes;ano;viagem_ida;viagem_volta;lugar_ida;lugar_volta"); + for (MovimentoLinha movimentoLinha : result) { + movimentoLinhas.add(movimentoLinha.toString()); + } + + return movimentoLinhas; + } + + private List consultaMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId) { + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + StringBuilder sb = new StringBuilder(); + sb.append("select e.codantt antt, r.prefixo prefixo, "); + sb.append(" to_char(c.feccorrida, 'MM') mes, to_char(c.feccorrida, 'yyyy') ano, "); + sb.append(" nvl(case r.indsentidoida when 1 then count(r.prefixo) end, 0) viagensida, "); + sb.append(" nvl(case r.indsentidoida when 0 then count(r.prefixo) end, 0) viagensvolta, "); + sb.append(" nvl(case r.indsentidoida when 1 then sum(da.cantasientos) end, 0) lugaresida, "); + sb.append(" nvl(case r.indsentidoida when 0 then sum(da.cantasientos) end, 0) lugaresvolta "); + sb.append("from ruta_empresa re "); + sb.append(" left join empresa e on e.empresa_id = re.empresa_id "); + sb.append(" left join ruta r on re.ruta_id = r.ruta_id "); + sb.append(" left join corrida c on c.ruta_id = r.ruta_id "); + sb.append(" left outer join rol_operativo ro on c.roloperativo_id = ro.roloperativo_id "); + sb.append(" left outer join diagrama_autobus da on da.diagramaautobus_id = ro.diagramaautobus_id "); + sb.append("where e.empresa_id = ? and re.activo = 1 and r.activo = 1 and e.activo = 1 "); + sb.append(" and r.orgaoconcedente_id = 3 and e.codantt is not null "); + sb.append(" and c.feccorrida between to_date(?, 'DD/MM/YYYY') and "); + sb.append(" to_date(?, 'DD/MM/YYYY') "); + sb.append("group by e.codantt, r.prefixo, r.indsentidoida, "); + sb.append(" to_char(c.feccorrida, 'MM'), to_char(c.feccorrida, 'yyyy') "); + sb.append("order by mes, ano, e.codantt, r.prefixo, viagensida, viagensvolta "); + + QueryRunner queryRunner = new QueryRunner(dataSourceRead); + ResultSetHandler> handler = new BeanListHandler(MovimentoLinha.class); + List returnedList = new ArrayList(); + + try { + returnedList = queryRunner.query(sb.toString(), handler, empresaId, sdf.format(fecInicio), sdf.format(fecFinal)); + } catch (SQLException e) { + log.error("",e); + } + + return returnedList; + } + + private List buscaPrefixoEmpresa(Integer empresaId) { + + StringBuilder sb = new StringBuilder(); + sb.append(" select e.codantt antt, r.prefixo prefixo "); + sb.append(" from ruta_empresa re "); + sb.append(" left join marca m on m.empresa_id = re.empresa_id "); + sb.append(" left join empresa e on m.empresa_id = e.empresa_id "); + sb.append(" left join ruta r on re.ruta_id = r.ruta_id "); + sb.append(" where re.empresa_id = ? and r.orgaoconcedente_id = 3 "); + sb.append(" and re.activo = 1 and r.activo = 1 and e.activo = 1 "); + sb.append(" group by e.codantt, r.prefixo "); + sb.append(" order by e.codantt, r.prefixo "); + + + QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); + ResultSetHandler> handler = new BeanListHandler(PrefixoAntt.class); + List returnedList = new ArrayList(); + + try { + returnedList = queryRunner.query(sb.toString(), handler, empresaId); + } catch (SQLException e) { + log.error("",e); + } + + return returnedList; + } + + private boolean agrupaMovimentoLinhas(List resul, MovimentoLinha movimentoLinha) { + + if (resul.isEmpty()) { + return true; + } else { + for (MovimentoLinha ml : resul) { + if (ml.getPrefixo().equals(movimentoLinha.getPrefixo()) && ml.getMes().equals(movimentoLinha.getMes()) + && ml.getAno().equals(movimentoLinha.getAno())) { + + if (movimentoLinha.getViagensVolta() > 0) { + ml.setLugaresVolta(movimentoLinha.getLugaresVolta()); + ml.setViagensVolta(movimentoLinha.getViagensVolta()); + } + + if (movimentoLinha.getViagensIda() > 0) { + ml.setLugaresIda(movimentoLinha.getLugaresIda()); + ml.setViagensIda(movimentoLinha.getViagensIda()); + } + return false; + } + } + } + + return true; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaGratuidadeIdoso, List pesquisaDescontoIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem) { + List listResultConsulta = consultaMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaDescontoIdoso, pesquisaGratuidadeIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem); + List listResultIdaVoltaInvertida = new ArrayList(); + List listVoltasSemIda = new ArrayList(); + + for (MovimentoSecoes ms : listResultConsulta) { + + Boolean achou = Boolean.FALSE; + if(isIda(ms)) { + for (MovimentoSecoes ms2 : listResultConsulta) { + if(ms != null && ms2 != null && ms.getLocalOrigem() != null && ms2.getLocalOrigem() != null && + ms.getLocalOrigem().equals(ms2.getLocalDestino()) && ms2.getLocalOrigem().equals(ms.getLocalDestino()) && !isIda(ms2) && ms2.getPrefixo().equals(ms.getPrefixo())) { + ms.setDescontoIdosoVolta(ms2.getDescontoIdosoVolta()); + ms.setGratuidadeIdosoVolta(ms2.getGratuidadeIdosoVolta()); + ms.setGratuidadePasseLivreVolta(ms2.getGratuidadePasseLivreVolta()); + ms.setPassageirosVolta(ms2.getPassageirosVolta()); + ms.setGratuidadeJovenVolta(ms2.getGratuidadeJovenVolta()); + ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); + ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); + listResultIdaVoltaInvertida.add(ms); + achou = Boolean.TRUE; + break; + } + } + + if(!achou) { + listResultIdaVoltaInvertida.add(ms); + } + } else { + listVoltasSemIda.add(ms); + } + } + + for (MovimentoSecoes volta : listVoltasSemIda) { + + Boolean achou = Boolean.FALSE; + + for (MovimentoSecoes idaVolta : listResultIdaVoltaInvertida) { + if(idaVolta != null && idaVolta.getLocalOrigem() != null && volta != null && volta.getLocalOrigem() != null && volta.getPrefixo() != null && + idaVolta.getLocalOrigem().equals(volta.getLocalDestino()) && volta.getLocalOrigem().equals(idaVolta.getLocalDestino()) && volta.getPrefixo().equals(idaVolta.getPrefixo())) { + achou = Boolean.TRUE; + break; + } + } + + if(!achou) { + String origem = volta.getLocalOrigem(); + String destino = volta.getLocalDestino(); + + volta.setLocalDestino(origem); + volta.setLocalOrigem(destino); + listResultIdaVoltaInvertida.add(volta); + } + } + + List periodos = new ArrayList(); + for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { + String periodo = ms.getAno() + HYPHEN + ms.getMes(); + if (!periodos.contains(periodo)) { + periodos.add(periodo); + } + } + + List prefixos = buscaPrefixoEmpresaOrigenDestino(empresaId); + + HashMap> periodosPrefixos = new HashMap>(); + for (String pd : periodos) { + periodosPrefixos.put(pd, prefixos); + } + + for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { + String periodo = ms.getAno() + HYPHEN + ms.getMes(); + + PrefixoAntt prefixoAntt = new PrefixoAntt(); + prefixoAntt.setAntt(ms.getAntt()); + prefixoAntt.setPrefixo(ms.getPrefixo()); + prefixoAntt.setLocalDestino(ms.getLocalDestino()); + prefixoAntt.setLocalOrigem(ms.getLocalOrigem()); + + if (periodosPrefixos.get(periodo).contains(prefixoAntt)) { + periodosPrefixos.get(periodo).remove(prefixoAntt); + } + } + + for (String key : periodosPrefixos.keySet()) { + String[] periodo = key.split(HYPHEN); + Integer ano = Integer.parseInt(periodo[0]); + Integer mes = Integer.parseInt(periodo[1]); + + for (PrefixoAntt prefixoAntt : periodosPrefixos.get(key)) { + MovimentoSecoes ms = new MovimentoSecoes(); + ms.setAno(ano); + ms.setMes(mes); + + ms.setAntt(prefixoAntt.getAntt()); + ms.setPrefixo(prefixoAntt.getPrefixo()); + ms.setLocalDestino(prefixoAntt.getLocalDestino()); + ms.setLocalOrigem(prefixoAntt.getLocalOrigem()); + + ms.setDescontoIdosoIda(NumberUtils.INTEGER_ZERO); + ms.setDescontoIdosoVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeIdosoIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeIdosoVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeJovenIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeJovenVolta(NumberUtils.INTEGER_ZERO); + ms.setDescontoJovenIda(NumberUtils.INTEGER_ZERO); + ms.setDescontoJovenVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadePasseLivreIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadePasseLivreVolta(NumberUtils.INTEGER_ZERO); + ms.setPassageirosIda(NumberUtils.INTEGER_ZERO); + ms.setPassageirosVolta(NumberUtils.INTEGER_ZERO); + + listResultIdaVoltaInvertida.add(ms); + } + } + + Collections.sort(listResultIdaVoltaInvertida, new Comparator() { + public int compare(Object o1, Object o2) { + MovimentoSecoes c1 = (MovimentoSecoes) o1; + MovimentoSecoes c2 = (MovimentoSecoes) o2; + + int result = c1.getAno().compareTo(c2.getAno()); + if (result == 0) { + result = c1.getMes().compareTo(c2.getMes()); + } + if (result == 0) { + result = c1.getAntt().compareToIgnoreCase(c2.getAntt()); + } + if (result == 0) { + return c1.getPrefixo().compareToIgnoreCase(c2.getPrefixo()); + } + if (result == 0) { + return c1.getLocalOrigem().compareToIgnoreCase(c2.getLocalOrigem()); + } + if (result == 0) { + return c1.getLocalDestino().compareToIgnoreCase(c2.getLocalDestino()); + } + return result; + } + }); + + List movimentosSecoes = new ArrayList(); + movimentosSecoes.add("empresa;prefixo;local_origem;local_destino;mes;ano;passageiro_ida;passageiro_volta;gratuidade_ida;gratuidade_volta;idoso_ida;idoso_volta;desconto_ida;desconto_volta;gratuidade_jovem_ida;gratuidade_jovem_volta;gratuidade_jovem_desconto_ida;gratuidade_jovem_desconto_volta"); + + for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { + movimentosSecoes.add(ms.toStringSisdap()); + } + + return movimentosSecoes; + } + + private boolean isIda(MovimentoSecoes ms) { + Integer somaVolta = (ms.getDescontoIdosoVolta() + ms.getGratuidadeIdosoVolta() + ms.getGratuidadePasseLivreVolta() + ms.getPassageirosVolta()); + Integer somaIda = (ms.getDescontoIdosoIda() + ms.getGratuidadeIdosoIda() + ms.getGratuidadePasseLivreIda() + ms.getPassageirosIda()); + return (somaVolta.intValue() == 0) && (somaIda.intValue() > 0); + } + + private List consultaMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem) { + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + String gratuidade = ""; + for (Object categoria : pesquisaGratuidade) { + gratuidade += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidade = gratuidade.substring(0, gratuidade.length()-1); + + String gratuidadeIdoso = ""; + for (Object categoria : pesquisaGratuidadeIdoso) { + gratuidadeIdoso += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidadeIdoso = gratuidadeIdoso.substring(0, gratuidadeIdoso.length()-1); + + String descontoIdoso = ""; + for (Object categoria : pesquisaDescontoIdoso) { + descontoIdoso += ((Categoria) categoria).getCategoriaId() + ","; + } + descontoIdoso = descontoIdoso.substring(0, descontoIdoso.length()-1); + + String gratuidadeJovem = ""; + for (Object categoria : pesquisaGratuidadeJovem) { + gratuidadeJovem += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidadeJovem = gratuidadeJovem.substring(0, gratuidadeJovem.length()-1); + + String descontoJovem = ""; + for (Object categoria : pesquisaDescontoJovem) { + descontoJovem += ((Categoria) categoria).getCategoriaId() + ","; + } + descontoJovem = descontoJovem.substring(0, descontoJovem.length()-1); + + StringBuilder sb = new StringBuilder(); + sb.append("SELECT subAlias.antt, "); + sb.append(" subAlias.prefixo, "); + sb.append(" subAlias.mes, "); + sb.append(" subAlias.ano, "); + sb.append(" po.codantt localOrigem, "); + sb.append(" pd.codantt localDestino, "); + sb.append(" sum(subAlias.passageirosida) as passageirosida, "); + sb.append(" sum(subAlias.passageirosvolta) as passageirosvolta, "); + sb.append(" sum(subAlias.gratuidadepasselivreida) as gratuidadepasselivreida, "); + sb.append(" sum(subAlias.gratuidadepasselivrevolta) as gratuidadepasselivrevolta, "); + sb.append(" sum(subAlias.gratuidadeidosoida) as gratuidadeidosoida, "); + sb.append(" sum(subAlias.gratuidadeidosovolta) as gratuidadeidosovolta, "); + sb.append(" sum(subAlias.descontoidosoida) as descontoidosoida, "); + sb.append(" sum(subAlias.descontoidosovolta) as descontoidosovolta, "); + + sb.append(" sum(subAlias.gratuidadejovenida) as gratuidadejovenida, "); + sb.append(" sum(subAlias.gratuidadejovenvolta) as gratuidadejovenvolta, "); + sb.append(" sum(subAlias.descontojovenida) as descontojovenida, "); + sb.append(" sum(subAlias.descontojovenvolta) as descontojovenvolta "); + + sb.append("FROM (SELECT subResp.antt antt, "); + sb.append(" subResp.prefixo prefixo, "); + sb.append(" subResp.mes mes, "); + sb.append(" subResp.ano ano, "); + sb.append(" coalesce(ase.aliasorigen_id, subResp.localorigem) aliasorigen, "); + sb.append(" coalesce(ase.aliasdestino_id, subResp.localdestino) aliasdestino, "); + sb.append(" subResp.passageirosida passageirosida, "); + sb.append(" subResp.passageirosvolta passageirosvolta, "); + sb.append(" subResp.gratuidadepasselivreida gratuidadepasselivreida, "); + sb.append(" subResp.gratuidadepasselivrevolta gratuidadepasselivrevolta, "); + sb.append(" subResp.gratuidadeidosoida gratuidadeidosoida, "); + sb.append(" subResp.gratuidadeidosovolta gratuidadeidosovolta, "); + sb.append(" subResp.descontoidosoida descontoidosoida, "); + sb.append(" subResp.descontoidosovolta descontoidosovolta, "); + + sb.append(" subResp.gratuidadejovenida gratuidadejovenida, "); + sb.append(" subResp.gratuidadejovenvolta gratuidadejovenvolta, "); + sb.append(" subResp.descontojovenida descontojovenida, "); + sb.append(" subResp.descontojovenvolta descontojovenvolta "); + + sb.append(" FROM (SELECT distinct r.ruta_id ruta_id, "); + sb.append(" e.codantt antt, "); + sb.append(" r.prefixo prefixo, "); + sb.append(" To_char(c.feccorrida, 'MM') mes, "); + sb.append(" To_char(c.feccorrida, 'yyyy') ano, "); + sb.append(" po.parada_id localorigem, "); + sb.append(" pd.parada_id localdestino, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosvolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivreida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivrevolta, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosoida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosovolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosoida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosovolta, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenvolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenvolta "); + + sb.append(" FROM ruta_empresa re "); + sb.append(" left join empresa e ON e.empresa_id = re.empresa_id "); + sb.append(" left join ruta r ON re.ruta_id = r.ruta_id "); + sb.append(" left join corrida c ON c.ruta_id = r.ruta_id "); + sb.append(" left outer join boleto b ON c.corrida_id = b.corrida_id AND c.feccorrida = b.feccorrida "); + sb.append(" left outer join parada po ON po.parada_id = b.origen_id "); + sb.append(" left outer join parada pd ON pd.parada_id = b.destino_id "); + + sb.append(" WHERE e.empresa_id = ? "); + sb.append(" AND re.activo = 1 "); + sb.append(" AND r.activo = 1 "); + sb.append(" AND e.activo = 1 "); + sb.append(" AND r.orgaoconcedente_id = 3 "); + sb.append(" AND b.numasiento IS NOT NULL "); + sb.append(" AND b.motivocancelacion_id IS NULL "); + sb.append(" AND b.indstatusoperacion = 'F' "); + sb.append(" AND b.activo = 1 "); + sb.append(" AND e.codantt IS NOT NULL "); + sb.append(" AND c.feccorrida BETWEEN To_date(?, 'dd/MM/yyyy') AND To_date (?, 'dd/MM/yyyy') "); + sb.append(" AND b.categoria_id <> (select valorconstante from constante where NOMBCONSTANTE = 'GRATUIDADE_CRIANCA')"); + sb.append(" GROUP BY e.codantt, "); + sb.append(" r.prefixo, "); + sb.append(" To_char(c.feccorrida, 'MM'), "); + sb.append(" To_char(c.feccorrida, 'yyyy'), "); + sb.append(" po.parada_id, "); + sb.append(" pd.parada_id, "); + sb.append(" r.indsentidoida, "); + sb.append(" b.categoria_id, "); + sb.append(" r.ruta_id "); + sb.append( " ORDER BY e.codantt, "); + sb.append( " r.prefixo) subResp "); + + sb.append(" left join alias_servico ase ON ( subResp.localorigem = ase.origen_id AND subResp.localdestino = ase.destino_id and ase.ruta_id = subResp.ruta_id and ase.activo = 1) "); + + sb.append( " ORDER BY subResp.antt,"); + sb.append( " subResp.prefixo"); + sb.append( " ) subAlias"); + + sb.append(" inner join parada po ON ( subAlias.aliasorigen = po.parada_id ) "); + sb.append(" inner join parada pd ON ( subAlias.aliasdestino = pd.parada_id ) "); + sb.append("GROUP BY mes, "); + sb.append(" ano, "); + sb.append(" antt, "); + sb.append(" prefixo, "); + sb.append(" po.codantt, "); + sb.append(" pd.codantt "); + + sb.append("ORDER BY mes, "); + sb.append(" ano, "); + sb.append(" antt, "); + sb.append(" prefixo, "); + sb.append(" localOrigem, "); + sb.append(" localDestino "); + + QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); + ResultSetHandler> handler = new BeanListHandler(MovimentoSecoes.class); + List returnedList = new ArrayList(); + + try { + returnedList = queryRunner.query(sb.toString(), handler, empresaId, sdf.format(fecInicio), sdf.format(fecFinal)); + + } catch (SQLException e) { + log.error("",e); + } + + return returnedList; + } + + private List consultaMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, List pesquisaGratuidadeEstudante, List pesquisaGratuidadeProfessor) { + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + String gratuidade = ""; + for (Object categoria : pesquisaGratuidade) { + gratuidade += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidade = gratuidade.substring(0, gratuidade.length()-1); + + String gratuidadeIdoso = ""; + for (Object categoria : pesquisaGratuidadeIdoso) { + gratuidadeIdoso += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidadeIdoso = gratuidadeIdoso.substring(0, gratuidadeIdoso.length()-1); + + String descontoIdoso = ""; + for (Object categoria : pesquisaDescontoIdoso) { + descontoIdoso += ((Categoria) categoria).getCategoriaId() + ","; + } + descontoIdoso = descontoIdoso.substring(0, descontoIdoso.length()-1); + + String gratuidadeJovem = ""; + for (Object categoria : pesquisaGratuidadeJovem) { + gratuidadeJovem += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidadeJovem = gratuidadeJovem.substring(0, gratuidadeJovem.length()-1); + + String descontoJovem = ""; + for (Object categoria : pesquisaDescontoJovem) { + descontoJovem += ((Categoria) categoria).getCategoriaId() + ","; + } + descontoJovem = descontoJovem.substring(0, descontoJovem.length()-1); + + String gratuidadeProfessor = ""; + for (Object categoria : pesquisaGratuidadeProfessor) { + gratuidadeProfessor += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidadeProfessor = gratuidadeProfessor.substring(0, gratuidadeProfessor.length()-1); + + String gratuidadeEstudante = ""; + for (Object categoria : pesquisaGratuidadeEstudante) { + gratuidadeEstudante += ((Categoria) categoria).getCategoriaId() + ","; + } + gratuidadeEstudante = gratuidadeEstudante.substring(0, gratuidade.length()-1); + + StringBuilder sb = new StringBuilder(); + sb.append("SELECT subAlias.antt, "); + sb.append(" subAlias.prefixo, "); + sb.append(" subAlias.mes, "); + sb.append(" subAlias.ano, "); + sb.append(" po.codantt localOrigem, "); + sb.append(" pd.codantt localDestino, "); + sb.append(" sum(subAlias.passageirosida) as passageirosida, "); + sb.append(" sum(subAlias.passageirosvolta) as passageirosvolta, "); + sb.append(" sum(subAlias.gratuidadepasselivreida) as gratuidadepasselivreida, "); + sb.append(" sum(subAlias.gratuidadepasselivrevolta) as gratuidadepasselivrevolta, "); + sb.append(" sum(subAlias.gratuidadeidosoida) as gratuidadeidosoida, "); + sb.append(" sum(subAlias.gratuidadeidosovolta) as gratuidadeidosovolta, "); + sb.append(" sum(subAlias.descontoidosoida) as descontoidosoida, "); + sb.append(" sum(subAlias.descontoidosovolta) as descontoidosovolta, "); + + sb.append(" sum(subAlias.gratuidadejovenida) as gratuidadejovenida, "); + sb.append(" sum(subAlias.gratuidadejovenvolta) as gratuidadejovenvolta, "); + sb.append(" sum(subAlias.descontojovenida) as descontojovenida, "); + sb.append(" sum(subAlias.descontojovenvolta) as descontojovenvolta, "); + + sb.append(" sum(subAlias.gratuidadeestudanteida) as gratuidadeestudanteida, "); + sb.append(" sum(subAlias.gratuidadeestudantevolta) as gratuidadeestudantevolta, "); + sb.append(" sum(subAlias.gratuidadeprofessorida) as gratuidadeprofessorida, "); + sb.append(" sum(subAlias.gratuidadeprofessorvolta) as gratuidadeprofessorvolta "); + + + + sb.append("FROM (SELECT subResp.antt antt, "); + sb.append(" subResp.prefixo prefixo, "); + sb.append(" subResp.mes mes, "); + sb.append(" subResp.ano ano, "); + sb.append(" coalesce(ase.aliasorigen_id, subResp.localorigem) aliasorigen, "); + sb.append(" coalesce(ase.aliasdestino_id, subResp.localdestino) aliasdestino, "); + sb.append(" subResp.passageirosida passageirosida, "); + sb.append(" subResp.passageirosvolta passageirosvolta, "); + sb.append(" subResp.gratuidadepasselivreida gratuidadepasselivreida, "); + sb.append(" subResp.gratuidadepasselivrevolta gratuidadepasselivrevolta, "); + sb.append(" subResp.gratuidadeidosoida gratuidadeidosoida, "); + sb.append(" subResp.gratuidadeidosovolta gratuidadeidosovolta, "); + sb.append(" subResp.descontoidosoida descontoidosoida, "); + sb.append(" subResp.descontoidosovolta descontoidosovolta, "); + + sb.append(" subResp.gratuidadejovenida gratuidadejovenida, "); + sb.append(" subResp.gratuidadejovenvolta gratuidadejovenvolta, "); + sb.append(" subResp.descontojovenida descontojovenida, "); + sb.append(" subResp.descontojovenvolta descontojovenvolta, "); + + sb.append(" subResp.gratuidadeestudanteida gratuidadeestudanteida, "); + sb.append(" subResp.gratuidadeestudantevolta gratuidadeestudantevolta, "); + sb.append(" subResp.gratuidadeprofessorida gratuidadeprofessorida, "); + sb.append(" subResp.gratuidadeprofessorvolta gratuidadeprofessorvolta "); + + sb.append(" FROM (SELECT distinct r.ruta_id ruta_id, "); + sb.append(" e.codantt antt, "); + sb.append(" r.prefixo prefixo, "); + sb.append(" To_char(c.feccorrida, 'MM') mes, "); + sb.append(" To_char(c.feccorrida, 'yyyy') ano, "); + sb.append(" po.parada_id localorigem, "); + sb.append(" pd.parada_id localdestino, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN (SELECT categoria_id FROM categoria WHERE grupocategoria_id IS NULL) THEN Count(*) END, 0) passageirosvolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivreida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidade + " ) THEN Count(*) END, 0) gratuidadepasselivrevolta, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosoida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeIdoso + " ) THEN Count(*) END, 0) gratuidadeidosovolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosoida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoIdoso + " ) THEN Count(*) END, 0) descontoidosovolta, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeJovem + " ) THEN Count(*) END, 0) gratuidadejovenvolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + descontoJovem + " ) THEN Count(*) END, 0) descontojovenvolta, "); + + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeEstudante + " ) THEN Count(*) END, 0) gratuidadeestudanteida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeEstudante + " ) THEN Count(*) END, 0) gratuidadeestudantevolta, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 1 AND b.categoria_id IN ( " + gratuidadeProfessor + " ) THEN Count(*) END, 0) gratuidadeprofessorida, "); + sb.append(" Nvl(CASE WHEN r.indsentidoida = 0 AND b.categoria_id IN ( " + gratuidadeProfessor + " ) THEN Count(*) END, 0) gratuidadeprofessorvolta "); + + + sb.append(" FROM ruta_empresa re "); + sb.append(" left join empresa e ON e.empresa_id = re.empresa_id "); + sb.append(" left join ruta r ON re.ruta_id = r.ruta_id "); + sb.append(" left join corrida c ON c.ruta_id = r.ruta_id "); + sb.append(" left outer join boleto b ON c.corrida_id = b.corrida_id AND c.feccorrida = b.feccorrida "); + sb.append(" left outer join parada po ON po.parada_id = b.origen_id "); + sb.append(" left outer join parada pd ON pd.parada_id = b.destino_id "); + + sb.append(" WHERE e.empresa_id = ? "); + sb.append(" AND re.activo = 1 "); + sb.append(" AND r.activo = 1 "); + sb.append(" AND e.activo = 1 "); + sb.append(" AND r.orgaoconcedente_id = 3 "); + sb.append(" AND b.numasiento IS NOT NULL "); + sb.append(" AND b.motivocancelacion_id IS NULL "); + sb.append(" AND b.indstatusoperacion = 'F' "); + sb.append(" AND b.activo = 1 "); + sb.append(" AND e.codantt IS NOT NULL "); + sb.append(" AND c.feccorrida BETWEEN To_date(?, 'dd/MM/yyyy') AND To_date (?, 'dd/MM/yyyy') "); + sb.append(" AND b.categoria_id <> (select valorconstante from constante where NOMBCONSTANTE = 'GRATUIDADE_CRIANCA')"); + sb.append(" GROUP BY e.codantt, "); + sb.append(" r.prefixo, "); + sb.append(" To_char(c.feccorrida, 'MM'), "); + sb.append(" To_char(c.feccorrida, 'yyyy'), "); + sb.append(" po.parada_id, "); + sb.append(" pd.parada_id, "); + sb.append(" r.indsentidoida, "); + sb.append(" b.categoria_id, "); + sb.append(" r.ruta_id "); + sb.append( " ORDER BY e.codantt, "); + sb.append( " r.prefixo) subResp "); + + sb.append(" left join alias_servico ase ON ( subResp.localorigem = ase.origen_id AND subResp.localdestino = ase.destino_id and ase.ruta_id = subResp.ruta_id and ase.activo = 1) "); + + sb.append( " ORDER BY subResp.antt,"); + sb.append( " subResp.prefixo"); + sb.append( " ) subAlias"); + + sb.append(" inner join parada po ON ( subAlias.aliasorigen = po.parada_id ) "); + sb.append(" inner join parada pd ON ( subAlias.aliasdestino = pd.parada_id ) "); + sb.append("GROUP BY mes, "); + sb.append(" ano, "); + sb.append(" antt, "); + sb.append(" prefixo, "); + sb.append(" po.codantt, "); + sb.append(" pd.codantt "); + + sb.append("ORDER BY mes, "); + sb.append(" ano, "); + sb.append(" antt, "); + sb.append(" prefixo, "); + sb.append(" localOrigem, "); + sb.append(" localDestino "); + QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); + ResultSetHandler> handler = new BeanListHandler(MovimentoSecoes.class); + List returnedList = new ArrayList(); + + try { + returnedList = queryRunner.query(sb.toString(), handler, empresaId, sdf.format(fecInicio), sdf.format(fecFinal)); + + } catch (SQLException e) { + log.error("",e); + } + + return returnedList; + } + + private List buscaPrefixoEmpresaOrigenDestino(Integer empresaId) { + + StringBuilder sb = new StringBuilder(); + + sb.append(" SELECT DISTINCT "); + sb.append(" subAlias.antt, "); + sb.append(" subAlias.prefixo, "); + sb.append(" CASE WHEN subAlias.indIda = 1 THEN po.codantt ELSE pd.codantt END localOrigem, "); + sb.append(" CASE WHEN subAlias.indIda = 1 THEN pd.codantt ELSE po.codantt END localDestino "); + sb.append(" FROM (SELECT distinct subResp.antt antt, "); + sb.append(" subResp.prefixo prefixo, "); + sb.append(" ase.aliasorigen_id aliasorigen, "); + sb.append(" ase.aliasdestino_id aliasdestino, "); + sb.append(" subResp.indIda indIda "); + + sb.append(" FROM (SELECT distinct r.ruta_id ruta_id, "); + sb.append(" e.codantt antt, "); + sb.append(" r.prefixo prefixo, "); + sb.append(" po.parada_id localorigem, "); + sb.append(" pd.parada_id localdestino, "); + sb.append(" r.INDSENTIDOIDA indIda "); + sb.append(" FROM ruta_empresa re "); + sb.append(" join empresa e ON re.empresa_id = e.empresa_id "); + sb.append(" join ruta r ON re.ruta_id = r.ruta_id "); + sb.append(" join RUTA_COMBINACION rc on rc.RUTA_ID = r.ruta_id "); + sb.append(" join tramo tr on tr.TRAMO_ID = rc.TRAMO_ID "); + sb.append(" join parada po ON po.parada_id = tr.origen_id "); + sb.append(" join parada pd ON pd.parada_id = tr.destino_id "); + + sb.append(" WHERE e.empresa_id = ? "); + sb.append(" AND re.activo = 1 "); + sb.append(" AND r.activo = 1 "); + sb.append(" AND r.orgaoconcedente_id = 3 "); + sb.append(" AND e.codantt IS NOT NULL "); + sb.append(" GROUP BY e.codantt, "); + sb.append(" r.prefixo, "); + sb.append(" po.parada_id, "); + sb.append(" pd.parada_id, "); + sb.append(" r.ruta_id, "); + sb.append(" r.INDSENTIDOIDA "); + sb.append(" ORDER BY e.codantt, "); + sb.append(" r.prefixo) subResp "); + + sb.append(" join alias_servico ase ON ( subResp.localorigem = ase.origen_id AND subResp.localdestino = ase.destino_id and ase.ruta_id = subResp.ruta_id) "); + + sb.append(" ORDER BY subResp.antt, "); + sb.append(" subResp.prefixo ) subAlias "); + + sb.append(" join parada po ON ( subAlias.aliasorigen = po.parada_id ) "); + sb.append(" join parada pd ON ( subAlias.aliasdestino = pd.parada_id ) "); + + sb.append(" WHERE po.codantt <> pd.codantt "); + + sb.append(" GROUP BY antt, "); + sb.append(" prefixo, "); + sb.append(" po.codantt, "); + sb.append(" pd.codantt , "); + sb.append(" indIda "); + sb.append(" ORDER BY antt, "); + sb.append(" prefixo, "); + sb.append(" localOrigem, "); + sb.append(" localDestino "); + + QueryRunner queryRunner = new QueryRunner(dataSourceRead, true); + ResultSetHandler> handler = new BeanListHandler(PrefixoAntt.class); + + List returnedList = new ArrayList(); + + try { + returnedList = queryRunner.query(sb.toString(), handler, empresaId); + } catch (SQLException e) { + log.error("",e); + } + return returnedList; + } + + @Override + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, + List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, + List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, + List pesquisaGratuidadeEstudante, List pesquisaGratuidadeProfessor) { + + List listResultConsulta = consultaMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaDescontoIdoso, pesquisaGratuidadeIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem, + pesquisaGratuidadeEstudante, pesquisaGratuidadeProfessor); + List listResultIdaVoltaInvertida = new ArrayList(); + List listVoltasSemIda = new ArrayList(); + + for (MovimentoSecoes ms : listResultConsulta) { + + Boolean achou = Boolean.FALSE; + if(isIda(ms)) { + for (MovimentoSecoes ms2 : listResultConsulta) { + if(ms != null && ms2 != null && ms.getLocalOrigem() != null && ms2.getLocalOrigem() != null && + ms.getLocalOrigem().equals(ms2.getLocalDestino()) && ms2.getLocalOrigem().equals(ms.getLocalDestino()) && !isIda(ms2) && ms2.getPrefixo().equals(ms.getPrefixo())) { + ms.setDescontoIdosoVolta(ms2.getDescontoIdosoVolta()); + ms.setGratuidadeIdosoVolta(ms2.getGratuidadeIdosoVolta()); + ms.setGratuidadePasseLivreVolta(ms2.getGratuidadePasseLivreVolta()); + ms.setPassageirosVolta(ms2.getPassageirosVolta()); + ms.setGratuidadeJovenVolta(ms2.getGratuidadeJovenVolta()); + ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); + ms.setDescontoJovenVolta(ms2.getGratuidadeJovenVolta()); + ms.setGratuidadeEstudanteIda(ms2.getGratuidadeEstudanteIda()); + ms.setGratuidadeEstudanteVolta(ms2.getGratuidadeEstudanteVolta()); + ms.setGratuidadeProfessorIda(ms2.getGratuidadeProfessorIda()); + ms.setGratuidadeProfessorVolta(ms2.getGratuidadeProfessorVolta()); + listResultIdaVoltaInvertida.add(ms); + achou = Boolean.TRUE; + break; + } + } + + if(!achou) { + listResultIdaVoltaInvertida.add(ms); + } + } else { + listVoltasSemIda.add(ms); + } + } + + for (MovimentoSecoes volta : listVoltasSemIda) { + + Boolean achou = Boolean.FALSE; + + for (MovimentoSecoes idaVolta : listResultIdaVoltaInvertida) { + if(idaVolta != null && idaVolta.getLocalOrigem() != null && volta != null && volta.getLocalOrigem() != null && volta.getPrefixo() != null && + idaVolta.getLocalOrigem().equals(volta.getLocalDestino()) && volta.getLocalOrigem().equals(idaVolta.getLocalDestino()) && volta.getPrefixo().equals(idaVolta.getPrefixo())) { + achou = Boolean.TRUE; + break; + } + } + + if(!achou) { + String origem = volta.getLocalOrigem(); + String destino = volta.getLocalDestino(); + + volta.setLocalDestino(origem); + volta.setLocalOrigem(destino); + listResultIdaVoltaInvertida.add(volta); + } + } + + List periodos = new ArrayList(); + for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { + String periodo = ms.getAno() + HYPHEN + ms.getMes(); + if (!periodos.contains(periodo)) { + periodos.add(periodo); + } + } + + List prefixos = buscaPrefixoEmpresaOrigenDestino(empresaId); + + HashMap> periodosPrefixos = new HashMap>(); + for (String pd : periodos) { + periodosPrefixos.put(pd, prefixos); + } + + for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { + String periodo = ms.getAno() + HYPHEN + ms.getMes(); + + PrefixoAntt prefixoAntt = new PrefixoAntt(); + prefixoAntt.setAntt(ms.getAntt()); + prefixoAntt.setPrefixo(ms.getPrefixo()); + prefixoAntt.setLocalDestino(ms.getLocalDestino()); + prefixoAntt.setLocalOrigem(ms.getLocalOrigem()); + + if (periodosPrefixos.get(periodo).contains(prefixoAntt)) { + periodosPrefixos.get(periodo).remove(prefixoAntt); + } + } + + for (String key : periodosPrefixos.keySet()) { + String[] periodo = key.split(HYPHEN); + Integer ano = Integer.parseInt(periodo[0]); + Integer mes = Integer.parseInt(periodo[1]); + + for (PrefixoAntt prefixoAntt : periodosPrefixos.get(key)) { + MovimentoSecoes ms = new MovimentoSecoes(); + ms.setAno(ano); + ms.setMes(mes); + + ms.setAntt(prefixoAntt.getAntt()); + ms.setPrefixo(prefixoAntt.getPrefixo()); + ms.setLocalDestino(prefixoAntt.getLocalDestino()); + ms.setLocalOrigem(prefixoAntt.getLocalOrigem()); + + ms.setDescontoIdosoIda(NumberUtils.INTEGER_ZERO); + ms.setDescontoIdosoVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeIdosoIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeIdosoVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeJovenIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeJovenVolta(NumberUtils.INTEGER_ZERO); + ms.setDescontoJovenIda(NumberUtils.INTEGER_ZERO); + ms.setDescontoJovenVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadePasseLivreIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadePasseLivreVolta(NumberUtils.INTEGER_ZERO); + ms.setPassageirosIda(NumberUtils.INTEGER_ZERO); + ms.setPassageirosVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeEstudanteIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeEstudanteVolta(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeProfessorIda(NumberUtils.INTEGER_ZERO); + ms.setGratuidadeProfessorVolta(NumberUtils.INTEGER_ZERO); + + + listResultIdaVoltaInvertida.add(ms); + } + } + + Collections.sort(listResultIdaVoltaInvertida, new Comparator() { + public int compare(Object o1, Object o2) { + MovimentoSecoes c1 = (MovimentoSecoes) o1; + MovimentoSecoes c2 = (MovimentoSecoes) o2; + + int result = c1.getAno().compareTo(c2.getAno()); + if (result == 0) { + result = c1.getMes().compareTo(c2.getMes()); + } + if (result == 0) { + result = c1.getAntt().compareToIgnoreCase(c2.getAntt()); + } + if (result == 0) { + return c1.getPrefixo().compareToIgnoreCase(c2.getPrefixo()); + } + if (result == 0) { + return c1.getLocalOrigem().compareToIgnoreCase(c2.getLocalOrigem()); + } + if (result == 0) { + return c1.getLocalDestino().compareToIgnoreCase(c2.getLocalDestino()); + } + return result; + } + }); + + List movimentosSecoes = new ArrayList(); + movimentosSecoes.add("empresa;prefixo;local_origem;local_destino;mes;ano;passageiro_ida;passageiro_volta;gratuidade_ida;gratuidade_volta;idoso_ida;idoso_volta;desconto_ida;desconto_volta;gratuidade_jovem_ida;gratuidade_jovem_volta;gratuidade_jovem_desconto_ida;gratuidade_jovem_desconto_volta;gratuidade_estudante_ida;gratuidade_estudante_volta;gratuidade_professoe_ida;gratuidade_professor_volta"); + + + for (MovimentoSecoes ms : listResultIdaVoltaInvertida) { + movimentosSecoes.add(ms.toString()); + } + + return movimentosSecoes; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SolicitudExpresosHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SolicitudExpresosHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/SolicitudExpresosHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/SolicitudExpresosHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/StatusSolicitudExpresosHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/StatusSolicitudExpresosHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/StatusSolicitudExpresosHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/StatusSolicitudExpresosHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHistHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHistHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHistHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHistHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java index 30ee055b1..876a44a90 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TarifaKmDAO; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.TarifaKm; - -/** -* -* @author daniel.zauli -*/ -@Repository("tarifaKmDAO") -public class TarifaKmHibernateDAO extends GenericHibernateDAO -implements TarifaKmDAO { - - @Autowired - public TarifaKmHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("orgaoconcedenteId", orgaoconcedenteId)); - if( claseId.getClaseservicioId() != -1){ - c.add(Restrictions.eq("claseServicio", claseId)); - } - - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TarifaKmDAO; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.TarifaKm; + +/** +* +* @author daniel.zauli +*/ +@Repository("tarifaKmDAO") +public class TarifaKmHibernateDAO extends GenericHibernateDAO +implements TarifaKmDAO { + + @Autowired + public TarifaKmHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("orgaoconcedenteId", orgaoconcedenteId)); + if( claseId.getClaseservicioId() != -1){ + c.add(Restrictions.eq("claseServicio", claseId)); + } + + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java index 1cf52a21e..7e59423f2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java @@ -1,611 +1,611 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.Hibernate; -import org.hibernate.Query; -import org.hibernate.SQLQuery; -import org.hibernate.SessionFactory; -import org.hibernate.transform.Transformers; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.dao.TarifaOficialDAO; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TarifaOficial; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialComComposicaoDoPedagioVo; -import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialVO; - -@Repository("tarifaOficialDAO") -public class TarifaOficialHibernateDAO extends GenericHibernateDAO implements TarifaOficialDAO { - - private static Logger log = LogManager.getLogger(TarifaOficialHibernateDAO.class); - - @Autowired - private SQLBuilder sqlBuilder; - - @Autowired - public TarifaOficialHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public Integer gerarTarifaPorCoeficiente(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedente, List idsEmpresas, Integer[] lsCasetaPeaje) { - - String sql = sqlBuilder.getSQLGerarTarifaOficial(rutaId, usuarioId, orgaoConcedente, idsEmpresas,lsCasetaPeaje); - - int qtd = getSession().createSQLQuery(sql).executeUpdate(); - - return qtd; - } - - @Override - public Integer gerarTarifaArtesp(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas) { - - String sql = sqlBuilder.getSQLGerarTarifaOficialArtesp(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas); - - int qtd = getSession().createSQLQuery(sql).executeUpdate(); - - return qtd; - } - - @Override - public Integer gerarTabelaZerada(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,ListlsParadaId) { - - String sql = sqlBuilder.getSQLGerarTabelaZerada(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaId); - - int qtd = getSession().createSQLQuery(sql).executeUpdate(); - - return qtd; - } - - @Override - public Integer atualizarTarifaCoeficiente(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedente) { - - String sql = sqlBuilder.getSQLAtualizarTarifaOficial(rutaId, usuarioId, orgaoConcedente); - - int qtd = getSession().createSQLQuery(sql).executeUpdate(); - - return qtd; - } - - @Override - public void limparTarifasOficiais(List lsEmpresaSelected) { - - String query = "DELETE FROM TarifaOficial "; - if (lsEmpresaSelected != null && !lsEmpresaSelected.isEmpty()) { - query += "WHERE tarifaOficialId IN ( "; - query += " SELECT t.tarifaOficialId FROM TarifaOficial t WHERE t.marca.empresa.empresaId IN ("; - for (Empresa e : lsEmpresaSelected) { - query += e.getEmpresaId() + ","; - } - query = query.substring(0, query.length() - 1); - query += "))"; - } - Query q = getSession().createQuery(query); - q.executeUpdate(); - } - - private void apagarTarifasInativas(VigenciaTarifa vigenciaTarifa, Empresa empresa, OrgaoConcedente orgao) { - StringBuilder sb = new StringBuilder(""); - sb.append("select "); - sb.append(" tar.tarifaId "); - sb.append("from "); - sb.append(" Tarifa tar,TarifaOficial tao "); - sb.append("where "); - sb.append(" tar.activo=0 "); - sb.append(" and tao.activo = 1 "); - sb.append(" and tar.tramo=tao.tramo "); - sb.append(" and tar.marca=tao.marca "); - sb.append(" and tar.claseServicio =tao.claseServicio "); - sb.append(" and tar.moneda=tao.moneda "); - sb.append(" and tar.orgaoConcedente=tao.orgaoConcedente "); - sb.append(" and tar.ruta=tao.ruta "); - sb.append(" and tar.vigenciaTarifa.vigenciatarifaId = :vigenciaId "); - - if (orgao != null) { - sb.append(" and tar.orgaoConcedente = :orgao "); - } - if (empresa != null) { - sb.append(" and tar.marca.empresa = :empresa "); - } - - Query query = getSession().createQuery("DELETE FROM TarifaTipoptovta WHERE tarifa.tarifaId in (" + sb.toString() + ")"); - query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); - - if (orgao != null) { - query.setParameter("orgao", orgao); - } - if (empresa != null) { - query.setParameter("empresa", empresa); - } - - int qtd = query.executeUpdate(); - log.info("qtd TarifaTipoptovta apagada = " + qtd); - - query = getSession().createQuery("DELETE FROM TarifaCategoria WHERE tarifa.tarifaId in (" + sb.toString() + ")"); - query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); - if (orgao != null) { - query.setParameter("orgao", orgao); - } - if (empresa != null) { - query.setParameter("empresa", empresa); - } - - qtd = query.executeUpdate(); - log.info("qtd TarifaCategoria apagada = " + qtd); - - query = getSession().createQuery("DELETE FROM Tarifa WHERE activo = 0 and tarifaId in (" + sb.toString() + ")"); - query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); - if (orgao != null) { - query.setParameter("orgao", orgao); - } - if (empresa != null) { - query.setParameter("empresa", empresa); - } - - qtd = query.executeUpdate(); - log.info("qtd Tarifa apagada = " + qtd); - } - - @SuppressWarnings("unchecked") - @Override - public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente) { - // Apago antes as tarifas que podem estar como activo =0 - apagarTarifasInativas(vigenciaTarifa, empresa, orgaoConcedente); - - // Insiro as tarifas que não existem - SQLQuery querySQL = getSession().createSQLQuery(sqlBuilder.getSQLInserirTarifaPelaTarifaOficial(vigenciaTarifa.getVigenciatarifaId(), usuarioId, empresa, orgaoConcedente)); - querySQL.executeUpdate(); - // Atualizo o preço e o componente dos preços que já existem - querySQL = getSession().createSQLQuery(sqlBuilder.getSQLSelecionarTarifaPorTarifaOficalParaAtualizar(vigenciaTarifa.getVigenciatarifaId(), empresa, orgaoConcedente)); - querySQL.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - List> dados = querySQL.list(); - for (Map dado : dados) { - querySQL = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTarifaPorTarifaOfical(dado, usuarioId, calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP)); - querySQL.executeUpdate(); - } - - if (Boolean.TRUE.equals(calculaEmbarcada)) { - copiarParaTarifaEmbarcada(vigenciaTarifa, usuarioId, calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP, calculaEmbarcada, empresa, orgaoConcedente); - } - } - - @SuppressWarnings("unchecked") - private void copiarParaTarifaEmbarcada(VigenciaTarifa vigenciaTarifa, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente) { - // Apago antes as tarifas embarcadas que podem estar como activo =0 - apagarTarifasEmbarcadasInativas(vigenciaTarifa, empresa, orgaoConcedente); - - // Insiro as tarifas embarcadas que não existem - SQLQuery querySQL = getSession().createSQLQuery(sqlBuilder.getSQLInserirTarifaEmbarcadaPelaTarifaOficial(vigenciaTarifa.getVigenciatarifaId(), usuarioId, empresa, orgaoConcedente)); - querySQL.executeUpdate(); - - // Atualizo o preço e o componente dos preços que já existem - querySQL = getSession().createSQLQuery(sqlBuilder.getSQLSelecionarTarifaEmbarcadaPorTarifaOficalParaAtualizar(vigenciaTarifa.getVigenciatarifaId(), empresa, orgaoConcedente)); - querySQL.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - - List> dados = querySQL.list(); - - for (Map dado : dados) { - querySQL = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTarifaEmbarcadaPorTarifaOfical(dado, usuarioId, calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP)); - querySQL.executeUpdate(); - } - } - - @Override - public void atualizarTaxaEmbarque(List lsRuta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds) { - - int x = 0; - - if (lsRuta != null && !lsRuta.isEmpty()) { - x = lsRuta.size(); - } - - do { - Integer rutaId = null; - - if (lsRuta != null && !lsRuta.isEmpty()) { - rutaId = lsRuta.get(x - 1).getRutaId(); - } - - // Atualizo a taxa de embarque de acordo a parada e km - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getAtualizarTaxaEmbarquePorKmParada(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaIds)); - query.executeUpdate(); - - // Atualizo a taxa de embarque de acordo a km do orgao - query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTaxaEmbarquePorKmOrgao(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaIds)); - query.executeUpdate(); - - // Atualizo a taxa de embarque de acordo a parada e valor fixo - query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTaxaEmbarquePorParadaFixo(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaIds)); - query.executeUpdate(); - x--; - } while (x > 0); - } - - @Override - public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro) { - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarSeguroPorKm(rutaId, usuarioId, orgaoId, tipoSeguro)); - query.executeUpdate(); - } - - @Override - public void atualizarPrecioPorTPP(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro) { - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarPrecioPorTPP(rutaId, usuarioId, orgaoId, tipoSeguro)); - query.executeUpdate(); - } - - @Override - public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId, Integer usuarioId) { - SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarSeguroPorTarifa(rutaId, usuarioId, orgaoId)); - query.executeUpdate(); - } - - @Override - public long obtenerCount(List lsEmpresaSelected) { - String query = " select count(*) from TarifaOficial "; - if (lsEmpresaSelected != null && !lsEmpresaSelected.isEmpty()) { - query += "WHERE tarifaOficialId IN ( "; - query += " SELECT t.tarifaOficialId FROM TarifaOficial t WHERE t.marca.empresa.empresaId IN ("; - for (Empresa e : lsEmpresaSelected) { - query += e.getEmpresaId() + ","; - } - query = query.substring(0, query.length() - 1); - query += "))"; - } - - long qtd = 0; - Query q = getSession().createQuery(query); - - qtd = (Long) q.list().get(0); - - return qtd; - } - - @Override - public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Integer usuarioId, Boolean taxaEmbarque) { - StringBuilder sql = new StringBuilder(); - sql.append(" UPDATE TarifaOficial tao "); - sql.append(" SET tao.precio = FN_ARREDONDAMENTO_TARIFA(tao.precio,tao.orgaoConcedente.orgaoConcedenteId,tao.importeseguro,tao.importetaxaembarque,tao.importepedagio,tao.importeoutros,:txEmbarque), "); - sql.append(" tao.activo = true , "); - sql.append(" tao.fecmodif= CURRENT_TIMESTAMP(), "); - sql.append(" tao.usuarioId =:usuarioId "); - - if (orgaoConcedenteId != null) { - sql.append(" WHERE tao.orgaoConcedente.orgaoConcedenteId = :orgao "); - } - - Query query = getSession().createQuery(sql.toString()); - if (orgaoConcedenteId != null) { - query.setParameter("orgao", orgaoConcedenteId); - } - query.setInteger("txEmbarque", taxaEmbarque ? 1 : 0); - query.setParameter("usuarioId", usuarioId); - query.executeUpdate(); - } - - @Override - @SuppressWarnings("deprecation") - public void atualizarPedagio() { - StringBuilder sql = new StringBuilder(); - - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.ARTESP_PEDAGIO_IDA_VOLTA_DIV_POR2.getDescricao())) { - sql.append(" merge into tarifa_oficial "); - sql.append(" using "); - sql.append(" ( "); - sql.append(" WITH tarifas_ofic as ( "); - sql.append(" select tarifaoficial_id, ORGAOCONCEDENTE_ID, ruta_id , origen_id , DESTINO_ID, MARCA_ID from tarifa_oficial where activo = 1"); - sql.append(" ), "); - - sql.append(" noArtesp as (select p.destino_id dest, p.origen_id as orig , p.ruta_id as idruta ,p.orgaoconcedente_id as idorgao, "); - sql.append(" p.importepeaje as importe , p.activo as actv, m.marca_id as marca from peaje p inner join tarifas_ofic tof on "); - sql.append(" p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID and p.ruta_id = tof.ruta_id "); - sql.append(" and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1 "); - sql.append(" inner join ruta_empresa re on p.ruta_id=re.ruta_id "); - sql.append(" inner join marca m on m.marca_id=tof.marca_id where re.empresa_id=m.empresa_id), "); - - sql.append(" linha as ( select * from ruta where ruta_id in (select ruta_id from tarifas_ofic ) ) , "); - sql.append(" linha_voltaId as (select ru.ruta_id rutavolta_id, t_1.ruta_id as ida from ruta ru "); - sql.append(" inner join linha t_1 on ru.prefixo like t_1.prefixo "); - sql.append(" and ru.orgaoconcedente_id = t_1.orgaoconcedente_id "); - sql.append(" and ru.indsentidoIda <> t_1.indsentidoIda "); - sql.append(" and ( (ru.numruta like t_1.numruta) or (ru.numruta like (to_char(to_Number(t_1.numruta)+1))) ) "); - sql.append(" and ru.ruta_id <> t_1.ruta_id "); - sql.append(" and ru.claseservicio_id = t_1.claseservicio_id "); - sql.append(" where ru.activo = 1), "); - - sql.append(" artesp as ( "); - sql.append(" SELECT * "); - sql.append(" FROM peaje p "); - sql.append(" INNER JOIN tarifas_ofic tof "); - sql.append(" ON p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID "); - sql.append(" AND p.ruta_id = tof.ruta_id "); - sql.append(" AND p.ORIGEN_ID = tof.ORIGEN_ID "); - sql.append(" AND p.DESTINO_ID = tof.DESTINO_ID "); - sql.append(" AND p.activo = 1 "); - - sql.append(" union "); - - sql.append(" SELECT * "); - sql.append(" FROM peaje p "); - sql.append(" INNER JOIN tarifas_ofic tof "); - sql.append(" ON p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID "); - sql.append(" AND p.ruta_id = (select rutavolta_id from linha_voltaId where linha_voltaId.ida = tof.ruta_id) "); - sql.append(" AND p.DESTINO_ID = tof.ORIGEN_ID "); - sql.append(" AND p.ORIGEN_ID = tof.DESTINO_ID "); - sql.append(" AND p.activo = 1 "); - sql.append(" AND p.ruta_id = (select rutavolta_id from linha_voltaId where linha_voltaId.ida = tof.ruta_id) "); - sql.append(" ) , "); - sql.append(" resultado as ( "); - sql.append(" select distinct tof.tarifaoficial_id tarifaoficial_id, tof.ruta_id as ruta, "); - sql.append(" ( case tof.orgaoconcedente_id "); - sql.append(" when 21 then ( select (sum(round(importepeaje,2))/2) from artesp ar where ar.tarifaoficial_id = tof.tarifaoficial_id ) "); - sql.append(" else ( select distinct sum(noar.importe) from noArtesp noar where noar.idorgao = tof.ORGAOCONCEDENTE_ID and noar.idruta = tof.ruta_id "); - sql.append(" and noar.ORIG = tof.ORIGEN_ID and noar.DEST = tof.DESTINO_ID and noar.actv = 1 ) "); - sql.append(" end ) importepeaje from tarifas_ofic tof "); - sql.append(" ), "); - sql.append(" peaje_tarifas as ( select * from resultado ) "); - sql.append(" select pf.tarifaoficial_id , sum(round(importepeaje,2)) as soma from peaje_tarifas pf Group by pf.tarifaoficial_id "); - sql.append(" "); - sql.append(" ) tarifa_importe "); - sql.append(" on (tarifa_oficial.tarifaoficial_id = tarifa_importe.tarifaoficial_id) "); - sql.append(" when matched then "); - sql.append(" update set "); - sql.append(" importepedagio = tarifa_importe.soma "); - } else { - sql.append(" merge into tarifa_oficial "); - sql.append(" using "); - sql.append(" ( "); - sql.append(" WITH tarifas_ofic as ( "); - sql.append(" select tarifaoficial_id, ORGAOCONCEDENTE_ID, ruta_id , origen_id , DESTINO_ID from tarifa_oficial "); - sql.append(" ), "); - sql.append(" peaje_tarifas as ( "); - sql.append(" select * from peaje p inner join tarifas_ofic tof on "); - sql.append(" p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID and p.ruta_id = tof.ruta_id "); - sql.append(" and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1 "); - sql.append(" ) "); - sql.append(" select pf.tarifaoficial_id , sum(round(importepeaje,2)) as soma,"); - sql.append(" LISTAGG(casetapeaje_id||';'||peaje_id,',') WITHIN GROUP (ORDER BY casetapeaje_id) as composicaoDoPeaje "); - sql.append(" from peaje_tarifas pf Group by pf.tarifaoficial_id "); - sql.append(" "); - sql.append(" ) tarifa_importe "); - sql.append(" on (tarifa_oficial.tarifaoficial_id = tarifa_importe.tarifaoficial_id) "); - sql.append(" when matched then "); - sql.append(" update set "); - sql.append(" composicao_do_peaje = tarifa_importe.composicaoDoPeaje,"); - sql.append(" importepedagio = tarifa_importe.soma "); - - } - - Connection conn = getSession().connection(); - Statement stmt; - try { - stmt = conn.createStatement(); - stmt.executeUpdate(sql.toString()); - } catch (SQLException e) { - e.printStackTrace(); - log.error("Erro na atualização do pedágio"); - } - } - - @Override - public List obterTarifaOficialPorFiltroVO(Moneda moneda, Marca marca, List lsMarcas, Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende) { - // TODO Auto-generated method stub - - StringBuilder sql = new StringBuilder(" SELECT "); - sql.append(" t.tarifaoficial_id tarifaoficialid,"); - sql.append(" t.PRECIO precio,"); - sql.append(" t.PRECIOORIGINAL preciooriginal,"); - sql.append(" t.IMPORTEPEDAGIO importepedagio,"); - sql.append(" t.IMPORTETAXAEMBARQUE importetaxaembarque,"); - sql.append(" t.IMPORTESEGURO importeseguro,"); - sql.append(" t.IMPORTETPP importetpp,"); - sql.append(" t.IMPORTEOUTROS importeoutros,"); - sql.append(" origem.DESCPARADA descparadaOrigem,"); - sql.append(" destino.DESCPARADA descparadaDestino,"); - sql.append(" via.NOMBVIA nomeVia,"); - sql.append(" ma.DESCMARCA descMarca,"); - sql.append(" cl.DESCCLASE descclasse,"); - sql.append(" oc.DESCORGAO descorgao,"); - sql.append(" r.prefixo rutaprefixo,"); - sql.append(" r.numruta numruta"); - sql.append(" FROM TARIFA_OFICIAL t"); - sql.append(" LEFT JOIN TRAMO tr on (tr.TRAMO_ID = t.TRAMO_ID)"); - sql.append(" LEFT JOIN ruta r ON ( r.ruta_id = t.ruta_id )"); - sql.append(" LEFT JOIN VIA via on (VIA.VIA_ID=tr.VIA_ID)"); - sql.append(" LEFT JOIN PARADA origem on (origem.PARADA_ID=tr.ORIGEN_ID)"); - sql.append(" LEFT JOIN PARADA destino on (destino.PARADA_ID=tr.DESTINO_ID)"); - sql.append(" LEFT JOIN MARCA ma on (ma.MARCA_ID = t.MARCA_ID)"); - sql.append(" LEFT JOIN CLASE_SERVICIO cl ON (cl.CLASESERVICIO_ID=t.CLASESERVICIO_ID)"); - sql.append(" LEFT JOIN ORGAO_CONCEDENTE oc ON (oc.ORGAOCONCEDENTE_ID=t.ORGAOCONCEDENTE_ID)"); - - if (vende != null) { - sql.append(" LEFT JOIN RUTA_COMBINACION rc on (rc.tramo_id = tr.tramo_id)"); - } - sql.append(" WHERE "); - sql.append(" t.activo=1 "); - if (moneda != null) { - sql.append(" and t.moneda_id=" + moneda.getMonedaId()); - } - if (marca != null) { - sql.append(" and t.marca_id=" + marca.getMarcaId()); - } else { - String stringMarca =" and t.marca_id in ("; - int contador =0; - for(Marca m:lsMarcas){ - if(contador==0){ - stringMarca=stringMarca+m.getMarcaId().toString(); - }else{ - stringMarca=stringMarca+","+m.getMarcaId(); - } - contador++; - if(lsMarcas.size()==contador){ - stringMarca=stringMarca+")"; - } - } - sql.append(stringMarca); - - } - if (ruta != null) { - sql.append(" and t.ruta_id=" + ruta.getRutaId()); - } - if (numRuta != null) { - sql.append(" and r.numruta=" + numRuta); - } - if (origem != null) { - sql.append(" and origem.parada_id=" + origem.getParadaId()); - } - if (destino != null) { - sql.append(" and destino.parada_id=" + destino.getParadaId()); - } - if (claseServicio != null) { - sql.append(" and t.claseservicio_id=" + claseServicio.getClaseservicioId()); - } - - if (vende != null) { - int simNao = vende ? 1 : 0; - sql.append(" and rc.tramo_id=t.tramo_id and rc.ruta_id=t.ruta_id and rc.activo=1 and rc.INDVENTA=" + simNao); - } - - Query qr = getSession().createSQLQuery(sql.toString()).addScalar("tarifaoficialid", Hibernate.INTEGER).addScalar("precio", Hibernate.BIG_DECIMAL).addScalar("preciooriginal", Hibernate.BIG_DECIMAL).addScalar("importepedagio", Hibernate.BIG_DECIMAL).addScalar("importetaxaembarque", Hibernate.BIG_DECIMAL).addScalar("importeseguro", Hibernate.BIG_DECIMAL).addScalar("importetpp", Hibernate.BIG_DECIMAL).addScalar("importeoutros", Hibernate.BIG_DECIMAL).addScalar("descparadaorigem", Hibernate.STRING).addScalar("descparadadestino", Hibernate.STRING).addScalar("nomevia", Hibernate.STRING).addScalar("descmarca", Hibernate.STRING).addScalar("descclasse", Hibernate.STRING).addScalar("descorgao", Hibernate.STRING).addScalar("rutaprefixo", Hibernate.STRING).addScalar("numruta", Hibernate.STRING).setResultTransformer(Transformers.aliasToBean(TarifaOficialVO.class)); - - return (List) qr.list(); - } - - private void apagarTarifasEmbarcadasInativas(VigenciaTarifa vigenciaTarifa, Empresa empresa, OrgaoConcedente orgao) { - StringBuilder sb = new StringBuilder(""); - sb.append("select "); - sb.append(" tar.tarifaembarcadaId "); - sb.append("from "); - sb.append(" TarifaEmbarcada tar,TarifaOficial tao "); - sb.append("where "); - sb.append(" tar.activo=0 "); - sb.append(" and tao.activo = 1 "); - sb.append(" and tar.tramo=tao.tramo "); - sb.append(" and tar.marca=tao.marca "); - sb.append(" and tar.claseServicio =tao.claseServicio "); - sb.append(" and tar.moneda=tao.moneda "); - sb.append(" and tar.orgaoConcedente=tao.orgaoConcedente "); - sb.append(" and tar.ruta=tao.ruta "); - sb.append(" and tar.vigenciaTarifa.vigenciatarifaId = :vigenciaId "); - - if (orgao != null) { - sb.append(" and tar.orgaoConcedente = :orgao "); - } - if (empresa != null) { - sb.append(" and tar.marca.empresa = :empresa "); - } - - Query query = getSession().createQuery("DELETE FROM TarifaEmbarcada WHERE activo = 0 and tarifaembarcadaId in (" + sb.toString() + ")"); - query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); - if (orgao != null) { - query.setParameter("orgao", orgao); - } - if (empresa != null) { - query.setParameter("empresa", empresa); - } - - int qtd = query.executeUpdate(); - log.info("qtd Tarifa Embarcada apagada = " + qtd); - } - - @Override - public List oberTarifaOficialComComposicaoDoPedagioVo(Integer empresaId) { - StringBuilder sql = new StringBuilder(" SELECT "); - sql.append(" tof.tarifaoficial_id as tarifaOficialId, "); - sql.append(" ta.COMPOSICAO_DO_PEAJE as composicaoDoPedagioNaTarifa, "); - sql.append(" LISTAGG(p.casetapeaje_id||';'||p.peaje_id,',')\r\n" - + "WITHIN GROUP (ORDER BY p.casetapeaje_id) as composicaoDoPedagioNaTarifaOficialComPeaje"); - sql.append(" FROM tarifa_oficial tof "); - sql.append(" INNER JOIN marca m ON m.marca_id=tof.marca_id "); - sql.append(" INNER join tarifa ta on "); - sql.append(" ( tof.MARCA_ID = ta.MARCA_ID "); - sql.append(" AND tof.CLASESERVICIO_ID = ta.CLASESERVICIO_ID "); - sql.append(" AND tof.TRAMO_ID = ta.TRAMO_ID "); - sql.append(" AND tof.MONEDA_ID = ta.MONEDA_ID "); - sql.append(" AND tof.RUTA_ID = ta.RUTA_ID "); - sql.append(" AND tof.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); - sql.append(" AND tof.ACTIVO = 1 "); - sql.append(" AND ta.ACTIVO = 1 ) "); - - sql.append(" INNER JOIN VIGENCIA_TARIFA vg on ta.VIGENCIATARIFA_ID=vg.VIGENCIATARIFA_ID"); - sql.append(" and vg.FECINICIOVIGENCIA<= TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') "); - sql.append(" and vg.FECFINVIGENCIA>= TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi')"); - sql.append(" INNER JOIN PEAJE p"); - sql.append(" ON p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID"); - sql.append(" AND p.ruta_id= tof.ruta_id"); - sql.append(" AND p.ORIGEN_ID = tof.ORIGEN_ID"); - sql.append(" AND p.DESTINO_ID = tof.DESTINO_ID"); - sql.append(" AND p.activo = 1"); - sql.append(" AND m.empresa_id=:empresaId "); - sql.append(" AND m.activo = 1 "); - sql.append(" AND ta.ORIGEN_ID = tof.ORIGEN_ID "); - sql.append(" AND ta.DESTINO_ID = tof.DESTINO_ID "); - sql.append(" AND p.ORIGEN_ID = ta.ORIGEN_ID "); - sql.append(" AND p.DESTINO_ID = ta.DESTINO_ID "); - sql.append(" AND p.ruta_id= ta.ruta_id "); - sql.append(" AND p.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); - sql.append(" group by ta.tarifa_id,tof.tarifaoficial_id,ta.tarifa_id,ta.COMPOSICAO_DO_PEAJE"); - - Query query = getSession().createSQLQuery(sql.toString()); - - Query qr = getSession().createSQLQuery(sql.toString()).addScalar("tarifaOficialId", Hibernate.INTEGER).addScalar("composicaoDoPedagioNaTarifa", Hibernate.STRING).addScalar("composicaoDoPedagioNaTarifaOficialComPeaje", Hibernate.STRING).setResultTransformer(Transformers.aliasToBean(TarifaOficialComComposicaoDoPedagioVo.class)); - qr.setParameter("empresaId", empresaId); - qr.setParameter("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(new Date()), "dd/MM/yyyy HH:mm")); - qr.setParameter("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(new Date()), "dd/MM/yyyy HH:mm")); - - return (List) qr.list(); - - - - - } - - @Override - public void atualizarPedagioComFiltroDePracaDePedagio(Integer tarifaOficialId, BigDecimal importePedagio, String composicaoPedagio) { - StringBuilder sb = new StringBuilder(""); - sb.append("update tarifa_oficial set IMPORTEPEDAGIO =:importePedagio, "); - sb.append("COMPOSICAO_DO_PEAJE =:composicaoDoPedagio "); - sb.append("WHERE tarifaoficial_id=:tarifaOficialId"); - - Query query = getSession().createSQLQuery(sb.toString()); - query.setBigDecimal("importePedagio", importePedagio); - query.setString("composicaoDoPedagio", composicaoPedagio); - query.setInteger("tarifaOficialId", tarifaOficialId); - - query.executeUpdate(); - - } - - @Override - public void removerDuplicidadeNaTarifaOficial() { - String sql = sqlBuilder.getSqlRemoverDuplicidadeNaTarifaOficial(); - Query q = getSession().createSQLQuery(sql); - q.executeUpdate(); - } - - - - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Hibernate; +import org.hibernate.Query; +import org.hibernate.SQLQuery; +import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.dao.TarifaOficialDAO; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TarifaOficial; +import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialComComposicaoDoPedagioVo; +import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialVO; + +@Repository("tarifaOficialDAO") +public class TarifaOficialHibernateDAO extends GenericHibernateDAO implements TarifaOficialDAO { + + private static Logger log = LogManager.getLogger(TarifaOficialHibernateDAO.class); + + @Autowired + private SQLBuilder sqlBuilder; + + @Autowired + public TarifaOficialHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public Integer gerarTarifaPorCoeficiente(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedente, List idsEmpresas, Integer[] lsCasetaPeaje) { + + String sql = sqlBuilder.getSQLGerarTarifaOficial(rutaId, usuarioId, orgaoConcedente, idsEmpresas,lsCasetaPeaje); + + int qtd = getSession().createSQLQuery(sql).executeUpdate(); + + return qtd; + } + + @Override + public Integer gerarTarifaArtesp(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas) { + + String sql = sqlBuilder.getSQLGerarTarifaOficialArtesp(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas); + + int qtd = getSession().createSQLQuery(sql).executeUpdate(); + + return qtd; + } + + @Override + public Integer gerarTabelaZerada(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,ListlsParadaId) { + + String sql = sqlBuilder.getSQLGerarTabelaZerada(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaId); + + int qtd = getSession().createSQLQuery(sql).executeUpdate(); + + return qtd; + } + + @Override + public Integer atualizarTarifaCoeficiente(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedente) { + + String sql = sqlBuilder.getSQLAtualizarTarifaOficial(rutaId, usuarioId, orgaoConcedente); + + int qtd = getSession().createSQLQuery(sql).executeUpdate(); + + return qtd; + } + + @Override + public void limparTarifasOficiais(List lsEmpresaSelected) { + + String query = "DELETE FROM TarifaOficial "; + if (lsEmpresaSelected != null && !lsEmpresaSelected.isEmpty()) { + query += "WHERE tarifaOficialId IN ( "; + query += " SELECT t.tarifaOficialId FROM TarifaOficial t WHERE t.marca.empresa.empresaId IN ("; + for (Empresa e : lsEmpresaSelected) { + query += e.getEmpresaId() + ","; + } + query = query.substring(0, query.length() - 1); + query += "))"; + } + Query q = getSession().createQuery(query); + q.executeUpdate(); + } + + private void apagarTarifasInativas(VigenciaTarifa vigenciaTarifa, Empresa empresa, OrgaoConcedente orgao) { + StringBuilder sb = new StringBuilder(""); + sb.append("select "); + sb.append(" tar.tarifaId "); + sb.append("from "); + sb.append(" Tarifa tar,TarifaOficial tao "); + sb.append("where "); + sb.append(" tar.activo=0 "); + sb.append(" and tao.activo = 1 "); + sb.append(" and tar.tramo=tao.tramo "); + sb.append(" and tar.marca=tao.marca "); + sb.append(" and tar.claseServicio =tao.claseServicio "); + sb.append(" and tar.moneda=tao.moneda "); + sb.append(" and tar.orgaoConcedente=tao.orgaoConcedente "); + sb.append(" and tar.ruta=tao.ruta "); + sb.append(" and tar.vigenciaTarifa.vigenciatarifaId = :vigenciaId "); + + if (orgao != null) { + sb.append(" and tar.orgaoConcedente = :orgao "); + } + if (empresa != null) { + sb.append(" and tar.marca.empresa = :empresa "); + } + + Query query = getSession().createQuery("DELETE FROM TarifaTipoptovta WHERE tarifa.tarifaId in (" + sb.toString() + ")"); + query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); + + if (orgao != null) { + query.setParameter("orgao", orgao); + } + if (empresa != null) { + query.setParameter("empresa", empresa); + } + + int qtd = query.executeUpdate(); + log.info("qtd TarifaTipoptovta apagada = " + qtd); + + query = getSession().createQuery("DELETE FROM TarifaCategoria WHERE tarifa.tarifaId in (" + sb.toString() + ")"); + query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); + if (orgao != null) { + query.setParameter("orgao", orgao); + } + if (empresa != null) { + query.setParameter("empresa", empresa); + } + + qtd = query.executeUpdate(); + log.info("qtd TarifaCategoria apagada = " + qtd); + + query = getSession().createQuery("DELETE FROM Tarifa WHERE activo = 0 and tarifaId in (" + sb.toString() + ")"); + query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); + if (orgao != null) { + query.setParameter("orgao", orgao); + } + if (empresa != null) { + query.setParameter("empresa", empresa); + } + + qtd = query.executeUpdate(); + log.info("qtd Tarifa apagada = " + qtd); + } + + @SuppressWarnings("unchecked") + @Override + public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente) { + // Apago antes as tarifas que podem estar como activo =0 + apagarTarifasInativas(vigenciaTarifa, empresa, orgaoConcedente); + + // Insiro as tarifas que não existem + SQLQuery querySQL = getSession().createSQLQuery(sqlBuilder.getSQLInserirTarifaPelaTarifaOficial(vigenciaTarifa.getVigenciatarifaId(), usuarioId, empresa, orgaoConcedente)); + querySQL.executeUpdate(); + // Atualizo o preço e o componente dos preços que já existem + querySQL = getSession().createSQLQuery(sqlBuilder.getSQLSelecionarTarifaPorTarifaOficalParaAtualizar(vigenciaTarifa.getVigenciatarifaId(), empresa, orgaoConcedente)); + querySQL.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + List> dados = querySQL.list(); + for (Map dado : dados) { + querySQL = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTarifaPorTarifaOfical(dado, usuarioId, calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP)); + querySQL.executeUpdate(); + } + + if (Boolean.TRUE.equals(calculaEmbarcada)) { + copiarParaTarifaEmbarcada(vigenciaTarifa, usuarioId, calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP, calculaEmbarcada, empresa, orgaoConcedente); + } + } + + @SuppressWarnings("unchecked") + private void copiarParaTarifaEmbarcada(VigenciaTarifa vigenciaTarifa, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente) { + // Apago antes as tarifas embarcadas que podem estar como activo =0 + apagarTarifasEmbarcadasInativas(vigenciaTarifa, empresa, orgaoConcedente); + + // Insiro as tarifas embarcadas que não existem + SQLQuery querySQL = getSession().createSQLQuery(sqlBuilder.getSQLInserirTarifaEmbarcadaPelaTarifaOficial(vigenciaTarifa.getVigenciatarifaId(), usuarioId, empresa, orgaoConcedente)); + querySQL.executeUpdate(); + + // Atualizo o preço e o componente dos preços que já existem + querySQL = getSession().createSQLQuery(sqlBuilder.getSQLSelecionarTarifaEmbarcadaPorTarifaOficalParaAtualizar(vigenciaTarifa.getVigenciatarifaId(), empresa, orgaoConcedente)); + querySQL.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + + List> dados = querySQL.list(); + + for (Map dado : dados) { + querySQL = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTarifaEmbarcadaPorTarifaOfical(dado, usuarioId, calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP)); + querySQL.executeUpdate(); + } + } + + @Override + public void atualizarTaxaEmbarque(List lsRuta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds) { + + int x = 0; + + if (lsRuta != null && !lsRuta.isEmpty()) { + x = lsRuta.size(); + } + + do { + Integer rutaId = null; + + if (lsRuta != null && !lsRuta.isEmpty()) { + rutaId = lsRuta.get(x - 1).getRutaId(); + } + + // Atualizo a taxa de embarque de acordo a parada e km + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getAtualizarTaxaEmbarquePorKmParada(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaIds)); + query.executeUpdate(); + + // Atualizo a taxa de embarque de acordo a km do orgao + query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTaxaEmbarquePorKmOrgao(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaIds)); + query.executeUpdate(); + + // Atualizo a taxa de embarque de acordo a parada e valor fixo + query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarTaxaEmbarquePorParadaFixo(rutaId, usuarioId, orgaoConcedenteId, idsEmpresas,lsParadaIds)); + query.executeUpdate(); + x--; + } while (x > 0); + } + + @Override + public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro) { + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarSeguroPorKm(rutaId, usuarioId, orgaoId, tipoSeguro)); + query.executeUpdate(); + } + + @Override + public void atualizarPrecioPorTPP(Integer rutaId, Integer orgaoId, Integer usuarioId, TipoSeguro tipoSeguro) { + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarPrecioPorTPP(rutaId, usuarioId, orgaoId, tipoSeguro)); + query.executeUpdate(); + } + + @Override + public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId, Integer usuarioId) { + SQLQuery query = getSession().createSQLQuery(sqlBuilder.getSQLAtualizarSeguroPorTarifa(rutaId, usuarioId, orgaoId)); + query.executeUpdate(); + } + + @Override + public long obtenerCount(List lsEmpresaSelected) { + String query = " select count(*) from TarifaOficial "; + if (lsEmpresaSelected != null && !lsEmpresaSelected.isEmpty()) { + query += "WHERE tarifaOficialId IN ( "; + query += " SELECT t.tarifaOficialId FROM TarifaOficial t WHERE t.marca.empresa.empresaId IN ("; + for (Empresa e : lsEmpresaSelected) { + query += e.getEmpresaId() + ","; + } + query = query.substring(0, query.length() - 1); + query += "))"; + } + + long qtd = 0; + Query q = getSession().createQuery(query); + + qtd = (Long) q.list().get(0); + + return qtd; + } + + @Override + public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Integer usuarioId, Boolean taxaEmbarque) { + StringBuilder sql = new StringBuilder(); + sql.append(" UPDATE TarifaOficial tao "); + sql.append(" SET tao.precio = FN_ARREDONDAMENTO_TARIFA(tao.precio,tao.orgaoConcedente.orgaoConcedenteId,tao.importeseguro,tao.importetaxaembarque,tao.importepedagio,tao.importeoutros,:txEmbarque), "); + sql.append(" tao.activo = true , "); + sql.append(" tao.fecmodif= CURRENT_TIMESTAMP(), "); + sql.append(" tao.usuarioId =:usuarioId "); + + if (orgaoConcedenteId != null) { + sql.append(" WHERE tao.orgaoConcedente.orgaoConcedenteId = :orgao "); + } + + Query query = getSession().createQuery(sql.toString()); + if (orgaoConcedenteId != null) { + query.setParameter("orgao", orgaoConcedenteId); + } + query.setInteger("txEmbarque", taxaEmbarque ? 1 : 0); + query.setParameter("usuarioId", usuarioId); + query.executeUpdate(); + } + + @Override + @SuppressWarnings("deprecation") + public void atualizarPedagio() { + StringBuilder sql = new StringBuilder(); + + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.ARTESP_PEDAGIO_IDA_VOLTA_DIV_POR2.getDescricao())) { + sql.append(" merge into tarifa_oficial "); + sql.append(" using "); + sql.append(" ( "); + sql.append(" WITH tarifas_ofic as ( "); + sql.append(" select tarifaoficial_id, ORGAOCONCEDENTE_ID, ruta_id , origen_id , DESTINO_ID, MARCA_ID from tarifa_oficial where activo = 1"); + sql.append(" ), "); + + sql.append(" noArtesp as (select p.destino_id dest, p.origen_id as orig , p.ruta_id as idruta ,p.orgaoconcedente_id as idorgao, "); + sql.append(" p.importepeaje as importe , p.activo as actv, m.marca_id as marca from peaje p inner join tarifas_ofic tof on "); + sql.append(" p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID and p.ruta_id = tof.ruta_id "); + sql.append(" and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1 "); + sql.append(" inner join ruta_empresa re on p.ruta_id=re.ruta_id "); + sql.append(" inner join marca m on m.marca_id=tof.marca_id where re.empresa_id=m.empresa_id), "); + + sql.append(" linha as ( select * from ruta where ruta_id in (select ruta_id from tarifas_ofic ) ) , "); + sql.append(" linha_voltaId as (select ru.ruta_id rutavolta_id, t_1.ruta_id as ida from ruta ru "); + sql.append(" inner join linha t_1 on ru.prefixo like t_1.prefixo "); + sql.append(" and ru.orgaoconcedente_id = t_1.orgaoconcedente_id "); + sql.append(" and ru.indsentidoIda <> t_1.indsentidoIda "); + sql.append(" and ( (ru.numruta like t_1.numruta) or (ru.numruta like (to_char(to_Number(t_1.numruta)+1))) ) "); + sql.append(" and ru.ruta_id <> t_1.ruta_id "); + sql.append(" and ru.claseservicio_id = t_1.claseservicio_id "); + sql.append(" where ru.activo = 1), "); + + sql.append(" artesp as ( "); + sql.append(" SELECT * "); + sql.append(" FROM peaje p "); + sql.append(" INNER JOIN tarifas_ofic tof "); + sql.append(" ON p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID "); + sql.append(" AND p.ruta_id = tof.ruta_id "); + sql.append(" AND p.ORIGEN_ID = tof.ORIGEN_ID "); + sql.append(" AND p.DESTINO_ID = tof.DESTINO_ID "); + sql.append(" AND p.activo = 1 "); + + sql.append(" union "); + + sql.append(" SELECT * "); + sql.append(" FROM peaje p "); + sql.append(" INNER JOIN tarifas_ofic tof "); + sql.append(" ON p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID "); + sql.append(" AND p.ruta_id = (select rutavolta_id from linha_voltaId where linha_voltaId.ida = tof.ruta_id) "); + sql.append(" AND p.DESTINO_ID = tof.ORIGEN_ID "); + sql.append(" AND p.ORIGEN_ID = tof.DESTINO_ID "); + sql.append(" AND p.activo = 1 "); + sql.append(" AND p.ruta_id = (select rutavolta_id from linha_voltaId where linha_voltaId.ida = tof.ruta_id) "); + sql.append(" ) , "); + sql.append(" resultado as ( "); + sql.append(" select distinct tof.tarifaoficial_id tarifaoficial_id, tof.ruta_id as ruta, "); + sql.append(" ( case tof.orgaoconcedente_id "); + sql.append(" when 21 then ( select (sum(round(importepeaje,2))/2) from artesp ar where ar.tarifaoficial_id = tof.tarifaoficial_id ) "); + sql.append(" else ( select distinct sum(noar.importe) from noArtesp noar where noar.idorgao = tof.ORGAOCONCEDENTE_ID and noar.idruta = tof.ruta_id "); + sql.append(" and noar.ORIG = tof.ORIGEN_ID and noar.DEST = tof.DESTINO_ID and noar.actv = 1 ) "); + sql.append(" end ) importepeaje from tarifas_ofic tof "); + sql.append(" ), "); + sql.append(" peaje_tarifas as ( select * from resultado ) "); + sql.append(" select pf.tarifaoficial_id , sum(round(importepeaje,2)) as soma from peaje_tarifas pf Group by pf.tarifaoficial_id "); + sql.append(" "); + sql.append(" ) tarifa_importe "); + sql.append(" on (tarifa_oficial.tarifaoficial_id = tarifa_importe.tarifaoficial_id) "); + sql.append(" when matched then "); + sql.append(" update set "); + sql.append(" importepedagio = tarifa_importe.soma "); + } else { + sql.append(" merge into tarifa_oficial "); + sql.append(" using "); + sql.append(" ( "); + sql.append(" WITH tarifas_ofic as ( "); + sql.append(" select tarifaoficial_id, ORGAOCONCEDENTE_ID, ruta_id , origen_id , DESTINO_ID from tarifa_oficial "); + sql.append(" ), "); + sql.append(" peaje_tarifas as ( "); + sql.append(" select * from peaje p inner join tarifas_ofic tof on "); + sql.append(" p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID and p.ruta_id = tof.ruta_id "); + sql.append(" and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1 "); + sql.append(" ) "); + sql.append(" select pf.tarifaoficial_id , sum(round(importepeaje,2)) as soma,"); + sql.append(" LISTAGG(casetapeaje_id||';'||peaje_id,',') WITHIN GROUP (ORDER BY casetapeaje_id) as composicaoDoPeaje "); + sql.append(" from peaje_tarifas pf Group by pf.tarifaoficial_id "); + sql.append(" "); + sql.append(" ) tarifa_importe "); + sql.append(" on (tarifa_oficial.tarifaoficial_id = tarifa_importe.tarifaoficial_id) "); + sql.append(" when matched then "); + sql.append(" update set "); + sql.append(" composicao_do_peaje = tarifa_importe.composicaoDoPeaje,"); + sql.append(" importepedagio = tarifa_importe.soma "); + + } + + Connection conn = getSession().connection(); + Statement stmt; + try { + stmt = conn.createStatement(); + stmt.executeUpdate(sql.toString()); + } catch (SQLException e) { + e.printStackTrace(); + log.error("Erro na atualização do pedágio"); + } + } + + @Override + public List obterTarifaOficialPorFiltroVO(Moneda moneda, Marca marca, List lsMarcas, Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende) { + // TODO Auto-generated method stub + + StringBuilder sql = new StringBuilder(" SELECT "); + sql.append(" t.tarifaoficial_id tarifaoficialid,"); + sql.append(" t.PRECIO precio,"); + sql.append(" t.PRECIOORIGINAL preciooriginal,"); + sql.append(" t.IMPORTEPEDAGIO importepedagio,"); + sql.append(" t.IMPORTETAXAEMBARQUE importetaxaembarque,"); + sql.append(" t.IMPORTESEGURO importeseguro,"); + sql.append(" t.IMPORTETPP importetpp,"); + sql.append(" t.IMPORTEOUTROS importeoutros,"); + sql.append(" origem.DESCPARADA descparadaOrigem,"); + sql.append(" destino.DESCPARADA descparadaDestino,"); + sql.append(" via.NOMBVIA nomeVia,"); + sql.append(" ma.DESCMARCA descMarca,"); + sql.append(" cl.DESCCLASE descclasse,"); + sql.append(" oc.DESCORGAO descorgao,"); + sql.append(" r.prefixo rutaprefixo,"); + sql.append(" r.numruta numruta"); + sql.append(" FROM TARIFA_OFICIAL t"); + sql.append(" LEFT JOIN TRAMO tr on (tr.TRAMO_ID = t.TRAMO_ID)"); + sql.append(" LEFT JOIN ruta r ON ( r.ruta_id = t.ruta_id )"); + sql.append(" LEFT JOIN VIA via on (VIA.VIA_ID=tr.VIA_ID)"); + sql.append(" LEFT JOIN PARADA origem on (origem.PARADA_ID=tr.ORIGEN_ID)"); + sql.append(" LEFT JOIN PARADA destino on (destino.PARADA_ID=tr.DESTINO_ID)"); + sql.append(" LEFT JOIN MARCA ma on (ma.MARCA_ID = t.MARCA_ID)"); + sql.append(" LEFT JOIN CLASE_SERVICIO cl ON (cl.CLASESERVICIO_ID=t.CLASESERVICIO_ID)"); + sql.append(" LEFT JOIN ORGAO_CONCEDENTE oc ON (oc.ORGAOCONCEDENTE_ID=t.ORGAOCONCEDENTE_ID)"); + + if (vende != null) { + sql.append(" LEFT JOIN RUTA_COMBINACION rc on (rc.tramo_id = tr.tramo_id)"); + } + sql.append(" WHERE "); + sql.append(" t.activo=1 "); + if (moneda != null) { + sql.append(" and t.moneda_id=" + moneda.getMonedaId()); + } + if (marca != null) { + sql.append(" and t.marca_id=" + marca.getMarcaId()); + } else { + String stringMarca =" and t.marca_id in ("; + int contador =0; + for(Marca m:lsMarcas){ + if(contador==0){ + stringMarca=stringMarca+m.getMarcaId().toString(); + }else{ + stringMarca=stringMarca+","+m.getMarcaId(); + } + contador++; + if(lsMarcas.size()==contador){ + stringMarca=stringMarca+")"; + } + } + sql.append(stringMarca); + + } + if (ruta != null) { + sql.append(" and t.ruta_id=" + ruta.getRutaId()); + } + if (numRuta != null) { + sql.append(" and r.numruta=" + numRuta); + } + if (origem != null) { + sql.append(" and origem.parada_id=" + origem.getParadaId()); + } + if (destino != null) { + sql.append(" and destino.parada_id=" + destino.getParadaId()); + } + if (claseServicio != null) { + sql.append(" and t.claseservicio_id=" + claseServicio.getClaseservicioId()); + } + + if (vende != null) { + int simNao = vende ? 1 : 0; + sql.append(" and rc.tramo_id=t.tramo_id and rc.ruta_id=t.ruta_id and rc.activo=1 and rc.INDVENTA=" + simNao); + } + + Query qr = getSession().createSQLQuery(sql.toString()).addScalar("tarifaoficialid", Hibernate.INTEGER).addScalar("precio", Hibernate.BIG_DECIMAL).addScalar("preciooriginal", Hibernate.BIG_DECIMAL).addScalar("importepedagio", Hibernate.BIG_DECIMAL).addScalar("importetaxaembarque", Hibernate.BIG_DECIMAL).addScalar("importeseguro", Hibernate.BIG_DECIMAL).addScalar("importetpp", Hibernate.BIG_DECIMAL).addScalar("importeoutros", Hibernate.BIG_DECIMAL).addScalar("descparadaorigem", Hibernate.STRING).addScalar("descparadadestino", Hibernate.STRING).addScalar("nomevia", Hibernate.STRING).addScalar("descmarca", Hibernate.STRING).addScalar("descclasse", Hibernate.STRING).addScalar("descorgao", Hibernate.STRING).addScalar("rutaprefixo", Hibernate.STRING).addScalar("numruta", Hibernate.STRING).setResultTransformer(Transformers.aliasToBean(TarifaOficialVO.class)); + + return (List) qr.list(); + } + + private void apagarTarifasEmbarcadasInativas(VigenciaTarifa vigenciaTarifa, Empresa empresa, OrgaoConcedente orgao) { + StringBuilder sb = new StringBuilder(""); + sb.append("select "); + sb.append(" tar.tarifaembarcadaId "); + sb.append("from "); + sb.append(" TarifaEmbarcada tar,TarifaOficial tao "); + sb.append("where "); + sb.append(" tar.activo=0 "); + sb.append(" and tao.activo = 1 "); + sb.append(" and tar.tramo=tao.tramo "); + sb.append(" and tar.marca=tao.marca "); + sb.append(" and tar.claseServicio =tao.claseServicio "); + sb.append(" and tar.moneda=tao.moneda "); + sb.append(" and tar.orgaoConcedente=tao.orgaoConcedente "); + sb.append(" and tar.ruta=tao.ruta "); + sb.append(" and tar.vigenciaTarifa.vigenciatarifaId = :vigenciaId "); + + if (orgao != null) { + sb.append(" and tar.orgaoConcedente = :orgao "); + } + if (empresa != null) { + sb.append(" and tar.marca.empresa = :empresa "); + } + + Query query = getSession().createQuery("DELETE FROM TarifaEmbarcada WHERE activo = 0 and tarifaembarcadaId in (" + sb.toString() + ")"); + query.setParameter("vigenciaId", vigenciaTarifa.getVigenciatarifaId()); + if (orgao != null) { + query.setParameter("orgao", orgao); + } + if (empresa != null) { + query.setParameter("empresa", empresa); + } + + int qtd = query.executeUpdate(); + log.info("qtd Tarifa Embarcada apagada = " + qtd); + } + + @Override + public List oberTarifaOficialComComposicaoDoPedagioVo(Integer empresaId) { + StringBuilder sql = new StringBuilder(" SELECT "); + sql.append(" tof.tarifaoficial_id as tarifaOficialId, "); + sql.append(" ta.COMPOSICAO_DO_PEAJE as composicaoDoPedagioNaTarifa, "); + sql.append(" LISTAGG(p.casetapeaje_id||';'||p.peaje_id,',')\r\n" + + "WITHIN GROUP (ORDER BY p.casetapeaje_id) as composicaoDoPedagioNaTarifaOficialComPeaje"); + sql.append(" FROM tarifa_oficial tof "); + sql.append(" INNER JOIN marca m ON m.marca_id=tof.marca_id "); + sql.append(" INNER join tarifa ta on "); + sql.append(" ( tof.MARCA_ID = ta.MARCA_ID "); + sql.append(" AND tof.CLASESERVICIO_ID = ta.CLASESERVICIO_ID "); + sql.append(" AND tof.TRAMO_ID = ta.TRAMO_ID "); + sql.append(" AND tof.MONEDA_ID = ta.MONEDA_ID "); + sql.append(" AND tof.RUTA_ID = ta.RUTA_ID "); + sql.append(" AND tof.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); + sql.append(" AND tof.ACTIVO = 1 "); + sql.append(" AND ta.ACTIVO = 1 ) "); + + sql.append(" INNER JOIN VIGENCIA_TARIFA vg on ta.VIGENCIATARIFA_ID=vg.VIGENCIATARIFA_ID"); + sql.append(" and vg.FECINICIOVIGENCIA<= TO_DATE(:dataInicial,'DD/MM/YYYY hh24:mi') "); + sql.append(" and vg.FECFINVIGENCIA>= TO_DATE(:dataFinal,'DD/MM/YYYY hh24:mi')"); + sql.append(" INNER JOIN PEAJE p"); + sql.append(" ON p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID"); + sql.append(" AND p.ruta_id= tof.ruta_id"); + sql.append(" AND p.ORIGEN_ID = tof.ORIGEN_ID"); + sql.append(" AND p.DESTINO_ID = tof.DESTINO_ID"); + sql.append(" AND p.activo = 1"); + sql.append(" AND m.empresa_id=:empresaId "); + sql.append(" AND m.activo = 1 "); + sql.append(" AND ta.ORIGEN_ID = tof.ORIGEN_ID "); + sql.append(" AND ta.DESTINO_ID = tof.DESTINO_ID "); + sql.append(" AND p.ORIGEN_ID = ta.ORIGEN_ID "); + sql.append(" AND p.DESTINO_ID = ta.DESTINO_ID "); + sql.append(" AND p.ruta_id= ta.ruta_id "); + sql.append(" AND p.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); + sql.append(" group by ta.tarifa_id,tof.tarifaoficial_id,ta.tarifa_id,ta.COMPOSICAO_DO_PEAJE"); + + Query query = getSession().createSQLQuery(sql.toString()); + + Query qr = getSession().createSQLQuery(sql.toString()).addScalar("tarifaOficialId", Hibernate.INTEGER).addScalar("composicaoDoPedagioNaTarifa", Hibernate.STRING).addScalar("composicaoDoPedagioNaTarifaOficialComPeaje", Hibernate.STRING).setResultTransformer(Transformers.aliasToBean(TarifaOficialComComposicaoDoPedagioVo.class)); + qr.setParameter("empresaId", empresaId); + qr.setParameter("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(new Date()), "dd/MM/yyyy HH:mm")); + qr.setParameter("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(new Date()), "dd/MM/yyyy HH:mm")); + + return (List) qr.list(); + + + + + } + + @Override + public void atualizarPedagioComFiltroDePracaDePedagio(Integer tarifaOficialId, BigDecimal importePedagio, String composicaoPedagio) { + StringBuilder sb = new StringBuilder(""); + sb.append("update tarifa_oficial set IMPORTEPEDAGIO =:importePedagio, "); + sb.append("COMPOSICAO_DO_PEAJE =:composicaoDoPedagio "); + sb.append("WHERE tarifaoficial_id=:tarifaOficialId"); + + Query query = getSession().createSQLQuery(sb.toString()); + query.setBigDecimal("importePedagio", importePedagio); + query.setString("composicaoDoPedagio", composicaoPedagio); + query.setInteger("tarifaOficialId", tarifaOficialId); + + query.executeUpdate(); + + } + + @Override + public void removerDuplicidadeNaTarifaOficial() { + String sql = sqlBuilder.getSqlRemoverDuplicidadeNaTarifaOficial(); + Query q = getSession().createSQLQuery(sql); + q.executeUpdate(); + } + + + + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java index 753b14123..b6ab4630c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TarjetaCreditoDAO; -import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; - -@Repository("tarjetaCreditoDAO") -public class TarjetaCreditoHibernateDAO extends GenericHibernateDAO - implements TarjetaCreditoDAO { - - @Autowired - public TarjetaCreditoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("descTarjetaCredito")); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TarjetaCreditoDAO; +import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; + +@Repository("tarjetaCreditoDAO") +public class TarjetaCreditoHibernateDAO extends GenericHibernateDAO + implements TarjetaCreditoDAO { + + @Autowired + public TarjetaCreditoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("descTarjetaCredito")); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java index 7e8afeff2..288f0ba23 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java @@ -1,139 +1,139 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.zkoss.zul.Comboitem; - -import com.rjconsultores.ventaboletos.dao.TarjetaViajeDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; -import java.util.Calendar; -import java.util.GregorianCalendar; -import org.hibernate.criterion.Order; - -@Repository("tarjetaViajeDAO") -public class TarjetaViajeHibernateDAO extends GenericHibernateDAO implements TarjetaViajeDAO { - - @Autowired - public TarjetaViajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List buscarTarjetaPorFiltros(Integer autoIni, Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa) { - String hql = " select tv from TarjetaViaje tv " - + " where tv.tarjetaviajeId > 0 and activo = 1 "; - StringBuilder sb = new StringBuilder(); - if (autoIni != null && autoFin != null) { - sb.append(" and cast(tv.autobus.numautobus as int) <= ").append(autoFin); - sb.append(" and cast(tv.autobus.numautobus as int) >= ").append(autoIni); - } - if (dataFin != null && dataIni != null) { - sb.append(" and tv.fecHorSalida >= :dataIni"); - sb.append(" and tv.fecHorSalida <= :dataFin"); - } - if (empresa != null) { - Empresa e = (Empresa) empresa.getValue(); - if (e.getEmpresaId() != -1) { - sb.append(" and tv.empresa.empresaId = ").append(e.getEmpresaId()); - } - } - - sb.append(" order by cast(tv.autobus.numautobus as int), tv.fecHorSalida, tv.origen, tv.conductor.conductorId asc "); - - hql += sb.toString(); - - Query sq = getSession().createQuery(hql); - if (dataFin != null && dataIni != null) { - sq.setTimestamp("dataIni", dataIni); - sq.setTimestamp("dataFin", dataFin); - } - List lsTarjetas = sq.list(); - - return lsTarjetas; - } - - @Override - public List buscarTarjetaPorFiltros(TarjetaViaje tarjeta) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, true)); - c.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); - c.add(Restrictions.eq("origen", tarjeta.getOrigen())); - return c.list(); - } - - @Override - public boolean buscarTarjetaExisteVolta(TarjetaViaje tarjeta) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, true)); - c.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); - c.add(Restrictions.ge("fecHorSalida", tarjeta.getFecHorSalida())); - c.add(Restrictions.not(Restrictions.eq("tarjetaviajeId", tarjeta.getTarjetaviajeId()))); - c.addOrder(Order.asc("fecHorSalida")); - - c.setMaxResults(1); - - if (!c.list().isEmpty()) { - - TarjetaViaje tVResult = (TarjetaViaje) c.uniqueResult(); - if (tVResult.getOrigen().equals(tarjeta.getDestino()) - && tVResult.getDestino().equals(tarjeta.getOrigen())) { - return true; - } - } - - Criteria c1 = getSession().createCriteria(getPersistentClass()); - c1.add(Restrictions.eq(ACTIVO, true)); - c1.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); - c1.add(Restrictions.le("fecHorSalida", tarjeta.getFecHorSalida())); - c1.add(Restrictions.not(Restrictions.eq("tarjetaviajeId", tarjeta.getTarjetaviajeId()))); - c1.addOrder(Order.desc("fecHorSalida")); - c1.setMaxResults(1); - if (!c1.list().isEmpty()) { - TarjetaViaje tVResult = (TarjetaViaje) c1.uniqueResult(); - if (tVResult.getOrigen().equals(tarjeta.getDestino()) - && tVResult.getDestino().equals(tarjeta.getOrigen())) { - return true; - } - } - - - return false; - } - - @Override - public List buscarTarjetasParaEnvioNomina(Date fecIni, Date fecFin) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, true)); - c.add(Restrictions.isNull("fecenvionomina")); - - GregorianCalendar gAux = new GregorianCalendar(); - gAux.setTime(fecIni); - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(fecIni); - gcalendar.set(Calendar.HOUR_OF_DAY, 0); - gcalendar.set(Calendar.MINUTE, 0); - gcalendar.set(Calendar.SECOND, 0); - gcalendar.set(Calendar.MILLISECOND, 0); - fecIni = gcalendar.getTime(); - - GregorianCalendar gcalendarFim = new GregorianCalendar(); - gcalendarFim.setTime(fecFin); - gcalendarFim.set(Calendar.HOUR_OF_DAY, 23); - gcalendarFim.set(Calendar.MINUTE, 59); - gcalendarFim.set(Calendar.SECOND, 59); - gcalendarFim.set(Calendar.MILLISECOND, 59); - fecFin = gcalendarFim.getTime(); - - c.add(Restrictions.between("fecHorSalida", fecIni, fecFin)); - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.zkoss.zul.Comboitem; + +import com.rjconsultores.ventaboletos.dao.TarjetaViajeDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; +import java.util.Calendar; +import java.util.GregorianCalendar; +import org.hibernate.criterion.Order; + +@Repository("tarjetaViajeDAO") +public class TarjetaViajeHibernateDAO extends GenericHibernateDAO implements TarjetaViajeDAO { + + @Autowired + public TarjetaViajeHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List buscarTarjetaPorFiltros(Integer autoIni, Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa) { + String hql = " select tv from TarjetaViaje tv " + + " where tv.tarjetaviajeId > 0 and activo = 1 "; + StringBuilder sb = new StringBuilder(); + if (autoIni != null && autoFin != null) { + sb.append(" and cast(tv.autobus.numautobus as int) <= ").append(autoFin); + sb.append(" and cast(tv.autobus.numautobus as int) >= ").append(autoIni); + } + if (dataFin != null && dataIni != null) { + sb.append(" and tv.fecHorSalida >= :dataIni"); + sb.append(" and tv.fecHorSalida <= :dataFin"); + } + if (empresa != null) { + Empresa e = (Empresa) empresa.getValue(); + if (e.getEmpresaId() != -1) { + sb.append(" and tv.empresa.empresaId = ").append(e.getEmpresaId()); + } + } + + sb.append(" order by cast(tv.autobus.numautobus as int), tv.fecHorSalida, tv.origen, tv.conductor.conductorId asc "); + + hql += sb.toString(); + + Query sq = getSession().createQuery(hql); + if (dataFin != null && dataIni != null) { + sq.setTimestamp("dataIni", dataIni); + sq.setTimestamp("dataFin", dataFin); + } + List lsTarjetas = sq.list(); + + return lsTarjetas; + } + + @Override + public List buscarTarjetaPorFiltros(TarjetaViaje tarjeta) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, true)); + c.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); + c.add(Restrictions.eq("origen", tarjeta.getOrigen())); + return c.list(); + } + + @Override + public boolean buscarTarjetaExisteVolta(TarjetaViaje tarjeta) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, true)); + c.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); + c.add(Restrictions.ge("fecHorSalida", tarjeta.getFecHorSalida())); + c.add(Restrictions.not(Restrictions.eq("tarjetaviajeId", tarjeta.getTarjetaviajeId()))); + c.addOrder(Order.asc("fecHorSalida")); + + c.setMaxResults(1); + + if (!c.list().isEmpty()) { + + TarjetaViaje tVResult = (TarjetaViaje) c.uniqueResult(); + if (tVResult.getOrigen().equals(tarjeta.getDestino()) + && tVResult.getDestino().equals(tarjeta.getOrigen())) { + return true; + } + } + + Criteria c1 = getSession().createCriteria(getPersistentClass()); + c1.add(Restrictions.eq(ACTIVO, true)); + c1.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); + c1.add(Restrictions.le("fecHorSalida", tarjeta.getFecHorSalida())); + c1.add(Restrictions.not(Restrictions.eq("tarjetaviajeId", tarjeta.getTarjetaviajeId()))); + c1.addOrder(Order.desc("fecHorSalida")); + c1.setMaxResults(1); + if (!c1.list().isEmpty()) { + TarjetaViaje tVResult = (TarjetaViaje) c1.uniqueResult(); + if (tVResult.getOrigen().equals(tarjeta.getDestino()) + && tVResult.getDestino().equals(tarjeta.getOrigen())) { + return true; + } + } + + + return false; + } + + @Override + public List buscarTarjetasParaEnvioNomina(Date fecIni, Date fecFin) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, true)); + c.add(Restrictions.isNull("fecenvionomina")); + + GregorianCalendar gAux = new GregorianCalendar(); + gAux.setTime(fecIni); + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(fecIni); + gcalendar.set(Calendar.HOUR_OF_DAY, 0); + gcalendar.set(Calendar.MINUTE, 0); + gcalendar.set(Calendar.SECOND, 0); + gcalendar.set(Calendar.MILLISECOND, 0); + fecIni = gcalendar.getTime(); + + GregorianCalendar gcalendarFim = new GregorianCalendar(); + gcalendarFim.setTime(fecFin); + gcalendarFim.set(Calendar.HOUR_OF_DAY, 23); + gcalendarFim.set(Calendar.MINUTE, 59); + gcalendarFim.set(Calendar.SECOND, 59); + gcalendarFim.set(Calendar.MILLISECOND, 59); + fecFin = gcalendarFim.getTime(); + + c.add(Restrictions.between("fecHorSalida", fecIni, fecFin)); + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbLevanteCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbLevanteCtrlHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbLevanteCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbLevanteCtrlHibernateDAO.java index 30d12ca3e..b38cba763 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbLevanteCtrlHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbLevanteCtrlHibernateDAO.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TaxaEmbLevanteCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; - -@Repository("taxaEmbLevanteCtrlDAO") -public class TaxaEmbLevanteCtrlHibernateDAO extends GenericHibernateDAO - implements TaxaEmbLevanteCtrlDAO { - - @Autowired - public TaxaEmbLevanteCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TaxaEmbLevanteCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; + +@Repository("taxaEmbLevanteCtrlDAO") +public class TaxaEmbLevanteCtrlHibernateDAO extends GenericHibernateDAO + implements TaxaEmbLevanteCtrlDAO { + + @Autowired + public TaxaEmbLevanteCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDocAutobusHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDocAutobusHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDocAutobusHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDocAutobusHibernateDAO.java index 476db4676..bbe99aa63 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDocAutobusHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDocAutobusHibernateDAO.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoDocAutobusDAO; -import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; - -@Repository("tipoDocAutobusDAO") -public class TipoDocAutobusHibernateDAO extends GenericHibernateDAO -implements TipoDocAutobusDAO { - @Autowired - public TipoDocAutobusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoDocAutobusDAO; +import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; + +@Repository("tipoDocAutobusDAO") +public class TipoDocAutobusHibernateDAO extends GenericHibernateDAO +implements TipoDocAutobusDAO { + @Autowired + public TipoDocAutobusHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraEmpresaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraEmpresaHibernateDAO.java index 1b3901701..1289b8ea0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraEmpresaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraEmpresaHibernateDAO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoEventoExtraEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; - -@Repository("tipoEventoExtraEmpresaDAO") -public class TipoEventoExtraEmpresaHibernateDAO extends GenericHibernateDAO implements -TipoEventoExtraEmpresaDAO { - - @Autowired - public TipoEventoExtraEmpresaHibernateDAO ( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - - return c.list(); - } - - @Override - public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("tipoeventoextra", tipoeventoextra)); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoEventoExtraEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; + +@Repository("tipoEventoExtraEmpresaDAO") +public class TipoEventoExtraEmpresaHibernateDAO extends GenericHibernateDAO implements +TipoEventoExtraEmpresaDAO { + + @Autowired + public TipoEventoExtraEmpresaHibernateDAO ( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + + return c.list(); + } + + @Override + public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("tipoeventoextra", tipoeventoextra)); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java index c94ec5fc5..448049836 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoEventoExtraDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -@Repository("tipoEventoExtraDAO") -public class TipoEventoExtraHibernateDAO extends - GenericHibernateDAO implements - TipoEventoExtraDAO { - - @Autowired - public TipoEventoExtraHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - @Override - public List buscar(String nombIngreso) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("descTipoEvento", nombIngreso)); - - return c.list(); - } - - @Override - public List buscarLike(String nombIngreso) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.like("descTipoEvento", nombIngreso, MatchMode.ANYWHERE)); - - return c.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoEventoExtraDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +@Repository("tipoEventoExtraDAO") +public class TipoEventoExtraHibernateDAO extends + GenericHibernateDAO implements + TipoEventoExtraDAO { + + @Autowired + public TipoEventoExtraHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public List buscar(String nombIngreso) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("descTipoEvento", nombIngreso)); + + return c.list(); + } + + @Override + public List buscarLike(String nombIngreso) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.like("descTipoEvento", nombIngreso, MatchMode.ANYWHERE)); + + return c.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraPtovtaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraPtovtaHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraPtovtaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraPtovtaHibernateDAO.java index 1976a0870..69e2705e6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraPtovtaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraPtovtaHibernateDAO.java @@ -1,31 +1,31 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoEventoExtraPtovtaDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; - -@Repository("tipoEventoExtraPtovtaDAO") -public class TipoEventoExtraPtovtaHibernateDAO extends GenericHibernateDAO implements -TipoEventoExtraPtovtaDAO { - - @Autowired - public TipoEventoExtraPtovtaHibernateDAO ( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - - return c.list(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoEventoExtraPtovtaDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; + +@Repository("tipoEventoExtraPtovtaDAO") +public class TipoEventoExtraPtovtaHibernateDAO extends GenericHibernateDAO implements +TipoEventoExtraPtovtaDAO { + + @Autowired + public TipoEventoExtraPtovtaHibernateDAO ( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + + return c.list(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoIdentificacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoIdentificacionHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoIdentificacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoIdentificacionHibernateDAO.java index c46dc1acd..0151d5234 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoIdentificacionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoIdentificacionHibernateDAO.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoIdentificacionDAO; -import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; - -@Repository("tipoIdentificacionDAO") -public class TipoIdentificacionHibernateDAO extends GenericHibernateDAO implements TipoIdentificacionDAO { - - @Autowired - public TipoIdentificacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public TipoIdentificacion buscarPorNome(String descTipoDoc) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("desctipo", descTipoDoc)); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - return (TipoIdentificacion) c.uniqueResult(); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoIdentificacionDAO; +import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; + +@Repository("tipoIdentificacionDAO") +public class TipoIdentificacionHibernateDAO extends GenericHibernateDAO implements TipoIdentificacionDAO { + + @Autowired + public TipoIdentificacionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public TipoIdentificacion buscarPorNome(String descTipoDoc) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("desctipo", descTipoDoc)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + return (TipoIdentificacion) c.uniqueResult(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimentacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimentacionHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimentacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimentacionHibernateDAO.java index e55fe18c7..8dc41d623 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimentacionHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimentacionHibernateDAO.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoMovimentacionDAO; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; - -@Repository("tipoMovimentacionDAO") -public class TipoMovimentacionHibernateDAO extends GenericHibernateDAO implements TipoMovimentacionDAO { - - @Autowired - public TipoMovimentacionHibernateDAO( - @Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return (List)c.list(); - } - - @Override - public TipoMovimentacion buscarTipoMovimentacio(int tipoMovimentacion) { - - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("tipomovimentacionId", tipoMovimentacion)); - - return (TipoMovimentacion) c.uniqueResult(); - - } - - @Override - public List obtenerTiposMovimetacionPuntoVenta() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.in("tipomovimentacionId", new Integer[]{TipoMovimentacion.TIPO_ENVIO, TipoMovimentacion.TIPO_TRANSFERENCIA, TipoMovimentacion.TIPO_VOLVER})); - - return c.list(); - } - - - - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoMovimentacionDAO; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; + +@Repository("tipoMovimentacionDAO") +public class TipoMovimentacionHibernateDAO extends GenericHibernateDAO implements TipoMovimentacionDAO { + + @Autowired + public TipoMovimentacionHibernateDAO( + @Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return (List)c.list(); + } + + @Override + public TipoMovimentacion buscarTipoMovimentacio(int tipoMovimentacion) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("tipomovimentacionId", tipoMovimentacion)); + + return (TipoMovimentacion) c.uniqueResult(); + + } + + @Override + public List obtenerTiposMovimetacionPuntoVenta() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.in("tipomovimentacionId", new Integer[]{TipoMovimentacion.TIPO_ENVIO, TipoMovimentacion.TIPO_TRANSFERENCIA, TipoMovimentacion.TIPO_VOLVER})); + + return c.list(); + } + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java index 9deadef5c..60752158b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Query; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.TipoTarifaPacoteDAO; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -@Repository("tipoTarifaPacoteDAO") -public class TipoTarifaPacoteHibernateDAO extends GenericHibernateDAO - implements TipoTarifaPacoteDAO { - - @Autowired - public TipoTarifaPacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @SuppressWarnings("unchecked") - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.addOrder(Order.asc("desctipotarifa")); - - return c.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List buscaTipoTarifaPacote(Pacote pacote) { - - StringBuilder sb = new StringBuilder(); - sb.append(" select pt.tipoTarifaPacote "); - sb.append(" from PacoteTarifa pt "); - sb.append(" where pt.pacote.pacoteId = :pacoteId "); - sb.append(" and pt.activo = 1 "); - - Query query = getSession().createQuery(sb.toString()); - query.setInteger("pacoteId", pacote.getPacoteId()); - - return query.list(); - } -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.TipoTarifaPacoteDAO; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +@Repository("tipoTarifaPacoteDAO") +public class TipoTarifaPacoteHibernateDAO extends GenericHibernateDAO + implements TipoTarifaPacoteDAO { + + @Autowired + public TipoTarifaPacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @SuppressWarnings("unchecked") + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.addOrder(Order.asc("desctipotarifa")); + + return c.list(); + } + + @SuppressWarnings("unchecked") + @Override + public List buscaTipoTarifaPacote(Pacote pacote) { + + StringBuilder sb = new StringBuilder(); + sb.append(" select pt.tipoTarifaPacote "); + sb.append(" from PacoteTarifa pt "); + sb.append(" where pt.pacote.pacoteId = :pacoteId "); + sb.append(" and pt.activo = 1 "); + + Query query = getSession().createQuery(sb.toString()); + query.setInteger("pacoteId", pacote.getPacoteId()); + + return query.list(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoTiempoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoTiempoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TramoTiempoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoTiempoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TrayectosExpresosHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TrayectosExpresosHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TrayectosExpresosHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TrayectosExpresosHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TurnoHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TurnoHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/TurnoHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/TurnoHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java index cec36907e..2b0f2a48c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java @@ -1,75 +1,75 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.ArrayList; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.UsuarioEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; - - -@Repository("usuarioEmpresaDAO") -public class UsuarioEmpresaHibernateDAO extends GenericHibernateDAO - implements UsuarioEmpresaDAO { - - @Autowired - public UsuarioEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - - return c.list(); - } - - public List obtenerPorUsuario(Usuario usuario) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("usuarioLog", usuario)); - - return c.list(); - } - - public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq("usuarioLog", usuario)); - if(!c.list().isEmpty()){ - return true; - }else{ - return false; - } - } - - public List obtenerEmpresa(Usuario usuario) { - Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); - c.add(Restrictions.eq("usuarioLog", usuario)); - List usuarioEmpresaList = c.list(); - List empresaList = new ArrayList(); - if(!usuarioEmpresaList.isEmpty()){ - for(UsuarioEmpresa ue : usuarioEmpresaList){ - empresaList.add(ue.getEmpresa()); - } - } - return empresaList; - } - - - - -} - +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.ArrayList; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.UsuarioEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; + + +@Repository("usuarioEmpresaDAO") +public class UsuarioEmpresaHibernateDAO extends GenericHibernateDAO + implements UsuarioEmpresaDAO { + + @Autowired + public UsuarioEmpresaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + public List obtenerPorUsuario(Usuario usuario) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("usuarioLog", usuario)); + + return c.list(); + } + + public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("empresa", empresa)); + c.add(Restrictions.eq("usuarioLog", usuario)); + if(!c.list().isEmpty()){ + return true; + }else{ + return false; + } + } + + public List obtenerEmpresa(Usuario usuario) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("usuarioLog", usuario)); + List usuarioEmpresaList = c.list(); + List empresaList = new ArrayList(); + if(!usuarioEmpresaList.isEmpty()){ + for(UsuarioEmpresa ue : usuarioEmpresaList){ + empresaList.add(ue.getEmpresa()); + } + } + return empresaList; + } + + + + +} + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/VendaPacoteHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VendaPacoteHibernateDAO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/VendaPacoteHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VendaPacoteHibernateDAO.java index 30dd948c8..21cb29e4a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/VendaPacoteHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VendaPacoteHibernateDAO.java @@ -1,45 +1,45 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; - -import java.util.Date; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.SessionFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.VendaPacoteDAO; -import com.rjconsultores.ventaboletos.entidad.VendaPacote; - -@Repository("vendaPacoteDAO") -public class VendaPacoteHibernateDAO extends GenericHibernateDAO implements VendaPacoteDAO { - - @Autowired - public VendaPacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { - setSessionFactory(factory); - } - - @Override - @SuppressWarnings("unchecked") - public List obtenerTodos() { - Criteria c = getSession().createCriteria(getPersistentClass()); - return c.list(); - } - - @Override - @Transactional - public VendaPacote suscribir(VendaPacote entidad) { - entidad.setFecmodif(new Date()); - return super.suscribir(entidad); - } - - @Override - @Transactional - public VendaPacote actualizacion(VendaPacote entidad) { - entidad.setFecmodif(new Date()); - return super.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.VendaPacoteDAO; +import com.rjconsultores.ventaboletos.entidad.VendaPacote; + +@Repository("vendaPacoteDAO") +public class VendaPacoteHibernateDAO extends GenericHibernateDAO implements VendaPacoteDAO { + + @Autowired + public VendaPacoteHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + @SuppressWarnings("unchecked") + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + return c.list(); + } + + @Override + @Transactional + public VendaPacote suscribir(VendaPacote entidad) { + entidad.setFecmodif(new Date()); + return super.suscribir(entidad); + } + + @Override + @Transactional + public VendaPacote actualizacion(VendaPacote entidad) { + entidad.setFecmodif(new Date()); + return super.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java similarity index 99% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java index 48ad91022..60c381dea 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java @@ -64,12 +64,12 @@ public class VigenciaTarifaHibernateDAO extends c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("fecfinvigencia", vt.getFeciniciovigencia())); c.add(Restrictions.le("feciniciovigencia", vt.getFecfinvigencia())); - + if (vt.getVigenciatarifaId() != null) { c.add(Restrictions.ne("vigenciatarifaId", vt.getVigenciatarifaId())); } - c.addOrder(Order.asc("feciniciovigencia")); + c.addOrder(Order.asc("feciniciovigencia")); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/VoucherHibernateDAO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VoucherHibernateDAO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/VoucherHibernateDAO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/VoucherHibernateDAO.java diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/sqlfunction/FnArredondamentoTarifa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/sqlfunction/FnArredondamentoTarifa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/dao/hibernate/sqlfunction/FnArredondamentoTarifa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/hibernate/sqlfunction/FnArredondamentoTarifa.java diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java index a0cda9133..f7e4bc973 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLBuilder.java @@ -1,130 +1,130 @@ -package com.rjconsultores.ventaboletos.dao.sqlbuilder; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -/** - * Interface que indica quais são os SQL nativos da aplicação. - * - * Cada método representa um SQL nativo que deve ser implementado de acordo com a base de dados. - * - * O padrão para a clase é retornar o SQL nativo para o conjunto de parametros - * - * - * @author gleimar - * - */ -public interface SQLBuilder { - - public String getSQLGerarTarifaOficial(Integer codRuta, Integer usuarioId, OrgaoConcedente orgaoConcedente, List idsEmpresas, Integer[] listCasetaPeaje); - - public String getSQLGerarTabelaZerada(Integer codRuta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas, List lsParadaId); - - public String getSQLAtualizarTarifaOficial(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedente); - - public String getSQLGerarTarifaOficialArtesp(Integer codRuta, Integer usuarioId, - Integer orgaoConcedenteId, List idsEmpresas); - - public String getAtualizarTaxaEmbarquePorKmParada(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,ListlsParadaIds); - - public String getSQLAtualizarTaxaEmbarquePorKmOrgao(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas, List lsParadaIds); - - public String getSQLAtualizarTaxaEmbarquePorParadaFixo(Integer rutaId, Integer usuarioId,Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds); - - public String getSQLAtualizarSeguroPorKm(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, TipoSeguro tipoSeguro); - - public String getSQLAtualizarSeguroPorTarifa(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId); - - public String getSQLSelecionarTarifaPorTarifaOficalParaAtualizar(Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao); - - public String getSQLAtualizarTarifaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP); - - public String getSQLInserirTarifaPelaTarifaOficial(Integer vigenciaTarifaId, Integer usuarioId, Empresa empresa, OrgaoConcedente orgao); - - public String getSQLActualizarCorridaFecHusoFecVerano(); - - public String getSQLActualizarCorridaTramoFecHusoFecVerano(); - - public String getSQLBuscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta); - - public String getSQLBuscarUsuariosCajaCerrado(Date fecha, String cveusuario, String turnoid); - - public String getSQLBuscarCajaCerrado(Integer usuarioId, Date fecha, String turnoid); - - public String getSQLBuscarReceitasDespesasCaja(Integer usuarioId, Date fec); - - public String getSQLBuscarUsuariosActivo(); - - public String getSQLAtualizarPrecioPorTPP(final Integer rutaId, final Integer usuarioId, - final Integer orgaoConcedenteId, TipoSeguro tipoSeguro); - - /** - * Venda Embarcada - * @return Retorna a Query para a inserção dos valores da venda na tabela de Caja - */ - public String getSQLInserirCajaVendaEmbarcada(); - - /** - * Venda Embarcada - * @return Retorna a Query para a inserção dos valores da venda na tabela de CajaFormaPago - */ - public String getSQLInserirCajaFormaPagoVendaEmbarcada(); - - /** - * Venda Embarcada - * - * @return Retorna a Query para a inserção dos valores da venda na tabela de Boleto - */ - public String getSQLInserirBoletoVendaEmbarcada(); - - /** - * Venda Embarcada - * @return Retorna a Query para a inserção dos valores da venda na tabela de BoletoFormaPago - */ - public String getSQLInserirBoletoFormaPagoVendaEmbarcada(); - - /** - * - * @return Retorna o valor gerado pela sequence para a tabela BoletoFormaPago - */ - public String getSQLObterSequenceBoletoFormaPago(); - - /** - * - * @return Retorna o valor gerado pela sequence para a tabela CajaFormaPago - */ - public String getSQLObterSequenceCajaFormaPago(); - - /** - * - * @return Retorna o valor gerado pela sequence da tabela Boleto - */ - public String getSQLObterSequenceBoleto(); - - /** - * - * @return Retorna o valor gerado pela sequence da tabela Caja - */ - public String getSQLObterSequenceCaja(); - - /** - * - * @return Retorna o valor gerado pela sequence do Numero de Operacao - */ - public String getSQLObterSequenciaNumOperacion(); - - public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote); - - public String getSQLInserirTarifaEmbarcadaPelaTarifaOficial(Integer vigenciaTarifaId, Integer usuarioId, Empresa empresa, OrgaoConcedente orgao); - - public String getSQLSelecionarTarifaEmbarcadaPorTarifaOficalParaAtualizar(Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao); - - public String getSQLAtualizarTarifaEmbarcadaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP); - - public String getSqlRemoverDuplicidadeNaTarifaOficial(); -} +package com.rjconsultores.ventaboletos.dao.sqlbuilder; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +/** + * Interface que indica quais são os SQL nativos da aplicação. + * + * Cada método representa um SQL nativo que deve ser implementado de acordo com a base de dados. + * + * O padrão para a clase é retornar o SQL nativo para o conjunto de parametros + * + * + * @author gleimar + * + */ +public interface SQLBuilder { + + public String getSQLGerarTarifaOficial(Integer codRuta, Integer usuarioId, OrgaoConcedente orgaoConcedente, List idsEmpresas, Integer[] listCasetaPeaje); + + public String getSQLGerarTabelaZerada(Integer codRuta, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas, List lsParadaId); + + public String getSQLAtualizarTarifaOficial(Integer rutaId, Integer usuarioId, OrgaoConcedente orgaoConcedente); + + public String getSQLGerarTarifaOficialArtesp(Integer codRuta, Integer usuarioId, + Integer orgaoConcedenteId, List idsEmpresas); + + public String getAtualizarTaxaEmbarquePorKmParada(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas,ListlsParadaIds); + + public String getSQLAtualizarTaxaEmbarquePorKmOrgao(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, List idsEmpresas, List lsParadaIds); + + public String getSQLAtualizarTaxaEmbarquePorParadaFixo(Integer rutaId, Integer usuarioId,Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds); + + public String getSQLAtualizarSeguroPorKm(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId, TipoSeguro tipoSeguro); + + public String getSQLAtualizarSeguroPorTarifa(Integer rutaId, Integer usuarioId, Integer orgaoConcedenteId); + + public String getSQLSelecionarTarifaPorTarifaOficalParaAtualizar(Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao); + + public String getSQLAtualizarTarifaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP); + + public String getSQLInserirTarifaPelaTarifaOficial(Integer vigenciaTarifaId, Integer usuarioId, Empresa empresa, OrgaoConcedente orgao); + + public String getSQLActualizarCorridaFecHusoFecVerano(); + + public String getSQLActualizarCorridaTramoFecHusoFecVerano(); + + public String getSQLBuscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta); + + public String getSQLBuscarUsuariosCajaCerrado(Date fecha, String cveusuario, String turnoid); + + public String getSQLBuscarCajaCerrado(Integer usuarioId, Date fecha, String turnoid); + + public String getSQLBuscarReceitasDespesasCaja(Integer usuarioId, Date fec); + + public String getSQLBuscarUsuariosActivo(); + + public String getSQLAtualizarPrecioPorTPP(final Integer rutaId, final Integer usuarioId, + final Integer orgaoConcedenteId, TipoSeguro tipoSeguro); + + /** + * Venda Embarcada + * @return Retorna a Query para a inserção dos valores da venda na tabela de Caja + */ + public String getSQLInserirCajaVendaEmbarcada(); + + /** + * Venda Embarcada + * @return Retorna a Query para a inserção dos valores da venda na tabela de CajaFormaPago + */ + public String getSQLInserirCajaFormaPagoVendaEmbarcada(); + + /** + * Venda Embarcada + * + * @return Retorna a Query para a inserção dos valores da venda na tabela de Boleto + */ + public String getSQLInserirBoletoVendaEmbarcada(); + + /** + * Venda Embarcada + * @return Retorna a Query para a inserção dos valores da venda na tabela de BoletoFormaPago + */ + public String getSQLInserirBoletoFormaPagoVendaEmbarcada(); + + /** + * + * @return Retorna o valor gerado pela sequence para a tabela BoletoFormaPago + */ + public String getSQLObterSequenceBoletoFormaPago(); + + /** + * + * @return Retorna o valor gerado pela sequence para a tabela CajaFormaPago + */ + public String getSQLObterSequenceCajaFormaPago(); + + /** + * + * @return Retorna o valor gerado pela sequence da tabela Boleto + */ + public String getSQLObterSequenceBoleto(); + + /** + * + * @return Retorna o valor gerado pela sequence da tabela Caja + */ + public String getSQLObterSequenceCaja(); + + /** + * + * @return Retorna o valor gerado pela sequence do Numero de Operacao + */ + public String getSQLObterSequenciaNumOperacion(); + + public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote); + + public String getSQLInserirTarifaEmbarcadaPelaTarifaOficial(Integer vigenciaTarifaId, Integer usuarioId, Empresa empresa, OrgaoConcedente orgao); + + public String getSQLSelecionarTarifaEmbarcadaPorTarifaOficalParaAtualizar(Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao); + + public String getSQLAtualizarTarifaEmbarcadaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP); + + public String getSqlRemoverDuplicidadeNaTarifaOficial(); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java index 66cef8fb4..0a9b6eba0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.dao.sqlbuilder; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.dao.sqlbuilder.impl.SQLBuilderOracle; -import com.rjconsultores.ventaboletos.dao.util.DBUtil; - -public class SQLFactory { - private static final Logger log = LogManager.getLogger(SQLFactory.class); - - public SQLBuilder getBuilder() { - if (DBUtil.getInstance().isOracle()) { - return new SQLBuilderOracle(); - } - - throw new RuntimeException("NÃO foi localizado a classe que traduz SQL Nativos"); - } -} +package com.rjconsultores.ventaboletos.dao.sqlbuilder; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.dao.sqlbuilder.impl.SQLBuilderOracle; +import com.rjconsultores.ventaboletos.dao.util.DBUtil; + +public class SQLFactory { + private static final Logger log = LogManager.getLogger(SQLFactory.class); + + public SQLBuilder getBuilder() { + if (DBUtil.getInstance().isOracle()) { + return new SQLBuilderOracle(); + } + + throw new RuntimeException("NÃO foi localizado a classe que traduz SQL Nativos"); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index 411a86763..7b9b0b5de 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -1,1510 +1,1510 @@ -package com.rjconsultores.ventaboletos.dao.sqlbuilder.impl; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; -import com.rjconsultores.ventaboletos.dao.util.DBUtil; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.enums.TipoFormapago; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; - -public class SQLBuilderOracle implements SQLBuilder { - private static final Integer SELECAO_TODOS = -1; - private static final Integer HORAS_NO_DIA = Integer.valueOf(24); - private static final Integer RED_PAGO_FORMAPAGO_ID = Integer.valueOf(95); - private static final String RED_PAGO_EMISSOR_TARJETA = "RDP"; - private static final String RED_PAGO_FORMA_PAGO = "CR"; - private static final Integer DER_PR = 2; - - @Override - public String getSQLGerarTabelaZerada(final Integer codRuta, final Integer usuarioId, final Integer orgaoConcedenteId, final List idsEmpresas, List lsParadaId) { - - StringBuilder sb = new StringBuilder(); - sb.append("INSERT "); - sb.append("INTO "); - sb.append(" TARIFA_OFICIAL "); - sb.append(" ( "); - sb.append(" TARIFAOFICIAL_ID, "); - sb.append(" PRECIO, "); - sb.append(" PRECIOORIGINAL, "); - sb.append(" TRAMO_ID, "); - sb.append(" MARCA_ID, "); - sb.append(" CLASESERVICIO_ID, "); - sb.append(" PRECIOREDABIERTO, "); - sb.append(" MONEDA_ID, "); - sb.append(" VIGENCIATARIFA_ID, "); - sb.append(" STATUSTARIFA, "); - sb.append(" IMPORTETAXAEMBARQUE, "); - sb.append(" IMPORTEPEDAGIO, "); - sb.append(" IMPORTEOUTROS, "); - sb.append(" IMPORTESEGURO, "); - sb.append(" ORGAOCONCEDENTE_ID, "); - sb.append(" RUTA_ID, "); - sb.append(" ACTIVO, "); - sb.append(" FECMODIF, "); - sb.append(" USUARIO_ID, "); - sb.append(" ORIGEN_ID, "); - sb.append(" DESTINO_ID "); - sb.append(" ) "); - sb.append(" select "); - sb.append(" "); - sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); - sb.append(" 0, "); - sb.append(" 0, "); - sb.append(" t.tramo_id, "); - sb.append(" mc.marca_id, "); - sb.append(" r.CLASESERVICIO_ID, "); - sb.append(" null, "); - sb.append(" m.moneda_id, "); - sb.append(" null, "); - sb.append(" 'A', "); - sb.append(" null, "); - sb.append(" null, "); - sb.append(" null, "); - sb.append(" null, "); - sb.append(" oc.orgaoconcedente_id, "); - sb.append(" r.ruta_id, "); - sb.append(" 1, "); - sb.append(" ").append(DBUtil.getInstance().dbSysdate()).append(", "); - sb.append(" ").append(usuarioId).append(", "); - sb.append(" po.parada_id, "); - sb.append(" pd.parada_id "); - sb.append(" "); - sb.append("from "); - sb.append(" ruta_combinacion rc "); - sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join ruta_empresa re on r.ruta_id = re.ruta_id "); - sb.append(" inner join marca ma on ma.empresa_id = re.empresa_id "); - sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id =r.orgaoconcedente_id "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sb.append(" inner join parada po on po.parada_id = t.origen_id "); - sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); - sb.append(" inner join estado e on e.estado_id = c.estado_id "); - sb.append(" inner join MARCA_CLASESERVICIO mc on "); - sb.append(" mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and ma.marca_id = mc.marca_id, "); - sb.append(" moneda m "); - sb.append(" "); - sb.append("where "); - sb.append(" rc.activo = 1 "); - if (codRuta != null) { - sb.append(" and r.ruta_id = ").append(codRuta); - } - sb.append(" and r.activo = 1 "); - sb.append(" and mc.marca_id <> -1 "); - sb.append(" and mc.activo = 1 "); - sb.append(" and re.activo = 1 "); - if (idsEmpresas != null) { - sb.append(" and re.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - } - sb.append(" and m.moneda_id = 1 "); - if (orgaoConcedenteId != null) { - sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - sb.append(" and "); - sb.append(" (t.tramo_id, "); - sb.append(" mc.marca_id, "); - sb.append(" r.CLASESERVICIO_ID, "); - sb.append(" m.moneda_id, "); - sb.append(" oc.orgaoconcedente_id, r.ruta_id) "); - sb.append(" not in (select tao.tramo_id,tao.marca_id,tao.CLASESERVICIO_ID, "); - sb.append(" tao.moneda_id,tao.orgaoconcedente_id, tao.ruta_id "); - sb.append(" from tarifa_oficial tao where tao.activo = 1) "); - if (null != lsParadaId) { - sb.append(" and t.origen_id in (").append(lsParadaId.toString().substring(1, lsParadaId.toString().length() - 1)).append(" ) "); - } - - return sb.toString(); - } - - @Override - public String getSQLGerarTarifaOficialArtesp(final Integer codRuta, final Integer usuarioId, - final Integer orgaoConcedenteId, final List idsEmpresas) { - StringBuilder sb = new StringBuilder(); - sb.append(" INSERT "); - sb.append(" INTO "); - sb.append(" TARIFA_OFICIAL "); - sb.append(" ( "); - sb.append(" TARIFAOFICIAL_ID, "); - sb.append(" PRECIO, "); - sb.append(" PRECIOORIGINAL, "); - sb.append(" TRAMO_ID, "); - sb.append(" MARCA_ID, "); - sb.append(" CLASESERVICIO_ID, "); - sb.append(" PRECIOREDABIERTO, "); - sb.append(" MONEDA_ID, "); - sb.append(" VIGENCIATARIFA_ID, "); - sb.append(" STATUSTARIFA, "); - sb.append(" IMPORTETAXAEMBARQUE, "); - sb.append(" IMPORTEPEDAGIO, "); - sb.append(" IMPORTEOUTROS, "); - sb.append(" IMPORTESEGURO, "); - sb.append(" ORGAOCONCEDENTE_ID, "); - sb.append(" RUTA_ID, "); - sb.append(" ACTIVO, "); - sb.append(" FECMODIF, "); - sb.append(" USUARIO_ID, "); - sb.append(" ORIGEN_ID, "); - sb.append(" DESTINO_ID "); - sb.append(" ) "); - sb.append(" select "); - sb.append(" "); - sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); - - sb.append(" ROUND( "); - sb.append(" ("); - sb.append(" "); - sb.append(" case ( coalesce((select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) , 0 )) when 0 then"); - sb.append(" (select max( tkm.valortaxa ) from Tarifa_km tkm where tkm.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tkm.activo = 1)"); - sb.append(" else"); - sb.append(" (select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) end"); - sb.append(" ) "); - sb.append(" ,2), "); - - sb.append(" ROUND( "); - sb.append(" ("); - sb.append(" "); - sb.append(" case ( coalesce((select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) , 0 )) when 0 then"); - sb.append(" (select max( tkm.valortaxa ) from Tarifa_km tkm where tkm.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tkm.activo = 1)"); - sb.append(" else"); - sb.append(" (select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) end"); - sb.append(" ) "); - sb.append(" ,2), "); - - sb.append(" t.tramo_id, "); - sb.append(" mc.marca_id, "); - sb.append(" r.CLASESERVICIO_ID, "); - sb.append(" null, "); - sb.append(" m.moneda_id, "); - sb.append(" null, "); - sb.append(" 'A', "); - sb.append(" null, "); - sb.append(" null, "); - sb.append(" null, "); - sb.append(" null, "); - sb.append(" oc.orgaoconcedente_id, "); - sb.append(" r.ruta_id, "); - sb.append(" 1, "); - sb.append(" ").append(DBUtil.getInstance().dbSysdate()).append(", "); - sb.append(" ").append(usuarioId).append(", "); - sb.append(" po.parada_id, "); - sb.append(" pd.parada_id "); - sb.append(" "); - sb.append("from "); - sb.append(" ruta_combinacion rc "); - sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join ruta_empresa re on r.ruta_id = re.ruta_id "); - sb.append(" inner join marca ma on ma.empresa_id = re.empresa_id "); - sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id =r.orgaoconcedente_id "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id and t.activo =1");// adicionei isso t.activo =1"); - sb.append(" inner join parada po on po.parada_id = t.origen_id "); - sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); - sb.append(" inner join estado e on e.estado_id = c.estado_id "); - sb.append(" inner join MARCA_CLASESERVICIO mc on "); - sb.append(" mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and ma.marca_id = mc.marca_id, "); - sb.append(" moneda m "); - sb.append(" "); - sb.append("where "); - - sb.append(" rc.activo = 1 "); - if (codRuta != null) { - sb.append(" and r.ruta_id = ").append(codRuta); - } - sb.append(" and r.activo = 1 "); - sb.append(" and mc.marca_id <> -1 "); - sb.append(" and mc.activo = 1 "); - sb.append(" and re.activo = 1 "); - sb.append(" and r.orgaoconcedente_id = 21 "); - if (idsEmpresas != null) { - sb.append(" and re.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - } - sb.append(" and m.moneda_id = 1 "); - if (orgaoConcedenteId != null) { - sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - sb.append(" and "); - sb.append(" (t.tramo_id, "); - sb.append(" mc.marca_id, "); - sb.append(" r.CLASESERVICIO_ID, "); - sb.append(" m.moneda_id, "); - sb.append(" oc.orgaoconcedente_id, r.ruta_id) "); - sb.append(" not in (select tao.tramo_id,tao.marca_id,tao.CLASESERVICIO_ID, "); - sb.append(" tao.moneda_id,tao.orgaoconcedente_id, tao.ruta_id "); - sb.append(" from tarifa_oficial tao where tao.activo = 1) "); - - return sb.toString(); - } - - @Override - public String getSQLGerarTarifaOficial(final Integer codRuta, final Integer usuarioId, - final OrgaoConcedente orgaoConcedente, final List idsEmpresas,Integer[] listCasetaPeaje) { - - StringBuilder sb = new StringBuilder(); - sb.append(" INSERT "); - sb.append(" INTO "); - sb.append(" TARIFA_OFICIAL "); - sb.append(" ( "); - sb.append(" TARIFAOFICIAL_ID, "); - sb.append(" PRECIO, "); - sb.append(" PRECIOORIGINAL, "); - sb.append(" TRAMO_ID, "); - sb.append(" MARCA_ID, "); - sb.append(" CLASESERVICIO_ID, "); - sb.append(" PRECIOREDABIERTO, "); - sb.append(" MONEDA_ID, "); - sb.append(" VIGENCIATARIFA_ID, "); - sb.append(" STATUSTARIFA, "); - sb.append(" IMPORTETAXAEMBARQUE, "); - sb.append(" IMPORTEPEDAGIO, "); - sb.append(" IMPORTEOUTROS, "); - sb.append(" IMPORTESEGURO, "); - sb.append(" ORGAOCONCEDENTE_ID, "); - sb.append(" RUTA_ID, "); - sb.append(" ACTIVO, "); - sb.append(" FECMODIF, "); - sb.append(" USUARIO_ID, "); - sb.append(" ORIGEN_ID, "); - sb.append(" DESTINO_ID "); - sb.append(" ) "); - - sb.append(" WITH tarifacte AS ( "); - - sb.append(" select DISTINCT "); - sb.append(" "); - - // >> SE ORGAO FOR DER-PR E SE O COEFICIENTE DA CLASSE NAO ESTA NULL - sb.append(" CASE R.ORGAOCONCEDENTE_ID WHEN " + DER_PR + " THEN CASE WHEN cl.COEFICIENTETARIFA IS NOT NULL THEN "); - sb.append(" trunc(((coalesce(ct1.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente1,0) + 350,0.27)*16160 )) ) * COALESCE(tc.kmcoeficiente1,0)) * cl.COEFICIENTETARIFA "); - sb.append(" + ((coalesce(ct2.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente2,0) + 350,0.27)*13470 )) ) * COALESCE(tc.kmcoeficiente2,0)) * cl.COEFICIENTETARIFA,2) "); - sb.append(" ELSE "); - // < COEFICIENTE DA CLASSE ESTA NULL - sb.append(" ROUND( "); - sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); - sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); - sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); - if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { - sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); - } else { - sb.append(" 1, 2 ) "); - } - // - sb.append(" end else "); - // < ORGAO NAO EH DER-PR - sb.append(" ROUND( "); - sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); - sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); - sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); - if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { - sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); - } else { - sb.append(" 1, 2 ) "); - } - sb.append(" end as precio, "); - // - // >> SE ORGAO FOR DER-PR E SE O COEFICIENTE DA CLASSE NAO ESTA NULL - sb.append(" CASE R.ORGAOCONCEDENTE_ID WHEN " + DER_PR + " THEN CASE WHEN cl.COEFICIENTETARIFA IS NOT NULL THEN "); - sb.append(" trunc(((coalesce(ct1.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente1,0) + 350,0.27)*16160 )) ) * COALESCE(tc.kmcoeficiente1,0)) * cl.COEFICIENTETARIFA "); - sb.append(" + ((coalesce(ct2.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente2,0) + 350,0.27)*13470 )) ) * COALESCE(tc.kmcoeficiente2,0)) * cl.COEFICIENTETARIFA,2) "); - sb.append(" ELSE "); - // < COEFICIENTE DA CLASSE ESTA NULL - sb.append(" ROUND( "); - sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); - sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); - sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); - if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { - sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); - } else { - sb.append(" 1, 2 ) "); - } - // - sb.append(" end else "); - // < ORGAO NAO EH DER-PR - sb.append(" ROUND( "); - sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); - sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); - sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); - if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { - sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); - } else { - sb.append(" 1, 2 ) "); - } - sb.append(" end as preciooriginal , "); - // - sb.append(" t.tramo_id, "); - sb.append(" mc.marca_id, "); - sb.append(" r.CLASESERVICIO_ID, "); - sb.append(" null as precioredabierto, "); - sb.append(" m.moneda_id, "); - sb.append(" null as vigenciatarifa_id, "); - sb.append(" 'A' as statustarifa, "); - sb.append(" null as importetaxaembarque, "); - sb.append(" null as importepedagio, "); - sb.append(" null as importeoutros, "); - sb.append(" null as importeseguro, "); - sb.append(" oc.orgaoconcedente_id, "); - sb.append(" r.ruta_id, "); - sb.append(" 1 as activo, "); - sb.append(" ").append(DBUtil.getInstance().dbSysdate()).append(" as fecmodif, "); - sb.append(" ").append(usuarioId).append(" as usuario_id, "); - sb.append(" po.parada_id as origen_id, "); - sb.append(" pd.parada_id as destino_id"); - sb.append(" "); - sb.append("from "); - sb.append(" ruta_combinacion rc "); - sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join ruta_empresa re on r.ruta_id = re.ruta_id "); - sb.append(" inner join marca ma on ma.empresa_id = re.empresa_id "); - sb.append(" inner join orgao_tramo tc on tc.tramo_id = rc.tramo_id "); - sb.append(" and tc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tc.activo =1 "); - sb.append(" inner join orgao_concedente oc on "); - sb.append(" oc.orgaoconcedente_id = tc.orgaoconcedente_id "); - sb.append(" and oc.orgaoconcedente_id =r.orgaoconcedente_id "); - sb.append(" inner join coeficiente_tarifa ct1 on ct1.coeficientetarifa_id = tc.coeficientetarifa1_id "); - sb.append(" left join coeficiente_tarifa ct2 on ct2.coeficientetarifa_id = tc.coeficientetarifa2_id "); - sb.append(" left join coeficiente_tarifa ct3 on ct3.coeficientetarifa_id = tc.coeficientetarifa3_id "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sb.append(" inner join parada po on po.parada_id = t.origen_id "); - sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); - sb.append(" inner join estado e on e.estado_id = c.estado_id "); - sb.append(" inner join MARCA_CLASESERVICIO mc on "); - sb.append(" mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and ma.marca_id = mc.marca_id "); - if(null !=listCasetaPeaje) { - sb.append(" inner join peaje p on p.ruta_id=r.ruta_id and p.origen_id=po.parada_id and p.destino_id=pd.parada_id and p.orgaoconcedente_id =oc.orgaoconcedente_id "); - } - sb.append(" inner join CLASE_SERVICIO cl on cl.claseservicio_id = r.CLASESERVICIO_ID, "); - sb.append(" moneda m "); - - sb.append(" "); - sb.append("where "); - sb.append(" rc.activo = 1 "); - if (codRuta != null) { - sb.append(" and r.ruta_id = ").append(codRuta); - } - sb.append(" and r.activo = 1 "); - sb.append(" and tc.activo = 1 "); - sb.append(" and mc.marca_id <> -1 "); - sb.append(" and mc.activo = 1 "); - sb.append(" and re.activo = 1 "); - sb.append(" and r.orgaoconcedente_id <> 21 "); - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.CRIAR_TARIFA_APENAS_TRECHO_VENDIDO.getDescricao())) { - sb.append(" and rc.indventa = 1 "); - } - if (idsEmpresas != null) { - sb.append(" and re.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - } - sb.append(" and m.moneda_id = 1 "); - sb.append(" and ma.activo = 1 "); - if (orgaoConcedente != null && orgaoConcedente.getOrgaoConcedenteId() != null && orgaoConcedente.getOrgaoConcedenteId() != SELECAO_TODOS) { - sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedente.getOrgaoConcedenteId()); - } - sb.append(" and "); - sb.append(" (t.tramo_id, "); - sb.append(" mc.marca_id, "); - sb.append(" r.CLASESERVICIO_ID, "); - sb.append(" m.moneda_id, "); - sb.append(" oc.orgaoconcedente_id, r.ruta_id) "); - sb.append(" not in (select tao.tramo_id,tao.marca_id,tao.CLASESERVICIO_ID, "); - sb.append(" tao.moneda_id,tao.orgaoconcedente_id, tao.ruta_id "); - sb.append(" from tarifa_oficial tao where tao.activo = 1) "); - if(null !=listCasetaPeaje) { - sb.append(" and p.activo=1 "); - sb.append(" and p.casetapeaje_id in ( " + StringUtils.join(listCasetaPeaje,",") + ") "); - } - - sb.append(" ) "); - - sb.append(" SELECT "); - - sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); - sb.append(" PRECIO, "); - sb.append(" PRECIOORIGINAL, "); - sb.append(" TRAMO_ID, "); - sb.append(" MARCA_ID, "); - sb.append(" CLASESERVICIO_ID, "); - sb.append(" PRECIOREDABIERTO, "); - sb.append(" MONEDA_ID, "); - sb.append(" VIGENCIATARIFA_ID, "); - sb.append(" STATUSTARIFA, "); - sb.append(" IMPORTETAXAEMBARQUE, "); - sb.append(" IMPORTEPEDAGIO, "); - sb.append(" IMPORTEOUTROS, "); - sb.append(" IMPORTESEGURO, "); - sb.append(" ORGAOCONCEDENTE_ID, "); - sb.append(" RUTA_ID, "); - sb.append(" ACTIVO, "); - sb.append(" FECMODIF, "); - sb.append(" USUARIO_ID, "); - sb.append(" ORIGEN_ID, "); - sb.append(" DESTINO_ID "); - - sb.append(" FROM tarifacte "); - - return sb.toString(); - } - - @Override - public String getSQLAtualizarTarifaOficial(final Integer rutaId, final Integer usuarioId, - final OrgaoConcedente orgaoConcedente) { - StringBuilder sb = new StringBuilder(""); - - sb.append("UPDATE TARIFA_OFICIAL SET PRECIO = "); - sb.append("( "); - sb.append("select "); - sb.append(" "); - sb.append(" ROUND( "); - sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); - sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); - sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); - sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2)"); - sb.append(" "); - sb.append("from "); - sb.append(" ruta_combinacion rc "); - sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join orgao_tramo tc on "); - sb.append(" tc.tramo_id = rc.tramo_id and tc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tc.activo =1 "); - sb.append(" inner join orgao_concedente oc on "); - sb.append(" oc.orgaoconcedente_id = tc.orgaoconcedente_id "); - sb.append(" and oc.orgaoconcedente_id =r.orgaoconcedente_id "); - sb.append(" inner join coeficiente_tarifa ct1 on ct1.coeficientetarifa_id = tc.coeficientetarifa1_id "); - sb.append(" left join coeficiente_tarifa ct2 on ct2.coeficientetarifa_id = tc.coeficientetarifa2_id "); - sb.append(" left join coeficiente_tarifa ct3 on ct3.coeficientetarifa_id = tc.coeficientetarifa3_id "); - sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); - sb.append(" inner join parada po on po.parada_id = t.origen_id "); - sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); - sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); - sb.append(" inner join estado e on e.estado_id = c.estado_id "); - sb.append(" inner join MARCA_CLASESERVICIO mc on mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID, "); - sb.append(" moneda m "); - sb.append(" "); - sb.append("where "); - sb.append(" rc.activo = 1 "); - sb.append(" and r.activo = 1 "); - sb.append(" and mc.marca_id <> -1 "); - sb.append(" and tc.activo = 1 "); - sb.append(" and m.moneda_id = 1 "); - if (orgaoConcedente != null && orgaoConcedente.getOrgaoConcedenteId() != null) { - sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedente.getOrgaoConcedenteId()); - } - sb.append(" and t.tramo_id = TARIFA_OFICIAL.tramo_id "); - sb.append(" and mc.marca_id = TARIFA_OFICIAL.marca_id "); - sb.append(" and r.CLASESERVICIO_ID = TARIFA_OFICIAL.CLASESERVICIO_ID "); - sb.append(" and m.moneda_id = TARIFA_OFICIAL.moneda_id "); - sb.append(" and oc.orgaoconcedente_id = TARIFA_OFICIAL.orgaoconcedente_id "); - sb.append(" and r.ruta_id = TARIFA_OFICIAL.ruta_id "); - sb.append(") "); - sb.append(" "); - sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); - sb.append(" "); - sb.append("where "); - sb.append(" activo = 1 "); - if (rutaId != null) { - sb.append(" and ruta_id = ").append(rutaId); - } - if (orgaoConcedente != null && orgaoConcedente.getOrgaoConcedenteId() != null) { - sb.append(" and orgaoconcedente_id = ").append(orgaoConcedente.getOrgaoConcedenteId()); - } - - return sb.toString(); - } - - @Override - public String getAtualizarTaxaEmbarquePorKmParada(final Integer rutaId, final Integer usuarioId, final Integer orgaoConcedenteId, List idsEmpresas, List lsParadaIds) { - StringBuilder sb = new StringBuilder(""); - sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE = "); - sb.append("( "); - sb.append("select "); - sb.append(" tepKm.valorTaxa "); - sb.append(" "); - sb.append(" "); - sb.append("from "); - sb.append(" tarifa_oficial tao "); - sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); - sb.append(" inner join TAXA_EMBARQUE_PARADA tepKm on "); - sb.append(" tepKm.parada_id = t.origen_id and tepKm.KMATE >= "); - sb.append(" t.CANTKMREAL and tepKm.activo = 1 and tepKm.indtipo = 'K' and tepKm.empresa_id in (-1, ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - if (null != lsParadaIds) { - sb.append(" and t.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); - } - - sb.append(" inner join marca m on m.marca_id = tao.marca_id "); - sb.append("where "); - sb.append(" tepKm.kmate= "); - sb.append(" (select min(tepKm1.KMATE) "); - sb.append(" from "); - sb.append(" TAXA_EMBARQUE_PARADA tepKm1 "); - sb.append(" where "); - sb.append(" tepKm1.parada_id = t.origen_id and tepKm1.KMATE >= t.CANTKMREAL and tepKm1.activo = 1 and tepKm1.orgaoconcedente_id = tao.orgaoconcedente_id and tepKm1.empresa_id in (-1, ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - sb.append(" ) "); - sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); - sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); - sb.append(" and tao.orgaoconcedente_id = tepKm.orgaoconcedente_id "); - sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); - sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); - sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); - sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); - sb.append(" and tepKm.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); - if (idsEmpresas != null) { - sb.append(" and m.empresa_id in (-1,").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - } - sb.append(") "); - sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); - sb.append(" "); - sb.append("where "); - sb.append(" tarifa_oficial.activo = 1 "); - if (rutaId != null) { - sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); - } - if (orgaoConcedenteId != null) { - sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - if (null != lsParadaIds) { - sb.append(" and tarifa_oficial.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); - } - return sb.toString(); - } - - @Override - public String getSQLAtualizarTaxaEmbarquePorKmOrgao(final Integer rutaId, final Integer usuarioId, final Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds) { - StringBuilder sb = new StringBuilder(""); - sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE = "); - sb.append("coalesce( "); - sb.append("( "); - sb.append("select "); - sb.append(" tek.valorTaxa "); - sb.append(" "); - sb.append("from "); - sb.append(" tarifa_oficial tao "); - sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); - sb.append(" inner join taxa_embarque_km tek on "); - sb.append(" tek.orgaoconcedente_id = tao.ORGAOCONCEDENTE_ID "); - sb.append(" and tek.activo = 1 and t.CANTKMREAL <= tek.kmate "); - sb.append(" inner join marca m on tao.marca_id = m.marca_id "); - sb.append("where "); - sb.append(" tek.kmate= "); - sb.append(" (select min(tek1.KMATE) "); - sb.append(" from "); - sb.append(" taxa_embarque_km tek1 "); - sb.append(" where "); - sb.append(" tek1.orgaoconcedente_id = tao.ORGAOCONCEDENTE_ID "); - sb.append(" and t.CANTKMREAL <= tek1.kmate and tek1.activo = 1 "); - sb.append(" ) "); - sb.append(" "); - sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); - sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); - sb.append(" and tao.orgaoconcedente_id = tek.orgaoconcedente_id "); - sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); - sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); - sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); - sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); - - if (idsEmpresas != null) { - sb.append(" and m.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); - } - - if (null != lsParadaIds) { - sb.append(" and t.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); - } - - - - sb.append("),IMPORTETAXAEMBARQUE) "); - sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); - sb.append(" "); - sb.append("where "); - sb.append(" tarifa_oficial.activo = 1 "); - - if (rutaId != null) { - sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); - } - - if (orgaoConcedenteId != null) { - sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - - if (null != lsParadaIds) { - sb.append(" and tarifa_oficial.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); - } - return sb.toString(); - } - - @Override - public String getSQLAtualizarTaxaEmbarquePorParadaFixo(final Integer rutaId, final Integer usuarioId, final Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds) { - StringBuilder sb = new StringBuilder(""); - - sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE = "); - sb.append("coalesce( "); - sb.append("( "); - sb.append("select distinct "); - sb.append(" tepFixo.valorTaxa "); - sb.append(" "); - sb.append("from "); - sb.append(" tarifa_oficial tao "); - sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); - sb.append(" inner join TAXA_EMBARQUE_PARADA tepFixo on "); - sb.append(" tepFixo.parada_id = t.origen_id and tepFixo.empresa_id in (" + obtemEmpresas(idsEmpresas) + " ) "); - sb.append(" and tepFixo.indtipo = 'F' and tepFixo.activo = 1 "); - sb.append(" inner join marca m on m.marca_id = tao.marca_id "); - sb.append("where "); - sb.append(" tao.marca_id = tarifa_oficial.marca_id "); - sb.append(" and (tao.orgaoconcedente_id = tepFixo.orgaoconcedente_id or tepFixo.orgaoconcedente_id in (-1, ").append(orgaoConcedenteId).append(")) "); - sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); - sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); - sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); - sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); - sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); - sb.append(" and m.empresa_id in (" + obtemEmpresas(idsEmpresas) + " ) and tao.activo = 1 "); - if (null != lsParadaIds) { - sb.append(" and t.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); - } - - sb.append("),IMPORTETAXAEMBARQUE) "); - sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); - sb.append(" "); - sb.append("where "); - sb.append(" tarifa_oficial.activo = 1 "); - if (rutaId != null) { - sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); - } - if (orgaoConcedenteId != null) { - sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - sb.append(" and tarifa_oficial.MARCA_ID in (select m2.marca_id from marca m2 where m2.activo = 1 and m2.empresa_id in (" + obtemEmpresas(idsEmpresas) + " ) ) "); - - if (null != lsParadaIds) { - sb.append(" and tarifa_oficial.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); - } - return sb.toString(); - } - - private String obtemEmpresas(List idsEmpresas) { - if (idsEmpresas == null || idsEmpresas.contains(SELECAO_TODOS)) { - return Integer.toString(SELECAO_TODOS); - } - return idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1); - } - - @Override - public String getSQLAtualizarSeguroPorKm(final Integer rutaId, final Integer usuarioId, - final Integer orgaoConcedenteId, TipoSeguro tipoSeguro) { - StringBuilder sb = new StringBuilder(""); - if (tipoSeguro.equals(TipoSeguro.SEGURO)) { - sb.append("update tarifa_oficial set IMPORTESEGURO = "); - } else { - sb.append("update tarifa_oficial set IMPORTETPP = "); - } - sb.append("( "); - sb.append("select "); - sb.append(" sk.VALORTAXA "); - sb.append("from "); - sb.append(" tarifa_oficial tao "); - sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); - sb.append(" inner join seguro_km sk on "); - sb.append(" sk.KMATE >= t.CANTKMREAL and sk.activo = 1 "); - sb.append(" and tao.ORGAOCONCEDENTE_ID = sk.ORGAOCONCEDENTE_ID "); - sb.append("where "); - sb.append(" sk.tipo_seguro = '").append(tipoSeguro).append("' and "); - sb.append(" sk.kmate= "); - sb.append(" (select min(sk1.KMATE) "); - sb.append(" from "); - sb.append(" seguro_km sk1 "); - sb.append(" where "); - sb.append(" sk1.KMATE >= t.CANTKMREAL and sk1.activo = 1 "); - sb.append(" and sk1.tipo_seguro = '").append(tipoSeguro).append("' "); - sb.append(" and tao.ORGAOCONCEDENTE_ID = sk1.ORGAOCONCEDENTE_ID "); - sb.append(" ) "); - sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); - sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); - sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); - sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); - sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); - sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); - sb.append(") "); - sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); - sb.append(" "); - sb.append("where "); - sb.append(" tarifa_oficial.activo = 1 "); - if (rutaId != null) { - sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); - } - if (orgaoConcedenteId != null) { - sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - - return sb.toString(); - } - - @Override - public String getSQLAtualizarPrecioPorTPP(final Integer rutaId, final Integer usuarioId, - final Integer orgaoConcedenteId, TipoSeguro tipoSeguro) { - StringBuilder sb = new StringBuilder(""); - sb.append("update tarifa_oficial set PRECIO = PRECIO + nvl(IMPORTETPP,0) "); - sb.append(" where "); - sb.append(" tarifa_oficial.activo = 1 "); - if (rutaId != null) { - sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); - } - if (orgaoConcedenteId != null) { - sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - - return sb.toString(); - } - - @Override - public String getSQLAtualizarSeguroPorTarifa(final Integer rutaId, final Integer usuarioId, - final Integer orgaoConcedenteId) { - StringBuilder sb = new StringBuilder(""); - sb.append("update tarifa_oficial set IMPORTESEGURO = "); - sb.append("( "); - sb.append("select "); - sb.append(" st.VALORTAXA "); - sb.append("from "); - sb.append(" tarifa_oficial tao "); - sb.append(" inner join seguro_tarifa st on "); - sb.append(" st.VALORTARIFAATE >= tao.precio and st.activo = 1 "); - sb.append(" and tao.ORGAOCONCEDENTE_ID = st.ORGAOCONCEDENTE_ID "); - sb.append("where "); - sb.append(" st.VALORTARIFAATE= "); - sb.append(" (select min(st1.VALORTARIFAATE) "); - sb.append(" from "); - sb.append(" seguro_tarifa st1 "); - sb.append(" where "); - sb.append(" st1.VALORTARIFAATE >= tao.precio and st1.activo = 1 "); - sb.append(" and tao.ORGAOCONCEDENTE_ID = st1.ORGAOCONCEDENTE_ID "); - sb.append(" ) "); - sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); - sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); - sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); - sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); - sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); - sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); - sb.append(") "); - sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); - sb.append(" "); - sb.append("where "); - sb.append(" tarifa_oficial.activo = 1 "); - - if (rutaId != null) { - sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); - } - if (orgaoConcedenteId != null) { - sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); - } - - return sb.toString(); - } - - @Override - public String getSQLSelecionarTarifaPorTarifaOficalParaAtualizar(final Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao) { - StringBuilder sb = new StringBuilder(""); - - sb.append("SELECT tao.IMPORTEPEDAGIO AS \"taoimportepedagio\", "); - sb.append(" tao.COMPOSICAO_DO_PEAJE AS \"taocomposicaodopeaje\", "); - sb.append(" tao.PRECIO AS \"taoprecio\", "); - sb.append(" tao.PRECIOORIGINAL AS \"taopreciooriginal\", "); - sb.append(" tao.IMPORTETAXAEMBARQUE AS \"taoimportetaxaembarque\", "); - sb.append(" tao.IMPORTESEGURO AS \"taoimporteseguro\", "); - sb.append(" tao.IMPORTETPP AS \"taoimportetpp\", "); - sb.append(" tao.IMPORTEOUTROS AS \"taoimporteoutros\", "); - sb.append(" ta.TARIFA_ID AS \"tarifaId\" "); - - sb.append("FROM TARIFA_OFICIAL tao "); - sb.append("INNER JOIN TARIFA ta ON (tao.MARCA_ID = ta.MARCA_ID "); - sb.append(" AND tao.CLASESERVICIO_ID = ta.CLASESERVICIO_ID "); - sb.append(" AND tao.TRAMO_ID = ta.TRAMO_ID "); - sb.append(" AND tao.MONEDA_ID = ta.MONEDA_ID "); - sb.append(" AND tao.RUTA_ID = ta.RUTA_ID "); - sb.append(" AND tao.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); - sb.append(" )"); - sb.append("INNER JOIN MARCA mTa ON tao.MARCA_ID = mTa.MARCA_ID "); - sb.append("INNER JOIN MARCA mTao ON ta.MARCA_ID = mTao.MARCA_ID "); - - sb.append("WHERE ta.VIGENCIATARIFA_ID = ").append(vigenciaTarifaId); - - if (orgao != null) { - sb.append(" AND tao.ORGAOCONCEDENTE_ID = ").append(orgao.getOrgaoConcedenteId()); - } - if (empresa != null) { - sb.append(" AND mTa.EMPRESA_ID = ").append(empresa.getEmpresaId()); - sb.append(" AND mTao.EMPRESA_ID = ").append(empresa.getEmpresaId()); - } - - return sb.toString(); - } - - @Override - public String getSQLAtualizarTarifaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, - Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP) { - - StringBuilder sb = new StringBuilder(""); - sb.append("UPDATE TARIFA SET "); - - if (calculaPegagio) { - sb.append("IMPORTEPEDAGIO=").append(dados.get("taoimportepedagio")).append(","); - sb.append(" COMPOSICAO_DO_PEAJE='").append(dados.get("taocomposicaodopeaje")).append("',"); - } - if (calculaTarifa) { - sb.append("PRECIO=").append(dados.get("taoprecio")).append(",PRECIOORIGINAL=").append(dados.get("taopreciooriginal")).append(","); - } - if (calculaTaxaEmbarque) { - sb.append("IMPORTETAXAEMBARQUE=").append(dados.get("taoimportetaxaembarque")).append(","); - } - if (calculaSeguro) { - sb.append("IMPORTESEGURO=").append(dados.get("taoimporteseguro")).append(","); - } - if (calculaTPP) { - sb.append("IMPORTETPP=").append(dados.get("taoimportetpp")).append(","); - } - sb.append("IMPORTEOUTROS=").append(dados.get("taoimporteoutros")).append(","); - sb.append("FECMODIF= current_timestamp, USUARIO_ID=").append(usuarioId); - sb.append(" WHERE TARIFA_ID = ").append(dados.get("tarifaId")); - - return sb.toString(); - } - - @Override - public String getSQLInserirTarifaPelaTarifaOficial(final Integer vigenciaTarifaId, final Integer usuarioId, Empresa empresa, OrgaoConcedente orgao) { - StringBuilder sb = new StringBuilder(""); - sb.append(" insert "); - sb.append(" into "); - sb.append(" TARIFA "); - sb.append(" ( TARIFA_ID, PRECIO, PRECIOREDABIERTO, TRAMO_ID, "); - sb.append(" MARCA_ID, CLASESERVICIO_ID, PRECIOORIGINAL, MONEDA_ID, "); - sb.append(" VIGENCIATARIFA_ID, STATUSTARIFA, ACTIVO, FECMODIF, "); - sb.append(" USUARIO_ID, IMPORTETAXAEMBARQUE, IMPORTEPEDAGIO, IMPORTEOUTROS, "); - sb.append(" IMPORTESEGURO, IMPORTETPP, ORGAOCONCEDENTE_ID, RUTA_ID, ORIGEN_ID, DESTINO_ID, COMPOSICAO_DO_PEAJE ) "); - sb.append(" select "); - sb.append(" TARIFA_SEQ.nextval, "); - sb.append(" tao.PRECIO , "); - sb.append(" tao.PRECIOREDABIERTO , "); - sb.append(" tao.TRAMO_ID , "); - sb.append(" tao.MARCA_ID , "); - sb.append(" tao.CLASESERVICIO_ID , "); - sb.append(" tao.PRECIOORIGINAL , "); - sb.append(" tao.MONEDA_ID , "); - sb.append(" v.VIGENCIATARIFA_ID , "); - sb.append(" tao.STATUSTARIFA , "); - sb.append(" tao.ACTIVO , "); - sb.append(" current_timestamp , "); - sb.append(" ").append(usuarioId).append(", "); - sb.append(" tao.IMPORTETAXAEMBARQUE , "); - sb.append(" tao.IMPORTEPEDAGIO , "); - sb.append(" tao.IMPORTEOUTROS , "); - sb.append(" tao.IMPORTESEGURO , "); - sb.append(" tao.IMPORTETPP , "); - sb.append(" tao.ORGAOCONCEDENTE_ID , "); - sb.append(" tao.RUTA_ID , "); - sb.append(" tao.ORIGEN_ID , "); - sb.append(" tao.DESTINO_ID, "); - sb.append(" tao.COMPOSICAO_DO_PEAJE "); - sb.append(" from "); - sb.append(" TARIFA_OFICIAL tao, "); - sb.append(" VIGENCIA_TARIFA v, "); - sb.append(" MARCA m "); - sb.append(" where "); - sb.append(" m.MARCA_ID=tao.MARCA_ID "); - sb.append(" and tao.ACTIVO=1 "); - sb.append(" and v.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append(" "); - - if (orgao != null) { - sb.append(" and tao.ORGAOCONCEDENTE_ID=").append(orgao.getOrgaoConcedenteId()).append(" "); - } - if (empresa != null) { - sb.append(" and m.EMPRESA_ID=").append(empresa.getEmpresaId()).append(" "); - } - - sb.append(" and not (exists (select "); - sb.append(" tar.TARIFA_ID "); - sb.append(" from "); - sb.append(" TARIFA tar "); - sb.append(" where "); - sb.append(" tar.ACTIVO=1 "); - sb.append(" and tar.TRAMO_ID=tao.TRAMO_ID "); - sb.append(" and tar.MARCA_ID=tao.MARCA_ID "); - sb.append(" and tar.CLASESERVICIO_ID=tao.CLASESERVICIO_ID "); - sb.append(" and tar.MONEDA_ID=tao.MONEDA_ID "); - sb.append(" and tar.ORGAOCONCEDENTE_ID=tao.ORGAOCONCEDENTE_ID "); - sb.append(" and tar.RUTA_ID=tao.RUTA_ID "); - sb.append(" and tar.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append("))"); - - return sb.toString(); - } - - @Override - public String getSQLActualizarCorridaFecHusoFecVerano() { - - StringBuilder sb = new StringBuilder(); - - sb.append(" update Corrida cq "); - sb.append(" set cq.fechorSalidaOriginalH = "); - sb.append(" ( "); - sb.append(" select "); - sb.append(" c.fechorSalidaOriginal "); - sb.append(" + nvl((c.origem.ciudad.estado.tiempoHorHuso/").append(HORAS_NO_DIA).append("), 0) "); - sb.append(" + nvl( case when "); - sb.append(" c.fechorSalidaOriginal between "); - sb.append(" c.origem.ciudad.estado.fecInicioHorVerano "); - sb.append(" and c.origem.ciudad.estado.fecFinoHorVerano "); - sb.append(" then (c.origem.ciudad.estado.tiempoHorVerano/").append(HORAS_NO_DIA).append(") "); - sb.append(" else 0 end, 0) "); - sb.append(" from Corrida c "); - sb.append(" where c.id.corridaId in ( :corridaId ) "); - sb.append(" and c.id.feccorrida in ( :feccorrida ) "); - sb.append(" and c.id.corridaId = cq.id.corridaId "); - sb.append(" and c.id.feccorrida = cq.id.feccorrida "); - sb.append(" ) "); - sb.append(" where cq.id.corridaId in ( :corridaId ) "); - sb.append(" and cq.id.feccorrida in ( :feccorrida ) "); - - return sb.toString(); - } - - @Override - public String getSQLActualizarCorridaTramoFecHusoFecVerano() { - StringBuilder sb = new StringBuilder(); - - sb.append(" update CorridaTramo ctq "); - sb.append(" set ctq.fechorSalidaOriginalH = :fechorSalidaOriginalH, ctq.fechorsalidaH = :fechorsalidaH, ctq.fechorllegadaH = :fechorllegadaH"); - sb.append(" where ctq.corridatramoId = :corridatramoId "); - - return sb.toString(); - } - - @Override - public String getSQLBuscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - - StringBuilder sb = new StringBuilder(""); - sb.append(" select "); - sb.append(" "); - sb.append(" c.CAJA_ID as \"cajaId\", "); - sb.append(" c.NUMASIENTO as \"numAsiento\", "); - sb.append(" c.CATEGORIA_ID as \"categoriaId\", "); - sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\", "); - sb.append(" c.CLASESERVICIO_ID as \"claseServicioId\", "); - sb.append(" c.MARCA_ID as \"marcaId\", "); - sb.append(" c.ORIGEN_ID as \"origenId\", "); - sb.append(" c.DESTINO_ID as \"destinoId\", "); - sb.append(" c.CORRIDA_ID as \"corridaId\", "); - sb.append(" c.FECCORRIDA as \"fecCorrida\", "); - sb.append(" c.NOMBPASAJERO as \"nombPasajero\", "); - sb.append(" c.PRECIOBASE as \"precioBase\", "); - sb.append(" c.PRECIOPAGADO as \"precioPagado\", "); - sb.append(" c.TIPOVENTA_ID as \"tipoVentaId\", "); - sb.append(" c.NUMSERIEPREIMPRESA as \"numSeriePreimpresa\", "); - sb.append(" c.NUMFOLIOPREIMPRESO as \"numFolioPreImpreso\", "); - sb.append(" c.FECHORVIAJE as \"fecHorViaje\", "); - sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); - sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); - sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); - sb.append(" c.NUMKMVIAJE as \"numKmViaje\", "); - sb.append(" c.NUMOPERACION as \"numOperacion\", "); - sb.append(" c.MOTIVOCANCELACION_ID as \"motivoCancelacionId\", "); - sb.append(" c.EMPRESAPUNTOVENTA_ID as \"empresaPuntoVentaId\", "); - sb.append(" c.EMPRESACORRIDA_ID as \"empresaCorridaId\", "); - sb.append(" c.TURNO_ID as \"turnoId\", "); - sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", "); - sb.append(" c.IMPORTEPEDAGIO as \"importePedagio\", "); - sb.append(" c.IMPORTEOUTROS as \"importeOutros\", "); - sb.append(" c.IMPORTESEGURO as \"importeSeguro\", "); - sb.append(" co.ruta_id as \"rutaId\", "); - sb.append(" c.usuario_id as \"usuarioId\", "); - sb.append(" ct.numautorizacion as \"numAutorizacion\", "); - sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\" "); - sb.append(" "); - sb.append(" from "); - sb.append(" caja c "); - sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida "); - sb.append(" left join caja_formapago cfp on cfp.caja_id = c.caja_id "); - sb.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); - sb.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); - sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sb.append(" "); - sb.append(" where "); - sb.append(" trunc(fechorventa) between to_date('").append(sdf.format(fechaDesde)).append("','yyyy-MM-dd') and ").append(" to_date('").append(sdf.format(fechaHasta)).append("','yyyy-MM-dd')"); - sb.append(" and c.feccorte ").append(yaCerrado ? " is not null" : " is null "); - sb.append(" "); - sb.append(" order by c.fechorventa,c.usuario_id,c.caja_id asc "); - - return sb.toString(); - } - - @Override - public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - - StringBuilder sb = new StringBuilder(""); - - sb.append(" select "); - sb.append(" "); - sb.append(" c.CAJA_ID as \"cajaId\", "); - sb.append(" c.NUMASIENTO as \"numAsiento\", "); - sb.append(" c.CATEGORIA_ID as \"categoriaId\", "); - sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\", "); - sb.append(" c.CLASESERVICIO_ID as \"claseServicioId\", "); - sb.append(" c.MARCA_ID as \"marcaId\", "); - sb.append(" c.ORIGEN_ID as \"origenId\", "); - sb.append(" c.DESTINO_ID as \"destinoId\", "); - sb.append(" c.CORRIDA_ID as \"corridaId\", "); - sb.append(" c.FECCORRIDA as \"fecCorrida\", "); - sb.append(" c.NOMBPASAJERO as \"nombPasajero\", "); - sb.append(" c.PRECIOBASE as \"precioBase\", "); - sb.append(" c.PRECIOPAGADO as \"precioPagado\", "); - sb.append(" c.TIPOVENTA_ID as \"tipoVentaId\", "); - sb.append(" c.NUMSERIEPREIMPRESA as \"numSeriePreimpresa\", "); - sb.append(" c.NUMFOLIOPREIMPRESO as \"numFolioPreImpreso\", "); - sb.append(" c.FECHORVIAJE as \"fecHorViaje\", "); - sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); - sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); - sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); - sb.append(" c.NUMKMVIAJE as \"numKmViaje\", "); - sb.append(" c.NUMOPERACION as \"numOperacion\", "); - sb.append(" c.MOTIVOCANCELACION_ID as \"motivoCancelacionId\", "); - sb.append(" c.EMPRESAPUNTOVENTA_ID as \"empresaPuntoVentaId\", "); - sb.append(" c.EMPRESACORRIDA_ID as \"empresaCorridaId\", "); - sb.append(" c.TURNO_ID as \"turnoId\", "); - sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", "); - sb.append(" c.IMPORTEPEDAGIO as \"importePedagio\", "); - sb.append(" c.IMPORTEOUTROS as \"importeOutros\", "); - sb.append(" c.IMPORTESEGURO as \"importeSeguro\", "); - sb.append(" co.ruta_id as \"rutaId\", "); - sb.append(" c.usuario_id as \"usuarioId\", "); - sb.append(" ct.numautorizacion as \"numAutorizacion\", "); - sb.append(" ct.tipotarjeta as \"tipotarjeta\", "); - sb.append(" ct.cantparcelas as \"cantparcelas\", "); - sb.append(" ct.numtarjeta as \"numtarjeta\", "); - sb.append(" ct.fecoperacion as \"fecoperacion\", "); - sb.append(" ct.nombtitular as \"nombtitular\", "); - sb.append(" fp.DESCPAGO as \"descPago\", "); - sb.append(" fp.formapago_id as \"formaPagoId\", "); - sb.append(" cfp.importe as \"vlrFormaPago\", "); - sb.append(" ca.CVECATEGORIA as \"cveCategoria\", "); - sb.append(" mc.DESCMOTIVO as \"descMotivo\", "); - sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\", "); - sb.append(" C.TRANSACAO_ID as \"transacaoId\", C.TRANSACAOORIGINAL_ID as \"transacaooriginalId\", "); - sb.append(" C.DESCNUMDOC as \"descnumdoc\", C.DESCNUMDOC2 as \"descnumdoc2\", C.DESCTIPODOC as \"desctipodoc\", "); - sb.append(" C.DESCTIPODOC2 as \"desctipodoc2\", C.DESCTELEFONO as \"desctelefono\", "); - sb.append(" ocd.ocd_id as \"ocdId\", ocd.numoperacion as \"numoperacionOcd\", "); - sb.append(" cdp.notacreditovendapacote_id as \"notacreditovendapacoteId\", "); - sb.append(" ct.descoperadoracartao as \"operadoracartao\", "); - sb.append(" sec.cvesecretaria as \"cvesecretaria\", "); - sb.append(" fp.tipo_pago as \"tipoPago\", "); - sb.append(" NVL(c.INDENCARGOVENTA,0) as \"indEncargoVenta\", "); - sb.append(" con.cveconvenio as \"cveconvenio\", "); - sb.append(" con.descconvenio as \"descconvenio\", "); - sb.append(" sec.descsecretaria as \"descsecretaria\" "); - sb.append(" from "); - sb.append(" caja c "); - sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida "); - sb.append(" left join caja_formapago cfp on cfp.caja_id = c.caja_id "); - sb.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); - sb.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); - sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sb.append(" inner join forma_pago fp on fp.formapago_id = cfp.FORMAPAGO_ID "); - sb.append(" inner join categoria ca on ca.categoria_id = c.categoria_id "); - sb.append(" left join motivo_cancelacion mc on mc.motivocancelacion_id = c.motivocancelacion_id "); - sb.append(" left join ocd ocd on ocd.ocd_id = cdp.ocd_id "); - sb.append(" left join secretaria sec on sec.secretaria_id = cdp.opcional1 "); - sb.append(" left join convenio_det cDet on cDet.conveniodet_id = c.conveniodet_id "); - sb.append(" left join convenio con on con.convenio_id = cDet.convenio_id "); - sb.append(" "); - sb.append(" where "); - sb.append(" trunc(fechorventa) between to_date('").append(sdf.format(fechaDesde)).append("','yyyy-MM-dd') and ").append(" to_date('").append(sdf.format(fechaHasta)).append("','yyyy-MM-dd')"); - - if (sembilhetesPacote != null && sembilhetesPacote) { - sb.append("and fp.tipo_pago != ") - .append(TipoFormapago.PACOTE.getValor()) - .append("and (c.motivocancelacion_id is null or c.motivocancelacion_id != ") - .append(Constantes.MVO_CANCEL_VENDA_PACOTE.intValue()) - .append(" ) "); - } - - sb.append(" order by c.fechorventa,c.usuario_id,c.caja_id asc "); - - return sb.toString(); - } - - @Override - public String getSQLBuscarUsuariosCajaCerrado(Date fecha, String cveusuario, String turnoid) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - - StringBuilder sb = new StringBuilder(""); - sb.append(" select distinct "); - sb.append(" "); - sb.append(" u.usuario_id as \"usuarioId\", "); - sb.append(" u.cveusuario as \"cveusuario\", "); - sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); - sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); - sb.append(" c.FECCORTE as \"fecCorte\", "); - sb.append(" c.TURNO_ID as \"turnoId\", "); - sb.append(" (select sum(importe) from conta_corrente_ptovta ccpv where ccpv.puntoventa_id = c.puntoventa_id and ccpv.usuario_id = c.usuario_id and ccpv.feccorte = c.feccorte and ccpv.turno_id = c.turno_id) as \"importeTotal\""); - sb.append(" "); - sb.append(" from "); - sb.append(" caja c "); - sb.append(" left join usuario u on c.usuario_id = u.usuario_id "); - sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); - sb.append(" "); - sb.append(" where "); - sb.append(" trunc(c.feccorte) = to_date('").append(sdf.format(fecha)).append("','yyyy-MM-dd')"); - - if (!cveusuario.equals("*")) { - sb.append(" and u.cveusuario like '" + cveusuario + "'"); - } - - if (!turnoid.equals("*")) { - sb.append(" and c.turno_id in(" + turnoid + ")"); - } else { - sb.append(" and c.turno_id is not null"); - } - - return sb.toString(); - } - - @Override - public String getSQLBuscarCajaCerrado(Integer usuarioId, Date fecha, String turnoid) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - - StringBuilder sb = new StringBuilder(""); - sb.append(" select "); - sb.append(" c.CAJA_ID as \"cajaId\", "); - sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\", "); - sb.append(" ori.descparada as \"origen\", "); - sb.append(" des.descparada as \"destino\", "); - sb.append(" c.CORRIDA_ID as \"corridaId\", "); - sb.append(" (case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end) as \"precioPagado\", "); - sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); - sb.append(" (case when c.motivocancelacion_id is null then c.IMPORTETAXAEMBARQUE else c.IMPORTETAXAEMBARQUE * -1 end) as \"importeTaxaEmbarque\", "); - sb.append(" ru.descruta as \"ruta\", "); - sb.append(" nvl(ct.numautorizacion, c.numoperacion) as \"numAutorizacion\", "); - sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\", "); - sb.append(" s.descsecretaria as \"secretaria\", "); - sb.append(" s.CVESECRETARIA as \"cvesecretaria\", "); - sb.append(" (case when fp.formapago_id = " + RED_PAGO_FORMAPAGO_ID).append(" then '" + RED_PAGO_EMISSOR_TARJETA + "' else ct.tipotarjeta end) as \"emissorTarjeta\", "); - sb.append(" cat.DESCCATEGORIA as \"tipoPasaje\", "); - sb.append(" (case when fp.formapago_id = " + RED_PAGO_FORMAPAGO_ID).append(" then '" + RED_PAGO_FORMA_PAGO + "' else fp.cvepago end) as \"formaPago\" "); - sb.append(" from "); - sb.append(" caja c "); - sb.append(" left join caja_formapago cfp on cfp.caja_id = c.caja_id "); - sb.append(" left outer join forma_pago fp on fp.formapago_id = cfp.formapago_id "); - sb.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); - sb.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); - sb.append(" left join categoria cat on cat.categoria_id = c.categoria_id "); - sb.append(" left join secretaria s on s.secretaria_id = cdp.opcional1 "); - sb.append(" left join ruta ru on ru.ruta_id = c.ruta_id "); - sb.append(" left join parada ori on ori.parada_id = c.origen_id "); - sb.append(" left join parada des on des.parada_id = c.destino_id "); - sb.append(" where "); - sb.append(" trunc(c.feccorte) = to_date('").append(sdf.format(fecha)).append("','yyyy-MM-dd')"); - sb.append(" and c.usuario_id = ").append(usuarioId); - if (!turnoid.equals("*")) { - sb.append(" and c.turno_id in(" + turnoid + ")"); - } else { - sb.append(" and c.turno_id is not null"); - } - sb.append(" and c.indreimpresion = 0"); - sb.append(" order by c.CAJA_ID"); - - return sb.toString(); - } - - @Override - public String getSQLBuscarReceitasDespesasCaja(Integer usuarioId, Date fec) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - StringBuilder sb = new StringBuilder(""); - sb.append(" select "); - sb.append(" "); - sb.append(" c.precio as \"precio\", "); - sb.append(" t.desctipoevento as \"tipoEvento\" "); - sb.append(" "); - sb.append(" from "); - sb.append(" caja_diversos c "); - sb.append(" left join evento_extra e on c.eventoextra_id = e.eventoextra_id "); - sb.append(" left join tipo_evento_extra t on t.tipoeventoextra_id = e.tipoeventoextra_id "); - sb.append(" "); - sb.append(" where "); - sb.append(" c.feccorte = to_date('").append(sdf.format(fec)).append("','yyyy-MM-dd')"); - sb.append(" and c.turno_id is not null and c.usuario_id = ").append(usuarioId); - - return sb.toString(); - } - - @Override - public String getSQLBuscarUsuariosActivo() { - StringBuilder sb = new StringBuilder(""); - - sb.append(" select distinct"); - sb.append(" u.usuario_id as \"usuarioId\","); - sb.append(" u.cveusuario as \"cveusuario\","); - sb.append(" u.NOMBUSUARIO||' '||u.NOMBPATERNO||' '||u.NOMBMATERNO as \"nombusuario\""); - sb.append(" from"); - sb.append(" usuario u"); - sb.append(" where"); - sb.append(" u.activo = 1"); - sb.append(" order by"); - sb.append(" u.usuario_id"); - - return sb.toString(); - } - - @Override - public String getSQLInserirCajaVendaEmbarcada() { - StringBuilder sb = new StringBuilder(); - - sb.append("insert into caja "); - sb.append("(caja_id, numasiento, categoria_id,numfoliosistema,claseservicio_id, marca_id, origen_id, destino_id, corrida_id, feccorrida,nombpasajero, preciobase, "); - sb.append("preciopagado,descuentoamparado, tipoventa_id, numseriepreimpresa, numfoliopreimpreso, fechorviaje, fechorventa, puntoventa_id,numkmviaje, numoperacion,"); - sb.append("indstatusoperacion,motivocancelacion_id, motivoreimpresion_id, cantpuntos, empresapuntoventa_id, empresacorrida_id, numreservacion, turno_id,"); - sb.append("indstatusboleto,indcancelacion, indreimpresion,indviajeredondo, feccorte, indextraviado, paridad, feccreacion, conveniodet_id, moneda_id, estacion_id,"); - sb.append("indreplica, usuarioautorizacion_id, tipoidentificacion_id, numidentificacion,clientefidelidad_id, opcional1, opcional2, opcional3, preciocargoextra,"); - sb.append("preciopricing, cajaoriginal_id, usuarioremoto_id, puntoventaremoto_id, numdocdescuento, canttransferencia,activo, fecmodif, usuario_id, nodo_id,"); - sb.append("porccategoria,importecategoria, cliente_id, pagorecaudacion_id, pagorecaudacion2_id, importetaxaembarque, importepedagio, importeoutros,"); - sb.append("importeseguro, indconexion, levante_id, ruta_id, serieimpfiscal, fecintegracion, ptovtaventa_id, indremotoinverso, fecnacimiento)"); - sb.append("values ("); - sb.append(":cajaId,:numAsiento,:categoriaId,null,:claseServicioId,:marcaId,:origemId,:destinoId,:corridaId,:fecCorrida,null,:precioBase,"); - sb.append(":precioPagado,null, :tipoVentaId, null, :numFolioPreimpresso, :fechorViaje, :fechorVenta, :puntoVentaId,null, :numOperacion,"); - sb.append("'F',null, null, null, :empresaPuntoVentaId, :empresaCorridaId, null, null,"); - sb.append("'V', 0, 0, 0, null, 0, null, :fecCreacion, null, null, :estacionId,"); - sb.append("0, null, null, null,null, null, null, null, null,"); - sb.append("null, null, null, null, null, null, 1, :fecModIf, :usuarioId, 1,"); - sb.append("null, null, null, null, null, :importeTaxaEmbarque, :importePedagio, :importeOutros,"); - sb.append(":importeSeguro, 0, null, :rutaId, :serieImpFiscal, null, null, 0, null)"); - - return sb.toString(); - } - - @Override - public String getSQLInserirCajaFormaPagoVendaEmbarcada() { - StringBuilder sb = new StringBuilder(); - - sb.append("insert into caja_formapago "); - sb.append("(formapago_id, caja_id, importe, activo, fecmodif, usuario_id, indreplica, nodo_id, cajaformapago_id) values "); - sb.append("(:formaPagoId, :cajaId, :importe, 1, :fecModIf, :usuarioId, null, 1, :cajaFormaPagoId)"); - - return sb.toString(); - } - - @Override - public String getSQLInserirBoletoVendaEmbarcada() { - StringBuilder sb = new StringBuilder(); - - sb.append("insert into boleto "); - sb.append("(empresacorrida_id, destino_id, tipoventa_id, categoria_id, motivoreimpresion_id, claseservicio_id, corrida_id, feccorrida, puntoventa_id,"); - sb.append("empresapuntoventa_id, turno_id, motivocancelacion_id, origen_id, marca_id, conveniodet_id, cliente_id, numasiento, numfoliosistema,"); - sb.append("nombpasajero,fecnacimiento,preciopagado,paridad, numseriepreimpresa, numfoliopreimpreso, fechorviaje, fechorventa, numkmviaje, numoperacion,"); - sb.append("indstatusoperacion, cantpuntos, numreservacion, indstatusboleto, indcancelacion, indreimpresion, indviajeredondo, feccreacion, activo,"); - sb.append("indconexion, fecmodif, usuario_id, usuarioautorizacion_id, tipoidentificacion_id, numidentificacion, indextraviado, preciobase, entregaboleto_id,"); - sb.append("opcional1,opcional2, opcional3, descuentoamparado, moneda_id, estacion_id, usuarioremoto_id, puntoventaremoto_id, preciocargoextra, nodo_id,"); - sb.append("indreplica, numdocdescuento, canttransferencia, porccategoria, preciopricing, importecategoria, boletooriginal_id, importetaxaembarque,"); - sb.append("importepedagio, importeoutros, importeseguro, desctipodoc, desctipodoc2, descnumdoc, descnumdoc2, tipoidentificaciondoc_id, descorgaodoc,"); - sb.append("NUMFIDELIDAD, INFOPASAJERO, LEVANTE_ID, ESTADOFOLIO_ID, RUTA_ID, DESCCORREO, DESCTELEFONO, SERIEIMPFISCAL,NUMASIENTOVINCULADO, BOLETO_ID) values "); - - sb.append("(:empresaCorridaId, :destinoId, :tipoVentaId, :categoriaId, null, :claseServicioId, :corridaId, :fecCorrida, :puntoVentaId, "); - sb.append(":empresaPuntoVentaId, null, null, :origemId, :marcaId, null, null, :numAsiento, null,"); - sb.append("null,null,:precioPagado,null,null, :numFolioPreimpresso, :fechorViaje, :fechorVenta, null, :numOperacion,"); - sb.append("'F', null, null, 'V', 0, 0, 0, null, 1,"); - sb.append("0, :fecModIf, :usuarioId,null, null, null, 0, :precioBase, null,"); - sb.append("null,null, null, null, null, :estacionId, null, null, null,1,"); - sb.append("0, null, null, null, :precioPricing, null, null, :importeTaxaEmbarque,"); - sb.append(":importePedagio, :importeOutros, :importeSeguro, null, null, null, null, null, null,"); - sb.append("null, null, null, null, :rutaId, null, null, :serieImpFiscal, null, :boletoId)"); - - return sb.toString(); - } - - @Override - public String getSQLInserirBoletoFormaPagoVendaEmbarcada() { - StringBuilder sb = new StringBuilder(); - - sb.append("insert into boleto_formapago "); - sb.append("(formapago_id, boleto_id, importe, fecmodif, usuario_id, activo, indreplica, nodo_id, boletoformapago_id) values "); - sb.append("(:formaPagoId, :boletoId, :importe, :fecModIf, :usuarioId, 1, 0, 1,:boletoFormaPagoId)"); - - return sb.toString(); - } - - @Override - public String getSQLObterSequenceBoletoFormaPago() { - return "select boleto_formapago_seq.nextval from dual"; - } - - @Override - public String getSQLObterSequenceCajaFormaPago() { - return "select caja_formapago_seq.nextval from dual"; - } - - @Override - public String getSQLObterSequenceBoleto() { - return "select boleto_seq.nextval from dual"; - } - - @Override - public String getSQLObterSequenceCaja() { - return "select caja_seq.nextval from dual"; - } - - @Override - public String getSQLObterSequenciaNumOperacion() { - return "select numeoperacion_seq.nextval from dual"; - } - - @Override - public String getSQLInserirTarifaEmbarcadaPelaTarifaOficial(final Integer vigenciaTarifaId, final Integer usuarioId, Empresa empresa, OrgaoConcedente orgao) { - StringBuilder sb = new StringBuilder(""); - sb.append(" insert "); - sb.append(" into "); - sb.append(" TARIFA_EMBARCADA "); - sb.append(" ( TARIFAEMBARCADA_ID, PRECIO, PRECIOREDABIERTO, TRAMO_ID, "); - sb.append(" MARCA_ID, CLASESERVICIO_ID, PRECIOORIGINAL, MONEDA_ID, "); - sb.append(" VIGENCIATARIFA_ID, STATUSTARIFA, ACTIVO, FECMODIF, "); - sb.append(" USUARIO_ID, IMPORTETAXAEMBARQUE, IMPORTEPEDAGIO, IMPORTEOUTROS, "); - sb.append(" IMPORTESEGURO, IMPORTETPP, ORGAOCONCEDENTE_ID, RUTA_ID, ORIGEN_ID, DESTINO_ID ) "); - sb.append(" select "); - sb.append(" TARIFA_EMBARCADA_SEQ.nextval, "); - sb.append(" tao.PRECIO , "); - sb.append(" tao.PRECIOREDABIERTO , "); - sb.append(" tao.TRAMO_ID , "); - sb.append(" tao.MARCA_ID , "); - sb.append(" tao.CLASESERVICIO_ID , "); - sb.append(" tao.PRECIOORIGINAL , "); - sb.append(" tao.MONEDA_ID , "); - sb.append(" v.VIGENCIATARIFA_ID , "); - sb.append(" tao.STATUSTARIFA , "); - sb.append(" tao.ACTIVO , "); - sb.append(" current_timestamp , "); - sb.append(" ").append(usuarioId).append(", "); - sb.append(" tao.IMPORTETAXAEMBARQUE , "); - sb.append(" tao.IMPORTEPEDAGIO , "); - sb.append(" tao.IMPORTEOUTROS , "); - sb.append(" tao.IMPORTESEGURO , "); - sb.append(" tao.IMPORTETPP , "); - sb.append(" tao.ORGAOCONCEDENTE_ID , "); - sb.append(" tao.RUTA_ID , "); - sb.append(" tao.ORIGEN_ID , "); - sb.append(" tao.DESTINO_ID "); - sb.append(" from "); - sb.append(" TARIFA_OFICIAL tao, "); - sb.append(" VIGENCIA_TARIFA v, "); - sb.append(" MARCA m "); - sb.append(" where "); - sb.append(" m.MARCA_ID=tao.MARCA_ID "); - sb.append(" and tao.ACTIVO=1 "); - sb.append(" and v.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append(" "); - - if (orgao != null) { - sb.append(" and tao.ORGAOCONCEDENTE_ID=").append(orgao.getOrgaoConcedenteId()).append(" "); - } - if (empresa != null) { - sb.append(" and m.EMPRESA_ID=").append(empresa.getEmpresaId()).append(" "); - } - - sb.append(" and not (exists (select "); - sb.append(" tar.TARIFAEMBARCADA_ID "); - sb.append(" from "); - sb.append(" TARIFA_EMBARCADA tar "); - sb.append(" where "); - sb.append(" tar.ACTIVO=1 "); - sb.append(" and tar.TRAMO_ID=tao.TRAMO_ID "); - sb.append(" and tar.MARCA_ID=tao.MARCA_ID "); - sb.append(" and tar.CLASESERVICIO_ID=tao.CLASESERVICIO_ID "); - sb.append(" and tar.MONEDA_ID=tao.MONEDA_ID "); - sb.append(" and tar.ORGAOCONCEDENTE_ID=tao.ORGAOCONCEDENTE_ID "); - sb.append(" and tar.RUTA_ID=tao.RUTA_ID "); - sb.append(" and tar.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append("))"); - - return sb.toString(); - } - - @Override - public String getSQLSelecionarTarifaEmbarcadaPorTarifaOficalParaAtualizar(final Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao) { - StringBuilder sb = new StringBuilder(""); - - sb.append("SELECT tao.IMPORTEPEDAGIO AS \"taoimportepedagio\", "); - sb.append(" tao.PRECIO AS \"taoprecio\", "); - sb.append(" tao.PRECIOORIGINAL AS \"taopreciooriginal\", "); - sb.append(" tao.IMPORTETAXAEMBARQUE AS \"taoimportetaxaembarque\", "); - sb.append(" tao.IMPORTESEGURO AS \"taoimporteseguro\", "); - sb.append(" tao.IMPORTETPP AS \"taoimportetpp\", "); - sb.append(" tao.IMPORTEOUTROS AS \"taoimporteoutros\", "); - sb.append(" ta.TARIFAEMBARCADA_ID AS \"tarifaId\" "); - - sb.append("FROM TARIFA_OFICIAL tao "); - sb.append("INNER JOIN TARIFA_EMBARCADA ta ON (tao.MARCA_ID = ta.MARCA_ID "); - sb.append(" AND tao.CLASESERVICIO_ID = ta.CLASESERVICIO_ID "); - sb.append(" AND tao.TRAMO_ID = ta.TRAMO_ID "); - sb.append(" AND tao.MONEDA_ID = ta.MONEDA_ID "); - sb.append(" AND tao.RUTA_ID = ta.RUTA_ID "); - sb.append(" AND tao.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); - sb.append(" )"); - sb.append("INNER JOIN MARCA mTa ON tao.MARCA_ID = mTa.MARCA_ID "); - sb.append("INNER JOIN MARCA mTao ON ta.MARCA_ID = mTao.MARCA_ID "); - - sb.append("WHERE ta.VIGENCIATARIFA_ID = ").append(vigenciaTarifaId); - - if (orgao != null) { - sb.append(" AND tao.ORGAOCONCEDENTE_ID = ").append(orgao.getOrgaoConcedenteId()); - } - if (empresa != null) { - sb.append(" AND mTa.EMPRESA_ID = ").append(empresa.getEmpresaId()); - sb.append(" AND mTao.EMPRESA_ID = ").append(empresa.getEmpresaId()); - } - - return sb.toString(); - } - - @Override - public String getSQLAtualizarTarifaEmbarcadaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, - Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP) { - - StringBuilder sb = new StringBuilder(""); - sb.append("UPDATE TARIFA_EMBARCADA SET "); - - if (calculaPegagio) { - sb.append("IMPORTEPEDAGIO=").append(dados.get("taoimportepedagio")).append(","); - } - if (calculaTarifa) { - sb.append("PRECIO=").append(dados.get("taoprecio")).append(",PRECIOORIGINAL=").append(dados.get("taopreciooriginal")).append(","); - } - if (calculaTaxaEmbarque) { - sb.append("IMPORTETAXAEMBARQUE=").append(dados.get("taoimportetaxaembarque")).append(","); - } - if (calculaSeguro) { - sb.append("IMPORTESEGURO=").append(dados.get("taoimporteseguro")).append(","); - } - if (calculaTPP) { - sb.append("IMPORTETPP=").append(dados.get("taoimportetpp")).append(","); - } - sb.append("IMPORTEOUTROS=").append(dados.get("taoimporteoutros")).append(","); - sb.append("FECMODIF= current_timestamp, USUARIO_ID=").append(usuarioId); - sb.append(" WHERE TARIFAEMBARCADA_ID = ").append(dados.get("tarifaId")); - - return sb.toString(); - } - - @Override - public String getSqlRemoverDuplicidadeNaTarifaOficial() { - // TODO Auto-generated method stub - StringBuilder sb = new StringBuilder("DELETE FROM tarifa_oficial "); - sb.append("WHERE ROWID IN ( "); - sb.append("SELECT rid FROM( "); - sb.append("SELECT ROWID rid, ROW_NUMBER() "); - sb.append("OVER(PARTITION BY orgaoconcedente_id, ruta_id, tramo_id, claseservicio_id, marca_id ORDER BY ROWID) rn "); - sb.append("FROM tarifa_oficial) "); - sb.append("WHERE rn <> 1 )"); - - return sb.toString(); - } - - - +package com.rjconsultores.ventaboletos.dao.sqlbuilder.impl; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder; +import com.rjconsultores.ventaboletos.dao.util.DBUtil; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.enums.TipoFormapago; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; + +public class SQLBuilderOracle implements SQLBuilder { + private static final Integer SELECAO_TODOS = -1; + private static final Integer HORAS_NO_DIA = Integer.valueOf(24); + private static final Integer RED_PAGO_FORMAPAGO_ID = Integer.valueOf(95); + private static final String RED_PAGO_EMISSOR_TARJETA = "RDP"; + private static final String RED_PAGO_FORMA_PAGO = "CR"; + private static final Integer DER_PR = 2; + + @Override + public String getSQLGerarTabelaZerada(final Integer codRuta, final Integer usuarioId, final Integer orgaoConcedenteId, final List idsEmpresas, List lsParadaId) { + + StringBuilder sb = new StringBuilder(); + sb.append("INSERT "); + sb.append("INTO "); + sb.append(" TARIFA_OFICIAL "); + sb.append(" ( "); + sb.append(" TARIFAOFICIAL_ID, "); + sb.append(" PRECIO, "); + sb.append(" PRECIOORIGINAL, "); + sb.append(" TRAMO_ID, "); + sb.append(" MARCA_ID, "); + sb.append(" CLASESERVICIO_ID, "); + sb.append(" PRECIOREDABIERTO, "); + sb.append(" MONEDA_ID, "); + sb.append(" VIGENCIATARIFA_ID, "); + sb.append(" STATUSTARIFA, "); + sb.append(" IMPORTETAXAEMBARQUE, "); + sb.append(" IMPORTEPEDAGIO, "); + sb.append(" IMPORTEOUTROS, "); + sb.append(" IMPORTESEGURO, "); + sb.append(" ORGAOCONCEDENTE_ID, "); + sb.append(" RUTA_ID, "); + sb.append(" ACTIVO, "); + sb.append(" FECMODIF, "); + sb.append(" USUARIO_ID, "); + sb.append(" ORIGEN_ID, "); + sb.append(" DESTINO_ID "); + sb.append(" ) "); + sb.append(" select "); + sb.append(" "); + sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); + sb.append(" 0, "); + sb.append(" 0, "); + sb.append(" t.tramo_id, "); + sb.append(" mc.marca_id, "); + sb.append(" r.CLASESERVICIO_ID, "); + sb.append(" null, "); + sb.append(" m.moneda_id, "); + sb.append(" null, "); + sb.append(" 'A', "); + sb.append(" null, "); + sb.append(" null, "); + sb.append(" null, "); + sb.append(" null, "); + sb.append(" oc.orgaoconcedente_id, "); + sb.append(" r.ruta_id, "); + sb.append(" 1, "); + sb.append(" ").append(DBUtil.getInstance().dbSysdate()).append(", "); + sb.append(" ").append(usuarioId).append(", "); + sb.append(" po.parada_id, "); + sb.append(" pd.parada_id "); + sb.append(" "); + sb.append("from "); + sb.append(" ruta_combinacion rc "); + sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sb.append(" inner join ruta_empresa re on r.ruta_id = re.ruta_id "); + sb.append(" inner join marca ma on ma.empresa_id = re.empresa_id "); + sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id =r.orgaoconcedente_id "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sb.append(" inner join parada po on po.parada_id = t.origen_id "); + sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); + sb.append(" inner join estado e on e.estado_id = c.estado_id "); + sb.append(" inner join MARCA_CLASESERVICIO mc on "); + sb.append(" mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and ma.marca_id = mc.marca_id, "); + sb.append(" moneda m "); + sb.append(" "); + sb.append("where "); + sb.append(" rc.activo = 1 "); + if (codRuta != null) { + sb.append(" and r.ruta_id = ").append(codRuta); + } + sb.append(" and r.activo = 1 "); + sb.append(" and mc.marca_id <> -1 "); + sb.append(" and mc.activo = 1 "); + sb.append(" and re.activo = 1 "); + if (idsEmpresas != null) { + sb.append(" and re.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + } + sb.append(" and m.moneda_id = 1 "); + if (orgaoConcedenteId != null) { + sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + sb.append(" and "); + sb.append(" (t.tramo_id, "); + sb.append(" mc.marca_id, "); + sb.append(" r.CLASESERVICIO_ID, "); + sb.append(" m.moneda_id, "); + sb.append(" oc.orgaoconcedente_id, r.ruta_id) "); + sb.append(" not in (select tao.tramo_id,tao.marca_id,tao.CLASESERVICIO_ID, "); + sb.append(" tao.moneda_id,tao.orgaoconcedente_id, tao.ruta_id "); + sb.append(" from tarifa_oficial tao where tao.activo = 1) "); + if (null != lsParadaId) { + sb.append(" and t.origen_id in (").append(lsParadaId.toString().substring(1, lsParadaId.toString().length() - 1)).append(" ) "); + } + + return sb.toString(); + } + + @Override + public String getSQLGerarTarifaOficialArtesp(final Integer codRuta, final Integer usuarioId, + final Integer orgaoConcedenteId, final List idsEmpresas) { + StringBuilder sb = new StringBuilder(); + sb.append(" INSERT "); + sb.append(" INTO "); + sb.append(" TARIFA_OFICIAL "); + sb.append(" ( "); + sb.append(" TARIFAOFICIAL_ID, "); + sb.append(" PRECIO, "); + sb.append(" PRECIOORIGINAL, "); + sb.append(" TRAMO_ID, "); + sb.append(" MARCA_ID, "); + sb.append(" CLASESERVICIO_ID, "); + sb.append(" PRECIOREDABIERTO, "); + sb.append(" MONEDA_ID, "); + sb.append(" VIGENCIATARIFA_ID, "); + sb.append(" STATUSTARIFA, "); + sb.append(" IMPORTETAXAEMBARQUE, "); + sb.append(" IMPORTEPEDAGIO, "); + sb.append(" IMPORTEOUTROS, "); + sb.append(" IMPORTESEGURO, "); + sb.append(" ORGAOCONCEDENTE_ID, "); + sb.append(" RUTA_ID, "); + sb.append(" ACTIVO, "); + sb.append(" FECMODIF, "); + sb.append(" USUARIO_ID, "); + sb.append(" ORIGEN_ID, "); + sb.append(" DESTINO_ID "); + sb.append(" ) "); + sb.append(" select "); + sb.append(" "); + sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); + + sb.append(" ROUND( "); + sb.append(" ("); + sb.append(" "); + sb.append(" case ( coalesce((select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) , 0 )) when 0 then"); + sb.append(" (select max( tkm.valortaxa ) from Tarifa_km tkm where tkm.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tkm.activo = 1)"); + sb.append(" else"); + sb.append(" (select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) end"); + sb.append(" ) "); + sb.append(" ,2), "); + + sb.append(" ROUND( "); + sb.append(" ("); + sb.append(" "); + sb.append(" case ( coalesce((select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) , 0 )) when 0 then"); + sb.append(" (select max( tkm.valortaxa ) from Tarifa_km tkm where tkm.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tkm.activo = 1)"); + sb.append(" else"); + sb.append(" (select min( tkm.valortaxa ) from Tarifa_km tkm where tkm.kmate >= t.cantkmreal and r.CLASESERVICIO_ID = tkm.CLASESERVICIO_ID and tkm.activo = 1) end"); + sb.append(" ) "); + sb.append(" ,2), "); + + sb.append(" t.tramo_id, "); + sb.append(" mc.marca_id, "); + sb.append(" r.CLASESERVICIO_ID, "); + sb.append(" null, "); + sb.append(" m.moneda_id, "); + sb.append(" null, "); + sb.append(" 'A', "); + sb.append(" null, "); + sb.append(" null, "); + sb.append(" null, "); + sb.append(" null, "); + sb.append(" oc.orgaoconcedente_id, "); + sb.append(" r.ruta_id, "); + sb.append(" 1, "); + sb.append(" ").append(DBUtil.getInstance().dbSysdate()).append(", "); + sb.append(" ").append(usuarioId).append(", "); + sb.append(" po.parada_id, "); + sb.append(" pd.parada_id "); + sb.append(" "); + sb.append("from "); + sb.append(" ruta_combinacion rc "); + sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sb.append(" inner join ruta_empresa re on r.ruta_id = re.ruta_id "); + sb.append(" inner join marca ma on ma.empresa_id = re.empresa_id "); + sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id =r.orgaoconcedente_id "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id and t.activo =1");// adicionei isso t.activo =1"); + sb.append(" inner join parada po on po.parada_id = t.origen_id "); + sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); + sb.append(" inner join estado e on e.estado_id = c.estado_id "); + sb.append(" inner join MARCA_CLASESERVICIO mc on "); + sb.append(" mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and ma.marca_id = mc.marca_id, "); + sb.append(" moneda m "); + sb.append(" "); + sb.append("where "); + + sb.append(" rc.activo = 1 "); + if (codRuta != null) { + sb.append(" and r.ruta_id = ").append(codRuta); + } + sb.append(" and r.activo = 1 "); + sb.append(" and mc.marca_id <> -1 "); + sb.append(" and mc.activo = 1 "); + sb.append(" and re.activo = 1 "); + sb.append(" and r.orgaoconcedente_id = 21 "); + if (idsEmpresas != null) { + sb.append(" and re.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + } + sb.append(" and m.moneda_id = 1 "); + if (orgaoConcedenteId != null) { + sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + sb.append(" and "); + sb.append(" (t.tramo_id, "); + sb.append(" mc.marca_id, "); + sb.append(" r.CLASESERVICIO_ID, "); + sb.append(" m.moneda_id, "); + sb.append(" oc.orgaoconcedente_id, r.ruta_id) "); + sb.append(" not in (select tao.tramo_id,tao.marca_id,tao.CLASESERVICIO_ID, "); + sb.append(" tao.moneda_id,tao.orgaoconcedente_id, tao.ruta_id "); + sb.append(" from tarifa_oficial tao where tao.activo = 1) "); + + return sb.toString(); + } + + @Override + public String getSQLGerarTarifaOficial(final Integer codRuta, final Integer usuarioId, + final OrgaoConcedente orgaoConcedente, final List idsEmpresas,Integer[] listCasetaPeaje) { + + StringBuilder sb = new StringBuilder(); + sb.append(" INSERT "); + sb.append(" INTO "); + sb.append(" TARIFA_OFICIAL "); + sb.append(" ( "); + sb.append(" TARIFAOFICIAL_ID, "); + sb.append(" PRECIO, "); + sb.append(" PRECIOORIGINAL, "); + sb.append(" TRAMO_ID, "); + sb.append(" MARCA_ID, "); + sb.append(" CLASESERVICIO_ID, "); + sb.append(" PRECIOREDABIERTO, "); + sb.append(" MONEDA_ID, "); + sb.append(" VIGENCIATARIFA_ID, "); + sb.append(" STATUSTARIFA, "); + sb.append(" IMPORTETAXAEMBARQUE, "); + sb.append(" IMPORTEPEDAGIO, "); + sb.append(" IMPORTEOUTROS, "); + sb.append(" IMPORTESEGURO, "); + sb.append(" ORGAOCONCEDENTE_ID, "); + sb.append(" RUTA_ID, "); + sb.append(" ACTIVO, "); + sb.append(" FECMODIF, "); + sb.append(" USUARIO_ID, "); + sb.append(" ORIGEN_ID, "); + sb.append(" DESTINO_ID "); + sb.append(" ) "); + + sb.append(" WITH tarifacte AS ( "); + + sb.append(" select DISTINCT "); + sb.append(" "); + + // >> SE ORGAO FOR DER-PR E SE O COEFICIENTE DA CLASSE NAO ESTA NULL + sb.append(" CASE R.ORGAOCONCEDENTE_ID WHEN " + DER_PR + " THEN CASE WHEN cl.COEFICIENTETARIFA IS NOT NULL THEN "); + sb.append(" trunc(((coalesce(ct1.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente1,0) + 350,0.27)*16160 )) ) * COALESCE(tc.kmcoeficiente1,0)) * cl.COEFICIENTETARIFA "); + sb.append(" + ((coalesce(ct2.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente2,0) + 350,0.27)*13470 )) ) * COALESCE(tc.kmcoeficiente2,0)) * cl.COEFICIENTETARIFA,2) "); + sb.append(" ELSE "); + // < COEFICIENTE DA CLASSE ESTA NULL + sb.append(" ROUND( "); + sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); + sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); + if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { + sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); + } else { + sb.append(" 1, 2 ) "); + } + // + sb.append(" end else "); + // < ORGAO NAO EH DER-PR + sb.append(" ROUND( "); + sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); + sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); + if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { + sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); + } else { + sb.append(" 1, 2 ) "); + } + sb.append(" end as precio, "); + // + // >> SE ORGAO FOR DER-PR E SE O COEFICIENTE DA CLASSE NAO ESTA NULL + sb.append(" CASE R.ORGAOCONCEDENTE_ID WHEN " + DER_PR + " THEN CASE WHEN cl.COEFICIENTETARIFA IS NOT NULL THEN "); + sb.append(" trunc(((coalesce(ct1.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente1,0) + 350,0.27)*16160 )) ) * COALESCE(tc.kmcoeficiente1,0)) * cl.COEFICIENTETARIFA "); + sb.append(" + ((coalesce(ct2.coeficiente,0) + oc.coeficientetarifa / ((POWER(COALESCE(tc.kmcoeficiente2,0) + 350,0.27)*13470 )) ) * COALESCE(tc.kmcoeficiente2,0)) * cl.COEFICIENTETARIFA,2) "); + sb.append(" ELSE "); + // < COEFICIENTE DA CLASSE ESTA NULL + sb.append(" ROUND( "); + sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); + sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); + if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { + sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); + } else { + sb.append(" 1, 2 ) "); + } + // + sb.append(" end else "); + // < ORGAO NAO EH DER-PR + sb.append(" ROUND( "); + sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); + sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); + if (orgaoConcedente != null && orgaoConcedente.getIndUtilizaICMS() != null && orgaoConcedente.getIndUtilizaICMS()) { + sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2) "); + } else { + sb.append(" 1, 2 ) "); + } + sb.append(" end as preciooriginal , "); + // + sb.append(" t.tramo_id, "); + sb.append(" mc.marca_id, "); + sb.append(" r.CLASESERVICIO_ID, "); + sb.append(" null as precioredabierto, "); + sb.append(" m.moneda_id, "); + sb.append(" null as vigenciatarifa_id, "); + sb.append(" 'A' as statustarifa, "); + sb.append(" null as importetaxaembarque, "); + sb.append(" null as importepedagio, "); + sb.append(" null as importeoutros, "); + sb.append(" null as importeseguro, "); + sb.append(" oc.orgaoconcedente_id, "); + sb.append(" r.ruta_id, "); + sb.append(" 1 as activo, "); + sb.append(" ").append(DBUtil.getInstance().dbSysdate()).append(" as fecmodif, "); + sb.append(" ").append(usuarioId).append(" as usuario_id, "); + sb.append(" po.parada_id as origen_id, "); + sb.append(" pd.parada_id as destino_id"); + sb.append(" "); + sb.append("from "); + sb.append(" ruta_combinacion rc "); + sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sb.append(" inner join ruta_empresa re on r.ruta_id = re.ruta_id "); + sb.append(" inner join marca ma on ma.empresa_id = re.empresa_id "); + sb.append(" inner join orgao_tramo tc on tc.tramo_id = rc.tramo_id "); + sb.append(" and tc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tc.activo =1 "); + sb.append(" inner join orgao_concedente oc on "); + sb.append(" oc.orgaoconcedente_id = tc.orgaoconcedente_id "); + sb.append(" and oc.orgaoconcedente_id =r.orgaoconcedente_id "); + sb.append(" inner join coeficiente_tarifa ct1 on ct1.coeficientetarifa_id = tc.coeficientetarifa1_id "); + sb.append(" left join coeficiente_tarifa ct2 on ct2.coeficientetarifa_id = tc.coeficientetarifa2_id "); + sb.append(" left join coeficiente_tarifa ct3 on ct3.coeficientetarifa_id = tc.coeficientetarifa3_id "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sb.append(" inner join parada po on po.parada_id = t.origen_id "); + sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); + sb.append(" inner join estado e on e.estado_id = c.estado_id "); + sb.append(" inner join MARCA_CLASESERVICIO mc on "); + sb.append(" mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and ma.marca_id = mc.marca_id "); + if(null !=listCasetaPeaje) { + sb.append(" inner join peaje p on p.ruta_id=r.ruta_id and p.origen_id=po.parada_id and p.destino_id=pd.parada_id and p.orgaoconcedente_id =oc.orgaoconcedente_id "); + } + sb.append(" inner join CLASE_SERVICIO cl on cl.claseservicio_id = r.CLASESERVICIO_ID, "); + sb.append(" moneda m "); + + sb.append(" "); + sb.append("where "); + sb.append(" rc.activo = 1 "); + if (codRuta != null) { + sb.append(" and r.ruta_id = ").append(codRuta); + } + sb.append(" and r.activo = 1 "); + sb.append(" and tc.activo = 1 "); + sb.append(" and mc.marca_id <> -1 "); + sb.append(" and mc.activo = 1 "); + sb.append(" and re.activo = 1 "); + sb.append(" and r.orgaoconcedente_id <> 21 "); + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.CRIAR_TARIFA_APENAS_TRECHO_VENDIDO.getDescricao())) { + sb.append(" and rc.indventa = 1 "); + } + if (idsEmpresas != null) { + sb.append(" and re.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + } + sb.append(" and m.moneda_id = 1 "); + sb.append(" and ma.activo = 1 "); + if (orgaoConcedente != null && orgaoConcedente.getOrgaoConcedenteId() != null && orgaoConcedente.getOrgaoConcedenteId() != SELECAO_TODOS) { + sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedente.getOrgaoConcedenteId()); + } + sb.append(" and "); + sb.append(" (t.tramo_id, "); + sb.append(" mc.marca_id, "); + sb.append(" r.CLASESERVICIO_ID, "); + sb.append(" m.moneda_id, "); + sb.append(" oc.orgaoconcedente_id, r.ruta_id) "); + sb.append(" not in (select tao.tramo_id,tao.marca_id,tao.CLASESERVICIO_ID, "); + sb.append(" tao.moneda_id,tao.orgaoconcedente_id, tao.ruta_id "); + sb.append(" from tarifa_oficial tao where tao.activo = 1) "); + if(null !=listCasetaPeaje) { + sb.append(" and p.activo=1 "); + sb.append(" and p.casetapeaje_id in ( " + StringUtils.join(listCasetaPeaje,",") + ") "); + } + + sb.append(" ) "); + + sb.append(" SELECT "); + + sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); + sb.append(" PRECIO, "); + sb.append(" PRECIOORIGINAL, "); + sb.append(" TRAMO_ID, "); + sb.append(" MARCA_ID, "); + sb.append(" CLASESERVICIO_ID, "); + sb.append(" PRECIOREDABIERTO, "); + sb.append(" MONEDA_ID, "); + sb.append(" VIGENCIATARIFA_ID, "); + sb.append(" STATUSTARIFA, "); + sb.append(" IMPORTETAXAEMBARQUE, "); + sb.append(" IMPORTEPEDAGIO, "); + sb.append(" IMPORTEOUTROS, "); + sb.append(" IMPORTESEGURO, "); + sb.append(" ORGAOCONCEDENTE_ID, "); + sb.append(" RUTA_ID, "); + sb.append(" ACTIVO, "); + sb.append(" FECMODIF, "); + sb.append(" USUARIO_ID, "); + sb.append(" ORIGEN_ID, "); + sb.append(" DESTINO_ID "); + + sb.append(" FROM tarifacte "); + + return sb.toString(); + } + + @Override + public String getSQLAtualizarTarifaOficial(final Integer rutaId, final Integer usuarioId, + final OrgaoConcedente orgaoConcedente) { + StringBuilder sb = new StringBuilder(""); + + sb.append("UPDATE TARIFA_OFICIAL SET PRECIO = "); + sb.append("( "); + sb.append("select "); + sb.append(" "); + sb.append(" ROUND( "); + sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); + sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * "); + sb.append(" case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2)"); + sb.append(" "); + sb.append("from "); + sb.append(" ruta_combinacion rc "); + sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sb.append(" inner join orgao_tramo tc on "); + sb.append(" tc.tramo_id = rc.tramo_id and tc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tc.activo =1 "); + sb.append(" inner join orgao_concedente oc on "); + sb.append(" oc.orgaoconcedente_id = tc.orgaoconcedente_id "); + sb.append(" and oc.orgaoconcedente_id =r.orgaoconcedente_id "); + sb.append(" inner join coeficiente_tarifa ct1 on ct1.coeficientetarifa_id = tc.coeficientetarifa1_id "); + sb.append(" left join coeficiente_tarifa ct2 on ct2.coeficientetarifa_id = tc.coeficientetarifa2_id "); + sb.append(" left join coeficiente_tarifa ct3 on ct3.coeficientetarifa_id = tc.coeficientetarifa3_id "); + sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sb.append(" inner join parada po on po.parada_id = t.origen_id "); + sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); + sb.append(" inner join estado e on e.estado_id = c.estado_id "); + sb.append(" inner join MARCA_CLASESERVICIO mc on mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID, "); + sb.append(" moneda m "); + sb.append(" "); + sb.append("where "); + sb.append(" rc.activo = 1 "); + sb.append(" and r.activo = 1 "); + sb.append(" and mc.marca_id <> -1 "); + sb.append(" and tc.activo = 1 "); + sb.append(" and m.moneda_id = 1 "); + if (orgaoConcedente != null && orgaoConcedente.getOrgaoConcedenteId() != null) { + sb.append(" and oc.orgaoconcedente_id = ").append(orgaoConcedente.getOrgaoConcedenteId()); + } + sb.append(" and t.tramo_id = TARIFA_OFICIAL.tramo_id "); + sb.append(" and mc.marca_id = TARIFA_OFICIAL.marca_id "); + sb.append(" and r.CLASESERVICIO_ID = TARIFA_OFICIAL.CLASESERVICIO_ID "); + sb.append(" and m.moneda_id = TARIFA_OFICIAL.moneda_id "); + sb.append(" and oc.orgaoconcedente_id = TARIFA_OFICIAL.orgaoconcedente_id "); + sb.append(" and r.ruta_id = TARIFA_OFICIAL.ruta_id "); + sb.append(") "); + sb.append(" "); + sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); + sb.append(" "); + sb.append("where "); + sb.append(" activo = 1 "); + if (rutaId != null) { + sb.append(" and ruta_id = ").append(rutaId); + } + if (orgaoConcedente != null && orgaoConcedente.getOrgaoConcedenteId() != null) { + sb.append(" and orgaoconcedente_id = ").append(orgaoConcedente.getOrgaoConcedenteId()); + } + + return sb.toString(); + } + + @Override + public String getAtualizarTaxaEmbarquePorKmParada(final Integer rutaId, final Integer usuarioId, final Integer orgaoConcedenteId, List idsEmpresas, List lsParadaIds) { + StringBuilder sb = new StringBuilder(""); + sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE = "); + sb.append("( "); + sb.append("select "); + sb.append(" tepKm.valorTaxa "); + sb.append(" "); + sb.append(" "); + sb.append("from "); + sb.append(" tarifa_oficial tao "); + sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); + sb.append(" inner join TAXA_EMBARQUE_PARADA tepKm on "); + sb.append(" tepKm.parada_id = t.origen_id and tepKm.KMATE >= "); + sb.append(" t.CANTKMREAL and tepKm.activo = 1 and tepKm.indtipo = 'K' and tepKm.empresa_id in (-1, ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + if (null != lsParadaIds) { + sb.append(" and t.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); + } + + sb.append(" inner join marca m on m.marca_id = tao.marca_id "); + sb.append("where "); + sb.append(" tepKm.kmate= "); + sb.append(" (select min(tepKm1.KMATE) "); + sb.append(" from "); + sb.append(" TAXA_EMBARQUE_PARADA tepKm1 "); + sb.append(" where "); + sb.append(" tepKm1.parada_id = t.origen_id and tepKm1.KMATE >= t.CANTKMREAL and tepKm1.activo = 1 and tepKm1.orgaoconcedente_id = tao.orgaoconcedente_id and tepKm1.empresa_id in (-1, ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + sb.append(" ) "); + sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); + sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); + sb.append(" and tao.orgaoconcedente_id = tepKm.orgaoconcedente_id "); + sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); + sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); + sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); + sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); + sb.append(" and tepKm.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); + if (idsEmpresas != null) { + sb.append(" and m.empresa_id in (-1,").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + } + sb.append(") "); + sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); + sb.append(" "); + sb.append("where "); + sb.append(" tarifa_oficial.activo = 1 "); + if (rutaId != null) { + sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); + } + if (orgaoConcedenteId != null) { + sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + if (null != lsParadaIds) { + sb.append(" and tarifa_oficial.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); + } + return sb.toString(); + } + + @Override + public String getSQLAtualizarTaxaEmbarquePorKmOrgao(final Integer rutaId, final Integer usuarioId, final Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds) { + StringBuilder sb = new StringBuilder(""); + sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE = "); + sb.append("coalesce( "); + sb.append("( "); + sb.append("select "); + sb.append(" tek.valorTaxa "); + sb.append(" "); + sb.append("from "); + sb.append(" tarifa_oficial tao "); + sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); + sb.append(" inner join taxa_embarque_km tek on "); + sb.append(" tek.orgaoconcedente_id = tao.ORGAOCONCEDENTE_ID "); + sb.append(" and tek.activo = 1 and t.CANTKMREAL <= tek.kmate "); + sb.append(" inner join marca m on tao.marca_id = m.marca_id "); + sb.append("where "); + sb.append(" tek.kmate= "); + sb.append(" (select min(tek1.KMATE) "); + sb.append(" from "); + sb.append(" taxa_embarque_km tek1 "); + sb.append(" where "); + sb.append(" tek1.orgaoconcedente_id = tao.ORGAOCONCEDENTE_ID "); + sb.append(" and t.CANTKMREAL <= tek1.kmate and tek1.activo = 1 "); + sb.append(" ) "); + sb.append(" "); + sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); + sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); + sb.append(" and tao.orgaoconcedente_id = tek.orgaoconcedente_id "); + sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); + sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); + sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); + sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); + + if (idsEmpresas != null) { + sb.append(" and m.empresa_id in ( ").append(idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1)).append(" ) "); + } + + if (null != lsParadaIds) { + sb.append(" and t.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); + } + + + + sb.append("),IMPORTETAXAEMBARQUE) "); + sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); + sb.append(" "); + sb.append("where "); + sb.append(" tarifa_oficial.activo = 1 "); + + if (rutaId != null) { + sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); + } + + if (orgaoConcedenteId != null) { + sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + + if (null != lsParadaIds) { + sb.append(" and tarifa_oficial.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); + } + return sb.toString(); + } + + @Override + public String getSQLAtualizarTaxaEmbarquePorParadaFixo(final Integer rutaId, final Integer usuarioId, final Integer orgaoConcedenteId, List idsEmpresas,List lsParadaIds) { + StringBuilder sb = new StringBuilder(""); + + sb.append("update tarifa_oficial set IMPORTETAXAEMBARQUE = "); + sb.append("coalesce( "); + sb.append("( "); + sb.append("select distinct "); + sb.append(" tepFixo.valorTaxa "); + sb.append(" "); + sb.append("from "); + sb.append(" tarifa_oficial tao "); + sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); + sb.append(" inner join TAXA_EMBARQUE_PARADA tepFixo on "); + sb.append(" tepFixo.parada_id = t.origen_id and tepFixo.empresa_id in (" + obtemEmpresas(idsEmpresas) + " ) "); + sb.append(" and tepFixo.indtipo = 'F' and tepFixo.activo = 1 "); + sb.append(" inner join marca m on m.marca_id = tao.marca_id "); + sb.append("where "); + sb.append(" tao.marca_id = tarifa_oficial.marca_id "); + sb.append(" and (tao.orgaoconcedente_id = tepFixo.orgaoconcedente_id or tepFixo.orgaoconcedente_id in (-1, ").append(orgaoConcedenteId).append(")) "); + sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); + sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); + sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); + sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); + sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); + sb.append(" and m.empresa_id in (" + obtemEmpresas(idsEmpresas) + " ) and tao.activo = 1 "); + if (null != lsParadaIds) { + sb.append(" and t.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); + } + + sb.append("),IMPORTETAXAEMBARQUE) "); + sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); + sb.append(" "); + sb.append("where "); + sb.append(" tarifa_oficial.activo = 1 "); + if (rutaId != null) { + sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); + } + if (orgaoConcedenteId != null) { + sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + sb.append(" and tarifa_oficial.MARCA_ID in (select m2.marca_id from marca m2 where m2.activo = 1 and m2.empresa_id in (" + obtemEmpresas(idsEmpresas) + " ) ) "); + + if (null != lsParadaIds) { + sb.append(" and tarifa_oficial.origen_id in (").append(lsParadaIds.toString().substring(1, lsParadaIds.toString().length() - 1)).append(" ) "); + } + return sb.toString(); + } + + private String obtemEmpresas(List idsEmpresas) { + if (idsEmpresas == null || idsEmpresas.contains(SELECAO_TODOS)) { + return Integer.toString(SELECAO_TODOS); + } + return idsEmpresas.toString().substring(1, idsEmpresas.toString().length() - 1); + } + + @Override + public String getSQLAtualizarSeguroPorKm(final Integer rutaId, final Integer usuarioId, + final Integer orgaoConcedenteId, TipoSeguro tipoSeguro) { + StringBuilder sb = new StringBuilder(""); + if (tipoSeguro.equals(TipoSeguro.SEGURO)) { + sb.append("update tarifa_oficial set IMPORTESEGURO = "); + } else { + sb.append("update tarifa_oficial set IMPORTETPP = "); + } + sb.append("( "); + sb.append("select "); + sb.append(" sk.VALORTAXA "); + sb.append("from "); + sb.append(" tarifa_oficial tao "); + sb.append(" inner join tramo t on t.tramo_id = tao.tramo_id "); + sb.append(" inner join seguro_km sk on "); + sb.append(" sk.KMATE >= t.CANTKMREAL and sk.activo = 1 "); + sb.append(" and tao.ORGAOCONCEDENTE_ID = sk.ORGAOCONCEDENTE_ID "); + sb.append("where "); + sb.append(" sk.tipo_seguro = '").append(tipoSeguro).append("' and "); + sb.append(" sk.kmate= "); + sb.append(" (select min(sk1.KMATE) "); + sb.append(" from "); + sb.append(" seguro_km sk1 "); + sb.append(" where "); + sb.append(" sk1.KMATE >= t.CANTKMREAL and sk1.activo = 1 "); + sb.append(" and sk1.tipo_seguro = '").append(tipoSeguro).append("' "); + sb.append(" and tao.ORGAOCONCEDENTE_ID = sk1.ORGAOCONCEDENTE_ID "); + sb.append(" ) "); + sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); + sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); + sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); + sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); + sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); + sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); + sb.append(") "); + sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); + sb.append(" "); + sb.append("where "); + sb.append(" tarifa_oficial.activo = 1 "); + if (rutaId != null) { + sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); + } + if (orgaoConcedenteId != null) { + sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + + return sb.toString(); + } + + @Override + public String getSQLAtualizarPrecioPorTPP(final Integer rutaId, final Integer usuarioId, + final Integer orgaoConcedenteId, TipoSeguro tipoSeguro) { + StringBuilder sb = new StringBuilder(""); + sb.append("update tarifa_oficial set PRECIO = PRECIO + nvl(IMPORTETPP,0) "); + sb.append(" where "); + sb.append(" tarifa_oficial.activo = 1 "); + if (rutaId != null) { + sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); + } + if (orgaoConcedenteId != null) { + sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + + return sb.toString(); + } + + @Override + public String getSQLAtualizarSeguroPorTarifa(final Integer rutaId, final Integer usuarioId, + final Integer orgaoConcedenteId) { + StringBuilder sb = new StringBuilder(""); + sb.append("update tarifa_oficial set IMPORTESEGURO = "); + sb.append("( "); + sb.append("select "); + sb.append(" st.VALORTAXA "); + sb.append("from "); + sb.append(" tarifa_oficial tao "); + sb.append(" inner join seguro_tarifa st on "); + sb.append(" st.VALORTARIFAATE >= tao.precio and st.activo = 1 "); + sb.append(" and tao.ORGAOCONCEDENTE_ID = st.ORGAOCONCEDENTE_ID "); + sb.append("where "); + sb.append(" st.VALORTARIFAATE= "); + sb.append(" (select min(st1.VALORTARIFAATE) "); + sb.append(" from "); + sb.append(" seguro_tarifa st1 "); + sb.append(" where "); + sb.append(" st1.VALORTARIFAATE >= tao.precio and st1.activo = 1 "); + sb.append(" and tao.ORGAOCONCEDENTE_ID = st1.ORGAOCONCEDENTE_ID "); + sb.append(" ) "); + sb.append(" and tao.marca_id = tarifa_oficial.marca_id "); + sb.append(" and tao.orgaoconcedente_id = tarifa_oficial.orgaoconcedente_id "); + sb.append(" and tao.claseservicio_id=tarifa_oficial.claseservicio_id "); + sb.append(" and tao.moneda_id = tarifa_oficial.moneda_id "); + sb.append(" and tao.ruta_id = tarifa_oficial.ruta_id "); + sb.append(" and tao.tramo_id = tarifa_oficial.tramo_id "); + sb.append(") "); + sb.append(", usuario_id = ").append(usuarioId).append(",fecmodif = ").append(DBUtil.getInstance().dbSysdate()).append(" "); + sb.append(" "); + sb.append("where "); + sb.append(" tarifa_oficial.activo = 1 "); + + if (rutaId != null) { + sb.append(" and tarifa_oficial.ruta_id = ").append(rutaId); + } + if (orgaoConcedenteId != null) { + sb.append(" and tarifa_oficial.orgaoconcedente_id = ").append(orgaoConcedenteId); + } + + return sb.toString(); + } + + @Override + public String getSQLSelecionarTarifaPorTarifaOficalParaAtualizar(final Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao) { + StringBuilder sb = new StringBuilder(""); + + sb.append("SELECT tao.IMPORTEPEDAGIO AS \"taoimportepedagio\", "); + sb.append(" tao.COMPOSICAO_DO_PEAJE AS \"taocomposicaodopeaje\", "); + sb.append(" tao.PRECIO AS \"taoprecio\", "); + sb.append(" tao.PRECIOORIGINAL AS \"taopreciooriginal\", "); + sb.append(" tao.IMPORTETAXAEMBARQUE AS \"taoimportetaxaembarque\", "); + sb.append(" tao.IMPORTESEGURO AS \"taoimporteseguro\", "); + sb.append(" tao.IMPORTETPP AS \"taoimportetpp\", "); + sb.append(" tao.IMPORTEOUTROS AS \"taoimporteoutros\", "); + sb.append(" ta.TARIFA_ID AS \"tarifaId\" "); + + sb.append("FROM TARIFA_OFICIAL tao "); + sb.append("INNER JOIN TARIFA ta ON (tao.MARCA_ID = ta.MARCA_ID "); + sb.append(" AND tao.CLASESERVICIO_ID = ta.CLASESERVICIO_ID "); + sb.append(" AND tao.TRAMO_ID = ta.TRAMO_ID "); + sb.append(" AND tao.MONEDA_ID = ta.MONEDA_ID "); + sb.append(" AND tao.RUTA_ID = ta.RUTA_ID "); + sb.append(" AND tao.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); + sb.append(" )"); + sb.append("INNER JOIN MARCA mTa ON tao.MARCA_ID = mTa.MARCA_ID "); + sb.append("INNER JOIN MARCA mTao ON ta.MARCA_ID = mTao.MARCA_ID "); + + sb.append("WHERE ta.VIGENCIATARIFA_ID = ").append(vigenciaTarifaId); + + if (orgao != null) { + sb.append(" AND tao.ORGAOCONCEDENTE_ID = ").append(orgao.getOrgaoConcedenteId()); + } + if (empresa != null) { + sb.append(" AND mTa.EMPRESA_ID = ").append(empresa.getEmpresaId()); + sb.append(" AND mTao.EMPRESA_ID = ").append(empresa.getEmpresaId()); + } + + return sb.toString(); + } + + @Override + public String getSQLAtualizarTarifaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, + Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP) { + + StringBuilder sb = new StringBuilder(""); + sb.append("UPDATE TARIFA SET "); + + if (calculaPegagio) { + sb.append("IMPORTEPEDAGIO=").append(dados.get("taoimportepedagio")).append(","); + sb.append(" COMPOSICAO_DO_PEAJE='").append(dados.get("taocomposicaodopeaje")).append("',"); + } + if (calculaTarifa) { + sb.append("PRECIO=").append(dados.get("taoprecio")).append(",PRECIOORIGINAL=").append(dados.get("taopreciooriginal")).append(","); + } + if (calculaTaxaEmbarque) { + sb.append("IMPORTETAXAEMBARQUE=").append(dados.get("taoimportetaxaembarque")).append(","); + } + if (calculaSeguro) { + sb.append("IMPORTESEGURO=").append(dados.get("taoimporteseguro")).append(","); + } + if (calculaTPP) { + sb.append("IMPORTETPP=").append(dados.get("taoimportetpp")).append(","); + } + sb.append("IMPORTEOUTROS=").append(dados.get("taoimporteoutros")).append(","); + sb.append("FECMODIF= current_timestamp, USUARIO_ID=").append(usuarioId); + sb.append(" WHERE TARIFA_ID = ").append(dados.get("tarifaId")); + + return sb.toString(); + } + + @Override + public String getSQLInserirTarifaPelaTarifaOficial(final Integer vigenciaTarifaId, final Integer usuarioId, Empresa empresa, OrgaoConcedente orgao) { + StringBuilder sb = new StringBuilder(""); + sb.append(" insert "); + sb.append(" into "); + sb.append(" TARIFA "); + sb.append(" ( TARIFA_ID, PRECIO, PRECIOREDABIERTO, TRAMO_ID, "); + sb.append(" MARCA_ID, CLASESERVICIO_ID, PRECIOORIGINAL, MONEDA_ID, "); + sb.append(" VIGENCIATARIFA_ID, STATUSTARIFA, ACTIVO, FECMODIF, "); + sb.append(" USUARIO_ID, IMPORTETAXAEMBARQUE, IMPORTEPEDAGIO, IMPORTEOUTROS, "); + sb.append(" IMPORTESEGURO, IMPORTETPP, ORGAOCONCEDENTE_ID, RUTA_ID, ORIGEN_ID, DESTINO_ID, COMPOSICAO_DO_PEAJE ) "); + sb.append(" select "); + sb.append(" TARIFA_SEQ.nextval, "); + sb.append(" tao.PRECIO , "); + sb.append(" tao.PRECIOREDABIERTO , "); + sb.append(" tao.TRAMO_ID , "); + sb.append(" tao.MARCA_ID , "); + sb.append(" tao.CLASESERVICIO_ID , "); + sb.append(" tao.PRECIOORIGINAL , "); + sb.append(" tao.MONEDA_ID , "); + sb.append(" v.VIGENCIATARIFA_ID , "); + sb.append(" tao.STATUSTARIFA , "); + sb.append(" tao.ACTIVO , "); + sb.append(" current_timestamp , "); + sb.append(" ").append(usuarioId).append(", "); + sb.append(" tao.IMPORTETAXAEMBARQUE , "); + sb.append(" tao.IMPORTEPEDAGIO , "); + sb.append(" tao.IMPORTEOUTROS , "); + sb.append(" tao.IMPORTESEGURO , "); + sb.append(" tao.IMPORTETPP , "); + sb.append(" tao.ORGAOCONCEDENTE_ID , "); + sb.append(" tao.RUTA_ID , "); + sb.append(" tao.ORIGEN_ID , "); + sb.append(" tao.DESTINO_ID, "); + sb.append(" tao.COMPOSICAO_DO_PEAJE "); + sb.append(" from "); + sb.append(" TARIFA_OFICIAL tao, "); + sb.append(" VIGENCIA_TARIFA v, "); + sb.append(" MARCA m "); + sb.append(" where "); + sb.append(" m.MARCA_ID=tao.MARCA_ID "); + sb.append(" and tao.ACTIVO=1 "); + sb.append(" and v.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append(" "); + + if (orgao != null) { + sb.append(" and tao.ORGAOCONCEDENTE_ID=").append(orgao.getOrgaoConcedenteId()).append(" "); + } + if (empresa != null) { + sb.append(" and m.EMPRESA_ID=").append(empresa.getEmpresaId()).append(" "); + } + + sb.append(" and not (exists (select "); + sb.append(" tar.TARIFA_ID "); + sb.append(" from "); + sb.append(" TARIFA tar "); + sb.append(" where "); + sb.append(" tar.ACTIVO=1 "); + sb.append(" and tar.TRAMO_ID=tao.TRAMO_ID "); + sb.append(" and tar.MARCA_ID=tao.MARCA_ID "); + sb.append(" and tar.CLASESERVICIO_ID=tao.CLASESERVICIO_ID "); + sb.append(" and tar.MONEDA_ID=tao.MONEDA_ID "); + sb.append(" and tar.ORGAOCONCEDENTE_ID=tao.ORGAOCONCEDENTE_ID "); + sb.append(" and tar.RUTA_ID=tao.RUTA_ID "); + sb.append(" and tar.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append("))"); + + return sb.toString(); + } + + @Override + public String getSQLActualizarCorridaFecHusoFecVerano() { + + StringBuilder sb = new StringBuilder(); + + sb.append(" update Corrida cq "); + sb.append(" set cq.fechorSalidaOriginalH = "); + sb.append(" ( "); + sb.append(" select "); + sb.append(" c.fechorSalidaOriginal "); + sb.append(" + nvl((c.origem.ciudad.estado.tiempoHorHuso/").append(HORAS_NO_DIA).append("), 0) "); + sb.append(" + nvl( case when "); + sb.append(" c.fechorSalidaOriginal between "); + sb.append(" c.origem.ciudad.estado.fecInicioHorVerano "); + sb.append(" and c.origem.ciudad.estado.fecFinoHorVerano "); + sb.append(" then (c.origem.ciudad.estado.tiempoHorVerano/").append(HORAS_NO_DIA).append(") "); + sb.append(" else 0 end, 0) "); + sb.append(" from Corrida c "); + sb.append(" where c.id.corridaId in ( :corridaId ) "); + sb.append(" and c.id.feccorrida in ( :feccorrida ) "); + sb.append(" and c.id.corridaId = cq.id.corridaId "); + sb.append(" and c.id.feccorrida = cq.id.feccorrida "); + sb.append(" ) "); + sb.append(" where cq.id.corridaId in ( :corridaId ) "); + sb.append(" and cq.id.feccorrida in ( :feccorrida ) "); + + return sb.toString(); + } + + @Override + public String getSQLActualizarCorridaTramoFecHusoFecVerano() { + StringBuilder sb = new StringBuilder(); + + sb.append(" update CorridaTramo ctq "); + sb.append(" set ctq.fechorSalidaOriginalH = :fechorSalidaOriginalH, ctq.fechorsalidaH = :fechorsalidaH, ctq.fechorllegadaH = :fechorllegadaH"); + sb.append(" where ctq.corridatramoId = :corridatramoId "); + + return sb.toString(); + } + + @Override + public String getSQLBuscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + StringBuilder sb = new StringBuilder(""); + sb.append(" select "); + sb.append(" "); + sb.append(" c.CAJA_ID as \"cajaId\", "); + sb.append(" c.NUMASIENTO as \"numAsiento\", "); + sb.append(" c.CATEGORIA_ID as \"categoriaId\", "); + sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\", "); + sb.append(" c.CLASESERVICIO_ID as \"claseServicioId\", "); + sb.append(" c.MARCA_ID as \"marcaId\", "); + sb.append(" c.ORIGEN_ID as \"origenId\", "); + sb.append(" c.DESTINO_ID as \"destinoId\", "); + sb.append(" c.CORRIDA_ID as \"corridaId\", "); + sb.append(" c.FECCORRIDA as \"fecCorrida\", "); + sb.append(" c.NOMBPASAJERO as \"nombPasajero\", "); + sb.append(" c.PRECIOBASE as \"precioBase\", "); + sb.append(" c.PRECIOPAGADO as \"precioPagado\", "); + sb.append(" c.TIPOVENTA_ID as \"tipoVentaId\", "); + sb.append(" c.NUMSERIEPREIMPRESA as \"numSeriePreimpresa\", "); + sb.append(" c.NUMFOLIOPREIMPRESO as \"numFolioPreImpreso\", "); + sb.append(" c.FECHORVIAJE as \"fecHorViaje\", "); + sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); + sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); + sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); + sb.append(" c.NUMKMVIAJE as \"numKmViaje\", "); + sb.append(" c.NUMOPERACION as \"numOperacion\", "); + sb.append(" c.MOTIVOCANCELACION_ID as \"motivoCancelacionId\", "); + sb.append(" c.EMPRESAPUNTOVENTA_ID as \"empresaPuntoVentaId\", "); + sb.append(" c.EMPRESACORRIDA_ID as \"empresaCorridaId\", "); + sb.append(" c.TURNO_ID as \"turnoId\", "); + sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", "); + sb.append(" c.IMPORTEPEDAGIO as \"importePedagio\", "); + sb.append(" c.IMPORTEOUTROS as \"importeOutros\", "); + sb.append(" c.IMPORTESEGURO as \"importeSeguro\", "); + sb.append(" co.ruta_id as \"rutaId\", "); + sb.append(" c.usuario_id as \"usuarioId\", "); + sb.append(" ct.numautorizacion as \"numAutorizacion\", "); + sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\" "); + sb.append(" "); + sb.append(" from "); + sb.append(" caja c "); + sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida "); + sb.append(" left join caja_formapago cfp on cfp.caja_id = c.caja_id "); + sb.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); + sb.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); + sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sb.append(" "); + sb.append(" where "); + sb.append(" trunc(fechorventa) between to_date('").append(sdf.format(fechaDesde)).append("','yyyy-MM-dd') and ").append(" to_date('").append(sdf.format(fechaHasta)).append("','yyyy-MM-dd')"); + sb.append(" and c.feccorte ").append(yaCerrado ? " is not null" : " is null "); + sb.append(" "); + sb.append(" order by c.fechorventa,c.usuario_id,c.caja_id asc "); + + return sb.toString(); + } + + @Override + public String getSQLBuscarDatosCaja(Date fechaDesde, Date fechaHasta, Boolean sembilhetesPacote) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + StringBuilder sb = new StringBuilder(""); + + sb.append(" select "); + sb.append(" "); + sb.append(" c.CAJA_ID as \"cajaId\", "); + sb.append(" c.NUMASIENTO as \"numAsiento\", "); + sb.append(" c.CATEGORIA_ID as \"categoriaId\", "); + sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\", "); + sb.append(" c.CLASESERVICIO_ID as \"claseServicioId\", "); + sb.append(" c.MARCA_ID as \"marcaId\", "); + sb.append(" c.ORIGEN_ID as \"origenId\", "); + sb.append(" c.DESTINO_ID as \"destinoId\", "); + sb.append(" c.CORRIDA_ID as \"corridaId\", "); + sb.append(" c.FECCORRIDA as \"fecCorrida\", "); + sb.append(" c.NOMBPASAJERO as \"nombPasajero\", "); + sb.append(" c.PRECIOBASE as \"precioBase\", "); + sb.append(" c.PRECIOPAGADO as \"precioPagado\", "); + sb.append(" c.TIPOVENTA_ID as \"tipoVentaId\", "); + sb.append(" c.NUMSERIEPREIMPRESA as \"numSeriePreimpresa\", "); + sb.append(" c.NUMFOLIOPREIMPRESO as \"numFolioPreImpreso\", "); + sb.append(" c.FECHORVIAJE as \"fecHorViaje\", "); + sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); + sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); + sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); + sb.append(" c.NUMKMVIAJE as \"numKmViaje\", "); + sb.append(" c.NUMOPERACION as \"numOperacion\", "); + sb.append(" c.MOTIVOCANCELACION_ID as \"motivoCancelacionId\", "); + sb.append(" c.EMPRESAPUNTOVENTA_ID as \"empresaPuntoVentaId\", "); + sb.append(" c.EMPRESACORRIDA_ID as \"empresaCorridaId\", "); + sb.append(" c.TURNO_ID as \"turnoId\", "); + sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", "); + sb.append(" c.IMPORTEPEDAGIO as \"importePedagio\", "); + sb.append(" c.IMPORTEOUTROS as \"importeOutros\", "); + sb.append(" c.IMPORTESEGURO as \"importeSeguro\", "); + sb.append(" co.ruta_id as \"rutaId\", "); + sb.append(" c.usuario_id as \"usuarioId\", "); + sb.append(" ct.numautorizacion as \"numAutorizacion\", "); + sb.append(" ct.tipotarjeta as \"tipotarjeta\", "); + sb.append(" ct.cantparcelas as \"cantparcelas\", "); + sb.append(" ct.numtarjeta as \"numtarjeta\", "); + sb.append(" ct.fecoperacion as \"fecoperacion\", "); + sb.append(" ct.nombtitular as \"nombtitular\", "); + sb.append(" fp.DESCPAGO as \"descPago\", "); + sb.append(" fp.formapago_id as \"formaPagoId\", "); + sb.append(" cfp.importe as \"vlrFormaPago\", "); + sb.append(" ca.CVECATEGORIA as \"cveCategoria\", "); + sb.append(" mc.DESCMOTIVO as \"descMotivo\", "); + sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\", "); + sb.append(" C.TRANSACAO_ID as \"transacaoId\", C.TRANSACAOORIGINAL_ID as \"transacaooriginalId\", "); + sb.append(" C.DESCNUMDOC as \"descnumdoc\", C.DESCNUMDOC2 as \"descnumdoc2\", C.DESCTIPODOC as \"desctipodoc\", "); + sb.append(" C.DESCTIPODOC2 as \"desctipodoc2\", C.DESCTELEFONO as \"desctelefono\", "); + sb.append(" ocd.ocd_id as \"ocdId\", ocd.numoperacion as \"numoperacionOcd\", "); + sb.append(" cdp.notacreditovendapacote_id as \"notacreditovendapacoteId\", "); + sb.append(" ct.descoperadoracartao as \"operadoracartao\", "); + sb.append(" sec.cvesecretaria as \"cvesecretaria\", "); + sb.append(" fp.tipo_pago as \"tipoPago\", "); + sb.append(" NVL(c.INDENCARGOVENTA,0) as \"indEncargoVenta\", "); + sb.append(" con.cveconvenio as \"cveconvenio\", "); + sb.append(" con.descconvenio as \"descconvenio\", "); + sb.append(" sec.descsecretaria as \"descsecretaria\" "); + sb.append(" from "); + sb.append(" caja c "); + sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida "); + sb.append(" left join caja_formapago cfp on cfp.caja_id = c.caja_id "); + sb.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); + sb.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); + sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sb.append(" inner join forma_pago fp on fp.formapago_id = cfp.FORMAPAGO_ID "); + sb.append(" inner join categoria ca on ca.categoria_id = c.categoria_id "); + sb.append(" left join motivo_cancelacion mc on mc.motivocancelacion_id = c.motivocancelacion_id "); + sb.append(" left join ocd ocd on ocd.ocd_id = cdp.ocd_id "); + sb.append(" left join secretaria sec on sec.secretaria_id = cdp.opcional1 "); + sb.append(" left join convenio_det cDet on cDet.conveniodet_id = c.conveniodet_id "); + sb.append(" left join convenio con on con.convenio_id = cDet.convenio_id "); + sb.append(" "); + sb.append(" where "); + sb.append(" trunc(fechorventa) between to_date('").append(sdf.format(fechaDesde)).append("','yyyy-MM-dd') and ").append(" to_date('").append(sdf.format(fechaHasta)).append("','yyyy-MM-dd')"); + + if (sembilhetesPacote != null && sembilhetesPacote) { + sb.append("and fp.tipo_pago != ") + .append(TipoFormapago.PACOTE.getValor()) + .append("and (c.motivocancelacion_id is null or c.motivocancelacion_id != ") + .append(Constantes.MVO_CANCEL_VENDA_PACOTE.intValue()) + .append(" ) "); + } + + sb.append(" order by c.fechorventa,c.usuario_id,c.caja_id asc "); + + return sb.toString(); + } + + @Override + public String getSQLBuscarUsuariosCajaCerrado(Date fecha, String cveusuario, String turnoid) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + StringBuilder sb = new StringBuilder(""); + sb.append(" select distinct "); + sb.append(" "); + sb.append(" u.usuario_id as \"usuarioId\", "); + sb.append(" u.cveusuario as \"cveusuario\", "); + sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); + sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); + sb.append(" c.FECCORTE as \"fecCorte\", "); + sb.append(" c.TURNO_ID as \"turnoId\", "); + sb.append(" (select sum(importe) from conta_corrente_ptovta ccpv where ccpv.puntoventa_id = c.puntoventa_id and ccpv.usuario_id = c.usuario_id and ccpv.feccorte = c.feccorte and ccpv.turno_id = c.turno_id) as \"importeTotal\""); + sb.append(" "); + sb.append(" from "); + sb.append(" caja c "); + sb.append(" left join usuario u on c.usuario_id = u.usuario_id "); + sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); + sb.append(" "); + sb.append(" where "); + sb.append(" trunc(c.feccorte) = to_date('").append(sdf.format(fecha)).append("','yyyy-MM-dd')"); + + if (!cveusuario.equals("*")) { + sb.append(" and u.cveusuario like '" + cveusuario + "'"); + } + + if (!turnoid.equals("*")) { + sb.append(" and c.turno_id in(" + turnoid + ")"); + } else { + sb.append(" and c.turno_id is not null"); + } + + return sb.toString(); + } + + @Override + public String getSQLBuscarCajaCerrado(Integer usuarioId, Date fecha, String turnoid) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + StringBuilder sb = new StringBuilder(""); + sb.append(" select "); + sb.append(" c.CAJA_ID as \"cajaId\", "); + sb.append(" c.NUMFOLIOSISTEMA as \"numFolioSistema\", "); + sb.append(" ori.descparada as \"origen\", "); + sb.append(" des.descparada as \"destino\", "); + sb.append(" c.CORRIDA_ID as \"corridaId\", "); + sb.append(" (case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end) as \"precioPagado\", "); + sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); + sb.append(" (case when c.motivocancelacion_id is null then c.IMPORTETAXAEMBARQUE else c.IMPORTETAXAEMBARQUE * -1 end) as \"importeTaxaEmbarque\", "); + sb.append(" ru.descruta as \"ruta\", "); + sb.append(" nvl(ct.numautorizacion, c.numoperacion) as \"numAutorizacion\", "); + sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\", "); + sb.append(" s.descsecretaria as \"secretaria\", "); + sb.append(" s.CVESECRETARIA as \"cvesecretaria\", "); + sb.append(" (case when fp.formapago_id = " + RED_PAGO_FORMAPAGO_ID).append(" then '" + RED_PAGO_EMISSOR_TARJETA + "' else ct.tipotarjeta end) as \"emissorTarjeta\", "); + sb.append(" cat.DESCCATEGORIA as \"tipoPasaje\", "); + sb.append(" (case when fp.formapago_id = " + RED_PAGO_FORMAPAGO_ID).append(" then '" + RED_PAGO_FORMA_PAGO + "' else fp.cvepago end) as \"formaPago\" "); + sb.append(" from "); + sb.append(" caja c "); + sb.append(" left join caja_formapago cfp on cfp.caja_id = c.caja_id "); + sb.append(" left outer join forma_pago fp on fp.formapago_id = cfp.formapago_id "); + sb.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); + sb.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); + sb.append(" left join categoria cat on cat.categoria_id = c.categoria_id "); + sb.append(" left join secretaria s on s.secretaria_id = cdp.opcional1 "); + sb.append(" left join ruta ru on ru.ruta_id = c.ruta_id "); + sb.append(" left join parada ori on ori.parada_id = c.origen_id "); + sb.append(" left join parada des on des.parada_id = c.destino_id "); + sb.append(" where "); + sb.append(" trunc(c.feccorte) = to_date('").append(sdf.format(fecha)).append("','yyyy-MM-dd')"); + sb.append(" and c.usuario_id = ").append(usuarioId); + if (!turnoid.equals("*")) { + sb.append(" and c.turno_id in(" + turnoid + ")"); + } else { + sb.append(" and c.turno_id is not null"); + } + sb.append(" and c.indreimpresion = 0"); + sb.append(" order by c.CAJA_ID"); + + return sb.toString(); + } + + @Override + public String getSQLBuscarReceitasDespesasCaja(Integer usuarioId, Date fec) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + StringBuilder sb = new StringBuilder(""); + sb.append(" select "); + sb.append(" "); + sb.append(" c.precio as \"precio\", "); + sb.append(" t.desctipoevento as \"tipoEvento\" "); + sb.append(" "); + sb.append(" from "); + sb.append(" caja_diversos c "); + sb.append(" left join evento_extra e on c.eventoextra_id = e.eventoextra_id "); + sb.append(" left join tipo_evento_extra t on t.tipoeventoextra_id = e.tipoeventoextra_id "); + sb.append(" "); + sb.append(" where "); + sb.append(" c.feccorte = to_date('").append(sdf.format(fec)).append("','yyyy-MM-dd')"); + sb.append(" and c.turno_id is not null and c.usuario_id = ").append(usuarioId); + + return sb.toString(); + } + + @Override + public String getSQLBuscarUsuariosActivo() { + StringBuilder sb = new StringBuilder(""); + + sb.append(" select distinct"); + sb.append(" u.usuario_id as \"usuarioId\","); + sb.append(" u.cveusuario as \"cveusuario\","); + sb.append(" u.NOMBUSUARIO||' '||u.NOMBPATERNO||' '||u.NOMBMATERNO as \"nombusuario\""); + sb.append(" from"); + sb.append(" usuario u"); + sb.append(" where"); + sb.append(" u.activo = 1"); + sb.append(" order by"); + sb.append(" u.usuario_id"); + + return sb.toString(); + } + + @Override + public String getSQLInserirCajaVendaEmbarcada() { + StringBuilder sb = new StringBuilder(); + + sb.append("insert into caja "); + sb.append("(caja_id, numasiento, categoria_id,numfoliosistema,claseservicio_id, marca_id, origen_id, destino_id, corrida_id, feccorrida,nombpasajero, preciobase, "); + sb.append("preciopagado,descuentoamparado, tipoventa_id, numseriepreimpresa, numfoliopreimpreso, fechorviaje, fechorventa, puntoventa_id,numkmviaje, numoperacion,"); + sb.append("indstatusoperacion,motivocancelacion_id, motivoreimpresion_id, cantpuntos, empresapuntoventa_id, empresacorrida_id, numreservacion, turno_id,"); + sb.append("indstatusboleto,indcancelacion, indreimpresion,indviajeredondo, feccorte, indextraviado, paridad, feccreacion, conveniodet_id, moneda_id, estacion_id,"); + sb.append("indreplica, usuarioautorizacion_id, tipoidentificacion_id, numidentificacion,clientefidelidad_id, opcional1, opcional2, opcional3, preciocargoextra,"); + sb.append("preciopricing, cajaoriginal_id, usuarioremoto_id, puntoventaremoto_id, numdocdescuento, canttransferencia,activo, fecmodif, usuario_id, nodo_id,"); + sb.append("porccategoria,importecategoria, cliente_id, pagorecaudacion_id, pagorecaudacion2_id, importetaxaembarque, importepedagio, importeoutros,"); + sb.append("importeseguro, indconexion, levante_id, ruta_id, serieimpfiscal, fecintegracion, ptovtaventa_id, indremotoinverso, fecnacimiento)"); + sb.append("values ("); + sb.append(":cajaId,:numAsiento,:categoriaId,null,:claseServicioId,:marcaId,:origemId,:destinoId,:corridaId,:fecCorrida,null,:precioBase,"); + sb.append(":precioPagado,null, :tipoVentaId, null, :numFolioPreimpresso, :fechorViaje, :fechorVenta, :puntoVentaId,null, :numOperacion,"); + sb.append("'F',null, null, null, :empresaPuntoVentaId, :empresaCorridaId, null, null,"); + sb.append("'V', 0, 0, 0, null, 0, null, :fecCreacion, null, null, :estacionId,"); + sb.append("0, null, null, null,null, null, null, null, null,"); + sb.append("null, null, null, null, null, null, 1, :fecModIf, :usuarioId, 1,"); + sb.append("null, null, null, null, null, :importeTaxaEmbarque, :importePedagio, :importeOutros,"); + sb.append(":importeSeguro, 0, null, :rutaId, :serieImpFiscal, null, null, 0, null)"); + + return sb.toString(); + } + + @Override + public String getSQLInserirCajaFormaPagoVendaEmbarcada() { + StringBuilder sb = new StringBuilder(); + + sb.append("insert into caja_formapago "); + sb.append("(formapago_id, caja_id, importe, activo, fecmodif, usuario_id, indreplica, nodo_id, cajaformapago_id) values "); + sb.append("(:formaPagoId, :cajaId, :importe, 1, :fecModIf, :usuarioId, null, 1, :cajaFormaPagoId)"); + + return sb.toString(); + } + + @Override + public String getSQLInserirBoletoVendaEmbarcada() { + StringBuilder sb = new StringBuilder(); + + sb.append("insert into boleto "); + sb.append("(empresacorrida_id, destino_id, tipoventa_id, categoria_id, motivoreimpresion_id, claseservicio_id, corrida_id, feccorrida, puntoventa_id,"); + sb.append("empresapuntoventa_id, turno_id, motivocancelacion_id, origen_id, marca_id, conveniodet_id, cliente_id, numasiento, numfoliosistema,"); + sb.append("nombpasajero,fecnacimiento,preciopagado,paridad, numseriepreimpresa, numfoliopreimpreso, fechorviaje, fechorventa, numkmviaje, numoperacion,"); + sb.append("indstatusoperacion, cantpuntos, numreservacion, indstatusboleto, indcancelacion, indreimpresion, indviajeredondo, feccreacion, activo,"); + sb.append("indconexion, fecmodif, usuario_id, usuarioautorizacion_id, tipoidentificacion_id, numidentificacion, indextraviado, preciobase, entregaboleto_id,"); + sb.append("opcional1,opcional2, opcional3, descuentoamparado, moneda_id, estacion_id, usuarioremoto_id, puntoventaremoto_id, preciocargoextra, nodo_id,"); + sb.append("indreplica, numdocdescuento, canttransferencia, porccategoria, preciopricing, importecategoria, boletooriginal_id, importetaxaembarque,"); + sb.append("importepedagio, importeoutros, importeseguro, desctipodoc, desctipodoc2, descnumdoc, descnumdoc2, tipoidentificaciondoc_id, descorgaodoc,"); + sb.append("NUMFIDELIDAD, INFOPASAJERO, LEVANTE_ID, ESTADOFOLIO_ID, RUTA_ID, DESCCORREO, DESCTELEFONO, SERIEIMPFISCAL,NUMASIENTOVINCULADO, BOLETO_ID) values "); + + sb.append("(:empresaCorridaId, :destinoId, :tipoVentaId, :categoriaId, null, :claseServicioId, :corridaId, :fecCorrida, :puntoVentaId, "); + sb.append(":empresaPuntoVentaId, null, null, :origemId, :marcaId, null, null, :numAsiento, null,"); + sb.append("null,null,:precioPagado,null,null, :numFolioPreimpresso, :fechorViaje, :fechorVenta, null, :numOperacion,"); + sb.append("'F', null, null, 'V', 0, 0, 0, null, 1,"); + sb.append("0, :fecModIf, :usuarioId,null, null, null, 0, :precioBase, null,"); + sb.append("null,null, null, null, null, :estacionId, null, null, null,1,"); + sb.append("0, null, null, null, :precioPricing, null, null, :importeTaxaEmbarque,"); + sb.append(":importePedagio, :importeOutros, :importeSeguro, null, null, null, null, null, null,"); + sb.append("null, null, null, null, :rutaId, null, null, :serieImpFiscal, null, :boletoId)"); + + return sb.toString(); + } + + @Override + public String getSQLInserirBoletoFormaPagoVendaEmbarcada() { + StringBuilder sb = new StringBuilder(); + + sb.append("insert into boleto_formapago "); + sb.append("(formapago_id, boleto_id, importe, fecmodif, usuario_id, activo, indreplica, nodo_id, boletoformapago_id) values "); + sb.append("(:formaPagoId, :boletoId, :importe, :fecModIf, :usuarioId, 1, 0, 1,:boletoFormaPagoId)"); + + return sb.toString(); + } + + @Override + public String getSQLObterSequenceBoletoFormaPago() { + return "select boleto_formapago_seq.nextval from dual"; + } + + @Override + public String getSQLObterSequenceCajaFormaPago() { + return "select caja_formapago_seq.nextval from dual"; + } + + @Override + public String getSQLObterSequenceBoleto() { + return "select boleto_seq.nextval from dual"; + } + + @Override + public String getSQLObterSequenceCaja() { + return "select caja_seq.nextval from dual"; + } + + @Override + public String getSQLObterSequenciaNumOperacion() { + return "select numeoperacion_seq.nextval from dual"; + } + + @Override + public String getSQLInserirTarifaEmbarcadaPelaTarifaOficial(final Integer vigenciaTarifaId, final Integer usuarioId, Empresa empresa, OrgaoConcedente orgao) { + StringBuilder sb = new StringBuilder(""); + sb.append(" insert "); + sb.append(" into "); + sb.append(" TARIFA_EMBARCADA "); + sb.append(" ( TARIFAEMBARCADA_ID, PRECIO, PRECIOREDABIERTO, TRAMO_ID, "); + sb.append(" MARCA_ID, CLASESERVICIO_ID, PRECIOORIGINAL, MONEDA_ID, "); + sb.append(" VIGENCIATARIFA_ID, STATUSTARIFA, ACTIVO, FECMODIF, "); + sb.append(" USUARIO_ID, IMPORTETAXAEMBARQUE, IMPORTEPEDAGIO, IMPORTEOUTROS, "); + sb.append(" IMPORTESEGURO, IMPORTETPP, ORGAOCONCEDENTE_ID, RUTA_ID, ORIGEN_ID, DESTINO_ID ) "); + sb.append(" select "); + sb.append(" TARIFA_EMBARCADA_SEQ.nextval, "); + sb.append(" tao.PRECIO , "); + sb.append(" tao.PRECIOREDABIERTO , "); + sb.append(" tao.TRAMO_ID , "); + sb.append(" tao.MARCA_ID , "); + sb.append(" tao.CLASESERVICIO_ID , "); + sb.append(" tao.PRECIOORIGINAL , "); + sb.append(" tao.MONEDA_ID , "); + sb.append(" v.VIGENCIATARIFA_ID , "); + sb.append(" tao.STATUSTARIFA , "); + sb.append(" tao.ACTIVO , "); + sb.append(" current_timestamp , "); + sb.append(" ").append(usuarioId).append(", "); + sb.append(" tao.IMPORTETAXAEMBARQUE , "); + sb.append(" tao.IMPORTEPEDAGIO , "); + sb.append(" tao.IMPORTEOUTROS , "); + sb.append(" tao.IMPORTESEGURO , "); + sb.append(" tao.IMPORTETPP , "); + sb.append(" tao.ORGAOCONCEDENTE_ID , "); + sb.append(" tao.RUTA_ID , "); + sb.append(" tao.ORIGEN_ID , "); + sb.append(" tao.DESTINO_ID "); + sb.append(" from "); + sb.append(" TARIFA_OFICIAL tao, "); + sb.append(" VIGENCIA_TARIFA v, "); + sb.append(" MARCA m "); + sb.append(" where "); + sb.append(" m.MARCA_ID=tao.MARCA_ID "); + sb.append(" and tao.ACTIVO=1 "); + sb.append(" and v.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append(" "); + + if (orgao != null) { + sb.append(" and tao.ORGAOCONCEDENTE_ID=").append(orgao.getOrgaoConcedenteId()).append(" "); + } + if (empresa != null) { + sb.append(" and m.EMPRESA_ID=").append(empresa.getEmpresaId()).append(" "); + } + + sb.append(" and not (exists (select "); + sb.append(" tar.TARIFAEMBARCADA_ID "); + sb.append(" from "); + sb.append(" TARIFA_EMBARCADA tar "); + sb.append(" where "); + sb.append(" tar.ACTIVO=1 "); + sb.append(" and tar.TRAMO_ID=tao.TRAMO_ID "); + sb.append(" and tar.MARCA_ID=tao.MARCA_ID "); + sb.append(" and tar.CLASESERVICIO_ID=tao.CLASESERVICIO_ID "); + sb.append(" and tar.MONEDA_ID=tao.MONEDA_ID "); + sb.append(" and tar.ORGAOCONCEDENTE_ID=tao.ORGAOCONCEDENTE_ID "); + sb.append(" and tar.RUTA_ID=tao.RUTA_ID "); + sb.append(" and tar.VIGENCIATARIFA_ID=").append(vigenciaTarifaId).append("))"); + + return sb.toString(); + } + + @Override + public String getSQLSelecionarTarifaEmbarcadaPorTarifaOficalParaAtualizar(final Integer vigenciaTarifaId, Empresa empresa, OrgaoConcedente orgao) { + StringBuilder sb = new StringBuilder(""); + + sb.append("SELECT tao.IMPORTEPEDAGIO AS \"taoimportepedagio\", "); + sb.append(" tao.PRECIO AS \"taoprecio\", "); + sb.append(" tao.PRECIOORIGINAL AS \"taopreciooriginal\", "); + sb.append(" tao.IMPORTETAXAEMBARQUE AS \"taoimportetaxaembarque\", "); + sb.append(" tao.IMPORTESEGURO AS \"taoimporteseguro\", "); + sb.append(" tao.IMPORTETPP AS \"taoimportetpp\", "); + sb.append(" tao.IMPORTEOUTROS AS \"taoimporteoutros\", "); + sb.append(" ta.TARIFAEMBARCADA_ID AS \"tarifaId\" "); + + sb.append("FROM TARIFA_OFICIAL tao "); + sb.append("INNER JOIN TARIFA_EMBARCADA ta ON (tao.MARCA_ID = ta.MARCA_ID "); + sb.append(" AND tao.CLASESERVICIO_ID = ta.CLASESERVICIO_ID "); + sb.append(" AND tao.TRAMO_ID = ta.TRAMO_ID "); + sb.append(" AND tao.MONEDA_ID = ta.MONEDA_ID "); + sb.append(" AND tao.RUTA_ID = ta.RUTA_ID "); + sb.append(" AND tao.ORGAOCONCEDENTE_ID = ta.ORGAOCONCEDENTE_ID "); + sb.append(" )"); + sb.append("INNER JOIN MARCA mTa ON tao.MARCA_ID = mTa.MARCA_ID "); + sb.append("INNER JOIN MARCA mTao ON ta.MARCA_ID = mTao.MARCA_ID "); + + sb.append("WHERE ta.VIGENCIATARIFA_ID = ").append(vigenciaTarifaId); + + if (orgao != null) { + sb.append(" AND tao.ORGAOCONCEDENTE_ID = ").append(orgao.getOrgaoConcedenteId()); + } + if (empresa != null) { + sb.append(" AND mTa.EMPRESA_ID = ").append(empresa.getEmpresaId()); + sb.append(" AND mTao.EMPRESA_ID = ").append(empresa.getEmpresaId()); + } + + return sb.toString(); + } + + @Override + public String getSQLAtualizarTarifaEmbarcadaPorTarifaOfical(Map dados, Integer usuarioId, Boolean calculaPegagio, + Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP) { + + StringBuilder sb = new StringBuilder(""); + sb.append("UPDATE TARIFA_EMBARCADA SET "); + + if (calculaPegagio) { + sb.append("IMPORTEPEDAGIO=").append(dados.get("taoimportepedagio")).append(","); + } + if (calculaTarifa) { + sb.append("PRECIO=").append(dados.get("taoprecio")).append(",PRECIOORIGINAL=").append(dados.get("taopreciooriginal")).append(","); + } + if (calculaTaxaEmbarque) { + sb.append("IMPORTETAXAEMBARQUE=").append(dados.get("taoimportetaxaembarque")).append(","); + } + if (calculaSeguro) { + sb.append("IMPORTESEGURO=").append(dados.get("taoimporteseguro")).append(","); + } + if (calculaTPP) { + sb.append("IMPORTETPP=").append(dados.get("taoimportetpp")).append(","); + } + sb.append("IMPORTEOUTROS=").append(dados.get("taoimporteoutros")).append(","); + sb.append("FECMODIF= current_timestamp, USUARIO_ID=").append(usuarioId); + sb.append(" WHERE TARIFAEMBARCADA_ID = ").append(dados.get("tarifaId")); + + return sb.toString(); + } + + @Override + public String getSqlRemoverDuplicidadeNaTarifaOficial() { + // TODO Auto-generated method stub + StringBuilder sb = new StringBuilder("DELETE FROM tarifa_oficial "); + sb.append("WHERE ROWID IN ( "); + sb.append("SELECT rid FROM( "); + sb.append("SELECT ROWID rid, ROW_NUMBER() "); + sb.append("OVER(PARTITION BY orgaoconcedente_id, ruta_id, tramo_id, claseservicio_id, marca_id ORDER BY ROWID) rn "); + sb.append("FROM tarifa_oficial) "); + sb.append("WHERE rn <> 1 )"); + + return sb.toString(); + } + + + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java index 470f9e82c..26ca6eb48 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.IdentifierGenerator; -/** - * Classe que trata a geração do ID da tabela Aidf. - * - * Foi abandonado o uso da sequence pois existiam lacunas nos numeros e já havia atingido o tamanho máximo de 3 dígitos, com isso - * sendo necessário aproveitar os número que não haviam sido utilizados - * - * @author gleimar - * - */ -public class AidfGenerator implements IdentifierGenerator { - - private static final Logger log = LogManager.getLogger(AidfGenerator.class); - - @Override - public Serializable generate(SessionImplementor session, Object object) throws HibernateException { - - log.info("Inicio geração Idaidf"); - Serializable nextId = IdAidfStore.getInstance().getNextId(session.connection()); - log.info("Fim geração Idaidf:" + nextId); - - return nextId; - - } - -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.IdentifierGenerator; +/** + * Classe que trata a geração do ID da tabela Aidf. + * + * Foi abandonado o uso da sequence pois existiam lacunas nos numeros e já havia atingido o tamanho máximo de 3 dígitos, com isso + * sendo necessário aproveitar os número que não haviam sido utilizados + * + * @author gleimar + * + */ +public class AidfGenerator implements IdentifierGenerator { + + private static final Logger log = LogManager.getLogger(AidfGenerator.class); + + @Override + public Serializable generate(SessionImplementor session, Object object) throws HibernateException { + + log.info("Inicio geração Idaidf"); + Serializable nextId = IdAidfStore.getInstance().getNextId(session.connection()); + log.info("Fim geração Idaidf:" + nextId); + + return nextId; + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java index f00159f7a..2bbb0b31a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.IdentifierGenerator; - -public class ClaseServicioGenerator implements IdentifierGenerator { - private static final Logger log = LogManager.getLogger(ClaseServicioGenerator.class); - - @Override - public Serializable generate(SessionImplementor session, Object object) throws HibernateException { - // TODO Auto-generated method stub - log.info("Inicio geração ClaseServicioID"); - Serializable nextId = ClaseServicioStore.getInstance().getNextId(session.connection()); - log.info("Fim geração ClaseServicioID:" + nextId); - - return nextId; - } - -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.IdentifierGenerator; + +public class ClaseServicioGenerator implements IdentifierGenerator { + private static final Logger log = LogManager.getLogger(ClaseServicioGenerator.class); + + @Override + public Serializable generate(SessionImplementor session, Object object) throws HibernateException { + // TODO Auto-generated method stub + log.info("Inicio geração ClaseServicioID"); + Serializable nextId = ClaseServicioStore.getInstance().getNextId(session.connection()); + log.info("Fim geração ClaseServicioID:" + nextId); + + return nextId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java index 365c44a1e..71b8ce168 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; - -public class ClaseServicioStore { - - private static final Logger log = LogManager.getLogger(ClaseServicioStore.class); - private static ClaseServicioStore INSTANCE = new ClaseServicioStore(); - protected int qtdMaxima = 99; - - private ClaseServicioStore() { - - } - - public static ClaseServicioStore getInstance() { - return INSTANCE; - } - - public synchronized Serializable getNextId(Connection connection) throws HibernateException { - - log.info(String.format("qtdMaxima:%s", qtdMaxima)); - Integer idEncontrado = 0; - PreparedStatement ps; - - try { - ps = connection.prepareStatement("select min(a.CLASESERVICIO_ID) as idEncontrado from CLASE_SERVICIO a left join CLASE_SERVICIO b on b.CLASESERVICIO_ID = (a.CLASESERVICIO_ID +1) where b.CLASESERVICIO_ID is null and a.CLASESERVICIO_ID<>-1"); - ResultSet rs = ps.executeQuery(); - rs.next(); - idEncontrado = rs.getInt("idEncontrado"); - if (idEncontrado == null) - idEncontrado = 1; - - } catch (SQLException e) { - log.error("erro ao buscar id clase_servicio", e); - throw new HibernateException(e); - } - - log.info("indiceAtual=" + idEncontrado); - idEncontrado = idEncontrado + 1; - log.info("idEncontrado=" + idEncontrado); - if (idEncontrado > qtdMaxima) { - throw new HibernateException("A qtd de IDs permitidos para clase_servicio foi atingido:" + qtdMaxima); - } - return idEncontrado; - } - -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; + +public class ClaseServicioStore { + + private static final Logger log = LogManager.getLogger(ClaseServicioStore.class); + private static ClaseServicioStore INSTANCE = new ClaseServicioStore(); + protected int qtdMaxima = 99; + + private ClaseServicioStore() { + + } + + public static ClaseServicioStore getInstance() { + return INSTANCE; + } + + public synchronized Serializable getNextId(Connection connection) throws HibernateException { + + log.info(String.format("qtdMaxima:%s", qtdMaxima)); + Integer idEncontrado = 0; + PreparedStatement ps; + + try { + ps = connection.prepareStatement("select min(a.CLASESERVICIO_ID) as idEncontrado from CLASE_SERVICIO a left join CLASE_SERVICIO b on b.CLASESERVICIO_ID = (a.CLASESERVICIO_ID +1) where b.CLASESERVICIO_ID is null and a.CLASESERVICIO_ID<>-1"); + ResultSet rs = ps.executeQuery(); + rs.next(); + idEncontrado = rs.getInt("idEncontrado"); + if (idEncontrado == null) + idEncontrado = 1; + + } catch (SQLException e) { + log.error("erro ao buscar id clase_servicio", e); + throw new HibernateException(e); + } + + log.info("indiceAtual=" + idEncontrado); + idEncontrado = idEncontrado + 1; + log.info("idEncontrado=" + idEncontrado); + if (idEncontrado > qtdMaxima) { + throw new HibernateException("A qtd de IDs permitidos para clase_servicio foi atingido:" + qtdMaxima); + } + return idEncontrado; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java index dcb794421..7fab0923b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java @@ -1,88 +1,88 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + import org.apache.logging.log4j.Logger; - -import org.hibernate.SessionFactory; -import org.springframework.core.io.ClassPathResource; -import org.apache.logging.log4j.LogManager; - -public class DBUtil { - - private static final Logger log = LogManager.getLogger(DBUtil.class); - private static DBUtil INSTANCE; - private static Properties p; - private SessionFactory sessionFactory; - - public static DBUtil getInstance() { - if (INSTANCE == null) { - INSTANCE = new DBUtil(); - } - return INSTANCE; - } - - private DBUtil() { - p = new Properties(); - InputStream is; - try { - is = new ClassPathResource("/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties").getInputStream(); - - p.load(is); - is.close(); - } catch (IOException e) { - log.error("Erro ao carregar o properties do banco de dados", e); - } - } - - public boolean isOracle() { - return p.getProperty("database.dialect").toUpperCase().contains("ORACLE"); - } - - public boolean isSQLServer() { - return p.getProperty("database.dialect").toUpperCase().contains("SQLSERVER"); - } - - public boolean isRDS() { - return Boolean.valueOf(p.getProperty("database.rds", "false")); - } - - public String dbSysdate() { - if (isOracle()) { - if (isRDS()) { - return "DATETIME_RDS()"; - } else { - return "SYSDATE"; - } - } - if (isSQLServer()) { - return "GETDATE()"; - } - return ""; - } - - public SessionFactory getSessionFactory() { - return sessionFactory; - } - - public void setSessionFactory(SessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } - - // private String getDefaultSchema(){ - // return p.getProperty("database.default_schema").toUpperCase(); - // } - - // public String agregarDefaulSchema(String objBaseDados){ - // String [] array = objBaseDados.split("\\."); - // - // if (array.length == 1){ - // return getDefaultSchema() + "." + array[0]; - // }else if (array.length == 2){ - // return getDefaultSchema() + "." + array[1]; - // } - // return objBaseDados; - // } -} + +import org.hibernate.SessionFactory; +import org.springframework.core.io.ClassPathResource; +import org.apache.logging.log4j.LogManager; + +public class DBUtil { + + private static final Logger log = LogManager.getLogger(DBUtil.class); + private static DBUtil INSTANCE; + private static Properties p; + private SessionFactory sessionFactory; + + public static DBUtil getInstance() { + if (INSTANCE == null) { + INSTANCE = new DBUtil(); + } + return INSTANCE; + } + + private DBUtil() { + p = new Properties(); + InputStream is; + try { + is = new ClassPathResource("/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties").getInputStream(); + + p.load(is); + is.close(); + } catch (IOException e) { + log.error("Erro ao carregar o properties do banco de dados", e); + } + } + + public boolean isOracle() { + return p.getProperty("database.dialect").toUpperCase().contains("ORACLE"); + } + + public boolean isSQLServer() { + return p.getProperty("database.dialect").toUpperCase().contains("SQLSERVER"); + } + + public boolean isRDS() { + return Boolean.valueOf(p.getProperty("database.rds", "false")); + } + + public String dbSysdate() { + if (isOracle()) { + if (isRDS()) { + return "DATETIME_RDS()"; + } else { + return "SYSDATE"; + } + } + if (isSQLServer()) { + return "GETDATE()"; + } + return ""; + } + + public SessionFactory getSessionFactory() { + return sessionFactory; + } + + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + + // private String getDefaultSchema(){ + // return p.getProperty("database.default_schema").toUpperCase(); + // } + + // public String agregarDefaulSchema(String objBaseDados){ + // String [] array = objBaseDados.split("\\."); + // + // if (array.length == 1){ + // return getDefaultSchema() + "." + array[0]; + // }else if (array.length == 2){ + // return getDefaultSchema() + "." + array[1]; + // } + // return objBaseDados; + // } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java index 678810e8e..453bbd0bf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java @@ -1,27 +1,27 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.IdentifierGenerator; - -/** - * Trata a geração do ID da forma de pagamento data tabela forma de pagamento, pois não pode ultrapassar 2 digitos - * - * @author Guilherme Lopes - */ -public class FormaPagoGenerator implements IdentifierGenerator { - - private static final Logger log = LogManager.getLogger(FormaPagoGenerator.class); - - @Override - public Short generate(SessionImplementor session, Object object) throws HibernateException { - log.info("Inicio geração IdFormaPago"); - Serializable nextId = IdFormaPagoStore.getInstance().getNextId(session.connection()); - log.info("Fim geração IdFormaPago:" + nextId); - return Short.parseShort(nextId.toString()); - } -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.IdentifierGenerator; + +/** + * Trata a geração do ID da forma de pagamento data tabela forma de pagamento, pois não pode ultrapassar 2 digitos + * + * @author Guilherme Lopes + */ +public class FormaPagoGenerator implements IdentifierGenerator { + + private static final Logger log = LogManager.getLogger(FormaPagoGenerator.class); + + @Override + public Short generate(SessionImplementor session, Object object) throws HibernateException { + log.info("Inicio geração IdFormaPago"); + Serializable nextId = IdFormaPagoStore.getInstance().getNextId(session.connection()); + log.info("Fim geração IdFormaPago:" + nextId); + return Short.parseShort(nextId.toString()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java index b867211dd..d719ab5ea 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java @@ -1,126 +1,126 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -/** - * Classe que trata a geração do ID da tabela Aidf. - * - * Foi abandonado o uso da sequence pois existiam lacunas nos numeros e já havia atingido o tamanho máximo de 3 dígitos, com isso - * sendo necessário aproveitar os número que não haviam sido utilizados - * - * @author gleimar - * - */ -public class IdAidfStore { - - private static final Logger log = LogManager.getLogger(IdAidfStore.class); - - private static final String LIMITE_ID_AIDF = "LIMITE_ID_AIDF"; - - private static IdAidfStore INSTANCE = new IdAidfStore(); - - private int indiceAtual = 1; - - private IdAidfStore(){ - - } - - public static IdAidfStore getInstance(){ - return INSTANCE; - } - - /** - * Buscar novo limite de aidf. - * - * Por padrão é 999. Com o intuito de ativar de forma gradual, foi criado uma constante para essa Função - * @param connection - * @return - */ - private int buscarLimiteAidf(Connection connection){ - int qtdMaxima = 999; - PreparedStatement ps; - - log.info("buscando constante limite aidf ..."); - - try { - - ps = connection.prepareStatement("select VALORCONSTANTE from constante where NOMBCONSTANTE = :1"); - ps.setString(1, LIMITE_ID_AIDF); - - ResultSet rs = ps.executeQuery(); - - if (rs.next()){ - - String tmp = rs.getString("VALORCONSTANTE"); - - if (StringUtils.isNotBlank(tmp)){ - qtdMaxima = Integer.parseInt(tmp); - - log.info(String.format("constante encontrada : %s",tmp)); - } - }else{ - log.info("constante não parametrizada"); - } - - rs.close(); - ps.close(); - - }catch(Throwable e){ - log.error("erro buscar constante",e); - } - - return qtdMaxima; - } - - public synchronized Serializable getNextId(Connection connection) throws HibernateException { - - int qtdMaxima = this.buscarLimiteAidf(connection); - - log.info(String.format("qtdMaxima:%s",qtdMaxima)); - - long idEncontrado = -1; - - PreparedStatement ps; - - try { - - ps = connection.prepareStatement("select count(*) as qtd from aidf where aidf_id = :1"); - - for(; (idEncontrado == -1) && (indiceAtual <= qtdMaxima);indiceAtual++){ - ps.setInt(1, indiceAtual); - ResultSet rs = ps.executeQuery(); - rs.next(); - int qtd = rs.getInt("qtd"); - - if (qtd == 0){ - idEncontrado = indiceAtual; - } - } - - } catch (SQLException e) { - log.error("erro ao buscar id aidf",e); - throw new HibernateException(e); - } - - log.info("indiceAtual="+indiceAtual); - log.info("idEncontrado="+idEncontrado); - - if (indiceAtual > qtdMaxima && (idEncontrado != qtdMaxima) ){ - throw new HibernateException("A qtd de IDs permitidos para AIDF foi atingido:"+qtdMaxima); - } - - if (idEncontrado == -1){ - throw new HibernateException("Houve algum erro ao buscar um novo ID para AIDF"); - } - return idEncontrado; - } - -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +/** + * Classe que trata a geração do ID da tabela Aidf. + * + * Foi abandonado o uso da sequence pois existiam lacunas nos numeros e já havia atingido o tamanho máximo de 3 dígitos, com isso + * sendo necessário aproveitar os número que não haviam sido utilizados + * + * @author gleimar + * + */ +public class IdAidfStore { + + private static final Logger log = LogManager.getLogger(IdAidfStore.class); + + private static final String LIMITE_ID_AIDF = "LIMITE_ID_AIDF"; + + private static IdAidfStore INSTANCE = new IdAidfStore(); + + private int indiceAtual = 1; + + private IdAidfStore(){ + + } + + public static IdAidfStore getInstance(){ + return INSTANCE; + } + + /** + * Buscar novo limite de aidf. + * + * Por padrão é 999. Com o intuito de ativar de forma gradual, foi criado uma constante para essa Função + * @param connection + * @return + */ + private int buscarLimiteAidf(Connection connection){ + int qtdMaxima = 999; + PreparedStatement ps; + + log.info("buscando constante limite aidf ..."); + + try { + + ps = connection.prepareStatement("select VALORCONSTANTE from constante where NOMBCONSTANTE = :1"); + ps.setString(1, LIMITE_ID_AIDF); + + ResultSet rs = ps.executeQuery(); + + if (rs.next()){ + + String tmp = rs.getString("VALORCONSTANTE"); + + if (StringUtils.isNotBlank(tmp)){ + qtdMaxima = Integer.parseInt(tmp); + + log.info(String.format("constante encontrada : %s",tmp)); + } + }else{ + log.info("constante não parametrizada"); + } + + rs.close(); + ps.close(); + + }catch(Throwable e){ + log.error("erro buscar constante",e); + } + + return qtdMaxima; + } + + public synchronized Serializable getNextId(Connection connection) throws HibernateException { + + int qtdMaxima = this.buscarLimiteAidf(connection); + + log.info(String.format("qtdMaxima:%s",qtdMaxima)); + + long idEncontrado = -1; + + PreparedStatement ps; + + try { + + ps = connection.prepareStatement("select count(*) as qtd from aidf where aidf_id = :1"); + + for(; (idEncontrado == -1) && (indiceAtual <= qtdMaxima);indiceAtual++){ + ps.setInt(1, indiceAtual); + ResultSet rs = ps.executeQuery(); + rs.next(); + int qtd = rs.getInt("qtd"); + + if (qtd == 0){ + idEncontrado = indiceAtual; + } + } + + } catch (SQLException e) { + log.error("erro ao buscar id aidf",e); + throw new HibernateException(e); + } + + log.info("indiceAtual="+indiceAtual); + log.info("idEncontrado="+idEncontrado); + + if (indiceAtual > qtdMaxima && (idEncontrado != qtdMaxima) ){ + throw new HibernateException("A qtd de IDs permitidos para AIDF foi atingido:"+qtdMaxima); + } + + if (idEncontrado == -1){ + throw new HibernateException("Houve algum erro ao buscar um novo ID para AIDF"); + } + return idEncontrado; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java index 889df531b..4d1822787 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java @@ -1,122 +1,122 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; - -/** - * Trata a geração do ID da forma de pagamento data tabela forma de pagamento, pois não pode ultrapassar 2 digitos - * - * @author Guilherme Lopes - */ -public class IdFormaPagoStore { - - private static final Logger log = LogManager.getLogger(IdFormaPagoStore.class); - - private static final String LIMITE_ID_FORMA_PAGTO = "LIMITE_ID_FORMA_PAGTO"; - - private static IdFormaPagoStore INSTANCE = new IdFormaPagoStore(); - - private int indiceAtual = 1; - - private IdFormaPagoStore() { - } - - public static IdFormaPagoStore getInstance() { - return INSTANCE; - } - - public synchronized Serializable getNextId(Connection connection) throws HibernateException { - - int qtdMaxima = this.buscarLimiteFormaPago(connection); - - log.info(String.format("qtdMaxima:%s", qtdMaxima)); - - long idEncontrado = -1; - - PreparedStatement ps; - - try { - - ps = connection.prepareStatement("SELECT COUNT(*) AS qtd FROM FORMA_PAGO WHERE FORMAPAGO_ID = :1"); - - for (; (idEncontrado == -1) && (indiceAtual <= qtdMaxima); indiceAtual++) { - ps.setInt(1, indiceAtual); - ResultSet rs = ps.executeQuery(); - rs.next(); - int qtd = rs.getInt("qtd"); - - if (qtd == 0) { - idEncontrado = indiceAtual; - } - } - - } catch (SQLException e) { - log.error("erro ao buscar id IdFormaPago", e); - throw new HibernateException(e); - } - - log.info("indiceAtual=" + indiceAtual); - log.info("idEncontrado=" + idEncontrado); - - if (indiceAtual > qtdMaxima && (idEncontrado != qtdMaxima)) { - throw new HibernateException("A qtd de IDs permitidos para IdFormaPago foi atingido:" + qtdMaxima); - } - - if (idEncontrado == -1) { - throw new HibernateException("Houve algum erro ao buscar um novo ID para IdFormaPago !"); - } - return idEncontrado; - } - - /** - * Buscar novo limite de IdFormaPago. - * - * Por padrão é 99. Com o intuito de ativar de forma gradual, foi criado uma constante para essa Função - * - * @param connection - * @return - */ - private int buscarLimiteFormaPago(Connection connection) { - int qtdMaxima = 99; - PreparedStatement ps; - - log.info("buscando constante limite IdFormaPago ..."); - - try { - - ps = connection.prepareStatement("SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = :1"); - ps.setString(1, LIMITE_ID_FORMA_PAGTO); - - ResultSet rs = ps.executeQuery(); - - if (rs.next()) { - - String tmp = rs.getString("VALORCONSTANTE"); - - if (StringUtils.isNotBlank(tmp)) { - qtdMaxima = Integer.parseInt(tmp); - - log.info(String.format("constante encontrada : %s", tmp)); - } - } else { - log.info("constante não parametrizada"); - } - - rs.close(); - ps.close(); - - } catch (Throwable e) { - log.error("erro buscar constante", e); - } - - return qtdMaxima; - } -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; + +/** + * Trata a geração do ID da forma de pagamento data tabela forma de pagamento, pois não pode ultrapassar 2 digitos + * + * @author Guilherme Lopes + */ +public class IdFormaPagoStore { + + private static final Logger log = LogManager.getLogger(IdFormaPagoStore.class); + + private static final String LIMITE_ID_FORMA_PAGTO = "LIMITE_ID_FORMA_PAGTO"; + + private static IdFormaPagoStore INSTANCE = new IdFormaPagoStore(); + + private int indiceAtual = 1; + + private IdFormaPagoStore() { + } + + public static IdFormaPagoStore getInstance() { + return INSTANCE; + } + + public synchronized Serializable getNextId(Connection connection) throws HibernateException { + + int qtdMaxima = this.buscarLimiteFormaPago(connection); + + log.info(String.format("qtdMaxima:%s", qtdMaxima)); + + long idEncontrado = -1; + + PreparedStatement ps; + + try { + + ps = connection.prepareStatement("SELECT COUNT(*) AS qtd FROM FORMA_PAGO WHERE FORMAPAGO_ID = :1"); + + for (; (idEncontrado == -1) && (indiceAtual <= qtdMaxima); indiceAtual++) { + ps.setInt(1, indiceAtual); + ResultSet rs = ps.executeQuery(); + rs.next(); + int qtd = rs.getInt("qtd"); + + if (qtd == 0) { + idEncontrado = indiceAtual; + } + } + + } catch (SQLException e) { + log.error("erro ao buscar id IdFormaPago", e); + throw new HibernateException(e); + } + + log.info("indiceAtual=" + indiceAtual); + log.info("idEncontrado=" + idEncontrado); + + if (indiceAtual > qtdMaxima && (idEncontrado != qtdMaxima)) { + throw new HibernateException("A qtd de IDs permitidos para IdFormaPago foi atingido:" + qtdMaxima); + } + + if (idEncontrado == -1) { + throw new HibernateException("Houve algum erro ao buscar um novo ID para IdFormaPago !"); + } + return idEncontrado; + } + + /** + * Buscar novo limite de IdFormaPago. + * + * Por padrão é 99. Com o intuito de ativar de forma gradual, foi criado uma constante para essa Função + * + * @param connection + * @return + */ + private int buscarLimiteFormaPago(Connection connection) { + int qtdMaxima = 99; + PreparedStatement ps; + + log.info("buscando constante limite IdFormaPago ..."); + + try { + + ps = connection.prepareStatement("SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = :1"); + ps.setString(1, LIMITE_ID_FORMA_PAGTO); + + ResultSet rs = ps.executeQuery(); + + if (rs.next()) { + + String tmp = rs.getString("VALORCONSTANTE"); + + if (StringUtils.isNotBlank(tmp)) { + qtdMaxima = Integer.parseInt(tmp); + + log.info(String.format("constante encontrada : %s", tmp)); + } + } else { + log.info("constante não parametrizada"); + } + + rs.close(); + ps.close(); + + } catch (Throwable e) { + log.error("erro buscar constante", e); + } + + return qtdMaxima; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java index 336d5f52f..d144f26e0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java @@ -1,122 +1,122 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; - -/** - * Trata a geração do ID da forma de pagamento data tabela forma de pagamento, pois não pode ultrapassar 2 digitos - * - * @author Wallace - */ -public class IdTipoParadaStore { - - private static final Logger log = LogManager.getLogger(IdTipoParadaStore.class); - - private static final String LIMITE_ID_TIPO_PARADA = "LIMITE_ID_TIPO_PARADA"; - - private static IdTipoParadaStore INSTANCE = new IdTipoParadaStore(); - - private int indiceAtual = 1; - - private IdTipoParadaStore() { - } - - public static IdTipoParadaStore getInstance() { - return INSTANCE; - } - - public synchronized Serializable getNextId(Connection connection) throws HibernateException { - - int qtdMaxima = this.buscarLimiteTipoParada(connection); - - log.info(String.format("qtdMaxima:%s", qtdMaxima)); - - long idEncontrado = -1; - - PreparedStatement ps; - - try { - - ps = connection.prepareStatement("SELECT COUNT(*) AS qtd FROM TIPO_PARADA WHERE TIPOPARADA_ID = :1"); - - for (; (idEncontrado == -1) && (indiceAtual <= qtdMaxima); indiceAtual++) { - ps.setInt(1, indiceAtual); - ResultSet rs = ps.executeQuery(); - rs.next(); - int qtd = rs.getInt("qtd"); - - if (qtd == 0) { - idEncontrado = indiceAtual; - } - } - - } catch (SQLException e) { - log.error("erro ao buscar id IdTipoParada", e); - throw new HibernateException(e); - } - - log.info("indiceAtual=" + indiceAtual); - log.info("idEncontrado=" + idEncontrado); - - if (indiceAtual > qtdMaxima && (idEncontrado != qtdMaxima)) { - throw new HibernateException("A qtd de IDs permitidos para IdTipoParadafoi atingido:" + qtdMaxima); - } - - if (idEncontrado == -1) { - throw new HibernateException("Houve algum erro ao buscar um novo ID para IdTipoParada !"); - } - return idEncontrado; - } - - /** - * Buscar novo limite de IdTipoParada. - * - * Por padrão é 127. Com o intuito de ativar de forma gradual, foi criado uma constante para essa Função - * - * @param connection - * @return - */ - private int buscarLimiteTipoParada(Connection connection) { - int qtdMaxima = 127; - PreparedStatement ps; - - log.info("buscando constante limite IdTipoParada ..."); - - try { - - ps = connection.prepareStatement("SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = :1"); - ps.setString(1, LIMITE_ID_TIPO_PARADA); - - ResultSet rs = ps.executeQuery(); - - if (rs.next()) { - - String tmp = rs.getString("VALORCONSTANTE"); - - if (StringUtils.isNotBlank(tmp)) { - qtdMaxima = Integer.parseInt(tmp); - - log.info(String.format("constante encontrada : %s", tmp)); - } - } else { - log.info("constante não parametrizada"); - } - - rs.close(); - ps.close(); - - } catch (Throwable e) { - log.error("erro buscar constante", e); - } - - return qtdMaxima; - } -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; + +/** + * Trata a geração do ID da forma de pagamento data tabela forma de pagamento, pois não pode ultrapassar 2 digitos + * + * @author Wallace + */ +public class IdTipoParadaStore { + + private static final Logger log = LogManager.getLogger(IdTipoParadaStore.class); + + private static final String LIMITE_ID_TIPO_PARADA = "LIMITE_ID_TIPO_PARADA"; + + private static IdTipoParadaStore INSTANCE = new IdTipoParadaStore(); + + private int indiceAtual = 1; + + private IdTipoParadaStore() { + } + + public static IdTipoParadaStore getInstance() { + return INSTANCE; + } + + public synchronized Serializable getNextId(Connection connection) throws HibernateException { + + int qtdMaxima = this.buscarLimiteTipoParada(connection); + + log.info(String.format("qtdMaxima:%s", qtdMaxima)); + + long idEncontrado = -1; + + PreparedStatement ps; + + try { + + ps = connection.prepareStatement("SELECT COUNT(*) AS qtd FROM TIPO_PARADA WHERE TIPOPARADA_ID = :1"); + + for (; (idEncontrado == -1) && (indiceAtual <= qtdMaxima); indiceAtual++) { + ps.setInt(1, indiceAtual); + ResultSet rs = ps.executeQuery(); + rs.next(); + int qtd = rs.getInt("qtd"); + + if (qtd == 0) { + idEncontrado = indiceAtual; + } + } + + } catch (SQLException e) { + log.error("erro ao buscar id IdTipoParada", e); + throw new HibernateException(e); + } + + log.info("indiceAtual=" + indiceAtual); + log.info("idEncontrado=" + idEncontrado); + + if (indiceAtual > qtdMaxima && (idEncontrado != qtdMaxima)) { + throw new HibernateException("A qtd de IDs permitidos para IdTipoParadafoi atingido:" + qtdMaxima); + } + + if (idEncontrado == -1) { + throw new HibernateException("Houve algum erro ao buscar um novo ID para IdTipoParada !"); + } + return idEncontrado; + } + + /** + * Buscar novo limite de IdTipoParada. + * + * Por padrão é 127. Com o intuito de ativar de forma gradual, foi criado uma constante para essa Função + * + * @param connection + * @return + */ + private int buscarLimiteTipoParada(Connection connection) { + int qtdMaxima = 127; + PreparedStatement ps; + + log.info("buscando constante limite IdTipoParada ..."); + + try { + + ps = connection.prepareStatement("SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = :1"); + ps.setString(1, LIMITE_ID_TIPO_PARADA); + + ResultSet rs = ps.executeQuery(); + + if (rs.next()) { + + String tmp = rs.getString("VALORCONSTANTE"); + + if (StringUtils.isNotBlank(tmp)) { + qtdMaxima = Integer.parseInt(tmp); + + log.info(String.format("constante encontrada : %s", tmp)); + } + } else { + log.info("constante não parametrizada"); + } + + rs.close(); + ps.close(); + + } catch (Throwable e) { + log.error("erro buscar constante", e); + } + + return qtdMaxima; + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java index 87bc2c128..97154212a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java @@ -1,27 +1,27 @@ -package com.rjconsultores.ventaboletos.dao.util; - -import java.io.Serializable; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.hibernate.HibernateException; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.IdentifierGenerator; - -/** - * Trata a geração do ID da tipo parada data tabela tipo parada - * - * @author Wallace - */ -public class TipoParadaGenerator implements IdentifierGenerator { - - private static final Logger log = LogManager.getLogger(TipoParadaGenerator.class); - - @Override - public Short generate(SessionImplementor session, Object object) throws HibernateException { - log.info("Inicio geração IdTipoParada"); - Serializable nextId = IdTipoParadaStore.getInstance().getNextId(session.connection()); - log.info("Fim geração IdTipoParada:" + nextId); - return Short.parseShort(nextId.toString()); - } -} +package com.rjconsultores.ventaboletos.dao.util; + +import java.io.Serializable; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.IdentifierGenerator; + +/** + * Trata a geração do ID da tipo parada data tabela tipo parada + * + * @author Wallace + */ +public class TipoParadaGenerator implements IdentifierGenerator { + + private static final Logger log = LogManager.getLogger(TipoParadaGenerator.class); + + @Override + public Short generate(SessionImplementor session, Object object) throws HibernateException { + log.info("Inicio geração IdTipoParada"); + Serializable nextId = IdTipoParadaStore.getInstance().getNextId(session.connection()); + log.info("Fim geração IdTipoParada:" + nextId); + return Short.parseShort(nextId.toString()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AbastoBoleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoBoleto.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/AbastoBoleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoBoleto.java index 81696f588..5a493eeb1 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AbastoBoleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoBoleto.java @@ -1,283 +1,283 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "ABASTO_BOLETO_SEQ", sequenceName = "ABASTO_BOLETO_SEQ", allocationSize = 1) -@Table(name = "ABASTO_BOLETO") -public class AbastoBoleto implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ABASTO_BOLETO_SEQ") - @Column(name = "ABASTOBOLETO_ID") - private Integer abastoboletoId; - @Column(name = "NUMSERVIDOR") - private Integer numservidor; - @Column(name = "NUMREQUISICION") - private Long numrequisicion; - @Column(name = "FECHORREQ") - @Temporal(TemporalType.TIMESTAMP) - private Date fechorreq; - @Column(name = "USUARIOREQ_ID") - private Integer usuarioreqId; - @Column(name = "CANTFAJILLA") - private Long cantfajilla; - @Column(name = "FECHORGENERACION") - @Temporal(TemporalType.TIMESTAMP) - private Date fechorgeneracion; - @Column(name = "USUARIOGENERACION_ID") - private Integer usuariogeneracionId; - @Column(name = "STATUSFIRMA") - private Integer statusfirma; - @Column(name = "STATUSENVIO") - private Integer statusEnvio; - @Column(name = "FECHORFIRMA") - @Temporal(TemporalType.TIMESTAMP) - private Date fechorfirma; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PUNTOVENTACENTRAL_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventacentral; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventa; - @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") - @ManyToOne - private Estacion estacion; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "CLASIFICACION_ID", referencedColumnName = "CLASIFICACION_ID") - @ManyToOne - private Clasificacion clasificacion; - @JoinColumn(name = "ARTICULO_ID", referencedColumnName = "ARTICULO_ID") - @ManyToOne - private Articulo articulo; - @OneToMany(mappedBy = "abastoBoleto", cascade = CascadeType.ALL) - private List detAbastoBoletoList; - - public Integer getAbastoboletoId() { - return abastoboletoId; - } - - public void setAbastoboletoId(Integer abastoboletoId) { - this.abastoboletoId = abastoboletoId; - } - - public Integer getNumservidor() { - return numservidor; - } - - public void setNumservidor(Integer numservidor) { - this.numservidor = numservidor; - } - - public Long getNumrequisicion() { - return numrequisicion; - } - - public void setNumrequisicion(Long numrequisicion) { - this.numrequisicion = numrequisicion; - } - - public Date getFechorreq() { - return fechorreq; - } - - public void setFechorreq(Date fechorreq) { - this.fechorreq = fechorreq; - } - - public Integer getUsuarioreqId() { - return usuarioreqId; - } - - public void setUsuarioreqId(Integer usuarioreqId) { - this.usuarioreqId = usuarioreqId; - } - - public Long getCantfajilla() { - return cantfajilla; - } - - public void setCantfajilla(Long cantfajilla) { - this.cantfajilla = cantfajilla; - } - - public Date getFechorgeneracion() { - return fechorgeneracion; - } - - public void setFechorgeneracion(Date fechorgeneracion) { - this.fechorgeneracion = fechorgeneracion; - } - - public Integer getUsuariogeneracionId() { - return usuariogeneracionId; - } - - public void setUsuariogeneracionId(Integer usuariogeneracionId) { - this.usuariogeneracionId = usuariogeneracionId; - } - - public Integer getStatusfirma() { - return statusfirma; - } - - public void setStatusfirma(Integer statusfirma) { - this.statusfirma = statusfirma; - } - - public Integer getStatusEnvio() { - return statusEnvio; - } - - public void setStatusEnvio(Integer statusEnvio) { - this.statusEnvio = statusEnvio; - } - - public Date getFechorfirma() { - return fechorfirma; - } - - public void setFechorfirma(Date fechorfirma) { - this.fechorfirma = fechorfirma; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventacentral() { - return puntoventacentral; - } - - public void setPuntoventacentral(PuntoVenta puntoventacentral) { - this.puntoventacentral = puntoventacentral; - } - - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Clasificacion getClasificacion() { - return clasificacion; - } - - public void setClasificacion(Clasificacion clasificacion) { - this.clasificacion = clasificacion; - } - - public Articulo getArticulo() { - return articulo; - } - - public void setArticulo(Articulo articulo) { - this.articulo = articulo; - } - - public List getDetAbastoBoletoList() { - return detAbastoBoletoList; - } - - public void setDetAbastoBoletoList(List detAbastoBoletoList) { - this.detAbastoBoletoList = detAbastoBoletoList; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((abastoboletoId == null) ? 0 : abastoboletoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AbastoBoleto other = (AbastoBoleto) obj; - if (abastoboletoId == null) { - if (other.abastoboletoId != null) - return false; - } else if (!abastoboletoId.equals(other.abastoboletoId)) - return false; - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.AbastoBoleto [abastoboletoId=" + abastoboletoId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "ABASTO_BOLETO_SEQ", sequenceName = "ABASTO_BOLETO_SEQ", allocationSize = 1) +@Table(name = "ABASTO_BOLETO") +public class AbastoBoleto implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ABASTO_BOLETO_SEQ") + @Column(name = "ABASTOBOLETO_ID") + private Integer abastoboletoId; + @Column(name = "NUMSERVIDOR") + private Integer numservidor; + @Column(name = "NUMREQUISICION") + private Long numrequisicion; + @Column(name = "FECHORREQ") + @Temporal(TemporalType.TIMESTAMP) + private Date fechorreq; + @Column(name = "USUARIOREQ_ID") + private Integer usuarioreqId; + @Column(name = "CANTFAJILLA") + private Long cantfajilla; + @Column(name = "FECHORGENERACION") + @Temporal(TemporalType.TIMESTAMP) + private Date fechorgeneracion; + @Column(name = "USUARIOGENERACION_ID") + private Integer usuariogeneracionId; + @Column(name = "STATUSFIRMA") + private Integer statusfirma; + @Column(name = "STATUSENVIO") + private Integer statusEnvio; + @Column(name = "FECHORFIRMA") + @Temporal(TemporalType.TIMESTAMP) + private Date fechorfirma; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PUNTOVENTACENTRAL_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventacentral; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventa; + @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") + @ManyToOne + private Estacion estacion; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "CLASIFICACION_ID", referencedColumnName = "CLASIFICACION_ID") + @ManyToOne + private Clasificacion clasificacion; + @JoinColumn(name = "ARTICULO_ID", referencedColumnName = "ARTICULO_ID") + @ManyToOne + private Articulo articulo; + @OneToMany(mappedBy = "abastoBoleto", cascade = CascadeType.ALL) + private List detAbastoBoletoList; + + public Integer getAbastoboletoId() { + return abastoboletoId; + } + + public void setAbastoboletoId(Integer abastoboletoId) { + this.abastoboletoId = abastoboletoId; + } + + public Integer getNumservidor() { + return numservidor; + } + + public void setNumservidor(Integer numservidor) { + this.numservidor = numservidor; + } + + public Long getNumrequisicion() { + return numrequisicion; + } + + public void setNumrequisicion(Long numrequisicion) { + this.numrequisicion = numrequisicion; + } + + public Date getFechorreq() { + return fechorreq; + } + + public void setFechorreq(Date fechorreq) { + this.fechorreq = fechorreq; + } + + public Integer getUsuarioreqId() { + return usuarioreqId; + } + + public void setUsuarioreqId(Integer usuarioreqId) { + this.usuarioreqId = usuarioreqId; + } + + public Long getCantfajilla() { + return cantfajilla; + } + + public void setCantfajilla(Long cantfajilla) { + this.cantfajilla = cantfajilla; + } + + public Date getFechorgeneracion() { + return fechorgeneracion; + } + + public void setFechorgeneracion(Date fechorgeneracion) { + this.fechorgeneracion = fechorgeneracion; + } + + public Integer getUsuariogeneracionId() { + return usuariogeneracionId; + } + + public void setUsuariogeneracionId(Integer usuariogeneracionId) { + this.usuariogeneracionId = usuariogeneracionId; + } + + public Integer getStatusfirma() { + return statusfirma; + } + + public void setStatusfirma(Integer statusfirma) { + this.statusfirma = statusfirma; + } + + public Integer getStatusEnvio() { + return statusEnvio; + } + + public void setStatusEnvio(Integer statusEnvio) { + this.statusEnvio = statusEnvio; + } + + public Date getFechorfirma() { + return fechorfirma; + } + + public void setFechorfirma(Date fechorfirma) { + this.fechorfirma = fechorfirma; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventacentral() { + return puntoventacentral; + } + + public void setPuntoventacentral(PuntoVenta puntoventacentral) { + this.puntoventacentral = puntoventacentral; + } + + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Clasificacion getClasificacion() { + return clasificacion; + } + + public void setClasificacion(Clasificacion clasificacion) { + this.clasificacion = clasificacion; + } + + public Articulo getArticulo() { + return articulo; + } + + public void setArticulo(Articulo articulo) { + this.articulo = articulo; + } + + public List getDetAbastoBoletoList() { + return detAbastoBoletoList; + } + + public void setDetAbastoBoletoList(List detAbastoBoletoList) { + this.detAbastoBoletoList = detAbastoBoletoList; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((abastoboletoId == null) ? 0 : abastoboletoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AbastoBoleto other = (AbastoBoleto) obj; + if (abastoboletoId == null) { + if (other.abastoboletoId != null) + return false; + } else if (!abastoboletoId.equals(other.abastoboletoId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.AbastoBoleto [abastoboletoId=" + abastoboletoId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AbastoCentral.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoCentral.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/AbastoCentral.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoCentral.java index 12b2336b2..e8b4c2d63 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AbastoCentral.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoCentral.java @@ -1,150 +1,150 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * AbastoCentral generated by hbm2java - */ -@Entity -@Table(name = "ABASTO_CENTRAL") -public class AbastoCentral implements java.io.Serializable { - - private Long abastocentralId; - private Aidf aidf; - private String numseriepreimpresa; - private String numfoliopreimpreso; - private String numsubseriepreimpreso; - private PuntoVenta puntoventa; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private Estacion estacion; - - public AbastoCentral() { - } - - public AbastoCentral(Aidf _aidf, String _numseriepreimpresa, String _numfoliopreimpreso, String _numsubseriepreimpreso, - PuntoVenta _puntoventa, Boolean _activo, Date _fecmodif, Integer _usuarioId) { - aidf = _aidf; - numseriepreimpresa = _numseriepreimpresa; - numfoliopreimpreso = _numfoliopreimpreso; - numsubseriepreimpreso = _numsubseriepreimpreso; - puntoventa = _puntoventa; - activo = _activo; - fecmodif = _fecmodif; - usuarioId = _usuarioId; - } - - @SequenceGenerator(name = "ABASTO_HISTO_SEQ", sequenceName = "ABASTO_HISTO_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ABASTO_HISTO_SEQ") - @Column(name = "ABASTOCENTRAL_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getAbastocentralId() { - return this.abastocentralId; - } - - public void setAbastocentralId(Long abastocentralId) { - this.abastocentralId = abastocentralId; - } - - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "AIDF_ID") - public Aidf getAidf() { - return this.aidf; - } - - public void setAidf(Aidf aidf) { - this.aidf = aidf; - } - - @Column(name = "NUMSERIEPREIMPRESA", length = 10) - public String getNumseriepreimpresa() { - return this.numseriepreimpresa; - } - - public void setNumseriepreimpresa(String numseriepreimpresa) { - this.numseriepreimpresa = numseriepreimpresa; - } - - @Column(name = "NUMFOLIOPREIMPRESO", length = 12) - public String getNumfoliopreimpreso() { - return this.numfoliopreimpreso; - } - - public void setNumfoliopreimpreso(String numfoliopreimpreso) { - this.numfoliopreimpreso = numfoliopreimpreso; - } - - @Column(name = "NUMSUBSERIEPREIMPRESO", length = 10) - public String getNumsubseriepreimpreso() { - return this.numsubseriepreimpreso; - } - - public void setNumsubseriepreimpreso(String numsubseriepreimpreso) { - this.numsubseriepreimpreso = numsubseriepreimpreso; - } - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - public PuntoVenta getPuntoventa() { - return this.puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @ManyToOne - @JoinColumn(name = "ESTACION_ID") - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * AbastoCentral generated by hbm2java + */ +@Entity +@Table(name = "ABASTO_CENTRAL") +public class AbastoCentral implements java.io.Serializable { + + private Long abastocentralId; + private Aidf aidf; + private String numseriepreimpresa; + private String numfoliopreimpreso; + private String numsubseriepreimpreso; + private PuntoVenta puntoventa; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private Estacion estacion; + + public AbastoCentral() { + } + + public AbastoCentral(Aidf _aidf, String _numseriepreimpresa, String _numfoliopreimpreso, String _numsubseriepreimpreso, + PuntoVenta _puntoventa, Boolean _activo, Date _fecmodif, Integer _usuarioId) { + aidf = _aidf; + numseriepreimpresa = _numseriepreimpresa; + numfoliopreimpreso = _numfoliopreimpreso; + numsubseriepreimpreso = _numsubseriepreimpreso; + puntoventa = _puntoventa; + activo = _activo; + fecmodif = _fecmodif; + usuarioId = _usuarioId; + } + + @SequenceGenerator(name = "ABASTO_HISTO_SEQ", sequenceName = "ABASTO_HISTO_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ABASTO_HISTO_SEQ") + @Column(name = "ABASTOCENTRAL_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getAbastocentralId() { + return this.abastocentralId; + } + + public void setAbastocentralId(Long abastocentralId) { + this.abastocentralId = abastocentralId; + } + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "AIDF_ID") + public Aidf getAidf() { + return this.aidf; + } + + public void setAidf(Aidf aidf) { + this.aidf = aidf; + } + + @Column(name = "NUMSERIEPREIMPRESA", length = 10) + public String getNumseriepreimpresa() { + return this.numseriepreimpresa; + } + + public void setNumseriepreimpresa(String numseriepreimpresa) { + this.numseriepreimpresa = numseriepreimpresa; + } + + @Column(name = "NUMFOLIOPREIMPRESO", length = 12) + public String getNumfoliopreimpreso() { + return this.numfoliopreimpreso; + } + + public void setNumfoliopreimpreso(String numfoliopreimpreso) { + this.numfoliopreimpreso = numfoliopreimpreso; + } + + @Column(name = "NUMSUBSERIEPREIMPRESO", length = 10) + public String getNumsubseriepreimpreso() { + return this.numsubseriepreimpreso; + } + + public void setNumsubseriepreimpreso(String numsubseriepreimpreso) { + this.numsubseriepreimpreso = numsubseriepreimpreso; + } + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + public PuntoVenta getPuntoventa() { + return this.puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @ManyToOne + @JoinColumn(name = "ESTACION_ID") + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AbastoHisto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoHisto.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/AbastoHisto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoHisto.java index 27cb2f742..d2a705f25 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AbastoHisto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AbastoHisto.java @@ -1,189 +1,189 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * AbastoHisto generated by hbm2java - */ -@Entity -@Table(name = "ABASTO_HISTO") -public class AbastoHisto implements java.io.Serializable { - - private Long abastohistoId; - private TipoMovimentacion tipoMovimentacion; - private Aidf aidf; - private String numseriepreimpresa; - private String numfoliopreimpreso; - private String numsubseriepreimpreso; - private Date fechorhisto; - private PuntoVenta puntoventa; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private Estacion estacion; - - public AbastoHisto() { - } - - public AbastoHisto(AbastoCentral bilhete, TipoMovimentacion _tipoMovimentacion, Date _fechorhisto, Boolean _activo, Date _fecmodif, Integer _usuarioId) { - tipoMovimentacion = _tipoMovimentacion; - aidf = bilhete.getAidf(); - numseriepreimpresa = bilhete.getNumseriepreimpresa(); - numfoliopreimpreso = bilhete.getNumfoliopreimpreso(); - numsubseriepreimpreso = bilhete.getNumsubseriepreimpreso(); - estacion = bilhete.getEstacion(); - fechorhisto = _fechorhisto; - puntoventa = bilhete.getPuntoventa(); - activo = _activo; - fecmodif = _fecmodif; - usuarioId = _usuarioId; - } - - public AbastoHisto(TipoMovimentacion _tipoMovimentacion, Aidf _aidf, String _numseriepreimpresa, String _numfoliopreimpreso, - String _numsubseriepreimpreso, Date _fechorhisto, PuntoVenta _puntoventa, Boolean _activo, Date _fecmodif, Integer _usuarioId, Estacion _estacion) { - tipoMovimentacion = _tipoMovimentacion; - aidf = _aidf; - numseriepreimpresa = _numseriepreimpresa; - numfoliopreimpreso = _numfoliopreimpreso; - numsubseriepreimpreso = _numsubseriepreimpreso; - fechorhisto = _fechorhisto; - puntoventa = _puntoventa; - activo = _activo; - fecmodif = _fecmodif; - usuarioId = _usuarioId; - estacion = _estacion; - } - - @SequenceGenerator(name = "ABASTO_HISTO_SEQ", sequenceName = "ABASTO_HISTO_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ABASTO_HISTO_SEQ") - @Column(name = "ABASTOHISTO_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getAbastohistoId() { - return this.abastohistoId; - } - - public void setAbastohistoId(Long abastohistoId) { - this.abastohistoId = abastohistoId; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "TIPOMOVIMENTACION_ID") - public TipoMovimentacion getTipoMovimentacion() { - return this.tipoMovimentacion; - } - - public void setTipoMovimentacion(TipoMovimentacion tipoMovimentacion) { - this.tipoMovimentacion = tipoMovimentacion; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "AIDF_ID") - public Aidf getAidf() { - return this.aidf; - } - - public void setAidf(Aidf aidf) { - this.aidf = aidf; - } - - @Column(name = "NUMSERIEPREIMPRESA", length = 10) - public String getNumseriepreimpresa() { - return this.numseriepreimpresa; - } - - public void setNumseriepreimpresa(String numseriepreimpresa) { - this.numseriepreimpresa = numseriepreimpresa; - } - - @Column(name = "NUMFOLIOPREIMPRESO", length = 12) - public String getNumfoliopreimpreso() { - return this.numfoliopreimpreso; - } - - public void setNumfoliopreimpreso(String numfoliopreimpreso) { - this.numfoliopreimpreso = numfoliopreimpreso; - } - - @Column(name = "NUMSUBSERIEPREIMPRESO", length = 10) - public String getNumsubseriepreimpreso() { - return this.numsubseriepreimpreso; - } - - public void setNumsubseriepreimpreso(String numsubseriepreimpreso) { - this.numsubseriepreimpreso = numsubseriepreimpreso; - } - - @Temporal(TemporalType.DATE) - @Column(name = "FECHORHISTO", length = 7) - public Date getFechorhisto() { - return this.fechorhisto; - } - - public void setFechorhisto(Date fechorhisto) { - this.fechorhisto = fechorhisto; - } - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - public PuntoVenta getPuntoventa() { - return this.puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @ManyToOne - @JoinColumn(name = "ESTACION_ID") - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * AbastoHisto generated by hbm2java + */ +@Entity +@Table(name = "ABASTO_HISTO") +public class AbastoHisto implements java.io.Serializable { + + private Long abastohistoId; + private TipoMovimentacion tipoMovimentacion; + private Aidf aidf; + private String numseriepreimpresa; + private String numfoliopreimpreso; + private String numsubseriepreimpreso; + private Date fechorhisto; + private PuntoVenta puntoventa; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private Estacion estacion; + + public AbastoHisto() { + } + + public AbastoHisto(AbastoCentral bilhete, TipoMovimentacion _tipoMovimentacion, Date _fechorhisto, Boolean _activo, Date _fecmodif, Integer _usuarioId) { + tipoMovimentacion = _tipoMovimentacion; + aidf = bilhete.getAidf(); + numseriepreimpresa = bilhete.getNumseriepreimpresa(); + numfoliopreimpreso = bilhete.getNumfoliopreimpreso(); + numsubseriepreimpreso = bilhete.getNumsubseriepreimpreso(); + estacion = bilhete.getEstacion(); + fechorhisto = _fechorhisto; + puntoventa = bilhete.getPuntoventa(); + activo = _activo; + fecmodif = _fecmodif; + usuarioId = _usuarioId; + } + + public AbastoHisto(TipoMovimentacion _tipoMovimentacion, Aidf _aidf, String _numseriepreimpresa, String _numfoliopreimpreso, + String _numsubseriepreimpreso, Date _fechorhisto, PuntoVenta _puntoventa, Boolean _activo, Date _fecmodif, Integer _usuarioId, Estacion _estacion) { + tipoMovimentacion = _tipoMovimentacion; + aidf = _aidf; + numseriepreimpresa = _numseriepreimpresa; + numfoliopreimpreso = _numfoliopreimpreso; + numsubseriepreimpreso = _numsubseriepreimpreso; + fechorhisto = _fechorhisto; + puntoventa = _puntoventa; + activo = _activo; + fecmodif = _fecmodif; + usuarioId = _usuarioId; + estacion = _estacion; + } + + @SequenceGenerator(name = "ABASTO_HISTO_SEQ", sequenceName = "ABASTO_HISTO_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ABASTO_HISTO_SEQ") + @Column(name = "ABASTOHISTO_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getAbastohistoId() { + return this.abastohistoId; + } + + public void setAbastohistoId(Long abastohistoId) { + this.abastohistoId = abastohistoId; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TIPOMOVIMENTACION_ID") + public TipoMovimentacion getTipoMovimentacion() { + return this.tipoMovimentacion; + } + + public void setTipoMovimentacion(TipoMovimentacion tipoMovimentacion) { + this.tipoMovimentacion = tipoMovimentacion; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "AIDF_ID") + public Aidf getAidf() { + return this.aidf; + } + + public void setAidf(Aidf aidf) { + this.aidf = aidf; + } + + @Column(name = "NUMSERIEPREIMPRESA", length = 10) + public String getNumseriepreimpresa() { + return this.numseriepreimpresa; + } + + public void setNumseriepreimpresa(String numseriepreimpresa) { + this.numseriepreimpresa = numseriepreimpresa; + } + + @Column(name = "NUMFOLIOPREIMPRESO", length = 12) + public String getNumfoliopreimpreso() { + return this.numfoliopreimpreso; + } + + public void setNumfoliopreimpreso(String numfoliopreimpreso) { + this.numfoliopreimpreso = numfoliopreimpreso; + } + + @Column(name = "NUMSUBSERIEPREIMPRESO", length = 10) + public String getNumsubseriepreimpreso() { + return this.numsubseriepreimpreso; + } + + public void setNumsubseriepreimpreso(String numsubseriepreimpreso) { + this.numsubseriepreimpreso = numsubseriepreimpreso; + } + + @Temporal(TemporalType.DATE) + @Column(name = "FECHORHISTO", length = 7) + public Date getFechorhisto() { + return this.fechorhisto; + } + + public void setFechorhisto(Date fechorhisto) { + this.fechorhisto = fechorhisto; + } + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + public PuntoVenta getPuntoventa() { + return this.puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @ManyToOne + @JoinColumn(name = "ESTACION_ID") + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AgrupamentoParada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AgrupamentoParada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/AgrupamentoParada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AgrupamentoParada.java index 69ba73333..eaf189660 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AgrupamentoParada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AgrupamentoParada.java @@ -1,106 +1,106 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "AGRUPAMENTOPARADA_SEQ", sequenceName = "AGRUPAMENTOPARADA_SEQ", allocationSize = 1) -@Table(name = "AGRUPAMENTO_PARADA") -public class AgrupamentoParada implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "AGRUPAMENTOPARADA_SEQ") - @Column(name = "AGRUPAMENTOPARADA_ID") - private Integer agrupamentoParadaId; - @Basic(optional = false) - @Column(name = "DESCAGRUPAMENTOPARADA") - private String descAgrupamentoParada; - @Column(name = "CVEAGRUPAMENTOPARADA") - private String cveAgrupamentoParada; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getAgrupamentoParadaId() { - return agrupamentoParadaId; - } - - public void setAgrupamentoParadaId(Integer agrupamentoParadaId) { - this.agrupamentoParadaId = agrupamentoParadaId; - } - - public String getDescAgrupamentoParada() { - return descAgrupamentoParada; - } - - public void setDescAgrupamentoParada(String descAgrupamentoParada) { - this.descAgrupamentoParada = descAgrupamentoParada; - } - - public String getCveAgrupamentoParada() { - return cveAgrupamentoParada; - } - - public void setCveAgrupamentoParada(String cveAgrupamentoParada) { - this.cveAgrupamentoParada = cveAgrupamentoParada; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof AgrupamentoParada)) { - return false; - } - AgrupamentoParada other = (AgrupamentoParada) object; - if ((this.getAgrupamentoParadaId() == null && other.getAgrupamentoParadaId() != null) || (this.getAgrupamentoParadaId() != null && !this.getAgrupamentoParadaId().equals(other.getAgrupamentoParadaId()))) { - return false; - } - return true; - } - - @Override - public String toString() { - return getDescAgrupamentoParada(); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "AGRUPAMENTOPARADA_SEQ", sequenceName = "AGRUPAMENTOPARADA_SEQ", allocationSize = 1) +@Table(name = "AGRUPAMENTO_PARADA") +public class AgrupamentoParada implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "AGRUPAMENTOPARADA_SEQ") + @Column(name = "AGRUPAMENTOPARADA_ID") + private Integer agrupamentoParadaId; + @Basic(optional = false) + @Column(name = "DESCAGRUPAMENTOPARADA") + private String descAgrupamentoParada; + @Column(name = "CVEAGRUPAMENTOPARADA") + private String cveAgrupamentoParada; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getAgrupamentoParadaId() { + return agrupamentoParadaId; + } + + public void setAgrupamentoParadaId(Integer agrupamentoParadaId) { + this.agrupamentoParadaId = agrupamentoParadaId; + } + + public String getDescAgrupamentoParada() { + return descAgrupamentoParada; + } + + public void setDescAgrupamentoParada(String descAgrupamentoParada) { + this.descAgrupamentoParada = descAgrupamentoParada; + } + + public String getCveAgrupamentoParada() { + return cveAgrupamentoParada; + } + + public void setCveAgrupamentoParada(String cveAgrupamentoParada) { + this.cveAgrupamentoParada = cveAgrupamentoParada; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof AgrupamentoParada)) { + return false; + } + AgrupamentoParada other = (AgrupamentoParada) object; + if ((this.getAgrupamentoParadaId() == null && other.getAgrupamentoParadaId() != null) || (this.getAgrupamentoParadaId() != null && !this.getAgrupamentoParadaId().equals(other.getAgrupamentoParadaId()))) { + return false; + } + return true; + } + + @Override + public String toString() { + return getDescAgrupamentoParada(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Aidf.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Aidf.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Aidf.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Aidf.java index 60510dc89..2134f8af3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Aidf.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Aidf.java @@ -1,308 +1,308 @@ -package com.rjconsultores.ventaboletos.entidad; - -/// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.GenericGenerator; - -/** - * Aidf generated by hbm2java - */ -@Entity -@Table(name = "AIDF") -public class Aidf implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GenericGenerator(name = "aidfgen_id", strategy = "com.rjconsultores.ventaboletos.dao.util.AidfGenerator") - @GeneratedValue(generator = "aidfgen_id") - @Column(name = "AIDF_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long aidfId; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "AIDFTIPO_ID") - private AidfTipo aidfTipo; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "AIDFESP_ID") - private AidfEspecie aidfEspecie; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - @JoinColumn(name = "ESTADO_ID") - @ManyToOne - private Estado estado; - @Column(name = "DOCFISCAL", length = 20) - private String docfiscal; - @Column(name = "ACFISCAL", length = 20) - private String acfiscal; - @Column(name = "SERIE", length = 20) - private String serie; - @Column(name = "SUBSERIE", length = 20) - private String subserie; - @Column(name = "FORMINICIAL", length = 12) - private String forminicial; - @Column(name = "FORMFINAL", length = 12) - private String formfinal; - @Temporal(TemporalType.DATE) - @Column(name = "FECADQUISICION", length = 7) - private Date fecadquisicion; - @Temporal(TemporalType.DATE) - @Column(name = "FECVENCIMIENTO", length = 7) - private Date fecvencimiento; - @Column(name = "INSCESTADUAL", length = 20) - private String inscestadual; - @JoinColumn(name = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - @Column(name = "CNPJ", length = 20) - private String cnpj; - @Column(name = "TIPOVALIDAVENTA") - private String tipoValidaVenta; - - public Aidf() { - } - - public Aidf(AidfTipo aidfTipo, PuntoVenta puntoVenta, AidfEspecie aidfEspecie, Estado estado, String docfiscal, String acfiscal, - String serie, String subserie, String forminicial, String formfinal, Date fecadquisicion, Date fecvencimiento, - String inscestadual, Empresa empresa, Boolean activo, Date fecmodif, Integer usuarioId) { - this.aidfTipo = aidfTipo; - this.puntoVenta = puntoVenta; - this.aidfEspecie = aidfEspecie; - this.estado = estado; - this.docfiscal = docfiscal; - this.acfiscal = acfiscal; - this.serie = serie; - this.subserie = subserie; - this.forminicial = forminicial; - this.formfinal = formfinal; - this.fecadquisicion = fecadquisicion; - this.fecvencimiento = fecvencimiento; - this.inscestadual = inscestadual; - this.empresa = empresa; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (aidfId != null ? aidfId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Aidf)) - return false; - - Aidf other = (Aidf) object; - if ((this.aidfId == null && other.aidfId != null) || (this.aidfId != null && !this.aidfId.equals(other.aidfId))) { - return false; - } - return true; - } - - public Long getAidfId() { - return aidfId; - } - - public void setAidfId(Long aidfId) { - this.aidfId = aidfId; - } - - public AidfTipo getAidfTipo() { - return aidfTipo; - } - - public void setAidfTipo(AidfTipo aidfTipo) { - this.aidfTipo = aidfTipo; - } - - public AidfEspecie getAidfEspecie() { - return aidfEspecie; - } - - public void setAidfEspecie(AidfEspecie aidfEspecie) { - this.aidfEspecie = aidfEspecie; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public String getDocfiscal() { - return docfiscal; - } - - public void setDocfiscal(String docfiscal) { - this.docfiscal = docfiscal; - } - - public String getAcfiscal() { - return acfiscal; - } - - public void setAcfiscal(String acfiscal) { - this.acfiscal = acfiscal; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getSubserie() { - return subserie==null?"":subserie; - } - - public void setSubserie(String subserie) { - this.subserie = subserie; - } - - public String getForminicial() { - return forminicial; - } - - public void setForminicial(String forminicial) { - this.forminicial = forminicial; - } - - public String getFormfinal() { - return formfinal; - } - - public void setFormfinal(String formfinal) { - this.formfinal = formfinal; - } - - public Date getFecadquisicion() { - return fecadquisicion; - } - - public void setFecadquisicion(Date fecadquisicion) { - this.fecadquisicion = fecadquisicion; - } - - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - public Date getFecvencimiento() { - return fecvencimiento; - } - - public void setFecvencimiento(Date fecvencimiento) { - this.fecvencimiento = fecvencimiento; - } - - public String getInscestadual() { - return inscestadual; - } - - public void setInscestadual(String inscestadual) { - this.inscestadual = inscestadual; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getTipoValidaVenta() { - return tipoValidaVenta; - } - - public void setTipoValidaVenta(String tipoValidaVenta) { - this.tipoValidaVenta = tipoValidaVenta; - } - - public String obterSerieSubserieFormatada() { - String serieInformada = this.getSerie(); - String subSerieInformada = this.getSubserie(); - - if(serieInformada == null) { - serieInformada = ""; - } - - return serieInformada - .trim() - .concat( - subSerieInformada == null || subSerieInformada.isEmpty() - ? "" - : "-".concat(subSerieInformada.trim())); - } - - @Override - public String toString() { - return String.format("%s - %s", this.getAidfId(), obterSerieSubserieFormatada()); - } - +package com.rjconsultores.ventaboletos.entidad; + +/// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.GenericGenerator; + +/** + * Aidf generated by hbm2java + */ +@Entity +@Table(name = "AIDF") +public class Aidf implements java.io.Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @GenericGenerator(name = "aidfgen_id", strategy = "com.rjconsultores.ventaboletos.dao.util.AidfGenerator") + @GeneratedValue(generator = "aidfgen_id") + @Column(name = "AIDF_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long aidfId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "AIDFTIPO_ID") + private AidfTipo aidfTipo; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "AIDFESP_ID") + private AidfEspecie aidfEspecie; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + @JoinColumn(name = "ESTADO_ID") + @ManyToOne + private Estado estado; + @Column(name = "DOCFISCAL", length = 20) + private String docfiscal; + @Column(name = "ACFISCAL", length = 20) + private String acfiscal; + @Column(name = "SERIE", length = 20) + private String serie; + @Column(name = "SUBSERIE", length = 20) + private String subserie; + @Column(name = "FORMINICIAL", length = 12) + private String forminicial; + @Column(name = "FORMFINAL", length = 12) + private String formfinal; + @Temporal(TemporalType.DATE) + @Column(name = "FECADQUISICION", length = 7) + private Date fecadquisicion; + @Temporal(TemporalType.DATE) + @Column(name = "FECVENCIMIENTO", length = 7) + private Date fecvencimiento; + @Column(name = "INSCESTADUAL", length = 20) + private String inscestadual; + @JoinColumn(name = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + @Column(name = "CNPJ", length = 20) + private String cnpj; + @Column(name = "TIPOVALIDAVENTA") + private String tipoValidaVenta; + + public Aidf() { + } + + public Aidf(AidfTipo aidfTipo, PuntoVenta puntoVenta, AidfEspecie aidfEspecie, Estado estado, String docfiscal, String acfiscal, + String serie, String subserie, String forminicial, String formfinal, Date fecadquisicion, Date fecvencimiento, + String inscestadual, Empresa empresa, Boolean activo, Date fecmodif, Integer usuarioId) { + this.aidfTipo = aidfTipo; + this.puntoVenta = puntoVenta; + this.aidfEspecie = aidfEspecie; + this.estado = estado; + this.docfiscal = docfiscal; + this.acfiscal = acfiscal; + this.serie = serie; + this.subserie = subserie; + this.forminicial = forminicial; + this.formfinal = formfinal; + this.fecadquisicion = fecadquisicion; + this.fecvencimiento = fecvencimiento; + this.inscestadual = inscestadual; + this.empresa = empresa; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (aidfId != null ? aidfId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Aidf)) + return false; + + Aidf other = (Aidf) object; + if ((this.aidfId == null && other.aidfId != null) || (this.aidfId != null && !this.aidfId.equals(other.aidfId))) { + return false; + } + return true; + } + + public Long getAidfId() { + return aidfId; + } + + public void setAidfId(Long aidfId) { + this.aidfId = aidfId; + } + + public AidfTipo getAidfTipo() { + return aidfTipo; + } + + public void setAidfTipo(AidfTipo aidfTipo) { + this.aidfTipo = aidfTipo; + } + + public AidfEspecie getAidfEspecie() { + return aidfEspecie; + } + + public void setAidfEspecie(AidfEspecie aidfEspecie) { + this.aidfEspecie = aidfEspecie; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public String getDocfiscal() { + return docfiscal; + } + + public void setDocfiscal(String docfiscal) { + this.docfiscal = docfiscal; + } + + public String getAcfiscal() { + return acfiscal; + } + + public void setAcfiscal(String acfiscal) { + this.acfiscal = acfiscal; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getSubserie() { + return subserie==null?"":subserie; + } + + public void setSubserie(String subserie) { + this.subserie = subserie; + } + + public String getForminicial() { + return forminicial; + } + + public void setForminicial(String forminicial) { + this.forminicial = forminicial; + } + + public String getFormfinal() { + return formfinal; + } + + public void setFormfinal(String formfinal) { + this.formfinal = formfinal; + } + + public Date getFecadquisicion() { + return fecadquisicion; + } + + public void setFecadquisicion(Date fecadquisicion) { + this.fecadquisicion = fecadquisicion; + } + + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + public Date getFecvencimiento() { + return fecvencimiento; + } + + public void setFecvencimiento(Date fecvencimiento) { + this.fecvencimiento = fecvencimiento; + } + + public String getInscestadual() { + return inscestadual; + } + + public void setInscestadual(String inscestadual) { + this.inscestadual = inscestadual; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getTipoValidaVenta() { + return tipoValidaVenta; + } + + public void setTipoValidaVenta(String tipoValidaVenta) { + this.tipoValidaVenta = tipoValidaVenta; + } + + public String obterSerieSubserieFormatada() { + String serieInformada = this.getSerie(); + String subSerieInformada = this.getSubserie(); + + if(serieInformada == null) { + serieInformada = ""; + } + + return serieInformada + .trim() + .concat( + subSerieInformada == null || subSerieInformada.isEmpty() + ? "" + : "-".concat(subSerieInformada.trim())); + } + + @Override + public String toString() { + return String.format("%s - %s", this.getAidfId(), obterSerieSubserieFormatada()); + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/AidfEspecie.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AidfEspecie.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/AidfEspecie.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AidfEspecie.java index 6bbdf878e..1fa19b125 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AidfEspecie.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AidfEspecie.java @@ -1,115 +1,115 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * AidfEspecie generated by hbm2java - */ -@Entity -@Table(name = "AIDF_ESPECIE") -public class AidfEspecie implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - - private Integer aidfespId; - private String decespecie; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - - public AidfEspecie() { - } - - public AidfEspecie(Integer aidfespId) { - this.aidfespId = aidfespId; - } - - @Override - public String toString() { - return decespecie; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (aidfespId != null ? aidfespId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof AidfEspecie)) - return false; - - AidfEspecie other = (AidfEspecie) object; - if ((this.aidfespId == null && other.aidfespId != null) || (this.aidfespId != null && !this.aidfespId.equals(other.aidfespId))) { - return false; - } - return true; - } - - public AidfEspecie(Integer aidfespId, String decespecie, Boolean activo, Date fecmodif, Integer usuarioId) { - this.aidfespId = aidfespId; - this.decespecie = decespecie; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - @Id - @Column(name = "AIDFESP_ID", unique = true, nullable = false, precision = 4, scale = 0) - public Integer getAidfespId() { - return this.aidfespId; - } - - public void setAidfespId(Integer aidfespId) { - this.aidfespId = aidfespId; - } - - @Column(name = "DECESPECIE", length = 20) - public String getDecespecie() { - return this.decespecie; - } - - public void setDecespecie(String decespecie) { - this.decespecie = decespecie; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * AidfEspecie generated by hbm2java + */ +@Entity +@Table(name = "AIDF_ESPECIE") +public class AidfEspecie implements java.io.Serializable { + + private static final long serialVersionUID = 1L; + + private Integer aidfespId; + private String decespecie; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + + public AidfEspecie() { + } + + public AidfEspecie(Integer aidfespId) { + this.aidfespId = aidfespId; + } + + @Override + public String toString() { + return decespecie; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (aidfespId != null ? aidfespId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof AidfEspecie)) + return false; + + AidfEspecie other = (AidfEspecie) object; + if ((this.aidfespId == null && other.aidfespId != null) || (this.aidfespId != null && !this.aidfespId.equals(other.aidfespId))) { + return false; + } + return true; + } + + public AidfEspecie(Integer aidfespId, String decespecie, Boolean activo, Date fecmodif, Integer usuarioId) { + this.aidfespId = aidfespId; + this.decespecie = decespecie; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + @Id + @Column(name = "AIDFESP_ID", unique = true, nullable = false, precision = 4, scale = 0) + public Integer getAidfespId() { + return this.aidfespId; + } + + public void setAidfespId(Integer aidfespId) { + this.aidfespId = aidfespId; + } + + @Column(name = "DECESPECIE", length = 20) + public String getDecespecie() { + return this.decespecie; + } + + public void setDecespecie(String decespecie) { + this.decespecie = decespecie; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AidfTipo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AidfTipo.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/AidfTipo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AidfTipo.java index 852043922..7cc664558 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AidfTipo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AidfTipo.java @@ -1,113 +1,113 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * AidfTipo generated by hbm2java - */ -@Entity -@Table(name = "AIDF_TIPO") -public class AidfTipo implements java.io.Serializable { - - private Integer aidftipoId; - private String desctipo; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - - public AidfTipo() { - } - - public AidfTipo(Integer aidftipoId) { - this.aidftipoId = aidftipoId; - } - - @Override - public String toString() { - return desctipo; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (aidftipoId != null ? aidftipoId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof AidfTipo)) - return false; - - AidfTipo other = (AidfTipo) object; - if ((this.aidftipoId == null && other.aidftipoId != null) || (this.aidftipoId != null && !this.aidftipoId.equals(other.aidftipoId))) { - return false; - } - return true; - } - - public AidfTipo(Integer aidftipoId, String desctipo, Boolean activo, Date fecmodif, Integer usuarioId) { - this.aidftipoId = aidftipoId; - this.desctipo = desctipo; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - @Id - @Column(name = "AIDFTIPO_ID", unique = true, nullable = false, precision = 4, scale = 0) - public Integer getAidftipoId() { - return this.aidftipoId; - } - - public void setAidftipoId(Integer aidftipoId) { - this.aidftipoId = aidftipoId; - } - - @Column(name = "DESCTIPO", length = 20) - public String getDesctipo() { - return this.desctipo; - } - - public void setDesctipo(String desctipo) { - this.desctipo = desctipo; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * AidfTipo generated by hbm2java + */ +@Entity +@Table(name = "AIDF_TIPO") +public class AidfTipo implements java.io.Serializable { + + private Integer aidftipoId; + private String desctipo; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + + public AidfTipo() { + } + + public AidfTipo(Integer aidftipoId) { + this.aidftipoId = aidftipoId; + } + + @Override + public String toString() { + return desctipo; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (aidftipoId != null ? aidftipoId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof AidfTipo)) + return false; + + AidfTipo other = (AidfTipo) object; + if ((this.aidftipoId == null && other.aidftipoId != null) || (this.aidftipoId != null && !this.aidftipoId.equals(other.aidftipoId))) { + return false; + } + return true; + } + + public AidfTipo(Integer aidftipoId, String desctipo, Boolean activo, Date fecmodif, Integer usuarioId) { + this.aidftipoId = aidftipoId; + this.desctipo = desctipo; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + @Id + @Column(name = "AIDFTIPO_ID", unique = true, nullable = false, precision = 4, scale = 0) + public Integer getAidftipoId() { + return this.aidftipoId; + } + + public void setAidftipoId(Integer aidftipoId) { + this.aidftipoId = aidftipoId; + } + + @Column(name = "DESCTIPO", length = 20) + public String getDesctipo() { + return this.desctipo; + } + + public void setDesctipo(String desctipo) { + this.desctipo = desctipo; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AjusteEventoExtra.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AjusteEventoExtra.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/AjusteEventoExtra.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AjusteEventoExtra.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AlertaCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AlertaCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/AlertaCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AlertaCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/AliasServico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java index ac077fa67..bc59dfb3a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliasServico.java @@ -1,174 +1,174 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "ALIAS_SERVICO_SEQ", sequenceName = "ALIAS_SERVICO_SEQ", allocationSize = 1) -@Table(name = "ALIAS_SERVICO") -public class AliasServico implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ALIAS_SERVICO_SEQ") - @Column(name = "ALIASSERVICO_ID") - private Integer aliasServicoId; - @OneToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origen; - @OneToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - @OneToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - @Column(name = "CORRIDA_ID") - private Integer corridaId; - @OneToOne - @JoinColumn(name = "ALIASORIGEN_ID") - private Parada aliasOrigen; - @OneToOne - @JoinColumn(name = "ALIASDESTINO_ID") - private Parada aliasDestino; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "INDIDALIASORIGINAL") - private Boolean indIdAliasOriginal; - - public AliasServico() { - super(); - this.indIdAliasOriginal = false; - } - - public Integer getAliasServicoId() { - return aliasServicoId; - } - - public void setAliasServicoId(Integer aliasServicoId) { - this.aliasServicoId = aliasServicoId; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Parada getAliasOrigen() { - return aliasOrigen; - } - - public void setAliasOrigen(Parada aliasOrigen) { - this.aliasOrigen = aliasOrigen; - } - - public Parada getAliasDestino() { - return aliasDestino; - } - - public void setAliasDestino(Parada aliasDestino) { - this.aliasDestino = aliasDestino; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndIdAliasOriginal() { - return indIdAliasOriginal; - } - - public void setIndIdAliasOriginal(Boolean indIdAliasOriginal) { - this.indIdAliasOriginal = indIdAliasOriginal; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((aliasServicoId == null) ? 0 : aliasServicoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AliasServico other = (AliasServico) obj; - if (aliasServicoId == null) { - if (other.aliasServicoId != null) - return false; - } else if (!aliasServicoId.equals(other.aliasServicoId)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "ALIAS_SERVICO_SEQ", sequenceName = "ALIAS_SERVICO_SEQ", allocationSize = 1) +@Table(name = "ALIAS_SERVICO") +public class AliasServico implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ALIAS_SERVICO_SEQ") + @Column(name = "ALIASSERVICO_ID") + private Integer aliasServicoId; + @OneToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origen; + @OneToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + @Column(name = "CORRIDA_ID") + private Integer corridaId; + @OneToOne + @JoinColumn(name = "ALIASORIGEN_ID") + private Parada aliasOrigen; + @OneToOne + @JoinColumn(name = "ALIASDESTINO_ID") + private Parada aliasDestino; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "INDIDALIASORIGINAL") + private Boolean indIdAliasOriginal; + + public AliasServico() { + super(); + this.indIdAliasOriginal = false; + } + + public Integer getAliasServicoId() { + return aliasServicoId; + } + + public void setAliasServicoId(Integer aliasServicoId) { + this.aliasServicoId = aliasServicoId; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Parada getAliasOrigen() { + return aliasOrigen; + } + + public void setAliasOrigen(Parada aliasOrigen) { + this.aliasOrigen = aliasOrigen; + } + + public Parada getAliasDestino() { + return aliasDestino; + } + + public void setAliasDestino(Parada aliasDestino) { + this.aliasDestino = aliasDestino; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndIdAliasOriginal() { + return indIdAliasOriginal; + } + + public void setIndIdAliasOriginal(Boolean indIdAliasOriginal) { + this.indIdAliasOriginal = indIdAliasOriginal; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((aliasServicoId == null) ? 0 : aliasServicoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AliasServico other = (AliasServico) obj; + if (aliasServicoId == null) { + if (other.aliasServicoId != null) + return false; + } else if (!aliasServicoId.equals(other.aliasServicoId)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AliquotaEstadoDestino.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliquotaEstadoDestino.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/AliquotaEstadoDestino.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliquotaEstadoDestino.java index 180e9ea2c..5c6924205 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AliquotaEstadoDestino.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AliquotaEstadoDestino.java @@ -1,153 +1,153 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@SequenceGenerator(name = "ALIQUOTAESTADODESTINO_SEQ", sequenceName = "ALIQUOTAESTADODESTINO_SEQ", allocationSize = 1) -@Table(name = "ALIQUOTA_ESTADO_DESTINO") -public class AliquotaEstadoDestino implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ALIQUOTAESTADODESTINO_SEQ") - @Basic(optional = false) - @Column(name = "ALIQUOTAESTADODESTINO_ID") - private Integer aliquotaEstadoDestinoId; - - @OneToOne - @JoinColumn(name = "ESTADO_ID") - private Estado estado; - - @Column(name = "ALIQUOTA") - private BigDecimal aliquota; - - @JoinColumn(name = "EMPRESAIMPOSTO_ID", referencedColumnName = "EMPRESAIMPOSTO_ID") - @ManyToOne - private EmpresaImposto empresaImposto; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private AliquotaEstadoDestino aliquotaEstadoDestinoClone; - - - - @Override - public boolean equals(Object object) { - if (!(object instanceof AliquotaEstadoDestino)) { - return false; - } - AliquotaEstadoDestino other = (AliquotaEstadoDestino) object; - if ((this.getAliquotaEstadoDestinoId() == null && other.getAliquotaEstadoDestinoId() != null) || (this.getAliquotaEstadoDestinoId() != null && !this.getAliquotaEstadoDestinoId().equals(other.getAliquotaEstadoDestinoId()))) { - return false; - } - return true; - } - - public Integer getAliquotaEstadoDestinoId() { - return aliquotaEstadoDestinoId; - } - - public void setAliquotaEstadoDestinoId(Integer aliquotaEstadoDestinoId) { - this.aliquotaEstadoDestinoId = aliquotaEstadoDestinoId; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public BigDecimal getAliquota() { - return aliquota; - } - - public void setAliquota(BigDecimal aliquota) { - this.aliquota = aliquota; - } - - public EmpresaImposto getEmpresaImposto() { - return empresaImposto; - } - - public void setEmpresaImposto(EmpresaImposto empresaImposto) { - this.empresaImposto = empresaImposto; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public void clonar() throws CloneNotSupportedException { - aliquotaEstadoDestinoClone = new AliquotaEstadoDestino(); - aliquotaEstadoDestinoClone = (AliquotaEstadoDestino) this.clone(); - Hibernate.initialize(aliquotaEstadoDestinoClone.getEmpresaImposto()); - - } - - @Override - public AliquotaEstadoDestino getCloneObject() throws CloneNotSupportedException { - return aliquotaEstadoDestinoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - // TODO Auto-generated method stub - return null; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@SequenceGenerator(name = "ALIQUOTAESTADODESTINO_SEQ", sequenceName = "ALIQUOTAESTADODESTINO_SEQ", allocationSize = 1) +@Table(name = "ALIQUOTA_ESTADO_DESTINO") +public class AliquotaEstadoDestino implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ALIQUOTAESTADODESTINO_SEQ") + @Basic(optional = false) + @Column(name = "ALIQUOTAESTADODESTINO_ID") + private Integer aliquotaEstadoDestinoId; + + @OneToOne + @JoinColumn(name = "ESTADO_ID") + private Estado estado; + + @Column(name = "ALIQUOTA") + private BigDecimal aliquota; + + @JoinColumn(name = "EMPRESAIMPOSTO_ID", referencedColumnName = "EMPRESAIMPOSTO_ID") + @ManyToOne + private EmpresaImposto empresaImposto; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private AliquotaEstadoDestino aliquotaEstadoDestinoClone; + + + + @Override + public boolean equals(Object object) { + if (!(object instanceof AliquotaEstadoDestino)) { + return false; + } + AliquotaEstadoDestino other = (AliquotaEstadoDestino) object; + if ((this.getAliquotaEstadoDestinoId() == null && other.getAliquotaEstadoDestinoId() != null) || (this.getAliquotaEstadoDestinoId() != null && !this.getAliquotaEstadoDestinoId().equals(other.getAliquotaEstadoDestinoId()))) { + return false; + } + return true; + } + + public Integer getAliquotaEstadoDestinoId() { + return aliquotaEstadoDestinoId; + } + + public void setAliquotaEstadoDestinoId(Integer aliquotaEstadoDestinoId) { + this.aliquotaEstadoDestinoId = aliquotaEstadoDestinoId; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public BigDecimal getAliquota() { + return aliquota; + } + + public void setAliquota(BigDecimal aliquota) { + this.aliquota = aliquota; + } + + public EmpresaImposto getEmpresaImposto() { + return empresaImposto; + } + + public void setEmpresaImposto(EmpresaImposto empresaImposto) { + this.empresaImposto = empresaImposto; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public void clonar() throws CloneNotSupportedException { + aliquotaEstadoDestinoClone = new AliquotaEstadoDestino(); + aliquotaEstadoDestinoClone = (AliquotaEstadoDestino) this.clone(); + Hibernate.initialize(aliquotaEstadoDestinoClone.getEmpresaImposto()); + + } + + @Override + public AliquotaEstadoDestino getCloneObject() throws CloneNotSupportedException { + return aliquotaEstadoDestinoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Articulo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Articulo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Articulo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Articulo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AsientoExclusivo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AsientoExclusivo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/AsientoExclusivo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AsientoExclusivo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AsistenciaDeViajeEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AsistenciaDeViajeEmpresa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/AsistenciaDeViajeEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AsistenciaDeViajeEmpresa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AuditLog.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditLog.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/AuditLog.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditLog.java index a40962b34..6d8335ec6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AuditLog.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditLog.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; - -@Entity -@SequenceGenerator(name = "AUDITLOG_SEQ", sequenceName = "AUDIT_LOG_SEQ", allocationSize = 1) -@Table(name = "AUDIT_LOG") -public class AuditLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "AUDITLOG_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "AUDITLOG_SEQ") - private Long auditLogId; - - @Column(name = "AUDITACTION_ID") - private Integer action; - - @Column(name = "ENTITY_DETAIL") - private String entityDetail; - - @Column(name = "ENTITY_NAME") - private String entityName; - - @Column(name = "CREATED_DATE") - private Date createdDate; - - @JoinColumn(name = "SISTEMA_ID", referencedColumnName = "SISTEMA_ID") - @ManyToOne - private Sistema sistema; - - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuario; - - @JoinColumn(name = "AUDITSERVICE_ID", referencedColumnName = "AUDITSERVICE_ID") - @ManyToOne - private AuditService service; - - @Transient - private Date dataInicio; - - @Transient - private Date dataFim; - - public Long getAuditLogId() { - return auditLogId; - } - - public void setAuditLogId(Long auditLogId) { - this.auditLogId = auditLogId; - } - - public Integer getAction() { - return action; - } - - public void setAction(Integer action) { - this.action = action; - } - - public Sistema getSistema() { - return sistema; - } - - public void setSistema(Sistema sistema) { - this.sistema = sistema; - } - - public String getEntityDetail() { - return entityDetail; - } - - public void setEntityDetail(String entityDetail) { - this.entityDetail = entityDetail; - } - - public String getEntityName() { - return entityName; - } - - public void setEntityName(String entityName) { - this.entityName = entityName; - } - - public Date getCreatedDate() { - return createdDate; - } - - public void setCreatedDate(Date createdDate) { - this.createdDate = createdDate; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public AuditService getService() { - return service; - } - - public void setService(AuditService service) { - this.service = service; - } - - @Override - public String toString() { - return createdDate.toString() + sistema.toString(); - } - - public Date getDataFim() { - return dataFim; - } - - public void setDataFim(Date dataFim) { - this.dataFim = dataFim; - } - - public Date getDataInicio() { - return dataInicio; - } - - public void setDataInicio(Date dataInicio) { - this.dataInicio = dataInicio; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Transient; + +@Entity +@SequenceGenerator(name = "AUDITLOG_SEQ", sequenceName = "AUDIT_LOG_SEQ", allocationSize = 1) +@Table(name = "AUDIT_LOG") +public class AuditLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "AUDITLOG_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "AUDITLOG_SEQ") + private Long auditLogId; + + @Column(name = "AUDITACTION_ID") + private Integer action; + + @Column(name = "ENTITY_DETAIL") + private String entityDetail; + + @Column(name = "ENTITY_NAME") + private String entityName; + + @Column(name = "CREATED_DATE") + private Date createdDate; + + @JoinColumn(name = "SISTEMA_ID", referencedColumnName = "SISTEMA_ID") + @ManyToOne + private Sistema sistema; + + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuario; + + @JoinColumn(name = "AUDITSERVICE_ID", referencedColumnName = "AUDITSERVICE_ID") + @ManyToOne + private AuditService service; + + @Transient + private Date dataInicio; + + @Transient + private Date dataFim; + + public Long getAuditLogId() { + return auditLogId; + } + + public void setAuditLogId(Long auditLogId) { + this.auditLogId = auditLogId; + } + + public Integer getAction() { + return action; + } + + public void setAction(Integer action) { + this.action = action; + } + + public Sistema getSistema() { + return sistema; + } + + public void setSistema(Sistema sistema) { + this.sistema = sistema; + } + + public String getEntityDetail() { + return entityDetail; + } + + public void setEntityDetail(String entityDetail) { + this.entityDetail = entityDetail; + } + + public String getEntityName() { + return entityName; + } + + public void setEntityName(String entityName) { + this.entityName = entityName; + } + + public Date getCreatedDate() { + return createdDate; + } + + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public AuditService getService() { + return service; + } + + public void setService(AuditService service) { + this.service = service; + } + + @Override + public String toString() { + return createdDate.toString() + sistema.toString(); + } + + public Date getDataFim() { + return dataFim; + } + + public void setDataFim(Date dataFim) { + this.dataFim = dataFim; + } + + public Date getDataInicio() { + return dataInicio; + } + + public void setDataInicio(Date dataInicio) { + this.dataInicio = dataInicio; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AuditModule.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditModule.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/AuditModule.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditModule.java index 9ae1d3189..131ab0e10 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AuditModule.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditModule.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "AUDIT_MODULE") -public class AuditModule implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "AUDITMODULE_ID") - private Long auditModuleId; - - @Column(name = "NAMEMODULE") - private String nameModule; - - @Column(name = "INDAUDITABLE") - private Boolean indAuditable; - - public Long getAuditModuleId() { - return auditModuleId; - } - - public void setAuditModuleId(Long auditModuleId) { - this.auditModuleId = auditModuleId; - } - - public Boolean getIndAuditable() { - return indAuditable; - } - - public String getNameModule() { - return nameModule; - } - - public void setNameModule(String nameModule) { - this.nameModule = nameModule; - } - - public void setIndAuditable(Boolean indAuditable) { - this.indAuditable = indAuditable; - } - - @Override - public String toString() { - return nameModule; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "AUDIT_MODULE") +public class AuditModule implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "AUDITMODULE_ID") + private Long auditModuleId; + + @Column(name = "NAMEMODULE") + private String nameModule; + + @Column(name = "INDAUDITABLE") + private Boolean indAuditable; + + public Long getAuditModuleId() { + return auditModuleId; + } + + public void setAuditModuleId(Long auditModuleId) { + this.auditModuleId = auditModuleId; + } + + public Boolean getIndAuditable() { + return indAuditable; + } + + public String getNameModule() { + return nameModule; + } + + public void setNameModule(String nameModule) { + this.nameModule = nameModule; + } + + public void setIndAuditable(Boolean indAuditable) { + this.indAuditable = indAuditable; + } + + @Override + public String toString() { + return nameModule; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/AuditService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/AuditService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditService.java index 62eb1099a..15e601250 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AuditService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AuditService.java @@ -1,64 +1,64 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "AUDIT_SERVICE") -public class AuditService implements Serializable{ - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "AUDITSERVICE_ID") - private Long auditServiceId; - - @Column(name = "NAMESERVICE") - private String nameService; - - @JoinColumn(name = "FUNCIONSISTEMA_ID", referencedColumnName = "FUNCIONSISTEMA_ID") - @ManyToOne - private FuncionSistema funcionSistema; - - @JoinColumn(name = "AUDITMODULE_ID", referencedColumnName = "AUDITMODULE_ID") - @ManyToOne - private AuditModule module; - - public Long getAuditServiceId() { - return auditServiceId; - } - - public void setAuditServiceId(Long auditServiceId) { - this.auditServiceId = auditServiceId; - } - - public String getNameService() { - return nameService; - } - - public void setNameService(String nameService) { - this.nameService = nameService; - } - - public AuditModule getModule() { - return module; - } - - public void setModule(AuditModule module) { - this.module = module; - } - - public FuncionSistema getFuncionSistema() { - return funcionSistema; - } - - public void setFuncionSistema(FuncionSistema funcionSistema) { - this.funcionSistema = funcionSistema; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +@Entity +@Table(name = "AUDIT_SERVICE") +public class AuditService implements Serializable{ + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "AUDITSERVICE_ID") + private Long auditServiceId; + + @Column(name = "NAMESERVICE") + private String nameService; + + @JoinColumn(name = "FUNCIONSISTEMA_ID", referencedColumnName = "FUNCIONSISTEMA_ID") + @ManyToOne + private FuncionSistema funcionSistema; + + @JoinColumn(name = "AUDITMODULE_ID", referencedColumnName = "AUDITMODULE_ID") + @ManyToOne + private AuditModule module; + + public Long getAuditServiceId() { + return auditServiceId; + } + + public void setAuditServiceId(Long auditServiceId) { + this.auditServiceId = auditServiceId; + } + + public String getNameService() { + return nameService; + } + + public void setNameService(String nameService) { + this.nameService = nameService; + } + + public AuditModule getModule() { + return module; + } + + public void setModule(AuditModule module) { + this.module = module; + } + + public FuncionSistema getFuncionSistema() { + return funcionSistema; + } + + public void setFuncionSistema(FuncionSistema funcionSistema) { + this.funcionSistema = funcionSistema; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Autobus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Autobus.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Autobus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Autobus.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AutobusDoc.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AutobusDoc.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/AutobusDoc.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AutobusDoc.java index 684f27865..dea19e0ee 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AutobusDoc.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AutobusDoc.java @@ -1,100 +1,100 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "AUTOBUS_DOC_SEQ", sequenceName = "AUTOBUS_DOC_SEQ", allocationSize = 1) -@Table(name = "AUTOBUS_DOC") -public class AutobusDoc { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @Column(name = "AUTOBUSDOC_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "AUTOBUS_DOC_SEQ") - private Integer autobusDocId; - @ManyToOne - @JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID") - private Autobus autobus; - @JoinColumn(name = "TIPODOCAUTOBUS_ID", referencedColumnName = "TIPODOCAUTOBUS_ID") - @ManyToOne - private TipoDocAutobus tipoDocAutobus; - @Column(name = "FECHACADUCIDAD") - private Date fechaCaducidad; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - public Integer getAutobusDocId() { - return autobusDocId; - } - public void setAutobusDocId(Integer autobusDocId) { - this.autobusDocId = autobusDocId; - } - public Autobus getAutobus() { - return autobus; - } - public void setAutobus(Autobus autobus) { - this.autobus = autobus; - } - public TipoDocAutobus getTipoDocAutobus() { - return tipoDocAutobus; - } - public void setTipoDocAutobus(TipoDocAutobus tipoDocAutobus) { - this.tipoDocAutobus = tipoDocAutobus; - } - public Date getFechaCaducidad() { - return fechaCaducidad; - } - public void setFechaCaducidad(Date fechaCaducidad) { - this.fechaCaducidad = fechaCaducidad; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof AutobusDoc)) { - return false; - } - AutobusDoc other = (AutobusDoc) object; - if ((this.autobusDocId == null && other.autobusDocId != null) || (this.autobusDocId != null && !this.autobusDocId.equals(other.autobusDocId))) { - return false; - } - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "AUTOBUS_DOC_SEQ", sequenceName = "AUTOBUS_DOC_SEQ", allocationSize = 1) +@Table(name = "AUTOBUS_DOC") +public class AutobusDoc { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @Column(name = "AUTOBUSDOC_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "AUTOBUS_DOC_SEQ") + private Integer autobusDocId; + @ManyToOne + @JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID") + private Autobus autobus; + @JoinColumn(name = "TIPODOCAUTOBUS_ID", referencedColumnName = "TIPODOCAUTOBUS_ID") + @ManyToOne + private TipoDocAutobus tipoDocAutobus; + @Column(name = "FECHACADUCIDAD") + private Date fechaCaducidad; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + public Integer getAutobusDocId() { + return autobusDocId; + } + public void setAutobusDocId(Integer autobusDocId) { + this.autobusDocId = autobusDocId; + } + public Autobus getAutobus() { + return autobus; + } + public void setAutobus(Autobus autobus) { + this.autobus = autobus; + } + public TipoDocAutobus getTipoDocAutobus() { + return tipoDocAutobus; + } + public void setTipoDocAutobus(TipoDocAutobus tipoDocAutobus) { + this.tipoDocAutobus = tipoDocAutobus; + } + public Date getFechaCaducidad() { + return fechaCaducidad; + } + public void setFechaCaducidad(Date fechaCaducidad) { + this.fechaCaducidad = fechaCaducidad; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof AutobusDoc)) { + return false; + } + AutobusDoc other = (AutobusDoc) object; + if ((this.autobusDocId == null && other.autobusDocId != null) || (this.autobusDocId != null && !this.autobusDocId.equals(other.autobusDocId))) { + return false; + } + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Autorizacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Autorizacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Autorizacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Autorizacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/AutorizacionPerfil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AutorizacionPerfil.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/AutorizacionPerfil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/AutorizacionPerfil.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Banco.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Banco.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Banco.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Banco.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Boleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Boleto.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Boleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Boleto.java index 4d47cd4d5..bc00ed799 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Boleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Boleto.java @@ -1,1251 +1,1251 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * Boleto generated by hbm2java - */ -@Entity -@Table(name = "BOLETO", schema = "VTABOL") -public class Boleto implements java.io.Serializable { - - private static final long serialVersionUID = 6202773630000194534L; - - @Id - @Column(name = "BOLETO_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long boletoId; - - @Column(name = "NUMASIENTO", length = 12) - private String numasiento; - - @Column(name = "CATEGORIA_ID", precision = 7, scale = 0) - private Integer categoriaId; - - @Column(name = "NUMFOLIOSISTEMA", length = 36) - private String numfoliosistema; - - @Column(name = "CLASESERVICIO_ID", precision = 2, scale = 0) - private Byte claseservicioId; - - @Column(name = "MARCA_ID", precision = 3, scale = 0) - private Short marcaId; - - @Column(name = "ORIGEN_ID", precision = 7, scale = 0) - private Integer origenId; - - @Column(name = "DESTINO_ID", precision = 7, scale = 0) - private Integer destinoId; - - @Column(name = "PUNTOVENTA_ID") - private Integer puntoVentaId; - - @Column(name = "CORRIDA_ID", precision = 7, scale = 0) - private Integer corridaId; - - @Temporal(TemporalType.DATE) - @Column(name = "FECCORRIDA", length = 7) - private Date feccorrida; - - @Column(name = "NOMBPASAJERO", length = 180) - private String nombpasajero; - - @Column(name = "PRECIOBASE", precision = 7) - private BigDecimal preciobase; - - @Column(name = "PRECIOPAGADO", precision = 7) - private BigDecimal preciopagado; - - @Column(name = "DESCUENTOAMPARADO", precision = 7) - private BigDecimal descuentoamparado; - - @Column(name = "TIPOVENTA_ID", precision = 2, scale = 0) - private Byte tipoventaId; - - @Column(name = "NUMSERIEPREIMPRESA", length = 30) - private String numseriepreimpresa; - - @Column(name = "NUMFOLIOPREIMPRESO", length = 36) - private String numfoliopreimpreso; - - @Temporal(TemporalType.DATE) - @Column(name = "FECHORVIAJE", length = 7) - private Date fechorviaje; - - @Temporal(TemporalType.DATE) - @Column(name = "FECHORVENTA", length = 7) - private Date fechorventa; - - @Temporal(TemporalType.DATE) - @Column(name = "FECHORVENTA_H", length = 7) - private Date fechorventaH; - - @Column(name = "NUMKMVIAJE", precision = 7) - private BigDecimal numkmviaje; - - @Column(name = "NUMOPERACION", length = 36) - private String numoperacion; - - @Column(name = "INDSTATUSOPERACION", length = 3) - private String indstatusoperacion; - - @Column(name = "MOTIVOCANCELACION_ID", precision = 2, scale = 0) - private Byte motivocancelacionId; - - @Column(name = "MOTIVOREIMPRESION_ID", precision = 2, scale = 0) - private Byte motivoreimpresionId; - - @Column(name = "CANTPUNTOS", precision = 6, scale = 0) - private Integer cantpuntos; - - @Column(name = "EMPRESAPUNTOVENTA_ID", precision = 7, scale = 0) - private Integer empresapuntoventaId; - - @Column(name = "EMPRESACORRIDA_ID", precision = 7, scale = 0) - private Integer empresacorridaId; - - @Column(name = "NUMRESERVACION", length = 36) - private String numreservacion; - - @Column(name = "TURNO_ID", precision = 2, scale = 0) - private Byte turnoId; - - @Column(name = "INDSTATUSBOLETO", length = 3) - private String indstatusboleto; - - @Column(name = "INDCANCELACION", precision = 1, scale = 0) - private Boolean indcancelacion; - - @Column(name = "INDREIMPRESION", precision = 1, scale = 0) - private Boolean indreimpresion; - - @Column(name = "INDVIAJEREDONDO", precision = 1, scale = 0) - private Boolean indviajeredondo; - - @Column(name = "INDEXTRAVIADO", precision = 1, scale = 0) - private Boolean indextraviado; - - @Column(name = "PARIDAD", precision = 7) - private BigDecimal paridad; - - @Column(name = "CONVENIODET_ID", precision = 7, scale = 0) - private Integer conveniodetId; - - @Temporal(TemporalType.DATE) - @Column(name = "FECCREACION", length = 7) - private Date feccreacion; - - @Column(name = "MONEDA_ID", precision = 7, scale = 0) - private Integer monedaId; - - @Column(name = "ESTACION_ID", precision = 7, scale = 0) - private Integer estacionId; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "USUARIOAUTORIZACION_ID", precision = 7, scale = 0) - private Integer usuarioautorizacionId; - - @Column(name = "TIPOIDENTIFICACION_ID", precision = 2, scale = 0) - private Byte tipoidentificacionId; - - @Column(name = "NUMIDENTIFICACION", length = 60) - private String numidentificacion; - - @Column(name = "CLIENTEFIDELIDAD_ID", precision = 15, scale = 0) - private Long clientefidelidadId; - - @Column(name = "OPCIONAL1", precision = 7, scale = 0) - private Integer opcional1; - - @Column(name = "OPCIONAL2", precision = 7, scale = 0) - private Integer opcional2; - - @Column(name = "OPCIONAL3", length = 60) - private String opcional3; - - @Column(name = "PRECIOCARGOEXTRA", precision = 7) - private BigDecimal preciocargoextra; - - @Column(name = "PORCCATEGORIA", precision = 7) - private BigDecimal porccategoria; - - @Column(name = "PRECIOPRICING", precision = 7) - private BigDecimal preciopricing; - - @Column(name = "USUARIOREMOTO_ID", precision = 7, scale = 0) - private Integer usuarioremotoId; - - @Column(name = "PUNTOVENTAREMOTO_ID", precision = 7, scale = 0) - private Integer puntoventaremotoId; - - @Column(name = "CANTTRANSFERENCIA", precision = 2, scale = 0) - private Byte canttransferencia; - - @Column(name = "NUMDOCDESCUENTO", length = 30) - private String numdocdescuento; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @OneToOne - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - private Usuario usuario; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @Column(name = "ENTREGABOLETO_ID", precision = 10, scale = 0) - private Long entregaboletoId; - - @Column(name = "IMPORTECATEGORIA", precision = 7) - private BigDecimal importecategoria; - - @Column(name = "CLIENTE_ID", precision = 7, scale = 0) - private Integer clienteId; - - @Column(name = "BOLETOORIGINAL_ID", precision = 15, scale = 0) - private Long boletooriginalId; - - @Column(name = "IMPORTETAXAEMBARQUE", precision = 7) - private BigDecimal importetaxaembarque; - - @Column(name = "IMPORTEPEDAGIO", precision = 7) - private BigDecimal importepedagio; - - @Column(name = "IMPORTEOUTROS", precision = 7) - private BigDecimal importeoutros; - - @Column(name = "IMPORTESEGURO", precision = 7) - private BigDecimal importeseguro; - - @Column(name = "DESCORGAODOC", length = 15) - private String descorgaodoc; - - @Column(name = "DESCTIPODOC", length = 15) - private String desctipodoc; - - @Column(name = "DESCNUMDOC", length = 45) - private String descnumdoc; - - @Column(name = "NUMFIDELIDAD", length = 90) - private String numfidelidad; - - @Column(name = "INFOPASAJERO", length = 300) - private String infopasajero; - - @Column(name = "INDCONEXION", precision = 1, scale = 0) - private Boolean indconexion; - - @Column(name = "RUTA_ID", precision = 7, scale = 0) - private Integer rutaId; - - @Column(name = "LEVANTE_ID", precision = 7, scale = 0) - private Integer levanteId; - - @Column(name = "TIPOIDENTIFICACIONDOC_ID", precision = 7, scale = 0) - private Integer tipoidentificaciondocId; - - @Column(name = "ESTADOFOLIO_ID", precision = 7, scale = 0) - private Integer estadofolioId; - - @Column(name = "SERIEIMPFISCAL", length = 6) - private String serieimpfiscal; - - @Column(name = "DESCCORREO", length = 100) - private String desccorreo; - - @Column(name = "DESCTELEFONO", length = 15) - private String desctelefono; - - @Column(name = "NUMASIENTOVINCULADO", length = 12) - private String numasientovinculado; - - @Column(name = "DESCTIPODOC2", length = 15) - private String desctipodoc2; - - @Column(name = "DESCNUMDOC2", length = 45) - private String descnumdoc2; - - @Temporal(TemporalType.DATE) - @Column(name = "FECNACIMIENTO", length = 7) - private Date fecnacimiento; - - @Column(name = "INDSEGUNDAVIAIMPRESSA", precision = 1, scale = 0) - private Boolean indsegundaviaimpressa; - - @Column(name = "DISPOSITIVOEMBARCADA", length = 15) - private String dispositivoembarcada; - - @Column(name = "NUMEROBILHETEEMBARCADA", precision = 15, scale = 0) - private Long numerobilheteembarcada; - - @Column(name = "PTOVTAVENTA_ID", precision = 7, scale = 0) - private Integer ptovtaventaId; - - @Column(name = "CCF", length = 6) - private String ccf; - - @Column(name = "RMD_ID", precision = 15, scale = 0) - private Long rmdId; - - @Column(name = "SERIEIMPFISCALORIGINAL", length = 6) - private String serieimpfiscaloriginal; - - @Column(name = "BOLETOANTERIOR_ID", precision = 15, scale = 0) - private Long boletoanteriorId; - - @Column(name = "AIDF_ID", precision = 15, scale = 0) - private Long aidfId; - - @Column(name = "NACIONALIDAD", length = 30) - private String nacionalidad; - - @Column(name = "SEXO", length = 1) - private String sexo; - - @Column(name = "ESTADOCIVIL_ID", precision = 2, scale = 0) - private Byte estadocivilId; - - @Column(name = "IMEI_DISPOSITIVO_EMBARCADA", length = 20) - private String imeiDispositivoEmbarcada; - - @Column(name = "TEMPORESERVAFIDELIDADE", length = 7) - private Integer temporeservafidelidade; - - - public Boleto() { - } - - public Boleto(long boletoId) { - this.boletoId = boletoId; - } - - public Boleto(long boletoId, String numasiento, Integer categoriaId, String numfoliosistema, Byte claseservicioId, - Short marcaId, Integer origenId, Integer destinoId, Integer puntoVentaId, Integer corridaId, - Date feccorrida, String nombpasajero, BigDecimal preciobase, BigDecimal preciopagado, - BigDecimal descuentoamparado, Byte tipoventaId, String numseriepreimpresa, String numfoliopreimpreso, - Date fechorviaje, Date fechorventa, BigDecimal numkmviaje, String numoperacion, String indstatusoperacion, - Byte motivocancelacionId, Byte motivoreimpresionId, Integer cantpuntos, Integer empresapuntoventaId, - Integer empresacorridaId, String numreservacion, Byte turnoId, String indstatusboleto, - Boolean indcancelacion, Boolean indreimpresion, Boolean indviajeredondo, Boolean indextraviado, - BigDecimal paridad, Integer conveniodetId, Date feccreacion, Integer monedaId, Integer estacionId, - Boolean indreplica, Integer usuarioautorizacionId, Byte tipoidentificacionId, String numidentificacion, - Long clientefidelidadId, Integer opcional1, Integer opcional2, String opcional3, - BigDecimal preciocargoextra, BigDecimal porccategoria, BigDecimal preciopricing, Integer usuarioremotoId, - Integer puntoventaremotoId, Byte canttransferencia, String numdocdescuento, Boolean activo, Date fecmodif, - Usuario usuario, Byte nodoId, Long entregaboletoId, BigDecimal importecategoria, Integer clienteId, - Long boletooriginalId, BigDecimal importetaxaembarque, BigDecimal importepedagio, BigDecimal importeoutros, - BigDecimal importeseguro, String descorgaodoc, String desctipodoc, String descnumdoc, String numfidelidad, - String infopasajero, Boolean indconexion, Integer rutaId, Integer levanteId, - Integer tipoidentificaciondocId, Integer estadofolioId, String serieimpfiscal, String desccorreo, - String desctelefono, String numasientovinculado, String desctipodoc2, String descnumdoc2, - Date fecnacimiento, Boolean indsegundaviaimpressa, String dispositivoembarcada, Long numerobilheteembarcada, - Integer ptovtaventaId, String ccf, Long rmdId, String serieimpfiscaloriginal, Long boletoanteriorId, - Long aidfId, String nacionalidad, String sexo, Byte estadocivilId) { - this.boletoId = boletoId; - this.numasiento = numasiento; - this.categoriaId = categoriaId; - this.numfoliosistema = numfoliosistema; - this.claseservicioId = claseservicioId; - this.marcaId = marcaId; - this.origenId = origenId; - this.destinoId = destinoId; - this.puntoVentaId = puntoVentaId; - this.corridaId = corridaId; - this.feccorrida = feccorrida; - this.nombpasajero = nombpasajero; - this.preciobase = preciobase; - this.preciopagado = preciopagado; - this.descuentoamparado = descuentoamparado; - this.tipoventaId = tipoventaId; - this.numseriepreimpresa = numseriepreimpresa; - this.numfoliopreimpreso = numfoliopreimpreso; - this.fechorviaje = fechorviaje; - this.fechorventa = fechorventa; - this.numkmviaje = numkmviaje; - this.numoperacion = numoperacion; - this.indstatusoperacion = indstatusoperacion; - this.motivocancelacionId = motivocancelacionId; - this.motivoreimpresionId = motivoreimpresionId; - this.cantpuntos = cantpuntos; - this.empresapuntoventaId = empresapuntoventaId; - this.empresacorridaId = empresacorridaId; - this.numreservacion = numreservacion; - this.turnoId = turnoId; - this.indstatusboleto = indstatusboleto; - this.indcancelacion = indcancelacion; - this.indreimpresion = indreimpresion; - this.indviajeredondo = indviajeredondo; - this.indextraviado = indextraviado; - this.paridad = paridad; - this.conveniodetId = conveniodetId; - this.feccreacion = feccreacion; - this.monedaId = monedaId; - this.estacionId = estacionId; - this.indreplica = indreplica; - this.usuarioautorizacionId = usuarioautorizacionId; - this.tipoidentificacionId = tipoidentificacionId; - this.numidentificacion = numidentificacion; - this.clientefidelidadId = clientefidelidadId; - this.opcional1 = opcional1; - this.opcional2 = opcional2; - this.opcional3 = opcional3; - this.preciocargoextra = preciocargoextra; - this.porccategoria = porccategoria; - this.preciopricing = preciopricing; - this.usuarioremotoId = usuarioremotoId; - this.puntoventaremotoId = puntoventaremotoId; - this.canttransferencia = canttransferencia; - this.numdocdescuento = numdocdescuento; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuario = usuario; - this.nodoId = nodoId; - this.entregaboletoId = entregaboletoId; - this.importecategoria = importecategoria; - this.clienteId = clienteId; - this.boletooriginalId = boletooriginalId; - this.importetaxaembarque = importetaxaembarque; - this.importepedagio = importepedagio; - this.importeoutros = importeoutros; - this.importeseguro = importeseguro; - this.descorgaodoc = descorgaodoc; - this.desctipodoc = desctipodoc; - this.descnumdoc = descnumdoc; - this.numfidelidad = numfidelidad; - this.infopasajero = infopasajero; - this.indconexion = indconexion; - this.rutaId = rutaId; - this.levanteId = levanteId; - this.tipoidentificaciondocId = tipoidentificaciondocId; - this.estadofolioId = estadofolioId; - this.serieimpfiscal = serieimpfiscal; - this.desccorreo = desccorreo; - this.desctelefono = desctelefono; - this.numasientovinculado = numasientovinculado; - this.desctipodoc2 = desctipodoc2; - this.descnumdoc2 = descnumdoc2; - this.fecnacimiento = fecnacimiento; - this.indsegundaviaimpressa = indsegundaviaimpressa; - this.dispositivoembarcada = dispositivoembarcada; - this.numerobilheteembarcada = numerobilheteembarcada; - this.ptovtaventaId = ptovtaventaId; - this.ccf = ccf; - this.rmdId = rmdId; - this.serieimpfiscaloriginal = serieimpfiscaloriginal; - this.boletoanteriorId = boletoanteriorId; - this.aidfId = aidfId; - this.nacionalidad = nacionalidad; - this.sexo = sexo; - this.estadocivilId = estadocivilId; - } - - public long getBoletoId() { - return this.boletoId; - } - - public void setBoletoId(long boletoId) { - this.boletoId = boletoId; - } - - public String getNumasiento() { - return this.numasiento; - } - - public void setNumasiento(String numasiento) { - this.numasiento = numasiento; - } - - public Integer getCategoriaId() { - return this.categoriaId; - } - - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - - public String getNumfoliosistema() { - return this.numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public Byte getClaseservicioId() { - return this.claseservicioId; - } - - public void setClaseservicioId(Byte claseservicioId) { - this.claseservicioId = claseservicioId; - } - - public Short getMarcaId() { - return this.marcaId; - } - - public void setMarcaId(Short marcaId) { - this.marcaId = marcaId; - } - - public Integer getOrigenId() { - return this.origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return this.destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public Integer getCorridaId() { - return this.corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Date getFeccorrida() { - return this.feccorrida; - } - - public void setFeccorrida(Date feccorrida) { - this.feccorrida = feccorrida; - } - - public String getNombpasajero() { - return this.nombpasajero; - } - - public void setNombpasajero(String nombpasajero) { - this.nombpasajero = nombpasajero; - } - - public BigDecimal getPreciobase() { - return this.preciobase; - } - - public void setPreciobase(BigDecimal preciobase) { - this.preciobase = preciobase; - } - - public BigDecimal getPreciopagado() { - return this.preciopagado; - } - - public void setPreciopagado(BigDecimal preciopagado) { - this.preciopagado = preciopagado; - } - - public BigDecimal getDescuentoamparado() { - return this.descuentoamparado; - } - - public void setDescuentoamparado(BigDecimal descuentoamparado) { - this.descuentoamparado = descuentoamparado; - } - - public Byte getTipoventaId() { - return this.tipoventaId; - } - - public void setTipoventaId(Byte tipoventaId) { - this.tipoventaId = tipoventaId; - } - - public String getNumseriepreimpresa() { - return this.numseriepreimpresa; - } - - public void setNumseriepreimpresa(String numseriepreimpresa) { - this.numseriepreimpresa = numseriepreimpresa; - } - - public String getNumfoliopreimpreso() { - return this.numfoliopreimpreso; - } - - public void setNumfoliopreimpreso(String numfoliopreimpreso) { - this.numfoliopreimpreso = numfoliopreimpreso; - } - - public Date getFechorviaje() { - return this.fechorviaje; - } - - public void setFechorviaje(Date fechorviaje) { - this.fechorviaje = fechorviaje; - } - - public Date getFechorventa() { - return this.fechorventa; - } - - public void setFechorventa(Date fechorventa) { - this.fechorventa = fechorventa; - } - - public BigDecimal getNumkmviaje() { - return this.numkmviaje; - } - - public void setNumkmviaje(BigDecimal numkmviaje) { - this.numkmviaje = numkmviaje; - } - - public String getNumoperacion() { - return this.numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public String getIndstatusoperacion() { - return this.indstatusoperacion; - } - - public void setIndstatusoperacion(String indstatusoperacion) { - this.indstatusoperacion = indstatusoperacion; - } - - public Byte getMotivocancelacionId() { - return this.motivocancelacionId; - } - - public void setMotivocancelacionId(Byte motivocancelacionId) { - this.motivocancelacionId = motivocancelacionId; - } - - public Byte getMotivoreimpresionId() { - return this.motivoreimpresionId; - } - - public void setMotivoreimpresionId(Byte motivoreimpresionId) { - this.motivoreimpresionId = motivoreimpresionId; - } - - public Integer getCantpuntos() { - return this.cantpuntos; - } - - public void setCantpuntos(Integer cantpuntos) { - this.cantpuntos = cantpuntos; - } - - public Integer getEmpresapuntoventaId() { - return this.empresapuntoventaId; - } - - public void setEmpresapuntoventaId(Integer empresapuntoventaId) { - this.empresapuntoventaId = empresapuntoventaId; - } - - public Integer getEmpresacorridaId() { - return this.empresacorridaId; - } - - public void setEmpresacorridaId(Integer empresacorridaId) { - this.empresacorridaId = empresacorridaId; - } - - public String getNumreservacion() { - return this.numreservacion; - } - - public void setNumreservacion(String numreservacion) { - this.numreservacion = numreservacion; - } - - public Byte getTurnoId() { - return this.turnoId; - } - - public void setTurnoId(Byte turnoId) { - this.turnoId = turnoId; - } - - public String getIndstatusboleto() { - return this.indstatusboleto; - } - - public void setIndstatusboleto(String indstatusboleto) { - this.indstatusboleto = indstatusboleto; - } - - public Boolean getIndcancelacion() { - return this.indcancelacion; - } - - public void setIndcancelacion(Boolean indcancelacion) { - this.indcancelacion = indcancelacion; - } - - public Boolean getIndreimpresion() { - return this.indreimpresion; - } - - public void setIndreimpresion(Boolean indreimpresion) { - this.indreimpresion = indreimpresion; - } - - public Boolean getIndviajeredondo() { - return this.indviajeredondo; - } - - public void setIndviajeredondo(Boolean indviajeredondo) { - this.indviajeredondo = indviajeredondo; - } - - public Boolean getIndextraviado() { - return this.indextraviado; - } - - public void setIndextraviado(Boolean indextraviado) { - this.indextraviado = indextraviado; - } - - public BigDecimal getParidad() { - return this.paridad; - } - - public void setParidad(BigDecimal paridad) { - this.paridad = paridad; - } - - public Integer getConveniodetId() { - return this.conveniodetId; - } - - public void setConveniodetId(Integer conveniodetId) { - this.conveniodetId = conveniodetId; - } - - public Date getFeccreacion() { - return this.feccreacion; - } - - public void setFeccreacion(Date feccreacion) { - this.feccreacion = feccreacion; - } - - public Integer getMonedaId() { - return this.monedaId; - } - - public void setMonedaId(Integer monedaId) { - this.monedaId = monedaId; - } - - public Integer getEstacionId() { - return this.estacionId; - } - - public void setEstacionId(Integer estacionId) { - this.estacionId = estacionId; - } - - public Boolean getIndreplica() { - return this.indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Integer getUsuarioautorizacionId() { - return this.usuarioautorizacionId; - } - - public void setUsuarioautorizacionId(Integer usuarioautorizacionId) { - this.usuarioautorizacionId = usuarioautorizacionId; - } - - public Byte getTipoidentificacionId() { - return this.tipoidentificacionId; - } - - public void setTipoidentificacionId(Byte tipoidentificacionId) { - this.tipoidentificacionId = tipoidentificacionId; - } - - public String getNumidentificacion() { - return this.numidentificacion; - } - - public void setNumidentificacion(String numidentificacion) { - this.numidentificacion = numidentificacion; - } - - public Long getClientefidelidadId() { - return this.clientefidelidadId; - } - - public void setClientefidelidadId(Long clientefidelidadId) { - this.clientefidelidadId = clientefidelidadId; - } - - public Integer getOpcional1() { - return this.opcional1; - } - - public void setOpcional1(Integer opcional1) { - this.opcional1 = opcional1; - } - - public Integer getOpcional2() { - return this.opcional2; - } - - public void setOpcional2(Integer opcional2) { - this.opcional2 = opcional2; - } - - public String getOpcional3() { - return this.opcional3; - } - - public void setOpcional3(String opcional3) { - this.opcional3 = opcional3; - } - - public BigDecimal getPreciocargoextra() { - return this.preciocargoextra; - } - - public void setPreciocargoextra(BigDecimal preciocargoextra) { - this.preciocargoextra = preciocargoextra; - } - - public BigDecimal getPorccategoria() { - return this.porccategoria; - } - - public void setPorccategoria(BigDecimal porccategoria) { - this.porccategoria = porccategoria; - } - - public BigDecimal getPreciopricing() { - return this.preciopricing; - } - - public void setPreciopricing(BigDecimal preciopricing) { - this.preciopricing = preciopricing; - } - - public Integer getUsuarioremotoId() { - return this.usuarioremotoId; - } - - public void setUsuarioremotoId(Integer usuarioremotoId) { - this.usuarioremotoId = usuarioremotoId; - } - - public Integer getPuntoventaremotoId() { - return this.puntoventaremotoId; - } - - public void setPuntoventaremotoId(Integer puntoventaremotoId) { - this.puntoventaremotoId = puntoventaremotoId; - } - - public Byte getCanttransferencia() { - return this.canttransferencia; - } - - public void setCanttransferencia(Byte canttransferencia) { - this.canttransferencia = canttransferencia; - } - - public String getNumdocdescuento() { - return this.numdocdescuento; - } - - public void setNumdocdescuento(String numdocdescuento) { - this.numdocdescuento = numdocdescuento; - } - - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public Byte getNodoId() { - return this.nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public Long getEntregaboletoId() { - return this.entregaboletoId; - } - - public void setEntregaboletoId(Long entregaboletoId) { - this.entregaboletoId = entregaboletoId; - } - - public BigDecimal getImportecategoria() { - return this.importecategoria; - } - - public void setImportecategoria(BigDecimal importecategoria) { - this.importecategoria = importecategoria; - } - - public Integer getClienteId() { - return this.clienteId; - } - - public void setClienteId(Integer clienteId) { - this.clienteId = clienteId; - } - - public Long getBoletooriginalId() { - return this.boletooriginalId; - } - - public void setBoletooriginalId(Long boletooriginalId) { - this.boletooriginalId = boletooriginalId; - } - - public BigDecimal getImportetaxaembarque() { - return this.importetaxaembarque; - } - - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - - public BigDecimal getImportepedagio() { - return this.importepedagio; - } - - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - - public BigDecimal getImporteoutros() { - return this.importeoutros; - } - - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - - public BigDecimal getImporteseguro() { - return this.importeseguro; - } - - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } - - public String getDescorgaodoc() { - return this.descorgaodoc; - } - - public void setDescorgaodoc(String descorgaodoc) { - this.descorgaodoc = descorgaodoc; - } - - public String getDesctipodoc() { - return this.desctipodoc; - } - - public void setDesctipodoc(String desctipodoc) { - this.desctipodoc = desctipodoc; - } - - public String getDescnumdoc() { - return this.descnumdoc; - } - - public void setDescnumdoc(String descnumdoc) { - this.descnumdoc = descnumdoc; - } - - public String getNumfidelidad() { - return this.numfidelidad; - } - - public void setNumfidelidad(String numfidelidad) { - this.numfidelidad = numfidelidad; - } - - public String getInfopasajero() { - return this.infopasajero; - } - - public void setInfopasajero(String infopasajero) { - this.infopasajero = infopasajero; - } - - public Boolean getIndconexion() { - return this.indconexion; - } - - public void setIndconexion(Boolean indconexion) { - this.indconexion = indconexion; - } - - public Integer getRutaId() { - return this.rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public Integer getLevanteId() { - return this.levanteId; - } - - public void setLevanteId(Integer levanteId) { - this.levanteId = levanteId; - } - - public Integer getTipoidentificaciondocId() { - return this.tipoidentificaciondocId; - } - - public void setTipoidentificaciondocId(Integer tipoidentificaciondocId) { - this.tipoidentificaciondocId = tipoidentificaciondocId; - } - - public Integer getEstadofolioId() { - return this.estadofolioId; - } - - public void setEstadofolioId(Integer estadofolioId) { - this.estadofolioId = estadofolioId; - } - - public String getSerieimpfiscal() { - return this.serieimpfiscal; - } - - public void setSerieimpfiscal(String serieimpfiscal) { - this.serieimpfiscal = serieimpfiscal; - } - - public String getDesccorreo() { - return this.desccorreo; - } - - public void setDesccorreo(String desccorreo) { - this.desccorreo = desccorreo; - } - - public String getDesctelefono() { - return this.desctelefono; - } - - public void setDesctelefono(String desctelefono) { - this.desctelefono = desctelefono; - } - - public String getNumasientovinculado() { - return this.numasientovinculado; - } - - public void setNumasientovinculado(String numasientovinculado) { - this.numasientovinculado = numasientovinculado; - } - - public String getDesctipodoc2() { - return this.desctipodoc2; - } - - public void setDesctipodoc2(String desctipodoc2) { - this.desctipodoc2 = desctipodoc2; - } - - public String getDescnumdoc2() { - return this.descnumdoc2; - } - - public void setDescnumdoc2(String descnumdoc2) { - this.descnumdoc2 = descnumdoc2; - } - - public Date getFecnacimiento() { - return this.fecnacimiento; - } - - public void setFecnacimiento(Date fecnacimiento) { - this.fecnacimiento = fecnacimiento; - } - - public Boolean getIndsegundaviaimpressa() { - return this.indsegundaviaimpressa; - } - - public void setIndsegundaviaimpressa(Boolean indsegundaviaimpressa) { - this.indsegundaviaimpressa = indsegundaviaimpressa; - } - - public String getDispositivoembarcada() { - return this.dispositivoembarcada; - } - - public void setDispositivoembarcada(String dispositivoembarcada) { - this.dispositivoembarcada = dispositivoembarcada; - } - - public Long getNumerobilheteembarcada() { - return this.numerobilheteembarcada; - } - - public void setNumerobilheteembarcada(Long numerobilheteembarcada) { - this.numerobilheteembarcada = numerobilheteembarcada; - } - - public Integer getPtovtaventaId() { - return this.ptovtaventaId; - } - - public void setPtovtaventaId(Integer ptovtaventaId) { - this.ptovtaventaId = ptovtaventaId; - } - - public String getCcf() { - return this.ccf; - } - - public void setCcf(String ccf) { - this.ccf = ccf; - } - - public Long getRmdId() { - return this.rmdId; - } - - public void setRmdId(Long rmdId) { - this.rmdId = rmdId; - } - - public String getSerieimpfiscaloriginal() { - return this.serieimpfiscaloriginal; - } - - public void setSerieimpfiscaloriginal(String serieimpfiscaloriginal) { - this.serieimpfiscaloriginal = serieimpfiscaloriginal; - } - - public Long getBoletoanteriorId() { - return this.boletoanteriorId; - } - - public void setBoletoanteriorId(Long boletoanteriorId) { - this.boletoanteriorId = boletoanteriorId; - } - - public Long getAidfId() { - return this.aidfId; - } - - public void setAidfId(Long aidfId) { - this.aidfId = aidfId; - } - - public String getNacionalidad() { - return this.nacionalidad; - } - - public void setNacionalidad(String nacionalidad) { - this.nacionalidad = nacionalidad; - } - - public String getSexo() { - return this.sexo; - } - - public void setSexo(String sexo) { - this.sexo = sexo; - } - - public Byte getEstadocivilId() { - return this.estadocivilId; - } - - public void setEstadocivilId(Byte estadocivilId) { - this.estadocivilId = estadocivilId; - } - - public String getImeiDispositivoEmbarcada() { - return imeiDispositivoEmbarcada; - } - - public void setImeiDispositivoEmbarcada(String imeiDispositivoEmbarcada) { - this.imeiDispositivoEmbarcada = imeiDispositivoEmbarcada; - } - - public Integer getTemporeservafidelidade() { - return temporeservafidelidade; - } - - public void setTemporeservafidelidade(Integer temporeservafidelidade) { - this.temporeservafidelidade = temporeservafidelidade; - } - - public Date getFechorventaH() { - return fechorventaH; - } - - public void setFechorventaH(Date fechorventaH) { - this.fechorventaH = fechorventaH; - } - - public Integer getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * Boleto generated by hbm2java + */ +@Entity +@Table(name = "BOLETO", schema = "VTABOL") +public class Boleto implements java.io.Serializable { + + private static final long serialVersionUID = 6202773630000194534L; + + @Id + @Column(name = "BOLETO_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long boletoId; + + @Column(name = "NUMASIENTO", length = 12) + private String numasiento; + + @Column(name = "CATEGORIA_ID", precision = 7, scale = 0) + private Integer categoriaId; + + @Column(name = "NUMFOLIOSISTEMA", length = 36) + private String numfoliosistema; + + @Column(name = "CLASESERVICIO_ID", precision = 2, scale = 0) + private Byte claseservicioId; + + @Column(name = "MARCA_ID", precision = 3, scale = 0) + private Short marcaId; + + @Column(name = "ORIGEN_ID", precision = 7, scale = 0) + private Integer origenId; + + @Column(name = "DESTINO_ID", precision = 7, scale = 0) + private Integer destinoId; + + @Column(name = "PUNTOVENTA_ID") + private Integer puntoVentaId; + + @Column(name = "CORRIDA_ID", precision = 7, scale = 0) + private Integer corridaId; + + @Temporal(TemporalType.DATE) + @Column(name = "FECCORRIDA", length = 7) + private Date feccorrida; + + @Column(name = "NOMBPASAJERO", length = 180) + private String nombpasajero; + + @Column(name = "PRECIOBASE", precision = 7) + private BigDecimal preciobase; + + @Column(name = "PRECIOPAGADO", precision = 7) + private BigDecimal preciopagado; + + @Column(name = "DESCUENTOAMPARADO", precision = 7) + private BigDecimal descuentoamparado; + + @Column(name = "TIPOVENTA_ID", precision = 2, scale = 0) + private Byte tipoventaId; + + @Column(name = "NUMSERIEPREIMPRESA", length = 30) + private String numseriepreimpresa; + + @Column(name = "NUMFOLIOPREIMPRESO", length = 36) + private String numfoliopreimpreso; + + @Temporal(TemporalType.DATE) + @Column(name = "FECHORVIAJE", length = 7) + private Date fechorviaje; + + @Temporal(TemporalType.DATE) + @Column(name = "FECHORVENTA", length = 7) + private Date fechorventa; + + @Temporal(TemporalType.DATE) + @Column(name = "FECHORVENTA_H", length = 7) + private Date fechorventaH; + + @Column(name = "NUMKMVIAJE", precision = 7) + private BigDecimal numkmviaje; + + @Column(name = "NUMOPERACION", length = 36) + private String numoperacion; + + @Column(name = "INDSTATUSOPERACION", length = 3) + private String indstatusoperacion; + + @Column(name = "MOTIVOCANCELACION_ID", precision = 2, scale = 0) + private Byte motivocancelacionId; + + @Column(name = "MOTIVOREIMPRESION_ID", precision = 2, scale = 0) + private Byte motivoreimpresionId; + + @Column(name = "CANTPUNTOS", precision = 6, scale = 0) + private Integer cantpuntos; + + @Column(name = "EMPRESAPUNTOVENTA_ID", precision = 7, scale = 0) + private Integer empresapuntoventaId; + + @Column(name = "EMPRESACORRIDA_ID", precision = 7, scale = 0) + private Integer empresacorridaId; + + @Column(name = "NUMRESERVACION", length = 36) + private String numreservacion; + + @Column(name = "TURNO_ID", precision = 2, scale = 0) + private Byte turnoId; + + @Column(name = "INDSTATUSBOLETO", length = 3) + private String indstatusboleto; + + @Column(name = "INDCANCELACION", precision = 1, scale = 0) + private Boolean indcancelacion; + + @Column(name = "INDREIMPRESION", precision = 1, scale = 0) + private Boolean indreimpresion; + + @Column(name = "INDVIAJEREDONDO", precision = 1, scale = 0) + private Boolean indviajeredondo; + + @Column(name = "INDEXTRAVIADO", precision = 1, scale = 0) + private Boolean indextraviado; + + @Column(name = "PARIDAD", precision = 7) + private BigDecimal paridad; + + @Column(name = "CONVENIODET_ID", precision = 7, scale = 0) + private Integer conveniodetId; + + @Temporal(TemporalType.DATE) + @Column(name = "FECCREACION", length = 7) + private Date feccreacion; + + @Column(name = "MONEDA_ID", precision = 7, scale = 0) + private Integer monedaId; + + @Column(name = "ESTACION_ID", precision = 7, scale = 0) + private Integer estacionId; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "USUARIOAUTORIZACION_ID", precision = 7, scale = 0) + private Integer usuarioautorizacionId; + + @Column(name = "TIPOIDENTIFICACION_ID", precision = 2, scale = 0) + private Byte tipoidentificacionId; + + @Column(name = "NUMIDENTIFICACION", length = 60) + private String numidentificacion; + + @Column(name = "CLIENTEFIDELIDAD_ID", precision = 15, scale = 0) + private Long clientefidelidadId; + + @Column(name = "OPCIONAL1", precision = 7, scale = 0) + private Integer opcional1; + + @Column(name = "OPCIONAL2", precision = 7, scale = 0) + private Integer opcional2; + + @Column(name = "OPCIONAL3", length = 60) + private String opcional3; + + @Column(name = "PRECIOCARGOEXTRA", precision = 7) + private BigDecimal preciocargoextra; + + @Column(name = "PORCCATEGORIA", precision = 7) + private BigDecimal porccategoria; + + @Column(name = "PRECIOPRICING", precision = 7) + private BigDecimal preciopricing; + + @Column(name = "USUARIOREMOTO_ID", precision = 7, scale = 0) + private Integer usuarioremotoId; + + @Column(name = "PUNTOVENTAREMOTO_ID", precision = 7, scale = 0) + private Integer puntoventaremotoId; + + @Column(name = "CANTTRANSFERENCIA", precision = 2, scale = 0) + private Byte canttransferencia; + + @Column(name = "NUMDOCDESCUENTO", length = 30) + private String numdocdescuento; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @OneToOne + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + private Usuario usuario; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @Column(name = "ENTREGABOLETO_ID", precision = 10, scale = 0) + private Long entregaboletoId; + + @Column(name = "IMPORTECATEGORIA", precision = 7) + private BigDecimal importecategoria; + + @Column(name = "CLIENTE_ID", precision = 7, scale = 0) + private Integer clienteId; + + @Column(name = "BOLETOORIGINAL_ID", precision = 15, scale = 0) + private Long boletooriginalId; + + @Column(name = "IMPORTETAXAEMBARQUE", precision = 7) + private BigDecimal importetaxaembarque; + + @Column(name = "IMPORTEPEDAGIO", precision = 7) + private BigDecimal importepedagio; + + @Column(name = "IMPORTEOUTROS", precision = 7) + private BigDecimal importeoutros; + + @Column(name = "IMPORTESEGURO", precision = 7) + private BigDecimal importeseguro; + + @Column(name = "DESCORGAODOC", length = 15) + private String descorgaodoc; + + @Column(name = "DESCTIPODOC", length = 15) + private String desctipodoc; + + @Column(name = "DESCNUMDOC", length = 45) + private String descnumdoc; + + @Column(name = "NUMFIDELIDAD", length = 90) + private String numfidelidad; + + @Column(name = "INFOPASAJERO", length = 300) + private String infopasajero; + + @Column(name = "INDCONEXION", precision = 1, scale = 0) + private Boolean indconexion; + + @Column(name = "RUTA_ID", precision = 7, scale = 0) + private Integer rutaId; + + @Column(name = "LEVANTE_ID", precision = 7, scale = 0) + private Integer levanteId; + + @Column(name = "TIPOIDENTIFICACIONDOC_ID", precision = 7, scale = 0) + private Integer tipoidentificaciondocId; + + @Column(name = "ESTADOFOLIO_ID", precision = 7, scale = 0) + private Integer estadofolioId; + + @Column(name = "SERIEIMPFISCAL", length = 6) + private String serieimpfiscal; + + @Column(name = "DESCCORREO", length = 100) + private String desccorreo; + + @Column(name = "DESCTELEFONO", length = 15) + private String desctelefono; + + @Column(name = "NUMASIENTOVINCULADO", length = 12) + private String numasientovinculado; + + @Column(name = "DESCTIPODOC2", length = 15) + private String desctipodoc2; + + @Column(name = "DESCNUMDOC2", length = 45) + private String descnumdoc2; + + @Temporal(TemporalType.DATE) + @Column(name = "FECNACIMIENTO", length = 7) + private Date fecnacimiento; + + @Column(name = "INDSEGUNDAVIAIMPRESSA", precision = 1, scale = 0) + private Boolean indsegundaviaimpressa; + + @Column(name = "DISPOSITIVOEMBARCADA", length = 15) + private String dispositivoembarcada; + + @Column(name = "NUMEROBILHETEEMBARCADA", precision = 15, scale = 0) + private Long numerobilheteembarcada; + + @Column(name = "PTOVTAVENTA_ID", precision = 7, scale = 0) + private Integer ptovtaventaId; + + @Column(name = "CCF", length = 6) + private String ccf; + + @Column(name = "RMD_ID", precision = 15, scale = 0) + private Long rmdId; + + @Column(name = "SERIEIMPFISCALORIGINAL", length = 6) + private String serieimpfiscaloriginal; + + @Column(name = "BOLETOANTERIOR_ID", precision = 15, scale = 0) + private Long boletoanteriorId; + + @Column(name = "AIDF_ID", precision = 15, scale = 0) + private Long aidfId; + + @Column(name = "NACIONALIDAD", length = 30) + private String nacionalidad; + + @Column(name = "SEXO", length = 1) + private String sexo; + + @Column(name = "ESTADOCIVIL_ID", precision = 2, scale = 0) + private Byte estadocivilId; + + @Column(name = "IMEI_DISPOSITIVO_EMBARCADA", length = 20) + private String imeiDispositivoEmbarcada; + + @Column(name = "TEMPORESERVAFIDELIDADE", length = 7) + private Integer temporeservafidelidade; + + + public Boleto() { + } + + public Boleto(long boletoId) { + this.boletoId = boletoId; + } + + public Boleto(long boletoId, String numasiento, Integer categoriaId, String numfoliosistema, Byte claseservicioId, + Short marcaId, Integer origenId, Integer destinoId, Integer puntoVentaId, Integer corridaId, + Date feccorrida, String nombpasajero, BigDecimal preciobase, BigDecimal preciopagado, + BigDecimal descuentoamparado, Byte tipoventaId, String numseriepreimpresa, String numfoliopreimpreso, + Date fechorviaje, Date fechorventa, BigDecimal numkmviaje, String numoperacion, String indstatusoperacion, + Byte motivocancelacionId, Byte motivoreimpresionId, Integer cantpuntos, Integer empresapuntoventaId, + Integer empresacorridaId, String numreservacion, Byte turnoId, String indstatusboleto, + Boolean indcancelacion, Boolean indreimpresion, Boolean indviajeredondo, Boolean indextraviado, + BigDecimal paridad, Integer conveniodetId, Date feccreacion, Integer monedaId, Integer estacionId, + Boolean indreplica, Integer usuarioautorizacionId, Byte tipoidentificacionId, String numidentificacion, + Long clientefidelidadId, Integer opcional1, Integer opcional2, String opcional3, + BigDecimal preciocargoextra, BigDecimal porccategoria, BigDecimal preciopricing, Integer usuarioremotoId, + Integer puntoventaremotoId, Byte canttransferencia, String numdocdescuento, Boolean activo, Date fecmodif, + Usuario usuario, Byte nodoId, Long entregaboletoId, BigDecimal importecategoria, Integer clienteId, + Long boletooriginalId, BigDecimal importetaxaembarque, BigDecimal importepedagio, BigDecimal importeoutros, + BigDecimal importeseguro, String descorgaodoc, String desctipodoc, String descnumdoc, String numfidelidad, + String infopasajero, Boolean indconexion, Integer rutaId, Integer levanteId, + Integer tipoidentificaciondocId, Integer estadofolioId, String serieimpfiscal, String desccorreo, + String desctelefono, String numasientovinculado, String desctipodoc2, String descnumdoc2, + Date fecnacimiento, Boolean indsegundaviaimpressa, String dispositivoembarcada, Long numerobilheteembarcada, + Integer ptovtaventaId, String ccf, Long rmdId, String serieimpfiscaloriginal, Long boletoanteriorId, + Long aidfId, String nacionalidad, String sexo, Byte estadocivilId) { + this.boletoId = boletoId; + this.numasiento = numasiento; + this.categoriaId = categoriaId; + this.numfoliosistema = numfoliosistema; + this.claseservicioId = claseservicioId; + this.marcaId = marcaId; + this.origenId = origenId; + this.destinoId = destinoId; + this.puntoVentaId = puntoVentaId; + this.corridaId = corridaId; + this.feccorrida = feccorrida; + this.nombpasajero = nombpasajero; + this.preciobase = preciobase; + this.preciopagado = preciopagado; + this.descuentoamparado = descuentoamparado; + this.tipoventaId = tipoventaId; + this.numseriepreimpresa = numseriepreimpresa; + this.numfoliopreimpreso = numfoliopreimpreso; + this.fechorviaje = fechorviaje; + this.fechorventa = fechorventa; + this.numkmviaje = numkmviaje; + this.numoperacion = numoperacion; + this.indstatusoperacion = indstatusoperacion; + this.motivocancelacionId = motivocancelacionId; + this.motivoreimpresionId = motivoreimpresionId; + this.cantpuntos = cantpuntos; + this.empresapuntoventaId = empresapuntoventaId; + this.empresacorridaId = empresacorridaId; + this.numreservacion = numreservacion; + this.turnoId = turnoId; + this.indstatusboleto = indstatusboleto; + this.indcancelacion = indcancelacion; + this.indreimpresion = indreimpresion; + this.indviajeredondo = indviajeredondo; + this.indextraviado = indextraviado; + this.paridad = paridad; + this.conveniodetId = conveniodetId; + this.feccreacion = feccreacion; + this.monedaId = monedaId; + this.estacionId = estacionId; + this.indreplica = indreplica; + this.usuarioautorizacionId = usuarioautorizacionId; + this.tipoidentificacionId = tipoidentificacionId; + this.numidentificacion = numidentificacion; + this.clientefidelidadId = clientefidelidadId; + this.opcional1 = opcional1; + this.opcional2 = opcional2; + this.opcional3 = opcional3; + this.preciocargoextra = preciocargoextra; + this.porccategoria = porccategoria; + this.preciopricing = preciopricing; + this.usuarioremotoId = usuarioremotoId; + this.puntoventaremotoId = puntoventaremotoId; + this.canttransferencia = canttransferencia; + this.numdocdescuento = numdocdescuento; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuario = usuario; + this.nodoId = nodoId; + this.entregaboletoId = entregaboletoId; + this.importecategoria = importecategoria; + this.clienteId = clienteId; + this.boletooriginalId = boletooriginalId; + this.importetaxaembarque = importetaxaembarque; + this.importepedagio = importepedagio; + this.importeoutros = importeoutros; + this.importeseguro = importeseguro; + this.descorgaodoc = descorgaodoc; + this.desctipodoc = desctipodoc; + this.descnumdoc = descnumdoc; + this.numfidelidad = numfidelidad; + this.infopasajero = infopasajero; + this.indconexion = indconexion; + this.rutaId = rutaId; + this.levanteId = levanteId; + this.tipoidentificaciondocId = tipoidentificaciondocId; + this.estadofolioId = estadofolioId; + this.serieimpfiscal = serieimpfiscal; + this.desccorreo = desccorreo; + this.desctelefono = desctelefono; + this.numasientovinculado = numasientovinculado; + this.desctipodoc2 = desctipodoc2; + this.descnumdoc2 = descnumdoc2; + this.fecnacimiento = fecnacimiento; + this.indsegundaviaimpressa = indsegundaviaimpressa; + this.dispositivoembarcada = dispositivoembarcada; + this.numerobilheteembarcada = numerobilheteembarcada; + this.ptovtaventaId = ptovtaventaId; + this.ccf = ccf; + this.rmdId = rmdId; + this.serieimpfiscaloriginal = serieimpfiscaloriginal; + this.boletoanteriorId = boletoanteriorId; + this.aidfId = aidfId; + this.nacionalidad = nacionalidad; + this.sexo = sexo; + this.estadocivilId = estadocivilId; + } + + public long getBoletoId() { + return this.boletoId; + } + + public void setBoletoId(long boletoId) { + this.boletoId = boletoId; + } + + public String getNumasiento() { + return this.numasiento; + } + + public void setNumasiento(String numasiento) { + this.numasiento = numasiento; + } + + public Integer getCategoriaId() { + return this.categoriaId; + } + + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + + public String getNumfoliosistema() { + return this.numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public Byte getClaseservicioId() { + return this.claseservicioId; + } + + public void setClaseservicioId(Byte claseservicioId) { + this.claseservicioId = claseservicioId; + } + + public Short getMarcaId() { + return this.marcaId; + } + + public void setMarcaId(Short marcaId) { + this.marcaId = marcaId; + } + + public Integer getOrigenId() { + return this.origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return this.destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public Integer getCorridaId() { + return this.corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Date getFeccorrida() { + return this.feccorrida; + } + + public void setFeccorrida(Date feccorrida) { + this.feccorrida = feccorrida; + } + + public String getNombpasajero() { + return this.nombpasajero; + } + + public void setNombpasajero(String nombpasajero) { + this.nombpasajero = nombpasajero; + } + + public BigDecimal getPreciobase() { + return this.preciobase; + } + + public void setPreciobase(BigDecimal preciobase) { + this.preciobase = preciobase; + } + + public BigDecimal getPreciopagado() { + return this.preciopagado; + } + + public void setPreciopagado(BigDecimal preciopagado) { + this.preciopagado = preciopagado; + } + + public BigDecimal getDescuentoamparado() { + return this.descuentoamparado; + } + + public void setDescuentoamparado(BigDecimal descuentoamparado) { + this.descuentoamparado = descuentoamparado; + } + + public Byte getTipoventaId() { + return this.tipoventaId; + } + + public void setTipoventaId(Byte tipoventaId) { + this.tipoventaId = tipoventaId; + } + + public String getNumseriepreimpresa() { + return this.numseriepreimpresa; + } + + public void setNumseriepreimpresa(String numseriepreimpresa) { + this.numseriepreimpresa = numseriepreimpresa; + } + + public String getNumfoliopreimpreso() { + return this.numfoliopreimpreso; + } + + public void setNumfoliopreimpreso(String numfoliopreimpreso) { + this.numfoliopreimpreso = numfoliopreimpreso; + } + + public Date getFechorviaje() { + return this.fechorviaje; + } + + public void setFechorviaje(Date fechorviaje) { + this.fechorviaje = fechorviaje; + } + + public Date getFechorventa() { + return this.fechorventa; + } + + public void setFechorventa(Date fechorventa) { + this.fechorventa = fechorventa; + } + + public BigDecimal getNumkmviaje() { + return this.numkmviaje; + } + + public void setNumkmviaje(BigDecimal numkmviaje) { + this.numkmviaje = numkmviaje; + } + + public String getNumoperacion() { + return this.numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public String getIndstatusoperacion() { + return this.indstatusoperacion; + } + + public void setIndstatusoperacion(String indstatusoperacion) { + this.indstatusoperacion = indstatusoperacion; + } + + public Byte getMotivocancelacionId() { + return this.motivocancelacionId; + } + + public void setMotivocancelacionId(Byte motivocancelacionId) { + this.motivocancelacionId = motivocancelacionId; + } + + public Byte getMotivoreimpresionId() { + return this.motivoreimpresionId; + } + + public void setMotivoreimpresionId(Byte motivoreimpresionId) { + this.motivoreimpresionId = motivoreimpresionId; + } + + public Integer getCantpuntos() { + return this.cantpuntos; + } + + public void setCantpuntos(Integer cantpuntos) { + this.cantpuntos = cantpuntos; + } + + public Integer getEmpresapuntoventaId() { + return this.empresapuntoventaId; + } + + public void setEmpresapuntoventaId(Integer empresapuntoventaId) { + this.empresapuntoventaId = empresapuntoventaId; + } + + public Integer getEmpresacorridaId() { + return this.empresacorridaId; + } + + public void setEmpresacorridaId(Integer empresacorridaId) { + this.empresacorridaId = empresacorridaId; + } + + public String getNumreservacion() { + return this.numreservacion; + } + + public void setNumreservacion(String numreservacion) { + this.numreservacion = numreservacion; + } + + public Byte getTurnoId() { + return this.turnoId; + } + + public void setTurnoId(Byte turnoId) { + this.turnoId = turnoId; + } + + public String getIndstatusboleto() { + return this.indstatusboleto; + } + + public void setIndstatusboleto(String indstatusboleto) { + this.indstatusboleto = indstatusboleto; + } + + public Boolean getIndcancelacion() { + return this.indcancelacion; + } + + public void setIndcancelacion(Boolean indcancelacion) { + this.indcancelacion = indcancelacion; + } + + public Boolean getIndreimpresion() { + return this.indreimpresion; + } + + public void setIndreimpresion(Boolean indreimpresion) { + this.indreimpresion = indreimpresion; + } + + public Boolean getIndviajeredondo() { + return this.indviajeredondo; + } + + public void setIndviajeredondo(Boolean indviajeredondo) { + this.indviajeredondo = indviajeredondo; + } + + public Boolean getIndextraviado() { + return this.indextraviado; + } + + public void setIndextraviado(Boolean indextraviado) { + this.indextraviado = indextraviado; + } + + public BigDecimal getParidad() { + return this.paridad; + } + + public void setParidad(BigDecimal paridad) { + this.paridad = paridad; + } + + public Integer getConveniodetId() { + return this.conveniodetId; + } + + public void setConveniodetId(Integer conveniodetId) { + this.conveniodetId = conveniodetId; + } + + public Date getFeccreacion() { + return this.feccreacion; + } + + public void setFeccreacion(Date feccreacion) { + this.feccreacion = feccreacion; + } + + public Integer getMonedaId() { + return this.monedaId; + } + + public void setMonedaId(Integer monedaId) { + this.monedaId = monedaId; + } + + public Integer getEstacionId() { + return this.estacionId; + } + + public void setEstacionId(Integer estacionId) { + this.estacionId = estacionId; + } + + public Boolean getIndreplica() { + return this.indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Integer getUsuarioautorizacionId() { + return this.usuarioautorizacionId; + } + + public void setUsuarioautorizacionId(Integer usuarioautorizacionId) { + this.usuarioautorizacionId = usuarioautorizacionId; + } + + public Byte getTipoidentificacionId() { + return this.tipoidentificacionId; + } + + public void setTipoidentificacionId(Byte tipoidentificacionId) { + this.tipoidentificacionId = tipoidentificacionId; + } + + public String getNumidentificacion() { + return this.numidentificacion; + } + + public void setNumidentificacion(String numidentificacion) { + this.numidentificacion = numidentificacion; + } + + public Long getClientefidelidadId() { + return this.clientefidelidadId; + } + + public void setClientefidelidadId(Long clientefidelidadId) { + this.clientefidelidadId = clientefidelidadId; + } + + public Integer getOpcional1() { + return this.opcional1; + } + + public void setOpcional1(Integer opcional1) { + this.opcional1 = opcional1; + } + + public Integer getOpcional2() { + return this.opcional2; + } + + public void setOpcional2(Integer opcional2) { + this.opcional2 = opcional2; + } + + public String getOpcional3() { + return this.opcional3; + } + + public void setOpcional3(String opcional3) { + this.opcional3 = opcional3; + } + + public BigDecimal getPreciocargoextra() { + return this.preciocargoextra; + } + + public void setPreciocargoextra(BigDecimal preciocargoextra) { + this.preciocargoextra = preciocargoextra; + } + + public BigDecimal getPorccategoria() { + return this.porccategoria; + } + + public void setPorccategoria(BigDecimal porccategoria) { + this.porccategoria = porccategoria; + } + + public BigDecimal getPreciopricing() { + return this.preciopricing; + } + + public void setPreciopricing(BigDecimal preciopricing) { + this.preciopricing = preciopricing; + } + + public Integer getUsuarioremotoId() { + return this.usuarioremotoId; + } + + public void setUsuarioremotoId(Integer usuarioremotoId) { + this.usuarioremotoId = usuarioremotoId; + } + + public Integer getPuntoventaremotoId() { + return this.puntoventaremotoId; + } + + public void setPuntoventaremotoId(Integer puntoventaremotoId) { + this.puntoventaremotoId = puntoventaremotoId; + } + + public Byte getCanttransferencia() { + return this.canttransferencia; + } + + public void setCanttransferencia(Byte canttransferencia) { + this.canttransferencia = canttransferencia; + } + + public String getNumdocdescuento() { + return this.numdocdescuento; + } + + public void setNumdocdescuento(String numdocdescuento) { + this.numdocdescuento = numdocdescuento; + } + + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Byte getNodoId() { + return this.nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public Long getEntregaboletoId() { + return this.entregaboletoId; + } + + public void setEntregaboletoId(Long entregaboletoId) { + this.entregaboletoId = entregaboletoId; + } + + public BigDecimal getImportecategoria() { + return this.importecategoria; + } + + public void setImportecategoria(BigDecimal importecategoria) { + this.importecategoria = importecategoria; + } + + public Integer getClienteId() { + return this.clienteId; + } + + public void setClienteId(Integer clienteId) { + this.clienteId = clienteId; + } + + public Long getBoletooriginalId() { + return this.boletooriginalId; + } + + public void setBoletooriginalId(Long boletooriginalId) { + this.boletooriginalId = boletooriginalId; + } + + public BigDecimal getImportetaxaembarque() { + return this.importetaxaembarque; + } + + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + + public BigDecimal getImportepedagio() { + return this.importepedagio; + } + + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + + public BigDecimal getImporteoutros() { + return this.importeoutros; + } + + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + + public BigDecimal getImporteseguro() { + return this.importeseguro; + } + + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } + + public String getDescorgaodoc() { + return this.descorgaodoc; + } + + public void setDescorgaodoc(String descorgaodoc) { + this.descorgaodoc = descorgaodoc; + } + + public String getDesctipodoc() { + return this.desctipodoc; + } + + public void setDesctipodoc(String desctipodoc) { + this.desctipodoc = desctipodoc; + } + + public String getDescnumdoc() { + return this.descnumdoc; + } + + public void setDescnumdoc(String descnumdoc) { + this.descnumdoc = descnumdoc; + } + + public String getNumfidelidad() { + return this.numfidelidad; + } + + public void setNumfidelidad(String numfidelidad) { + this.numfidelidad = numfidelidad; + } + + public String getInfopasajero() { + return this.infopasajero; + } + + public void setInfopasajero(String infopasajero) { + this.infopasajero = infopasajero; + } + + public Boolean getIndconexion() { + return this.indconexion; + } + + public void setIndconexion(Boolean indconexion) { + this.indconexion = indconexion; + } + + public Integer getRutaId() { + return this.rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public Integer getLevanteId() { + return this.levanteId; + } + + public void setLevanteId(Integer levanteId) { + this.levanteId = levanteId; + } + + public Integer getTipoidentificaciondocId() { + return this.tipoidentificaciondocId; + } + + public void setTipoidentificaciondocId(Integer tipoidentificaciondocId) { + this.tipoidentificaciondocId = tipoidentificaciondocId; + } + + public Integer getEstadofolioId() { + return this.estadofolioId; + } + + public void setEstadofolioId(Integer estadofolioId) { + this.estadofolioId = estadofolioId; + } + + public String getSerieimpfiscal() { + return this.serieimpfiscal; + } + + public void setSerieimpfiscal(String serieimpfiscal) { + this.serieimpfiscal = serieimpfiscal; + } + + public String getDesccorreo() { + return this.desccorreo; + } + + public void setDesccorreo(String desccorreo) { + this.desccorreo = desccorreo; + } + + public String getDesctelefono() { + return this.desctelefono; + } + + public void setDesctelefono(String desctelefono) { + this.desctelefono = desctelefono; + } + + public String getNumasientovinculado() { + return this.numasientovinculado; + } + + public void setNumasientovinculado(String numasientovinculado) { + this.numasientovinculado = numasientovinculado; + } + + public String getDesctipodoc2() { + return this.desctipodoc2; + } + + public void setDesctipodoc2(String desctipodoc2) { + this.desctipodoc2 = desctipodoc2; + } + + public String getDescnumdoc2() { + return this.descnumdoc2; + } + + public void setDescnumdoc2(String descnumdoc2) { + this.descnumdoc2 = descnumdoc2; + } + + public Date getFecnacimiento() { + return this.fecnacimiento; + } + + public void setFecnacimiento(Date fecnacimiento) { + this.fecnacimiento = fecnacimiento; + } + + public Boolean getIndsegundaviaimpressa() { + return this.indsegundaviaimpressa; + } + + public void setIndsegundaviaimpressa(Boolean indsegundaviaimpressa) { + this.indsegundaviaimpressa = indsegundaviaimpressa; + } + + public String getDispositivoembarcada() { + return this.dispositivoembarcada; + } + + public void setDispositivoembarcada(String dispositivoembarcada) { + this.dispositivoembarcada = dispositivoembarcada; + } + + public Long getNumerobilheteembarcada() { + return this.numerobilheteembarcada; + } + + public void setNumerobilheteembarcada(Long numerobilheteembarcada) { + this.numerobilheteembarcada = numerobilheteembarcada; + } + + public Integer getPtovtaventaId() { + return this.ptovtaventaId; + } + + public void setPtovtaventaId(Integer ptovtaventaId) { + this.ptovtaventaId = ptovtaventaId; + } + + public String getCcf() { + return this.ccf; + } + + public void setCcf(String ccf) { + this.ccf = ccf; + } + + public Long getRmdId() { + return this.rmdId; + } + + public void setRmdId(Long rmdId) { + this.rmdId = rmdId; + } + + public String getSerieimpfiscaloriginal() { + return this.serieimpfiscaloriginal; + } + + public void setSerieimpfiscaloriginal(String serieimpfiscaloriginal) { + this.serieimpfiscaloriginal = serieimpfiscaloriginal; + } + + public Long getBoletoanteriorId() { + return this.boletoanteriorId; + } + + public void setBoletoanteriorId(Long boletoanteriorId) { + this.boletoanteriorId = boletoanteriorId; + } + + public Long getAidfId() { + return this.aidfId; + } + + public void setAidfId(Long aidfId) { + this.aidfId = aidfId; + } + + public String getNacionalidad() { + return this.nacionalidad; + } + + public void setNacionalidad(String nacionalidad) { + this.nacionalidad = nacionalidad; + } + + public String getSexo() { + return this.sexo; + } + + public void setSexo(String sexo) { + this.sexo = sexo; + } + + public Byte getEstadocivilId() { + return this.estadocivilId; + } + + public void setEstadocivilId(Byte estadocivilId) { + this.estadocivilId = estadocivilId; + } + + public String getImeiDispositivoEmbarcada() { + return imeiDispositivoEmbarcada; + } + + public void setImeiDispositivoEmbarcada(String imeiDispositivoEmbarcada) { + this.imeiDispositivoEmbarcada = imeiDispositivoEmbarcada; + } + + public Integer getTemporeservafidelidade() { + return temporeservafidelidade; + } + + public void setTemporeservafidelidade(Integer temporeservafidelidade) { + this.temporeservafidelidade = temporeservafidelidade; + } + + public Date getFechorventaH() { + return fechorventaH; + } + + public void setFechorventaH(Date fechorventaH) { + this.fechorventaH = fechorventaH; + } + + public Integer getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Caja.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Caja.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Caja.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Caja.java index 89ebe7c5c..a2677706d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Caja.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Caja.java @@ -1,1248 +1,1248 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CAJA") -public class Caja implements java.io.Serializable { - - private static final long serialVersionUID = -4352546555190468104L; - - @Id - @Column(name = "CAJA_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long cajaId; - - @Column(name = "NUMASIENTO", length = 12) - private String numasiento; - - @Column(name = "CATEGORIA_ID") - private Integer categoriaId; - - @Column(name = "NUMFOLIOSISTEMA", length = 36) - private String numfoliosistema; - - @Column(name = "CLASESERVICIO_ID", precision = 2, scale = 0) - private Byte claseservicioId; - - @Column(name = "MARCA_ID", precision = 3, scale = 0) - private Short marcaId; - - @Column(name = "ORIGEN_ID", precision = 7, scale = 0) - private Integer origenId; - - @Column(name = "DESTINO_ID", precision = 7, scale = 0) - private Integer destinoId; - - @Column(name = "CORRIDA_ID", precision = 7, scale = 0) - private Integer corridaId; - - @Temporal(TemporalType.DATE) - @Column(name = "FECCORRIDA", length = 7) - private Date feccorrida; - - @Column(name = "NOMBPASAJERO", length = 180) - private String nombpasajero; - - @Column(name = "PRECIOBASE", precision = 7) - private BigDecimal preciobase; - - @Column(name = "PRECIOPAGADO", precision = 7) - private BigDecimal preciopagado; - - @Column(name = "DESCUENTOAMPARADO", precision = 7) - private BigDecimal descuentoamparado; - - @Column(name = "TIPOVENTA_ID", precision = 2, scale = 0) - private Byte tipoventaId; - - @Column(name = "NUMSERIEPREIMPRESA", length = 30) - private String numseriepreimpresa; - - @Column(name = "NUMFOLIOPREIMPRESO", length = 36) - private String numfoliopreimpreso; - - @Temporal(TemporalType.DATE) - @Column(name = "FECHORVIAJE", length = 7) - private Date fechorviaje; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECHORVENTA") - private Date fechorventa; - - @Column(name = "PUNTOVENTA_ID", precision = 7, scale = 0) - private Integer puntoventaId; - - @Column(name = "NUMKMVIAJE", precision = 7) - private BigDecimal numkmviaje; - - @Column(name = "NUMOPERACION", length = 36) - private String numoperacion; - - @Column(name = "INDSTATUSOPERACION", length = 3) - private String indstatusoperacion; - - @Column(name = "MOTIVOCANCELACION_ID", precision = 2, scale = 0) - private Byte motivocancelacionId; - - @Column(name = "MOTIVOREIMPRESION_ID", precision = 2, scale = 0) - private Byte motivoreimpresionId; - - @Column(name = "CANTPUNTOS", precision = 6, scale = 0) - private Integer cantpuntos; - - @Column(name = "EMPRESAPUNTOVENTA_ID", precision = 7, scale = 0) - private Integer empresapuntoventaId; - - @Column(name = "EMPRESACORRIDA_ID", precision = 7, scale = 0) - private Integer empresacorridaId; - - @Column(name = "NUMRESERVACION", length = 36) - private String numreservacion; - - @Column(name = "TURNO_ID", precision = 2, scale = 0) - private Byte turnoId; - - @Column(name = "INDSTATUSBOLETO", length = 3) - private String indstatusboleto; - - @Column(name = "INDCANCELACION", precision = 1, scale = 0) - private Boolean indcancelacion; - - @Column(name = "INDREIMPRESION", precision = 1, scale = 0) - private Boolean indreimpresion; - - @Column(name = "INDVIAJEREDONDO", precision = 1, scale = 0) - private Boolean indviajeredondo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECCORTE", length = 7) - private Date feccorte; - - @Column(name = "INDEXTRAVIADO", precision = 1, scale = 0) - private Boolean indextraviado; - - @Column(name = "PARIDAD", precision = 7) - private BigDecimal paridad; - - @Temporal(TemporalType.DATE) - @Column(name = "FECCREACION", length = 7) - private Date feccreacion; - - @Column(name = "CONVENIODET_ID", precision = 7, scale = 0) - private Integer conveniodetId; - - @Column(name = "MONEDA_ID", precision = 7, scale = 0) - private Integer monedaId; - - @Column(name = "ESTACION_ID", precision = 7, scale = 0) - private Integer estacionId; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "USUARIOAUTORIZACION_ID", precision = 7, scale = 0) - private Integer usuarioautorizacionId; - - @Column(name = "TIPOIDENTIFICACION_ID", precision = 2, scale = 0) - private Byte tipoidentificacionId; - - @Column(name = "NUMIDENTIFICACION", length = 60) - private String numidentificacion; - - @Column(name = "CLIENTEFIDELIDAD_ID", precision = 15, scale = 0) - private Long clientefidelidadId; - - @Column(name = "OPCIONAL1", precision = 7, scale = 0) - private Integer opcional1; - - @Column(name = "OPCIONAL2", precision = 7, scale = 0) - private Integer opcional2; - - @Column(name = "OPCIONAL3", length = 60) - private String opcional3; - - @Column(name = "PRECIOCARGOEXTRA", precision = 7) - private BigDecimal preciocargoextra; - - @Column(name = "PRECIOPRICING", precision = 7) - private BigDecimal preciopricing; - - @Column(name = "CAJAORIGINAL_ID", precision = 15, scale = 0) - private Long cajaoriginalId; - - @Column(name = "USUARIOREMOTO_ID", precision = 7, scale = 0) - private Integer usuarioremotoId; - - @Column(name = "PUNTOVENTAREMOTO_ID", precision = 7, scale = 0) - private Integer puntoventaremotoId; - - @Column(name = "NUMDOCDESCUENTO", length = 30) - private String numdocdescuento; - - @Column(name = "CANTTRANSFERENCIA", precision = 2, scale = 0) - private Byte canttransferencia; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @Column(name = "PORCCATEGORIA", precision = 7) - private BigDecimal porccategoria; - - @Column(name = "IMPORTECATEGORIA", precision = 7) - private BigDecimal importecategoria; - - @Column(name = "CLIENTE_ID", precision = 7, scale = 0) - private Integer clienteId; - - @Column(name = "PAGORECAUDACION_ID", precision = 7, scale = 0) - private Integer pagorecaudacionId; - - @Column(name = "PAGORECAUDACION2_ID", precision = 7, scale = 0) - private Integer pagorecaudacion2Id; - - @Column(name = "IMPORTETAXAEMBARQUE", precision = 7) - private BigDecimal importetaxaembarque; - - @Column(name = "IMPORTEPEDAGIO", precision = 7) - private BigDecimal importepedagio; - - @Column(name = "IMPORTEOUTROS", precision = 7) - private BigDecimal importeoutros; - - @Column(name = "IMPORTESEGURO", precision = 7) - private BigDecimal importeseguro; - - @Column(name = "INDCONEXION", precision = 1, scale = 0) - private Boolean indconexion; - - @Column(name = "LEVANTE_ID", precision = 7, scale = 0) - private Integer levanteId; - - @Column(name = "RUTA_ID", precision = 7, scale = 0) - private Integer rutaId; - - @Column(name = "SERIEIMPFISCAL", length = 6) - private String serieimpfiscal; - - @Temporal(TemporalType.DATE) - @Column(name = "FECINTEGRACION", length = 7) - private Date fecintegracion; - - @Column(name = "PTOVTAVENTA_ID", precision = 7, scale = 0) - private Integer ptovtaventaId; - - @Column(name = "INDREMOTOINVERSO", precision = 1, scale = 0) - private Boolean indremotoinverso; - - @Temporal(TemporalType.DATE) - @Column(name = "FECNACIMIENTO", length = 7) - private Date fecnacimiento; - - @Column(name = "DISPOSITIVOEMBARCADA", length = 15) - private String dispositivoembarcada; - - @Column(name = "NUMEROBILHETEEMBARCADA", precision = 15, scale = 0) - private Long numerobilheteembarcada; - - @Column(name = "NUMASIENTOVINCULADO", length = 3) - private String numasientovinculado; - - @Column(name = "CCF", length = 6) - private String ccf; - - @Temporal(TemporalType.DATE) - @Column(name = "FECHORVENTA_H") - private Date fechorventaH; - - @Column(name = "SERIEIMPFISCALORIGINAL", length = 6) - private String serieimpfiscaloriginal; - - @Column(name = "INDINTEGRADOAG", precision = 1, scale = 0) - private Boolean indintegradoag; - - @Column(name = "TRANSACAO_ID", precision = 15, scale = 0) - private Long transacaoId; - - @Column(name = "TRANSACAOORIGINAL_ID", precision = 15, scale = 0) - private Long transacaooriginalId; - - @Column(name = "DESCNUMDOC", length = 45) - private String descnumdoc; - - @Column(name = "DESCNUMDOC2", length = 45) - private String descnumdoc2; - - @Column(name = "DESCTIPODOC", length = 15) - private String desctipodoc; - - @Column(name = "DESCTIPODOC2", length = 15) - private String desctipodoc2; - - @Column(name = "DESCTELEFONO", length = 15) - private String desctelefono; - - @Column(name = "AIDF_ID", precision = 15, scale = 0) - private Long aidfId; - - @Column(name = "NACIONALIDAD", length = 30) - private String nacionalidad; - - @Column(name = "SEXO", length = 1) - private String sexo; - - @OneToMany(mappedBy = "caja") - private List cajaFormaPago; - - @Column(name = "INTEGRADOTOTVS", precision = 1, scale = 0) - private Integer integradoTotvs; - - @Column(name = "ERRO", precision = 1, scale = 0) - private String erro; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECHORINTEGRADOTOTVS") - private Date fechorIntegradoTotvs; - - @Column(name = "CONTADORINTEGRADOTOTVS", precision = 7, scale = 0) - private Integer contadorIntegradoTotvs; - - - public Caja() { - } - - public Caja(Long cajaId, boolean indintegradoag) { - this.cajaId = cajaId; - this.indintegradoag = indintegradoag; - } - - public Caja(Long cajaId, String numasiento, Integer categoriaId, String numfoliosistema, Byte claseservicioId, - Short marcaId, Integer origenId, Integer destinoId, Integer corridaId, Date feccorrida, String nombpasajero, - BigDecimal preciobase, BigDecimal preciopagado, BigDecimal descuentoamparado, Byte tipoventaId, - String numseriepreimpresa, String numfoliopreimpreso, Date fechorviaje, Date fechorventa, - Integer puntoventaId, BigDecimal numkmviaje, String numoperacion, String indstatusoperacion, - Byte motivocancelacionId, Byte motivoreimpresionId, Integer cantpuntos, Integer empresapuntoventaId, - Integer empresacorridaId, String numreservacion, Byte turnoId, String indstatusboleto, - Boolean indcancelacion, Boolean indreimpresion, Boolean indviajeredondo, Date feccorte, - Boolean indextraviado, BigDecimal paridad, Date feccreacion, Integer conveniodetId, Integer monedaId, - Integer estacionId, Boolean indreplica, Integer usuarioautorizacionId, Byte tipoidentificacionId, - String numidentificacion, Long clientefidelidadId, Integer opcional1, Integer opcional2, String opcional3, - BigDecimal preciocargoextra, BigDecimal preciopricing, Long cajaoriginalId, Integer usuarioremotoId, - Integer puntoventaremotoId, String numdocdescuento, Byte canttransferencia, Boolean activo, Date fecmodif, - Integer usuarioId, Byte nodoId, BigDecimal porccategoria, BigDecimal importecategoria, Integer clienteId, - Integer pagorecaudacionId, Integer pagorecaudacion2Id, BigDecimal importetaxaembarque, - BigDecimal importepedagio, BigDecimal importeoutros, BigDecimal importeseguro, Boolean indconexion, - Integer levanteId, Integer rutaId, String serieimpfiscal, Date fecintegracion, Integer ptovtaventaId, - Boolean indremotoinverso, Date fecnacimiento, String dispositivoembarcada, Long numerobilheteembarcada, - String numasientovinculado, String ccf, Date fechorventaH, String serieimpfiscaloriginal, - Boolean indintegradoag, Long transacaoId, Long transacaooriginalId, String descnumdoc, String descnumdoc2, - String desctipodoc, String desctipodoc2, String desctelefono, Long aidfId, String nacionalidad, - String sexo) { - this.cajaId = cajaId; - this.numasiento = numasiento; - this.categoriaId = categoriaId; - this.numfoliosistema = numfoliosistema; - this.claseservicioId = claseservicioId; - this.marcaId = marcaId; - this.origenId = origenId; - this.destinoId = destinoId; - this.corridaId = corridaId; - this.feccorrida = feccorrida; - this.nombpasajero = nombpasajero; - this.preciobase = preciobase; - this.preciopagado = preciopagado; - this.descuentoamparado = descuentoamparado; - this.tipoventaId = tipoventaId; - this.numseriepreimpresa = numseriepreimpresa; - this.numfoliopreimpreso = numfoliopreimpreso; - this.fechorviaje = fechorviaje; - this.fechorventa = fechorventa; - this.puntoventaId = puntoventaId; - this.numkmviaje = numkmviaje; - this.numoperacion = numoperacion; - this.indstatusoperacion = indstatusoperacion; - this.motivocancelacionId = motivocancelacionId; - this.motivoreimpresionId = motivoreimpresionId; - this.cantpuntos = cantpuntos; - this.empresapuntoventaId = empresapuntoventaId; - this.empresacorridaId = empresacorridaId; - this.numreservacion = numreservacion; - this.turnoId = turnoId; - this.indstatusboleto = indstatusboleto; - this.indcancelacion = indcancelacion; - this.indreimpresion = indreimpresion; - this.indviajeredondo = indviajeredondo; - this.feccorte = feccorte; - this.indextraviado = indextraviado; - this.paridad = paridad; - this.feccreacion = feccreacion; - this.conveniodetId = conveniodetId; - this.monedaId = monedaId; - this.estacionId = estacionId; - this.indreplica = indreplica; - this.usuarioautorizacionId = usuarioautorizacionId; - this.tipoidentificacionId = tipoidentificacionId; - this.numidentificacion = numidentificacion; - this.clientefidelidadId = clientefidelidadId; - this.opcional1 = opcional1; - this.opcional2 = opcional2; - this.opcional3 = opcional3; - this.preciocargoextra = preciocargoextra; - this.preciopricing = preciopricing; - this.cajaoriginalId = cajaoriginalId; - this.usuarioremotoId = usuarioremotoId; - this.puntoventaremotoId = puntoventaremotoId; - this.numdocdescuento = numdocdescuento; - this.canttransferencia = canttransferencia; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.nodoId = nodoId; - this.porccategoria = porccategoria; - this.importecategoria = importecategoria; - this.clienteId = clienteId; - this.pagorecaudacionId = pagorecaudacionId; - this.pagorecaudacion2Id = pagorecaudacion2Id; - this.importetaxaembarque = importetaxaembarque; - this.importepedagio = importepedagio; - this.importeoutros = importeoutros; - this.importeseguro = importeseguro; - this.indconexion = indconexion; - this.levanteId = levanteId; - this.rutaId = rutaId; - this.serieimpfiscal = serieimpfiscal; - this.fecintegracion = fecintegracion; - this.ptovtaventaId = ptovtaventaId; - this.indremotoinverso = indremotoinverso; - this.fecnacimiento = fecnacimiento; - this.dispositivoembarcada = dispositivoembarcada; - this.numerobilheteembarcada = numerobilheteembarcada; - this.numasientovinculado = numasientovinculado; - this.ccf = ccf; - this.fechorventaH = fechorventaH; - this.serieimpfiscaloriginal = serieimpfiscaloriginal; - this.indintegradoag = indintegradoag; - this.transacaoId = transacaoId; - this.transacaooriginalId = transacaooriginalId; - this.descnumdoc = descnumdoc; - this.descnumdoc2 = descnumdoc2; - this.desctipodoc = desctipodoc; - this.desctipodoc2 = desctipodoc2; - this.desctelefono = desctelefono; - this.aidfId = aidfId; - this.nacionalidad = nacionalidad; - this.sexo = sexo; - } - - public Long getCajaId() { - return this.cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public String getNumasiento() { - return this.numasiento; - } - - public void setNumasiento(String numasiento) { - this.numasiento = numasiento; - } - - public Integer getCategoriaId() { - return this.categoriaId; - } - - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - - public String getNumfoliosistema() { - return this.numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public Byte getClaseservicioId() { - return this.claseservicioId; - } - - public void setClaseservicioId(Byte claseservicioId) { - this.claseservicioId = claseservicioId; - } - - public Short getMarcaId() { - return this.marcaId; - } - - public void setMarcaId(Short marcaId) { - this.marcaId = marcaId; - } - - public Integer getOrigenId() { - return this.origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return this.destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public Integer getCorridaId() { - return this.corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Date getFeccorrida() { - return this.feccorrida; - } - - public void setFeccorrida(Date feccorrida) { - this.feccorrida = feccorrida; - } - - public String getNombpasajero() { - return this.nombpasajero; - } - - public void setNombpasajero(String nombpasajero) { - this.nombpasajero = nombpasajero; - } - - public BigDecimal getPreciobase() { - return this.preciobase; - } - - public void setPreciobase(BigDecimal preciobase) { - this.preciobase = preciobase; - } - - public BigDecimal getPreciopagado() { - return this.preciopagado; - } - - public void setPreciopagado(BigDecimal preciopagado) { - this.preciopagado = preciopagado; - } - - public BigDecimal getDescuentoamparado() { - return this.descuentoamparado; - } - - public void setDescuentoamparado(BigDecimal descuentoamparado) { - this.descuentoamparado = descuentoamparado; - } - - public Byte getTipoventaId() { - return this.tipoventaId; - } - - public void setTipoventaId(Byte tipoventaId) { - this.tipoventaId = tipoventaId; - } - - public String getNumseriepreimpresa() { - return this.numseriepreimpresa; - } - - public void setNumseriepreimpresa(String numseriepreimpresa) { - this.numseriepreimpresa = numseriepreimpresa; - } - - public String getNumfoliopreimpreso() { - return this.numfoliopreimpreso; - } - - public void setNumfoliopreimpreso(String numfoliopreimpreso) { - this.numfoliopreimpreso = numfoliopreimpreso; - } - - public Date getFechorviaje() { - return this.fechorviaje; - } - - public void setFechorviaje(Date fechorviaje) { - this.fechorviaje = fechorviaje; - } - - public Date getFechorventa() { - return this.fechorventa; - } - - public void setFechorventa(Date fechorventa) { - this.fechorventa = fechorventa; - } - - public Integer getPuntoventaId() { - return this.puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public BigDecimal getNumkmviaje() { - return this.numkmviaje; - } - - public void setNumkmviaje(BigDecimal numkmviaje) { - this.numkmviaje = numkmviaje; - } - - public String getNumoperacion() { - return this.numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public String getIndstatusoperacion() { - return this.indstatusoperacion; - } - - public void setIndstatusoperacion(String indstatusoperacion) { - this.indstatusoperacion = indstatusoperacion; - } - - public Byte getMotivocancelacionId() { - return this.motivocancelacionId; - } - - public void setMotivocancelacionId(Byte motivocancelacionId) { - this.motivocancelacionId = motivocancelacionId; - } - - public Byte getMotivoreimpresionId() { - return this.motivoreimpresionId; - } - - public void setMotivoreimpresionId(Byte motivoreimpresionId) { - this.motivoreimpresionId = motivoreimpresionId; - } - - public Integer getCantpuntos() { - return this.cantpuntos; - } - - public void setCantpuntos(Integer cantpuntos) { - this.cantpuntos = cantpuntos; - } - - public Integer getEmpresapuntoventaId() { - return this.empresapuntoventaId; - } - - public void setEmpresapuntoventaId(Integer empresapuntoventaId) { - this.empresapuntoventaId = empresapuntoventaId; - } - - public Integer getEmpresacorridaId() { - return this.empresacorridaId; - } - - public void setEmpresacorridaId(Integer empresacorridaId) { - this.empresacorridaId = empresacorridaId; - } - - public String getNumreservacion() { - return this.numreservacion; - } - - public void setNumreservacion(String numreservacion) { - this.numreservacion = numreservacion; - } - - public Byte getTurnoId() { - return this.turnoId; - } - - public void setTurnoId(Byte turnoId) { - this.turnoId = turnoId; - } - - public String getIndstatusboleto() { - return this.indstatusboleto; - } - - public void setIndstatusboleto(String indstatusboleto) { - this.indstatusboleto = indstatusboleto; - } - - public Boolean getIndcancelacion() { - return this.indcancelacion; - } - - public void setIndcancelacion(Boolean indcancelacion) { - this.indcancelacion = indcancelacion; - } - - public Boolean getIndreimpresion() { - return this.indreimpresion; - } - - public void setIndreimpresion(Boolean indreimpresion) { - this.indreimpresion = indreimpresion; - } - - public Boolean getIndviajeredondo() { - return this.indviajeredondo; - } - - public void setIndviajeredondo(Boolean indviajeredondo) { - this.indviajeredondo = indviajeredondo; - } - - public Date getFeccorte() { - return this.feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public Boolean getIndextraviado() { - return this.indextraviado; - } - - public void setIndextraviado(Boolean indextraviado) { - this.indextraviado = indextraviado; - } - - public BigDecimal getParidad() { - return this.paridad; - } - - public void setParidad(BigDecimal paridad) { - this.paridad = paridad; - } - - public Date getFeccreacion() { - return this.feccreacion; - } - - public void setFeccreacion(Date feccreacion) { - this.feccreacion = feccreacion; - } - - public Integer getConveniodetId() { - return this.conveniodetId; - } - - public void setConveniodetId(Integer conveniodetId) { - this.conveniodetId = conveniodetId; - } - - public Integer getMonedaId() { - return this.monedaId; - } - - public void setMonedaId(Integer monedaId) { - this.monedaId = monedaId; - } - - public Integer getEstacionId() { - return this.estacionId; - } - - public void setEstacionId(Integer estacionId) { - this.estacionId = estacionId; - } - - public Boolean getIndreplica() { - return this.indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Integer getUsuarioautorizacionId() { - return this.usuarioautorizacionId; - } - - public void setUsuarioautorizacionId(Integer usuarioautorizacionId) { - this.usuarioautorizacionId = usuarioautorizacionId; - } - - public Byte getTipoidentificacionId() { - return this.tipoidentificacionId; - } - - public void setTipoidentificacionId(Byte tipoidentificacionId) { - this.tipoidentificacionId = tipoidentificacionId; - } - - public String getNumidentificacion() { - return this.numidentificacion; - } - - public void setNumidentificacion(String numidentificacion) { - this.numidentificacion = numidentificacion; - } - - public Long getClientefidelidadId() { - return this.clientefidelidadId; - } - - public void setClientefidelidadId(Long clientefidelidadId) { - this.clientefidelidadId = clientefidelidadId; - } - - public Integer getOpcional1() { - return this.opcional1; - } - - public void setOpcional1(Integer opcional1) { - this.opcional1 = opcional1; - } - - public Integer getOpcional2() { - return this.opcional2; - } - - public void setOpcional2(Integer opcional2) { - this.opcional2 = opcional2; - } - - public String getOpcional3() { - return this.opcional3; - } - - public void setOpcional3(String opcional3) { - this.opcional3 = opcional3; - } - - public BigDecimal getPreciocargoextra() { - return this.preciocargoextra; - } - - public void setPreciocargoextra(BigDecimal preciocargoextra) { - this.preciocargoextra = preciocargoextra; - } - - public BigDecimal getPreciopricing() { - return this.preciopricing; - } - - public void setPreciopricing(BigDecimal preciopricing) { - this.preciopricing = preciopricing; - } - - public Long getCajaoriginalId() { - return this.cajaoriginalId; - } - - public void setCajaoriginalId(Long cajaoriginalId) { - this.cajaoriginalId = cajaoriginalId; - } - - public Integer getUsuarioremotoId() { - return this.usuarioremotoId; - } - - public void setUsuarioremotoId(Integer usuarioremotoId) { - this.usuarioremotoId = usuarioremotoId; - } - - public Integer getPuntoventaremotoId() { - return this.puntoventaremotoId; - } - - public void setPuntoventaremotoId(Integer puntoventaremotoId) { - this.puntoventaremotoId = puntoventaremotoId; - } - - public String getNumdocdescuento() { - return this.numdocdescuento; - } - - public void setNumdocdescuento(String numdocdescuento) { - this.numdocdescuento = numdocdescuento; - } - - public Byte getCanttransferencia() { - return this.canttransferencia; - } - - public void setCanttransferencia(Byte canttransferencia) { - this.canttransferencia = canttransferencia; - } - - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Byte getNodoId() { - return this.nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public BigDecimal getPorccategoria() { - return this.porccategoria; - } - - public void setPorccategoria(BigDecimal porccategoria) { - this.porccategoria = porccategoria; - } - - public BigDecimal getImportecategoria() { - return this.importecategoria; - } - - public void setImportecategoria(BigDecimal importecategoria) { - this.importecategoria = importecategoria; - } - - public Integer getClienteId() { - return this.clienteId; - } - - public void setClienteId(Integer clienteId) { - this.clienteId = clienteId; - } - - public Integer getPagorecaudacionId() { - return this.pagorecaudacionId; - } - - public void setPagorecaudacionId(Integer pagorecaudacionId) { - this.pagorecaudacionId = pagorecaudacionId; - } - - public Integer getPagorecaudacion2Id() { - return this.pagorecaudacion2Id; - } - - public void setPagorecaudacion2Id(Integer pagorecaudacion2Id) { - this.pagorecaudacion2Id = pagorecaudacion2Id; - } - - public BigDecimal getImportetaxaembarque() { - return this.importetaxaembarque; - } - - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - - public BigDecimal getImportepedagio() { - return this.importepedagio; - } - - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - - public BigDecimal getImporteoutros() { - return this.importeoutros; - } - - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - - public BigDecimal getImporteseguro() { - return this.importeseguro; - } - - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } - - public Boolean getIndconexion() { - return this.indconexion; - } - - public void setIndconexion(Boolean indconexion) { - this.indconexion = indconexion; - } - - public Integer getLevanteId() { - return this.levanteId; - } - - public void setLevanteId(Integer levanteId) { - this.levanteId = levanteId; - } - - public Integer getRutaId() { - return this.rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public String getSerieimpfiscal() { - return this.serieimpfiscal; - } - - public void setSerieimpfiscal(String serieimpfiscal) { - this.serieimpfiscal = serieimpfiscal; - } - - public Date getFecintegracion() { - return this.fecintegracion; - } - - public void setFecintegracion(Date fecintegracion) { - this.fecintegracion = fecintegracion; - } - - public Integer getPtovtaventaId() { - return this.ptovtaventaId; - } - - public void setPtovtaventaId(Integer ptovtaventaId) { - this.ptovtaventaId = ptovtaventaId; - } - - public Boolean getIndremotoinverso() { - return this.indremotoinverso; - } - - public void setIndremotoinverso(Boolean indremotoinverso) { - this.indremotoinverso = indremotoinverso; - } - - public Date getFecnacimiento() { - return this.fecnacimiento; - } - - public void setFecnacimiento(Date fecnacimiento) { - this.fecnacimiento = fecnacimiento; - } - - public String getDispositivoembarcada() { - return this.dispositivoembarcada; - } - - public void setDispositivoembarcada(String dispositivoembarcada) { - this.dispositivoembarcada = dispositivoembarcada; - } - - public Long getNumerobilheteembarcada() { - return this.numerobilheteembarcada; - } - - public void setNumerobilheteembarcada(Long numerobilheteembarcada) { - this.numerobilheteembarcada = numerobilheteembarcada; - } - - public String getNumasientovinculado() { - return this.numasientovinculado; - } - - public void setNumasientovinculado(String numasientovinculado) { - this.numasientovinculado = numasientovinculado; - } - - public String getCcf() { - return this.ccf; - } - - public void setCcf(String ccf) { - this.ccf = ccf; - } - - public Date getFechorventaH() { - return this.fechorventaH; - } - - public void setFechorventaH(Date fechorventaH) { - this.fechorventaH = fechorventaH; - } - - public String getSerieimpfiscaloriginal() { - return this.serieimpfiscaloriginal; - } - - public void setSerieimpfiscaloriginal(String serieimpfiscaloriginal) { - this.serieimpfiscaloriginal = serieimpfiscaloriginal; - } - - public Boolean isIndintegradoag() { - return this.indintegradoag; - } - - public void setIndintegradoag(Boolean indintegradoag) { - this.indintegradoag = indintegradoag; - } - - public Long getTransacaoId() { - return this.transacaoId; - } - - public void setTransacaoId(Long transacaoId) { - this.transacaoId = transacaoId; - } - - public Long getTransacaooriginalId() { - return this.transacaooriginalId; - } - - public void setTransacaooriginalId(Long transacaooriginalId) { - this.transacaooriginalId = transacaooriginalId; - } - - public String getDescnumdoc() { - return this.descnumdoc; - } - - public void setDescnumdoc(String descnumdoc) { - this.descnumdoc = descnumdoc; - } - - public String getDescnumdoc2() { - return this.descnumdoc2; - } - - public void setDescnumdoc2(String descnumdoc2) { - this.descnumdoc2 = descnumdoc2; - } - - public String getDesctipodoc() { - return this.desctipodoc; - } - - public void setDesctipodoc(String desctipodoc) { - this.desctipodoc = desctipodoc; - } - - public String getDesctipodoc2() { - return this.desctipodoc2; - } - - public void setDesctipodoc2(String desctipodoc2) { - this.desctipodoc2 = desctipodoc2; - } - - public String getDesctelefono() { - return this.desctelefono; - } - - public void setDesctelefono(String desctelefono) { - this.desctelefono = desctelefono; - } - - public Long getAidfId() { - return this.aidfId; - } - - public void setAidfId(Long aidfId) { - this.aidfId = aidfId; - } - - public String getNacionalidad() { - return this.nacionalidad; - } - - public void setNacionalidad(String nacionalidad) { - this.nacionalidad = nacionalidad; - } - - public String getSexo() { - return this.sexo; - } - - public void setSexo(String sexo) { - this.sexo = sexo; - } - - public List getCajaFormaPago() { - return cajaFormaPago; - } - - public void setCajaFormaPago(List cajaFormaPago) { - this.cajaFormaPago = cajaFormaPago; - } - - public Integer getIntegradoTotvs() { - return integradoTotvs; - } - - public void setIntegradoTotvs(Integer integradoTotvs) { - this.integradoTotvs = integradoTotvs; - } - - public String getErro() { - return erro; - } - - public void setErro(String erro) { - this.erro = erro; - } - - public Date getFechorIntegradoTotvs() { - return fechorIntegradoTotvs; - } - - public void setFechorIntegradoTotvs(Date fechorIntegradoTotvs) { - this.fechorIntegradoTotvs = fechorIntegradoTotvs; - } - - public Integer getContadorIntegradoTotvs() { - return contadorIntegradoTotvs; - } - - public void setContadorIntegradoTotvs(Integer contadorIntegradoTotvs) { - this.contadorIntegradoTotvs = contadorIntegradoTotvs; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CAJA") +public class Caja implements java.io.Serializable { + + private static final long serialVersionUID = -4352546555190468104L; + + @Id + @Column(name = "CAJA_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long cajaId; + + @Column(name = "NUMASIENTO", length = 12) + private String numasiento; + + @Column(name = "CATEGORIA_ID") + private Integer categoriaId; + + @Column(name = "NUMFOLIOSISTEMA", length = 36) + private String numfoliosistema; + + @Column(name = "CLASESERVICIO_ID", precision = 2, scale = 0) + private Byte claseservicioId; + + @Column(name = "MARCA_ID", precision = 3, scale = 0) + private Short marcaId; + + @Column(name = "ORIGEN_ID", precision = 7, scale = 0) + private Integer origenId; + + @Column(name = "DESTINO_ID", precision = 7, scale = 0) + private Integer destinoId; + + @Column(name = "CORRIDA_ID", precision = 7, scale = 0) + private Integer corridaId; + + @Temporal(TemporalType.DATE) + @Column(name = "FECCORRIDA", length = 7) + private Date feccorrida; + + @Column(name = "NOMBPASAJERO", length = 180) + private String nombpasajero; + + @Column(name = "PRECIOBASE", precision = 7) + private BigDecimal preciobase; + + @Column(name = "PRECIOPAGADO", precision = 7) + private BigDecimal preciopagado; + + @Column(name = "DESCUENTOAMPARADO", precision = 7) + private BigDecimal descuentoamparado; + + @Column(name = "TIPOVENTA_ID", precision = 2, scale = 0) + private Byte tipoventaId; + + @Column(name = "NUMSERIEPREIMPRESA", length = 30) + private String numseriepreimpresa; + + @Column(name = "NUMFOLIOPREIMPRESO", length = 36) + private String numfoliopreimpreso; + + @Temporal(TemporalType.DATE) + @Column(name = "FECHORVIAJE", length = 7) + private Date fechorviaje; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECHORVENTA") + private Date fechorventa; + + @Column(name = "PUNTOVENTA_ID", precision = 7, scale = 0) + private Integer puntoventaId; + + @Column(name = "NUMKMVIAJE", precision = 7) + private BigDecimal numkmviaje; + + @Column(name = "NUMOPERACION", length = 36) + private String numoperacion; + + @Column(name = "INDSTATUSOPERACION", length = 3) + private String indstatusoperacion; + + @Column(name = "MOTIVOCANCELACION_ID", precision = 2, scale = 0) + private Byte motivocancelacionId; + + @Column(name = "MOTIVOREIMPRESION_ID", precision = 2, scale = 0) + private Byte motivoreimpresionId; + + @Column(name = "CANTPUNTOS", precision = 6, scale = 0) + private Integer cantpuntos; + + @Column(name = "EMPRESAPUNTOVENTA_ID", precision = 7, scale = 0) + private Integer empresapuntoventaId; + + @Column(name = "EMPRESACORRIDA_ID", precision = 7, scale = 0) + private Integer empresacorridaId; + + @Column(name = "NUMRESERVACION", length = 36) + private String numreservacion; + + @Column(name = "TURNO_ID", precision = 2, scale = 0) + private Byte turnoId; + + @Column(name = "INDSTATUSBOLETO", length = 3) + private String indstatusboleto; + + @Column(name = "INDCANCELACION", precision = 1, scale = 0) + private Boolean indcancelacion; + + @Column(name = "INDREIMPRESION", precision = 1, scale = 0) + private Boolean indreimpresion; + + @Column(name = "INDVIAJEREDONDO", precision = 1, scale = 0) + private Boolean indviajeredondo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECCORTE", length = 7) + private Date feccorte; + + @Column(name = "INDEXTRAVIADO", precision = 1, scale = 0) + private Boolean indextraviado; + + @Column(name = "PARIDAD", precision = 7) + private BigDecimal paridad; + + @Temporal(TemporalType.DATE) + @Column(name = "FECCREACION", length = 7) + private Date feccreacion; + + @Column(name = "CONVENIODET_ID", precision = 7, scale = 0) + private Integer conveniodetId; + + @Column(name = "MONEDA_ID", precision = 7, scale = 0) + private Integer monedaId; + + @Column(name = "ESTACION_ID", precision = 7, scale = 0) + private Integer estacionId; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "USUARIOAUTORIZACION_ID", precision = 7, scale = 0) + private Integer usuarioautorizacionId; + + @Column(name = "TIPOIDENTIFICACION_ID", precision = 2, scale = 0) + private Byte tipoidentificacionId; + + @Column(name = "NUMIDENTIFICACION", length = 60) + private String numidentificacion; + + @Column(name = "CLIENTEFIDELIDAD_ID", precision = 15, scale = 0) + private Long clientefidelidadId; + + @Column(name = "OPCIONAL1", precision = 7, scale = 0) + private Integer opcional1; + + @Column(name = "OPCIONAL2", precision = 7, scale = 0) + private Integer opcional2; + + @Column(name = "OPCIONAL3", length = 60) + private String opcional3; + + @Column(name = "PRECIOCARGOEXTRA", precision = 7) + private BigDecimal preciocargoextra; + + @Column(name = "PRECIOPRICING", precision = 7) + private BigDecimal preciopricing; + + @Column(name = "CAJAORIGINAL_ID", precision = 15, scale = 0) + private Long cajaoriginalId; + + @Column(name = "USUARIOREMOTO_ID", precision = 7, scale = 0) + private Integer usuarioremotoId; + + @Column(name = "PUNTOVENTAREMOTO_ID", precision = 7, scale = 0) + private Integer puntoventaremotoId; + + @Column(name = "NUMDOCDESCUENTO", length = 30) + private String numdocdescuento; + + @Column(name = "CANTTRANSFERENCIA", precision = 2, scale = 0) + private Byte canttransferencia; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @Column(name = "PORCCATEGORIA", precision = 7) + private BigDecimal porccategoria; + + @Column(name = "IMPORTECATEGORIA", precision = 7) + private BigDecimal importecategoria; + + @Column(name = "CLIENTE_ID", precision = 7, scale = 0) + private Integer clienteId; + + @Column(name = "PAGORECAUDACION_ID", precision = 7, scale = 0) + private Integer pagorecaudacionId; + + @Column(name = "PAGORECAUDACION2_ID", precision = 7, scale = 0) + private Integer pagorecaudacion2Id; + + @Column(name = "IMPORTETAXAEMBARQUE", precision = 7) + private BigDecimal importetaxaembarque; + + @Column(name = "IMPORTEPEDAGIO", precision = 7) + private BigDecimal importepedagio; + + @Column(name = "IMPORTEOUTROS", precision = 7) + private BigDecimal importeoutros; + + @Column(name = "IMPORTESEGURO", precision = 7) + private BigDecimal importeseguro; + + @Column(name = "INDCONEXION", precision = 1, scale = 0) + private Boolean indconexion; + + @Column(name = "LEVANTE_ID", precision = 7, scale = 0) + private Integer levanteId; + + @Column(name = "RUTA_ID", precision = 7, scale = 0) + private Integer rutaId; + + @Column(name = "SERIEIMPFISCAL", length = 6) + private String serieimpfiscal; + + @Temporal(TemporalType.DATE) + @Column(name = "FECINTEGRACION", length = 7) + private Date fecintegracion; + + @Column(name = "PTOVTAVENTA_ID", precision = 7, scale = 0) + private Integer ptovtaventaId; + + @Column(name = "INDREMOTOINVERSO", precision = 1, scale = 0) + private Boolean indremotoinverso; + + @Temporal(TemporalType.DATE) + @Column(name = "FECNACIMIENTO", length = 7) + private Date fecnacimiento; + + @Column(name = "DISPOSITIVOEMBARCADA", length = 15) + private String dispositivoembarcada; + + @Column(name = "NUMEROBILHETEEMBARCADA", precision = 15, scale = 0) + private Long numerobilheteembarcada; + + @Column(name = "NUMASIENTOVINCULADO", length = 3) + private String numasientovinculado; + + @Column(name = "CCF", length = 6) + private String ccf; + + @Temporal(TemporalType.DATE) + @Column(name = "FECHORVENTA_H") + private Date fechorventaH; + + @Column(name = "SERIEIMPFISCALORIGINAL", length = 6) + private String serieimpfiscaloriginal; + + @Column(name = "INDINTEGRADOAG", precision = 1, scale = 0) + private Boolean indintegradoag; + + @Column(name = "TRANSACAO_ID", precision = 15, scale = 0) + private Long transacaoId; + + @Column(name = "TRANSACAOORIGINAL_ID", precision = 15, scale = 0) + private Long transacaooriginalId; + + @Column(name = "DESCNUMDOC", length = 45) + private String descnumdoc; + + @Column(name = "DESCNUMDOC2", length = 45) + private String descnumdoc2; + + @Column(name = "DESCTIPODOC", length = 15) + private String desctipodoc; + + @Column(name = "DESCTIPODOC2", length = 15) + private String desctipodoc2; + + @Column(name = "DESCTELEFONO", length = 15) + private String desctelefono; + + @Column(name = "AIDF_ID", precision = 15, scale = 0) + private Long aidfId; + + @Column(name = "NACIONALIDAD", length = 30) + private String nacionalidad; + + @Column(name = "SEXO", length = 1) + private String sexo; + + @OneToMany(mappedBy = "caja") + private List cajaFormaPago; + + @Column(name = "INTEGRADOTOTVS", precision = 1, scale = 0) + private Integer integradoTotvs; + + @Column(name = "ERRO", precision = 1, scale = 0) + private String erro; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECHORINTEGRADOTOTVS") + private Date fechorIntegradoTotvs; + + @Column(name = "CONTADORINTEGRADOTOTVS", precision = 7, scale = 0) + private Integer contadorIntegradoTotvs; + + + public Caja() { + } + + public Caja(Long cajaId, boolean indintegradoag) { + this.cajaId = cajaId; + this.indintegradoag = indintegradoag; + } + + public Caja(Long cajaId, String numasiento, Integer categoriaId, String numfoliosistema, Byte claseservicioId, + Short marcaId, Integer origenId, Integer destinoId, Integer corridaId, Date feccorrida, String nombpasajero, + BigDecimal preciobase, BigDecimal preciopagado, BigDecimal descuentoamparado, Byte tipoventaId, + String numseriepreimpresa, String numfoliopreimpreso, Date fechorviaje, Date fechorventa, + Integer puntoventaId, BigDecimal numkmviaje, String numoperacion, String indstatusoperacion, + Byte motivocancelacionId, Byte motivoreimpresionId, Integer cantpuntos, Integer empresapuntoventaId, + Integer empresacorridaId, String numreservacion, Byte turnoId, String indstatusboleto, + Boolean indcancelacion, Boolean indreimpresion, Boolean indviajeredondo, Date feccorte, + Boolean indextraviado, BigDecimal paridad, Date feccreacion, Integer conveniodetId, Integer monedaId, + Integer estacionId, Boolean indreplica, Integer usuarioautorizacionId, Byte tipoidentificacionId, + String numidentificacion, Long clientefidelidadId, Integer opcional1, Integer opcional2, String opcional3, + BigDecimal preciocargoextra, BigDecimal preciopricing, Long cajaoriginalId, Integer usuarioremotoId, + Integer puntoventaremotoId, String numdocdescuento, Byte canttransferencia, Boolean activo, Date fecmodif, + Integer usuarioId, Byte nodoId, BigDecimal porccategoria, BigDecimal importecategoria, Integer clienteId, + Integer pagorecaudacionId, Integer pagorecaudacion2Id, BigDecimal importetaxaembarque, + BigDecimal importepedagio, BigDecimal importeoutros, BigDecimal importeseguro, Boolean indconexion, + Integer levanteId, Integer rutaId, String serieimpfiscal, Date fecintegracion, Integer ptovtaventaId, + Boolean indremotoinverso, Date fecnacimiento, String dispositivoembarcada, Long numerobilheteembarcada, + String numasientovinculado, String ccf, Date fechorventaH, String serieimpfiscaloriginal, + Boolean indintegradoag, Long transacaoId, Long transacaooriginalId, String descnumdoc, String descnumdoc2, + String desctipodoc, String desctipodoc2, String desctelefono, Long aidfId, String nacionalidad, + String sexo) { + this.cajaId = cajaId; + this.numasiento = numasiento; + this.categoriaId = categoriaId; + this.numfoliosistema = numfoliosistema; + this.claseservicioId = claseservicioId; + this.marcaId = marcaId; + this.origenId = origenId; + this.destinoId = destinoId; + this.corridaId = corridaId; + this.feccorrida = feccorrida; + this.nombpasajero = nombpasajero; + this.preciobase = preciobase; + this.preciopagado = preciopagado; + this.descuentoamparado = descuentoamparado; + this.tipoventaId = tipoventaId; + this.numseriepreimpresa = numseriepreimpresa; + this.numfoliopreimpreso = numfoliopreimpreso; + this.fechorviaje = fechorviaje; + this.fechorventa = fechorventa; + this.puntoventaId = puntoventaId; + this.numkmviaje = numkmviaje; + this.numoperacion = numoperacion; + this.indstatusoperacion = indstatusoperacion; + this.motivocancelacionId = motivocancelacionId; + this.motivoreimpresionId = motivoreimpresionId; + this.cantpuntos = cantpuntos; + this.empresapuntoventaId = empresapuntoventaId; + this.empresacorridaId = empresacorridaId; + this.numreservacion = numreservacion; + this.turnoId = turnoId; + this.indstatusboleto = indstatusboleto; + this.indcancelacion = indcancelacion; + this.indreimpresion = indreimpresion; + this.indviajeredondo = indviajeredondo; + this.feccorte = feccorte; + this.indextraviado = indextraviado; + this.paridad = paridad; + this.feccreacion = feccreacion; + this.conveniodetId = conveniodetId; + this.monedaId = monedaId; + this.estacionId = estacionId; + this.indreplica = indreplica; + this.usuarioautorizacionId = usuarioautorizacionId; + this.tipoidentificacionId = tipoidentificacionId; + this.numidentificacion = numidentificacion; + this.clientefidelidadId = clientefidelidadId; + this.opcional1 = opcional1; + this.opcional2 = opcional2; + this.opcional3 = opcional3; + this.preciocargoextra = preciocargoextra; + this.preciopricing = preciopricing; + this.cajaoriginalId = cajaoriginalId; + this.usuarioremotoId = usuarioremotoId; + this.puntoventaremotoId = puntoventaremotoId; + this.numdocdescuento = numdocdescuento; + this.canttransferencia = canttransferencia; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.nodoId = nodoId; + this.porccategoria = porccategoria; + this.importecategoria = importecategoria; + this.clienteId = clienteId; + this.pagorecaudacionId = pagorecaudacionId; + this.pagorecaudacion2Id = pagorecaudacion2Id; + this.importetaxaembarque = importetaxaembarque; + this.importepedagio = importepedagio; + this.importeoutros = importeoutros; + this.importeseguro = importeseguro; + this.indconexion = indconexion; + this.levanteId = levanteId; + this.rutaId = rutaId; + this.serieimpfiscal = serieimpfiscal; + this.fecintegracion = fecintegracion; + this.ptovtaventaId = ptovtaventaId; + this.indremotoinverso = indremotoinverso; + this.fecnacimiento = fecnacimiento; + this.dispositivoembarcada = dispositivoembarcada; + this.numerobilheteembarcada = numerobilheteembarcada; + this.numasientovinculado = numasientovinculado; + this.ccf = ccf; + this.fechorventaH = fechorventaH; + this.serieimpfiscaloriginal = serieimpfiscaloriginal; + this.indintegradoag = indintegradoag; + this.transacaoId = transacaoId; + this.transacaooriginalId = transacaooriginalId; + this.descnumdoc = descnumdoc; + this.descnumdoc2 = descnumdoc2; + this.desctipodoc = desctipodoc; + this.desctipodoc2 = desctipodoc2; + this.desctelefono = desctelefono; + this.aidfId = aidfId; + this.nacionalidad = nacionalidad; + this.sexo = sexo; + } + + public Long getCajaId() { + return this.cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public String getNumasiento() { + return this.numasiento; + } + + public void setNumasiento(String numasiento) { + this.numasiento = numasiento; + } + + public Integer getCategoriaId() { + return this.categoriaId; + } + + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + + public String getNumfoliosistema() { + return this.numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public Byte getClaseservicioId() { + return this.claseservicioId; + } + + public void setClaseservicioId(Byte claseservicioId) { + this.claseservicioId = claseservicioId; + } + + public Short getMarcaId() { + return this.marcaId; + } + + public void setMarcaId(Short marcaId) { + this.marcaId = marcaId; + } + + public Integer getOrigenId() { + return this.origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return this.destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public Integer getCorridaId() { + return this.corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Date getFeccorrida() { + return this.feccorrida; + } + + public void setFeccorrida(Date feccorrida) { + this.feccorrida = feccorrida; + } + + public String getNombpasajero() { + return this.nombpasajero; + } + + public void setNombpasajero(String nombpasajero) { + this.nombpasajero = nombpasajero; + } + + public BigDecimal getPreciobase() { + return this.preciobase; + } + + public void setPreciobase(BigDecimal preciobase) { + this.preciobase = preciobase; + } + + public BigDecimal getPreciopagado() { + return this.preciopagado; + } + + public void setPreciopagado(BigDecimal preciopagado) { + this.preciopagado = preciopagado; + } + + public BigDecimal getDescuentoamparado() { + return this.descuentoamparado; + } + + public void setDescuentoamparado(BigDecimal descuentoamparado) { + this.descuentoamparado = descuentoamparado; + } + + public Byte getTipoventaId() { + return this.tipoventaId; + } + + public void setTipoventaId(Byte tipoventaId) { + this.tipoventaId = tipoventaId; + } + + public String getNumseriepreimpresa() { + return this.numseriepreimpresa; + } + + public void setNumseriepreimpresa(String numseriepreimpresa) { + this.numseriepreimpresa = numseriepreimpresa; + } + + public String getNumfoliopreimpreso() { + return this.numfoliopreimpreso; + } + + public void setNumfoliopreimpreso(String numfoliopreimpreso) { + this.numfoliopreimpreso = numfoliopreimpreso; + } + + public Date getFechorviaje() { + return this.fechorviaje; + } + + public void setFechorviaje(Date fechorviaje) { + this.fechorviaje = fechorviaje; + } + + public Date getFechorventa() { + return this.fechorventa; + } + + public void setFechorventa(Date fechorventa) { + this.fechorventa = fechorventa; + } + + public Integer getPuntoventaId() { + return this.puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public BigDecimal getNumkmviaje() { + return this.numkmviaje; + } + + public void setNumkmviaje(BigDecimal numkmviaje) { + this.numkmviaje = numkmviaje; + } + + public String getNumoperacion() { + return this.numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public String getIndstatusoperacion() { + return this.indstatusoperacion; + } + + public void setIndstatusoperacion(String indstatusoperacion) { + this.indstatusoperacion = indstatusoperacion; + } + + public Byte getMotivocancelacionId() { + return this.motivocancelacionId; + } + + public void setMotivocancelacionId(Byte motivocancelacionId) { + this.motivocancelacionId = motivocancelacionId; + } + + public Byte getMotivoreimpresionId() { + return this.motivoreimpresionId; + } + + public void setMotivoreimpresionId(Byte motivoreimpresionId) { + this.motivoreimpresionId = motivoreimpresionId; + } + + public Integer getCantpuntos() { + return this.cantpuntos; + } + + public void setCantpuntos(Integer cantpuntos) { + this.cantpuntos = cantpuntos; + } + + public Integer getEmpresapuntoventaId() { + return this.empresapuntoventaId; + } + + public void setEmpresapuntoventaId(Integer empresapuntoventaId) { + this.empresapuntoventaId = empresapuntoventaId; + } + + public Integer getEmpresacorridaId() { + return this.empresacorridaId; + } + + public void setEmpresacorridaId(Integer empresacorridaId) { + this.empresacorridaId = empresacorridaId; + } + + public String getNumreservacion() { + return this.numreservacion; + } + + public void setNumreservacion(String numreservacion) { + this.numreservacion = numreservacion; + } + + public Byte getTurnoId() { + return this.turnoId; + } + + public void setTurnoId(Byte turnoId) { + this.turnoId = turnoId; + } + + public String getIndstatusboleto() { + return this.indstatusboleto; + } + + public void setIndstatusboleto(String indstatusboleto) { + this.indstatusboleto = indstatusboleto; + } + + public Boolean getIndcancelacion() { + return this.indcancelacion; + } + + public void setIndcancelacion(Boolean indcancelacion) { + this.indcancelacion = indcancelacion; + } + + public Boolean getIndreimpresion() { + return this.indreimpresion; + } + + public void setIndreimpresion(Boolean indreimpresion) { + this.indreimpresion = indreimpresion; + } + + public Boolean getIndviajeredondo() { + return this.indviajeredondo; + } + + public void setIndviajeredondo(Boolean indviajeredondo) { + this.indviajeredondo = indviajeredondo; + } + + public Date getFeccorte() { + return this.feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public Boolean getIndextraviado() { + return this.indextraviado; + } + + public void setIndextraviado(Boolean indextraviado) { + this.indextraviado = indextraviado; + } + + public BigDecimal getParidad() { + return this.paridad; + } + + public void setParidad(BigDecimal paridad) { + this.paridad = paridad; + } + + public Date getFeccreacion() { + return this.feccreacion; + } + + public void setFeccreacion(Date feccreacion) { + this.feccreacion = feccreacion; + } + + public Integer getConveniodetId() { + return this.conveniodetId; + } + + public void setConveniodetId(Integer conveniodetId) { + this.conveniodetId = conveniodetId; + } + + public Integer getMonedaId() { + return this.monedaId; + } + + public void setMonedaId(Integer monedaId) { + this.monedaId = monedaId; + } + + public Integer getEstacionId() { + return this.estacionId; + } + + public void setEstacionId(Integer estacionId) { + this.estacionId = estacionId; + } + + public Boolean getIndreplica() { + return this.indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Integer getUsuarioautorizacionId() { + return this.usuarioautorizacionId; + } + + public void setUsuarioautorizacionId(Integer usuarioautorizacionId) { + this.usuarioautorizacionId = usuarioautorizacionId; + } + + public Byte getTipoidentificacionId() { + return this.tipoidentificacionId; + } + + public void setTipoidentificacionId(Byte tipoidentificacionId) { + this.tipoidentificacionId = tipoidentificacionId; + } + + public String getNumidentificacion() { + return this.numidentificacion; + } + + public void setNumidentificacion(String numidentificacion) { + this.numidentificacion = numidentificacion; + } + + public Long getClientefidelidadId() { + return this.clientefidelidadId; + } + + public void setClientefidelidadId(Long clientefidelidadId) { + this.clientefidelidadId = clientefidelidadId; + } + + public Integer getOpcional1() { + return this.opcional1; + } + + public void setOpcional1(Integer opcional1) { + this.opcional1 = opcional1; + } + + public Integer getOpcional2() { + return this.opcional2; + } + + public void setOpcional2(Integer opcional2) { + this.opcional2 = opcional2; + } + + public String getOpcional3() { + return this.opcional3; + } + + public void setOpcional3(String opcional3) { + this.opcional3 = opcional3; + } + + public BigDecimal getPreciocargoextra() { + return this.preciocargoextra; + } + + public void setPreciocargoextra(BigDecimal preciocargoextra) { + this.preciocargoextra = preciocargoextra; + } + + public BigDecimal getPreciopricing() { + return this.preciopricing; + } + + public void setPreciopricing(BigDecimal preciopricing) { + this.preciopricing = preciopricing; + } + + public Long getCajaoriginalId() { + return this.cajaoriginalId; + } + + public void setCajaoriginalId(Long cajaoriginalId) { + this.cajaoriginalId = cajaoriginalId; + } + + public Integer getUsuarioremotoId() { + return this.usuarioremotoId; + } + + public void setUsuarioremotoId(Integer usuarioremotoId) { + this.usuarioremotoId = usuarioremotoId; + } + + public Integer getPuntoventaremotoId() { + return this.puntoventaremotoId; + } + + public void setPuntoventaremotoId(Integer puntoventaremotoId) { + this.puntoventaremotoId = puntoventaremotoId; + } + + public String getNumdocdescuento() { + return this.numdocdescuento; + } + + public void setNumdocdescuento(String numdocdescuento) { + this.numdocdescuento = numdocdescuento; + } + + public Byte getCanttransferencia() { + return this.canttransferencia; + } + + public void setCanttransferencia(Byte canttransferencia) { + this.canttransferencia = canttransferencia; + } + + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Byte getNodoId() { + return this.nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public BigDecimal getPorccategoria() { + return this.porccategoria; + } + + public void setPorccategoria(BigDecimal porccategoria) { + this.porccategoria = porccategoria; + } + + public BigDecimal getImportecategoria() { + return this.importecategoria; + } + + public void setImportecategoria(BigDecimal importecategoria) { + this.importecategoria = importecategoria; + } + + public Integer getClienteId() { + return this.clienteId; + } + + public void setClienteId(Integer clienteId) { + this.clienteId = clienteId; + } + + public Integer getPagorecaudacionId() { + return this.pagorecaudacionId; + } + + public void setPagorecaudacionId(Integer pagorecaudacionId) { + this.pagorecaudacionId = pagorecaudacionId; + } + + public Integer getPagorecaudacion2Id() { + return this.pagorecaudacion2Id; + } + + public void setPagorecaudacion2Id(Integer pagorecaudacion2Id) { + this.pagorecaudacion2Id = pagorecaudacion2Id; + } + + public BigDecimal getImportetaxaembarque() { + return this.importetaxaembarque; + } + + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + + public BigDecimal getImportepedagio() { + return this.importepedagio; + } + + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + + public BigDecimal getImporteoutros() { + return this.importeoutros; + } + + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + + public BigDecimal getImporteseguro() { + return this.importeseguro; + } + + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } + + public Boolean getIndconexion() { + return this.indconexion; + } + + public void setIndconexion(Boolean indconexion) { + this.indconexion = indconexion; + } + + public Integer getLevanteId() { + return this.levanteId; + } + + public void setLevanteId(Integer levanteId) { + this.levanteId = levanteId; + } + + public Integer getRutaId() { + return this.rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public String getSerieimpfiscal() { + return this.serieimpfiscal; + } + + public void setSerieimpfiscal(String serieimpfiscal) { + this.serieimpfiscal = serieimpfiscal; + } + + public Date getFecintegracion() { + return this.fecintegracion; + } + + public void setFecintegracion(Date fecintegracion) { + this.fecintegracion = fecintegracion; + } + + public Integer getPtovtaventaId() { + return this.ptovtaventaId; + } + + public void setPtovtaventaId(Integer ptovtaventaId) { + this.ptovtaventaId = ptovtaventaId; + } + + public Boolean getIndremotoinverso() { + return this.indremotoinverso; + } + + public void setIndremotoinverso(Boolean indremotoinverso) { + this.indremotoinverso = indremotoinverso; + } + + public Date getFecnacimiento() { + return this.fecnacimiento; + } + + public void setFecnacimiento(Date fecnacimiento) { + this.fecnacimiento = fecnacimiento; + } + + public String getDispositivoembarcada() { + return this.dispositivoembarcada; + } + + public void setDispositivoembarcada(String dispositivoembarcada) { + this.dispositivoembarcada = dispositivoembarcada; + } + + public Long getNumerobilheteembarcada() { + return this.numerobilheteembarcada; + } + + public void setNumerobilheteembarcada(Long numerobilheteembarcada) { + this.numerobilheteembarcada = numerobilheteembarcada; + } + + public String getNumasientovinculado() { + return this.numasientovinculado; + } + + public void setNumasientovinculado(String numasientovinculado) { + this.numasientovinculado = numasientovinculado; + } + + public String getCcf() { + return this.ccf; + } + + public void setCcf(String ccf) { + this.ccf = ccf; + } + + public Date getFechorventaH() { + return this.fechorventaH; + } + + public void setFechorventaH(Date fechorventaH) { + this.fechorventaH = fechorventaH; + } + + public String getSerieimpfiscaloriginal() { + return this.serieimpfiscaloriginal; + } + + public void setSerieimpfiscaloriginal(String serieimpfiscaloriginal) { + this.serieimpfiscaloriginal = serieimpfiscaloriginal; + } + + public Boolean isIndintegradoag() { + return this.indintegradoag; + } + + public void setIndintegradoag(Boolean indintegradoag) { + this.indintegradoag = indintegradoag; + } + + public Long getTransacaoId() { + return this.transacaoId; + } + + public void setTransacaoId(Long transacaoId) { + this.transacaoId = transacaoId; + } + + public Long getTransacaooriginalId() { + return this.transacaooriginalId; + } + + public void setTransacaooriginalId(Long transacaooriginalId) { + this.transacaooriginalId = transacaooriginalId; + } + + public String getDescnumdoc() { + return this.descnumdoc; + } + + public void setDescnumdoc(String descnumdoc) { + this.descnumdoc = descnumdoc; + } + + public String getDescnumdoc2() { + return this.descnumdoc2; + } + + public void setDescnumdoc2(String descnumdoc2) { + this.descnumdoc2 = descnumdoc2; + } + + public String getDesctipodoc() { + return this.desctipodoc; + } + + public void setDesctipodoc(String desctipodoc) { + this.desctipodoc = desctipodoc; + } + + public String getDesctipodoc2() { + return this.desctipodoc2; + } + + public void setDesctipodoc2(String desctipodoc2) { + this.desctipodoc2 = desctipodoc2; + } + + public String getDesctelefono() { + return this.desctelefono; + } + + public void setDesctelefono(String desctelefono) { + this.desctelefono = desctelefono; + } + + public Long getAidfId() { + return this.aidfId; + } + + public void setAidfId(Long aidfId) { + this.aidfId = aidfId; + } + + public String getNacionalidad() { + return this.nacionalidad; + } + + public void setNacionalidad(String nacionalidad) { + this.nacionalidad = nacionalidad; + } + + public String getSexo() { + return this.sexo; + } + + public void setSexo(String sexo) { + this.sexo = sexo; + } + + public List getCajaFormaPago() { + return cajaFormaPago; + } + + public void setCajaFormaPago(List cajaFormaPago) { + this.cajaFormaPago = cajaFormaPago; + } + + public Integer getIntegradoTotvs() { + return integradoTotvs; + } + + public void setIntegradoTotvs(Integer integradoTotvs) { + this.integradoTotvs = integradoTotvs; + } + + public String getErro() { + return erro; + } + + public void setErro(String erro) { + this.erro = erro; + } + + public Date getFechorIntegradoTotvs() { + return fechorIntegradoTotvs; + } + + public void setFechorIntegradoTotvs(Date fechorIntegradoTotvs) { + this.fechorIntegradoTotvs = fechorIntegradoTotvs; + } + + public Integer getContadorIntegradoTotvs() { + return contadorIntegradoTotvs; + } + + public void setContadorIntegradoTotvs(Integer contadorIntegradoTotvs) { + this.contadorIntegradoTotvs = contadorIntegradoTotvs; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java index 86acd5271..39f10c058 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDetPago.java @@ -1,249 +1,249 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CAJA_DET_PAGO") -public class CajaDetPago implements java.io.Serializable { - - private static final long serialVersionUID = 7865266026539127982L; - - @Id - @Column(name = "CAJADETPAGO_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long cajaDetPagoId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CAJAFORMAPAGO_ID") - private CajaFormaPago cajaFormaPago; - - @Column(name = "NUMOPERACION", length = 36) - private String numoperacion; - - @OneToOne - @JoinColumn(name = "FORMAPAGO_ID") - private FormaPago formaPago; - - @Column(name = "NUMDOCUMENTO", length = 60) - private String numdocumento; - - @Column(name = "OPCIONAL1", length = 60) - private String opcional1; - - @Column(name = "OPCIONAL2", length = 60) - private String opcional2; - - @Column(name = "OPCIONAL3", length = 60) - private String opcional3; - - @Column(name = "IMPORTE1", precision = 8) - private BigDecimal importe1; - - @Column(name = "IMPORTE2", precision = 8) - private BigDecimal importe2; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @ManyToOne - @JoinColumn(name = "CAJA_ID") - private Caja caja; - - @ManyToOne - @JoinColumn(name = "OCD_ID") - private OCD ocd; - - @Column(name = "NOTACREDITOVENDAPACOTE_ID", precision = 7, scale = 0) - private Integer notacreditovendapacoteId; - - @OneToOne(mappedBy = "cajaDetPago") - private CajaTarjeta cajaTarjetas; - - @Column(name = "SERIESUBSERIE", length = 30) - private String serieSubSerie; - - public Long getCajaDetPagoId() { - return cajaDetPagoId; - } - - public void setCajaDetPagoId(Long cajaDetPagoId) { - this.cajaDetPagoId = cajaDetPagoId; - } - - public CajaFormaPago getCajaFormaPago() { - return cajaFormaPago; - } - - public void setCajaFormaPago(CajaFormaPago cajaFormaPago) { - this.cajaFormaPago = cajaFormaPago; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public FormaPago getFormaPago() { - return formaPago; - } - - public void setFormaPago(FormaPago formaPago) { - this.formaPago = formaPago; - } - - public String getNumdocumento() { - return numdocumento; - } - - public void setNumdocumento(String numdocumento) { - this.numdocumento = numdocumento; - } - - public String getOpcional1() { - return opcional1; - } - - public void setOpcional1(String opcional1) { - this.opcional1 = opcional1; - } - - public String getOpcional2() { - return opcional2; - } - - public void setOpcional2(String opcional2) { - this.opcional2 = opcional2; - } - - public String getOpcional3() { - return opcional3; - } - - public void setOpcional3(String opcional3) { - this.opcional3 = opcional3; - } - - public BigDecimal getImporte1() { - return importe1; - } - - public void setImporte1(BigDecimal importe1) { - this.importe1 = importe1; - } - - public BigDecimal getImporte2() { - return importe2; - } - - public void setImporte2(BigDecimal importe2) { - this.importe2 = importe2; - } - - public Boolean getIndreplica() { - return indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Byte getNodoId() { - return nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public Caja getCaja() { - return caja; - } - - public void setCaja(Caja caja) { - this.caja = caja; - } - - public OCD getOcd() { - return ocd; - } - - public void setOcd(OCD ocd) { - this.ocd = ocd; - } - - public Integer getNotacreditovendapacoteId() { - return notacreditovendapacoteId; - } - - public void setNotacreditovendapacoteId(Integer notacreditovendapacoteId) { - this.notacreditovendapacoteId = notacreditovendapacoteId; - } - - public CajaTarjeta getCajaTarjetas() { - return cajaTarjetas; - } - - public void setCajaTarjetas(CajaTarjeta cajaTarjetas) { - this.cajaTarjetas = cajaTarjetas; - } - - public String getSerieSubSerie() { - return serieSubSerie; - } - - public void setSerieSubSerie(String serieSubSerie) { - this.serieSubSerie = serieSubSerie; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CAJA_DET_PAGO") +public class CajaDetPago implements java.io.Serializable { + + private static final long serialVersionUID = 7865266026539127982L; + + @Id + @Column(name = "CAJADETPAGO_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long cajaDetPagoId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CAJAFORMAPAGO_ID") + private CajaFormaPago cajaFormaPago; + + @Column(name = "NUMOPERACION", length = 36) + private String numoperacion; + + @OneToOne + @JoinColumn(name = "FORMAPAGO_ID") + private FormaPago formaPago; + + @Column(name = "NUMDOCUMENTO", length = 60) + private String numdocumento; + + @Column(name = "OPCIONAL1", length = 60) + private String opcional1; + + @Column(name = "OPCIONAL2", length = 60) + private String opcional2; + + @Column(name = "OPCIONAL3", length = 60) + private String opcional3; + + @Column(name = "IMPORTE1", precision = 8) + private BigDecimal importe1; + + @Column(name = "IMPORTE2", precision = 8) + private BigDecimal importe2; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @ManyToOne + @JoinColumn(name = "CAJA_ID") + private Caja caja; + + @ManyToOne + @JoinColumn(name = "OCD_ID") + private OCD ocd; + + @Column(name = "NOTACREDITOVENDAPACOTE_ID", precision = 7, scale = 0) + private Integer notacreditovendapacoteId; + + @OneToOne(mappedBy = "cajaDetPago") + private CajaTarjeta cajaTarjetas; + + @Column(name = "SERIESUBSERIE", length = 30) + private String serieSubSerie; + + public Long getCajaDetPagoId() { + return cajaDetPagoId; + } + + public void setCajaDetPagoId(Long cajaDetPagoId) { + this.cajaDetPagoId = cajaDetPagoId; + } + + public CajaFormaPago getCajaFormaPago() { + return cajaFormaPago; + } + + public void setCajaFormaPago(CajaFormaPago cajaFormaPago) { + this.cajaFormaPago = cajaFormaPago; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public FormaPago getFormaPago() { + return formaPago; + } + + public void setFormaPago(FormaPago formaPago) { + this.formaPago = formaPago; + } + + public String getNumdocumento() { + return numdocumento; + } + + public void setNumdocumento(String numdocumento) { + this.numdocumento = numdocumento; + } + + public String getOpcional1() { + return opcional1; + } + + public void setOpcional1(String opcional1) { + this.opcional1 = opcional1; + } + + public String getOpcional2() { + return opcional2; + } + + public void setOpcional2(String opcional2) { + this.opcional2 = opcional2; + } + + public String getOpcional3() { + return opcional3; + } + + public void setOpcional3(String opcional3) { + this.opcional3 = opcional3; + } + + public BigDecimal getImporte1() { + return importe1; + } + + public void setImporte1(BigDecimal importe1) { + this.importe1 = importe1; + } + + public BigDecimal getImporte2() { + return importe2; + } + + public void setImporte2(BigDecimal importe2) { + this.importe2 = importe2; + } + + public Boolean getIndreplica() { + return indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Byte getNodoId() { + return nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public Caja getCaja() { + return caja; + } + + public void setCaja(Caja caja) { + this.caja = caja; + } + + public OCD getOcd() { + return ocd; + } + + public void setOcd(OCD ocd) { + this.ocd = ocd; + } + + public Integer getNotacreditovendapacoteId() { + return notacreditovendapacoteId; + } + + public void setNotacreditovendapacoteId(Integer notacreditovendapacoteId) { + this.notacreditovendapacoteId = notacreditovendapacoteId; + } + + public CajaTarjeta getCajaTarjetas() { + return cajaTarjetas; + } + + public void setCajaTarjetas(CajaTarjeta cajaTarjetas) { + this.cajaTarjetas = cajaTarjetas; + } + + public String getSerieSubSerie() { + return serieSubSerie; + } + + public void setSerieSubSerie(String serieSubSerie) { + this.serieSubSerie = serieSubSerie; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CajaDiversos.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDiversos.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CajaDiversos.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDiversos.java index 25844a588..2ab056349 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CajaDiversos.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDiversos.java @@ -1,432 +1,432 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -@Entity -@Table(name = "CAJA_DIVERSOS") -public class CajaDiversos implements java.io.Serializable { - - private static final long serialVersionUID = -3120518309581568769L; - - @Id - @Column(name = "CAJADIVERSOS_ID", nullable = false, precision = 15, scale = 0) - private Long cajaDiversosId; - - @Column(name = "NUMOPERACION", length = 36) - private String numoperacion; - - @Column(name = "NUMOPERACIONDIVERSOS", length = 36) - private String numoperaciondiversos; - - @Column(name = "PRODUCTOSERVICIO_ID", precision = 7, scale = 0) - private Integer productoservicioId; - - @Column(name = "FECHORVTA", length = 7) - private Date fechorvta; - - @Column(name = "PRECIO", precision = 7) - private BigDecimal precio; - - @Column(name = "MONEDA_ID", precision = 7, scale = 0) - private Integer monedaId; - - @Column(name = "PARIDAD", precision = 7) - private BigDecimal paridad; - - @Column(name = "CARGOEXTRA", precision = 7) - private BigDecimal cargoextra; - - @Column(name = "NUMFOLIOPREIMPRESO", length = 36) - private String numfoliopreimpreso; - - @Column(name = "NUMSERIEPREIMPRESA", length = 30) - private String numseriepreimpresa; - - @Column(name = "NUMOPCIONAL1", precision = 15, scale = 0) - private Long numopcional1; - - @Column(name = "NUMOPCIONAL2", precision = 15, scale = 0) - private Long numopcional2; - - @Column(name = "DESCOPCIONAL1", length = 45) - private String descopcional1; - - @Column(name = "DESCOPCIONAL2", length = 45) - private String descopcional2; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "FECCORTE", length = 7) - private Date feccorte; - - @Column(name = "TURNO_ID", precision = 2, scale = 0) - private Byte turnoId; - - @Column(name = "INDCANCELACION", precision = 1, scale = 0) - private Boolean indcancelacion; - - @Column(name = "NUMFOLIOSISTEMA", length = 36) - private String numfoliosistema; - - @ManyToOne - @JoinColumn(name = "TIPOVENTA_ID") - private TipoVenta tipoVenta; - - @Column(name = "PUNTOVENTAREMOTO_ID", precision = 7, scale = 0) - private Integer puntoventaremotoId; - - @Column(name = "USUARIOREMOTO_ID", precision = 7, scale = 0) - private Integer usuarioremotoId; - - @Column(name = "ESTACION_ID", precision = 7, scale = 0) - private Integer estacionId; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @Column(name = "INDREIMPRESION", precision = 1, scale = 0) - private Boolean indreimpresion; - - @Column(name = "EVENTOEXTRA_ID", precision = 10, scale = 0) - private Long eventoextraId; - - @Column(name = "MOTIVOCANCELACION_ID", precision = 2, scale = 0) - private Byte motivocancelacionId; - - @Column(name = "FECINTEGRACION", length = 7) - private Date fecintegracion; - - @Column(name = "VENDAPACOTE_ID", precision = 7, scale = 0) - private Integer vendapacoteId; - - @Column(name = "FECHORVTA_H", length = 7) - private Date fechorvtaH; - - @ManyToOne - @JoinColumn(name = "NOTACREDITOVENDAPACOTE_ID", insertable = false, updatable = false) - private NotaCreditoVendaPacote notaCreditoVendaPacote; - - @OneToMany(mappedBy = "cajaDiversos") - private List cajaDiversosPagosList; - - public Long getCajaDiversosId() { - return cajaDiversosId; - } - - public void setCajaDiversosId(Long cajaDiversosId) { - this.cajaDiversosId = cajaDiversosId; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public String getNumoperaciondiversos() { - return numoperaciondiversos; - } - - public void setNumoperaciondiversos(String numoperaciondiversos) { - this.numoperaciondiversos = numoperaciondiversos; - } - - public Integer getProductoservicioId() { - return productoservicioId; - } - - public void setProductoservicioId(Integer productoservicioId) { - this.productoservicioId = productoservicioId; - } - - public Date getFechorvta() { - return fechorvta; - } - - public void setFechorvta(Date fechorvta) { - this.fechorvta = fechorvta; - } - - public BigDecimal getPrecio() { - return precio; - } - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - public Integer getMonedaId() { - return monedaId; - } - - public void setMonedaId(Integer monedaId) { - this.monedaId = monedaId; - } - - public BigDecimal getParidad() { - return paridad; - } - - public void setParidad(BigDecimal paridad) { - this.paridad = paridad; - } - - public BigDecimal getCargoextra() { - return cargoextra; - } - - public void setCargoextra(BigDecimal cargoextra) { - this.cargoextra = cargoextra; - } - - public String getNumfoliopreimpreso() { - return numfoliopreimpreso; - } - - public void setNumfoliopreimpreso(String numfoliopreimpreso) { - this.numfoliopreimpreso = numfoliopreimpreso; - } - - public String getNumseriepreimpresa() { - return numseriepreimpresa; - } - - public void setNumseriepreimpresa(String numseriepreimpresa) { - this.numseriepreimpresa = numseriepreimpresa; - } - - public Long getNumopcional1() { - return numopcional1; - } - - public void setNumopcional1(Long numopcional1) { - this.numopcional1 = numopcional1; - } - - public Long getNumopcional2() { - return numopcional2; - } - - public void setNumopcional2(Long numopcional2) { - this.numopcional2 = numopcional2; - } - - public String getDescopcional1() { - return descopcional1; - } - - public void setDescopcional1(String descopcional1) { - this.descopcional1 = descopcional1; - } - - public String getDescopcional2() { - return descopcional2; - } - - public void setDescopcional2(String descopcional2) { - this.descopcional2 = descopcional2; - } - - public Byte getNodoId() { - return nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public Boolean getIndreplica() { - return indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Date getFeccorte() { - return feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public Byte getTurnoId() { - return turnoId; - } - - public void setTurnoId(Byte turnoId) { - this.turnoId = turnoId; - } - - public Boolean getIndcancelacion() { - return indcancelacion; - } - - public void setIndcancelacion(Boolean indcancelacion) { - this.indcancelacion = indcancelacion; - } - - public String getNumfoliosistema() { - return numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public TipoVenta getTipoVenta() { - return tipoVenta; - } - - public void setTipoVenta(TipoVenta tipoVenta) { - this.tipoVenta = tipoVenta; - } - - public Integer getPuntoventaremotoId() { - return puntoventaremotoId; - } - - public void setPuntoventaremotoId(Integer puntoventaremotoId) { - this.puntoventaremotoId = puntoventaremotoId; - } - - public Integer getUsuarioremotoId() { - return usuarioremotoId; - } - - public void setUsuarioremotoId(Integer usuarioremotoId) { - this.usuarioremotoId = usuarioremotoId; - } - - public Integer getEstacionId() { - return estacionId; - } - - public void setEstacionId(Integer estacionId) { - this.estacionId = estacionId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Boolean getIndreimpresion() { - return indreimpresion; - } - - public void setIndreimpresion(Boolean indreimpresion) { - this.indreimpresion = indreimpresion; - } - - public Long getEventoextraId() { - return eventoextraId; - } - - public void setEventoextraId(Long eventoextraId) { - this.eventoextraId = eventoextraId; - } - - public Byte getMotivocancelacionId() { - return motivocancelacionId; - } - - public void setMotivocancelacionId(Byte motivocancelacionId) { - this.motivocancelacionId = motivocancelacionId; - } - - public Date getFecintegracion() { - return fecintegracion; - } - - public void setFecintegracion(Date fecintegracion) { - this.fecintegracion = fecintegracion; - } - - public Integer getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Integer vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - public Date getFechorvtaH() { - return fechorvtaH; - } - - public void setFechorvtaH(Date fechorvtaH) { - this.fechorvtaH = fechorvtaH; - } - - public NotaCreditoVendaPacote getNotaCreditoVendaPacote() { - return notaCreditoVendaPacote; - } - - public void setNotaCreditoVendaPacote(NotaCreditoVendaPacote notaCreditoVendaPacote) { - this.notaCreditoVendaPacote = notaCreditoVendaPacote; - } - - public List getCajaDiversosPagosList() { - return cajaDiversosPagosList; - } - - public void setCajaDiversosPagosList(List listCajaDiversosPagos) { - this.cajaDiversosPagosList = listCajaDiversosPagos; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +@Entity +@Table(name = "CAJA_DIVERSOS") +public class CajaDiversos implements java.io.Serializable { + + private static final long serialVersionUID = -3120518309581568769L; + + @Id + @Column(name = "CAJADIVERSOS_ID", nullable = false, precision = 15, scale = 0) + private Long cajaDiversosId; + + @Column(name = "NUMOPERACION", length = 36) + private String numoperacion; + + @Column(name = "NUMOPERACIONDIVERSOS", length = 36) + private String numoperaciondiversos; + + @Column(name = "PRODUCTOSERVICIO_ID", precision = 7, scale = 0) + private Integer productoservicioId; + + @Column(name = "FECHORVTA", length = 7) + private Date fechorvta; + + @Column(name = "PRECIO", precision = 7) + private BigDecimal precio; + + @Column(name = "MONEDA_ID", precision = 7, scale = 0) + private Integer monedaId; + + @Column(name = "PARIDAD", precision = 7) + private BigDecimal paridad; + + @Column(name = "CARGOEXTRA", precision = 7) + private BigDecimal cargoextra; + + @Column(name = "NUMFOLIOPREIMPRESO", length = 36) + private String numfoliopreimpreso; + + @Column(name = "NUMSERIEPREIMPRESA", length = 30) + private String numseriepreimpresa; + + @Column(name = "NUMOPCIONAL1", precision = 15, scale = 0) + private Long numopcional1; + + @Column(name = "NUMOPCIONAL2", precision = 15, scale = 0) + private Long numopcional2; + + @Column(name = "DESCOPCIONAL1", length = 45) + private String descopcional1; + + @Column(name = "DESCOPCIONAL2", length = 45) + private String descopcional2; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "FECCORTE", length = 7) + private Date feccorte; + + @Column(name = "TURNO_ID", precision = 2, scale = 0) + private Byte turnoId; + + @Column(name = "INDCANCELACION", precision = 1, scale = 0) + private Boolean indcancelacion; + + @Column(name = "NUMFOLIOSISTEMA", length = 36) + private String numfoliosistema; + + @ManyToOne + @JoinColumn(name = "TIPOVENTA_ID") + private TipoVenta tipoVenta; + + @Column(name = "PUNTOVENTAREMOTO_ID", precision = 7, scale = 0) + private Integer puntoventaremotoId; + + @Column(name = "USUARIOREMOTO_ID", precision = 7, scale = 0) + private Integer usuarioremotoId; + + @Column(name = "ESTACION_ID", precision = 7, scale = 0) + private Integer estacionId; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @Column(name = "INDREIMPRESION", precision = 1, scale = 0) + private Boolean indreimpresion; + + @Column(name = "EVENTOEXTRA_ID", precision = 10, scale = 0) + private Long eventoextraId; + + @Column(name = "MOTIVOCANCELACION_ID", precision = 2, scale = 0) + private Byte motivocancelacionId; + + @Column(name = "FECINTEGRACION", length = 7) + private Date fecintegracion; + + @Column(name = "VENDAPACOTE_ID", precision = 7, scale = 0) + private Integer vendapacoteId; + + @Column(name = "FECHORVTA_H", length = 7) + private Date fechorvtaH; + + @ManyToOne + @JoinColumn(name = "NOTACREDITOVENDAPACOTE_ID", insertable = false, updatable = false) + private NotaCreditoVendaPacote notaCreditoVendaPacote; + + @OneToMany(mappedBy = "cajaDiversos") + private List cajaDiversosPagosList; + + public Long getCajaDiversosId() { + return cajaDiversosId; + } + + public void setCajaDiversosId(Long cajaDiversosId) { + this.cajaDiversosId = cajaDiversosId; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public String getNumoperaciondiversos() { + return numoperaciondiversos; + } + + public void setNumoperaciondiversos(String numoperaciondiversos) { + this.numoperaciondiversos = numoperaciondiversos; + } + + public Integer getProductoservicioId() { + return productoservicioId; + } + + public void setProductoservicioId(Integer productoservicioId) { + this.productoservicioId = productoservicioId; + } + + public Date getFechorvta() { + return fechorvta; + } + + public void setFechorvta(Date fechorvta) { + this.fechorvta = fechorvta; + } + + public BigDecimal getPrecio() { + return precio; + } + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + public Integer getMonedaId() { + return monedaId; + } + + public void setMonedaId(Integer monedaId) { + this.monedaId = monedaId; + } + + public BigDecimal getParidad() { + return paridad; + } + + public void setParidad(BigDecimal paridad) { + this.paridad = paridad; + } + + public BigDecimal getCargoextra() { + return cargoextra; + } + + public void setCargoextra(BigDecimal cargoextra) { + this.cargoextra = cargoextra; + } + + public String getNumfoliopreimpreso() { + return numfoliopreimpreso; + } + + public void setNumfoliopreimpreso(String numfoliopreimpreso) { + this.numfoliopreimpreso = numfoliopreimpreso; + } + + public String getNumseriepreimpresa() { + return numseriepreimpresa; + } + + public void setNumseriepreimpresa(String numseriepreimpresa) { + this.numseriepreimpresa = numseriepreimpresa; + } + + public Long getNumopcional1() { + return numopcional1; + } + + public void setNumopcional1(Long numopcional1) { + this.numopcional1 = numopcional1; + } + + public Long getNumopcional2() { + return numopcional2; + } + + public void setNumopcional2(Long numopcional2) { + this.numopcional2 = numopcional2; + } + + public String getDescopcional1() { + return descopcional1; + } + + public void setDescopcional1(String descopcional1) { + this.descopcional1 = descopcional1; + } + + public String getDescopcional2() { + return descopcional2; + } + + public void setDescopcional2(String descopcional2) { + this.descopcional2 = descopcional2; + } + + public Byte getNodoId() { + return nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public Boolean getIndreplica() { + return indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Date getFeccorte() { + return feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public Byte getTurnoId() { + return turnoId; + } + + public void setTurnoId(Byte turnoId) { + this.turnoId = turnoId; + } + + public Boolean getIndcancelacion() { + return indcancelacion; + } + + public void setIndcancelacion(Boolean indcancelacion) { + this.indcancelacion = indcancelacion; + } + + public String getNumfoliosistema() { + return numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public TipoVenta getTipoVenta() { + return tipoVenta; + } + + public void setTipoVenta(TipoVenta tipoVenta) { + this.tipoVenta = tipoVenta; + } + + public Integer getPuntoventaremotoId() { + return puntoventaremotoId; + } + + public void setPuntoventaremotoId(Integer puntoventaremotoId) { + this.puntoventaremotoId = puntoventaremotoId; + } + + public Integer getUsuarioremotoId() { + return usuarioremotoId; + } + + public void setUsuarioremotoId(Integer usuarioremotoId) { + this.usuarioremotoId = usuarioremotoId; + } + + public Integer getEstacionId() { + return estacionId; + } + + public void setEstacionId(Integer estacionId) { + this.estacionId = estacionId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Boolean getIndreimpresion() { + return indreimpresion; + } + + public void setIndreimpresion(Boolean indreimpresion) { + this.indreimpresion = indreimpresion; + } + + public Long getEventoextraId() { + return eventoextraId; + } + + public void setEventoextraId(Long eventoextraId) { + this.eventoextraId = eventoextraId; + } + + public Byte getMotivocancelacionId() { + return motivocancelacionId; + } + + public void setMotivocancelacionId(Byte motivocancelacionId) { + this.motivocancelacionId = motivocancelacionId; + } + + public Date getFecintegracion() { + return fecintegracion; + } + + public void setFecintegracion(Date fecintegracion) { + this.fecintegracion = fecintegracion; + } + + public Integer getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Integer vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + public Date getFechorvtaH() { + return fechorvtaH; + } + + public void setFechorvtaH(Date fechorvtaH) { + this.fechorvtaH = fechorvtaH; + } + + public NotaCreditoVendaPacote getNotaCreditoVendaPacote() { + return notaCreditoVendaPacote; + } + + public void setNotaCreditoVendaPacote(NotaCreditoVendaPacote notaCreditoVendaPacote) { + this.notaCreditoVendaPacote = notaCreditoVendaPacote; + } + + public List getCajaDiversosPagosList() { + return cajaDiversosPagosList; + } + + public void setCajaDiversosPagosList(List listCajaDiversosPagos) { + this.cajaDiversosPagosList = listCajaDiversosPagos; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CajaDiversosPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDiversosPago.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CajaDiversosPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDiversosPago.java index c0f1a9a49..8c859a87e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CajaDiversosPago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaDiversosPago.java @@ -1,136 +1,136 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CAJA_DIVERSOS_PAGO") -public class CajaDiversosPago implements java.io.Serializable { - - private static final long serialVersionUID = 591550428860169139L; - - @Id - @Column(name = "CAJADIVERSOSPAGO_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long cajaDiversosPagoId; - - @ManyToOne - @JoinColumn(name = "CAJATARJETA_ID") - private CajaTarjeta cajaTarjeta; - - @ManyToOne - @JoinColumn(name = "CAJADIVERSOS_ID") - private CajaDiversos cajaDiversos; - - @ManyToOne - @JoinColumn(name = "FORMAPAGO_ID") - private FormaPago formaPago; - - @Column(name = "IMPORTE", precision = 7) - private BigDecimal importe; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - public Long getCajaDiversosPagoId() { - return cajaDiversosPagoId; - } - - public void setCajaDiversosPagoId(Long cajaDiversosPagoId) { - this.cajaDiversosPagoId = cajaDiversosPagoId; - } - - public CajaTarjeta getCajaTarjeta() { - return cajaTarjeta; - } - - public void setCajaTarjeta(CajaTarjeta cajaTarjeta) { - this.cajaTarjeta = cajaTarjeta; - } - - public CajaDiversos getCajaDiversos() { - return cajaDiversos; - } - - public void setCajaDiversos(CajaDiversos cajaDiversos) { - this.cajaDiversos = cajaDiversos; - } - - public FormaPago getFormaPago() { - return formaPago; - } - - public void setFormaPago(FormaPago formaPago) { - this.formaPago = formaPago; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public Byte getNodoId() { - return nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public Boolean getIndreplica() { - return indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CAJA_DIVERSOS_PAGO") +public class CajaDiversosPago implements java.io.Serializable { + + private static final long serialVersionUID = 591550428860169139L; + + @Id + @Column(name = "CAJADIVERSOSPAGO_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long cajaDiversosPagoId; + + @ManyToOne + @JoinColumn(name = "CAJATARJETA_ID") + private CajaTarjeta cajaTarjeta; + + @ManyToOne + @JoinColumn(name = "CAJADIVERSOS_ID") + private CajaDiversos cajaDiversos; + + @ManyToOne + @JoinColumn(name = "FORMAPAGO_ID") + private FormaPago formaPago; + + @Column(name = "IMPORTE", precision = 7) + private BigDecimal importe; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + public Long getCajaDiversosPagoId() { + return cajaDiversosPagoId; + } + + public void setCajaDiversosPagoId(Long cajaDiversosPagoId) { + this.cajaDiversosPagoId = cajaDiversosPagoId; + } + + public CajaTarjeta getCajaTarjeta() { + return cajaTarjeta; + } + + public void setCajaTarjeta(CajaTarjeta cajaTarjeta) { + this.cajaTarjeta = cajaTarjeta; + } + + public CajaDiversos getCajaDiversos() { + return cajaDiversos; + } + + public void setCajaDiversos(CajaDiversos cajaDiversos) { + this.cajaDiversos = cajaDiversos; + } + + public FormaPago getFormaPago() { + return formaPago; + } + + public void setFormaPago(FormaPago formaPago) { + this.formaPago = formaPago; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public Byte getNodoId() { + return nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public Boolean getIndreplica() { + return indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CajaFormaPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaFormaPago.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CajaFormaPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaFormaPago.java index 830180380..a3fc2082c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CajaFormaPago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaFormaPago.java @@ -1,136 +1,136 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CAJA_FORMAPAGO") -public class CajaFormaPago implements java.io.Serializable { - - private static final long serialVersionUID = -2927885703968812837L; - - @Id - @Column(name = "CAJAFORMAPAGO_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long cajaFormaPagoId; - - @ManyToOne - @JoinColumn(name = "CAJA_ID") - private Caja caja; - - @ManyToOne - @JoinColumn(name = "FORMAPAGO_ID") - private FormaPago formapago; - - @Column(name = "IMPORTE", precision = 8) - private BigDecimal importe; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @OneToOne(mappedBy = "cajaFormaPago") - private CajaDetPago cajaDetPago; - - public Long getCajaFormaPagoId() { - return cajaFormaPagoId; - } - - public void setCajaFormaPagoId(Long cajaFormaPagoId) { - this.cajaFormaPagoId = cajaFormaPagoId; - } - - public Caja getCaja() { - return caja; - } - - public void setCaja(Caja caja) { - this.caja = caja; - } - - public FormaPago getFormapago() { - return formapago; - } - - public void setFormapago(FormaPago formapago) { - this.formapago = formapago; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public Boolean getIndreplica() { - return indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Byte getNodoId() { - return nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public CajaDetPago getCajaDetPago() { - return cajaDetPago; - } - - public void setCajaDetPago(CajaDetPago cajaDetPago) { - this.cajaDetPago = cajaDetPago; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CAJA_FORMAPAGO") +public class CajaFormaPago implements java.io.Serializable { + + private static final long serialVersionUID = -2927885703968812837L; + + @Id + @Column(name = "CAJAFORMAPAGO_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long cajaFormaPagoId; + + @ManyToOne + @JoinColumn(name = "CAJA_ID") + private Caja caja; + + @ManyToOne + @JoinColumn(name = "FORMAPAGO_ID") + private FormaPago formapago; + + @Column(name = "IMPORTE", precision = 8) + private BigDecimal importe; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @OneToOne(mappedBy = "cajaFormaPago") + private CajaDetPago cajaDetPago; + + public Long getCajaFormaPagoId() { + return cajaFormaPagoId; + } + + public void setCajaFormaPagoId(Long cajaFormaPagoId) { + this.cajaFormaPagoId = cajaFormaPagoId; + } + + public Caja getCaja() { + return caja; + } + + public void setCaja(Caja caja) { + this.caja = caja; + } + + public FormaPago getFormapago() { + return formapago; + } + + public void setFormapago(FormaPago formapago) { + this.formapago = formapago; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public Boolean getIndreplica() { + return indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Byte getNodoId() { + return nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public CajaDetPago getCajaDetPago() { + return cajaDetPago; + } + + public void setCajaDetPago(CajaDetPago cajaDetPago) { + this.cajaDetPago = cajaDetPago; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CajaTarjeta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaTarjeta.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CajaTarjeta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaTarjeta.java index c04cb8eb3..29301f309 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CajaTarjeta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CajaTarjeta.java @@ -1,260 +1,260 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.sql.Clob; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CAJA_TARJETA") -public class CajaTarjeta implements java.io.Serializable { - - private static final long serialVersionUID = 5807160178691935393L; - - @Id - @Column(name = "CAJATARJETA_ID", unique = true, nullable = false, precision = 10, scale = 0) - private Long cajaTarjetaId; - - @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CAJADETPAGO_ID") - private CajaDetPago cajaDetPago; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CAJADIVERSOSPAGO_ID") - private CajaDiversosPago cajaDiversosPago; - - @Column(name = "NOMBTITULAR", length = 180) - private String nombtitular; - - @Column(name = "TIPOTARJETA", length = 66) - private String tipotarjeta; - - @Column(name = "NUMTARJETA", length = 48) - private String numtarjeta; - - @Column(name = "NUMAUTORIZACION", length = 45) - private String numautorizacion; - - @Column(name = "INDREPLICA", precision = 1, scale = 0) - private Boolean indreplica; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "NODO_ID", precision = 2, scale = 0) - private Byte nodoId; - - @Column(name = "DESCOPERACION", length = 90) - private String descoperacion; - - @Temporal(TemporalType.DATE) - @Column(name = "FECOPERACION", length = 7) - private Date fecoperacion; - - @Column(name = "VOUCHERCLIENTE") - private Clob vouchercliente; - - @Column(name = "VOUCHERCOMERCIO") - private Clob vouchercomercio; - - @Column(name = "NSU", length = 45) - private String nsu; - - @Column(name = "NSUHOST", length = 45) - private String nsuhost; - - @Column(name = "IMPORTE", precision = 11) - private BigDecimal importe; - - @Column(name = "CANTPARCELAS", precision = 2, scale = 0) - private Byte cantparcelas; - - @Column(name = "DESCOPERADORACARTAO", length = 50) - private String descoperadoracartao; - - public Long getCajaTarjetaId() { - return cajaTarjetaId; - } - - public void setCajaTarjetaId(Long cajaTarjetaId) { - this.cajaTarjetaId = cajaTarjetaId; - } - - public CajaDetPago getCajaDetPago() { - return cajaDetPago; - } - - public void setCajaDetPago(CajaDetPago cajaDetPago) { - this.cajaDetPago = cajaDetPago; - } - - public CajaDiversosPago getCajaDiversosPago() { - return cajaDiversosPago; - } - - public void setCajaDiversosPago(CajaDiversosPago cajaDiversosPago) { - this.cajaDiversosPago = cajaDiversosPago; - } - - public String getNombtitular() { - return nombtitular; - } - - public void setNombtitular(String nombtitular) { - this.nombtitular = nombtitular; - } - - public String getTipotarjeta() { - return tipotarjeta; - } - - public void setTipotarjeta(String tipotarjeta) { - this.tipotarjeta = tipotarjeta; - } - - public String getNumtarjeta() { - return numtarjeta; - } - - public void setNumtarjeta(String numtarjeta) { - this.numtarjeta = numtarjeta; - } - - public String getNumautorizacion() { - return numautorizacion; - } - - public void setNumautorizacion(String numautorizacion) { - this.numautorizacion = numautorizacion; - } - - public Boolean getIndreplica() { - return indreplica; - } - - public void setIndreplica(Boolean indreplica) { - this.indreplica = indreplica; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Byte getNodoId() { - return nodoId; - } - - public void setNodoId(Byte nodoId) { - this.nodoId = nodoId; - } - - public String getDescoperacion() { - return descoperacion; - } - - public void setDescoperacion(String descoperacion) { - this.descoperacion = descoperacion; - } - - public Date getFecoperacion() { - return fecoperacion; - } - - public void setFecoperacion(Date fecoperacion) { - this.fecoperacion = fecoperacion; - } - - public Clob getVouchercliente() { - return vouchercliente; - } - - public void setVouchercliente(Clob vouchercliente) { - this.vouchercliente = vouchercliente; - } - - public Clob getVouchercomercio() { - return vouchercomercio; - } - - public void setVouchercomercio(Clob vouchercomercio) { - this.vouchercomercio = vouchercomercio; - } - - public String getNsu() { - return nsu; - } - - public void setNsu(String nsu) { - this.nsu = nsu; - } - - public String getNsuhost() { - return nsuhost; - } - - public void setNsuhost(String nsuhost) { - this.nsuhost = nsuhost; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public Byte getCantparcelas() { - return cantparcelas; - } - - public void setCantparcelas(Byte cantparcelas) { - this.cantparcelas = cantparcelas; - } - - public String getDescoperadoracartao() { - return descoperadoracartao; - } - - public void setDescoperadoracartao(String descoperadoracartao) { - this.descoperadoracartao = descoperadoracartao; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.sql.Clob; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CAJA_TARJETA") +public class CajaTarjeta implements java.io.Serializable { + + private static final long serialVersionUID = 5807160178691935393L; + + @Id + @Column(name = "CAJATARJETA_ID", unique = true, nullable = false, precision = 10, scale = 0) + private Long cajaTarjetaId; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CAJADETPAGO_ID") + private CajaDetPago cajaDetPago; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CAJADIVERSOSPAGO_ID") + private CajaDiversosPago cajaDiversosPago; + + @Column(name = "NOMBTITULAR", length = 180) + private String nombtitular; + + @Column(name = "TIPOTARJETA", length = 66) + private String tipotarjeta; + + @Column(name = "NUMTARJETA", length = 48) + private String numtarjeta; + + @Column(name = "NUMAUTORIZACION", length = 45) + private String numautorizacion; + + @Column(name = "INDREPLICA", precision = 1, scale = 0) + private Boolean indreplica; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "NODO_ID", precision = 2, scale = 0) + private Byte nodoId; + + @Column(name = "DESCOPERACION", length = 90) + private String descoperacion; + + @Temporal(TemporalType.DATE) + @Column(name = "FECOPERACION", length = 7) + private Date fecoperacion; + + @Column(name = "VOUCHERCLIENTE") + private Clob vouchercliente; + + @Column(name = "VOUCHERCOMERCIO") + private Clob vouchercomercio; + + @Column(name = "NSU", length = 45) + private String nsu; + + @Column(name = "NSUHOST", length = 45) + private String nsuhost; + + @Column(name = "IMPORTE", precision = 11) + private BigDecimal importe; + + @Column(name = "CANTPARCELAS", precision = 2, scale = 0) + private Byte cantparcelas; + + @Column(name = "DESCOPERADORACARTAO", length = 50) + private String descoperadoracartao; + + public Long getCajaTarjetaId() { + return cajaTarjetaId; + } + + public void setCajaTarjetaId(Long cajaTarjetaId) { + this.cajaTarjetaId = cajaTarjetaId; + } + + public CajaDetPago getCajaDetPago() { + return cajaDetPago; + } + + public void setCajaDetPago(CajaDetPago cajaDetPago) { + this.cajaDetPago = cajaDetPago; + } + + public CajaDiversosPago getCajaDiversosPago() { + return cajaDiversosPago; + } + + public void setCajaDiversosPago(CajaDiversosPago cajaDiversosPago) { + this.cajaDiversosPago = cajaDiversosPago; + } + + public String getNombtitular() { + return nombtitular; + } + + public void setNombtitular(String nombtitular) { + this.nombtitular = nombtitular; + } + + public String getTipotarjeta() { + return tipotarjeta; + } + + public void setTipotarjeta(String tipotarjeta) { + this.tipotarjeta = tipotarjeta; + } + + public String getNumtarjeta() { + return numtarjeta; + } + + public void setNumtarjeta(String numtarjeta) { + this.numtarjeta = numtarjeta; + } + + public String getNumautorizacion() { + return numautorizacion; + } + + public void setNumautorizacion(String numautorizacion) { + this.numautorizacion = numautorizacion; + } + + public Boolean getIndreplica() { + return indreplica; + } + + public void setIndreplica(Boolean indreplica) { + this.indreplica = indreplica; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Byte getNodoId() { + return nodoId; + } + + public void setNodoId(Byte nodoId) { + this.nodoId = nodoId; + } + + public String getDescoperacion() { + return descoperacion; + } + + public void setDescoperacion(String descoperacion) { + this.descoperacion = descoperacion; + } + + public Date getFecoperacion() { + return fecoperacion; + } + + public void setFecoperacion(Date fecoperacion) { + this.fecoperacion = fecoperacion; + } + + public Clob getVouchercliente() { + return vouchercliente; + } + + public void setVouchercliente(Clob vouchercliente) { + this.vouchercliente = vouchercliente; + } + + public Clob getVouchercomercio() { + return vouchercomercio; + } + + public void setVouchercomercio(Clob vouchercomercio) { + this.vouchercomercio = vouchercomercio; + } + + public String getNsu() { + return nsu; + } + + public void setNsu(String nsu) { + this.nsu = nsu; + } + + public String getNsuhost() { + return nsuhost; + } + + public void setNsuhost(String nsuhost) { + this.nsuhost = nsuhost; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public Byte getCantparcelas() { + return cantparcelas; + } + + public void setCantparcelas(Byte cantparcelas) { + this.cantparcelas = cantparcelas; + } + + public String getDescoperadoracartao() { + return descoperadoracartao; + } + + public void setDescoperadoracartao(String descoperadoracartao) { + this.descoperadoracartao = descoperadoracartao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CampanhaCupomSorteado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CampanhaCupomSorteado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CampanhaCupomSorteado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CampanhaCupomSorteado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CancelacionCargo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CancelacionCargo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CancelacionCargo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CancelacionCargo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CancelacionCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CancelacionCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CancelacionCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CancelacionCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CasetaPeaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CasetaPeaje.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CasetaPeaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CasetaPeaje.java index d35981357..04a636e97 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CasetaPeaje.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CasetaPeaje.java @@ -1,172 +1,172 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; -import org.hibernate.annotations.Where; - -@Entity -@SequenceGenerator(name = "CASETA_PEAJE_SEQ", sequenceName = "CASETA_PEAJE_SEQ", allocationSize = 1) -@Table(name = "CASETA_PEAJE") -public class CasetaPeaje implements Serializable, Comparable, Cloneable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CASETA_PEAJE_SEQ") - @Column(name = "CASETAPEAJE_ID") - private Integer casetaPeajeId; - @Column(name = "DESCCASETA") - private String desccaseta; - @Column(name = "IMPORTEIDA") - private BigDecimal importeIda; - @Column(name = "IMPORTEVUELTA") - private BigDecimal importeVuelta; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToMany(mappedBy = "casetaPeaje", fetch=FetchType.EAGER, cascade=CascadeType.ALL) - @Where(clause="ACTIVO=1") - @Fetch(value = FetchMode.SELECT) - private List lsCasetaPeajeExcepcion = new ArrayList(); - @ManyToMany(fetch=FetchType.EAGER) - @JoinTable(name = "RUTA_CASETA", joinColumns = { @JoinColumn(name = "CASETAPEAJE_ID") }, - inverseJoinColumns = { @JoinColumn(name = "RUTASECUENCIA_ID") }) - private List lsRutaSecuencia; - - @OneToMany(mappedBy = "pracaPedagioId", cascade=CascadeType.ALL) - @LazyCollection(LazyCollectionOption.FALSE) - @Where(clause="ACTIVO=1") - private List lsPrecoFixoPedagio; - - - @Override - public int hashCode() { - int hash = 0; - hash += casetaPeajeId != null ? casetaPeajeId.hashCode() : 0; - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof CasetaPeaje)) { - return false; - } - CasetaPeaje other = (CasetaPeaje) object; - if ((this.casetaPeajeId == null && other.casetaPeajeId != null) || (this.casetaPeajeId != null && !this.casetaPeajeId.equals(other.casetaPeajeId))) { - return false; - } - return true; - } - - public CasetaPeaje(){ - lsRutaSecuencia = new ArrayList(); - } - - public Integer getCasetaPeajeId() { - return casetaPeajeId; - } - public void setCasetaPeajeId(Integer casetaPeajeId) { - this.casetaPeajeId = casetaPeajeId; - } - public String getDesccaseta() { - return desccaseta; - } - public void setDesccaseta(String desccaseta) { - this.desccaseta = desccaseta; - } - public BigDecimal getImporteIda() { - return importeIda; - } - public void setImporteIda(BigDecimal importeIda) { - this.importeIda = importeIda; - } - public BigDecimal getImporteVuelta() { - return importeVuelta; - } - public void setImporteVuelta(BigDecimal importeVuelta) { - this.importeVuelta = importeVuelta; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return getCasetaPeajeId() + " - " +getDesccaseta(); - } - - @Override - public int compareTo(CasetaPeaje caseta) { - return this.getDesccaseta().compareTo(caseta.getDesccaseta()); - } - - public List getLsRutaSecuencia() { - return lsRutaSecuencia; - } - - public void setLsRutaSecuencia(List lsRutaSecuencia) { - this.lsRutaSecuencia = lsRutaSecuencia; - } - - public List getLsCasetaPeajeExcepcion() { - return lsCasetaPeajeExcepcion; - } - - public void setLsCasetaPeajeExcepcion(List lsCasetaPeajeExcepcion) { - this.lsCasetaPeajeExcepcion = lsCasetaPeajeExcepcion; - } - - public List getLsPrecoFixoPedagio() { - return lsPrecoFixoPedagio; - } - - public void setLsPrecoFixoPedagio(List lsPrecoFixoPedagio) { - this.lsPrecoFixoPedagio = lsPrecoFixoPedagio; - } - - +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; +import org.hibernate.annotations.Where; + +@Entity +@SequenceGenerator(name = "CASETA_PEAJE_SEQ", sequenceName = "CASETA_PEAJE_SEQ", allocationSize = 1) +@Table(name = "CASETA_PEAJE") +public class CasetaPeaje implements Serializable, Comparable, Cloneable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CASETA_PEAJE_SEQ") + @Column(name = "CASETAPEAJE_ID") + private Integer casetaPeajeId; + @Column(name = "DESCCASETA") + private String desccaseta; + @Column(name = "IMPORTEIDA") + private BigDecimal importeIda; + @Column(name = "IMPORTEVUELTA") + private BigDecimal importeVuelta; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToMany(mappedBy = "casetaPeaje", fetch=FetchType.EAGER, cascade=CascadeType.ALL) + @Where(clause="ACTIVO=1") + @Fetch(value = FetchMode.SELECT) + private List lsCasetaPeajeExcepcion = new ArrayList(); + @ManyToMany(fetch=FetchType.EAGER) + @JoinTable(name = "RUTA_CASETA", joinColumns = { @JoinColumn(name = "CASETAPEAJE_ID") }, + inverseJoinColumns = { @JoinColumn(name = "RUTASECUENCIA_ID") }) + private List lsRutaSecuencia; + + @OneToMany(mappedBy = "pracaPedagioId", cascade=CascadeType.ALL) + @LazyCollection(LazyCollectionOption.FALSE) + @Where(clause="ACTIVO=1") + private List lsPrecoFixoPedagio; + + + @Override + public int hashCode() { + int hash = 0; + hash += casetaPeajeId != null ? casetaPeajeId.hashCode() : 0; + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof CasetaPeaje)) { + return false; + } + CasetaPeaje other = (CasetaPeaje) object; + if ((this.casetaPeajeId == null && other.casetaPeajeId != null) || (this.casetaPeajeId != null && !this.casetaPeajeId.equals(other.casetaPeajeId))) { + return false; + } + return true; + } + + public CasetaPeaje(){ + lsRutaSecuencia = new ArrayList(); + } + + public Integer getCasetaPeajeId() { + return casetaPeajeId; + } + public void setCasetaPeajeId(Integer casetaPeajeId) { + this.casetaPeajeId = casetaPeajeId; + } + public String getDesccaseta() { + return desccaseta; + } + public void setDesccaseta(String desccaseta) { + this.desccaseta = desccaseta; + } + public BigDecimal getImporteIda() { + return importeIda; + } + public void setImporteIda(BigDecimal importeIda) { + this.importeIda = importeIda; + } + public BigDecimal getImporteVuelta() { + return importeVuelta; + } + public void setImporteVuelta(BigDecimal importeVuelta) { + this.importeVuelta = importeVuelta; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return getCasetaPeajeId() + " - " +getDesccaseta(); + } + + @Override + public int compareTo(CasetaPeaje caseta) { + return this.getDesccaseta().compareTo(caseta.getDesccaseta()); + } + + public List getLsRutaSecuencia() { + return lsRutaSecuencia; + } + + public void setLsRutaSecuencia(List lsRutaSecuencia) { + this.lsRutaSecuencia = lsRutaSecuencia; + } + + public List getLsCasetaPeajeExcepcion() { + return lsCasetaPeajeExcepcion; + } + + public void setLsCasetaPeajeExcepcion(List lsCasetaPeajeExcepcion) { + this.lsCasetaPeajeExcepcion = lsCasetaPeajeExcepcion; + } + + public List getLsPrecoFixoPedagio() { + return lsPrecoFixoPedagio; + } + + public void setLsPrecoFixoPedagio(List lsPrecoFixoPedagio) { + this.lsPrecoFixoPedagio = lsPrecoFixoPedagio; + } + + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/CasetaPeajeExcepcion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CasetaPeajeExcepcion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CasetaPeajeExcepcion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CasetaPeajeExcepcion.java index ca5b3b1bd..4bef61b57 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CasetaPeajeExcepcion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CasetaPeajeExcepcion.java @@ -1,203 +1,203 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CASETA_PEAJE_EXCEPCION_SEQ", sequenceName = "CASETA_PEAJE_EXCEPCION_SEQ", allocationSize = 1) -@Table(name = "CASETA_PEAJE_EXCEPCION") -public class CasetaPeajeExcepcion implements Serializable, Comparable { - -private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @Column(name = "CASETAPEAJEEXCEPCION_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CASETA_PEAJE_EXCEPCION_SEQ") - private Integer casetaPeajeExcepcionId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @ManyToOne - @JoinColumn(name = "CASETAPEAJE_ID" , referencedColumnName = "CASETAPEAJE_ID") - private CasetaPeaje casetaPeaje; - @Column(name = "FECHAVENTAINI") - @Temporal(TemporalType.TIMESTAMP) - private java.util.Date fecVentaIni; - @Column(name = "FECHAVENTAFIN") - @Temporal(TemporalType.TIMESTAMP) - private java.util.Date fecVentaFin; - @Column(name = "FECHORINICIO") - @Temporal(TemporalType.TIME) - private Date horaIni; - @Column(name = "FECHORFINAL") - @Temporal(TemporalType.TIME) - private Date horaFin; - @Column(name = "INDLUNES") - private Boolean INDLUNES; - @Column(name = "INDMARTES") - private Boolean INDMARTES; - @Column(name = "INDMIERCOLES") - private Boolean INDMIERCOLES; - @Column(name = "INDJUEVES") - private Boolean INDJUEVES; - @Column(name = "INDVIERNES") - private Boolean INDVIERNES; - @Column(name = "INDSABADO") - private Boolean INDSABADO; - @Column(name = "INDDOMINGO") - private Boolean INDDOMINGO; - @Column(name = "PRECIO") - private BigDecimal precio; - - - public Integer getCasetaPeajeExcepcionId() { - return casetaPeajeExcepcionId; - } - public void setCasetaPeajeExcepcionId(Integer casetaPeajeExcepcionId) { - this.casetaPeajeExcepcionId = casetaPeajeExcepcionId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public CasetaPeaje getCasetaPeaje() { - return casetaPeaje; - } - public void setCasetaPeaje(CasetaPeaje casetaPeaje) { - this.casetaPeaje = casetaPeaje; - } - public java.util.Date getFecVentaIni() { - return fecVentaIni; - } - public void setFecVentaIni(java.util.Date fecVentaIni) { - this.fecVentaIni = fecVentaIni; - } - public java.util.Date getFecVentaFin() { - return fecVentaFin; - } - public void setFecVentaFin(java.util.Date fecVentaFin) { - this.fecVentaFin = fecVentaFin; - } - public Date getHoraIni() { - return horaIni; - } - public void setHoraIni(Date horaIni) { - this.horaIni = horaIni; - } - public Date getHoraFin() { - return horaFin; - } - public void setHoraFin(Date horaFin) { - this.horaFin = horaFin; - } - public Boolean getINDLUNES() { - return INDLUNES; - } - public void setINDLUNES(Boolean iNDLUNES) { - INDLUNES = iNDLUNES; - } - public Boolean getINDMARTES() { - return INDMARTES; - } - public void setINDMARTES(Boolean iNDMARTES) { - INDMARTES = iNDMARTES; - } - public Boolean getINDMIERCOLES() { - return INDMIERCOLES; - } - public void setINDMIERCOLES(Boolean iNDMIERCOLES) { - INDMIERCOLES = iNDMIERCOLES; - } - public Boolean getINDJUEVES() { - return INDJUEVES; - } - public void setINDJUEVES(Boolean iNDJUEVES) { - INDJUEVES = iNDJUEVES; - } - public Boolean getINDVIERNES() { - return INDVIERNES; - } - public void setINDVIERNES(Boolean iNDVIERNES) { - INDVIERNES = iNDVIERNES; - } - public Boolean getINDSABADO() { - return INDSABADO; - } - public void setINDSABADO(Boolean iNDSABADO) { - INDSABADO = iNDSABADO; - } - public Boolean getINDDOMINGO() { - return INDDOMINGO; - } - public void setINDDOMINGO(Boolean iNDDOMINGO) { - INDDOMINGO = iNDDOMINGO; - } - public BigDecimal getPrecio() { - return precio; - } - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - @Override - public int compareTo(CasetaPeajeExcepcion o) { - if(o.getCasetaPeajeExcepcionId() != null){ - return this.getCasetaPeajeExcepcionId().intValue() - o.getCasetaPeajeExcepcionId().intValue(); - }else{ - return -1; - } - } - - @Override - public int hashCode() { - int hash = 0; - hash += casetaPeajeExcepcionId != null ? casetaPeajeExcepcionId.hashCode() : 0; - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof CasetaPeajeExcepcion)) { - return false; - } - CasetaPeajeExcepcion other = (CasetaPeajeExcepcion) object; - if ((this.casetaPeajeExcepcionId == null && other.casetaPeajeExcepcionId != null) || (this.casetaPeajeExcepcionId != null && !this.casetaPeajeExcepcionId.equals(other.casetaPeajeExcepcionId))) { - return false; - } - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CASETA_PEAJE_EXCEPCION_SEQ", sequenceName = "CASETA_PEAJE_EXCEPCION_SEQ", allocationSize = 1) +@Table(name = "CASETA_PEAJE_EXCEPCION") +public class CasetaPeajeExcepcion implements Serializable, Comparable { + +private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @Column(name = "CASETAPEAJEEXCEPCION_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CASETA_PEAJE_EXCEPCION_SEQ") + private Integer casetaPeajeExcepcionId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @ManyToOne + @JoinColumn(name = "CASETAPEAJE_ID" , referencedColumnName = "CASETAPEAJE_ID") + private CasetaPeaje casetaPeaje; + @Column(name = "FECHAVENTAINI") + @Temporal(TemporalType.TIMESTAMP) + private java.util.Date fecVentaIni; + @Column(name = "FECHAVENTAFIN") + @Temporal(TemporalType.TIMESTAMP) + private java.util.Date fecVentaFin; + @Column(name = "FECHORINICIO") + @Temporal(TemporalType.TIME) + private Date horaIni; + @Column(name = "FECHORFINAL") + @Temporal(TemporalType.TIME) + private Date horaFin; + @Column(name = "INDLUNES") + private Boolean INDLUNES; + @Column(name = "INDMARTES") + private Boolean INDMARTES; + @Column(name = "INDMIERCOLES") + private Boolean INDMIERCOLES; + @Column(name = "INDJUEVES") + private Boolean INDJUEVES; + @Column(name = "INDVIERNES") + private Boolean INDVIERNES; + @Column(name = "INDSABADO") + private Boolean INDSABADO; + @Column(name = "INDDOMINGO") + private Boolean INDDOMINGO; + @Column(name = "PRECIO") + private BigDecimal precio; + + + public Integer getCasetaPeajeExcepcionId() { + return casetaPeajeExcepcionId; + } + public void setCasetaPeajeExcepcionId(Integer casetaPeajeExcepcionId) { + this.casetaPeajeExcepcionId = casetaPeajeExcepcionId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public CasetaPeaje getCasetaPeaje() { + return casetaPeaje; + } + public void setCasetaPeaje(CasetaPeaje casetaPeaje) { + this.casetaPeaje = casetaPeaje; + } + public java.util.Date getFecVentaIni() { + return fecVentaIni; + } + public void setFecVentaIni(java.util.Date fecVentaIni) { + this.fecVentaIni = fecVentaIni; + } + public java.util.Date getFecVentaFin() { + return fecVentaFin; + } + public void setFecVentaFin(java.util.Date fecVentaFin) { + this.fecVentaFin = fecVentaFin; + } + public Date getHoraIni() { + return horaIni; + } + public void setHoraIni(Date horaIni) { + this.horaIni = horaIni; + } + public Date getHoraFin() { + return horaFin; + } + public void setHoraFin(Date horaFin) { + this.horaFin = horaFin; + } + public Boolean getINDLUNES() { + return INDLUNES; + } + public void setINDLUNES(Boolean iNDLUNES) { + INDLUNES = iNDLUNES; + } + public Boolean getINDMARTES() { + return INDMARTES; + } + public void setINDMARTES(Boolean iNDMARTES) { + INDMARTES = iNDMARTES; + } + public Boolean getINDMIERCOLES() { + return INDMIERCOLES; + } + public void setINDMIERCOLES(Boolean iNDMIERCOLES) { + INDMIERCOLES = iNDMIERCOLES; + } + public Boolean getINDJUEVES() { + return INDJUEVES; + } + public void setINDJUEVES(Boolean iNDJUEVES) { + INDJUEVES = iNDJUEVES; + } + public Boolean getINDVIERNES() { + return INDVIERNES; + } + public void setINDVIERNES(Boolean iNDVIERNES) { + INDVIERNES = iNDVIERNES; + } + public Boolean getINDSABADO() { + return INDSABADO; + } + public void setINDSABADO(Boolean iNDSABADO) { + INDSABADO = iNDSABADO; + } + public Boolean getINDDOMINGO() { + return INDDOMINGO; + } + public void setINDDOMINGO(Boolean iNDDOMINGO) { + INDDOMINGO = iNDDOMINGO; + } + public BigDecimal getPrecio() { + return precio; + } + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + @Override + public int compareTo(CasetaPeajeExcepcion o) { + if(o.getCasetaPeajeExcepcionId() != null){ + return this.getCasetaPeajeExcepcionId().intValue() - o.getCasetaPeajeExcepcionId().intValue(); + }else{ + return -1; + } + } + + @Override + public int hashCode() { + int hash = 0; + hash += casetaPeajeExcepcionId != null ? casetaPeajeExcepcionId.hashCode() : 0; + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof CasetaPeajeExcepcion)) { + return false; + } + CasetaPeajeExcepcion other = (CasetaPeajeExcepcion) object; + if ((this.casetaPeajeExcepcionId == null && other.casetaPeajeExcepcionId != null) || (this.casetaPeajeExcepcionId != null && !this.casetaPeajeExcepcionId.equals(other.casetaPeajeExcepcionId))) { + return false; + } + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Categoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Categoria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Categoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Categoria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaBloqueioImpPosterior.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaBloqueioImpPosterior.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaBloqueioImpPosterior.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaBloqueioImpPosterior.java index 5c1901c6b..e30bf8d94 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaBloqueioImpPosterior.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaBloqueioImpPosterior.java @@ -1,99 +1,99 @@ -package com.rjconsultores.ventaboletos.entidad; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "CategoriaBloqueioImpPosterior", tela = "auditarClasse.CategoriaBloqueioImpPosterior") -@Entity -@SequenceGenerator(name = "CAT_BLOQ_IMPPOSTERIOR_SEQ", sequenceName = "CAT_BLOQ_IMPPOSTERIOR_SEQ", allocationSize = 1) -@Table(name = "CATEGORIA_BLOQ_IMPPOSTERIOR") -public class CategoriaBloqueioImpPosterior implements Auditavel { - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CAT_BLOQ_IMPPOSTERIOR_SEQ") - @Column(name = "CATBLOQUEIOIMPPOSTERIOR_ID") - private Integer categoriaBloqueioImpPosteriorId; - @ManyToOne() - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoventa; - @ManyToOne() - @JoinColumn(name = "CATEGORIA_ID") - private Categoria categoria; - - @Transient - @NaoAuditar - private CategoriaBloqueioImpPosterior categoriaBloqueioImpPosteriorClone; - - public Integer getCategoriaBloqueioImpPosteriorId() { - return categoriaBloqueioImpPosteriorId; - } - public void setCategoriaBloqueioImpPosteriorId(Integer categoriaBloqueioImpPosteriorId) { - this.categoriaBloqueioImpPosteriorId = categoriaBloqueioImpPosteriorId; - } - public PuntoVenta getPuntoventa() { - return puntoventa; - } - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - public Categoria getCategoria() { - return categoria; - } - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (categoriaBloqueioImpPosteriorId != null ? categoriaBloqueioImpPosteriorId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are - // not set - if (!(object instanceof CategoriaBloqueioImpPosterior)) { - return false; - } - CategoriaBloqueioImpPosterior other = (CategoriaBloqueioImpPosterior) object; - if ((this.categoriaBloqueioImpPosteriorId == null && other.categoriaBloqueioImpPosteriorId != null) || (this.categoriaBloqueioImpPosteriorId != null && !this.categoriaBloqueioImpPosteriorId.equals(other.categoriaBloqueioImpPosteriorId))) { - return false; - } - return true; - } - - @Override - public void clonar() throws CloneNotSupportedException { - categoriaBloqueioImpPosteriorClone = new CategoriaBloqueioImpPosterior(); - categoriaBloqueioImpPosteriorClone = (CategoriaBloqueioImpPosterior) this.clone(); - Hibernate.initialize(categoriaBloqueioImpPosteriorClone.getPuntoventa()); - - } - - @Override - public CategoriaBloqueioImpPosterior getCloneObject() throws CloneNotSupportedException { - return categoriaBloqueioImpPosteriorClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getCategoriaBloqueioImpPosteriorId()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "CategoriaBloqueioImpPosterior", tela = "auditarClasse.CategoriaBloqueioImpPosterior") +@Entity +@SequenceGenerator(name = "CAT_BLOQ_IMPPOSTERIOR_SEQ", sequenceName = "CAT_BLOQ_IMPPOSTERIOR_SEQ", allocationSize = 1) +@Table(name = "CATEGORIA_BLOQ_IMPPOSTERIOR") +public class CategoriaBloqueioImpPosterior implements Auditavel { + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CAT_BLOQ_IMPPOSTERIOR_SEQ") + @Column(name = "CATBLOQUEIOIMPPOSTERIOR_ID") + private Integer categoriaBloqueioImpPosteriorId; + @ManyToOne() + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoventa; + @ManyToOne() + @JoinColumn(name = "CATEGORIA_ID") + private Categoria categoria; + + @Transient + @NaoAuditar + private CategoriaBloqueioImpPosterior categoriaBloqueioImpPosteriorClone; + + public Integer getCategoriaBloqueioImpPosteriorId() { + return categoriaBloqueioImpPosteriorId; + } + public void setCategoriaBloqueioImpPosteriorId(Integer categoriaBloqueioImpPosteriorId) { + this.categoriaBloqueioImpPosteriorId = categoriaBloqueioImpPosteriorId; + } + public PuntoVenta getPuntoventa() { + return puntoventa; + } + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + public Categoria getCategoria() { + return categoria; + } + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (categoriaBloqueioImpPosteriorId != null ? categoriaBloqueioImpPosteriorId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are + // not set + if (!(object instanceof CategoriaBloqueioImpPosterior)) { + return false; + } + CategoriaBloqueioImpPosterior other = (CategoriaBloqueioImpPosterior) object; + if ((this.categoriaBloqueioImpPosteriorId == null && other.categoriaBloqueioImpPosteriorId != null) || (this.categoriaBloqueioImpPosteriorId != null && !this.categoriaBloqueioImpPosteriorId.equals(other.categoriaBloqueioImpPosteriorId))) { + return false; + } + return true; + } + + @Override + public void clonar() throws CloneNotSupportedException { + categoriaBloqueioImpPosteriorClone = new CategoriaBloqueioImpPosterior(); + categoriaBloqueioImpPosteriorClone = (CategoriaBloqueioImpPosterior) this.clone(); + Hibernate.initialize(categoriaBloqueioImpPosteriorClone.getPuntoventa()); + + } + + @Override + public CategoriaBloqueioImpPosterior getCloneObject() throws CloneNotSupportedException { + return categoriaBloqueioImpPosteriorClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getCategoriaBloqueioImpPosteriorId()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaClase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaClase.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaClase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaClase.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaCorrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaCorrida.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaDescuento.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaFormAutorizacao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaFormAutorizacao.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaFormAutorizacao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaFormAutorizacao.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaMarca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaMarca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaMercado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaMercado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaMercado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaMercado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaOrgao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaOrgao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaOrgao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaOrgao.java index b721d8513..de673b720 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaOrgao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaOrgao.java @@ -1,166 +1,166 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarEntidade; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "CategoriaOrgao", tela = "auditarClasse.CategoriaOrgao") -@Entity -@SequenceGenerator(name = "CATEGORIA_ORGAO_SEQ", sequenceName = "CATEGORIA_ORGAO_SEQ", allocationSize = 1) -@Table(name = "CATEGORIA_ORGAO") -public class CategoriaOrgao implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_ORGAO_SEQ") - @Column(name = "CATEGORIAORGAO_ID") - private Integer categoriaorgaoId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - @AuditarEntidade - private OrgaoConcedente orgao; - @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") - @ManyToOne - private CategoriaCtrl categoriaCtrl; - - @Transient - @NaoAuditar - private CategoriaOrgao categoriaOrgaoClone; - - public CategoriaOrgao() { - } - - public CategoriaOrgao(Integer categoriaorgaoId) { - this.categoriaorgaoId = categoriaorgaoId; - } - - - - public Integer getCategoriaorgaoId() { - return categoriaorgaoId; - } - - public void setCategoriaorgaoId(Integer categoriaorgaoId) { - this.categoriaorgaoId = categoriaorgaoId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - - public OrgaoConcedente getOrgao() { - return orgao; - } - - public void setOrgao(OrgaoConcedente orgao) { - this.orgao = orgao; - } - - public CategoriaCtrl getCategoriaCtrl() { - return categoriaCtrl; - } - - public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { - this.categoriaCtrl = categoriaCtrl; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final CategoriaOrgao other = (CategoriaOrgao) obj; - if (this.orgao != other.orgao && (this.orgao == null || !this.orgao.equals(other.orgao))) { - return false; - } - if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 97 * hash + (this.orgao != null ? this.orgao.hashCode() : 0); - hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.CategoriaOrgao[categoriaorgaoId=" + categoriaorgaoId + "]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - categoriaOrgaoClone = new CategoriaOrgao(); - categoriaOrgaoClone = (CategoriaOrgao) this.clone(); - Hibernate.initialize(categoriaOrgaoClone.getOrgao()); - - } - - @Override - public CategoriaOrgao getCloneObject() throws CloneNotSupportedException { - return categoriaOrgaoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrgao().getDescOrgao()+"-"+getOrgao().getOrgaoConcedenteId()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarEntidade; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "CategoriaOrgao", tela = "auditarClasse.CategoriaOrgao") +@Entity +@SequenceGenerator(name = "CATEGORIA_ORGAO_SEQ", sequenceName = "CATEGORIA_ORGAO_SEQ", allocationSize = 1) +@Table(name = "CATEGORIA_ORGAO") +public class CategoriaOrgao implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_ORGAO_SEQ") + @Column(name = "CATEGORIAORGAO_ID") + private Integer categoriaorgaoId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + @AuditarEntidade + private OrgaoConcedente orgao; + @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") + @ManyToOne + private CategoriaCtrl categoriaCtrl; + + @Transient + @NaoAuditar + private CategoriaOrgao categoriaOrgaoClone; + + public CategoriaOrgao() { + } + + public CategoriaOrgao(Integer categoriaorgaoId) { + this.categoriaorgaoId = categoriaorgaoId; + } + + + + public Integer getCategoriaorgaoId() { + return categoriaorgaoId; + } + + public void setCategoriaorgaoId(Integer categoriaorgaoId) { + this.categoriaorgaoId = categoriaorgaoId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + + public OrgaoConcedente getOrgao() { + return orgao; + } + + public void setOrgao(OrgaoConcedente orgao) { + this.orgao = orgao; + } + + public CategoriaCtrl getCategoriaCtrl() { + return categoriaCtrl; + } + + public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { + this.categoriaCtrl = categoriaCtrl; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final CategoriaOrgao other = (CategoriaOrgao) obj; + if (this.orgao != other.orgao && (this.orgao == null || !this.orgao.equals(other.orgao))) { + return false; + } + if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.orgao != null ? this.orgao.hashCode() : 0); + hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.CategoriaOrgao[categoriaorgaoId=" + categoriaorgaoId + "]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + categoriaOrgaoClone = new CategoriaOrgao(); + categoriaOrgaoClone = (CategoriaOrgao) this.clone(); + Hibernate.initialize(categoriaOrgaoClone.getOrgao()); + + } + + @Override + public CategoriaOrgao getCloneObject() throws CloneNotSupportedException { + return categoriaOrgaoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrgao().getDescOrgao()+"-"+getOrgao().getOrgaoConcedenteId()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaPeriodo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaPeriodo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaPeriodo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaPeriodo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaRuta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaRuta.java index 0790305e4..cbfbf0c4d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaRuta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaRuta.java @@ -1,193 +1,193 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "CategoriaRuta", tela = "auditarClasse.CategoriaRuta") -@SequenceGenerator(name = "CATEGORIA_RUTA_SEQ", sequenceName = "CATEGORIA_RUTA_SEQ", allocationSize = 1) -@Table(name = "CATEGORIA_RUTA") -public class CategoriaRuta implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_RUTA_SEQ") - @Column(name = "CATEGORIARUTA_ID") - private Integer categoriarutaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "QTD_POLTRONA_AUTORIZADA") - private Integer qtdPoltronasAutorizadas; - @Column(name = "VALOR_DESCONTO") - private BigDecimal valorDesconto; - @Column(name = "PORCENTAGEM_DESCONTO") - private BigDecimal porcentagemDesconto; - - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") - @ManyToOne - private CategoriaCtrl categoriaCtrl; - - @Transient - @NaoAuditar - private CategoriaRuta categoriaRutaClone; - - public CategoriaRuta() { - } - - public CategoriaRuta(Integer categoriarutaId) { - this.categoriarutaId = categoriarutaId; - } - - public Integer getCategoriarutaId() { - return categoriarutaId; - } - - public void setCategoriarutaId(Integer categoriarutaId) { - this.categoriarutaId = categoriarutaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - public Integer getQtdPoltronasAutorizadas() { - return qtdPoltronasAutorizadas; - } - - public void setQtdPoltronasAutorizadas(Integer qtdPoltronasAutorizadas) { - this.qtdPoltronasAutorizadas = qtdPoltronasAutorizadas; - } - - public BigDecimal getValorDesconto() { - return valorDesconto; - } - - public void setValorDesconto(BigDecimal valorDesconto) { - this.valorDesconto = valorDesconto; - } - - public BigDecimal getPorcentagemDesconto() { - return porcentagemDesconto; - } - - public void setPorcentagemDesconto(BigDecimal porcentagemDesconto) { - this.porcentagemDesconto = porcentagemDesconto; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public CategoriaCtrl getCategoriaCtrl() { - return categoriaCtrl; - } - - public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { - this.categoriaCtrl = categoriaCtrl; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final CategoriaRuta other = (CategoriaRuta) obj; - if (this.ruta != other.ruta && (this.ruta == null || !this.ruta.equals(other.ruta))) { - return false; - } - if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 97 * hash + (this.ruta != null ? this.ruta.hashCode() : 0); - hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.CategoriaOrgao[categoriaorgaoId=" + categoriarutaId + "]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - categoriaRutaClone = new CategoriaRuta(); - categoriaRutaClone = (CategoriaRuta) this.clone(); - Hibernate.initialize(categoriaRutaClone.getCategoriaCtrl()); - - } - - @Override - public CategoriaRuta getCloneObject() throws CloneNotSupportedException { - return categoriaRutaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getRuta().getNumRuta()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "CategoriaRuta", tela = "auditarClasse.CategoriaRuta") +@SequenceGenerator(name = "CATEGORIA_RUTA_SEQ", sequenceName = "CATEGORIA_RUTA_SEQ", allocationSize = 1) +@Table(name = "CATEGORIA_RUTA") +public class CategoriaRuta implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_RUTA_SEQ") + @Column(name = "CATEGORIARUTA_ID") + private Integer categoriarutaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "QTD_POLTRONA_AUTORIZADA") + private Integer qtdPoltronasAutorizadas; + @Column(name = "VALOR_DESCONTO") + private BigDecimal valorDesconto; + @Column(name = "PORCENTAGEM_DESCONTO") + private BigDecimal porcentagemDesconto; + + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") + @ManyToOne + private CategoriaCtrl categoriaCtrl; + + @Transient + @NaoAuditar + private CategoriaRuta categoriaRutaClone; + + public CategoriaRuta() { + } + + public CategoriaRuta(Integer categoriarutaId) { + this.categoriarutaId = categoriarutaId; + } + + public Integer getCategoriarutaId() { + return categoriarutaId; + } + + public void setCategoriarutaId(Integer categoriarutaId) { + this.categoriarutaId = categoriarutaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + public Integer getQtdPoltronasAutorizadas() { + return qtdPoltronasAutorizadas; + } + + public void setQtdPoltronasAutorizadas(Integer qtdPoltronasAutorizadas) { + this.qtdPoltronasAutorizadas = qtdPoltronasAutorizadas; + } + + public BigDecimal getValorDesconto() { + return valorDesconto; + } + + public void setValorDesconto(BigDecimal valorDesconto) { + this.valorDesconto = valorDesconto; + } + + public BigDecimal getPorcentagemDesconto() { + return porcentagemDesconto; + } + + public void setPorcentagemDesconto(BigDecimal porcentagemDesconto) { + this.porcentagemDesconto = porcentagemDesconto; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public CategoriaCtrl getCategoriaCtrl() { + return categoriaCtrl; + } + + public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { + this.categoriaCtrl = categoriaCtrl; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final CategoriaRuta other = (CategoriaRuta) obj; + if (this.ruta != other.ruta && (this.ruta == null || !this.ruta.equals(other.ruta))) { + return false; + } + if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.ruta != null ? this.ruta.hashCode() : 0); + hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.CategoriaOrgao[categoriaorgaoId=" + categoriarutaId + "]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + categoriaRutaClone = new CategoriaRuta(); + categoriaRutaClone = (CategoriaRuta) this.clone(); + Hibernate.initialize(categoriaRutaClone.getCategoriaCtrl()); + + } + + @Override + public CategoriaRuta getCloneObject() throws CloneNotSupportedException { + return categoriaRutaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getRuta().getNumRuta()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java index b1551f3f7..52d0ee857 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java @@ -1,161 +1,161 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "CategoriaRutaExcecao", tela = "auditarClasse.CategoriaRutaExcecao") -@SequenceGenerator(name = "CATEGORIA_RUTA_EXCECAO_SEQ", sequenceName = "CATEGORIA_RUTA_EXCECAO_SEQ", allocationSize = 1) -@Table(name = "CATEGORIA_RUTA_EXCECAO") -public class CategoriaRutaExcecao implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_RUTA_EXCECAO_SEQ") - @Column(name = "CATEGORIARUTAEXCECAO_ID") - private Integer categoriaRutaExcecaoId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") - @ManyToOne - private CategoriaCtrl categoriaCtrl; - @Transient - @NaoAuditar - private CategoriaRutaExcecao categoriaRutaExcecaoClone; - - public CategoriaRutaExcecao() { - } - - public CategoriaRutaExcecao(Integer categoriaRutaExcecaoId) { - this.categoriaRutaExcecaoId = categoriaRutaExcecaoId; - } - - public Integer getCategoriaRutaExcecaoId() { - return categoriaRutaExcecaoId; - } - - public void setCategoriaRutaExcecaoId(Integer categoriaRutaExcecaoId) { - this.categoriaRutaExcecaoId = categoriaRutaExcecaoId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public CategoriaCtrl getCategoriaCtrl() { - return categoriaCtrl; - } - - public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { - this.categoriaCtrl = categoriaCtrl; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final CategoriaRutaExcecao other = (CategoriaRutaExcecao) obj; - if (this.ruta != other.ruta && (this.ruta == null || !this.ruta.equals(other.ruta))) { - return false; - } - if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 97 * hash + (this.ruta != null ? this.ruta.hashCode() : 0); - hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.CategoriaRutaExcecao[categoriaRutaExcecaoId=" + categoriaRutaExcecaoId + "]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - categoriaRutaExcecaoClone = new CategoriaRutaExcecao(); - categoriaRutaExcecaoClone = (CategoriaRutaExcecao) this.clone(); - Hibernate.initialize(categoriaRutaExcecaoClone.getCategoriaCtrl()); - - } - - @Override - public CategoriaRutaExcecao getCloneObject() throws CloneNotSupportedException { - return categoriaRutaExcecaoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getRuta().getNumRuta()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "CategoriaRutaExcecao", tela = "auditarClasse.CategoriaRutaExcecao") +@SequenceGenerator(name = "CATEGORIA_RUTA_EXCECAO_SEQ", sequenceName = "CATEGORIA_RUTA_EXCECAO_SEQ", allocationSize = 1) +@Table(name = "CATEGORIA_RUTA_EXCECAO") +public class CategoriaRutaExcecao implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_RUTA_EXCECAO_SEQ") + @Column(name = "CATEGORIARUTAEXCECAO_ID") + private Integer categoriaRutaExcecaoId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") + @ManyToOne + private CategoriaCtrl categoriaCtrl; + @Transient + @NaoAuditar + private CategoriaRutaExcecao categoriaRutaExcecaoClone; + + public CategoriaRutaExcecao() { + } + + public CategoriaRutaExcecao(Integer categoriaRutaExcecaoId) { + this.categoriaRutaExcecaoId = categoriaRutaExcecaoId; + } + + public Integer getCategoriaRutaExcecaoId() { + return categoriaRutaExcecaoId; + } + + public void setCategoriaRutaExcecaoId(Integer categoriaRutaExcecaoId) { + this.categoriaRutaExcecaoId = categoriaRutaExcecaoId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public CategoriaCtrl getCategoriaCtrl() { + return categoriaCtrl; + } + + public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { + this.categoriaCtrl = categoriaCtrl; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final CategoriaRutaExcecao other = (CategoriaRutaExcecao) obj; + if (this.ruta != other.ruta && (this.ruta == null || !this.ruta.equals(other.ruta))) { + return false; + } + if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.ruta != null ? this.ruta.hashCode() : 0); + hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.CategoriaRutaExcecao[categoriaRutaExcecaoId=" + categoriaRutaExcecaoId + "]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + categoriaRutaExcecaoClone = new CategoriaRutaExcecao(); + categoriaRutaExcecaoClone = (CategoriaRutaExcecao) this.clone(); + Hibernate.initialize(categoriaRutaExcecaoClone.getCategoriaCtrl()); + + } + + @Override + public CategoriaRutaExcecao getCloneObject() throws CloneNotSupportedException { + return categoriaRutaExcecaoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getRuta().getNumRuta()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaTipoPtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaTipoPtoVta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CategoriaTipoPtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CategoriaTipoPtoVta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Ciudad.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Ciudad.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Ciudad.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Ciudad.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClaseservicioEquivalencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClaseservicioEquivalencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ClaseservicioEquivalencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClaseservicioEquivalencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java index ff9c7d321..958e5e276 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java @@ -1,155 +1,155 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CLASIFICACION_SEQ", sequenceName = "CLASIFICACION_SEQ", allocationSize = 1) -@Table(name = "CLASIFICACION") -public class Clasificacion implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLASIFICACION_SEQ") - @Column(name = "CLASIFICACION_ID") - private Integer clasificacionId; - @Column(name = "DESCCLASIFICACION") - private String descclasificacion; - @Column(name = "EQUIVALENCIA_ID") - private String equivalenciaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "ARTICULO_ID", referencedColumnName = "ARTICULO_ID") - @OneToOne - private Articulo articulo; - @OneToMany(mappedBy = "clasificacion", cascade = CascadeType.ALL) - private List abastoBoletoList; - @OneToMany(mappedBy = "clasificacion", cascade = CascadeType.ALL) - private List requisicionBoletoList; - - public Clasificacion(Integer clasificacionId) { - this.clasificacionId = clasificacionId; - } - - public Clasificacion() { - } - - public Integer getClasificacionId() { - return clasificacionId; - } - - public void setClasificacionId(Integer clasificacionId) { - this.clasificacionId = clasificacionId; - } - - public String getDescclasificacion() { - return descclasificacion; - } - - public void setDescclasificacion(String descclasificacion) { - this.descclasificacion = descclasificacion; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getEquivalenciaId() { - return equivalenciaId; - } - - public void setEquivalenciaId(String equivalenciaId) { - this.equivalenciaId = equivalenciaId; - } - - public Articulo getArticulo() { - return articulo; - } - - public void setArticulo(Articulo articulo) { - this.articulo = articulo; - } - - public List getAbastoBoletoList() { - return abastoBoletoList; - } - - public void setAbastoBoletoList(List abastoBoletoList) { - this.abastoBoletoList = abastoBoletoList; - } - - public List getRequisicionBoletoList() { - return requisicionBoletoList; - } - - public void setRequisicionBoletoList(List requisicionBoletoList) { - this.requisicionBoletoList = requisicionBoletoList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (clasificacionId != null ? clasificacionId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Pricing)) { - return false; - } - Clasificacion other = (Clasificacion) object; - if ((this.clasificacionId == null && other.clasificacionId != null) || (this.clasificacionId != null && !this.clasificacionId.equals(other.clasificacionId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.Clasificacion[clasificacionId=" + clasificacionId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CLASIFICACION_SEQ", sequenceName = "CLASIFICACION_SEQ", allocationSize = 1) +@Table(name = "CLASIFICACION") +public class Clasificacion implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLASIFICACION_SEQ") + @Column(name = "CLASIFICACION_ID") + private Integer clasificacionId; + @Column(name = "DESCCLASIFICACION") + private String descclasificacion; + @Column(name = "EQUIVALENCIA_ID") + private String equivalenciaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "ARTICULO_ID", referencedColumnName = "ARTICULO_ID") + @OneToOne + private Articulo articulo; + @OneToMany(mappedBy = "clasificacion", cascade = CascadeType.ALL) + private List abastoBoletoList; + @OneToMany(mappedBy = "clasificacion", cascade = CascadeType.ALL) + private List requisicionBoletoList; + + public Clasificacion(Integer clasificacionId) { + this.clasificacionId = clasificacionId; + } + + public Clasificacion() { + } + + public Integer getClasificacionId() { + return clasificacionId; + } + + public void setClasificacionId(Integer clasificacionId) { + this.clasificacionId = clasificacionId; + } + + public String getDescclasificacion() { + return descclasificacion; + } + + public void setDescclasificacion(String descclasificacion) { + this.descclasificacion = descclasificacion; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getEquivalenciaId() { + return equivalenciaId; + } + + public void setEquivalenciaId(String equivalenciaId) { + this.equivalenciaId = equivalenciaId; + } + + public Articulo getArticulo() { + return articulo; + } + + public void setArticulo(Articulo articulo) { + this.articulo = articulo; + } + + public List getAbastoBoletoList() { + return abastoBoletoList; + } + + public void setAbastoBoletoList(List abastoBoletoList) { + this.abastoBoletoList = abastoBoletoList; + } + + public List getRequisicionBoletoList() { + return requisicionBoletoList; + } + + public void setRequisicionBoletoList(List requisicionBoletoList) { + this.requisicionBoletoList = requisicionBoletoList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (clasificacionId != null ? clasificacionId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Pricing)) { + return false; + } + Clasificacion other = (Clasificacion) object; + if ((this.clasificacionId == null && other.clasificacionId != null) || (this.clasificacionId != null && !this.clasificacionId.equals(other.clasificacionId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.Clasificacion[clasificacionId=" + clasificacionId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java index 093da7764..0778c7d0c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java @@ -1,94 +1,94 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -import org.apache.commons.lang.builder.EqualsBuilder; - -@Entity -@SequenceGenerator(name = "CLASSE_INDICE_PEAJE_SEQ", sequenceName = "CLASSE_INDICE_PEAJE_SEQ", initialValue = 1) -@Table(name = "CLASSE_INDICE_PEAJE") -public class ClasseIndicePeaje implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "CLASSE_INDICE_PEAJE_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLASSE_INDICE_PEAJE_SEQ") - private Long id; - - @Column - private Boolean activo; - - @OneToOne - @JoinColumn(name = "CLASSE_SERVICIO_ID") - private ClaseServicio classeServicio; - - @ManyToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - - @Column(name = "INDICE_PEAJE") - private BigDecimal indicePeaje; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public ClaseServicio getClasseServicio() { - return classeServicio; - } - - public void setClasseServicio(ClaseServicio classeServicio) { - this.classeServicio = classeServicio; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public BigDecimal getIndicePeaje() { - return indicePeaje; - } - - public void setIndicePeaje(BigDecimal indicePeaje) { - this.indicePeaje = indicePeaje; - } - - @Override - public boolean equals(Object obj) { - return new EqualsBuilder().append(this.id, ((ClasseIndicePeaje) obj).getId()).isEquals(); - } - - @Override - public String toString() { - return classeServicio.getDescclase() + " " + indicePeaje.toString(); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +import org.apache.commons.lang.builder.EqualsBuilder; + +@Entity +@SequenceGenerator(name = "CLASSE_INDICE_PEAJE_SEQ", sequenceName = "CLASSE_INDICE_PEAJE_SEQ", initialValue = 1) +@Table(name = "CLASSE_INDICE_PEAJE") +public class ClasseIndicePeaje implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "CLASSE_INDICE_PEAJE_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLASSE_INDICE_PEAJE_SEQ") + private Long id; + + @Column + private Boolean activo; + + @OneToOne + @JoinColumn(name = "CLASSE_SERVICIO_ID") + private ClaseServicio classeServicio; + + @ManyToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + + @Column(name = "INDICE_PEAJE") + private BigDecimal indicePeaje; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public ClaseServicio getClasseServicio() { + return classeServicio; + } + + public void setClasseServicio(ClaseServicio classeServicio) { + this.classeServicio = classeServicio; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public BigDecimal getIndicePeaje() { + return indicePeaje; + } + + public void setIndicePeaje(BigDecimal indicePeaje) { + this.indicePeaje = indicePeaje; + } + + @Override + public boolean equals(Object obj) { + return new EqualsBuilder().append(this.id, ((ClasseIndicePeaje) obj).getId()).isEquals(); + } + + @Override + public String toString() { + return classeServicio.getDescclase() + " " + indicePeaje.toString(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Cliente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cliente.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Cliente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cliente.java index b5b9fc29f..1b3aadf6b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Cliente.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cliente.java @@ -1,569 +1,569 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.Where; - -/** - * - * @author RJ - */ -@Entity -@SequenceGenerator(name = "CLIENTE_SEQ", sequenceName = "CLIENTE_SEQ", allocationSize = 1) -@Table(name = "CLIENTE") - -public class Cliente implements Serializable { - @Column(name="ROWID", updatable=false, insertable=false) - private String rowId; - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_SEQ") - @Column(name = "CLIENTE_ID") - private Integer clienteId; - @Column(name = "NOMBCLIENTE") - private String nombcliente; - @Column(name = "APELLIDOPATERNO") - private String apellidopaterno; - @Column(name = "APELLIDOMATERNO") - private String apellidomaterno; - @Column(name = "FECNACIMIENTO") - @Temporal(TemporalType.TIMESTAMP) - private Date fecnacimiento; - @Column(name = "NUMRFC") - private String numrfc; - @Column(name = "NUMTELEFONO") - private String numtelefono; - @Column(name = "NUMTELEFONODOS") - private String numtelefonodos; - @Column(name = "NUMFAX") - private String numfax; - @Column(name = "NUMEXTENSION") - private String numextension; - @Column(name = "NUMEXTENSIONDOS") - private String numextensiondos; - @JoinColumn(name = "TIPOOCUPACION_ID") - @OneToOne(cascade = CascadeType.ALL) - private TipoOcupacion tipoocupacionId; - @Column(name = "MEDIOINFORMATIVO_ID") - private Integer medioinformativoId; - @JoinColumn(name = "MOTIVOVIAJE_ID") - @OneToOne(cascade = CascadeType.ALL) - private MotivoViaje motivoviajeId; - @Column(name = "INDSEXO") - private String indsexo; - @Column(name = "NUMCURP") - private String numcurp; - @Column(name = "CANTHIJOS") - private Integer canthijos; - @Column(name = "DESCCORREO") - private String desccorreo; - @Column(name = "EDAD") - private Integer edad; - @Column(name = "ESTADOCIVIL_ID") - private Integer estadocivilId; - @Column(name = "GRADOESTUDIO_ID") - private Integer gradoestudioId; - @Column(name = "EQUIVALENCIA_ID") - private String equivalenciaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "DESCCONTRASENA") - private String desccontrasena; - @Column(name = "NUMLADA") - private String numlada; - @Column(name = "INDCAMBIOCONTRASENA") - private Integer indcambiocontrasena; - @OneToMany(cascade = CascadeType.ALL, mappedBy = "clienteId") - private List lsClienteDireccion; - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") - @Where(clause = "activo=1") - private List listClienteFidelidad; - @Column(name = "NUMIDENTIFICAUNO") - private String numIdentificaUno; - @Column(name = "NUMIDENTIFICADOS") - private String numIdentificaDos; - @Column(name = "INDBLOQUEO") - private Boolean indBloqueo; - @JoinColumn(name = "TIPOIDENTIFICAUNO_ID") - @OneToOne - private TipoIdentificacion tipoIdentificacionUno; - @JoinColumn(name = "TIPOIDENTIFICADOS_ID") - @OneToOne - private TipoIdentificacion tipoIdentificacionDos; - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") - private List lsClienteDescuento; - - @ManyToMany - @JoinTable(name = "CLIENTE_CURSO", joinColumns = { @JoinColumn(name = "CLIENTE_ID") }, inverseJoinColumns = { @JoinColumn(name = "CURSO_ID") }) - private List cursoList; - - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "ESCOLA_ID", referencedColumnName = "ESCOLA_ID") - private Escola escola; - - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - private Empresa empresaCadastro; - - @Column(name = "FECCADASTRO") - @Temporal(TemporalType.TIMESTAMP) - private Date fecCadastro; - - @Column(name = "INDCLIENTEPCD") - private Boolean indClientePcd; - - @Column(name = "FECBLOQUEIOPCD") - @Temporal(TemporalType.DATE) - private Date fecbloqueiopcd; - - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") - @Where(clause = "activo=1") - private List listReservaEspecialCliente; - - public List getListReservaEspecialCliente() { - return listReservaEspecialCliente; - } - - public void setListReservaEspecialCliente(List listReservaEspecialCliente) { - this.listReservaEspecialCliente = listReservaEspecialCliente; - } - - public Cliente() { - } - - public Cliente(Integer clienteId) { - this.clienteId = clienteId; - } - - public Integer getClienteId() { - return clienteId; - } - - public void setClienteId(Integer clienteId) { - this.clienteId = clienteId; - } - - public String getNombcliente() { - return nombcliente; - } - - public void setNombcliente(String nombcliente) { - this.nombcliente = nombcliente; - } - - public String getApellidopaterno() { - return apellidopaterno; - } - - public void setApellidopaterno(String apellidopaterno) { - this.apellidopaterno = apellidopaterno; - } - - public String getApellidomaterno() { - return apellidomaterno; - } - - public void setApellidomaterno(String apellidomaterno) { - this.apellidomaterno = apellidomaterno; - } - - public Date getFecnacimiento() { - return fecnacimiento; - } - - public void setFecnacimiento(Date fecnacimiento) { - this.fecnacimiento = fecnacimiento; - } - - public String getNumrfc() { - return numrfc; - } - - public void setNumrfc(String numrfc) { - this.numrfc = numrfc; - } - - public String getNumtelefono() { - return numtelefono; - } - - public void setNumtelefono(String numtelefono) { - this.numtelefono = numtelefono; - } - - public String getNumtelefonodos() { - return numtelefonodos; - } - - public void setNumtelefonodos(String numtelefonodos) { - this.numtelefonodos = numtelefonodos; - } - - public String getNumfax() { - return numfax; - } - - public void setNumfax(String numfax) { - this.numfax = numfax; - } - - public String getNumextension() { - return numextension; - } - - public void setNumextension(String numextension) { - this.numextension = numextension; - } - - public String getNumextensiondos() { - return numextensiondos; - } - - public void setNumextensiondos(String numextensiondos) { - this.numextensiondos = numextensiondos; - } - - public TipoOcupacion getTipoocupacionId() { - return tipoocupacionId; - } - - public void setTipoocupacionId(TipoOcupacion tipoocupacionId) { - this.tipoocupacionId = tipoocupacionId; - } - - public Integer getMedioinformativoId() { - return medioinformativoId; - } - - public void setMedioinformativoId(Integer medioinformativoId) { - this.medioinformativoId = medioinformativoId; - } - - public MotivoViaje getMotivoviajeId() { - return motivoviajeId; - } - - public void setMotivoviajeId(MotivoViaje motivoviajeId) { - this.motivoviajeId = motivoviajeId; - } - - public String getIndsexo() { - return indsexo; - } - - public void setIndsexo(String indsexo) { - this.indsexo = indsexo; - } - - public String getNumcurp() { - return numcurp; - } - - public void setNumcurp(String numcurp) { - this.numcurp = numcurp; - } - - public Integer getCanthijos() { - return canthijos; - } - - public void setCanthijos(Integer canthijos) { - this.canthijos = canthijos; - } - - public String getDesccorreo() { - return desccorreo; - } - - public void setDesccorreo(String desccorreo) { - this.desccorreo = desccorreo; - } - - public Integer getEdad() { - return edad; - } - - public void setEdad(Integer edad) { - this.edad = edad; - } - - public Integer getEstadocivilId() { - return estadocivilId; - } - - public void setEstadocivilId(Integer estadocivilId) { - this.estadocivilId = estadocivilId; - } - - public Integer getGradoestudioId() { - return gradoestudioId; - } - - public void setGradoestudioId(Integer gradoestudioId) { - this.gradoestudioId = gradoestudioId; - } - - public String getEquivalenciaId() { - return equivalenciaId; - } - - public void setEquivalenciaId(String equivalenciaId) { - this.equivalenciaId = equivalenciaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getDesccontrasena() { - return desccontrasena; - } - - public void setDesccontrasena(String desccontrasena) { - this.desccontrasena = desccontrasena; - } - - public String getNumlada() { - return numlada; - } - - public void setNumlada(String numlada) { - this.numlada = numlada; - } - - public Integer getIndcambiocontrasena() { - return indcambiocontrasena; - } - - public void setIndcambiocontrasena(Integer indcambiocontrasena) { - this.indcambiocontrasena = indcambiocontrasena; - } - - public List getLsClienteDireccion() { - return lsClienteDireccion; - } - - public void setLsClienteDireccion(List lsClienteDireccion) { - this.lsClienteDireccion = lsClienteDireccion; - } - - public List getListClienteFidelidad() { - return listClienteFidelidad; - } - - public void setListClienteFidelidad(List listClienteFidelidad) { - this.listClienteFidelidad = listClienteFidelidad; - } - - public String getNumIdentificaUno() { - return numIdentificaUno; - } - - public void setNumIdentificaUno(String numIdentificaUno) { - this.numIdentificaUno = numIdentificaUno; - } - - public String getNumIdentificaDos() { - return numIdentificaDos; - } - - public void setNumIdentificaDos(String numIdentificaDos) { - this.numIdentificaDos = numIdentificaDos; - } - - public Boolean getIndBloqueo() { - return indBloqueo; - } - - public void setIndBloqueo(Boolean indBloqueo) { - this.indBloqueo = indBloqueo; - } - - public TipoIdentificacion getTipoIdentificacionUno() { - return tipoIdentificacionUno; - } - - public void setTipoIdentificacionUno(TipoIdentificacion tipoIdentificacionUno) { - this.tipoIdentificacionUno = tipoIdentificacionUno; - } - - public TipoIdentificacion getTipoIdentificacionDos() { - return tipoIdentificacionDos; - } - - public void setTipoIdentificacionDos(TipoIdentificacion tipoIdentificacionDos) { - this.tipoIdentificacionDos = tipoIdentificacionDos; - } - - public List getLsClienteDescuento() { - return lsClienteDescuento; - } - - public void setLsClienteDescuento(List lsClienteDescuento) { - this.lsClienteDescuento = lsClienteDescuento; - } - - public List getCursoList() { - - List aux = new ArrayList(); - if (cursoList == null) { - return aux; - } - - for (Curso curso : cursoList) { - if (curso.getActivo()) { - aux.add(curso); - } - } - - return aux; - } - - public void setCursoList(List cursoList) { - this.cursoList = cursoList; - } - - public Escola getEscola() { - return escola; - } - - public void setEscola(Escola escola) { - this.escola = escola; - } - - public Empresa getEmpresaCadastro() { - return empresaCadastro; - } - - public void setEmpresaCadastro(Empresa empresaCadastro) { - this.empresaCadastro = empresaCadastro; - } - - public Date getFecCadastro() { - return fecCadastro; - } - - public void setFecCadastro(Date fecCadastro) { - this.fecCadastro = fecCadastro; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (clienteId != null ? clienteId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Cliente)) { - return false; - } - Cliente other = (Cliente) object; - if ((this.clienteId == null && other.clienteId != null) || (this.clienteId != null && !this.clienteId.equals(other.clienteId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.Cliente[ clienteId=" + clienteId + " ]"; - } - - //Removida a annotação Trasient pois getListClienteFidelidad() é um persistionbag - public List getListClienteFidelidadActivos() { - List lsActivos = new ArrayList(); - - if (getListClienteFidelidad() != null) - for (ClienteFidelidad clienteFidelidad : getListClienteFidelidad()) { - if (clienteFidelidad.getActivo() && clienteFidelidad.getTarjetaFidelidad().getActivo()) { - lsActivos.add(clienteFidelidad); - } - } - - return lsActivos; - } - - public Boolean getIndClientePcd() { - return indClientePcd; - } - - public void setIndClientePcd(Boolean indClientePcd) { - this.indClientePcd = indClientePcd; - } - - public Date getFecbloqueiopcd() { - return fecbloqueiopcd; - } - - public void setFecbloqueiopcd(Date fecbloqueiopcd) { - this.fecbloqueiopcd = fecbloqueiopcd; - } - - public String getRowId() { - return rowId; - } - - public void setRowId(String rowId) { - this.rowId = rowId; - } - - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.Where; + +/** + * + * @author RJ + */ +@Entity +@SequenceGenerator(name = "CLIENTE_SEQ", sequenceName = "CLIENTE_SEQ", allocationSize = 1) +@Table(name = "CLIENTE") + +public class Cliente implements Serializable { + @Column(name="ROWID", updatable=false, insertable=false) + private String rowId; + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_SEQ") + @Column(name = "CLIENTE_ID") + private Integer clienteId; + @Column(name = "NOMBCLIENTE") + private String nombcliente; + @Column(name = "APELLIDOPATERNO") + private String apellidopaterno; + @Column(name = "APELLIDOMATERNO") + private String apellidomaterno; + @Column(name = "FECNACIMIENTO") + @Temporal(TemporalType.TIMESTAMP) + private Date fecnacimiento; + @Column(name = "NUMRFC") + private String numrfc; + @Column(name = "NUMTELEFONO") + private String numtelefono; + @Column(name = "NUMTELEFONODOS") + private String numtelefonodos; + @Column(name = "NUMFAX") + private String numfax; + @Column(name = "NUMEXTENSION") + private String numextension; + @Column(name = "NUMEXTENSIONDOS") + private String numextensiondos; + @JoinColumn(name = "TIPOOCUPACION_ID") + @OneToOne(cascade = CascadeType.ALL) + private TipoOcupacion tipoocupacionId; + @Column(name = "MEDIOINFORMATIVO_ID") + private Integer medioinformativoId; + @JoinColumn(name = "MOTIVOVIAJE_ID") + @OneToOne(cascade = CascadeType.ALL) + private MotivoViaje motivoviajeId; + @Column(name = "INDSEXO") + private String indsexo; + @Column(name = "NUMCURP") + private String numcurp; + @Column(name = "CANTHIJOS") + private Integer canthijos; + @Column(name = "DESCCORREO") + private String desccorreo; + @Column(name = "EDAD") + private Integer edad; + @Column(name = "ESTADOCIVIL_ID") + private Integer estadocivilId; + @Column(name = "GRADOESTUDIO_ID") + private Integer gradoestudioId; + @Column(name = "EQUIVALENCIA_ID") + private String equivalenciaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "DESCCONTRASENA") + private String desccontrasena; + @Column(name = "NUMLADA") + private String numlada; + @Column(name = "INDCAMBIOCONTRASENA") + private Integer indcambiocontrasena; + @OneToMany(cascade = CascadeType.ALL, mappedBy = "clienteId") + private List lsClienteDireccion; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") + @Where(clause = "activo=1") + private List listClienteFidelidad; + @Column(name = "NUMIDENTIFICAUNO") + private String numIdentificaUno; + @Column(name = "NUMIDENTIFICADOS") + private String numIdentificaDos; + @Column(name = "INDBLOQUEO") + private Boolean indBloqueo; + @JoinColumn(name = "TIPOIDENTIFICAUNO_ID") + @OneToOne + private TipoIdentificacion tipoIdentificacionUno; + @JoinColumn(name = "TIPOIDENTIFICADOS_ID") + @OneToOne + private TipoIdentificacion tipoIdentificacionDos; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") + private List lsClienteDescuento; + + @ManyToMany + @JoinTable(name = "CLIENTE_CURSO", joinColumns = { @JoinColumn(name = "CLIENTE_ID") }, inverseJoinColumns = { @JoinColumn(name = "CURSO_ID") }) + private List cursoList; + + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "ESCOLA_ID", referencedColumnName = "ESCOLA_ID") + private Escola escola; + + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + private Empresa empresaCadastro; + + @Column(name = "FECCADASTRO") + @Temporal(TemporalType.TIMESTAMP) + private Date fecCadastro; + + @Column(name = "INDCLIENTEPCD") + private Boolean indClientePcd; + + @Column(name = "FECBLOQUEIOPCD") + @Temporal(TemporalType.DATE) + private Date fecbloqueiopcd; + + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") + @Where(clause = "activo=1") + private List listReservaEspecialCliente; + + public List getListReservaEspecialCliente() { + return listReservaEspecialCliente; + } + + public void setListReservaEspecialCliente(List listReservaEspecialCliente) { + this.listReservaEspecialCliente = listReservaEspecialCliente; + } + + public Cliente() { + } + + public Cliente(Integer clienteId) { + this.clienteId = clienteId; + } + + public Integer getClienteId() { + return clienteId; + } + + public void setClienteId(Integer clienteId) { + this.clienteId = clienteId; + } + + public String getNombcliente() { + return nombcliente; + } + + public void setNombcliente(String nombcliente) { + this.nombcliente = nombcliente; + } + + public String getApellidopaterno() { + return apellidopaterno; + } + + public void setApellidopaterno(String apellidopaterno) { + this.apellidopaterno = apellidopaterno; + } + + public String getApellidomaterno() { + return apellidomaterno; + } + + public void setApellidomaterno(String apellidomaterno) { + this.apellidomaterno = apellidomaterno; + } + + public Date getFecnacimiento() { + return fecnacimiento; + } + + public void setFecnacimiento(Date fecnacimiento) { + this.fecnacimiento = fecnacimiento; + } + + public String getNumrfc() { + return numrfc; + } + + public void setNumrfc(String numrfc) { + this.numrfc = numrfc; + } + + public String getNumtelefono() { + return numtelefono; + } + + public void setNumtelefono(String numtelefono) { + this.numtelefono = numtelefono; + } + + public String getNumtelefonodos() { + return numtelefonodos; + } + + public void setNumtelefonodos(String numtelefonodos) { + this.numtelefonodos = numtelefonodos; + } + + public String getNumfax() { + return numfax; + } + + public void setNumfax(String numfax) { + this.numfax = numfax; + } + + public String getNumextension() { + return numextension; + } + + public void setNumextension(String numextension) { + this.numextension = numextension; + } + + public String getNumextensiondos() { + return numextensiondos; + } + + public void setNumextensiondos(String numextensiondos) { + this.numextensiondos = numextensiondos; + } + + public TipoOcupacion getTipoocupacionId() { + return tipoocupacionId; + } + + public void setTipoocupacionId(TipoOcupacion tipoocupacionId) { + this.tipoocupacionId = tipoocupacionId; + } + + public Integer getMedioinformativoId() { + return medioinformativoId; + } + + public void setMedioinformativoId(Integer medioinformativoId) { + this.medioinformativoId = medioinformativoId; + } + + public MotivoViaje getMotivoviajeId() { + return motivoviajeId; + } + + public void setMotivoviajeId(MotivoViaje motivoviajeId) { + this.motivoviajeId = motivoviajeId; + } + + public String getIndsexo() { + return indsexo; + } + + public void setIndsexo(String indsexo) { + this.indsexo = indsexo; + } + + public String getNumcurp() { + return numcurp; + } + + public void setNumcurp(String numcurp) { + this.numcurp = numcurp; + } + + public Integer getCanthijos() { + return canthijos; + } + + public void setCanthijos(Integer canthijos) { + this.canthijos = canthijos; + } + + public String getDesccorreo() { + return desccorreo; + } + + public void setDesccorreo(String desccorreo) { + this.desccorreo = desccorreo; + } + + public Integer getEdad() { + return edad; + } + + public void setEdad(Integer edad) { + this.edad = edad; + } + + public Integer getEstadocivilId() { + return estadocivilId; + } + + public void setEstadocivilId(Integer estadocivilId) { + this.estadocivilId = estadocivilId; + } + + public Integer getGradoestudioId() { + return gradoestudioId; + } + + public void setGradoestudioId(Integer gradoestudioId) { + this.gradoestudioId = gradoestudioId; + } + + public String getEquivalenciaId() { + return equivalenciaId; + } + + public void setEquivalenciaId(String equivalenciaId) { + this.equivalenciaId = equivalenciaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getDesccontrasena() { + return desccontrasena; + } + + public void setDesccontrasena(String desccontrasena) { + this.desccontrasena = desccontrasena; + } + + public String getNumlada() { + return numlada; + } + + public void setNumlada(String numlada) { + this.numlada = numlada; + } + + public Integer getIndcambiocontrasena() { + return indcambiocontrasena; + } + + public void setIndcambiocontrasena(Integer indcambiocontrasena) { + this.indcambiocontrasena = indcambiocontrasena; + } + + public List getLsClienteDireccion() { + return lsClienteDireccion; + } + + public void setLsClienteDireccion(List lsClienteDireccion) { + this.lsClienteDireccion = lsClienteDireccion; + } + + public List getListClienteFidelidad() { + return listClienteFidelidad; + } + + public void setListClienteFidelidad(List listClienteFidelidad) { + this.listClienteFidelidad = listClienteFidelidad; + } + + public String getNumIdentificaUno() { + return numIdentificaUno; + } + + public void setNumIdentificaUno(String numIdentificaUno) { + this.numIdentificaUno = numIdentificaUno; + } + + public String getNumIdentificaDos() { + return numIdentificaDos; + } + + public void setNumIdentificaDos(String numIdentificaDos) { + this.numIdentificaDos = numIdentificaDos; + } + + public Boolean getIndBloqueo() { + return indBloqueo; + } + + public void setIndBloqueo(Boolean indBloqueo) { + this.indBloqueo = indBloqueo; + } + + public TipoIdentificacion getTipoIdentificacionUno() { + return tipoIdentificacionUno; + } + + public void setTipoIdentificacionUno(TipoIdentificacion tipoIdentificacionUno) { + this.tipoIdentificacionUno = tipoIdentificacionUno; + } + + public TipoIdentificacion getTipoIdentificacionDos() { + return tipoIdentificacionDos; + } + + public void setTipoIdentificacionDos(TipoIdentificacion tipoIdentificacionDos) { + this.tipoIdentificacionDos = tipoIdentificacionDos; + } + + public List getLsClienteDescuento() { + return lsClienteDescuento; + } + + public void setLsClienteDescuento(List lsClienteDescuento) { + this.lsClienteDescuento = lsClienteDescuento; + } + + public List getCursoList() { + + List aux = new ArrayList(); + if (cursoList == null) { + return aux; + } + + for (Curso curso : cursoList) { + if (curso.getActivo()) { + aux.add(curso); + } + } + + return aux; + } + + public void setCursoList(List cursoList) { + this.cursoList = cursoList; + } + + public Escola getEscola() { + return escola; + } + + public void setEscola(Escola escola) { + this.escola = escola; + } + + public Empresa getEmpresaCadastro() { + return empresaCadastro; + } + + public void setEmpresaCadastro(Empresa empresaCadastro) { + this.empresaCadastro = empresaCadastro; + } + + public Date getFecCadastro() { + return fecCadastro; + } + + public void setFecCadastro(Date fecCadastro) { + this.fecCadastro = fecCadastro; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (clienteId != null ? clienteId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Cliente)) { + return false; + } + Cliente other = (Cliente) object; + if ((this.clienteId == null && other.clienteId != null) || (this.clienteId != null && !this.clienteId.equals(other.clienteId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.Cliente[ clienteId=" + clienteId + " ]"; + } + + //Removida a annotação Trasient pois getListClienteFidelidad() é um persistionbag + public List getListClienteFidelidadActivos() { + List lsActivos = new ArrayList(); + + if (getListClienteFidelidad() != null) + for (ClienteFidelidad clienteFidelidad : getListClienteFidelidad()) { + if (clienteFidelidad.getActivo() && clienteFidelidad.getTarjetaFidelidad().getActivo()) { + lsActivos.add(clienteFidelidad); + } + } + + return lsActivos; + } + + public Boolean getIndClientePcd() { + return indClientePcd; + } + + public void setIndClientePcd(Boolean indClientePcd) { + this.indClientePcd = indClientePcd; + } + + public Date getFecbloqueiopcd() { + return fecbloqueiopcd; + } + + public void setFecbloqueiopcd(Date fecbloqueiopcd) { + this.fecbloqueiopcd = fecbloqueiopcd; + } + + public String getRowId() { + return rowId; + } + + public void setRowId(String rowId) { + this.rowId = rowId; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClienteCorporativo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteCorporativo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ClienteCorporativo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteCorporativo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClienteCurso.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteCurso.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ClienteCurso.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteCurso.java index 904631029..876f9f7d8 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClienteCurso.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteCurso.java @@ -1,93 +1,93 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CLIENTE_CURSO_SEQ", sequenceName = "CLIENTE_CURSO_SEQ", allocationSize = 1) -@Table(name = "CLIENTE_CURSO") -public class ClienteCurso implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_CURSO_SEQ") - @Column(name = "CLIENTECURSO_ID") - private Integer clientecursoId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @JoinColumn(name = "CURSO_ID", referencedColumnName = "CURSO_ID") - @ManyToOne - private Curso curso; - @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") - @ManyToOne - private Cliente cliente; - - public Integer getClientecursoId() { - return clientecursoId; - } - - public void setClientecursoId(Integer clientecursoId) { - this.clientecursoId = clientecursoId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Curso getCurso() { - return curso; - } - - public void setCurso(Curso curso) { - this.curso = curso; - } - - public Cliente getCliente() { - return cliente; - } - - public void setCliente(Cliente cliente) { - this.cliente = cliente; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CLIENTE_CURSO_SEQ", sequenceName = "CLIENTE_CURSO_SEQ", allocationSize = 1) +@Table(name = "CLIENTE_CURSO") +public class ClienteCurso implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_CURSO_SEQ") + @Column(name = "CLIENTECURSO_ID") + private Integer clientecursoId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @JoinColumn(name = "CURSO_ID", referencedColumnName = "CURSO_ID") + @ManyToOne + private Curso curso; + @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") + @ManyToOne + private Cliente cliente; + + public Integer getClientecursoId() { + return clientecursoId; + } + + public void setClientecursoId(Integer clientecursoId) { + this.clientecursoId = clientecursoId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Curso getCurso() { + return curso; + } + + public void setCurso(Curso curso) { + this.curso = curso; + } + + public Cliente getCliente() { + return cliente; + } + + public void setCliente(Cliente cliente) { + this.cliente = cliente; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClienteDescuento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteDescuento.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ClienteDescuento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteDescuento.java index 48e0f8731..b4b3c1018 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClienteDescuento.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteDescuento.java @@ -1,241 +1,241 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CLIENTE_DESCUENTO_SEQ", sequenceName = "CLIENTE_DESCUENTO_SEQ", allocationSize = 1) -@Table(name = "CLIENTE_DESCUENTO") -public class ClienteDescuento implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_DESCUENTO_SEQ") - @Column(name = "CLIENTEDESCUENTO_ID") - private Integer clienteDescuentoId; - @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") - @ManyToOne - private Cliente cliente; - @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada origem; - @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada destino; - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - @Column(name = "CANTMAXMES") - private Integer cantMaxMes; - @Column(name = "INDVENDER1PORCORRIDA") - private Boolean INDVENDER1PORCORRIDA; - @Column(name = "INDLUNES") - private Boolean INDLUNES; - @Column(name = "INDMARTES") - private Boolean INDMARTES; - @Column(name = "INDMIERCOLES") - private Boolean INDMIERCOLES; - @Column(name = "INDJUEVES") - private Boolean INDJUEVES; - @Column(name = "INDVIERNES") - private Boolean INDVIERNES; - @Column(name = "INDSABADO") - private Boolean INDSABADO; - @Column(name = "INDDOMINGO") - private Boolean INDDOMINGO; - @Column(name = "INDFORMAVALIDACIONESTUDIANTE") - private String indFormaValidacionEstudiante; - @Column(name = "FECINI") - @Temporal(TemporalType.DATE) - private Date fecIni; - @Column(name = "FECFIN") - @Temporal(TemporalType.DATE) - private Date FecFin; - @Column(name = "ACTIVO") - private Integer activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getClienteDescuentoId() { - return clienteDescuentoId; - } - - public void setClienteDescuentoId(Integer clienteDescuentoId) { - this.clienteDescuentoId = clienteDescuentoId; - } - - public Cliente getCliente() { - return cliente; - } - - public void setCliente(Cliente cliente) { - this.cliente = cliente; - } - - public Parada getOrigem() { - return origem; - } - - public void setOrigem(Parada origem) { - this.origem = origem; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Integer getCantMaxMes() { - return cantMaxMes; - } - - public void setCantMaxMes(Integer cantMaxMes) { - this.cantMaxMes = cantMaxMes; - } - - public Boolean getINDVENDER1PORCORRIDA() { - return INDVENDER1PORCORRIDA; - } - - public void setINDVENDER1PORCORRIDA(Boolean iNDVENDER1PORCORRIDA) { - INDVENDER1PORCORRIDA = iNDVENDER1PORCORRIDA; - } - - public Boolean getINDLUNES() { - return INDLUNES; - } - - public void setINDLUNES(Boolean iNDLUNES) { - INDLUNES = iNDLUNES; - } - - public Boolean getINDMARTES() { - return INDMARTES; - } - - public void setINDMARTES(Boolean iNDMARTES) { - INDMARTES = iNDMARTES; - } - - public Boolean getINDMIERCOLES() { - return INDMIERCOLES; - } - - public void setINDMIERCOLES(Boolean iNDMIERCOLES) { - INDMIERCOLES = iNDMIERCOLES; - } - - public Boolean getINDJUEVES() { - return INDJUEVES; - } - - public void setINDJUEVES(Boolean iNDJUEVES) { - INDJUEVES = iNDJUEVES; - } - - public Boolean getINDVIERNES() { - return INDVIERNES; - } - - public void setINDVIERNES(Boolean iNDVIERNES) { - INDVIERNES = iNDVIERNES; - } - - public Boolean getINDSABADO() { - return INDSABADO; - } - - public void setINDSABADO(Boolean iNDSABADO) { - INDSABADO = iNDSABADO; - } - - public Boolean getINDDOMINGO() { - return INDDOMINGO; - } - - public void setINDDOMINGO(Boolean iNDDOMINGO) { - INDDOMINGO = iNDDOMINGO; - } - - public Date getFecIni() { - return fecIni; - } - - public void setFecIni(Date fecIni) { - this.fecIni = fecIni; - } - - public Date getFecFin() { - return FecFin; - } - - public void setFecFin(Date fecFin) { - FecFin = fecFin; - } - - public Integer getActivo() { - return activo; - } - - public void setActivo(Integer activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getIndFormaValidacionEstudiante() { - return indFormaValidacionEstudiante; - } - - public void setIndFormaValidacionEstudiante(String indFormaValidacionEstudiante) { - this.indFormaValidacionEstudiante = indFormaValidacionEstudiante; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ClienteDescuento[ clienteDescuentoId=" + clienteDescuentoId + " ]"; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CLIENTE_DESCUENTO_SEQ", sequenceName = "CLIENTE_DESCUENTO_SEQ", allocationSize = 1) +@Table(name = "CLIENTE_DESCUENTO") +public class ClienteDescuento implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_DESCUENTO_SEQ") + @Column(name = "CLIENTEDESCUENTO_ID") + private Integer clienteDescuentoId; + @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") + @ManyToOne + private Cliente cliente; + @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada origem; + @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada destino; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @Column(name = "CANTMAXMES") + private Integer cantMaxMes; + @Column(name = "INDVENDER1PORCORRIDA") + private Boolean INDVENDER1PORCORRIDA; + @Column(name = "INDLUNES") + private Boolean INDLUNES; + @Column(name = "INDMARTES") + private Boolean INDMARTES; + @Column(name = "INDMIERCOLES") + private Boolean INDMIERCOLES; + @Column(name = "INDJUEVES") + private Boolean INDJUEVES; + @Column(name = "INDVIERNES") + private Boolean INDVIERNES; + @Column(name = "INDSABADO") + private Boolean INDSABADO; + @Column(name = "INDDOMINGO") + private Boolean INDDOMINGO; + @Column(name = "INDFORMAVALIDACIONESTUDIANTE") + private String indFormaValidacionEstudiante; + @Column(name = "FECINI") + @Temporal(TemporalType.DATE) + private Date fecIni; + @Column(name = "FECFIN") + @Temporal(TemporalType.DATE) + private Date FecFin; + @Column(name = "ACTIVO") + private Integer activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getClienteDescuentoId() { + return clienteDescuentoId; + } + + public void setClienteDescuentoId(Integer clienteDescuentoId) { + this.clienteDescuentoId = clienteDescuentoId; + } + + public Cliente getCliente() { + return cliente; + } + + public void setCliente(Cliente cliente) { + this.cliente = cliente; + } + + public Parada getOrigem() { + return origem; + } + + public void setOrigem(Parada origem) { + this.origem = origem; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Integer getCantMaxMes() { + return cantMaxMes; + } + + public void setCantMaxMes(Integer cantMaxMes) { + this.cantMaxMes = cantMaxMes; + } + + public Boolean getINDVENDER1PORCORRIDA() { + return INDVENDER1PORCORRIDA; + } + + public void setINDVENDER1PORCORRIDA(Boolean iNDVENDER1PORCORRIDA) { + INDVENDER1PORCORRIDA = iNDVENDER1PORCORRIDA; + } + + public Boolean getINDLUNES() { + return INDLUNES; + } + + public void setINDLUNES(Boolean iNDLUNES) { + INDLUNES = iNDLUNES; + } + + public Boolean getINDMARTES() { + return INDMARTES; + } + + public void setINDMARTES(Boolean iNDMARTES) { + INDMARTES = iNDMARTES; + } + + public Boolean getINDMIERCOLES() { + return INDMIERCOLES; + } + + public void setINDMIERCOLES(Boolean iNDMIERCOLES) { + INDMIERCOLES = iNDMIERCOLES; + } + + public Boolean getINDJUEVES() { + return INDJUEVES; + } + + public void setINDJUEVES(Boolean iNDJUEVES) { + INDJUEVES = iNDJUEVES; + } + + public Boolean getINDVIERNES() { + return INDVIERNES; + } + + public void setINDVIERNES(Boolean iNDVIERNES) { + INDVIERNES = iNDVIERNES; + } + + public Boolean getINDSABADO() { + return INDSABADO; + } + + public void setINDSABADO(Boolean iNDSABADO) { + INDSABADO = iNDSABADO; + } + + public Boolean getINDDOMINGO() { + return INDDOMINGO; + } + + public void setINDDOMINGO(Boolean iNDDOMINGO) { + INDDOMINGO = iNDDOMINGO; + } + + public Date getFecIni() { + return fecIni; + } + + public void setFecIni(Date fecIni) { + this.fecIni = fecIni; + } + + public Date getFecFin() { + return FecFin; + } + + public void setFecFin(Date fecFin) { + FecFin = fecFin; + } + + public Integer getActivo() { + return activo; + } + + public void setActivo(Integer activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getIndFormaValidacionEstudiante() { + return indFormaValidacionEstudiante; + } + + public void setIndFormaValidacionEstudiante(String indFormaValidacionEstudiante) { + this.indFormaValidacionEstudiante = indFormaValidacionEstudiante; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ClienteDescuento[ clienteDescuentoId=" + clienteDescuentoId + " ]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClienteDireccion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteDireccion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ClienteDireccion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteDireccion.java index 058ba6151..e5f6fc178 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClienteDireccion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteDireccion.java @@ -1,294 +1,294 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * - * @author RJ - */ -@Entity - -@SequenceGenerator(name = "CLIENTE_DIRECCION_SEQ", sequenceName = "CLIENTE_DIRECCION_SEQ", allocationSize = 1) -@Table(name = "CLIENTE_DIRECCION") - -public class ClienteDireccion implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_DIRECCION_SEQ") - @Column(name = "CLIENTEDIRECCION_ID") - private Integer clientedireccionId; - - @Column(name = "DESCCALLE") - private String desccalle; - - @Column(name = "DESCCALLECOMP") - private String desccallecomp; - - @Column(name = "DESCDELEGACION") - private String descdelegacion; - - @JoinColumn(name = "TIPODOMICILIO_ID") - @OneToOne(cascade=CascadeType.ALL) - private TipoDomicilio tipodomicilioId; - - @Column(name = "DESCPLANO") - private String descplano; - - @Column(name = "DESCCOORDENADA") - private String desccoordenada; - - @Column(name = "FECHORINICIOENTREGA") - @Temporal(TemporalType.TIMESTAMP) - private Date fechorinicioentrega; - - @Column(name = "FECHORFINENTREGA") - @Temporal(TemporalType.TIMESTAMP) - private Date fechorfinentrega; - - @Column(name = "COLONIA_ID") - private Integer coloniaId; - - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "NUMINTERIOR") - private String numinterior; - @Column(name = "NUMEXTERIOR") - private String numexterior; - @Column(name = "DESCCOLONIA") - private String desccolonia; - @Column(name = "CODPOSTAL") - private String codpostal; - @Column(name = "DESCIUDAD") - private String desciudad; - @Column(name = "DESESTADO") - private String desestado; - - - @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") - @ManyToOne - private Cliente clienteId; - - - public ClienteDireccion() { - - } - - public ClienteDireccion(Integer clientedireccionId) { - this.clientedireccionId = clientedireccionId; - } - - public Integer getClientedireccionId() { - return clientedireccionId; - } - - public void setClientedireccionId(Integer clientedireccionId) { - this.clientedireccionId = clientedireccionId; - } - - - public Cliente getClienteId() { - return clienteId; - } - - public void setClienteId(Cliente clienteId) { - this.clienteId = clienteId; - } - - public String getDesccalle() { - return desccalle; - } - - public void setDesccalle(String desccalle) { - this.desccalle = desccalle; - } - - public String getDesccallecomp() { - return desccallecomp; - } - - public void setDesccallecomp(String desccallecomp) { - this.desccallecomp = desccallecomp; - } - - public String getDescdelegacion() { - return descdelegacion; - } - - public void setDescdelegacion(String descdelegacion) { - this.descdelegacion = descdelegacion; - } - - public TipoDomicilio getTipodomicilioId() { - return tipodomicilioId; - } - - public void setTipodomicilioId(TipoDomicilio tipodomicilioId) { - this.tipodomicilioId = tipodomicilioId; - } - - public String getDescplano() { - return descplano; - } - - public void setDescplano(String descplano) { - this.descplano = descplano; - } - - public String getDesccoordenada() { - return desccoordenada; - } - - public void setDesccoordenada(String desccoordenada) { - this.desccoordenada = desccoordenada; - } - - public Date getFechorinicioentrega() { - return fechorinicioentrega; - } - - public void setFechorinicioentrega(Date fechorinicioentrega) { - this.fechorinicioentrega = fechorinicioentrega; - } - - public Date getFechorfinentrega() { - return fechorfinentrega; - } - - public void setFechorfinentrega(Date fechorfinentrega) { - this.fechorfinentrega = fechorfinentrega; - } - - public Integer getColoniaId() { - return coloniaId; - } - - public void setColoniaId(Integer coloniaId) { - this.coloniaId = coloniaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getNuminterior() { - return numinterior; - } - - public void setNuminterior(String numinterior) { - this.numinterior = numinterior; - } - - public String getNumexterior() { - return numexterior; - } - - public void setNumexterior(String numexterior) { - this.numexterior = numexterior; - } - - public String getDesccolonia() { - return desccolonia; - } - - public void setDesccolonia(String desccolonia) { - this.desccolonia = desccolonia; - } - - public String getCodpostal() { - return codpostal; - } - - public void setCodpostal(String codpostal) { - this.codpostal = codpostal; - } - - public String getDesciudad() { - return desciudad; - } - - public void setDesciudad(String desciudad) { - this.desciudad = desciudad; - } - - public String getDesestado() { - return desestado; - } - - public void setDesestado(String desestado) { - this.desestado = desestado; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (clientedireccionId != null ? clientedireccionId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ClienteDireccion)) { - return false; - } - ClienteDireccion other = (ClienteDireccion) object; - if ((this.clientedireccionId == null && other.clientedireccionId != null) || (this.clientedireccionId != null && !this.clientedireccionId.equals(other.clientedireccionId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ClienteDireccion[ clientedireccionId=" + clientedireccionId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author RJ + */ +@Entity + +@SequenceGenerator(name = "CLIENTE_DIRECCION_SEQ", sequenceName = "CLIENTE_DIRECCION_SEQ", allocationSize = 1) +@Table(name = "CLIENTE_DIRECCION") + +public class ClienteDireccion implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_DIRECCION_SEQ") + @Column(name = "CLIENTEDIRECCION_ID") + private Integer clientedireccionId; + + @Column(name = "DESCCALLE") + private String desccalle; + + @Column(name = "DESCCALLECOMP") + private String desccallecomp; + + @Column(name = "DESCDELEGACION") + private String descdelegacion; + + @JoinColumn(name = "TIPODOMICILIO_ID") + @OneToOne(cascade=CascadeType.ALL) + private TipoDomicilio tipodomicilioId; + + @Column(name = "DESCPLANO") + private String descplano; + + @Column(name = "DESCCOORDENADA") + private String desccoordenada; + + @Column(name = "FECHORINICIOENTREGA") + @Temporal(TemporalType.TIMESTAMP) + private Date fechorinicioentrega; + + @Column(name = "FECHORFINENTREGA") + @Temporal(TemporalType.TIMESTAMP) + private Date fechorfinentrega; + + @Column(name = "COLONIA_ID") + private Integer coloniaId; + + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "NUMINTERIOR") + private String numinterior; + @Column(name = "NUMEXTERIOR") + private String numexterior; + @Column(name = "DESCCOLONIA") + private String desccolonia; + @Column(name = "CODPOSTAL") + private String codpostal; + @Column(name = "DESCIUDAD") + private String desciudad; + @Column(name = "DESESTADO") + private String desestado; + + + @JoinColumn(name = "CLIENTE_ID", referencedColumnName = "CLIENTE_ID") + @ManyToOne + private Cliente clienteId; + + + public ClienteDireccion() { + + } + + public ClienteDireccion(Integer clientedireccionId) { + this.clientedireccionId = clientedireccionId; + } + + public Integer getClientedireccionId() { + return clientedireccionId; + } + + public void setClientedireccionId(Integer clientedireccionId) { + this.clientedireccionId = clientedireccionId; + } + + + public Cliente getClienteId() { + return clienteId; + } + + public void setClienteId(Cliente clienteId) { + this.clienteId = clienteId; + } + + public String getDesccalle() { + return desccalle; + } + + public void setDesccalle(String desccalle) { + this.desccalle = desccalle; + } + + public String getDesccallecomp() { + return desccallecomp; + } + + public void setDesccallecomp(String desccallecomp) { + this.desccallecomp = desccallecomp; + } + + public String getDescdelegacion() { + return descdelegacion; + } + + public void setDescdelegacion(String descdelegacion) { + this.descdelegacion = descdelegacion; + } + + public TipoDomicilio getTipodomicilioId() { + return tipodomicilioId; + } + + public void setTipodomicilioId(TipoDomicilio tipodomicilioId) { + this.tipodomicilioId = tipodomicilioId; + } + + public String getDescplano() { + return descplano; + } + + public void setDescplano(String descplano) { + this.descplano = descplano; + } + + public String getDesccoordenada() { + return desccoordenada; + } + + public void setDesccoordenada(String desccoordenada) { + this.desccoordenada = desccoordenada; + } + + public Date getFechorinicioentrega() { + return fechorinicioentrega; + } + + public void setFechorinicioentrega(Date fechorinicioentrega) { + this.fechorinicioentrega = fechorinicioentrega; + } + + public Date getFechorfinentrega() { + return fechorfinentrega; + } + + public void setFechorfinentrega(Date fechorfinentrega) { + this.fechorfinentrega = fechorfinentrega; + } + + public Integer getColoniaId() { + return coloniaId; + } + + public void setColoniaId(Integer coloniaId) { + this.coloniaId = coloniaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getNuminterior() { + return numinterior; + } + + public void setNuminterior(String numinterior) { + this.numinterior = numinterior; + } + + public String getNumexterior() { + return numexterior; + } + + public void setNumexterior(String numexterior) { + this.numexterior = numexterior; + } + + public String getDesccolonia() { + return desccolonia; + } + + public void setDesccolonia(String desccolonia) { + this.desccolonia = desccolonia; + } + + public String getCodpostal() { + return codpostal; + } + + public void setCodpostal(String codpostal) { + this.codpostal = codpostal; + } + + public String getDesciudad() { + return desciudad; + } + + public void setDesciudad(String desciudad) { + this.desciudad = desciudad; + } + + public String getDesestado() { + return desestado; + } + + public void setDesestado(String desestado) { + this.desestado = desestado; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (clientedireccionId != null ? clientedireccionId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ClienteDireccion)) { + return false; + } + ClienteDireccion other = (ClienteDireccion) object; + if ((this.clientedireccionId == null && other.clientedireccionId != null) || (this.clientedireccionId != null && !this.clientedireccionId.equals(other.clientedireccionId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ClienteDireccion[ clientedireccionId=" + clientedireccionId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClienteFidelidad.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteFidelidad.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ClienteFidelidad.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteFidelidad.java index d50ee3e0d..7ccc50b51 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClienteFidelidad.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClienteFidelidad.java @@ -1,129 +1,129 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CLIENTE_FIDELIDAD_SEQ", sequenceName = "CLIENTE_FIDELIDAD_SEQ", allocationSize = 1) -@Table(name = "CLIENTE_FIDELIDAD") -public class ClienteFidelidad implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_FIDELIDAD_SEQ") - @Column(name = "CLIENTEFIDELIDAD_ID") - private Integer clienteFidelidadId; - @OneToOne - @JoinColumn(name = "CLIENTE_ID") - private Cliente cliente; - @OneToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "TARJETAFIDELIDAD_ID") - private TarjetaFidelidad tarjetaFidelidad; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getClienteFidelidadId() { - return clienteFidelidadId; - } - - public void setClienteFidelidadId(Integer clienteFidelidadId) { - this.clienteFidelidadId = clienteFidelidadId; - } - - public TarjetaFidelidad getTarjetaFidelidad() { - return tarjetaFidelidad; - } - - public void setTarjetaFidelidad(TarjetaFidelidad tarjetaFidelidad) { - this.tarjetaFidelidad = tarjetaFidelidad; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Cliente getCliente() { - return cliente; - } - - public void setCliente(Cliente cliente) { - this.cliente = cliente; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((clienteFidelidadId == null) ? 0 : clienteFidelidadId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ClienteFidelidad other = (ClienteFidelidad) obj; - if (clienteFidelidadId == null) { - if (other.clienteFidelidadId != null) - return false; - } else if (!clienteFidelidadId.equals(other.clienteFidelidadId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CLIENTE_FIDELIDAD_SEQ", sequenceName = "CLIENTE_FIDELIDAD_SEQ", allocationSize = 1) +@Table(name = "CLIENTE_FIDELIDAD") +public class ClienteFidelidad implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLIENTE_FIDELIDAD_SEQ") + @Column(name = "CLIENTEFIDELIDAD_ID") + private Integer clienteFidelidadId; + @OneToOne + @JoinColumn(name = "CLIENTE_ID") + private Cliente cliente; + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "TARJETAFIDELIDAD_ID") + private TarjetaFidelidad tarjetaFidelidad; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getClienteFidelidadId() { + return clienteFidelidadId; + } + + public void setClienteFidelidadId(Integer clienteFidelidadId) { + this.clienteFidelidadId = clienteFidelidadId; + } + + public TarjetaFidelidad getTarjetaFidelidad() { + return tarjetaFidelidad; + } + + public void setTarjetaFidelidad(TarjetaFidelidad tarjetaFidelidad) { + this.tarjetaFidelidad = tarjetaFidelidad; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Cliente getCliente() { + return cliente; + } + + public void setCliente(Cliente cliente) { + this.cliente = cliente; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((clienteFidelidadId == null) ? 0 : clienteFidelidadId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ClienteFidelidad other = (ClienteFidelidad) obj; + if (clienteFidelidadId == null) { + if (other.clienteFidelidadId != null) + return false; + } else if (!clienteFidelidadId.equals(other.clienteFidelidadId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClientePacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClientePacote.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/entidad/ClientePacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClientePacote.java index 5e2a2bcc9..fb9f112cc 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClientePacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ClientePacote.java @@ -1,189 +1,189 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -import com.rjconsultores.ventaboletos.enums.TipoPessoa; - -@Entity -@SequenceGenerator(name = "CLIENTE_PACOTE_SEQ", sequenceName = "CLIENTE_PACOTE_SEQ", allocationSize = 1) -@Table(name = "CLIENTE_PACOTE") -public class ClientePacote implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "CLIENTEPACOTE_ID") - private Long clientepacoteId; - - @Column(name = "RAZAO_SOCIAL") - private String razaoSocial; - - @Column(name = "CPF_CNPJ") - private String cpfCnpj; - - @Column(name = "TIPO_PESSOA") - @Enumerated(EnumType.ORDINAL) - private TipoPessoa tipoPessoa; - - @Column(name = "DESCEMAIL") - private String descemail; - - @Column(name = "DESCTELEFONE") - private String desctelefone; - - @Column(name = "DESCFAX") - private String descfax; - - @Column(name = "CEP") - private String cep; - - @Column(name = "ENDERECO") - private String endereco; - - @Column(name = "NUMERO") - private String numero; - - @Column(name = "COMPLEMENTO") - private String complemento; - - @Column(name = "PAIS") - private String pais; - - @Column(name = "ESTADO") - private String estado; - - @Column(name = "CIDADE") - private String cidade; - - @Column(name = "BAIRRO") - private String bairro; - - public Long getClientepacoteId() { - return clientepacoteId; - } - - public void setClientepacoteId(Long clientepacoteId) { - this.clientepacoteId = clientepacoteId; - } - - public String getRazaoSocial() { - return razaoSocial; - } - - public void setRazaoSocial(String razaoSocial) { - this.razaoSocial = razaoSocial; - } - - public String getDescemail() { - return descemail; - } - - public void setDescemail(String descemail) { - this.descemail = descemail; - } - - public String getDesctelefone() { - return desctelefone; - } - - public void setDesctelefone(String desctelefone) { - this.desctelefone = desctelefone; - } - - public String getDescfax() { - return descfax; - } - - public void setDescfax(String descfax) { - this.descfax = descfax; - } - - public String getCep() { - return cep; - } - - public void setCep(String cep) { - this.cep = cep; - } - - public String getEndereco() { - return endereco; - } - - public void setEndereco(String endereco) { - this.endereco = endereco; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getPais() { - return pais; - } - - public void setPais(String pais) { - this.pais = pais; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public String getCidade() { - return cidade; - } - - public void setCidade(String cidade) { - this.cidade = cidade; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public String getCpfCnpj() { - return cpfCnpj; - } - - public void setCpfCnpj(String cpfCnpj) { - this.cpfCnpj = cpfCnpj; - } - - public TipoPessoa getTipoPessoa() { - return tipoPessoa; - } - - public void setTipoPessoa(TipoPessoa tipoPessoa) { - this.tipoPessoa = tipoPessoa; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +import com.rjconsultores.ventaboletos.enums.TipoPessoa; + +@Entity +@SequenceGenerator(name = "CLIENTE_PACOTE_SEQ", sequenceName = "CLIENTE_PACOTE_SEQ", allocationSize = 1) +@Table(name = "CLIENTE_PACOTE") +public class ClientePacote implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "CLIENTEPACOTE_ID") + private Long clientepacoteId; + + @Column(name = "RAZAO_SOCIAL") + private String razaoSocial; + + @Column(name = "CPF_CNPJ") + private String cpfCnpj; + + @Column(name = "TIPO_PESSOA") + @Enumerated(EnumType.ORDINAL) + private TipoPessoa tipoPessoa; + + @Column(name = "DESCEMAIL") + private String descemail; + + @Column(name = "DESCTELEFONE") + private String desctelefone; + + @Column(name = "DESCFAX") + private String descfax; + + @Column(name = "CEP") + private String cep; + + @Column(name = "ENDERECO") + private String endereco; + + @Column(name = "NUMERO") + private String numero; + + @Column(name = "COMPLEMENTO") + private String complemento; + + @Column(name = "PAIS") + private String pais; + + @Column(name = "ESTADO") + private String estado; + + @Column(name = "CIDADE") + private String cidade; + + @Column(name = "BAIRRO") + private String bairro; + + public Long getClientepacoteId() { + return clientepacoteId; + } + + public void setClientepacoteId(Long clientepacoteId) { + this.clientepacoteId = clientepacoteId; + } + + public String getRazaoSocial() { + return razaoSocial; + } + + public void setRazaoSocial(String razaoSocial) { + this.razaoSocial = razaoSocial; + } + + public String getDescemail() { + return descemail; + } + + public void setDescemail(String descemail) { + this.descemail = descemail; + } + + public String getDesctelefone() { + return desctelefone; + } + + public void setDesctelefone(String desctelefone) { + this.desctelefone = desctelefone; + } + + public String getDescfax() { + return descfax; + } + + public void setDescfax(String descfax) { + this.descfax = descfax; + } + + public String getCep() { + return cep; + } + + public void setCep(String cep) { + this.cep = cep; + } + + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getPais() { + return pais; + } + + public void setPais(String pais) { + this.pais = pais; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public String getCpfCnpj() { + return cpfCnpj; + } + + public void setCpfCnpj(String cpfCnpj) { + this.cpfCnpj = cpfCnpj; + } + + public TipoPessoa getTipoPessoa() { + return tipoPessoa; + } + + public void setTipoPessoa(TipoPessoa tipoPessoa) { + this.tipoPessoa = tipoPessoa; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdcPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdcPuntoVenta.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CobrancaAdcPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdcPuntoVenta.java index f9ea74889..127b7216d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdcPuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdcPuntoVenta.java @@ -1,348 +1,348 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * @author vjcor - * - */ -@AuditarClasse(nome = "CobrancaAdcPuntoVenta", tela = "auditarClasse.CobrancaAdcPuntoVenta") -@Entity -@SequenceGenerator(name = "COBRANCA_ADC_SEQ", sequenceName = "COBRANCA_ADC_SEQ", allocationSize = 1) -@Table(name = "COBRANCA_ADC_PUNTO_VENTA") -public class CobrancaAdcPuntoVenta implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COBRANCA_ADC_SEQ") - @Column(name = "COBRANCAADDPUNTOVENTA_ID") - private Integer cobrancaAddPuntoVenta_id; - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - - @Column(name = "DESCRICAO") - private String descricao; - - @Column(name = "VALOR") - private BigDecimal valor; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "DIARIO") - private Boolean diario; - - @Column(name = "SEMANAL") - private Boolean semanal; - - @Column(name = "MENSAL") - private Boolean mensal; - - @Column(name = "SEGUNDA") - private Boolean segunda; - - @Column(name = "TERCA") - private Boolean terca; - - @Column(name = "QUARTA") - private Boolean quarta; - - @Column(name = "QUINTA") - private Boolean quinta; - - @Column(name = "SEXTA") - private Boolean sexta; - - @Column(name = "PRIMEIRO_DIA_UTIL") - private Boolean primeiroDiaUtil; - - @Column(name = "ULTIMO_DIA_UTIL") - private Boolean ultimoDiaUtil; - - @Column(name = "DESCONTO_PROXIMO_CICLO") - private Boolean descontarProximoCiclo; - - @Column(name = "DESCONTO_PROXIMO_DIA") - private Boolean descontarProximoDia; - - @Column(name = "DATAINICIAL") - @Temporal(TemporalType.TIMESTAMP) - private Date dataInicial; - - @Column(name = "DATAFINAL") - @Temporal(TemporalType.TIMESTAMP) - private Date dataFinal; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private CobrancaAdcPuntoVenta cobrancaAdcPuntoVentaClone; - - private Boolean getBoolean(Boolean valor) { - return valor == null ? false : valor; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - public Integer getCobrancaAddPuntoVenta_id() { - return cobrancaAddPuntoVenta_id; - } - - public void setCobrancaAddPuntoVenta_id(Integer cobrancaAddPuntoVenta_id) { - this.cobrancaAddPuntoVenta_id = cobrancaAddPuntoVenta_id; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getDiario() { - return getBoolean(diario); - } - - public void setDiario(Boolean diario) { - this.diario = diario; - } - - public Boolean getSemanal() { - return getBoolean(semanal); - } - - public void setSemanal(Boolean semanal) { - this.semanal = semanal; - } - - public Boolean getMensal() { - return getBoolean(mensal); - } - - public void setMensal(Boolean mensal) { - this.mensal = mensal; - } - - public Boolean getSegunda() { - return getBoolean(segunda); - } - - public void setSegunda(Boolean segunda) { - this.segunda = segunda; - } - - public Boolean getTerca() { - return getBoolean(terca); - } - - public void setTerca(Boolean terca) { - this.terca = terca; - } - - public Boolean getQuarta() { - return getBoolean(quarta); - } - - public void setQuarta(Boolean quarta) { - this.quarta = quarta; - } - - public Boolean getQuinta() { - return getBoolean(quinta); - } - - public void setQuinta(Boolean quinta) { - this.quinta = quinta; - } - - public Boolean getSexta() { - return getBoolean(sexta); - } - - public void setSexta(Boolean sexta) { - this.sexta = sexta; - } - - public Boolean getPrimeiroDiaUtil() { - return getBoolean(primeiroDiaUtil); - } - - public void setPrimeiroDiaUtil(Boolean primeiroDiaUtil) { - this.primeiroDiaUtil = primeiroDiaUtil; - } - - public Boolean getUltimoDiaUtil() { - return getBoolean(ultimoDiaUtil); - } - - public void setUltimoDiaUtil(Boolean ultimoDiaUtil) { - this.ultimoDiaUtil = ultimoDiaUtil; - } - - public Boolean getActivo() { - return getBoolean(activo); - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getDescontarProximoCiclo() { - return descontarProximoCiclo; - } - - public void setDescontarProximoCiclo(Boolean descontarProximoCiclo) { - this.descontarProximoCiclo = descontarProximoCiclo; - } - - public Boolean getDescontarProximoDia() { - return descontarProximoDia; - } - - public void setDescontarProximoDia(Boolean descontarProximoDia) { - this.descontarProximoDia = descontarProximoDia; - } - - public Date getDataInicial() { - return dataInicial; - } - - public void setDataInicial(Date dataInicial) { - this.dataInicial = dataInicial; - } - - public Date getDataFinal() { - return dataFinal; - } - - public void setDataFinal(Date dataFinal) { - this.dataFinal = dataFinal; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((cobrancaAddPuntoVenta_id == null) ? 0 : cobrancaAddPuntoVenta_id.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - CobrancaAdcPuntoVenta other = (CobrancaAdcPuntoVenta) obj; - if (cobrancaAddPuntoVenta_id == null) { - if (other.cobrancaAddPuntoVenta_id != null) - return false; - } else if (!cobrancaAddPuntoVenta_id.equals(other.cobrancaAddPuntoVenta_id)) - return false; - return true; - } - - @Override - public String toString() { - return this.getDescricao(); - } - - @Override - public void clonar() throws CloneNotSupportedException { - - cobrancaAdcPuntoVentaClone = new CobrancaAdcPuntoVenta(); - cobrancaAdcPuntoVentaClone = (CobrancaAdcPuntoVenta) this.clone(); - Hibernate.initialize(cobrancaAdcPuntoVentaClone.getPuntoVenta()); - - } - - @Override - public CobrancaAdcPuntoVenta getCloneObject() throws CloneNotSupportedException { - return cobrancaAdcPuntoVentaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getCobrancaAddPuntoVenta_id()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * @author vjcor + * + */ +@AuditarClasse(nome = "CobrancaAdcPuntoVenta", tela = "auditarClasse.CobrancaAdcPuntoVenta") +@Entity +@SequenceGenerator(name = "COBRANCA_ADC_SEQ", sequenceName = "COBRANCA_ADC_SEQ", allocationSize = 1) +@Table(name = "COBRANCA_ADC_PUNTO_VENTA") +public class CobrancaAdcPuntoVenta implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COBRANCA_ADC_SEQ") + @Column(name = "COBRANCAADDPUNTOVENTA_ID") + private Integer cobrancaAddPuntoVenta_id; + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + + @Column(name = "DESCRICAO") + private String descricao; + + @Column(name = "VALOR") + private BigDecimal valor; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "DIARIO") + private Boolean diario; + + @Column(name = "SEMANAL") + private Boolean semanal; + + @Column(name = "MENSAL") + private Boolean mensal; + + @Column(name = "SEGUNDA") + private Boolean segunda; + + @Column(name = "TERCA") + private Boolean terca; + + @Column(name = "QUARTA") + private Boolean quarta; + + @Column(name = "QUINTA") + private Boolean quinta; + + @Column(name = "SEXTA") + private Boolean sexta; + + @Column(name = "PRIMEIRO_DIA_UTIL") + private Boolean primeiroDiaUtil; + + @Column(name = "ULTIMO_DIA_UTIL") + private Boolean ultimoDiaUtil; + + @Column(name = "DESCONTO_PROXIMO_CICLO") + private Boolean descontarProximoCiclo; + + @Column(name = "DESCONTO_PROXIMO_DIA") + private Boolean descontarProximoDia; + + @Column(name = "DATAINICIAL") + @Temporal(TemporalType.TIMESTAMP) + private Date dataInicial; + + @Column(name = "DATAFINAL") + @Temporal(TemporalType.TIMESTAMP) + private Date dataFinal; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private CobrancaAdcPuntoVenta cobrancaAdcPuntoVentaClone; + + private Boolean getBoolean(Boolean valor) { + return valor == null ? false : valor; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + public Integer getCobrancaAddPuntoVenta_id() { + return cobrancaAddPuntoVenta_id; + } + + public void setCobrancaAddPuntoVenta_id(Integer cobrancaAddPuntoVenta_id) { + this.cobrancaAddPuntoVenta_id = cobrancaAddPuntoVenta_id; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getDiario() { + return getBoolean(diario); + } + + public void setDiario(Boolean diario) { + this.diario = diario; + } + + public Boolean getSemanal() { + return getBoolean(semanal); + } + + public void setSemanal(Boolean semanal) { + this.semanal = semanal; + } + + public Boolean getMensal() { + return getBoolean(mensal); + } + + public void setMensal(Boolean mensal) { + this.mensal = mensal; + } + + public Boolean getSegunda() { + return getBoolean(segunda); + } + + public void setSegunda(Boolean segunda) { + this.segunda = segunda; + } + + public Boolean getTerca() { + return getBoolean(terca); + } + + public void setTerca(Boolean terca) { + this.terca = terca; + } + + public Boolean getQuarta() { + return getBoolean(quarta); + } + + public void setQuarta(Boolean quarta) { + this.quarta = quarta; + } + + public Boolean getQuinta() { + return getBoolean(quinta); + } + + public void setQuinta(Boolean quinta) { + this.quinta = quinta; + } + + public Boolean getSexta() { + return getBoolean(sexta); + } + + public void setSexta(Boolean sexta) { + this.sexta = sexta; + } + + public Boolean getPrimeiroDiaUtil() { + return getBoolean(primeiroDiaUtil); + } + + public void setPrimeiroDiaUtil(Boolean primeiroDiaUtil) { + this.primeiroDiaUtil = primeiroDiaUtil; + } + + public Boolean getUltimoDiaUtil() { + return getBoolean(ultimoDiaUtil); + } + + public void setUltimoDiaUtil(Boolean ultimoDiaUtil) { + this.ultimoDiaUtil = ultimoDiaUtil; + } + + public Boolean getActivo() { + return getBoolean(activo); + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getDescontarProximoCiclo() { + return descontarProximoCiclo; + } + + public void setDescontarProximoCiclo(Boolean descontarProximoCiclo) { + this.descontarProximoCiclo = descontarProximoCiclo; + } + + public Boolean getDescontarProximoDia() { + return descontarProximoDia; + } + + public void setDescontarProximoDia(Boolean descontarProximoDia) { + this.descontarProximoDia = descontarProximoDia; + } + + public Date getDataInicial() { + return dataInicial; + } + + public void setDataInicial(Date dataInicial) { + this.dataInicial = dataInicial; + } + + public Date getDataFinal() { + return dataFinal; + } + + public void setDataFinal(Date dataFinal) { + this.dataFinal = dataFinal; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((cobrancaAddPuntoVenta_id == null) ? 0 : cobrancaAddPuntoVenta_id.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CobrancaAdcPuntoVenta other = (CobrancaAdcPuntoVenta) obj; + if (cobrancaAddPuntoVenta_id == null) { + if (other.cobrancaAddPuntoVenta_id != null) + return false; + } else if (!cobrancaAddPuntoVenta_id.equals(other.cobrancaAddPuntoVenta_id)) + return false; + return true; + } + + @Override + public String toString() { + return this.getDescricao(); + } + + @Override + public void clonar() throws CloneNotSupportedException { + + cobrancaAdcPuntoVentaClone = new CobrancaAdcPuntoVenta(); + cobrancaAdcPuntoVentaClone = (CobrancaAdcPuntoVenta) this.clone(); + Hibernate.initialize(cobrancaAdcPuntoVentaClone.getPuntoVenta()); + + } + + @Override + public CobrancaAdcPuntoVenta getCloneObject() throws CloneNotSupportedException { + return cobrancaAdcPuntoVentaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getCobrancaAddPuntoVenta_id()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdicionalHistorico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdicionalHistorico.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CobrancaAdicionalHistorico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdicionalHistorico.java index d7f079f06..a8f5e913b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdicionalHistorico.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CobrancaAdicionalHistorico.java @@ -1,167 +1,167 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author vjcor - * - */ -@Entity -@SequenceGenerator(name = "COBRANCA_ADC_HIST_SEQ", sequenceName = "COBRANCA_ADC_HIST_SEQ", allocationSize = 1) -@Table(name = "COBRANCA_ADICIONAL_HISTORICO") -public class CobrancaAdicionalHistorico implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COBRANCA_ADC_HIST_SEQ") - @Column(name = "COBRANCAADICIONALHISTORICO_ID") - private Long cobrancaAdicionalHistoricoID; - - @JoinColumn(name = "COBRANCAADDPUNTOVENTA_ID") - @ManyToOne - private CobrancaAdcPuntoVenta cobrancaAdicional; - - @Column(name = "CONTACORRENTEPTOVTA_ID") - private Long contaCorrentePtoVtaId; - - @Column(name = "PUNTOVENTA_ID") - private Integer puntoVentaId; - - @Column(name = "VALOR_COBRANCA") - private BigDecimal valorCobranca; - - @Column(name = "VALOR_ACUMULADO") - private BigDecimal valorAcumulado; - - @Column(name = "VALOR_APLICADO") - private BigDecimal valorAplicado; - - @Column(name = "COBRANCA_EFETUADA") - private Boolean cobrancaEfetuada; - - @Column(name = "FREQUENCIA_NA_DATA") - private String frequenciaNaData; - - @Column(name = "DATA_REGISTRO") - @Temporal(TemporalType.TIMESTAMP) - private Date dataRegistro; - - @Column(name = "MOTIVO") - private String motivo; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getCobrancaAdicionalHistoricoID() { - return cobrancaAdicionalHistoricoID; - } - - public void setCobrancaAdicionalHistoricoID(Long cobrancaAdicionalHistoricoID) { - this.cobrancaAdicionalHistoricoID = cobrancaAdicionalHistoricoID; - } - - public CobrancaAdcPuntoVenta getCobrancaAdicional() { - return cobrancaAdicional; - } - - public void setCobrancaAdicional(CobrancaAdcPuntoVenta cobrancaAdicional) { - this.cobrancaAdicional = cobrancaAdicional; - } - - public Long getContaCorrentePtoVtaId() { - return contaCorrentePtoVtaId; - } - - public void setContaCorrentePtoVtaId(Long contaCorrentePtoVtaId) { - this.contaCorrentePtoVtaId = contaCorrentePtoVtaId; - } - - public Integer getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - - public BigDecimal getValorCobranca() { - return valorCobranca; - } - - public void setValorCobranca(BigDecimal valorCobranca) { - this.valorCobranca = valorCobranca; - } - - public BigDecimal getValorAcumulado() { - return valorAcumulado; - } - - public void setValorAcumulado(BigDecimal valorAcumulado) { - this.valorAcumulado = valorAcumulado; - } - - public BigDecimal getValorAplicado() { - return valorAplicado; - } - - public void setValorAplicado(BigDecimal valorAplicado) { - this.valorAplicado = valorAplicado; - } - - public Boolean getCobrancaEfetuada() { - return cobrancaEfetuada == null ? false : cobrancaEfetuada; - } - - public void setCobrancaEfetuada(Boolean cobrancaEfetuada) { - this.cobrancaEfetuada = cobrancaEfetuada; - } - - public String getFrequenciaNaData() { - return frequenciaNaData; - } - - public void setFrequenciaNaData(String frequenciaNaData) { - this.frequenciaNaData = frequenciaNaData; - } - - public Date getDataRegistro() { - return dataRegistro; - } - - public void setDataRegistro(Date dataRegistro) { - this.dataRegistro = dataRegistro; - } - - public String getMotivo() { - return motivo; - } - - public void setMotivo(String motivo) { - this.motivo = motivo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author vjcor + * + */ +@Entity +@SequenceGenerator(name = "COBRANCA_ADC_HIST_SEQ", sequenceName = "COBRANCA_ADC_HIST_SEQ", allocationSize = 1) +@Table(name = "COBRANCA_ADICIONAL_HISTORICO") +public class CobrancaAdicionalHistorico implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COBRANCA_ADC_HIST_SEQ") + @Column(name = "COBRANCAADICIONALHISTORICO_ID") + private Long cobrancaAdicionalHistoricoID; + + @JoinColumn(name = "COBRANCAADDPUNTOVENTA_ID") + @ManyToOne + private CobrancaAdcPuntoVenta cobrancaAdicional; + + @Column(name = "CONTACORRENTEPTOVTA_ID") + private Long contaCorrentePtoVtaId; + + @Column(name = "PUNTOVENTA_ID") + private Integer puntoVentaId; + + @Column(name = "VALOR_COBRANCA") + private BigDecimal valorCobranca; + + @Column(name = "VALOR_ACUMULADO") + private BigDecimal valorAcumulado; + + @Column(name = "VALOR_APLICADO") + private BigDecimal valorAplicado; + + @Column(name = "COBRANCA_EFETUADA") + private Boolean cobrancaEfetuada; + + @Column(name = "FREQUENCIA_NA_DATA") + private String frequenciaNaData; + + @Column(name = "DATA_REGISTRO") + @Temporal(TemporalType.TIMESTAMP) + private Date dataRegistro; + + @Column(name = "MOTIVO") + private String motivo; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getCobrancaAdicionalHistoricoID() { + return cobrancaAdicionalHistoricoID; + } + + public void setCobrancaAdicionalHistoricoID(Long cobrancaAdicionalHistoricoID) { + this.cobrancaAdicionalHistoricoID = cobrancaAdicionalHistoricoID; + } + + public CobrancaAdcPuntoVenta getCobrancaAdicional() { + return cobrancaAdicional; + } + + public void setCobrancaAdicional(CobrancaAdcPuntoVenta cobrancaAdicional) { + this.cobrancaAdicional = cobrancaAdicional; + } + + public Long getContaCorrentePtoVtaId() { + return contaCorrentePtoVtaId; + } + + public void setContaCorrentePtoVtaId(Long contaCorrentePtoVtaId) { + this.contaCorrentePtoVtaId = contaCorrentePtoVtaId; + } + + public Integer getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + + public BigDecimal getValorCobranca() { + return valorCobranca; + } + + public void setValorCobranca(BigDecimal valorCobranca) { + this.valorCobranca = valorCobranca; + } + + public BigDecimal getValorAcumulado() { + return valorAcumulado; + } + + public void setValorAcumulado(BigDecimal valorAcumulado) { + this.valorAcumulado = valorAcumulado; + } + + public BigDecimal getValorAplicado() { + return valorAplicado; + } + + public void setValorAplicado(BigDecimal valorAplicado) { + this.valorAplicado = valorAplicado; + } + + public Boolean getCobrancaEfetuada() { + return cobrancaEfetuada == null ? false : cobrancaEfetuada; + } + + public void setCobrancaEfetuada(Boolean cobrancaEfetuada) { + this.cobrancaEfetuada = cobrancaEfetuada; + } + + public String getFrequenciaNaData() { + return frequenciaNaData; + } + + public void setFrequenciaNaData(String frequenciaNaData) { + this.frequenciaNaData = frequenciaNaData; + } + + public Date getDataRegistro() { + return dataRegistro; + } + + public void setDataRegistro(Date dataRegistro) { + this.dataRegistro = dataRegistro; + } + + public String getMotivo() { + return motivo; + } + + public void setMotivo(String motivo) { + this.motivo = motivo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CodigoBarraTrecho.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CodigoBarraTrecho.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CodigoBarraTrecho.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CodigoBarraTrecho.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CoeficienteTarifa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CoeficienteTarifa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CoeficienteTarifa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CoeficienteTarifa.java index 155aff120..5b894420a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CoeficienteTarifa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CoeficienteTarifa.java @@ -1,145 +1,145 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "CoeficienteTarifa", tela = "auditarClasse.CoeficienteTarifa") -@Entity -@SequenceGenerator(name = "COEFICIENTE_TARIFA_SEQ", sequenceName = "COEFICIENTE_TARIFA_SEQ", allocationSize = 1) -@Table(name = "COEFICIENTE_TARIFA") -public class CoeficienteTarifa implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COEFICIENTE_TARIFA_SEQ") - @Column(name = "COEFICIENTETARIFA_ID") - private Integer coeficienteId; - @Column(name = "DESCCOEFICIENTE") - private String descCoeficiente; - @Column(name = "COEFICIENTE") - private BigDecimal coeficiente; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private CoeficienteTarifa coeficienteTarifaClone; - - public Integer getCoeficienteId() { - return coeficienteId; - } - - public void setCoeficienteId(Integer coeficienteId) { - this.coeficienteId = coeficienteId; - } - - public String getDescCoeficiente() { - return descCoeficiente; - } - - public void setDescCoeficiente(String descCoeficiente) { - this.descCoeficiente = descCoeficiente; - } - - public BigDecimal getCoeficiente() { - return coeficiente; - } - - public void setCoeficiente(BigDecimal coeficiente) { - this.coeficiente = coeficiente; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public CoeficienteTarifa getCloneObject() throws CloneNotSupportedException { - return coeficienteTarifaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getCoeficienteId()); - } - - @Override - public void clonar() throws CloneNotSupportedException { - coeficienteTarifaClone = new CoeficienteTarifa(); - coeficienteTarifaClone = (CoeficienteTarifa) this.clone(); - - } - - @Override - public String toString() { - return descCoeficiente + " - " + coeficiente; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((coeficienteId == null) ? 0 : coeficienteId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - CoeficienteTarifa other = (CoeficienteTarifa) obj; - if (coeficienteId == null) { - if (other.coeficienteId != null) - return false; - } else if (!coeficienteId.equals(other.coeficienteId)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "CoeficienteTarifa", tela = "auditarClasse.CoeficienteTarifa") +@Entity +@SequenceGenerator(name = "COEFICIENTE_TARIFA_SEQ", sequenceName = "COEFICIENTE_TARIFA_SEQ", allocationSize = 1) +@Table(name = "COEFICIENTE_TARIFA") +public class CoeficienteTarifa implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COEFICIENTE_TARIFA_SEQ") + @Column(name = "COEFICIENTETARIFA_ID") + private Integer coeficienteId; + @Column(name = "DESCCOEFICIENTE") + private String descCoeficiente; + @Column(name = "COEFICIENTE") + private BigDecimal coeficiente; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private CoeficienteTarifa coeficienteTarifaClone; + + public Integer getCoeficienteId() { + return coeficienteId; + } + + public void setCoeficienteId(Integer coeficienteId) { + this.coeficienteId = coeficienteId; + } + + public String getDescCoeficiente() { + return descCoeficiente; + } + + public void setDescCoeficiente(String descCoeficiente) { + this.descCoeficiente = descCoeficiente; + } + + public BigDecimal getCoeficiente() { + return coeficiente; + } + + public void setCoeficiente(BigDecimal coeficiente) { + this.coeficiente = coeficiente; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public CoeficienteTarifa getCloneObject() throws CloneNotSupportedException { + return coeficienteTarifaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getCoeficienteId()); + } + + @Override + public void clonar() throws CloneNotSupportedException { + coeficienteTarifaClone = new CoeficienteTarifa(); + coeficienteTarifaClone = (CoeficienteTarifa) this.clone(); + + } + + @Override + public String toString() { + return descCoeficiente + " - " + coeficiente; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((coeficienteId == null) ? 0 : coeficienteId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CoeficienteTarifa other = (CoeficienteTarifa) obj; + if (coeficienteId == null) { + if (other.coeficienteId != null) + return false; + } else if (!coeficienteId.equals(other.coeficienteId)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Colonia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Colonia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Colonia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Colonia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComEmpCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpCategoria.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ComEmpCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpCategoria.java index 49fc418e3..788d94ab3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ComEmpCategoria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpCategoria.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COM_EMP_CATEGORIA_SEQ", sequenceName = "COM_EMP_CATEGORIA_SEQ", allocationSize = 1) -@Table(name = "COM_EMP_CATEGORIA") -public class ComEmpCategoria implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_CATEGORIA_SEQ") - @Column(name = "COMEMPCATEGORIA_ID") - private Long comempcategoriaId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CATEGORIA_ID") - private Categoria categoria; - - @Column(name = "ACTIVO") - private boolean activo; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - public Long getComempcategoriaId() { - return comempcategoriaId; - } - - public void setComempcategoriaId(Long comempcategoriaId) { - this.comempcategoriaId = comempcategoriaId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Categoria getCategoria() { - return categoria; - } - - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((comempcategoriaId == null) ? 0 : comempcategoriaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - ComEmpCategoria other = (ComEmpCategoria) obj; - if (comempcategoriaId == null) { - if (other.comempcategoriaId != null) - return false; - } else if (!comempcategoriaId.equals(other.comempcategoriaId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COM_EMP_CATEGORIA_SEQ", sequenceName = "COM_EMP_CATEGORIA_SEQ", allocationSize = 1) +@Table(name = "COM_EMP_CATEGORIA") +public class ComEmpCategoria implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_CATEGORIA_SEQ") + @Column(name = "COMEMPCATEGORIA_ID") + private Long comempcategoriaId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CATEGORIA_ID") + private Categoria categoria; + + @Column(name = "ACTIVO") + private boolean activo; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + public Long getComempcategoriaId() { + return comempcategoriaId; + } + + public void setComempcategoriaId(Long comempcategoriaId) { + this.comempcategoriaId = comempcategoriaId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((comempcategoriaId == null) ? 0 : comempcategoriaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + ComEmpCategoria other = (ComEmpCategoria) obj; + if (comempcategoriaId == null) { + if (other.comempcategoriaId != null) + return false; + } else if (!comempcategoriaId.equals(other.comempcategoriaId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java index c9f6632bb..db7b48321 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpConferencia.java @@ -1,232 +1,232 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COM_EMP_CONFERENCIA_SEQ", sequenceName = "COM_EMP_CONFERENCIA_SEQ", allocationSize = 1) -@Table(name = "COM_EMP_CONFERENCIA") -public class ComEmpConferencia implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_CONFERENCIA_SEQ") - @Column(name = "COMEMPCONFERENCIA_ID") - private Long comempconferenciaId; - - @Column(name = "INDBILHETEMANUAL") - private Boolean indbilhetemanual; - - @Column(name = "INDBILHETEVENDIDO") - private Boolean indbilhetevendido; - - @Column(name = "INDBILHETECANCELADO") - private Boolean indbilhetecancelado; - - @Column(name = "INDBILHETEDEVOLVIDO") - private Boolean indbilhetedevolvido; - - @Column(name = "INDGAPVENDIDO") - private Boolean indgapvendido; - - @Column(name = "INDGAPCANCELADO") - private Boolean indgapcancelado; - - @Column(name = "INDGAPDEVOLVIDO") - private Boolean indgapdevolvido; - - @Column(name = "INDEVENTOSFINANCEIROS") - private Boolean indeventosfinanceiros; - - @Column(name = "INDOCD") - private Boolean indocd; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "INDTIPO_DEB_CRED") - private Integer tipoDebitoCredito; - - @Column(name = "ACTIVO") - private boolean activo; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - public ComEmpConferencia() { - super(); - setIndbilhetecancelado(Boolean.FALSE); - setIndbilhetevendido(Boolean.FALSE); - setIndbilhetedevolvido(Boolean.FALSE); - setIndgapcancelado(Boolean.FALSE); - setIndgapdevolvido(Boolean.FALSE); - setIndgapvendido(Boolean.FALSE); - setIndeventosfinanceiros(Boolean.FALSE); - setIndocd(Boolean.FALSE); - } - - public Long getComempconferenciaId() { - return comempconferenciaId; - } - - public void setComempconferenciaId(Long comempconferenciaId) { - this.comempconferenciaId = comempconferenciaId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getComempconferenciaId() == null) ? 0 : getComempconferenciaId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ComEmpConferencia)) - return false; - ComEmpConferencia other = (ComEmpConferencia) obj; - if (getComempconferenciaId() == null) { - if (other.getComempconferenciaId() != null) - return false; - } else if (!getComempconferenciaId().equals(other.getComempconferenciaId())) - return false; - return true; - } - - public Boolean getIndbilhetemanual() { - return indbilhetemanual; - } - - public void setIndbilhetemanual(Boolean indbilhetemanual) { - this.indbilhetemanual = indbilhetemanual; - } - - public Boolean getIndbilhetevendido() { - return indbilhetevendido; - } - - public void setIndbilhetevendido(Boolean indbilhetevendido) { - this.indbilhetevendido = indbilhetevendido; - } - - public Boolean getIndbilhetecancelado() { - return indbilhetecancelado; - } - - public void setIndbilhetecancelado(Boolean indbilhetecancelado) { - this.indbilhetecancelado = indbilhetecancelado; - } - - public Boolean getIndbilhetedevolvido() { - return indbilhetedevolvido; - } - - public void setIndbilhetedevolvido(Boolean indbilhetedevolvido) { - this.indbilhetedevolvido = indbilhetedevolvido; - } - - public Boolean getIndgapvendido() { - return indgapvendido; - } - - public void setIndgapvendido(Boolean indgapvendido) { - this.indgapvendido = indgapvendido; - } - - public Boolean getIndgapcancelado() { - return indgapcancelado; - } - - public void setIndgapcancelado(Boolean indgapcancelado) { - this.indgapcancelado = indgapcancelado; - } - - public Boolean getIndgapdevolvido() { - return indgapdevolvido; - } - - public void setIndgapdevolvido(Boolean indgapdevolvido) { - this.indgapdevolvido = indgapdevolvido; - } - - public Boolean getIndeventosfinanceiros() { - return indeventosfinanceiros; - } - - public void setIndeventosfinanceiros(Boolean indeventosfinanceiros) { - this.indeventosfinanceiros = indeventosfinanceiros; - } - - public Boolean getIndocd() { - return indocd; - } - - public void setIndocd(Boolean indocd) { - this.indocd = indocd; - } - - public Integer getTipoDebitoCredito() { - return tipoDebitoCredito; - } - - public void setTipoDebitoCredito(int tipoDebitoCredito) { - this.tipoDebitoCredito = tipoDebitoCredito; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COM_EMP_CONFERENCIA_SEQ", sequenceName = "COM_EMP_CONFERENCIA_SEQ", allocationSize = 1) +@Table(name = "COM_EMP_CONFERENCIA") +public class ComEmpConferencia implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_CONFERENCIA_SEQ") + @Column(name = "COMEMPCONFERENCIA_ID") + private Long comempconferenciaId; + + @Column(name = "INDBILHETEMANUAL") + private Boolean indbilhetemanual; + + @Column(name = "INDBILHETEVENDIDO") + private Boolean indbilhetevendido; + + @Column(name = "INDBILHETECANCELADO") + private Boolean indbilhetecancelado; + + @Column(name = "INDBILHETEDEVOLVIDO") + private Boolean indbilhetedevolvido; + + @Column(name = "INDGAPVENDIDO") + private Boolean indgapvendido; + + @Column(name = "INDGAPCANCELADO") + private Boolean indgapcancelado; + + @Column(name = "INDGAPDEVOLVIDO") + private Boolean indgapdevolvido; + + @Column(name = "INDEVENTOSFINANCEIROS") + private Boolean indeventosfinanceiros; + + @Column(name = "INDOCD") + private Boolean indocd; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "INDTIPO_DEB_CRED") + private Integer tipoDebitoCredito; + + @Column(name = "ACTIVO") + private boolean activo; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + public ComEmpConferencia() { + super(); + setIndbilhetecancelado(Boolean.FALSE); + setIndbilhetevendido(Boolean.FALSE); + setIndbilhetedevolvido(Boolean.FALSE); + setIndgapcancelado(Boolean.FALSE); + setIndgapdevolvido(Boolean.FALSE); + setIndgapvendido(Boolean.FALSE); + setIndeventosfinanceiros(Boolean.FALSE); + setIndocd(Boolean.FALSE); + } + + public Long getComempconferenciaId() { + return comempconferenciaId; + } + + public void setComempconferenciaId(Long comempconferenciaId) { + this.comempconferenciaId = comempconferenciaId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getComempconferenciaId() == null) ? 0 : getComempconferenciaId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ComEmpConferencia)) + return false; + ComEmpConferencia other = (ComEmpConferencia) obj; + if (getComempconferenciaId() == null) { + if (other.getComempconferenciaId() != null) + return false; + } else if (!getComempconferenciaId().equals(other.getComempconferenciaId())) + return false; + return true; + } + + public Boolean getIndbilhetemanual() { + return indbilhetemanual; + } + + public void setIndbilhetemanual(Boolean indbilhetemanual) { + this.indbilhetemanual = indbilhetemanual; + } + + public Boolean getIndbilhetevendido() { + return indbilhetevendido; + } + + public void setIndbilhetevendido(Boolean indbilhetevendido) { + this.indbilhetevendido = indbilhetevendido; + } + + public Boolean getIndbilhetecancelado() { + return indbilhetecancelado; + } + + public void setIndbilhetecancelado(Boolean indbilhetecancelado) { + this.indbilhetecancelado = indbilhetecancelado; + } + + public Boolean getIndbilhetedevolvido() { + return indbilhetedevolvido; + } + + public void setIndbilhetedevolvido(Boolean indbilhetedevolvido) { + this.indbilhetedevolvido = indbilhetedevolvido; + } + + public Boolean getIndgapvendido() { + return indgapvendido; + } + + public void setIndgapvendido(Boolean indgapvendido) { + this.indgapvendido = indgapvendido; + } + + public Boolean getIndgapcancelado() { + return indgapcancelado; + } + + public void setIndgapcancelado(Boolean indgapcancelado) { + this.indgapcancelado = indgapcancelado; + } + + public Boolean getIndgapdevolvido() { + return indgapdevolvido; + } + + public void setIndgapdevolvido(Boolean indgapdevolvido) { + this.indgapdevolvido = indgapdevolvido; + } + + public Boolean getIndeventosfinanceiros() { + return indeventosfinanceiros; + } + + public void setIndeventosfinanceiros(Boolean indeventosfinanceiros) { + this.indeventosfinanceiros = indeventosfinanceiros; + } + + public Boolean getIndocd() { + return indocd; + } + + public void setIndocd(Boolean indocd) { + this.indocd = indocd; + } + + public Integer getTipoDebitoCredito() { + return tipoDebitoCredito; + } + + public void setTipoDebitoCredito(int tipoDebitoCredito) { + this.tipoDebitoCredito = tipoDebitoCredito; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComEmpFormapago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpFormapago.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ComEmpFormapago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpFormapago.java index f51618e41..2e9839aac 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ComEmpFormapago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpFormapago.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COM_EMP_FORMAPAGO_SEQ", sequenceName = "COM_EMP_FORMAPAGO_SEQ", allocationSize = 1) -@Table(name = "COM_EMP_FORMAPAGO") -public class ComEmpFormapago implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "COMEMPFORMAPAGO_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_FORMAPAGO_SEQ") - private Long comempformapagoId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "FORMAPAGO_ID") - private FormaPago formaPago; - - @Column(name = "ACTIVO") - private boolean activo; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - public Long getComempformapagoId() { - return comempformapagoId; - } - - public void setComempformapagoId(Long comempformapagoId) { - this.comempformapagoId = comempformapagoId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public FormaPago getFormaPago() { - return formaPago; - } - - public void setFormaPago(FormaPago formaPago) { - this.formaPago = formaPago; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((comempformapagoId == null) ? 0 : comempformapagoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - ComEmpFormapago other = (ComEmpFormapago) obj; - if (comempformapagoId == null) { - if (other.comempformapagoId != null) - return false; - } else if (!comempformapagoId.equals(other.comempformapagoId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COM_EMP_FORMAPAGO_SEQ", sequenceName = "COM_EMP_FORMAPAGO_SEQ", allocationSize = 1) +@Table(name = "COM_EMP_FORMAPAGO") +public class ComEmpFormapago implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "COMEMPFORMAPAGO_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_FORMAPAGO_SEQ") + private Long comempformapagoId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "FORMAPAGO_ID") + private FormaPago formaPago; + + @Column(name = "ACTIVO") + private boolean activo; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + public Long getComempformapagoId() { + return comempformapagoId; + } + + public void setComempformapagoId(Long comempformapagoId) { + this.comempformapagoId = comempformapagoId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public FormaPago getFormaPago() { + return formaPago; + } + + public void setFormaPago(FormaPago formaPago) { + this.formaPago = formaPago; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((comempformapagoId == null) ? 0 : comempformapagoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + ComEmpFormapago other = (ComEmpFormapago) obj; + if (comempformapagoId == null) { + if (other.comempformapagoId != null) + return false; + } else if (!comempformapagoId.equals(other.comempformapagoId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java index fe64b89cb..368cf4b53 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComEmpTipoEventoExtra.java @@ -1,116 +1,116 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COM_EMP_TIPOEVENTOEXTRA_SEQ", sequenceName = "COM_EMP_TIPOEVENTOEXTRA_SEQ", allocationSize = 1) -@Table(name = "COM_EMP_TIPOEVENTOEXTRA") -public class ComEmpTipoEventoExtra implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "COMEMPTIPOEVENTOEXTRA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_TIPOEVENTOEXTRA_SEQ") - private Long comemptipoeventoextraId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "TIPOEVENTOEXTRA_ID") - private TipoEventoExtra tipoEventoExtra; - - @Column(name = "ACTIVO") - private boolean activo; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - public Long getComemptipoeventoextraId() { - return comemptipoeventoextraId; - } - - public void setComemptipoeventoextraId(Long comemptipoeventoextraId) { - this.comemptipoeventoextraId = comemptipoeventoextraId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public TipoEventoExtra getTipoEventoExtra() { - return tipoEventoExtra; - } - - public void setTipoEventoExtra(TipoEventoExtra tipoEventoExtra) { - this.tipoEventoExtra = tipoEventoExtra; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((comemptipoeventoextraId == null) ? 0 : comemptipoeventoextraId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - ComEmpTipoEventoExtra other = (ComEmpTipoEventoExtra) obj; - if (comemptipoeventoextraId == null) { - if (other.comemptipoeventoextraId != null) - return false; - } else if (!comemptipoeventoextraId.equals(other.comemptipoeventoextraId)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COM_EMP_TIPOEVENTOEXTRA_SEQ", sequenceName = "COM_EMP_TIPOEVENTOEXTRA_SEQ", allocationSize = 1) +@Table(name = "COM_EMP_TIPOEVENTOEXTRA") +public class ComEmpTipoEventoExtra implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "COMEMPTIPOEVENTOEXTRA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COM_EMP_TIPOEVENTOEXTRA_SEQ") + private Long comemptipoeventoextraId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TIPOEVENTOEXTRA_ID") + private TipoEventoExtra tipoEventoExtra; + + @Column(name = "ACTIVO") + private boolean activo; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + public Long getComemptipoeventoextraId() { + return comemptipoeventoextraId; + } + + public void setComemptipoeventoextraId(Long comemptipoeventoextraId) { + this.comemptipoeventoextraId = comemptipoeventoextraId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public TipoEventoExtra getTipoEventoExtra() { + return tipoEventoExtra; + } + + public void setTipoEventoExtra(TipoEventoExtra tipoEventoExtra) { + this.tipoEventoExtra = tipoEventoExtra; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((comemptipoeventoextraId == null) ? 0 : comemptipoeventoextraId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + ComEmpTipoEventoExtra other = (ComEmpTipoEventoExtra) obj; + if (comemptipoeventoextraId == null) { + if (other.comemptipoeventoextraId != null) + return false; + } else if (!comemptipoeventoextraId.equals(other.comemptipoeventoextraId)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComisionistaExterno.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComisionistaExterno.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ComisionistaExterno.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComisionistaExterno.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Comissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Comissao.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Comissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Comissao.java index d453437df..348358937 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Comissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Comissao.java @@ -1,374 +1,374 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COMISSAO_SEQ", sequenceName = "COMISSAO_SEQ", allocationSize = 1) -@Table(name = "COMISSAO") -public class Comissao implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COMISSAO_SEQ") - @Column(name = "COMISSAO_ID") - private Integer comissaoId; - - @Column(name = "COMPETENCIA") - private String competencia; - - @Column(name = "DATAPAGAMENTO") - @Temporal(TemporalType.TIMESTAMP) - private Date dataPagamento; - - @Column(name = "INDPAGO") - private Boolean indPago; - - @Column(name = "COMISSAO_BPR") - private BigDecimal comissaoBpr; - - @Column(name = "RECEITA_EXCESSOBAGAGEM") - private BigDecimal receitaExcessobagagem; - - @Column(name = "RECEITA_SEGUROOPCIONAL") - private BigDecimal receitaSeguroopcional; - - @Column(name = "RECEITA_SEGURO") - private BigDecimal receitaSeguro; - - @Column(name = "RECEITA_OUTROS") - private BigDecimal receitaOutros; - - @Column(name = "DESCONTOS_FIXOS") - private BigDecimal descontosFixos; - - @Column(name = "DESCONTOS_EVENTUAIS") - private BigDecimal descontosEventuais; - - @Column(name = "ROYATIES") - private BigDecimal royaties; - - @Column(name = "ISS_RETIDO") - private BigDecimal issRetido; - - @Column(name = "BONIFICACAO_METAS") - private BigDecimal bonificacaoMetas; - - @Column(name = "ENTREGAS_PASSAGEM") - private BigDecimal entregasPassagem; - - @Column(name = "USUARIOPAGAMENTO_ID") - private Integer usuarioPagamentoId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @Column(name = "EMPRESA_ID") - private Integer empresaId; - - @Column(name = "RECEITA_BPR") - private BigDecimal receitaBPR; - - @Column(name = "DEVOLVIDOS") - private BigDecimal devolvidos; - - @Column(name = "RECEITA_BRUTA_EXCESSOBAGAGEM") - private BigDecimal receitaBrutaExcessoBagagem; - - @Column(name = "RECEITA_BRUTA_SEGURO") - private BigDecimal receitaBrutaSeguro; - - @Column(name = "RECEITA_BRUTA_SEGUROOPCIONAL") - private BigDecimal receitaBrutaSeguroopcional; - - @Column(name = "DATA_INICIAL") - @Temporal(TemporalType.DATE) - private Date dataInicial; - - @Column(name = "DATA_FINAL") - @Temporal(TemporalType.DATE) - private Date dataFinal; - - @Column(name = "RECEITA_GAP") - private BigDecimal receitaGAP; - - public Comissao() { - super(); - setComissaoBpr(BigDecimal.ZERO); - setReceitaExcessobagagem(BigDecimal.ZERO); - setReceitaSeguroopcional(BigDecimal.ZERO); - setReceitaOutros(BigDecimal.ZERO); - setDescontosFixos(BigDecimal.ZERO); - setDescontosEventuais(BigDecimal.ZERO); - setRoyaties(BigDecimal.ZERO); - setIssRetido(BigDecimal.ZERO); - setBonificacaoMetas(BigDecimal.ZERO); - setEntregasPassagem(BigDecimal.ZERO); - setReceitaBPR(BigDecimal.ZERO); - setDevolvidos(BigDecimal.ZERO); - setReceitaBrutaExcessoBagagem(BigDecimal.ZERO); - setReceitaBrutaSeguroopcional(BigDecimal.ZERO); - setReceitaGAP(BigDecimal.ZERO); - } - - public Integer getComissaoId() { - return comissaoId; - } - - public void setComissaoId(Integer comissaoId) { - this.comissaoId = comissaoId; - } - - public String getCompetencia() { - return competencia; - } - - public void setCompetencia(String competencia) { - this.competencia = competencia; - } - - public Date getDataPagamento() { - return dataPagamento; - } - - public void setDataPagamento(Date dataPagamento) { - this.dataPagamento = dataPagamento; - } - - public Boolean getIndPago() { - return indPago; - } - - public void setIndPago(Boolean indPago) { - this.indPago = indPago; - } - - public BigDecimal getComissaoBpr() { - return comissaoBpr; - } - - public void setComissaoBpr(BigDecimal comissaoBpr) { - this.comissaoBpr = comissaoBpr; - } - - public BigDecimal getReceitaExcessobagagem() { - return receitaExcessobagagem; - } - - public void setReceitaExcessobagagem(BigDecimal receitaExcessobagagem) { - this.receitaExcessobagagem = receitaExcessobagagem; - } - - public BigDecimal getReceitaSeguroopcional() { - return receitaSeguroopcional; - } - - public void setReceitaSeguroopcional(BigDecimal receitaSeguroopcional) { - this.receitaSeguroopcional = receitaSeguroopcional; - } - - public BigDecimal getReceitaSeguro() { - return receitaSeguro; - } - - public void setReceitaSeguro(BigDecimal receitaSeguro) { - this.receitaSeguro = receitaSeguro; - } - - public BigDecimal getDescontosFixos() { - return descontosFixos; - } - - public void setDescontosFixos(BigDecimal descontosFixos) { - this.descontosFixos = descontosFixos; - } - - public BigDecimal getDescontosEventuais() { - return descontosEventuais; - } - - public void setDescontosEventuais(BigDecimal descontosEventuais) { - this.descontosEventuais = descontosEventuais; - } - - public BigDecimal getRoyaties() { - return royaties; - } - - public void setRoyaties(BigDecimal royaties) { - this.royaties = royaties; - } - - public BigDecimal getIssRetido() { - return issRetido; - } - - public void setIssRetido(BigDecimal issRetido) { - this.issRetido = issRetido; - } - - public BigDecimal getBonificacaoMetas() { - return bonificacaoMetas; - } - - public void setBonificacaoMetas(BigDecimal bonificacaoMetas) { - this.bonificacaoMetas = bonificacaoMetas; - } - - public BigDecimal getEntregasPassagem() { - return entregasPassagem; - } - - public void setEntregasPassagem(BigDecimal entregasPassagem) { - this.entregasPassagem = entregasPassagem; - } - - public Integer getUsuarioPagamentoId() { - return usuarioPagamentoId; - } - - public void setUsuarioPagamentoId(Integer usuarioPagamentoId) { - this.usuarioPagamentoId = usuarioPagamentoId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public BigDecimal getReceitaOutros() { - return receitaOutros; - } - - public void setReceitaOutros(BigDecimal receitaOutros) { - this.receitaOutros = receitaOutros; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public BigDecimal getReceitaBPR() { - return receitaBPR; - } - - public void setReceitaBPR(BigDecimal receitaBPR) { - this.receitaBPR = receitaBPR; - } - - public BigDecimal getDevolvidos() { - return devolvidos; - } - - public void setDevolvidos(BigDecimal devolvidos) { - this.devolvidos = devolvidos; - } - - public BigDecimal getReceitaBrutaExcessoBagagem() { - return receitaBrutaExcessoBagagem; - } - - public void setReceitaBrutaExcessoBagagem(BigDecimal receitaBrutaExcessoBagagem) { - this.receitaBrutaExcessoBagagem = receitaBrutaExcessoBagagem; - } - - public BigDecimal getReceitaBrutaSeguroopcional() { - return receitaBrutaSeguroopcional; - } - - public void setReceitaBrutaSeguroopcional(BigDecimal receitaBrutaSeguroopcional) { - this.receitaBrutaSeguroopcional = receitaBrutaSeguroopcional; - } - - public Date getDataInicial() { - return dataInicial; - } - - public void setDataInicial(Date dataInicial) { - this.dataInicial = dataInicial; - } - - public Date getDataFinal() { - return dataFinal; - } - - public void setDataFinal(Date dataFinal) { - this.dataFinal = dataFinal; - } - - public BigDecimal getReceitaGAP() { - return receitaGAP; - } - - public void setReceitaGAP(BigDecimal receitaGAP) { - this.receitaGAP = receitaGAP; - } - - public BigDecimal getReceitaBrutaSeguro() { - return receitaBrutaSeguro; - } - - public void setReceitaBrutaSeguro(BigDecimal receitaBrutaSeguro) { - this.receitaBrutaSeguro = receitaBrutaSeguro; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COMISSAO_SEQ", sequenceName = "COMISSAO_SEQ", allocationSize = 1) +@Table(name = "COMISSAO") +public class Comissao implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COMISSAO_SEQ") + @Column(name = "COMISSAO_ID") + private Integer comissaoId; + + @Column(name = "COMPETENCIA") + private String competencia; + + @Column(name = "DATAPAGAMENTO") + @Temporal(TemporalType.TIMESTAMP) + private Date dataPagamento; + + @Column(name = "INDPAGO") + private Boolean indPago; + + @Column(name = "COMISSAO_BPR") + private BigDecimal comissaoBpr; + + @Column(name = "RECEITA_EXCESSOBAGAGEM") + private BigDecimal receitaExcessobagagem; + + @Column(name = "RECEITA_SEGUROOPCIONAL") + private BigDecimal receitaSeguroopcional; + + @Column(name = "RECEITA_SEGURO") + private BigDecimal receitaSeguro; + + @Column(name = "RECEITA_OUTROS") + private BigDecimal receitaOutros; + + @Column(name = "DESCONTOS_FIXOS") + private BigDecimal descontosFixos; + + @Column(name = "DESCONTOS_EVENTUAIS") + private BigDecimal descontosEventuais; + + @Column(name = "ROYATIES") + private BigDecimal royaties; + + @Column(name = "ISS_RETIDO") + private BigDecimal issRetido; + + @Column(name = "BONIFICACAO_METAS") + private BigDecimal bonificacaoMetas; + + @Column(name = "ENTREGAS_PASSAGEM") + private BigDecimal entregasPassagem; + + @Column(name = "USUARIOPAGAMENTO_ID") + private Integer usuarioPagamentoId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @Column(name = "EMPRESA_ID") + private Integer empresaId; + + @Column(name = "RECEITA_BPR") + private BigDecimal receitaBPR; + + @Column(name = "DEVOLVIDOS") + private BigDecimal devolvidos; + + @Column(name = "RECEITA_BRUTA_EXCESSOBAGAGEM") + private BigDecimal receitaBrutaExcessoBagagem; + + @Column(name = "RECEITA_BRUTA_SEGURO") + private BigDecimal receitaBrutaSeguro; + + @Column(name = "RECEITA_BRUTA_SEGUROOPCIONAL") + private BigDecimal receitaBrutaSeguroopcional; + + @Column(name = "DATA_INICIAL") + @Temporal(TemporalType.DATE) + private Date dataInicial; + + @Column(name = "DATA_FINAL") + @Temporal(TemporalType.DATE) + private Date dataFinal; + + @Column(name = "RECEITA_GAP") + private BigDecimal receitaGAP; + + public Comissao() { + super(); + setComissaoBpr(BigDecimal.ZERO); + setReceitaExcessobagagem(BigDecimal.ZERO); + setReceitaSeguroopcional(BigDecimal.ZERO); + setReceitaOutros(BigDecimal.ZERO); + setDescontosFixos(BigDecimal.ZERO); + setDescontosEventuais(BigDecimal.ZERO); + setRoyaties(BigDecimal.ZERO); + setIssRetido(BigDecimal.ZERO); + setBonificacaoMetas(BigDecimal.ZERO); + setEntregasPassagem(BigDecimal.ZERO); + setReceitaBPR(BigDecimal.ZERO); + setDevolvidos(BigDecimal.ZERO); + setReceitaBrutaExcessoBagagem(BigDecimal.ZERO); + setReceitaBrutaSeguroopcional(BigDecimal.ZERO); + setReceitaGAP(BigDecimal.ZERO); + } + + public Integer getComissaoId() { + return comissaoId; + } + + public void setComissaoId(Integer comissaoId) { + this.comissaoId = comissaoId; + } + + public String getCompetencia() { + return competencia; + } + + public void setCompetencia(String competencia) { + this.competencia = competencia; + } + + public Date getDataPagamento() { + return dataPagamento; + } + + public void setDataPagamento(Date dataPagamento) { + this.dataPagamento = dataPagamento; + } + + public Boolean getIndPago() { + return indPago; + } + + public void setIndPago(Boolean indPago) { + this.indPago = indPago; + } + + public BigDecimal getComissaoBpr() { + return comissaoBpr; + } + + public void setComissaoBpr(BigDecimal comissaoBpr) { + this.comissaoBpr = comissaoBpr; + } + + public BigDecimal getReceitaExcessobagagem() { + return receitaExcessobagagem; + } + + public void setReceitaExcessobagagem(BigDecimal receitaExcessobagagem) { + this.receitaExcessobagagem = receitaExcessobagagem; + } + + public BigDecimal getReceitaSeguroopcional() { + return receitaSeguroopcional; + } + + public void setReceitaSeguroopcional(BigDecimal receitaSeguroopcional) { + this.receitaSeguroopcional = receitaSeguroopcional; + } + + public BigDecimal getReceitaSeguro() { + return receitaSeguro; + } + + public void setReceitaSeguro(BigDecimal receitaSeguro) { + this.receitaSeguro = receitaSeguro; + } + + public BigDecimal getDescontosFixos() { + return descontosFixos; + } + + public void setDescontosFixos(BigDecimal descontosFixos) { + this.descontosFixos = descontosFixos; + } + + public BigDecimal getDescontosEventuais() { + return descontosEventuais; + } + + public void setDescontosEventuais(BigDecimal descontosEventuais) { + this.descontosEventuais = descontosEventuais; + } + + public BigDecimal getRoyaties() { + return royaties; + } + + public void setRoyaties(BigDecimal royaties) { + this.royaties = royaties; + } + + public BigDecimal getIssRetido() { + return issRetido; + } + + public void setIssRetido(BigDecimal issRetido) { + this.issRetido = issRetido; + } + + public BigDecimal getBonificacaoMetas() { + return bonificacaoMetas; + } + + public void setBonificacaoMetas(BigDecimal bonificacaoMetas) { + this.bonificacaoMetas = bonificacaoMetas; + } + + public BigDecimal getEntregasPassagem() { + return entregasPassagem; + } + + public void setEntregasPassagem(BigDecimal entregasPassagem) { + this.entregasPassagem = entregasPassagem; + } + + public Integer getUsuarioPagamentoId() { + return usuarioPagamentoId; + } + + public void setUsuarioPagamentoId(Integer usuarioPagamentoId) { + this.usuarioPagamentoId = usuarioPagamentoId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public BigDecimal getReceitaOutros() { + return receitaOutros; + } + + public void setReceitaOutros(BigDecimal receitaOutros) { + this.receitaOutros = receitaOutros; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public BigDecimal getReceitaBPR() { + return receitaBPR; + } + + public void setReceitaBPR(BigDecimal receitaBPR) { + this.receitaBPR = receitaBPR; + } + + public BigDecimal getDevolvidos() { + return devolvidos; + } + + public void setDevolvidos(BigDecimal devolvidos) { + this.devolvidos = devolvidos; + } + + public BigDecimal getReceitaBrutaExcessoBagagem() { + return receitaBrutaExcessoBagagem; + } + + public void setReceitaBrutaExcessoBagagem(BigDecimal receitaBrutaExcessoBagagem) { + this.receitaBrutaExcessoBagagem = receitaBrutaExcessoBagagem; + } + + public BigDecimal getReceitaBrutaSeguroopcional() { + return receitaBrutaSeguroopcional; + } + + public void setReceitaBrutaSeguroopcional(BigDecimal receitaBrutaSeguroopcional) { + this.receitaBrutaSeguroopcional = receitaBrutaSeguroopcional; + } + + public Date getDataInicial() { + return dataInicial; + } + + public void setDataInicial(Date dataInicial) { + this.dataInicial = dataInicial; + } + + public Date getDataFinal() { + return dataFinal; + } + + public void setDataFinal(Date dataFinal) { + this.dataFinal = dataFinal; + } + + public BigDecimal getReceitaGAP() { + return receitaGAP; + } + + public void setReceitaGAP(BigDecimal receitaGAP) { + this.receitaGAP = receitaGAP; + } + + public BigDecimal getReceitaBrutaSeguro() { + return receitaBrutaSeguro; + } + + public void setReceitaBrutaSeguro(BigDecimal receitaBrutaSeguro) { + this.receitaBrutaSeguro = receitaBrutaSeguro; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComissaoLog.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComissaoLog.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ComissaoLog.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComissaoLog.java index 6d91544dc..683f39a35 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ComissaoLog.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComissaoLog.java @@ -1,195 +1,195 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COMISSAO_LOG_SEQ", sequenceName = "COMISSAO_LOG_SEQ", allocationSize = 1) -@Table(name = "COMISSAO_LOG") -public class ComissaoLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COMISSAO_LOG_SEQ") - @Column(name = "COMISSAOLOG_ID") - private Long comissaologId; - - @Column(name = "PUNTOVENTA_ID") - private Integer puntoventaId; - - @Column(name = "EMPRESA_ID") - private Integer empresaId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "FECCORTE") - @Temporal(TemporalType.DATE) - private Date feccorte; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "TURNO_ID") - private Integer turnoId; - - @Column(name = "CAJA_ID") - private Long cajaId; - - @Column(name = "CAJADIVERSOS_ID") - private Long cajadiversosId; - - @Column(name = "PORC_COMISSAO") - private BigDecimal porcComissao; - - @Column(name = "VALOR_BASE") - private BigDecimal valorBase; - - @Column(name = "VALOR_COMISSAO") - private BigDecimal valorComissao; - - @Column(name = "ORIGEM") - private String origem; - - @Column(name = "TEXTO") - private String texto; - - public Long getComissaologId() { - return comissaologId; - } - - public void setComissaologId(Long comissaologId) { - this.comissaologId = comissaologId; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Date getFeccorte() { - return feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getTurnoId() { - return turnoId; - } - - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public Long getCajadiversosId() { - return cajadiversosId; - } - - public void setCajadiversosId(Long cajadiversosId) { - this.cajadiversosId = cajadiversosId; - } - - public BigDecimal getPorcComissao() { - return porcComissao; - } - - public void setPorcComissao(BigDecimal porcComissao) { - this.porcComissao = porcComissao; - } - - public BigDecimal getValorBase() { - return valorBase; - } - - public void setValorBase(BigDecimal valorBase) { - this.valorBase = valorBase; - } - - public BigDecimal getValorComissao() { - return valorComissao; - } - - public void setValorComissao(BigDecimal valorComissao) { - this.valorComissao = valorComissao; - } - - public String getOrigem() { - return origem; - } - - public void setOrigem(String origem) { - this.origem = origem; - } - - public String getTexto() { - return texto; - } - - public void setTexto(String texto) { - this.texto = texto; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COMISSAO_LOG_SEQ", sequenceName = "COMISSAO_LOG_SEQ", allocationSize = 1) +@Table(name = "COMISSAO_LOG") +public class ComissaoLog implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COMISSAO_LOG_SEQ") + @Column(name = "COMISSAOLOG_ID") + private Long comissaologId; + + @Column(name = "PUNTOVENTA_ID") + private Integer puntoventaId; + + @Column(name = "EMPRESA_ID") + private Integer empresaId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "FECCORTE") + @Temporal(TemporalType.DATE) + private Date feccorte; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "TURNO_ID") + private Integer turnoId; + + @Column(name = "CAJA_ID") + private Long cajaId; + + @Column(name = "CAJADIVERSOS_ID") + private Long cajadiversosId; + + @Column(name = "PORC_COMISSAO") + private BigDecimal porcComissao; + + @Column(name = "VALOR_BASE") + private BigDecimal valorBase; + + @Column(name = "VALOR_COMISSAO") + private BigDecimal valorComissao; + + @Column(name = "ORIGEM") + private String origem; + + @Column(name = "TEXTO") + private String texto; + + public Long getComissaologId() { + return comissaologId; + } + + public void setComissaologId(Long comissaologId) { + this.comissaologId = comissaologId; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Date getFeccorte() { + return feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getTurnoId() { + return turnoId; + } + + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public Long getCajadiversosId() { + return cajadiversosId; + } + + public void setCajadiversosId(Long cajadiversosId) { + this.cajadiversosId = cajadiversosId; + } + + public BigDecimal getPorcComissao() { + return porcComissao; + } + + public void setPorcComissao(BigDecimal porcComissao) { + this.porcComissao = porcComissao; + } + + public BigDecimal getValorBase() { + return valorBase; + } + + public void setValorBase(BigDecimal valorBase) { + this.valorBase = valorBase; + } + + public BigDecimal getValorComissao() { + return valorComissao; + } + + public void setValorComissao(BigDecimal valorComissao) { + this.valorComissao = valorComissao; + } + + public String getOrigem() { + return origem; + } + + public void setOrigem(String origem) { + this.origem = origem; + } + + public String getTexto() { + return texto; + } + + public void setTexto(String texto) { + this.texto = texto; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ComissaoReceita.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComissaoReceita.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ComissaoReceita.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComissaoReceita.java index 9400877b9..80f731029 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ComissaoReceita.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ComissaoReceita.java @@ -1,401 +1,401 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "COMISSAO_RECEITA_SEQ", sequenceName = "COMISSAO_RECEITA_SEQ", allocationSize = 1) -@Table(name = "COMISSAO_RECEITA") -public class ComissaoReceita implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COMISSAO_RECEITA_SEQ") - @Column(name = "COMISSAORECEITA_ID") - private Integer comissaoreceitaId; - - @Column(name = "DATAMOVIMENTO") - @Temporal(TemporalType.DATE) - private Date datamovimento; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "BPR") - private BigDecimal bpr; - - @Column(name = "GAP") - private BigDecimal gap; - - @Column(name = "IMPGAP") - private BigDecimal impgap; - - @Column(name = "INTERNET") - private BigDecimal internet; - - @Column(name = "CANCELADOS") - private BigDecimal cancelados; - - @Column(name = "CANCELGAP") - private BigDecimal cancelgap; - - @Column(name = "DEVOLVIDOS") - private BigDecimal devolvidos; - - @Column(name = "DEVOLVIDOS_ORIGEM") - private BigDecimal devolvidosOrigem; - - @Column(name = "DEVOLVIDOS_ORIGEM_GAP") - private BigDecimal devolvidosOrigemGap; - - @Column(name = "DEVGAP") - private BigDecimal devgap; - - @Column(name = "EXCESSO_BAGAGEM") - private BigDecimal excessoBagagem; - - @Column(name = "SEG_OPCIONAL") - private BigDecimal segOpcional; - - @Column(name = "SEG_OBRIGATORIO") - private BigDecimal segObrigatorio; - - @Column(name = "RECEITA_OUTROS") - private BigDecimal receitaOutros; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "COMISSAO_BPR") - private BigDecimal comissaoBpr; - - @Column(name = "COMISSAO_ENTREGA_PASSAGEM") - private BigDecimal comissaoEntregaPassagem; - - @Column(name = "COMISSAO_ENTREGA_BAGAGEM") - private BigDecimal comissaoExcessoBagagem; - - @Column(name = "COMISSAO_SEG_OPCIONAL") - private BigDecimal comissaoSegOpcional; - - @Column(name = "COMISSAO_OUTROS") - private BigDecimal comissaoOutros; - - @Column(name = "COMISSAO_SEG_OBRIGATORIO") - private BigDecimal comissaoSegObrigatorio; - - @Column(name = "QTDE_IMPGAP") - private Integer qtdeImpgap; - - public ComissaoReceita() { - super(); - } - - public ComissaoReceita(com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita comissaoReceitaVO) { - this(); - this.activo = Boolean.TRUE; - this.fecmodif = new Date(); - this.datamovimento = comissaoReceitaVO.getData(); - this.bpr = comissaoReceitaVO.getReceitaBPR(); - this.gap = comissaoReceitaVO.getReceitaGAP(); - this.impgap = comissaoReceitaVO.getGapImpressa(); - this.qtdeImpgap = comissaoReceitaVO.getContImpressa(); - this.internet = comissaoReceitaVO.getInternet(); - this.cancelados = comissaoReceitaVO.getCancelados(); - this.cancelgap = comissaoReceitaVO.getCanceladosGAP(); - this.devolvidos = comissaoReceitaVO.getDevolvidos(); - this.devgap = comissaoReceitaVO.getDevolvidosGAP(); - this.excessoBagagem = comissaoReceitaVO.getReceitaExcessoBagagem(); - this.segObrigatorio = comissaoReceitaVO.getReceitaSeguro(); - this.segOpcional = comissaoReceitaVO.getReceitaSeguroOpcional(); - this.receitaOutros = comissaoReceitaVO.getReceitaSeguroOutros(); - this.devolvidosOrigem = comissaoReceitaVO.getDevolucoesOrigem(); - this.devolvidosOrigemGap = comissaoReceitaVO.getDevolucoesOrigemGAP(); - - this.comissaoBpr = comissaoReceitaVO.getComissaoBPRDiaria(); - this.comissaoEntregaPassagem = comissaoReceitaVO.getComissaoEntregaPassagemDiaria(); - this.comissaoExcessoBagagem = comissaoReceitaVO.getComissaoExcessoBagagemDiaria(); - this.comissaoSegOpcional = comissaoReceitaVO.getComissaoSegOpcionalDiaria(); - this.comissaoOutros = comissaoReceitaVO.getComissaoOutrosDiaria(); - this.comissaoSegObrigatorio = comissaoReceitaVO.getComissaoSeguroObrigatorioDiaria(); - } - - public Integer getComissaoreceitaId() { - return comissaoreceitaId; - } - - public void setComissaoreceitaId(Integer comissaoreceitaId) { - this.comissaoreceitaId = comissaoreceitaId; - } - - public Date getDatamovimento() { - return datamovimento; - } - - public void setDatamovimento(Date datamovimento) { - this.datamovimento = datamovimento; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public BigDecimal getBpr() { - return bpr; - } - - public void setBpr(BigDecimal bpr) { - this.bpr = bpr; - } - - public BigDecimal getGap() { - return gap; - } - - public void setGap(BigDecimal gap) { - this.gap = gap; - } - - public BigDecimal getImpgap() { - return impgap; - } - - public void setImpgap(BigDecimal impgap) { - this.impgap = impgap; - } - - public BigDecimal getInternet() { - return internet; - } - - public void setInternet(BigDecimal internet) { - this.internet = internet; - } - - public BigDecimal getCancelados() { - return cancelados; - } - - public void setCancelados(BigDecimal cancelados) { - this.cancelados = cancelados; - } - - public BigDecimal getCancelgap() { - return cancelgap; - } - - public void setCancelgap(BigDecimal cancelgap) { - this.cancelgap = cancelgap; - } - - public BigDecimal getDevolvidos() { - return devolvidos; - } - - public void setDevolvidos(BigDecimal devolvidos) { - this.devolvidos = devolvidos; - } - - public BigDecimal getDevgap() { - return devgap; - } - - public void setDevgap(BigDecimal devgap) { - this.devgap = devgap; - } - - public BigDecimal getExcessoBagagem() { - return excessoBagagem; - } - - public void setExcessoBagagem(BigDecimal excessoBagagem) { - this.excessoBagagem = excessoBagagem; - } - - public BigDecimal getSegOpcional() { - return segOpcional; - } - - public void setSegOpcional(BigDecimal segOpcional) { - this.segOpcional = segOpcional; - } - - public BigDecimal getReceitaOutros() { - return receitaOutros; - } - - public void setReceitaOutros(BigDecimal receitaOutros) { - this.receitaOutros = receitaOutros; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public BigDecimal getDevolvidosOrigem() { - return devolvidosOrigem; - } - - public void setDevolvidosOrigem(BigDecimal devolvidosOrigem) { - this.devolvidosOrigem = devolvidosOrigem; - } - - public BigDecimal getDevolvidosOrigemGap() { - return devolvidosOrigemGap; - } - - public void setDevolvidosOrigemGap(BigDecimal devolvidosOrigemGap) { - this.devolvidosOrigemGap = devolvidosOrigemGap; - } - - public BigDecimal getComissaoBpr() { - return comissaoBpr; - } - - public void setComissaoBpr(BigDecimal comissaoBpr) { - this.comissaoBpr = comissaoBpr; - } - - public BigDecimal getComissaoEntregaPassagem() { - return comissaoEntregaPassagem; - } - - public void setComissaoEntregaPassagem(BigDecimal comissaoEntregaPassagem) { - this.comissaoEntregaPassagem = comissaoEntregaPassagem; - } - - public BigDecimal getComissaoExcessoBagagem() { - return comissaoExcessoBagagem; - } - - public void setComissaoExcessoBagagem(BigDecimal comissaoExcessoBagagem) { - this.comissaoExcessoBagagem = comissaoExcessoBagagem; - } - - public BigDecimal getComissaoSegOpcional() { - return comissaoSegOpcional; - } - - public void setComissaoSegOpcional(BigDecimal comissaoSegOpcional) { - this.comissaoSegOpcional = comissaoSegOpcional; - } - - public BigDecimal getComissaoOutros() { - return comissaoOutros; - } - - public void setComissaoOutros(BigDecimal comissaoOutros) { - this.comissaoOutros = comissaoOutros; - } - - public Integer getQtdeImpgap() { - return qtdeImpgap; - } - - public void setQtdeImpgap(Integer qtdeImpgap) { - this.qtdeImpgap = qtdeImpgap; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((comissaoreceitaId == null) ? 0 : comissaoreceitaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ComissaoReceita)) - return false; - ComissaoReceita other = (ComissaoReceita) obj; - if (comissaoreceitaId == null) { - if (other.comissaoreceitaId != null) - return false; - } else if (!comissaoreceitaId.equals(other.comissaoreceitaId)) - return false; - return true; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public BigDecimal getComissaoSegObrigatorio() { - return comissaoSegObrigatorio; - } - - public void setComissaoSegObrigatorio(BigDecimal comissaoSegObrigatorio) { - this.comissaoSegObrigatorio = comissaoSegObrigatorio; - } - - public BigDecimal getSegObrigatorio() { - return segObrigatorio != null ? segObrigatorio : BigDecimal.ZERO ; - } - - public void setSegObrigatorio(BigDecimal segObrigatorio) { - this.segObrigatorio = segObrigatorio; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "COMISSAO_RECEITA_SEQ", sequenceName = "COMISSAO_RECEITA_SEQ", allocationSize = 1) +@Table(name = "COMISSAO_RECEITA") +public class ComissaoReceita implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COMISSAO_RECEITA_SEQ") + @Column(name = "COMISSAORECEITA_ID") + private Integer comissaoreceitaId; + + @Column(name = "DATAMOVIMENTO") + @Temporal(TemporalType.DATE) + private Date datamovimento; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "BPR") + private BigDecimal bpr; + + @Column(name = "GAP") + private BigDecimal gap; + + @Column(name = "IMPGAP") + private BigDecimal impgap; + + @Column(name = "INTERNET") + private BigDecimal internet; + + @Column(name = "CANCELADOS") + private BigDecimal cancelados; + + @Column(name = "CANCELGAP") + private BigDecimal cancelgap; + + @Column(name = "DEVOLVIDOS") + private BigDecimal devolvidos; + + @Column(name = "DEVOLVIDOS_ORIGEM") + private BigDecimal devolvidosOrigem; + + @Column(name = "DEVOLVIDOS_ORIGEM_GAP") + private BigDecimal devolvidosOrigemGap; + + @Column(name = "DEVGAP") + private BigDecimal devgap; + + @Column(name = "EXCESSO_BAGAGEM") + private BigDecimal excessoBagagem; + + @Column(name = "SEG_OPCIONAL") + private BigDecimal segOpcional; + + @Column(name = "SEG_OBRIGATORIO") + private BigDecimal segObrigatorio; + + @Column(name = "RECEITA_OUTROS") + private BigDecimal receitaOutros; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "COMISSAO_BPR") + private BigDecimal comissaoBpr; + + @Column(name = "COMISSAO_ENTREGA_PASSAGEM") + private BigDecimal comissaoEntregaPassagem; + + @Column(name = "COMISSAO_ENTREGA_BAGAGEM") + private BigDecimal comissaoExcessoBagagem; + + @Column(name = "COMISSAO_SEG_OPCIONAL") + private BigDecimal comissaoSegOpcional; + + @Column(name = "COMISSAO_OUTROS") + private BigDecimal comissaoOutros; + + @Column(name = "COMISSAO_SEG_OBRIGATORIO") + private BigDecimal comissaoSegObrigatorio; + + @Column(name = "QTDE_IMPGAP") + private Integer qtdeImpgap; + + public ComissaoReceita() { + super(); + } + + public ComissaoReceita(com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita comissaoReceitaVO) { + this(); + this.activo = Boolean.TRUE; + this.fecmodif = new Date(); + this.datamovimento = comissaoReceitaVO.getData(); + this.bpr = comissaoReceitaVO.getReceitaBPR(); + this.gap = comissaoReceitaVO.getReceitaGAP(); + this.impgap = comissaoReceitaVO.getGapImpressa(); + this.qtdeImpgap = comissaoReceitaVO.getContImpressa(); + this.internet = comissaoReceitaVO.getInternet(); + this.cancelados = comissaoReceitaVO.getCancelados(); + this.cancelgap = comissaoReceitaVO.getCanceladosGAP(); + this.devolvidos = comissaoReceitaVO.getDevolvidos(); + this.devgap = comissaoReceitaVO.getDevolvidosGAP(); + this.excessoBagagem = comissaoReceitaVO.getReceitaExcessoBagagem(); + this.segObrigatorio = comissaoReceitaVO.getReceitaSeguro(); + this.segOpcional = comissaoReceitaVO.getReceitaSeguroOpcional(); + this.receitaOutros = comissaoReceitaVO.getReceitaSeguroOutros(); + this.devolvidosOrigem = comissaoReceitaVO.getDevolucoesOrigem(); + this.devolvidosOrigemGap = comissaoReceitaVO.getDevolucoesOrigemGAP(); + + this.comissaoBpr = comissaoReceitaVO.getComissaoBPRDiaria(); + this.comissaoEntregaPassagem = comissaoReceitaVO.getComissaoEntregaPassagemDiaria(); + this.comissaoExcessoBagagem = comissaoReceitaVO.getComissaoExcessoBagagemDiaria(); + this.comissaoSegOpcional = comissaoReceitaVO.getComissaoSegOpcionalDiaria(); + this.comissaoOutros = comissaoReceitaVO.getComissaoOutrosDiaria(); + this.comissaoSegObrigatorio = comissaoReceitaVO.getComissaoSeguroObrigatorioDiaria(); + } + + public Integer getComissaoreceitaId() { + return comissaoreceitaId; + } + + public void setComissaoreceitaId(Integer comissaoreceitaId) { + this.comissaoreceitaId = comissaoreceitaId; + } + + public Date getDatamovimento() { + return datamovimento; + } + + public void setDatamovimento(Date datamovimento) { + this.datamovimento = datamovimento; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public BigDecimal getBpr() { + return bpr; + } + + public void setBpr(BigDecimal bpr) { + this.bpr = bpr; + } + + public BigDecimal getGap() { + return gap; + } + + public void setGap(BigDecimal gap) { + this.gap = gap; + } + + public BigDecimal getImpgap() { + return impgap; + } + + public void setImpgap(BigDecimal impgap) { + this.impgap = impgap; + } + + public BigDecimal getInternet() { + return internet; + } + + public void setInternet(BigDecimal internet) { + this.internet = internet; + } + + public BigDecimal getCancelados() { + return cancelados; + } + + public void setCancelados(BigDecimal cancelados) { + this.cancelados = cancelados; + } + + public BigDecimal getCancelgap() { + return cancelgap; + } + + public void setCancelgap(BigDecimal cancelgap) { + this.cancelgap = cancelgap; + } + + public BigDecimal getDevolvidos() { + return devolvidos; + } + + public void setDevolvidos(BigDecimal devolvidos) { + this.devolvidos = devolvidos; + } + + public BigDecimal getDevgap() { + return devgap; + } + + public void setDevgap(BigDecimal devgap) { + this.devgap = devgap; + } + + public BigDecimal getExcessoBagagem() { + return excessoBagagem; + } + + public void setExcessoBagagem(BigDecimal excessoBagagem) { + this.excessoBagagem = excessoBagagem; + } + + public BigDecimal getSegOpcional() { + return segOpcional; + } + + public void setSegOpcional(BigDecimal segOpcional) { + this.segOpcional = segOpcional; + } + + public BigDecimal getReceitaOutros() { + return receitaOutros; + } + + public void setReceitaOutros(BigDecimal receitaOutros) { + this.receitaOutros = receitaOutros; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public BigDecimal getDevolvidosOrigem() { + return devolvidosOrigem; + } + + public void setDevolvidosOrigem(BigDecimal devolvidosOrigem) { + this.devolvidosOrigem = devolvidosOrigem; + } + + public BigDecimal getDevolvidosOrigemGap() { + return devolvidosOrigemGap; + } + + public void setDevolvidosOrigemGap(BigDecimal devolvidosOrigemGap) { + this.devolvidosOrigemGap = devolvidosOrigemGap; + } + + public BigDecimal getComissaoBpr() { + return comissaoBpr; + } + + public void setComissaoBpr(BigDecimal comissaoBpr) { + this.comissaoBpr = comissaoBpr; + } + + public BigDecimal getComissaoEntregaPassagem() { + return comissaoEntregaPassagem; + } + + public void setComissaoEntregaPassagem(BigDecimal comissaoEntregaPassagem) { + this.comissaoEntregaPassagem = comissaoEntregaPassagem; + } + + public BigDecimal getComissaoExcessoBagagem() { + return comissaoExcessoBagagem; + } + + public void setComissaoExcessoBagagem(BigDecimal comissaoExcessoBagagem) { + this.comissaoExcessoBagagem = comissaoExcessoBagagem; + } + + public BigDecimal getComissaoSegOpcional() { + return comissaoSegOpcional; + } + + public void setComissaoSegOpcional(BigDecimal comissaoSegOpcional) { + this.comissaoSegOpcional = comissaoSegOpcional; + } + + public BigDecimal getComissaoOutros() { + return comissaoOutros; + } + + public void setComissaoOutros(BigDecimal comissaoOutros) { + this.comissaoOutros = comissaoOutros; + } + + public Integer getQtdeImpgap() { + return qtdeImpgap; + } + + public void setQtdeImpgap(Integer qtdeImpgap) { + this.qtdeImpgap = qtdeImpgap; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((comissaoreceitaId == null) ? 0 : comissaoreceitaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ComissaoReceita)) + return false; + ComissaoReceita other = (ComissaoReceita) obj; + if (comissaoreceitaId == null) { + if (other.comissaoreceitaId != null) + return false; + } else if (!comissaoreceitaId.equals(other.comissaoreceitaId)) + return false; + return true; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public BigDecimal getComissaoSegObrigatorio() { + return comissaoSegObrigatorio; + } + + public void setComissaoSegObrigatorio(BigDecimal comissaoSegObrigatorio) { + this.comissaoSegObrigatorio = comissaoSegObrigatorio; + } + + public BigDecimal getSegObrigatorio() { + return segObrigatorio != null ? segObrigatorio : BigDecimal.ZERO ; + } + + public void setSegObrigatorio(BigDecimal segObrigatorio) { + this.segObrigatorio = segObrigatorio; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CompaniaBancaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CompaniaBancaria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CompaniaBancaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CompaniaBancaria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Conductor.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conductor.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Conductor.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conductor.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Conexion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conexion.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Conexion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conexion.java index 57fc8dd0a..7aebf7d0e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Conexion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conexion.java @@ -1,215 +1,215 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "CONEXION_SEQ", sequenceName = "CONEXION_SEQ", allocationSize = 1) -@Table(name = "CONEXION") -public class Conexion implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_SEQ") - @Column(name = "CONEXION_ID") - private Long conexionId; - @Column(name = "NUMGRUPO") - private Integer numgrupo; - @Column(name = "NUMSECUENCIA") - private Short numsecuencia; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ORIGEN_ID") - private Integer origenId; - @Column(name = "DESTINO_ID") - private Integer destinoId; - @Column(name = "CONEXIONCTRL_ID") - private Long conexionctrlId; - @Column(name = "CORRIDA_ID") - private Long corridaId; - @Transient - private List conexionesDescuentos; - @Column(name = "RUTA_ID") - private Integer rutaId; - @Column(name = "CONEXIONRUTATRAMOCTRL_ID") - private Long conexionRutaTramoId; - - @Transient - private Boolean indPricing; - - public Long getCorridaId() { - return corridaId; - } - - public void setCorridaId(Long corridaId) { - this.corridaId = corridaId; - } - - public Conexion() { - this(null); - } - - public Conexion(Long conexionId) { - this.conexionId = conexionId; - conexionesDescuentos = new ArrayList(); - } - - public Long getConexionId() { - return conexionId; - } - - public void setConexionId(Long conexionId) { - this.conexionId = conexionId; - } - - public Integer getNumgrupo() { - return numgrupo; - } - - public void setNumgrupo(Integer numgrupo) { - this.numgrupo = numgrupo; - } - - public Short getNumsecuencia() { - return numsecuencia; - } - - public void setNumsecuencia(Short numsecuencia) { - this.numsecuencia = numsecuencia; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (conexionId != null ? conexionId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Conexion)) { - return false; - } - Conexion other = (Conexion) object; - - if (this.conexionId == null && other.getConexionId() == null) { - return this.numgrupo == other.getNumgrupo() - && this.getOrigenId() == other.getOrigenId() - && this.getNumsecuencia() == other.getNumsecuencia() - && this.getDestinoId() == other.destinoId; - } - return conexionId == other.getConexionId(); - } - - @Override - public String toString() { - return "com.rjconsultores.entidad.Conexion[ conexionId=" + conexionId + " ]"; - } - - public Long getConexionctrlId() { - return conexionctrlId; - } - - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public List getConexionesDescuentos() { - return conexionesDescuentos; - } - - public void setConexionesDescuentos(List conexionesDescuentos) { - this.conexionesDescuentos = conexionesDescuentos; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public Long getConexionRutaTramoId() { - return conexionRutaTramoId; - } - - public void setConexionRutaTramoId(Long conexionRutaTramoId) { - this.conexionRutaTramoId = conexionRutaTramoId; - } - - public Boolean getIndPricing() { - return indPricing == null ? false : indPricing; - } - - public void setIndPricing(Boolean indPricing) { - this.indPricing = indPricing; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "CONEXION_SEQ", sequenceName = "CONEXION_SEQ", allocationSize = 1) +@Table(name = "CONEXION") +public class Conexion implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_SEQ") + @Column(name = "CONEXION_ID") + private Long conexionId; + @Column(name = "NUMGRUPO") + private Integer numgrupo; + @Column(name = "NUMSECUENCIA") + private Short numsecuencia; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ORIGEN_ID") + private Integer origenId; + @Column(name = "DESTINO_ID") + private Integer destinoId; + @Column(name = "CONEXIONCTRL_ID") + private Long conexionctrlId; + @Column(name = "CORRIDA_ID") + private Long corridaId; + @Transient + private List conexionesDescuentos; + @Column(name = "RUTA_ID") + private Integer rutaId; + @Column(name = "CONEXIONRUTATRAMOCTRL_ID") + private Long conexionRutaTramoId; + + @Transient + private Boolean indPricing; + + public Long getCorridaId() { + return corridaId; + } + + public void setCorridaId(Long corridaId) { + this.corridaId = corridaId; + } + + public Conexion() { + this(null); + } + + public Conexion(Long conexionId) { + this.conexionId = conexionId; + conexionesDescuentos = new ArrayList(); + } + + public Long getConexionId() { + return conexionId; + } + + public void setConexionId(Long conexionId) { + this.conexionId = conexionId; + } + + public Integer getNumgrupo() { + return numgrupo; + } + + public void setNumgrupo(Integer numgrupo) { + this.numgrupo = numgrupo; + } + + public Short getNumsecuencia() { + return numsecuencia; + } + + public void setNumsecuencia(Short numsecuencia) { + this.numsecuencia = numsecuencia; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (conexionId != null ? conexionId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Conexion)) { + return false; + } + Conexion other = (Conexion) object; + + if (this.conexionId == null && other.getConexionId() == null) { + return this.numgrupo == other.getNumgrupo() + && this.getOrigenId() == other.getOrigenId() + && this.getNumsecuencia() == other.getNumsecuencia() + && this.getDestinoId() == other.destinoId; + } + return conexionId == other.getConexionId(); + } + + @Override + public String toString() { + return "com.rjconsultores.entidad.Conexion[ conexionId=" + conexionId + " ]"; + } + + public Long getConexionctrlId() { + return conexionctrlId; + } + + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public List getConexionesDescuentos() { + return conexionesDescuentos; + } + + public void setConexionesDescuentos(List conexionesDescuentos) { + this.conexionesDescuentos = conexionesDescuentos; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public Long getConexionRutaTramoId() { + return conexionRutaTramoId; + } + + public void setConexionRutaTramoId(Long conexionRutaTramoId) { + this.conexionRutaTramoId = conexionRutaTramoId; + } + + public Boolean getIndPricing() { + return indPricing == null ? false : indPricing; + } + + public void setIndPricing(Boolean indPricing) { + this.indPricing = indPricing; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionConf.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionConf.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionConf.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionConf.java index bbe93f433..efbcfaa3b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionConf.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionConf.java @@ -1,183 +1,183 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CONEXION_CONF_SEQ", sequenceName = "CONEXION_CONF_SEQ", allocationSize = 1) -@Table(name = "CONEXION_CONF") -public class ConexionConf implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "CONEXIONCONF_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_CONF_SEQ") - private Long conexionConfId; - @ManyToOne - @JoinColumn(name = "CONEXIONCTRL_ID", referencedColumnName = "CONEXIONCTRL_ID") - private ConexionCtrl conexionCtrl; - @Column(name = "GRUPO") - private Integer grupo; - @Column(name = "PORSEC1") - private BigDecimal porSec1; - @Column(name = "PORSEC2") - private BigDecimal porSec2; - @Column(name = "PORSEC3") - private BigDecimal porSec3; - @Column(name = "PORSEC4") - private BigDecimal porSec4; - @Column(name = "TIEMPOMIN") - private Integer tiempoMin; - @Column(name = "TIEMPOMAX") - private Integer tiempoMax; - @Column(name = "INDDISPONIBLE") - private Boolean indisponible; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getConexionConfId() { - return conexionConfId; - } - - public void setConexionConfId(Long conexionConfId) { - this.conexionConfId = conexionConfId; - } - - public ConexionCtrl getConexionCtrl() { - return conexionCtrl; - } - - public void setConexionCtrl(ConexionCtrl conexionCtrl) { - this.conexionCtrl = conexionCtrl; - } - - public Integer getGrupo() { - return grupo; - } - - public void setGrupo(Integer grupo) { - this.grupo = grupo; - } - - public BigDecimal getPorSec1() { - return porSec1; - } - - public void setPorSec1(BigDecimal porSec1) { - this.porSec1 = porSec1; - } - - public BigDecimal getPorSec2() { - return porSec2; - } - - public void setPorSec2(BigDecimal porSec2) { - this.porSec2 = porSec2; - } - - public BigDecimal getPorSec3() { - return porSec3; - } - - public void setPorSec3(BigDecimal porSec3) { - this.porSec3 = porSec3; - } - - public BigDecimal getPorSec4() { - return porSec4; - } - - public void setPorSec4(BigDecimal porSec4) { - this.porSec4 = porSec4; - } - - public Integer getTiempoMin() { - return tiempoMin; - } - - public void setTiempoMin(Integer tiempoMin) { - this.tiempoMin = tiempoMin; - } - - public Integer getTiempoMax() { - return tiempoMax; - } - - public void setTiempoMax(Integer tiempoMax) { - this.tiempoMax = tiempoMax; - } - - public Boolean getIndisponible() { - return indisponible; - } - - public void setIndisponible(Boolean indisponible) { - this.indisponible = indisponible; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conexionConfId == null) ? 0 : conexionConfId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConexionConf other = (ConexionConf) obj; - if (conexionConfId == null) { - if (other.conexionConfId != null) - return false; - } else if (!conexionConfId.equals(other.conexionConfId)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CONEXION_CONF_SEQ", sequenceName = "CONEXION_CONF_SEQ", allocationSize = 1) +@Table(name = "CONEXION_CONF") +public class ConexionConf implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Column(name = "CONEXIONCONF_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_CONF_SEQ") + private Long conexionConfId; + @ManyToOne + @JoinColumn(name = "CONEXIONCTRL_ID", referencedColumnName = "CONEXIONCTRL_ID") + private ConexionCtrl conexionCtrl; + @Column(name = "GRUPO") + private Integer grupo; + @Column(name = "PORSEC1") + private BigDecimal porSec1; + @Column(name = "PORSEC2") + private BigDecimal porSec2; + @Column(name = "PORSEC3") + private BigDecimal porSec3; + @Column(name = "PORSEC4") + private BigDecimal porSec4; + @Column(name = "TIEMPOMIN") + private Integer tiempoMin; + @Column(name = "TIEMPOMAX") + private Integer tiempoMax; + @Column(name = "INDDISPONIBLE") + private Boolean indisponible; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getConexionConfId() { + return conexionConfId; + } + + public void setConexionConfId(Long conexionConfId) { + this.conexionConfId = conexionConfId; + } + + public ConexionCtrl getConexionCtrl() { + return conexionCtrl; + } + + public void setConexionCtrl(ConexionCtrl conexionCtrl) { + this.conexionCtrl = conexionCtrl; + } + + public Integer getGrupo() { + return grupo; + } + + public void setGrupo(Integer grupo) { + this.grupo = grupo; + } + + public BigDecimal getPorSec1() { + return porSec1; + } + + public void setPorSec1(BigDecimal porSec1) { + this.porSec1 = porSec1; + } + + public BigDecimal getPorSec2() { + return porSec2; + } + + public void setPorSec2(BigDecimal porSec2) { + this.porSec2 = porSec2; + } + + public BigDecimal getPorSec3() { + return porSec3; + } + + public void setPorSec3(BigDecimal porSec3) { + this.porSec3 = porSec3; + } + + public BigDecimal getPorSec4() { + return porSec4; + } + + public void setPorSec4(BigDecimal porSec4) { + this.porSec4 = porSec4; + } + + public Integer getTiempoMin() { + return tiempoMin; + } + + public void setTiempoMin(Integer tiempoMin) { + this.tiempoMin = tiempoMin; + } + + public Integer getTiempoMax() { + return tiempoMax; + } + + public void setTiempoMax(Integer tiempoMax) { + this.tiempoMax = tiempoMax; + } + + public Boolean getIndisponible() { + return indisponible; + } + + public void setIndisponible(Boolean indisponible) { + this.indisponible = indisponible; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conexionConfId == null) ? 0 : conexionConfId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConexionConf other = (ConexionConf) obj; + if (conexionConfId == null) { + if (other.conexionConfId != null) + return false; + } else if (!conexionConfId.equals(other.conexionConfId)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrl.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrl.java index 39110acca..4a5e72b1b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrl.java @@ -1,157 +1,157 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "CONEXION_CTRL_SEQ", sequenceName = "CONEXION_CTRL_SEQ", allocationSize = 1) -@Table(name = "CONEXION_CTRL") -public class ConexionCtrl implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_CTRL_SEQ") - @Column(name = "CONEXIONCTRL_ID") - private Long conexionctrlId; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ORIGEN_ID") - private Integer origenId; - @Column(name = "DESTINO_ID") - private Integer destinoId; - - @Column(name = "INDPRICING") - private Boolean indPricing; - - @Transient - private Integer grupos; - - public ConexionCtrl() { - } - - public ConexionCtrl(Integer origenId, Integer destinoId, Integer grupos) { - this(); - this.origenId = origenId; - this.destinoId = destinoId; - this.grupos = grupos; - } - - public ConexionCtrl(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Long getConexionctrlId() { - return conexionctrlId; - } - - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (getConexionctrlId() != null ? getConexionctrlId().hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof ConexionCtrl)) { - return false; - } - ConexionCtrl other = (ConexionCtrl) object; - if ((this.getConexionctrlId() == null && other.getConexionctrlId() != null) || (this.getConexionctrlId() != null && !this.getConexionctrlId().equals(other.getConexionctrlId()))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.entidad.ConexionCtrl[ conexionctrlId=" + conexionctrlId + " ]"; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public Integer getGrupos() { - return grupos; - } - - public void setGrupos(Integer grupos) { - this.grupos = grupos; - } - - public boolean isOrigemDestinoIgual(Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { - return getOrigenId() != null && getDestinoId() != null && getOrigenId().equals(origemConexaoCtrl) && getDestinoId().equals(destinoConexaoCtrl); - } - - public Boolean getIndPricing() { - return indPricing == null ? false : indPricing; - } - - public void setIndPricing(Boolean indPricing) { - this.indPricing = indPricing; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "CONEXION_CTRL_SEQ", sequenceName = "CONEXION_CTRL_SEQ", allocationSize = 1) +@Table(name = "CONEXION_CTRL") +public class ConexionCtrl implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_CTRL_SEQ") + @Column(name = "CONEXIONCTRL_ID") + private Long conexionctrlId; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ORIGEN_ID") + private Integer origenId; + @Column(name = "DESTINO_ID") + private Integer destinoId; + + @Column(name = "INDPRICING") + private Boolean indPricing; + + @Transient + private Integer grupos; + + public ConexionCtrl() { + } + + public ConexionCtrl(Integer origenId, Integer destinoId, Integer grupos) { + this(); + this.origenId = origenId; + this.destinoId = destinoId; + this.grupos = grupos; + } + + public ConexionCtrl(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Long getConexionctrlId() { + return conexionctrlId; + } + + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (getConexionctrlId() != null ? getConexionctrlId().hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof ConexionCtrl)) { + return false; + } + ConexionCtrl other = (ConexionCtrl) object; + if ((this.getConexionctrlId() == null && other.getConexionctrlId() != null) || (this.getConexionctrlId() != null && !this.getConexionctrlId().equals(other.getConexionctrlId()))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.entidad.ConexionCtrl[ conexionctrlId=" + conexionctrlId + " ]"; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public Integer getGrupos() { + return grupos; + } + + public void setGrupos(Integer grupos) { + this.grupos = grupos; + } + + public boolean isOrigemDestinoIgual(Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { + return getOrigenId() != null && getDestinoId() != null && getOrigenId().equals(origemConexaoCtrl) && getDestinoId().equals(destinoConexaoCtrl); + } + + public Boolean getIndPricing() { + return indPricing == null ? false : indPricing; + } + + public void setIndPricing(Boolean indPricing) { + this.indPricing = indPricing; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrlTemp.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrlTemp.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionCtrlTemp.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrlTemp.java index 9f714e021..131ab1b99 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrlTemp.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionCtrlTemp.java @@ -1,126 +1,126 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "CONEXION_CTRL_SEQ", sequenceName = "CONEXION_CTRL_SEQ", allocationSize = 1) -@Table(name = "CONEXION_CTRL_TEMP") -public class ConexionCtrlTemp implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_CTRL_SEQ") - @Column(name = "CONEXIONCTRL_ID") - private Long conexionctrlId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ORIGEN_ID") - private Integer origenId; - @Column(name = "DESTINO_ID") - private Integer destinoId; - - public ConexionCtrlTemp() { - } - - public ConexionCtrlTemp(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Long getConexionctrlId() { - return conexionctrlId; - } - - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - @Override - public int hashCode() { - int hash = 0; - hash += (conexionctrlId != null ? conexionctrlId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ConexionCtrlTemp)) { - return false; - } - ConexionCtrlTemp other = (ConexionCtrlTemp) object; - if ((this.conexionctrlId == null && other.conexionctrlId != null) || (this.conexionctrlId != null && !this.conexionctrlId.equals(other.conexionctrlId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.entidad.ConexionCtrlTemp[ conexionctrlId=" + conexionctrlId + " ]"; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "CONEXION_CTRL_SEQ", sequenceName = "CONEXION_CTRL_SEQ", allocationSize = 1) +@Table(name = "CONEXION_CTRL_TEMP") +public class ConexionCtrlTemp implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_CTRL_SEQ") + @Column(name = "CONEXIONCTRL_ID") + private Long conexionctrlId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ORIGEN_ID") + private Integer origenId; + @Column(name = "DESTINO_ID") + private Integer destinoId; + + public ConexionCtrlTemp() { + } + + public ConexionCtrlTemp(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Long getConexionctrlId() { + return conexionctrlId; + } + + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + @Override + public int hashCode() { + int hash = 0; + hash += (conexionctrlId != null ? conexionctrlId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ConexionCtrlTemp)) { + return false; + } + ConexionCtrlTemp other = (ConexionCtrlTemp) object; + if ((this.conexionctrlId == null && other.conexionctrlId != null) || (this.conexionctrlId != null && !this.conexionctrlId.equals(other.conexionctrlId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.entidad.ConexionCtrlTemp[ conexionctrlId=" + conexionctrlId + " ]"; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionDescuento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionDescuento.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionDescuento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionDescuento.java index ea4c1fe62..775b59911 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionDescuento.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionDescuento.java @@ -1,135 +1,135 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "CONEXION_DESCUENTO_SEQ", sequenceName = "CONEXION_DESCUENTO_SEQ", allocationSize = 1) -@Table(name = "CONEXION_DESCUENTO") -public class ConexionDescuento { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_DESCUENTO_SEQ") - @Column(name = "CONEXIONDESCUENTO_ID") - private Long idConexionDescuento; - - @Column - private Boolean activo; - - @ManyToOne - @JoinColumn(name = "CONEXION_ID") - private Conexion conexion; - - @ManyToOne(targetEntity = ClaseServicio.class) - @JoinColumn(name = "CLASSESERVICIO_ID") - private ClaseServicio claseServicio; - - @Column - private Short secuencia; - - @Column - private Integer grupo; - - @Column - private BigDecimal descuento; - - @Column(name = "DESCUENTO_TASAEMBARQUE") - private BigDecimal descuentoTasaEmbarque; - - @Column - private Date fecModif; - - public Long getIdConexionDescuento() { - return idConexionDescuento; - } - - public void setIdConexionDescuento(Long idConexionDescuento) { - this.idConexionDescuento = idConexionDescuento; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Conexion getConexion() { - return conexion; - } - - public void setConexion(Conexion conexion) { - this.conexion = conexion; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - - public Short getSecuencia() { - return secuencia; - } - - public void setSecuencia(Short secuencia) { - this.secuencia = secuencia; - } - - public Integer getGrupo() { - return grupo; - } - - public void setGrupo(Integer grupo) { - this.grupo = grupo; - } - - public BigDecimal getDescuento() { - return descuento; - } - - public void setDescuento(BigDecimal descuento) { - this.descuento = descuento; - } - - public Date getFecModif() { - return fecModif; - } - - public void setFecModif(Date fecModif) { - this.fecModif = fecModif; - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof ConexionDescuento)) { - return false; - } - ConexionDescuento other = (ConexionDescuento) obj; - if(this.getClaseServicio()==null &&other.getClaseServicio()==null){ - return true; - } - return this.getClaseServicio().equals(other.getClaseServicio()); - } - - public BigDecimal getDescuentoTasaEmbarque() { - return descuentoTasaEmbarque; - } - - public void setDescuentoTasaEmbarque(BigDecimal descuentoTasaEmbarque) { - this.descuentoTasaEmbarque = descuentoTasaEmbarque; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "CONEXION_DESCUENTO_SEQ", sequenceName = "CONEXION_DESCUENTO_SEQ", allocationSize = 1) +@Table(name = "CONEXION_DESCUENTO") +public class ConexionDescuento { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_DESCUENTO_SEQ") + @Column(name = "CONEXIONDESCUENTO_ID") + private Long idConexionDescuento; + + @Column + private Boolean activo; + + @ManyToOne + @JoinColumn(name = "CONEXION_ID") + private Conexion conexion; + + @ManyToOne(targetEntity = ClaseServicio.class) + @JoinColumn(name = "CLASSESERVICIO_ID") + private ClaseServicio claseServicio; + + @Column + private Short secuencia; + + @Column + private Integer grupo; + + @Column + private BigDecimal descuento; + + @Column(name = "DESCUENTO_TASAEMBARQUE") + private BigDecimal descuentoTasaEmbarque; + + @Column + private Date fecModif; + + public Long getIdConexionDescuento() { + return idConexionDescuento; + } + + public void setIdConexionDescuento(Long idConexionDescuento) { + this.idConexionDescuento = idConexionDescuento; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Conexion getConexion() { + return conexion; + } + + public void setConexion(Conexion conexion) { + this.conexion = conexion; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + + public Short getSecuencia() { + return secuencia; + } + + public void setSecuencia(Short secuencia) { + this.secuencia = secuencia; + } + + public Integer getGrupo() { + return grupo; + } + + public void setGrupo(Integer grupo) { + this.grupo = grupo; + } + + public BigDecimal getDescuento() { + return descuento; + } + + public void setDescuento(BigDecimal descuento) { + this.descuento = descuento; + } + + public Date getFecModif() { + return fecModif; + } + + public void setFecModif(Date fecModif) { + this.fecModif = fecModif; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ConexionDescuento)) { + return false; + } + ConexionDescuento other = (ConexionDescuento) obj; + if(this.getClaseServicio()==null &&other.getClaseServicio()==null){ + return true; + } + return this.getClaseServicio().equals(other.getClaseServicio()); + } + + public BigDecimal getDescuentoTasaEmbarque() { + return descuentoTasaEmbarque; + } + + public void setDescuentoTasaEmbarque(BigDecimal descuentoTasaEmbarque) { + this.descuentoTasaEmbarque = descuentoTasaEmbarque; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcion.java index e3cf9013c..a738a0312 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcion.java @@ -1,134 +1,134 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CONEXION_EXCEPCION_SEQ", sequenceName = "CONEXION_EXCEPCION_SEQ", allocationSize = 1) -@Table(name = "CONEXION_EXCEPCION") -public class ConexionExcepcion implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_EXCEPCION_SEQ") - @Column(name = "CONEXIONEXCEPCION_ID") - private Long conexionExcepcionId; - @Column(name = "NUMCORRIDA") - private Integer numcorrida; - @Column(name = "CONEXIONCTRL_ID") - private Long conexionctrlId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public ConexionExcepcion() { - } - - public ConexionExcepcion(Long conexionExcepcionId) { - this.conexionExcepcionId = conexionExcepcionId; - } - - public ConexionExcepcion(Long conexionExcepcionId, Integer numcorrida, Long conexionctrlId, Boolean activo, Date fecmodif, Integer usuarioId) { - this.conexionExcepcionId = conexionExcepcionId; - this.numcorrida = numcorrida; - this.conexionctrlId = conexionctrlId; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Long getConexionExcepcionId() { - return conexionExcepcionId; - } - - public void setConexionExcepcionId(Long conexionExcepcionId) { - this.conexionExcepcionId = conexionExcepcionId; - } - - public Integer getNumcorrida() { - return numcorrida; - } - - public void setNumcorrida(Integer numcorrida) { - this.numcorrida = numcorrida; - } - - public Long getConexionctrlId() { - return conexionctrlId; - } - - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conexionExcepcionId == null) ? 0 : conexionExcepcionId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConexionExcepcion other = (ConexionExcepcion) obj; - if (conexionExcepcionId == null) { - if (other.conexionExcepcionId != null) - return false; - } else if (!conexionExcepcionId.equals(other.conexionExcepcionId)) - return false; - return true; - } - - @Override - public String toString() { - return "ConexionExcepcion [conexionExcepcionId=" + conexionExcepcionId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CONEXION_EXCEPCION_SEQ", sequenceName = "CONEXION_EXCEPCION_SEQ", allocationSize = 1) +@Table(name = "CONEXION_EXCEPCION") +public class ConexionExcepcion implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_EXCEPCION_SEQ") + @Column(name = "CONEXIONEXCEPCION_ID") + private Long conexionExcepcionId; + @Column(name = "NUMCORRIDA") + private Integer numcorrida; + @Column(name = "CONEXIONCTRL_ID") + private Long conexionctrlId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public ConexionExcepcion() { + } + + public ConexionExcepcion(Long conexionExcepcionId) { + this.conexionExcepcionId = conexionExcepcionId; + } + + public ConexionExcepcion(Long conexionExcepcionId, Integer numcorrida, Long conexionctrlId, Boolean activo, Date fecmodif, Integer usuarioId) { + this.conexionExcepcionId = conexionExcepcionId; + this.numcorrida = numcorrida; + this.conexionctrlId = conexionctrlId; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Long getConexionExcepcionId() { + return conexionExcepcionId; + } + + public void setConexionExcepcionId(Long conexionExcepcionId) { + this.conexionExcepcionId = conexionExcepcionId; + } + + public Integer getNumcorrida() { + return numcorrida; + } + + public void setNumcorrida(Integer numcorrida) { + this.numcorrida = numcorrida; + } + + public Long getConexionctrlId() { + return conexionctrlId; + } + + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conexionExcepcionId == null) ? 0 : conexionExcepcionId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConexionExcepcion other = (ConexionExcepcion) obj; + if (conexionExcepcionId == null) { + if (other.conexionExcepcionId != null) + return false; + } else if (!conexionExcepcionId.equals(other.conexionExcepcionId)) + return false; + return true; + } + + @Override + public String toString() { + return "ConexionExcepcion [conexionExcepcionId=" + conexionExcepcionId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcionRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcionRuta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcionRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcionRuta.java index 5baffac0c..bf107fe39 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcionRuta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionExcepcionRuta.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CONEXION_EXCEPCION_RUTA_SEQ", sequenceName = "CONEXION_EXCEPCION_RUTA_SEQ", allocationSize = 1) -@Table(name = "CONEXION_EXCEPCION_RUTA") -public class ConexionExcepcionRuta implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_EXCEPCION_RUTA_SEQ") - @Column(name = "CONEXIONEXCEPCIONRUTA_ID") - private Long conexionExcepcionRutaId; - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - @Column(name = "CONEXIONCTRL_ID") - private Long conexionctrlId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - public Long getConexionExcepcionRutaId() { - return conexionExcepcionRutaId; - } - public void setConexionExcepcionRutaId(Long conexionExcepcionRutaId) { - this.conexionExcepcionRutaId = conexionExcepcionRutaId; - } - public Ruta getRuta() { - return ruta; - } - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - public Long getConexionctrlId() { - return conexionctrlId; - } - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CONEXION_EXCEPCION_RUTA_SEQ", sequenceName = "CONEXION_EXCEPCION_RUTA_SEQ", allocationSize = 1) +@Table(name = "CONEXION_EXCEPCION_RUTA") +public class ConexionExcepcionRuta implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_EXCEPCION_RUTA_SEQ") + @Column(name = "CONEXIONEXCEPCIONRUTA_ID") + private Long conexionExcepcionRutaId; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @Column(name = "CONEXIONCTRL_ID") + private Long conexionctrlId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + public Long getConexionExcepcionRutaId() { + return conexionExcepcionRutaId; + } + public void setConexionExcepcionRutaId(Long conexionExcepcionRutaId) { + this.conexionExcepcionRutaId = conexionExcepcionRutaId; + } + public Ruta getRuta() { + return ruta; + } + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + public Long getConexionctrlId() { + return conexionctrlId; + } + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaConf.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaConf.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionRutaConf.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaConf.java index a28146a72..865ccebd6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaConf.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaConf.java @@ -1,202 +1,202 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author wallace - */ -@Entity -@SequenceGenerator(name = "CONEXION_RUTA_CONF_SEQ", sequenceName = "CONEXION_RUTA_CONF_SEQ", allocationSize = 1) -@Table(name = "CONEXION_RUTA_CONF") -public class ConexionRutaConf implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_CONF_SEQ") - @Column(name = "CONEXIONRUTACONF_ID") - private Integer conexionRutaConfId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "DESCRICAO") - private String descricao; - @Column(name = "TIEMPOMIN") - private Integer tiempoMin; - @Column(name = "TIEMPOMAX") - private Integer tiempoMax; - - @Column(name = "DESCUENTO") - private BigDecimal descuento; - - @Column(name = "ISBLOQUEIOTRECHO_A") - private Boolean isBloqueioTrechoA; - - @Column(name = "ISBLOQUEIOTRECHO_B") - private Boolean isBloqueioTrechoB; - - @Column(name = "ISBLOQUEIOTRECHO_C") - private Boolean isBloqueioTrechoC; - - @Column(name = "PORCENTAGEM_OCUPACAO") - private Integer porcentagemOcupacao; - - @Column(name = "MINUTOS_ANTES_PARTIDA") - private Integer minutosAntesPartida; - - public ConexionRutaConf() { - super(); - } - - public Boolean getActivo() { - return activo; - } - - public Integer getConexionRutaConfId() { - return conexionRutaConfId; - } - - - public void setConexionRutaConfId(Integer conexionRutaConfId) { - this.conexionRutaConfId = conexionRutaConfId; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public Integer getTiempoMin() { - return tiempoMin; - } - - public void setTiempoMin(Integer tiempoMin) { - this.tiempoMin = tiempoMin; - } - - public Integer getTiempoMax() { - return tiempoMax; - } - - public void setTiempoMax(Integer tiempoMax) { - this.tiempoMax = tiempoMax; - } - - @Override - public String toString() { - return "ConexionRutaConf [descricao=" + descricao + "]"; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getConexionRutaConfId() == null) ? 0 : getConexionRutaConfId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ConexionRutaConf)) - return false; - ConexionRutaConf other = (ConexionRutaConf) obj; - if (getConexionRutaConfId() == null) { - if (other.getConexionRutaConfId() != null) - return false; - } else if (!getConexionRutaConfId().equals(other.getConexionRutaConfId())) - return false; - return true; - } - - public BigDecimal getDescuento() { - return descuento; - } - - public void setDescuento(BigDecimal descuento) { - this.descuento = descuento; - } - - public Boolean getIsBloqueioTrechoA() { - return isBloqueioTrechoA == null ? false: isBloqueioTrechoA; - } - - public void setIsBloqueioTrechoA(Boolean isBloqueioTrechoA) { - this.isBloqueioTrechoA = isBloqueioTrechoA; - } - - public Boolean getIsBloqueioTrechoB() { - return isBloqueioTrechoB == null ? false: isBloqueioTrechoB; - } - - public void setIsBloqueioTrechoB(Boolean isBloqueioTrechoB) { - this.isBloqueioTrechoB = isBloqueioTrechoB; - } - - public Boolean getIsBloqueioTrechoC() { - return isBloqueioTrechoC == null ? false: isBloqueioTrechoC; - } - - public void setIsBloqueioTrechoC(Boolean isBloqueioTrechoC) { - this.isBloqueioTrechoC = isBloqueioTrechoC; - } - - public Integer getPorcentagemOcupacao() { - return porcentagemOcupacao; - } - - public void setPorcentagemOcupacao(Integer porcentagemOcupacao) { - this.porcentagemOcupacao = porcentagemOcupacao; - } - - public Integer getMinutosAntesPartida() { - return minutosAntesPartida; - } - - public void setMinutosAntesPartida(Integer minutosAntesPartida) { - this.minutosAntesPartida = minutosAntesPartida; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author wallace + */ +@Entity +@SequenceGenerator(name = "CONEXION_RUTA_CONF_SEQ", sequenceName = "CONEXION_RUTA_CONF_SEQ", allocationSize = 1) +@Table(name = "CONEXION_RUTA_CONF") +public class ConexionRutaConf implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_CONF_SEQ") + @Column(name = "CONEXIONRUTACONF_ID") + private Integer conexionRutaConfId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "DESCRICAO") + private String descricao; + @Column(name = "TIEMPOMIN") + private Integer tiempoMin; + @Column(name = "TIEMPOMAX") + private Integer tiempoMax; + + @Column(name = "DESCUENTO") + private BigDecimal descuento; + + @Column(name = "ISBLOQUEIOTRECHO_A") + private Boolean isBloqueioTrechoA; + + @Column(name = "ISBLOQUEIOTRECHO_B") + private Boolean isBloqueioTrechoB; + + @Column(name = "ISBLOQUEIOTRECHO_C") + private Boolean isBloqueioTrechoC; + + @Column(name = "PORCENTAGEM_OCUPACAO") + private Integer porcentagemOcupacao; + + @Column(name = "MINUTOS_ANTES_PARTIDA") + private Integer minutosAntesPartida; + + public ConexionRutaConf() { + super(); + } + + public Boolean getActivo() { + return activo; + } + + public Integer getConexionRutaConfId() { + return conexionRutaConfId; + } + + + public void setConexionRutaConfId(Integer conexionRutaConfId) { + this.conexionRutaConfId = conexionRutaConfId; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Integer getTiempoMin() { + return tiempoMin; + } + + public void setTiempoMin(Integer tiempoMin) { + this.tiempoMin = tiempoMin; + } + + public Integer getTiempoMax() { + return tiempoMax; + } + + public void setTiempoMax(Integer tiempoMax) { + this.tiempoMax = tiempoMax; + } + + @Override + public String toString() { + return "ConexionRutaConf [descricao=" + descricao + "]"; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getConexionRutaConfId() == null) ? 0 : getConexionRutaConfId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ConexionRutaConf)) + return false; + ConexionRutaConf other = (ConexionRutaConf) obj; + if (getConexionRutaConfId() == null) { + if (other.getConexionRutaConfId() != null) + return false; + } else if (!getConexionRutaConfId().equals(other.getConexionRutaConfId())) + return false; + return true; + } + + public BigDecimal getDescuento() { + return descuento; + } + + public void setDescuento(BigDecimal descuento) { + this.descuento = descuento; + } + + public Boolean getIsBloqueioTrechoA() { + return isBloqueioTrechoA == null ? false: isBloqueioTrechoA; + } + + public void setIsBloqueioTrechoA(Boolean isBloqueioTrechoA) { + this.isBloqueioTrechoA = isBloqueioTrechoA; + } + + public Boolean getIsBloqueioTrechoB() { + return isBloqueioTrechoB == null ? false: isBloqueioTrechoB; + } + + public void setIsBloqueioTrechoB(Boolean isBloqueioTrechoB) { + this.isBloqueioTrechoB = isBloqueioTrechoB; + } + + public Boolean getIsBloqueioTrechoC() { + return isBloqueioTrechoC == null ? false: isBloqueioTrechoC; + } + + public void setIsBloqueioTrechoC(Boolean isBloqueioTrechoC) { + this.isBloqueioTrechoC = isBloqueioTrechoC; + } + + public Integer getPorcentagemOcupacao() { + return porcentagemOcupacao; + } + + public void setPorcentagemOcupacao(Integer porcentagemOcupacao) { + this.porcentagemOcupacao = porcentagemOcupacao; + } + + public Integer getMinutosAntesPartida() { + return minutosAntesPartida; + } + + public void setMinutosAntesPartida(Integer minutosAntesPartida) { + this.minutosAntesPartida = minutosAntesPartida; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaCtrl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionRutaCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaCtrl.java index 990de9416..29bc5b664 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaCtrl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaCtrl.java @@ -1,177 +1,177 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author wallace - */ -@Entity -@SequenceGenerator(name = "CONEXION_RUTA_CTRL_SEQ", sequenceName = "CONEXION_RUTA_CTRL_SEQ", allocationSize = 1) -@Table(name = "CONEXION_RUTA_CTRL") -public class ConexionRutaCtrl implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_CTRL_SEQ") - @Column(name = "CONEXIONRUTACTRL_ID") - private Long conexionRutaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @ManyToOne - @JoinColumn(name = "RUTA_ORIGEN_ID") - private Ruta rutaOrigen; - - @ManyToOne - @JoinColumn(name = "RUTA_DESTINO_ID") - private Ruta rutaDestino; - - @ManyToOne - @JoinColumn(name = "RUTA_DESTINOC_ID") - private Ruta rutaDestinoC; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CONEXIONRUTACONF_ID") - private ConexionRutaConf conexionRutaConf; - - public ConexionRutaCtrl() { - super(); - } - - public Boolean getActivo() { - return activo; - } - - public Long getConexionRutaId() { - return conexionRutaId; - } - - public void setConexionRutaId(Long conexionRutaId) { - this.conexionRutaId = conexionRutaId; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ConexionRutaConf getConexionRutaConf() { - return conexionRutaConf; - } - - public void setConexionRutaConf(ConexionRutaConf conexionRutaConf) { - this.conexionRutaConf = conexionRutaConf; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conexionRutaId == null) ? 0 : conexionRutaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConexionRutaCtrl other = (ConexionRutaCtrl) obj; - if (conexionRutaId == null) { - if (other.conexionRutaId != null) - return false; - } else if (!conexionRutaId.equals(other.conexionRutaId)) - return false; - return true; - } - - public static ConexionRutaCtrl getConexionRutaCtrl(List list, Integer... rutas) { - if(rutas != null && rutas.length > 1) { - for (ConexionRutaCtrl conexionRutaCtrl : list) { - boolean isMatched = conexionRutaCtrl.getRutaOrigen() != null && conexionRutaCtrl.getRutaOrigen().getRutaId().equals(rutas[0]); - if(!isMatched) { - continue; - } - - isMatched = conexionRutaCtrl.getRutaDestino() != null && conexionRutaCtrl.getRutaDestino().getRutaId().equals(rutas[1]); - if(!isMatched) { - continue; - } - - if(rutas.length > 2 && conexionRutaCtrl.getRutaDestinoC() != null) { - isMatched = conexionRutaCtrl.getRutaDestinoC().getRutaId().equals(rutas[2]); - } - - if(isMatched) { - return conexionRutaCtrl; - } - } - } - throw new RuntimeException("ConexionRutaCtrl não identificada"); - } - - public Ruta getRutaOrigen() { - return rutaOrigen; - } - - public void setRutaOrigen(Ruta rutaOrigen) { - this.rutaOrigen = rutaOrigen; - } - - public Ruta getRutaDestino() { - return rutaDestino; - } - - public void setRutaDestino(Ruta rutaDestino) { - this.rutaDestino = rutaDestino; - } - - public Ruta getRutaDestinoC() { - return rutaDestinoC; - } - - public void setRutaDestinoC(Ruta rutaDestinoC) { - this.rutaDestinoC = rutaDestinoC; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author wallace + */ +@Entity +@SequenceGenerator(name = "CONEXION_RUTA_CTRL_SEQ", sequenceName = "CONEXION_RUTA_CTRL_SEQ", allocationSize = 1) +@Table(name = "CONEXION_RUTA_CTRL") +public class ConexionRutaCtrl implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_CTRL_SEQ") + @Column(name = "CONEXIONRUTACTRL_ID") + private Long conexionRutaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @ManyToOne + @JoinColumn(name = "RUTA_ORIGEN_ID") + private Ruta rutaOrigen; + + @ManyToOne + @JoinColumn(name = "RUTA_DESTINO_ID") + private Ruta rutaDestino; + + @ManyToOne + @JoinColumn(name = "RUTA_DESTINOC_ID") + private Ruta rutaDestinoC; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CONEXIONRUTACONF_ID") + private ConexionRutaConf conexionRutaConf; + + public ConexionRutaCtrl() { + super(); + } + + public Boolean getActivo() { + return activo; + } + + public Long getConexionRutaId() { + return conexionRutaId; + } + + public void setConexionRutaId(Long conexionRutaId) { + this.conexionRutaId = conexionRutaId; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ConexionRutaConf getConexionRutaConf() { + return conexionRutaConf; + } + + public void setConexionRutaConf(ConexionRutaConf conexionRutaConf) { + this.conexionRutaConf = conexionRutaConf; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conexionRutaId == null) ? 0 : conexionRutaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConexionRutaCtrl other = (ConexionRutaCtrl) obj; + if (conexionRutaId == null) { + if (other.conexionRutaId != null) + return false; + } else if (!conexionRutaId.equals(other.conexionRutaId)) + return false; + return true; + } + + public static ConexionRutaCtrl getConexionRutaCtrl(List list, Integer... rutas) { + if(rutas != null && rutas.length > 1) { + for (ConexionRutaCtrl conexionRutaCtrl : list) { + boolean isMatched = conexionRutaCtrl.getRutaOrigen() != null && conexionRutaCtrl.getRutaOrigen().getRutaId().equals(rutas[0]); + if(!isMatched) { + continue; + } + + isMatched = conexionRutaCtrl.getRutaDestino() != null && conexionRutaCtrl.getRutaDestino().getRutaId().equals(rutas[1]); + if(!isMatched) { + continue; + } + + if(rutas.length > 2 && conexionRutaCtrl.getRutaDestinoC() != null) { + isMatched = conexionRutaCtrl.getRutaDestinoC().getRutaId().equals(rutas[2]); + } + + if(isMatched) { + return conexionRutaCtrl; + } + } + } + throw new RuntimeException("ConexionRutaCtrl não identificada"); + } + + public Ruta getRutaOrigen() { + return rutaOrigen; + } + + public void setRutaOrigen(Ruta rutaOrigen) { + this.rutaOrigen = rutaOrigen; + } + + public Ruta getRutaDestino() { + return rutaDestino; + } + + public void setRutaDestino(Ruta rutaDestino) { + this.rutaDestino = rutaDestino; + } + + public Ruta getRutaDestinoC() { + return rutaDestinoC; + } + + public void setRutaDestinoC(Ruta rutaDestinoC) { + this.rutaDestinoC = rutaDestinoC; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionPtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionPtoVta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionPtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionPtoVta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionTipoPtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionTipoPtoVta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionTipoPtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaExcepcionTipoPtoVta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaLocalidadeRemovida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaLocalidadeRemovida.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionRutaLocalidadeRemovida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaLocalidadeRemovida.java index ef2b15ff1..d29c289e9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaLocalidadeRemovida.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaLocalidadeRemovida.java @@ -1,138 +1,138 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author valdevir.silva - * - */ -@Entity -@SequenceGenerator(name = "CONEXION_RUTA_LOC_REMOVIDA_SEQ", sequenceName = "CONEXION_RUTA_LOC_REMOVIDA_SEQ", allocationSize = 1) -@Table(name = "CONEXION_RUTA_LOC_REMOVIDA") -public class ConexionRutaLocalidadeRemovida implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_LOC_REMOVIDA_SEQ") - @Column(name = "CONEXIONRUTALOCREMOVIDA_ID") - private Integer conexionRutaLocRemovidaId; - @Column(name = "CONEXIONRUTACONF_ID") - private Integer conexionRutaConfId; - @Column(name = "PARADA_ID") - private Long paradaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - - public ConexionRutaLocalidadeRemovida() { - super(); - } - - - - public ConexionRutaLocalidadeRemovida(Integer conexionRutaLocRemovidaId, Integer conexionRutaConfId, Long paradaId, Boolean activo, Date fecmodif, Integer usuarioId) { - super(); - this.conexionRutaLocRemovidaId = conexionRutaLocRemovidaId; - this.conexionRutaConfId = conexionRutaConfId; - this.paradaId = paradaId; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getConexionRutaLocRemovidaId() { - return conexionRutaLocRemovidaId; - } - - public void setConexionRutaLocRemovidaId(Integer conexionRutaLocRemovidaId) { - this.conexionRutaLocRemovidaId = conexionRutaLocRemovidaId; - } - - public Integer getConexionRutaConfId() { - return conexionRutaConfId; - } - - public void setConexionRutaConfId(Integer conexionRutaConfId) { - this.conexionRutaConfId = conexionRutaConfId; - } - - public Long getParadaId() { - return paradaId; - } - - public void setParadaId(Long paradaId) { - this.paradaId = paradaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return "ConexionRutaConf [conexionRutaLocRemovidasId=" + conexionRutaLocRemovidaId + "]"; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conexionRutaLocRemovidaId == null) ? 0 : conexionRutaLocRemovidaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ConexionRutaConf)) - return false; - ConexionRutaConf other = (ConexionRutaConf) obj; - if (getConexionRutaConfId() == null) { - if (other.getConexionRutaConfId() != null) - return false; - } else if (!getConexionRutaConfId().equals(other.getConexionRutaConfId())) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author valdevir.silva + * + */ +@Entity +@SequenceGenerator(name = "CONEXION_RUTA_LOC_REMOVIDA_SEQ", sequenceName = "CONEXION_RUTA_LOC_REMOVIDA_SEQ", allocationSize = 1) +@Table(name = "CONEXION_RUTA_LOC_REMOVIDA") +public class ConexionRutaLocalidadeRemovida implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_LOC_REMOVIDA_SEQ") + @Column(name = "CONEXIONRUTALOCREMOVIDA_ID") + private Integer conexionRutaLocRemovidaId; + @Column(name = "CONEXIONRUTACONF_ID") + private Integer conexionRutaConfId; + @Column(name = "PARADA_ID") + private Long paradaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + + public ConexionRutaLocalidadeRemovida() { + super(); + } + + + + public ConexionRutaLocalidadeRemovida(Integer conexionRutaLocRemovidaId, Integer conexionRutaConfId, Long paradaId, Boolean activo, Date fecmodif, Integer usuarioId) { + super(); + this.conexionRutaLocRemovidaId = conexionRutaLocRemovidaId; + this.conexionRutaConfId = conexionRutaConfId; + this.paradaId = paradaId; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getConexionRutaLocRemovidaId() { + return conexionRutaLocRemovidaId; + } + + public void setConexionRutaLocRemovidaId(Integer conexionRutaLocRemovidaId) { + this.conexionRutaLocRemovidaId = conexionRutaLocRemovidaId; + } + + public Integer getConexionRutaConfId() { + return conexionRutaConfId; + } + + public void setConexionRutaConfId(Integer conexionRutaConfId) { + this.conexionRutaConfId = conexionRutaConfId; + } + + public Long getParadaId() { + return paradaId; + } + + public void setParadaId(Long paradaId) { + this.paradaId = paradaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return "ConexionRutaConf [conexionRutaLocRemovidasId=" + conexionRutaLocRemovidaId + "]"; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conexionRutaLocRemovidaId == null) ? 0 : conexionRutaLocRemovidaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ConexionRutaConf)) + return false; + ConexionRutaConf other = (ConexionRutaConf) obj; + if (getConexionRutaConfId() == null) { + if (other.getConexionRutaConfId() != null) + return false; + } else if (!getConexionRutaConfId().equals(other.getConexionRutaConfId())) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaTramoCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaTramoCtrl.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionRutaTramoCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaTramoCtrl.java index d70ef85ce..7a66d5cbb 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaTramoCtrl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionRutaTramoCtrl.java @@ -1,210 +1,210 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; - -/** - * - * @author wallace - */ -@Entity -@SequenceGenerator(name = "CONEXION_RUTA_TRAMO_CTRL_SEQ", sequenceName = "CONEXION_RUTA_TRAMO_CTRL_SEQ", allocationSize = 1) -@Table(name = "CONEXION_RUTA_TRAMO_CTRL") -public class ConexionRutaTramoCtrl implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_TRAMO_CTRL_SEQ") - @Column(name = "CONEXIONRUTATRAMOCTRL_ID") - private Long conexionRutaTramoId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @ManyToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origen; - - @ManyToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CONEXIONRUTACTRL_ID") - private ConexionRutaCtrl conexionRutaCtrl; - - @ManyToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - - @Transient - private Short secuencia; - @Transient - private boolean valido; - @Transient - private Integer grupo; - - @Transient - private ConexionCtrlVO conexionCtrl; - - public ConexionRutaTramoCtrl() { - super(); - } - - public ConexionRutaTramoCtrl(Long conexionRutaTramoId) { - this(); - this.conexionRutaTramoId = conexionRutaTramoId; - } - - public Boolean getActivo() { - return activo; - } - - public Long getConexionRutaTramoId() { - return conexionRutaTramoId; - } - - public void setConexionRutaTramoId(Long conexionRutaTramoId) { - this.conexionRutaTramoId = conexionRutaTramoId; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ConexionRutaCtrl getConexionRutaCtrl() { - return conexionRutaCtrl; - } - - public void setConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl) { - this.conexionRutaCtrl = conexionRutaCtrl; - } - - public Short getSecuencia() { - return secuencia; - } - - public void setSecuencia(Short secuencia) { - this.secuencia = secuencia; - } - - public boolean isValido() { - return valido; - } - - public void setValido(boolean valido) { - this.valido = valido; - } - - public Integer getGrupo() { - return grupo; - } - - public void setGrupo(Integer grupo) { - this.grupo = grupo; - } - - public static Long getConexionRutaTramoConexionId(List conexiones) { - if(conexiones != null && !conexiones.isEmpty()) { - Conexion conexionRutaTramoCtrl = conexiones.get(0); - return conexionRutaTramoCtrl.getConexionRutaTramoId(); - } - return null; - - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conexionRutaTramoId == null) ? 0 : conexionRutaTramoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ConexionRutaTramoCtrl)) - return false; - ConexionRutaTramoCtrl other = (ConexionRutaTramoCtrl) obj; - if (getConexionRutaTramoId() == null) { - if (other.getConexionRutaTramoId() != null) - return false; - } else if (!getConexionRutaTramoId().equals(other.getConexionRutaTramoId())) - return false; - return true; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public ConexionCtrlVO getConexionCtrl() { - return conexionCtrl; - } - - public void setConexionCtrl(ConexionCtrlVO conexionCtrl) { - this.conexionCtrl = conexionCtrl; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; + +/** + * + * @author wallace + */ +@Entity +@SequenceGenerator(name = "CONEXION_RUTA_TRAMO_CTRL_SEQ", sequenceName = "CONEXION_RUTA_TRAMO_CTRL_SEQ", allocationSize = 1) +@Table(name = "CONEXION_RUTA_TRAMO_CTRL") +public class ConexionRutaTramoCtrl implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_RUTA_TRAMO_CTRL_SEQ") + @Column(name = "CONEXIONRUTATRAMOCTRL_ID") + private Long conexionRutaTramoId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @ManyToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origen; + + @ManyToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CONEXIONRUTACTRL_ID") + private ConexionRutaCtrl conexionRutaCtrl; + + @ManyToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + + @Transient + private Short secuencia; + @Transient + private boolean valido; + @Transient + private Integer grupo; + + @Transient + private ConexionCtrlVO conexionCtrl; + + public ConexionRutaTramoCtrl() { + super(); + } + + public ConexionRutaTramoCtrl(Long conexionRutaTramoId) { + this(); + this.conexionRutaTramoId = conexionRutaTramoId; + } + + public Boolean getActivo() { + return activo; + } + + public Long getConexionRutaTramoId() { + return conexionRutaTramoId; + } + + public void setConexionRutaTramoId(Long conexionRutaTramoId) { + this.conexionRutaTramoId = conexionRutaTramoId; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ConexionRutaCtrl getConexionRutaCtrl() { + return conexionRutaCtrl; + } + + public void setConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl) { + this.conexionRutaCtrl = conexionRutaCtrl; + } + + public Short getSecuencia() { + return secuencia; + } + + public void setSecuencia(Short secuencia) { + this.secuencia = secuencia; + } + + public boolean isValido() { + return valido; + } + + public void setValido(boolean valido) { + this.valido = valido; + } + + public Integer getGrupo() { + return grupo; + } + + public void setGrupo(Integer grupo) { + this.grupo = grupo; + } + + public static Long getConexionRutaTramoConexionId(List conexiones) { + if(conexiones != null && !conexiones.isEmpty()) { + Conexion conexionRutaTramoCtrl = conexiones.get(0); + return conexionRutaTramoCtrl.getConexionRutaTramoId(); + } + return null; + + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conexionRutaTramoId == null) ? 0 : conexionRutaTramoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ConexionRutaTramoCtrl)) + return false; + ConexionRutaTramoCtrl other = (ConexionRutaTramoCtrl) obj; + if (getConexionRutaTramoId() == null) { + if (other.getConexionRutaTramoId() != null) + return false; + } else if (!getConexionRutaTramoId().equals(other.getConexionRutaTramoId())) + return false; + return true; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public ConexionCtrlVO getConexionCtrl() { + return conexionCtrl; + } + + public void setConexionCtrl(ConexionCtrlVO conexionCtrl) { + this.conexionCtrl = conexionCtrl; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConexionTemp.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionTemp.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConexionTemp.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionTemp.java index 503fe3609..d48a86058 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConexionTemp.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConexionTemp.java @@ -1,156 +1,156 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author gleimar - */ -@Entity -@Table(name = "CONEXION_TEMP") -@SequenceGenerator(name = "CONEXION_SEQ", sequenceName = "CONEXION_SEQ", allocationSize = 1) -public class ConexionTemp implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_SEQ") - @Column(name = "CONEXION_ID") - private Long conexionId; - @Column(name = "NUMGRUPO") - private Integer numgrupo; - @Column(name = "NUMSECUENCIA") - private Short numsecuencia; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ORIGEN_ID") - private Integer origenId; - @Column(name = "DESTINO_ID") - private Integer destinoId; - @Column(name = "CONEXIONCTRL_ID") - private Long conexionctrlId; - - public ConexionTemp() { - } - - public ConexionTemp(Long conexionId) { - this.conexionId = conexionId; - } - - public Long getConexionId() { - return conexionId; - } - - public void setConexionId(Long conexionId) { - this.conexionId = conexionId; - } - - public Integer getNumgrupo() { - return numgrupo; - } - - public void setNumgrupo(Integer numgrupo) { - this.numgrupo = numgrupo; - } - - public Short getNumsecuencia() { - return numsecuencia; - } - - public void setNumsecuencia(Short numsecuencia) { - this.numsecuencia = numsecuencia; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - @Override - public int hashCode() { - int hash = 0; - hash += (conexionId != null ? conexionId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ConexionTemp)) { - return false; - } - ConexionTemp other = (ConexionTemp) object; - if ((this.conexionId == null && other.conexionId != null) || (this.conexionId != null && !this.conexionId.equals(other.conexionId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.entidad.ConexionTemp[ conexionId=" + conexionId + " ]"; - } - - public Long getConexionctrlId() { - return conexionctrlId; - } - - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author gleimar + */ +@Entity +@Table(name = "CONEXION_TEMP") +@SequenceGenerator(name = "CONEXION_SEQ", sequenceName = "CONEXION_SEQ", allocationSize = 1) +public class ConexionTemp implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONEXION_SEQ") + @Column(name = "CONEXION_ID") + private Long conexionId; + @Column(name = "NUMGRUPO") + private Integer numgrupo; + @Column(name = "NUMSECUENCIA") + private Short numsecuencia; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ORIGEN_ID") + private Integer origenId; + @Column(name = "DESTINO_ID") + private Integer destinoId; + @Column(name = "CONEXIONCTRL_ID") + private Long conexionctrlId; + + public ConexionTemp() { + } + + public ConexionTemp(Long conexionId) { + this.conexionId = conexionId; + } + + public Long getConexionId() { + return conexionId; + } + + public void setConexionId(Long conexionId) { + this.conexionId = conexionId; + } + + public Integer getNumgrupo() { + return numgrupo; + } + + public void setNumgrupo(Integer numgrupo) { + this.numgrupo = numgrupo; + } + + public Short getNumsecuencia() { + return numsecuencia; + } + + public void setNumsecuencia(Short numsecuencia) { + this.numsecuencia = numsecuencia; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + @Override + public int hashCode() { + int hash = 0; + hash += (conexionId != null ? conexionId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ConexionTemp)) { + return false; + } + ConexionTemp other = (ConexionTemp) object; + if ((this.conexionId == null && other.conexionId != null) || (this.conexionId != null && !this.conexionId.equals(other.conexionId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.entidad.ConexionTemp[ conexionId=" + conexionId + " ]"; + } + + public Long getConexionctrlId() { + return conexionctrlId; + } + + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfComprovantePassagem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfComprovantePassagem.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConfComprovantePassagem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfComprovantePassagem.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfContratoPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfContratoPuntoVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfContratoPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfContratoPuntoVenta.java index 2ee5c31e9..c6b68ba99 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfContratoPuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfContratoPuntoVenta.java @@ -1,122 +1,122 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "conf_contrato_puntoVenta") -@SequenceGenerator(name = "CONFCONTRATOPUNTOVENTA_SEQ", sequenceName = "CONFCONTRATOPUNTOVENTA_SEQ", allocationSize = 1) -public class ConfContratoPuntoVenta implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFCONTRATOPUNTOVENTA_SEQ") - @Column(name = "CONF_CONTRATO_PUNTOVENTA_ID") - private Integer confContratoPuntoVentaId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "TEXTOCONTRATOAVISTA") - private String textoContratoAVista; - @Column(name = "TEXTOCONTRATOPRAZO") - private String textoContratoPrazo; - - public Integer getConfigContratoPuntoVentaId() { - return confContratoPuntoVentaId; - } - - public void setConfContratoPuntoVentaId(Integer confContratoPuntoVentaId) { - this.confContratoPuntoVentaId = confContratoPuntoVentaId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - - public String getTextoContratoAVista() { - return textoContratoAVista; - } - - public void setTextoContratoAVista(String textoContratoAVista) { - this.textoContratoAVista = textoContratoAVista; - } - - public String getTextoContratoPrazo() { - return textoContratoPrazo; - } - - public void setTextoContratoPrazo(String textoContratoPrazo) { - this.textoContratoPrazo = textoContratoPrazo; - } - - public Integer getConfContratoPuntoVentaId() { - return confContratoPuntoVentaId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((confContratoPuntoVentaId == null) ? 0 : confContratoPuntoVentaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - ConfContratoPuntoVenta other = (ConfContratoPuntoVenta) obj; - if (confContratoPuntoVentaId == null) { - if (other.confContratoPuntoVentaId != null) - return false; - } else if (!confContratoPuntoVentaId.equals(other.confContratoPuntoVentaId)) - return false; - return true; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "conf_contrato_puntoVenta") +@SequenceGenerator(name = "CONFCONTRATOPUNTOVENTA_SEQ", sequenceName = "CONFCONTRATOPUNTOVENTA_SEQ", allocationSize = 1) +public class ConfContratoPuntoVenta implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFCONTRATOPUNTOVENTA_SEQ") + @Column(name = "CONF_CONTRATO_PUNTOVENTA_ID") + private Integer confContratoPuntoVentaId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "TEXTOCONTRATOAVISTA") + private String textoContratoAVista; + @Column(name = "TEXTOCONTRATOPRAZO") + private String textoContratoPrazo; + + public Integer getConfigContratoPuntoVentaId() { + return confContratoPuntoVentaId; + } + + public void setConfContratoPuntoVentaId(Integer confContratoPuntoVentaId) { + this.confContratoPuntoVentaId = confContratoPuntoVentaId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + + public String getTextoContratoAVista() { + return textoContratoAVista; + } + + public void setTextoContratoAVista(String textoContratoAVista) { + this.textoContratoAVista = textoContratoAVista; + } + + public String getTextoContratoPrazo() { + return textoContratoPrazo; + } + + public void setTextoContratoPrazo(String textoContratoPrazo) { + this.textoContratoPrazo = textoContratoPrazo; + } + + public Integer getConfContratoPuntoVentaId() { + return confContratoPuntoVentaId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((confContratoPuntoVentaId == null) ? 0 : confContratoPuntoVentaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + ConfContratoPuntoVenta other = (ConfContratoPuntoVenta) obj; + if (confContratoPuntoVentaId == null) { + if (other.confContratoPuntoVentaId != null) + return false; + } else if (!confContratoPuntoVentaId.equals(other.confContratoPuntoVentaId)) + return false; + return true; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java index b58ee6307..b1d52fee8 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoCanalVenta.java @@ -1,613 +1,613 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.apache.commons.lang.BooleanUtils; -import org.hibernate.annotations.Where; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarID; -import br.com.rjconsultores.auditador.annotations.AuditarLista; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoCanalVenta", tela = "auditarClasse.ConfRestricaoCanalVenta") -@SequenceGenerator(name = "CONF_RESTRICAO_CANALVENTA_SEQ", sequenceName = "CONF_RESTRICAO_CANALVENTA_SEQ", allocationSize = 1) -@Table(name = "CONF_RESTRICAO_CANALVENTA") -public class ConfRestricaoCanalVenta implements Serializable, Cloneable, Auditavel{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_CANALVENTA_SEQ") - @Column(name = "CONFRESTRICAOCANALVENTA_ID") - @AuditarID - private Long confRestricaoCanalVentaId; - @Column(name = "DESCCONFRESTRICAOCANALVENTA") - private String descConfRestricaoCanalVenta; - @OneToOne - @JoinColumn(name = "TIPOPTOVTA_ID") - @Deprecated - private TipoPuntoVenta tipoPuntoVenta; - @OneToOne - @JoinColumn(name = "ORIGEN_ID") - @Deprecated - private Parada origem; - @OneToOne - @JoinColumn(name = "DESTINO_ID") - @Deprecated - private Parada destino; - @Column(name = "TEMPOPERMITIR") - @Deprecated - private Date tempoPermitir; - @Column(name = "CORRIDA_ID") - private Integer corridaId; - @Column(name = "FECCORRIDA") - private Date fecCorrida; - @Column(name = "SEGUNDA") - @Deprecated - private Boolean segunda; - @Column(name = "TERCA") - @Deprecated - private Boolean terca; - @Column(name = "QUARTA") - @Deprecated - private Boolean quarta; - @Column(name = "QUINTA") - @Deprecated - private Boolean quinta; - @Column(name = "SEXTA") - @Deprecated - private Boolean sexta; - @Column(name = "SABADO") - @Deprecated - private Boolean sabado; - @Column(name = "DOMINGO") - @Deprecated - private Boolean domingo; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - @AuditarLista(auditarEntidades = true, nome = "Exceções de Data Serviço") - @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List lsConfRestricaoExcecao; - @AuditarLista(auditarEntidades = true, nome = "Exceções de Pontos de Vendas") - @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List lsConfRestricaoPtovta; - @Column(name = "INDEXIBECONSULTAVENDAWEB") - private Boolean indexibeconsultavendaweb; - @Column(name = "INDEXIBECORRIDABLOQ") - private Boolean indexibecorridabloq; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "FECINICIOVIGENCIA") - @Temporal(TemporalType.TIMESTAMP) - private Date feciniciovigencia; - @Column(name = "FECFINVIGENCIA") - @Temporal(TemporalType.TIMESTAMP) - private Date fecfinvigencia; - @Column(name = "INDRESTRICAODINAMICA") - private Boolean indRestricaoDinamica; - @AuditarLista(auditarEntidades = true, nome = "Exceções de Trechos") - @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @Where(clause="activo=1") - private List lsConfRestricaoTramo; - @AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoOrgaoConcedente") - @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List lsConfRestricaoOrgaoConcedente; - @AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoRutas") - @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List lsConfRestricaoRutas; - @AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoTramoOC") - @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List lsConfRestricaoTramoOC; - - @Transient - @NaoAuditar - private ConfRestricaoCanalVenta confRestricaoCanalVentaClone; - - public ConfRestricaoCanalVenta() { - super(); - indexibeconsultavendaweb = false; - indexibecorridabloq = false; - } - - public Long getConfRestricaoCanalVentaId() { - return confRestricaoCanalVentaId; - } - - public void setConfRestricaoCanalVentaId(Long confRestricaoCanalVentaId) { - this.confRestricaoCanalVentaId = confRestricaoCanalVentaId; - } - - public String getDescConfRestricaoCanalVenta() { - return descConfRestricaoCanalVenta; - } - - public void setDescConfRestricaoCanalVenta(String descConfRestricaoCanalVenta) { - this.descConfRestricaoCanalVenta = descConfRestricaoCanalVenta; - } - - @Deprecated - public TipoPuntoVenta getTipoPuntoVenta() { - return tipoPuntoVenta; - } - - @Deprecated - public void setTipoPuntoVenta(TipoPuntoVenta tipoPuntoVenta) { - this.tipoPuntoVenta = tipoPuntoVenta; - } - - @Deprecated - public Parada getOrigem() { - return origem; - } - @Deprecated - public void setOrigem(Parada origem) { - this.origem = origem; - } - @Deprecated - public Parada getDestino() { - return destino; - } - @Deprecated - public void setDestino(Parada destino) { - this.destino = destino; - } - @Deprecated - public Date getTempoPermitir() { - return tempoPermitir; - } - @Deprecated - public void setTempoPermitir(Date tempoPermitir) { - this.tempoPermitir = tempoPermitir; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Date getFecCorrida() { - return fecCorrida; - } - - public void setFecCorrida(Date fecCorrida) { - this.fecCorrida = fecCorrida; - } - @Deprecated - public Boolean getSegunda() { - return segunda; - } - @Deprecated - public void setSegunda(Boolean segunda) { - this.segunda = segunda; - } - @Deprecated - public Boolean getTerca() { - return terca; - } - @Deprecated - public void setTerca(Boolean terca) { - this.terca = terca; - } - @Deprecated - public Boolean getQuarta() { - return quarta; - } - @Deprecated - public void setQuarta(Boolean quarta) { - this.quarta = quarta; - } - @Deprecated - public Boolean getQuinta() { - return quinta; - } - @Deprecated - public void setQuinta(Boolean quinta) { - this.quinta = quinta; - } - @Deprecated - public Boolean getSexta() { - return sexta; - } - @Deprecated - public void setSexta(Boolean sexta) { - this.sexta = sexta; - } - @Deprecated - public Boolean getSabado() { - return sabado; - } - @Deprecated - public void setSabado(Boolean sabado) { - this.sabado = sabado; - } - @Deprecated - public Boolean getDomingo() { - return domingo; - } - @Deprecated - public void setDomingo(Boolean domingo) { - this.domingo = domingo; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Boolean getIndexibeconsultavendaweb() { - return indexibeconsultavendaweb; - } - - public void setIndexibeconsultavendaweb(Boolean indexibeconsultavendaweb) { - this.indexibeconsultavendaweb = indexibeconsultavendaweb; - } - - public Boolean getIndexibecorridabloq() { - return indexibecorridabloq; - } - - public void setIndexibecorridabloq(Boolean indexibecorridabloq) { - this.indexibecorridabloq = indexibecorridabloq; - } - - public List getLsConfRestricaoExcecao() { - - List tmp = new ArrayList(); - if (lsConfRestricaoExcecao != null) { - for (ConfRestricaoExcecao cm : this.lsConfRestricaoExcecao) { - if (cm.getActivo()) { - tmp.add(cm); - } - } - } - return tmp; - - } - - public void setLsConfRestricaoExcecao(List lsConfRestricaoExcecao) { - this.lsConfRestricaoExcecao = lsConfRestricaoExcecao; - } - - - public List getLsConfRestricaoOrgaoConcedente() { - - List lsTemp = new ArrayList(); - if (this.lsConfRestricaoOrgaoConcedente != null) { - for (ConfRestricaoOrgaoConcedente cre : this.lsConfRestricaoOrgaoConcedente) { - if (cre.getActivo() == Boolean.TRUE) { - lsTemp.add(cre); - } - } - return lsTemp; - } - return null; - } - - public void setLsConfRestricaoOrgaoConcedente(List lsConfRestricaoOrgaoConcedente) { - this.lsConfRestricaoOrgaoConcedente = lsConfRestricaoOrgaoConcedente; - } - - public List getLsConfRestricaoRutas() { - if (this.lsConfRestricaoRutas != null) { - List lsTemp = new ArrayList(); - - for (ConfRestricaoRutas cre : this.lsConfRestricaoRutas) { - if (cre.getActivo() == Boolean.TRUE) { - lsTemp.add(cre); - } - } - - lsConfRestricaoRutas = lsTemp; - return lsConfRestricaoRutas; - } - - return null; - } - - public void setLsConfRestricaoRutas(List lsConfRestricaoRutas) { - this.lsConfRestricaoRutas = lsConfRestricaoRutas; - } - - public List getLsConfRestricaoTramoOC() { - if (this.lsConfRestricaoTramoOC != null) { - List lsTemp = new ArrayList(); - - for (ConfRestricaoTramoOC cre : this.lsConfRestricaoTramoOC) { - if (cre.getActivo() == Boolean.TRUE) { - lsTemp.add(cre); - } - } - - lsConfRestricaoTramoOC = lsTemp; - return lsConfRestricaoTramoOC; - } - - return null; - } - - public void setLsConfRestricaoTramoOC(List lsConfRestricaoTramoOC) { - this.lsConfRestricaoTramoOC = lsConfRestricaoTramoOC; - } - - public List getLsConfRestricaoPtovta() { - if (this.lsConfRestricaoPtovta != null) { - List lsTemp = new ArrayList(); - - for (ConfRestricaoPtovta cre : this.lsConfRestricaoPtovta) { - if (cre.getActivo() == Boolean.TRUE) { - lsTemp.add(cre); - } - } - - lsConfRestricaoPtovta = lsTemp; - return lsConfRestricaoPtovta; - } - - return null; - } - - public void setLsConfRestricaoPtovta(List lsConfRestricaoPtovta) { - this.lsConfRestricaoPtovta = lsConfRestricaoPtovta; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Date getFeciniciovigencia() { - return feciniciovigencia; - } - - public void setFeciniciovigencia(Date feciniciovigencia) { - this.feciniciovigencia = feciniciovigencia; - } - - public Date getFecfinvigencia() { - return fecfinvigencia; - } - - public void setFecfinvigencia(Date fecfinvigencia) { - this.fecfinvigencia = fecfinvigencia; - } - - public List getLsConfRestricaoTramo() { - - if (this.lsConfRestricaoTramo != null) { - List lsTemp = new ArrayList(); - for (ConfRestricaoTramo cre : this.lsConfRestricaoTramo) { - if (cre.getActivo() == Boolean.TRUE) { - lsTemp.add(cre); - } - } - lsConfRestricaoTramo = lsTemp; - return lsConfRestricaoTramo; - } - - return null; - - } - - public void setLsConfRestricaoTramo(List lsConfRestricaoTramo) { - this.lsConfRestricaoTramo = lsConfRestricaoTramo; - } - - - public Boolean getIndRestricaoDinamica() { - return indRestricaoDinamica; - } - - public void setIndRestricaoDinamica(Boolean indRestricaoDinamica) { - this.indRestricaoDinamica = indRestricaoDinamica; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((confRestricaoCanalVentaId == null) ? 0 : confRestricaoCanalVentaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfRestricaoCanalVenta other = (ConfRestricaoCanalVenta) obj; - if (confRestricaoCanalVentaId == null) { - if (other.confRestricaoCanalVentaId != null) - return false; - } else if (!confRestricaoCanalVentaId.equals(other.confRestricaoCanalVentaId)) - return false; - return true; - } - - public ConfRestricaoCanalVenta getNewConfRestricaoCanalVenta(ConfRestricaoCanalVenta oldConfRestricaoCanalVenta) { - ConfRestricaoCanalVenta newConfRestricaoCanalVenda = new ConfRestricaoCanalVenta(); - newConfRestricaoCanalVenda.setActivo(oldConfRestricaoCanalVenta.getActivo()); - newConfRestricaoCanalVenda.setCorridaId(oldConfRestricaoCanalVenta.getCorridaId()); - newConfRestricaoCanalVenda.setDescConfRestricaoCanalVenta(oldConfRestricaoCanalVenta.getDescConfRestricaoCanalVenta()); - newConfRestricaoCanalVenda.setDestino(oldConfRestricaoCanalVenta.getDestino()); - newConfRestricaoCanalVenda.setDomingo(oldConfRestricaoCanalVenta.getDomingo()); - newConfRestricaoCanalVenda.setEmpresa(oldConfRestricaoCanalVenta.getEmpresa()); - newConfRestricaoCanalVenda.setFecCorrida(oldConfRestricaoCanalVenta.getFecCorrida()); - newConfRestricaoCanalVenda.setFecfinvigencia(oldConfRestricaoCanalVenta.getFecfinvigencia()); - newConfRestricaoCanalVenda.setFeciniciovigencia(oldConfRestricaoCanalVenta.getFeciniciovigencia()); - newConfRestricaoCanalVenda.setFecmodif(new Date()); - newConfRestricaoCanalVenda.setIndexibeconsultavendaweb(oldConfRestricaoCanalVenta.getIndexibeconsultavendaweb()); - newConfRestricaoCanalVenda.setIndexibecorridabloq(oldConfRestricaoCanalVenta.getIndexibecorridabloq()); - newConfRestricaoCanalVenda.setLsConfRestricaoExcecao(oldConfRestricaoCanalVenta.getLsConfRestricaoExcecao()); - newConfRestricaoCanalVenda.setLsConfRestricaoPtovta(oldConfRestricaoCanalVenta.getLsConfRestricaoPtovta()); - newConfRestricaoCanalVenda.setLsConfRestricaoTramo(oldConfRestricaoCanalVenta.getLsConfRestricaoTramo()); - newConfRestricaoCanalVenda.setOrigem(oldConfRestricaoCanalVenta.getOrigem()); - newConfRestricaoCanalVenda.setQuarta(oldConfRestricaoCanalVenta.getQuarta()); - newConfRestricaoCanalVenda.setQuinta(oldConfRestricaoCanalVenta.getQuinta()); - newConfRestricaoCanalVenda.setRuta(oldConfRestricaoCanalVenta.getRuta()); - newConfRestricaoCanalVenda.setSabado(oldConfRestricaoCanalVenta.getSabado()); - newConfRestricaoCanalVenda.setSegunda(oldConfRestricaoCanalVenta.getSegunda()); - newConfRestricaoCanalVenda.setSexta(oldConfRestricaoCanalVenta.getSexta()); - newConfRestricaoCanalVenda.setTempoPermitir(oldConfRestricaoCanalVenta.getTempoPermitir()); - newConfRestricaoCanalVenda.setTerca(oldConfRestricaoCanalVenta.getTerca()); - newConfRestricaoCanalVenda.setTipoPuntoVenta(oldConfRestricaoCanalVenta.getTipoPuntoVenta()); - newConfRestricaoCanalVenda.setUsuarioId(oldConfRestricaoCanalVenta.getUsuarioId()); - newConfRestricaoCanalVenda.setLsConfRestricaoOrgaoConcedente(oldConfRestricaoCanalVenta.getLsConfRestricaoOrgaoConcedente()); - newConfRestricaoCanalVenda.setLsConfRestricaoRutas(oldConfRestricaoCanalVenta.getLsConfRestricaoRutas()); - newConfRestricaoCanalVenda.setLsConfRestricaoTramoOC(oldConfRestricaoCanalVenta.getLsConfRestricaoTramoOC()); - - return newConfRestricaoCanalVenda; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoCanalVentaClone = new ConfRestricaoCanalVenta(); - confRestricaoCanalVentaClone = (ConfRestricaoCanalVenta) this.clone(); - - - if(this.getLsConfRestricaoTramo() != null) { - List lsClones = new ArrayList(); - for (ConfRestricaoTramo confRestricaoTramo : this.getLsConfRestricaoTramo()) { - if(BooleanUtils.isTrue(confRestricaoTramo.getActivo())) { - confRestricaoTramo.clonar(); - lsClones.add(confRestricaoTramo.getCloneObject()); - } - } - confRestricaoCanalVentaClone.setLsConfRestricaoTramo(lsClones); - } - - if(this.getLsConfRestricaoExcecao() != null) { - List lsClones = new ArrayList(); - for (ConfRestricaoExcecao confRestricaoExcecao : this.getLsConfRestricaoExcecao()) { - if(BooleanUtils.isTrue(confRestricaoExcecao.getActivo())) { - confRestricaoExcecao.clonar(); - lsClones.add(confRestricaoExcecao.getCloneObject()); - } - } - confRestricaoCanalVentaClone.setLsConfRestricaoExcecao(lsClones); - } - - if(this.getLsConfRestricaoOrgaoConcedente()!= null) { - List lsClones = new ArrayList(); - for (ConfRestricaoOrgaoConcedente confRestricaoOrgaoConcedente : this.getLsConfRestricaoOrgaoConcedente()) { - if(BooleanUtils.isTrue(confRestricaoOrgaoConcedente.getActivo())) { - confRestricaoOrgaoConcedente.clonar(); - lsClones.add(confRestricaoOrgaoConcedente.getCloneObject()); - } - } - confRestricaoCanalVentaClone.setLsConfRestricaoOrgaoConcedente(lsClones); - } - if(this.getLsConfRestricaoPtovta()!= null) { - List lsClones = new ArrayList(); - for (ConfRestricaoPtovta confRestricaoPtovta : this.getLsConfRestricaoPtovta()) { - if(BooleanUtils.isTrue(confRestricaoPtovta.getActivo())) { - confRestricaoPtovta.clonar(); - lsClones.add(confRestricaoPtovta.getCloneObject()); - } - } - confRestricaoCanalVentaClone.setLsConfRestricaoPtovta(lsClones); - } - - if(this.getLsConfRestricaoRutas()!= null) { - List lsClones = new ArrayList(); - for (ConfRestricaoRutas confRestricaoRutas : this.getLsConfRestricaoRutas()) { - if(BooleanUtils.isTrue(confRestricaoRutas.getActivo())) { - confRestricaoRutas.clonar(); - lsClones.add(confRestricaoRutas.getCloneObject()); - } - } - confRestricaoCanalVentaClone.setLsConfRestricaoRutas(lsClones); - } - - if(this.getLsConfRestricaoTramoOC()!= null) { - List lsClones = new ArrayList(); - for (ConfRestricaoTramoOC confRestricaoTramoOC : this.getLsConfRestricaoTramoOC()) { - if(BooleanUtils.isTrue(confRestricaoTramoOC.getActivo())) { - confRestricaoTramoOC.clonar(); - lsClones.add(confRestricaoTramoOC.getCloneObject()); - } - } - confRestricaoCanalVentaClone.setLsConfRestricaoTramoOC(lsClones); - } - } - - @Override - public ConfRestricaoCanalVenta getCloneObject() throws CloneNotSupportedException { - return confRestricaoCanalVentaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getConfRestricaoCanalVentaId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.apache.commons.lang.BooleanUtils; +import org.hibernate.annotations.Where; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarID; +import br.com.rjconsultores.auditador.annotations.AuditarLista; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoCanalVenta", tela = "auditarClasse.ConfRestricaoCanalVenta") +@SequenceGenerator(name = "CONF_RESTRICAO_CANALVENTA_SEQ", sequenceName = "CONF_RESTRICAO_CANALVENTA_SEQ", allocationSize = 1) +@Table(name = "CONF_RESTRICAO_CANALVENTA") +public class ConfRestricaoCanalVenta implements Serializable, Cloneable, Auditavel{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_CANALVENTA_SEQ") + @Column(name = "CONFRESTRICAOCANALVENTA_ID") + @AuditarID + private Long confRestricaoCanalVentaId; + @Column(name = "DESCCONFRESTRICAOCANALVENTA") + private String descConfRestricaoCanalVenta; + @OneToOne + @JoinColumn(name = "TIPOPTOVTA_ID") + @Deprecated + private TipoPuntoVenta tipoPuntoVenta; + @OneToOne + @JoinColumn(name = "ORIGEN_ID") + @Deprecated + private Parada origem; + @OneToOne + @JoinColumn(name = "DESTINO_ID") + @Deprecated + private Parada destino; + @Column(name = "TEMPOPERMITIR") + @Deprecated + private Date tempoPermitir; + @Column(name = "CORRIDA_ID") + private Integer corridaId; + @Column(name = "FECCORRIDA") + private Date fecCorrida; + @Column(name = "SEGUNDA") + @Deprecated + private Boolean segunda; + @Column(name = "TERCA") + @Deprecated + private Boolean terca; + @Column(name = "QUARTA") + @Deprecated + private Boolean quarta; + @Column(name = "QUINTA") + @Deprecated + private Boolean quinta; + @Column(name = "SEXTA") + @Deprecated + private Boolean sexta; + @Column(name = "SABADO") + @Deprecated + private Boolean sabado; + @Column(name = "DOMINGO") + @Deprecated + private Boolean domingo; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + @AuditarLista(auditarEntidades = true, nome = "Exceções de Data Serviço") + @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List lsConfRestricaoExcecao; + @AuditarLista(auditarEntidades = true, nome = "Exceções de Pontos de Vendas") + @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List lsConfRestricaoPtovta; + @Column(name = "INDEXIBECONSULTAVENDAWEB") + private Boolean indexibeconsultavendaweb; + @Column(name = "INDEXIBECORRIDABLOQ") + private Boolean indexibecorridabloq; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "FECINICIOVIGENCIA") + @Temporal(TemporalType.TIMESTAMP) + private Date feciniciovigencia; + @Column(name = "FECFINVIGENCIA") + @Temporal(TemporalType.TIMESTAMP) + private Date fecfinvigencia; + @Column(name = "INDRESTRICAODINAMICA") + private Boolean indRestricaoDinamica; + @AuditarLista(auditarEntidades = true, nome = "Exceções de Trechos") + @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @Where(clause="activo=1") + private List lsConfRestricaoTramo; + @AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoOrgaoConcedente") + @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List lsConfRestricaoOrgaoConcedente; + @AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoRutas") + @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List lsConfRestricaoRutas; + @AuditarLista(auditarEntidades = true, nome = "lsConfRestricaoTramoOC") + @OneToMany(mappedBy = "confRestricaoCanalVenta", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List lsConfRestricaoTramoOC; + + @Transient + @NaoAuditar + private ConfRestricaoCanalVenta confRestricaoCanalVentaClone; + + public ConfRestricaoCanalVenta() { + super(); + indexibeconsultavendaweb = false; + indexibecorridabloq = false; + } + + public Long getConfRestricaoCanalVentaId() { + return confRestricaoCanalVentaId; + } + + public void setConfRestricaoCanalVentaId(Long confRestricaoCanalVentaId) { + this.confRestricaoCanalVentaId = confRestricaoCanalVentaId; + } + + public String getDescConfRestricaoCanalVenta() { + return descConfRestricaoCanalVenta; + } + + public void setDescConfRestricaoCanalVenta(String descConfRestricaoCanalVenta) { + this.descConfRestricaoCanalVenta = descConfRestricaoCanalVenta; + } + + @Deprecated + public TipoPuntoVenta getTipoPuntoVenta() { + return tipoPuntoVenta; + } + + @Deprecated + public void setTipoPuntoVenta(TipoPuntoVenta tipoPuntoVenta) { + this.tipoPuntoVenta = tipoPuntoVenta; + } + + @Deprecated + public Parada getOrigem() { + return origem; + } + @Deprecated + public void setOrigem(Parada origem) { + this.origem = origem; + } + @Deprecated + public Parada getDestino() { + return destino; + } + @Deprecated + public void setDestino(Parada destino) { + this.destino = destino; + } + @Deprecated + public Date getTempoPermitir() { + return tempoPermitir; + } + @Deprecated + public void setTempoPermitir(Date tempoPermitir) { + this.tempoPermitir = tempoPermitir; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Date getFecCorrida() { + return fecCorrida; + } + + public void setFecCorrida(Date fecCorrida) { + this.fecCorrida = fecCorrida; + } + @Deprecated + public Boolean getSegunda() { + return segunda; + } + @Deprecated + public void setSegunda(Boolean segunda) { + this.segunda = segunda; + } + @Deprecated + public Boolean getTerca() { + return terca; + } + @Deprecated + public void setTerca(Boolean terca) { + this.terca = terca; + } + @Deprecated + public Boolean getQuarta() { + return quarta; + } + @Deprecated + public void setQuarta(Boolean quarta) { + this.quarta = quarta; + } + @Deprecated + public Boolean getQuinta() { + return quinta; + } + @Deprecated + public void setQuinta(Boolean quinta) { + this.quinta = quinta; + } + @Deprecated + public Boolean getSexta() { + return sexta; + } + @Deprecated + public void setSexta(Boolean sexta) { + this.sexta = sexta; + } + @Deprecated + public Boolean getSabado() { + return sabado; + } + @Deprecated + public void setSabado(Boolean sabado) { + this.sabado = sabado; + } + @Deprecated + public Boolean getDomingo() { + return domingo; + } + @Deprecated + public void setDomingo(Boolean domingo) { + this.domingo = domingo; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Boolean getIndexibeconsultavendaweb() { + return indexibeconsultavendaweb; + } + + public void setIndexibeconsultavendaweb(Boolean indexibeconsultavendaweb) { + this.indexibeconsultavendaweb = indexibeconsultavendaweb; + } + + public Boolean getIndexibecorridabloq() { + return indexibecorridabloq; + } + + public void setIndexibecorridabloq(Boolean indexibecorridabloq) { + this.indexibecorridabloq = indexibecorridabloq; + } + + public List getLsConfRestricaoExcecao() { + + List tmp = new ArrayList(); + if (lsConfRestricaoExcecao != null) { + for (ConfRestricaoExcecao cm : this.lsConfRestricaoExcecao) { + if (cm.getActivo()) { + tmp.add(cm); + } + } + } + return tmp; + + } + + public void setLsConfRestricaoExcecao(List lsConfRestricaoExcecao) { + this.lsConfRestricaoExcecao = lsConfRestricaoExcecao; + } + + + public List getLsConfRestricaoOrgaoConcedente() { + + List lsTemp = new ArrayList(); + if (this.lsConfRestricaoOrgaoConcedente != null) { + for (ConfRestricaoOrgaoConcedente cre : this.lsConfRestricaoOrgaoConcedente) { + if (cre.getActivo() == Boolean.TRUE) { + lsTemp.add(cre); + } + } + return lsTemp; + } + return null; + } + + public void setLsConfRestricaoOrgaoConcedente(List lsConfRestricaoOrgaoConcedente) { + this.lsConfRestricaoOrgaoConcedente = lsConfRestricaoOrgaoConcedente; + } + + public List getLsConfRestricaoRutas() { + if (this.lsConfRestricaoRutas != null) { + List lsTemp = new ArrayList(); + + for (ConfRestricaoRutas cre : this.lsConfRestricaoRutas) { + if (cre.getActivo() == Boolean.TRUE) { + lsTemp.add(cre); + } + } + + lsConfRestricaoRutas = lsTemp; + return lsConfRestricaoRutas; + } + + return null; + } + + public void setLsConfRestricaoRutas(List lsConfRestricaoRutas) { + this.lsConfRestricaoRutas = lsConfRestricaoRutas; + } + + public List getLsConfRestricaoTramoOC() { + if (this.lsConfRestricaoTramoOC != null) { + List lsTemp = new ArrayList(); + + for (ConfRestricaoTramoOC cre : this.lsConfRestricaoTramoOC) { + if (cre.getActivo() == Boolean.TRUE) { + lsTemp.add(cre); + } + } + + lsConfRestricaoTramoOC = lsTemp; + return lsConfRestricaoTramoOC; + } + + return null; + } + + public void setLsConfRestricaoTramoOC(List lsConfRestricaoTramoOC) { + this.lsConfRestricaoTramoOC = lsConfRestricaoTramoOC; + } + + public List getLsConfRestricaoPtovta() { + if (this.lsConfRestricaoPtovta != null) { + List lsTemp = new ArrayList(); + + for (ConfRestricaoPtovta cre : this.lsConfRestricaoPtovta) { + if (cre.getActivo() == Boolean.TRUE) { + lsTemp.add(cre); + } + } + + lsConfRestricaoPtovta = lsTemp; + return lsConfRestricaoPtovta; + } + + return null; + } + + public void setLsConfRestricaoPtovta(List lsConfRestricaoPtovta) { + this.lsConfRestricaoPtovta = lsConfRestricaoPtovta; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Date getFeciniciovigencia() { + return feciniciovigencia; + } + + public void setFeciniciovigencia(Date feciniciovigencia) { + this.feciniciovigencia = feciniciovigencia; + } + + public Date getFecfinvigencia() { + return fecfinvigencia; + } + + public void setFecfinvigencia(Date fecfinvigencia) { + this.fecfinvigencia = fecfinvigencia; + } + + public List getLsConfRestricaoTramo() { + + if (this.lsConfRestricaoTramo != null) { + List lsTemp = new ArrayList(); + for (ConfRestricaoTramo cre : this.lsConfRestricaoTramo) { + if (cre.getActivo() == Boolean.TRUE) { + lsTemp.add(cre); + } + } + lsConfRestricaoTramo = lsTemp; + return lsConfRestricaoTramo; + } + + return null; + + } + + public void setLsConfRestricaoTramo(List lsConfRestricaoTramo) { + this.lsConfRestricaoTramo = lsConfRestricaoTramo; + } + + + public Boolean getIndRestricaoDinamica() { + return indRestricaoDinamica; + } + + public void setIndRestricaoDinamica(Boolean indRestricaoDinamica) { + this.indRestricaoDinamica = indRestricaoDinamica; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((confRestricaoCanalVentaId == null) ? 0 : confRestricaoCanalVentaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfRestricaoCanalVenta other = (ConfRestricaoCanalVenta) obj; + if (confRestricaoCanalVentaId == null) { + if (other.confRestricaoCanalVentaId != null) + return false; + } else if (!confRestricaoCanalVentaId.equals(other.confRestricaoCanalVentaId)) + return false; + return true; + } + + public ConfRestricaoCanalVenta getNewConfRestricaoCanalVenta(ConfRestricaoCanalVenta oldConfRestricaoCanalVenta) { + ConfRestricaoCanalVenta newConfRestricaoCanalVenda = new ConfRestricaoCanalVenta(); + newConfRestricaoCanalVenda.setActivo(oldConfRestricaoCanalVenta.getActivo()); + newConfRestricaoCanalVenda.setCorridaId(oldConfRestricaoCanalVenta.getCorridaId()); + newConfRestricaoCanalVenda.setDescConfRestricaoCanalVenta(oldConfRestricaoCanalVenta.getDescConfRestricaoCanalVenta()); + newConfRestricaoCanalVenda.setDestino(oldConfRestricaoCanalVenta.getDestino()); + newConfRestricaoCanalVenda.setDomingo(oldConfRestricaoCanalVenta.getDomingo()); + newConfRestricaoCanalVenda.setEmpresa(oldConfRestricaoCanalVenta.getEmpresa()); + newConfRestricaoCanalVenda.setFecCorrida(oldConfRestricaoCanalVenta.getFecCorrida()); + newConfRestricaoCanalVenda.setFecfinvigencia(oldConfRestricaoCanalVenta.getFecfinvigencia()); + newConfRestricaoCanalVenda.setFeciniciovigencia(oldConfRestricaoCanalVenta.getFeciniciovigencia()); + newConfRestricaoCanalVenda.setFecmodif(new Date()); + newConfRestricaoCanalVenda.setIndexibeconsultavendaweb(oldConfRestricaoCanalVenta.getIndexibeconsultavendaweb()); + newConfRestricaoCanalVenda.setIndexibecorridabloq(oldConfRestricaoCanalVenta.getIndexibecorridabloq()); + newConfRestricaoCanalVenda.setLsConfRestricaoExcecao(oldConfRestricaoCanalVenta.getLsConfRestricaoExcecao()); + newConfRestricaoCanalVenda.setLsConfRestricaoPtovta(oldConfRestricaoCanalVenta.getLsConfRestricaoPtovta()); + newConfRestricaoCanalVenda.setLsConfRestricaoTramo(oldConfRestricaoCanalVenta.getLsConfRestricaoTramo()); + newConfRestricaoCanalVenda.setOrigem(oldConfRestricaoCanalVenta.getOrigem()); + newConfRestricaoCanalVenda.setQuarta(oldConfRestricaoCanalVenta.getQuarta()); + newConfRestricaoCanalVenda.setQuinta(oldConfRestricaoCanalVenta.getQuinta()); + newConfRestricaoCanalVenda.setRuta(oldConfRestricaoCanalVenta.getRuta()); + newConfRestricaoCanalVenda.setSabado(oldConfRestricaoCanalVenta.getSabado()); + newConfRestricaoCanalVenda.setSegunda(oldConfRestricaoCanalVenta.getSegunda()); + newConfRestricaoCanalVenda.setSexta(oldConfRestricaoCanalVenta.getSexta()); + newConfRestricaoCanalVenda.setTempoPermitir(oldConfRestricaoCanalVenta.getTempoPermitir()); + newConfRestricaoCanalVenda.setTerca(oldConfRestricaoCanalVenta.getTerca()); + newConfRestricaoCanalVenda.setTipoPuntoVenta(oldConfRestricaoCanalVenta.getTipoPuntoVenta()); + newConfRestricaoCanalVenda.setUsuarioId(oldConfRestricaoCanalVenta.getUsuarioId()); + newConfRestricaoCanalVenda.setLsConfRestricaoOrgaoConcedente(oldConfRestricaoCanalVenta.getLsConfRestricaoOrgaoConcedente()); + newConfRestricaoCanalVenda.setLsConfRestricaoRutas(oldConfRestricaoCanalVenta.getLsConfRestricaoRutas()); + newConfRestricaoCanalVenda.setLsConfRestricaoTramoOC(oldConfRestricaoCanalVenta.getLsConfRestricaoTramoOC()); + + return newConfRestricaoCanalVenda; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoCanalVentaClone = new ConfRestricaoCanalVenta(); + confRestricaoCanalVentaClone = (ConfRestricaoCanalVenta) this.clone(); + + + if(this.getLsConfRestricaoTramo() != null) { + List lsClones = new ArrayList(); + for (ConfRestricaoTramo confRestricaoTramo : this.getLsConfRestricaoTramo()) { + if(BooleanUtils.isTrue(confRestricaoTramo.getActivo())) { + confRestricaoTramo.clonar(); + lsClones.add(confRestricaoTramo.getCloneObject()); + } + } + confRestricaoCanalVentaClone.setLsConfRestricaoTramo(lsClones); + } + + if(this.getLsConfRestricaoExcecao() != null) { + List lsClones = new ArrayList(); + for (ConfRestricaoExcecao confRestricaoExcecao : this.getLsConfRestricaoExcecao()) { + if(BooleanUtils.isTrue(confRestricaoExcecao.getActivo())) { + confRestricaoExcecao.clonar(); + lsClones.add(confRestricaoExcecao.getCloneObject()); + } + } + confRestricaoCanalVentaClone.setLsConfRestricaoExcecao(lsClones); + } + + if(this.getLsConfRestricaoOrgaoConcedente()!= null) { + List lsClones = new ArrayList(); + for (ConfRestricaoOrgaoConcedente confRestricaoOrgaoConcedente : this.getLsConfRestricaoOrgaoConcedente()) { + if(BooleanUtils.isTrue(confRestricaoOrgaoConcedente.getActivo())) { + confRestricaoOrgaoConcedente.clonar(); + lsClones.add(confRestricaoOrgaoConcedente.getCloneObject()); + } + } + confRestricaoCanalVentaClone.setLsConfRestricaoOrgaoConcedente(lsClones); + } + if(this.getLsConfRestricaoPtovta()!= null) { + List lsClones = new ArrayList(); + for (ConfRestricaoPtovta confRestricaoPtovta : this.getLsConfRestricaoPtovta()) { + if(BooleanUtils.isTrue(confRestricaoPtovta.getActivo())) { + confRestricaoPtovta.clonar(); + lsClones.add(confRestricaoPtovta.getCloneObject()); + } + } + confRestricaoCanalVentaClone.setLsConfRestricaoPtovta(lsClones); + } + + if(this.getLsConfRestricaoRutas()!= null) { + List lsClones = new ArrayList(); + for (ConfRestricaoRutas confRestricaoRutas : this.getLsConfRestricaoRutas()) { + if(BooleanUtils.isTrue(confRestricaoRutas.getActivo())) { + confRestricaoRutas.clonar(); + lsClones.add(confRestricaoRutas.getCloneObject()); + } + } + confRestricaoCanalVentaClone.setLsConfRestricaoRutas(lsClones); + } + + if(this.getLsConfRestricaoTramoOC()!= null) { + List lsClones = new ArrayList(); + for (ConfRestricaoTramoOC confRestricaoTramoOC : this.getLsConfRestricaoTramoOC()) { + if(BooleanUtils.isTrue(confRestricaoTramoOC.getActivo())) { + confRestricaoTramoOC.clonar(); + lsClones.add(confRestricaoTramoOC.getCloneObject()); + } + } + confRestricaoCanalVentaClone.setLsConfRestricaoTramoOC(lsClones); + } + } + + @Override + public ConfRestricaoCanalVenta getCloneObject() throws CloneNotSupportedException { + return confRestricaoCanalVentaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getConfRestricaoCanalVentaId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoExcecao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoExcecao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoExcecao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoExcecao.java index 4d1ccfcc0..ac1168f3f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoExcecao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoExcecao.java @@ -1,181 +1,181 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarEntidade; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoExcecao", tela = "auditarClasse.ConfRestricaoExcecao") -@SequenceGenerator(name = "CONF_RESTRICAO_EXCECAO_SEQ", sequenceName = "CONF_RESTRICAO_EXCECAO_SEQ", allocationSize = 1) -@Table(name = "CONF_RESTRICAO_EXCECAO") -public class ConfRestricaoExcecao implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @Column(name = "CONFRESTRICAOEXCECAO_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_EXCECAO_SEQ") - private Integer confRestricaoExcecaoId; - @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") - @ManyToOne - private ConfRestricaoCanalVenta confRestricaoCanalVenta; - @Column(name = "FECEXCECAO") - private Date fecExcecao; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @NaoAuditar - @JoinColumn(name = "CONFRESTRICAOTRAMO_ID", referencedColumnName = "CONFRESTRICAOTRAMO_ID") - @OneToOne - private ConfRestricaoTramo confRestricaoTramo; - @NaoAuditar - @Transient - private ConfRestricaoExcecao confRestricaoExcecaoClone; - - - public Integer getConfRestricaoExcecaoId() { - return confRestricaoExcecaoId; - } - - public void setConfRestricaoExcecaoId(Integer confRestricaoExcecaoId) { - this.confRestricaoExcecaoId = confRestricaoExcecaoId; - } - - public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { - return confRestricaoCanalVenta; - } - - public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { - this.confRestricaoCanalVenta = confRestricaoCanalVenta; - } - - public Date getFecExcecao() { - return fecExcecao; - } - - public void setFecExcecao(Date fecExcecao) { - this.fecExcecao = fecExcecao; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ConfRestricaoTramo getConfRestricaoTramo() { - return confRestricaoTramo; - } - - public void setConfRestricaoTramo(ConfRestricaoTramo confRestricaoTramo) { - this.confRestricaoTramo = confRestricaoTramo; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((confRestricaoTramo == null) ? 0 : confRestricaoTramo.hashCode()); - result = prime * result + ((fecExcecao == null) ? 0 : fecExcecao.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof ConfRestricaoExcecao)) { - return false; - } - ConfRestricaoExcecao other = (ConfRestricaoExcecao) obj; - if (activo == null) { - if (other.activo != null) { - return false; - } - } else if (!activo.equals(other.activo)) { - return false; - } - if (confRestricaoTramo == null) { - if (other.confRestricaoTramo != null) { - return false; - } - } else if (!confRestricaoTramo.equals(other.confRestricaoTramo)) { - return false; - } - if (fecExcecao == null) { - if (other.fecExcecao != null) { - return false; - } - } else if (!fecExcecao.equals(other.fecExcecao)) { - return false; - } - return true; - } - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoExcecaoClone = new ConfRestricaoExcecao(); - confRestricaoExcecaoClone = (ConfRestricaoExcecao) this.clone(); - Hibernate.initialize(confRestricaoExcecaoClone.getConfRestricaoCanalVenta()); - - } - - @Override - public ConfRestricaoExcecao getCloneObject() throws CloneNotSupportedException { - return confRestricaoExcecaoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getConfRestricaoTramo().getOrigem().getDescparada()+"-"+getConfRestricaoTramo().getDestino().getDescparada()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarEntidade; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoExcecao", tela = "auditarClasse.ConfRestricaoExcecao") +@SequenceGenerator(name = "CONF_RESTRICAO_EXCECAO_SEQ", sequenceName = "CONF_RESTRICAO_EXCECAO_SEQ", allocationSize = 1) +@Table(name = "CONF_RESTRICAO_EXCECAO") +public class ConfRestricaoExcecao implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @Column(name = "CONFRESTRICAOEXCECAO_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_EXCECAO_SEQ") + private Integer confRestricaoExcecaoId; + @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") + @ManyToOne + private ConfRestricaoCanalVenta confRestricaoCanalVenta; + @Column(name = "FECEXCECAO") + private Date fecExcecao; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @NaoAuditar + @JoinColumn(name = "CONFRESTRICAOTRAMO_ID", referencedColumnName = "CONFRESTRICAOTRAMO_ID") + @OneToOne + private ConfRestricaoTramo confRestricaoTramo; + @NaoAuditar + @Transient + private ConfRestricaoExcecao confRestricaoExcecaoClone; + + + public Integer getConfRestricaoExcecaoId() { + return confRestricaoExcecaoId; + } + + public void setConfRestricaoExcecaoId(Integer confRestricaoExcecaoId) { + this.confRestricaoExcecaoId = confRestricaoExcecaoId; + } + + public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { + return confRestricaoCanalVenta; + } + + public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { + this.confRestricaoCanalVenta = confRestricaoCanalVenta; + } + + public Date getFecExcecao() { + return fecExcecao; + } + + public void setFecExcecao(Date fecExcecao) { + this.fecExcecao = fecExcecao; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ConfRestricaoTramo getConfRestricaoTramo() { + return confRestricaoTramo; + } + + public void setConfRestricaoTramo(ConfRestricaoTramo confRestricaoTramo) { + this.confRestricaoTramo = confRestricaoTramo; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((confRestricaoTramo == null) ? 0 : confRestricaoTramo.hashCode()); + result = prime * result + ((fecExcecao == null) ? 0 : fecExcecao.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof ConfRestricaoExcecao)) { + return false; + } + ConfRestricaoExcecao other = (ConfRestricaoExcecao) obj; + if (activo == null) { + if (other.activo != null) { + return false; + } + } else if (!activo.equals(other.activo)) { + return false; + } + if (confRestricaoTramo == null) { + if (other.confRestricaoTramo != null) { + return false; + } + } else if (!confRestricaoTramo.equals(other.confRestricaoTramo)) { + return false; + } + if (fecExcecao == null) { + if (other.fecExcecao != null) { + return false; + } + } else if (!fecExcecao.equals(other.fecExcecao)) { + return false; + } + return true; + } + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoExcecaoClone = new ConfRestricaoExcecao(); + confRestricaoExcecaoClone = (ConfRestricaoExcecao) this.clone(); + Hibernate.initialize(confRestricaoExcecaoClone.getConfRestricaoCanalVenta()); + + } + + @Override + public ConfRestricaoExcecao getCloneObject() throws CloneNotSupportedException { + return confRestricaoExcecaoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getConfRestricaoTramo().getOrigem().getDescparada()+"-"+getConfRestricaoTramo().getDestino().getDescparada()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoOrgaoConcedente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoOrgaoConcedente.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoOrgaoConcedente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoOrgaoConcedente.java index c7cc56c06..103151677 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoOrgaoConcedente.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoOrgaoConcedente.java @@ -1,162 +1,162 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoOrgaoConcedente", tela = "auditarClasse.ConfRestricaoOrgaoConcedente") -@SequenceGenerator(name = "CONF_REST_ORGAOCONCEDENTE_SEQ", sequenceName = "CONF_REST_ORGAOCONCEDENTE_SEQ", allocationSize = 1) -@Table(name = "CONF_REST_ORGAOCONCEDENTE") -public class ConfRestricaoOrgaoConcedente implements Serializable, Auditavel{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_REST_ORGAOCONCEDENTE_SEQ") - @Column(name = "CONFRESTORGAOCONCEDENTE_ID") - private Long confRestOrgaoConcedenteId; - - @OneToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - - @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") - @ManyToOne - private ConfRestricaoCanalVenta confRestricaoCanalVenta; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private ConfRestricaoOrgaoConcedente confRestricaoOrgaoConcedenteClone; - - public ConfRestricaoOrgaoConcedente() { - super(); - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Long getConfRestOrgaoConcedenteId() { - return confRestOrgaoConcedenteId; - } - - public void setConfRestOrgaoConcedenteId(Long confRestOrgaoConcedenteId) { - this.confRestOrgaoConcedenteId = confRestOrgaoConcedenteId; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { - return confRestricaoCanalVenta; - } - - public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { - this.confRestricaoCanalVenta = confRestricaoCanalVenta; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((orgaoConcedente == null) ? 0 : orgaoConcedente.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfRestricaoOrgaoConcedente other = (ConfRestricaoOrgaoConcedente) obj; - if (orgaoConcedente == null) { - if (other.orgaoConcedente != null) - return false; - } else if (!orgaoConcedente.equals(other.orgaoConcedente)) - return false; - return true; - } - - @Override - public String toString() { - return "ConfRestricaoOrgaoConcedente [confRestOrgaoConcedenteId=" + confRestOrgaoConcedenteId + ", orgaoConcedente=" + orgaoConcedente + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoOrgaoConcedenteClone = new ConfRestricaoOrgaoConcedente(); - confRestricaoOrgaoConcedenteClone = (ConfRestricaoOrgaoConcedente) this.clone(); - Hibernate.initialize(confRestricaoOrgaoConcedenteClone.getConfRestricaoCanalVenta()); - - } - - @Override - public ConfRestricaoOrgaoConcedente getCloneObject() throws CloneNotSupportedException { - return confRestricaoOrgaoConcedenteClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrgaoConcedente().getDescOrgao()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoOrgaoConcedente", tela = "auditarClasse.ConfRestricaoOrgaoConcedente") +@SequenceGenerator(name = "CONF_REST_ORGAOCONCEDENTE_SEQ", sequenceName = "CONF_REST_ORGAOCONCEDENTE_SEQ", allocationSize = 1) +@Table(name = "CONF_REST_ORGAOCONCEDENTE") +public class ConfRestricaoOrgaoConcedente implements Serializable, Auditavel{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_REST_ORGAOCONCEDENTE_SEQ") + @Column(name = "CONFRESTORGAOCONCEDENTE_ID") + private Long confRestOrgaoConcedenteId; + + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + + @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") + @ManyToOne + private ConfRestricaoCanalVenta confRestricaoCanalVenta; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private ConfRestricaoOrgaoConcedente confRestricaoOrgaoConcedenteClone; + + public ConfRestricaoOrgaoConcedente() { + super(); + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Long getConfRestOrgaoConcedenteId() { + return confRestOrgaoConcedenteId; + } + + public void setConfRestOrgaoConcedenteId(Long confRestOrgaoConcedenteId) { + this.confRestOrgaoConcedenteId = confRestOrgaoConcedenteId; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { + return confRestricaoCanalVenta; + } + + public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { + this.confRestricaoCanalVenta = confRestricaoCanalVenta; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((orgaoConcedente == null) ? 0 : orgaoConcedente.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfRestricaoOrgaoConcedente other = (ConfRestricaoOrgaoConcedente) obj; + if (orgaoConcedente == null) { + if (other.orgaoConcedente != null) + return false; + } else if (!orgaoConcedente.equals(other.orgaoConcedente)) + return false; + return true; + } + + @Override + public String toString() { + return "ConfRestricaoOrgaoConcedente [confRestOrgaoConcedenteId=" + confRestOrgaoConcedenteId + ", orgaoConcedente=" + orgaoConcedente + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoOrgaoConcedenteClone = new ConfRestricaoOrgaoConcedente(); + confRestricaoOrgaoConcedenteClone = (ConfRestricaoOrgaoConcedente) this.clone(); + Hibernate.initialize(confRestricaoOrgaoConcedenteClone.getConfRestricaoCanalVenta()); + + } + + @Override + public ConfRestricaoOrgaoConcedente getCloneObject() throws CloneNotSupportedException { + return confRestricaoOrgaoConcedenteClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrgaoConcedente().getDescOrgao()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoPtovta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoPtovta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoPtovta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoPtovta.java index 4d3069d0d..352789da5 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoPtovta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoPtovta.java @@ -1,185 +1,185 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoOrgaoConcedente", tela = "auditarClasse.ConfRestricaoPtovta") -@SequenceGenerator(name = "CONF_RESTRICAO_PTOVTA_SEQ", sequenceName = "CONF_RESTRICAO_PTOVTA_SEQ", allocationSize = 1) -@Table(name = "CONF_RESTRICAO_PTOVTA") -public class ConfRestricaoPtovta implements Serializable, Auditavel{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_PTOVTA_SEQ") - @Column(name = "CONFRESTRICAOPTOVTA_ID") - private Integer confRestricaoPtovtaId; - @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") - @ManyToOne - private ConfRestricaoCanalVenta confRestricaoCanalVenta; - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CONFRESTRICAOTRAMO_ID", referencedColumnName = "CONFRESTRICAOTRAMO_ID") - @OneToOne - private ConfRestricaoTramo confRestricaoTramo; - @Transient - @NaoAuditar - private ConfRestricaoPtovta confRestricaoPtovtaClone; - - public Integer getConfRestricaoPtovtaId() { - return confRestricaoPtovtaId; - } - - public void setConfRestricaoPtovtaId(Integer confRestricaoPtovtaId) { - this.confRestricaoPtovtaId = confRestricaoPtovtaId; - } - - public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { - return confRestricaoCanalVenta; - } - - public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { - this.confRestricaoCanalVenta = confRestricaoCanalVenta; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ConfRestricaoTramo getConfRestricaoTramo() { - return confRestricaoTramo; - } - - public void setConfRestricaoTramo(ConfRestricaoTramo confRestricaoTramo) { - this.confRestricaoTramo = confRestricaoTramo; - } - - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((confRestricaoTramo == null) ? 0 : confRestricaoTramo.hashCode()); - result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof ConfRestricaoPtovta)) { - return false; - } - ConfRestricaoPtovta other = (ConfRestricaoPtovta) obj; - if (activo == null) { - if (other.activo != null) { - return false; - } - } else if (!activo.equals(other.activo)) { - return false; - } - if (confRestricaoTramo == null) { - if (other.confRestricaoTramo != null) { - return false; - } - } else if (!confRestricaoTramo.equals(other.confRestricaoTramo)) { - return false; - } - if (puntoVenta == null) { - if (other.puntoVenta != null) { - return false; - } - } else if (!puntoVenta.equals(other.puntoVenta)) { - return false; - } - return true; - } - - @Override - public String toString() { - return "ConfRestricaoPtovta [confRestricaoPtovtaId=" + confRestricaoPtovtaId + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", puntoVenta=" + puntoVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; - } - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoPtovtaClone = new ConfRestricaoPtovta(); - confRestricaoPtovtaClone = (ConfRestricaoPtovta) this.clone(); - Hibernate.initialize(confRestricaoPtovtaClone.getConfRestricaoCanalVenta()); - - } - - @Override - public ConfRestricaoPtovta getCloneObject() throws CloneNotSupportedException { - return confRestricaoPtovtaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPuntoVenta().getNombpuntoventa()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoOrgaoConcedente", tela = "auditarClasse.ConfRestricaoPtovta") +@SequenceGenerator(name = "CONF_RESTRICAO_PTOVTA_SEQ", sequenceName = "CONF_RESTRICAO_PTOVTA_SEQ", allocationSize = 1) +@Table(name = "CONF_RESTRICAO_PTOVTA") +public class ConfRestricaoPtovta implements Serializable, Auditavel{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_PTOVTA_SEQ") + @Column(name = "CONFRESTRICAOPTOVTA_ID") + private Integer confRestricaoPtovtaId; + @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") + @ManyToOne + private ConfRestricaoCanalVenta confRestricaoCanalVenta; + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CONFRESTRICAOTRAMO_ID", referencedColumnName = "CONFRESTRICAOTRAMO_ID") + @OneToOne + private ConfRestricaoTramo confRestricaoTramo; + @Transient + @NaoAuditar + private ConfRestricaoPtovta confRestricaoPtovtaClone; + + public Integer getConfRestricaoPtovtaId() { + return confRestricaoPtovtaId; + } + + public void setConfRestricaoPtovtaId(Integer confRestricaoPtovtaId) { + this.confRestricaoPtovtaId = confRestricaoPtovtaId; + } + + public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { + return confRestricaoCanalVenta; + } + + public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { + this.confRestricaoCanalVenta = confRestricaoCanalVenta; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ConfRestricaoTramo getConfRestricaoTramo() { + return confRestricaoTramo; + } + + public void setConfRestricaoTramo(ConfRestricaoTramo confRestricaoTramo) { + this.confRestricaoTramo = confRestricaoTramo; + } + + + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((confRestricaoTramo == null) ? 0 : confRestricaoTramo.hashCode()); + result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof ConfRestricaoPtovta)) { + return false; + } + ConfRestricaoPtovta other = (ConfRestricaoPtovta) obj; + if (activo == null) { + if (other.activo != null) { + return false; + } + } else if (!activo.equals(other.activo)) { + return false; + } + if (confRestricaoTramo == null) { + if (other.confRestricaoTramo != null) { + return false; + } + } else if (!confRestricaoTramo.equals(other.confRestricaoTramo)) { + return false; + } + if (puntoVenta == null) { + if (other.puntoVenta != null) { + return false; + } + } else if (!puntoVenta.equals(other.puntoVenta)) { + return false; + } + return true; + } + + @Override + public String toString() { + return "ConfRestricaoPtovta [confRestricaoPtovtaId=" + confRestricaoPtovtaId + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", puntoVenta=" + puntoVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; + } + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoPtovtaClone = new ConfRestricaoPtovta(); + confRestricaoPtovtaClone = (ConfRestricaoPtovta) this.clone(); + Hibernate.initialize(confRestricaoPtovtaClone.getConfRestricaoCanalVenta()); + + } + + @Override + public ConfRestricaoPtovta getCloneObject() throws CloneNotSupportedException { + return confRestricaoPtovtaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPuntoVenta().getNombpuntoventa()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoRutas.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoRutas.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoRutas.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoRutas.java index 214c639b8..2175b583e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoRutas.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoRutas.java @@ -1,160 +1,160 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoRutas", tela = "auditarClasse.ConfRestricaoRutas") -@SequenceGenerator(name = "CONF_REST_RUTAS_SEQ", sequenceName = "CONF_REST_RUTAS_SEQ", allocationSize = 1) -@Table(name = "CONF_REST_RUTAS") -public class ConfRestricaoRutas implements Serializable, Auditavel{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_REST_RUTAS_SEQ") - @Column(name = "CONFRESTRUTAS_ID") - private Long confRestRutasId; - - @OneToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - - @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") - @ManyToOne - private ConfRestricaoCanalVenta confRestricaoCanalVenta; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private ConfRestricaoRutas confRestricaoRutasClone; - - public ConfRestricaoRutas() { - super(); - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Long getConfRestRutasId() { - return confRestRutasId; - } - - public void setConfRestRutasId(Long confRestRutasId) { - this.confRestRutasId = confRestRutasId; - } - - public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { - return confRestricaoCanalVenta; - } - - public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { - this.confRestricaoCanalVenta = confRestricaoCanalVenta; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ruta == null) ? 0 : ruta.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfRestricaoRutas other = (ConfRestricaoRutas) obj; - if (ruta == null) { - if (other.ruta != null) - return false; - } else if (!ruta.equals(other.ruta)) - return false; - return true; - } - - @Override - public String toString() { - return "ConfRestricaoRutas [confRestRutasId=" + confRestRutasId + ", ruta=" + ruta + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; - } - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoRutasClone = new ConfRestricaoRutas(); - confRestricaoRutasClone = (ConfRestricaoRutas) this.clone(); - Hibernate.initialize(confRestricaoRutasClone.getConfRestricaoCanalVenta()); - - } - @Override - public ConfRestricaoRutas getCloneObject() throws CloneNotSupportedException { - return confRestricaoRutasClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getRuta().getDescruta()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoRutas", tela = "auditarClasse.ConfRestricaoRutas") +@SequenceGenerator(name = "CONF_REST_RUTAS_SEQ", sequenceName = "CONF_REST_RUTAS_SEQ", allocationSize = 1) +@Table(name = "CONF_REST_RUTAS") +public class ConfRestricaoRutas implements Serializable, Auditavel{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_REST_RUTAS_SEQ") + @Column(name = "CONFRESTRUTAS_ID") + private Long confRestRutasId; + + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + + @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") + @ManyToOne + private ConfRestricaoCanalVenta confRestricaoCanalVenta; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private ConfRestricaoRutas confRestricaoRutasClone; + + public ConfRestricaoRutas() { + super(); + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Long getConfRestRutasId() { + return confRestRutasId; + } + + public void setConfRestRutasId(Long confRestRutasId) { + this.confRestRutasId = confRestRutasId; + } + + public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { + return confRestricaoCanalVenta; + } + + public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { + this.confRestricaoCanalVenta = confRestricaoCanalVenta; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ruta == null) ? 0 : ruta.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfRestricaoRutas other = (ConfRestricaoRutas) obj; + if (ruta == null) { + if (other.ruta != null) + return false; + } else if (!ruta.equals(other.ruta)) + return false; + return true; + } + + @Override + public String toString() { + return "ConfRestricaoRutas [confRestRutasId=" + confRestRutasId + ", ruta=" + ruta + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; + } + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoRutasClone = new ConfRestricaoRutas(); + confRestricaoRutasClone = (ConfRestricaoRutas) this.clone(); + Hibernate.initialize(confRestricaoRutasClone.getConfRestricaoCanalVenta()); + + } + @Override + public ConfRestricaoRutas getCloneObject() throws CloneNotSupportedException { + return confRestricaoRutasClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getRuta().getDescruta()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramo.java index a521c5b86..aca44fc1d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramo.java @@ -1,306 +1,306 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarEntidade; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoTramo", tela = "auditarClasse.ConfRestricaoTramo") -@SequenceGenerator(name = "CONF_RESTRICAO_TRAMO_SEQ", sequenceName = "CONF_RESTRICAO_TRAMO_SEQ", allocationSize = 1) -@Table(name = "CONF_RESTRICAO_TRAMO") -public class ConfRestricaoTramo implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_TRAMO_SEQ") - @Column(name = "CONFRESTRICAOTRAMO_ID") - private Long confRestricaoTramoId; - - @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") - @ManyToOne - private ConfRestricaoCanalVenta confRestricaoCanalVenta; - @AuditarEntidade - @OneToOne - @JoinColumn(name = "TIPOPTOVTA_ID") - private TipoPuntoVenta tipoPuntoVenta; - @OneToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origem; - @OneToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - @Column(name = "TEMPOPERMITIR") - private Date tempoPermitir; - - @Column(name = "SEGUNDA") - private Boolean segunda; - @Column(name = "TERCA") - private Boolean terca; - @Column(name = "QUARTA") - private Boolean quarta; - @Column(name = "QUINTA") - private Boolean quinta; - @Column(name = "SEXTA") - private Boolean sexta; - @Column(name = "SABADO") - private Boolean sabado; - @Column(name = "DOMINGO") - private Boolean domingo; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Transient - @NaoAuditar - private ConfRestricaoTramo confRestricaoTramoClone; - - public Long getConfRestricaoTramoId() { - return confRestricaoTramoId; - } - - public void setConfRestricaoTramoId(Long confRestricaoTramoId) { - this.confRestricaoTramoId = confRestricaoTramoId; - } - - public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { - return confRestricaoCanalVenta; - } - - public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { - this.confRestricaoCanalVenta = confRestricaoCanalVenta; - } - - public TipoPuntoVenta getTipoPuntoVenta() { - return tipoPuntoVenta; - } - - public void setTipoPuntoVenta(TipoPuntoVenta tipoPuntoVenta) { - this.tipoPuntoVenta = tipoPuntoVenta; - } - - public Parada getOrigem() { - return origem; - } - - public void setOrigem(Parada origem) { - this.origem = origem; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Date getTempoPermitir() { - return tempoPermitir; - } - - public void setTempoPermitir(Date tempoPermitir) { - this.tempoPermitir = tempoPermitir; - } - - public Boolean getSegunda() { - return segunda; - } - - public void setSegunda(Boolean segunda) { - this.segunda = segunda; - } - - public Boolean getTerca() { - return terca; - } - - public void setTerca(Boolean terca) { - this.terca = terca; - } - - public Boolean getQuarta() { - return quarta; - } - - public void setQuarta(Boolean quarta) { - this.quarta = quarta; - } - - public Boolean getQuinta() { - return quinta; - } - - public void setQuinta(Boolean quinta) { - this.quinta = quinta; - } - - public Boolean getSexta() { - return sexta; - } - - public void setSexta(Boolean sexta) { - this.sexta = sexta; - } - - public Boolean getSabado() { - return sabado; - } - - public void setSabado(Boolean sabado) { - this.sabado = sabado; - } - - public Boolean getDomingo() { - return domingo; - } - - public void setDomingo(Boolean domingo) { - this.domingo = domingo; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - if (confRestricaoTramoId != null) - builder.append(confRestricaoTramoId).append(" - "); - if (tipoPuntoVenta != null) - builder.append(tipoPuntoVenta).append(" - "); - if (origem != null) - builder.append(origem).append(" - "); - if (destino != null) - builder.append(destino); - return builder.toString(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((confRestricaoCanalVenta == null) ? 0 : confRestricaoCanalVenta.hashCode()); - result = prime * result + ((destino == null) ? 0 : destino.hashCode()); - result = prime * result + ((origem == null) ? 0 : origem.hashCode()); - result = prime * result + ((tipoPuntoVenta == null) ? 0 : tipoPuntoVenta.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof ConfRestricaoTramo)) { - return false; - } - ConfRestricaoTramo other = (ConfRestricaoTramo) obj; - if (activo == null) { - if (other.activo != null) { - return false; - } - } else if (!activo.equals(other.activo)) { - return false; - } - if (confRestricaoCanalVenta == null) { - if (other.confRestricaoCanalVenta != null) { - return false; - } - } else if (!confRestricaoCanalVenta.equals(other.confRestricaoCanalVenta)) { - return false; - } - if (destino == null) { - if (other.destino != null) { - return false; - } - } else if (!destino.equals(other.destino)) { - return false; - } - if (origem == null) { - if (other.origem != null) { - return false; - } - } else if (!origem.equals(other.origem)) { - return false; - } - if (tipoPuntoVenta == null) { - if (other.tipoPuntoVenta != null) { - return false; - } - } else if (!tipoPuntoVenta.equals(other.tipoPuntoVenta)) { - return false; - } - return true; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoTramoClone = new ConfRestricaoTramo(); - confRestricaoTramoClone = (ConfRestricaoTramo) this.clone(); - Hibernate.initialize(confRestricaoTramoClone.getConfRestricaoCanalVenta()); - - } - - @Override - public ConfRestricaoTramo getCloneObject() throws CloneNotSupportedException { - return confRestricaoTramoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrigem().getDescparada()+"-"+getDestino().getDescparada()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarEntidade; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoTramo", tela = "auditarClasse.ConfRestricaoTramo") +@SequenceGenerator(name = "CONF_RESTRICAO_TRAMO_SEQ", sequenceName = "CONF_RESTRICAO_TRAMO_SEQ", allocationSize = 1) +@Table(name = "CONF_RESTRICAO_TRAMO") +public class ConfRestricaoTramo implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_TRAMO_SEQ") + @Column(name = "CONFRESTRICAOTRAMO_ID") + private Long confRestricaoTramoId; + + @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") + @ManyToOne + private ConfRestricaoCanalVenta confRestricaoCanalVenta; + @AuditarEntidade + @OneToOne + @JoinColumn(name = "TIPOPTOVTA_ID") + private TipoPuntoVenta tipoPuntoVenta; + @OneToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origem; + @OneToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + @Column(name = "TEMPOPERMITIR") + private Date tempoPermitir; + + @Column(name = "SEGUNDA") + private Boolean segunda; + @Column(name = "TERCA") + private Boolean terca; + @Column(name = "QUARTA") + private Boolean quarta; + @Column(name = "QUINTA") + private Boolean quinta; + @Column(name = "SEXTA") + private Boolean sexta; + @Column(name = "SABADO") + private Boolean sabado; + @Column(name = "DOMINGO") + private Boolean domingo; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Transient + @NaoAuditar + private ConfRestricaoTramo confRestricaoTramoClone; + + public Long getConfRestricaoTramoId() { + return confRestricaoTramoId; + } + + public void setConfRestricaoTramoId(Long confRestricaoTramoId) { + this.confRestricaoTramoId = confRestricaoTramoId; + } + + public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { + return confRestricaoCanalVenta; + } + + public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { + this.confRestricaoCanalVenta = confRestricaoCanalVenta; + } + + public TipoPuntoVenta getTipoPuntoVenta() { + return tipoPuntoVenta; + } + + public void setTipoPuntoVenta(TipoPuntoVenta tipoPuntoVenta) { + this.tipoPuntoVenta = tipoPuntoVenta; + } + + public Parada getOrigem() { + return origem; + } + + public void setOrigem(Parada origem) { + this.origem = origem; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Date getTempoPermitir() { + return tempoPermitir; + } + + public void setTempoPermitir(Date tempoPermitir) { + this.tempoPermitir = tempoPermitir; + } + + public Boolean getSegunda() { + return segunda; + } + + public void setSegunda(Boolean segunda) { + this.segunda = segunda; + } + + public Boolean getTerca() { + return terca; + } + + public void setTerca(Boolean terca) { + this.terca = terca; + } + + public Boolean getQuarta() { + return quarta; + } + + public void setQuarta(Boolean quarta) { + this.quarta = quarta; + } + + public Boolean getQuinta() { + return quinta; + } + + public void setQuinta(Boolean quinta) { + this.quinta = quinta; + } + + public Boolean getSexta() { + return sexta; + } + + public void setSexta(Boolean sexta) { + this.sexta = sexta; + } + + public Boolean getSabado() { + return sabado; + } + + public void setSabado(Boolean sabado) { + this.sabado = sabado; + } + + public Boolean getDomingo() { + return domingo; + } + + public void setDomingo(Boolean domingo) { + this.domingo = domingo; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + if (confRestricaoTramoId != null) + builder.append(confRestricaoTramoId).append(" - "); + if (tipoPuntoVenta != null) + builder.append(tipoPuntoVenta).append(" - "); + if (origem != null) + builder.append(origem).append(" - "); + if (destino != null) + builder.append(destino); + return builder.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((confRestricaoCanalVenta == null) ? 0 : confRestricaoCanalVenta.hashCode()); + result = prime * result + ((destino == null) ? 0 : destino.hashCode()); + result = prime * result + ((origem == null) ? 0 : origem.hashCode()); + result = prime * result + ((tipoPuntoVenta == null) ? 0 : tipoPuntoVenta.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof ConfRestricaoTramo)) { + return false; + } + ConfRestricaoTramo other = (ConfRestricaoTramo) obj; + if (activo == null) { + if (other.activo != null) { + return false; + } + } else if (!activo.equals(other.activo)) { + return false; + } + if (confRestricaoCanalVenta == null) { + if (other.confRestricaoCanalVenta != null) { + return false; + } + } else if (!confRestricaoCanalVenta.equals(other.confRestricaoCanalVenta)) { + return false; + } + if (destino == null) { + if (other.destino != null) { + return false; + } + } else if (!destino.equals(other.destino)) { + return false; + } + if (origem == null) { + if (other.origem != null) { + return false; + } + } else if (!origem.equals(other.origem)) { + return false; + } + if (tipoPuntoVenta == null) { + if (other.tipoPuntoVenta != null) { + return false; + } + } else if (!tipoPuntoVenta.equals(other.tipoPuntoVenta)) { + return false; + } + return true; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoTramoClone = new ConfRestricaoTramo(); + confRestricaoTramoClone = (ConfRestricaoTramo) this.clone(); + Hibernate.initialize(confRestricaoTramoClone.getConfRestricaoCanalVenta()); + + } + + @Override + public ConfRestricaoTramo getCloneObject() throws CloneNotSupportedException { + return confRestricaoTramoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrigem().getDescparada()+"-"+getDestino().getDescparada()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramoOC.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramoOC.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramoOC.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramoOC.java index 4359e710b..142309daf 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramoOC.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoTramoOC.java @@ -1,179 +1,179 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoTramoOC", tela = "auditarClasse.ConfRestricaoTramoOC") -@SequenceGenerator(name = "CONF_REST_TRAMOOC_SEQ", sequenceName = "CONF_REST_TRAMOOC_SEQ", allocationSize = 1) -@Table(name = "CONF_REST_TRAMOOC") -public class ConfRestricaoTramoOC implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_REST_TRAMOOC_SEQ") - @Column(name = "CONFRESTTRAMOOC_ID") - private Long confRestTramoOCId; - - @OneToOne - @JoinColumn(name = "ORIGEM_ID") - private Parada origem; - - @OneToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - - @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") - @ManyToOne - private ConfRestricaoCanalVenta confRestricaoCanalVenta; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private ConfRestricaoTramoOC confRestricaoTramoOCClone; - - public ConfRestricaoTramoOC() { - super(); - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { - return confRestricaoCanalVenta; - } - - public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { - this.confRestricaoCanalVenta = confRestricaoCanalVenta; - } - - public Long getConfRestTramoOCId() { - return confRestTramoOCId; - } - - public void setConfRestTramoOCId(Long confRestTramoOCId) { - this.confRestTramoOCId = confRestTramoOCId; - } - - public Parada getOrigem() { - return origem; - } - - public void setOrigem(Parada origem) { - this.origem = origem; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((destino == null) ? 0 : destino.hashCode()); - result = prime * result + ((origem == null) ? 0 : origem.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfRestricaoTramoOC other = (ConfRestricaoTramoOC) obj; - if (destino == null) { - if (other.destino != null) - return false; - } else if (!destino.equals(other.destino)) - return false; - if (origem == null) { - if (other.origem != null) - return false; - } else if (!origem.equals(other.origem)) - return false; - return true; - } - - @Override - public String toString() { - return "ConfRestricaoTramoOC [confRestTramoOCId=" + confRestTramoOCId + ", origem=" + origem + ", destino=" + destino + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoTramoOCClone = new ConfRestricaoTramoOC(); - confRestricaoTramoOCClone = (ConfRestricaoTramoOC) this.clone(); - Hibernate.initialize(confRestricaoTramoOCClone.getConfRestricaoCanalVenta()); - - } - @Override - public ConfRestricaoTramoOC getCloneObject() throws CloneNotSupportedException { - return confRestricaoTramoOCClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrigem().getDescparada()+"-"+getDestino().getDescparada()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoTramoOC", tela = "auditarClasse.ConfRestricaoTramoOC") +@SequenceGenerator(name = "CONF_REST_TRAMOOC_SEQ", sequenceName = "CONF_REST_TRAMOOC_SEQ", allocationSize = 1) +@Table(name = "CONF_REST_TRAMOOC") +public class ConfRestricaoTramoOC implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_REST_TRAMOOC_SEQ") + @Column(name = "CONFRESTTRAMOOC_ID") + private Long confRestTramoOCId; + + @OneToOne + @JoinColumn(name = "ORIGEM_ID") + private Parada origem; + + @OneToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + + @JoinColumn(name = "CONFRESTRICAOCANALVENTA_ID", referencedColumnName = "CONFRESTRICAOCANALVENTA_ID") + @ManyToOne + private ConfRestricaoCanalVenta confRestricaoCanalVenta; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private ConfRestricaoTramoOC confRestricaoTramoOCClone; + + public ConfRestricaoTramoOC() { + super(); + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ConfRestricaoCanalVenta getConfRestricaoCanalVenta() { + return confRestricaoCanalVenta; + } + + public void setConfRestricaoCanalVenta(ConfRestricaoCanalVenta confRestricaoCanalVenta) { + this.confRestricaoCanalVenta = confRestricaoCanalVenta; + } + + public Long getConfRestTramoOCId() { + return confRestTramoOCId; + } + + public void setConfRestTramoOCId(Long confRestTramoOCId) { + this.confRestTramoOCId = confRestTramoOCId; + } + + public Parada getOrigem() { + return origem; + } + + public void setOrigem(Parada origem) { + this.origem = origem; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((destino == null) ? 0 : destino.hashCode()); + result = prime * result + ((origem == null) ? 0 : origem.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfRestricaoTramoOC other = (ConfRestricaoTramoOC) obj; + if (destino == null) { + if (other.destino != null) + return false; + } else if (!destino.equals(other.destino)) + return false; + if (origem == null) { + if (other.origem != null) + return false; + } else if (!origem.equals(other.origem)) + return false; + return true; + } + + @Override + public String toString() { + return "ConfRestricaoTramoOC [confRestTramoOCId=" + confRestTramoOCId + ", origem=" + origem + ", destino=" + destino + ", confRestricaoCanalVenta=" + confRestricaoCanalVenta + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + "]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoTramoOCClone = new ConfRestricaoTramoOC(); + confRestricaoTramoOCClone = (ConfRestricaoTramoOC) this.clone(); + Hibernate.initialize(confRestricaoTramoOCClone.getConfRestricaoCanalVenta()); + + } + @Override + public ConfRestricaoTramoOC getCloneObject() throws CloneNotSupportedException { + return confRestricaoTramoOCClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrigem().getDescparada()+"-"+getDestino().getDescparada()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoVendaWeb.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoVendaWeb.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoVendaWeb.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoVendaWeb.java index f815802a6..13a637949 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoVendaWeb.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfRestricaoVendaWeb.java @@ -1,108 +1,108 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@AuditarClasse(nome = "ConfRestricaoVendaWeb", tela = "auditarClasse.ConfRestricaoVendaWeb") -@SequenceGenerator(name = "CONF_RESTRICAO_VENDAWEB_SEQ", sequenceName = "CONF_RESTRICAO_VENDAWEB_SEQ", allocationSize = 1) -@Table(name = "CONF_RESTRICAO_VENDAWEB") -public class ConfRestricaoVendaWeb implements Serializable, Auditavel{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_VENDAWEB_SEQ") - @Column(name = "CONFRESTRICAOVENDAWEB_ID") - private Integer confRestricaoVendaWebId; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "valor") - private Double valor; - - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @NaoAuditar - @Transient - private ConfRestricaoVendaWeb confRestricaoVendaWebClone; - - public Integer getConfRestricaoVendaWebId() { - return confRestricaoVendaWebId; - } - public void setConfRestricaoVendaWebId(Integer confRestricaoVendaWebId) { - this.confRestricaoVendaWebId = confRestricaoVendaWebId; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Double getValor() { - return valor; - } - public void setValor(Double valor) { - this.valor = valor; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - confRestricaoVendaWebClone = new ConfRestricaoVendaWeb(); - confRestricaoVendaWebClone = (ConfRestricaoVendaWeb) this.clone(); - - } - - @Override - public ConfRestricaoVendaWeb getCloneObject() throws CloneNotSupportedException { - return confRestricaoVendaWebClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", "Empresa: "+getEmpresa().getNombempresa()+"- Valor: "+getValor()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@AuditarClasse(nome = "ConfRestricaoVendaWeb", tela = "auditarClasse.ConfRestricaoVendaWeb") +@SequenceGenerator(name = "CONF_RESTRICAO_VENDAWEB_SEQ", sequenceName = "CONF_RESTRICAO_VENDAWEB_SEQ", allocationSize = 1) +@Table(name = "CONF_RESTRICAO_VENDAWEB") +public class ConfRestricaoVendaWeb implements Serializable, Auditavel{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_RESTRICAO_VENDAWEB_SEQ") + @Column(name = "CONFRESTRICAOVENDAWEB_ID") + private Integer confRestricaoVendaWebId; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "valor") + private Double valor; + + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @NaoAuditar + @Transient + private ConfRestricaoVendaWeb confRestricaoVendaWebClone; + + public Integer getConfRestricaoVendaWebId() { + return confRestricaoVendaWebId; + } + public void setConfRestricaoVendaWebId(Integer confRestricaoVendaWebId) { + this.confRestricaoVendaWebId = confRestricaoVendaWebId; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Double getValor() { + return valor; + } + public void setValor(Double valor) { + this.valor = valor; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + confRestricaoVendaWebClone = new ConfRestricaoVendaWeb(); + confRestricaoVendaWebClone = (ConfRestricaoVendaWeb) this.clone(); + + } + + @Override + public ConfRestricaoVendaWeb getCloneObject() throws CloneNotSupportedException { + return confRestricaoVendaWebClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", "Empresa: "+getEmpresa().getNombempresa()+"- Valor: "+getValor()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfTotem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfTotem.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConfTotem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfTotem.java index b99bbd239..32b034c08 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfTotem.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfTotem.java @@ -1,111 +1,111 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CONF_TOTEM_SEQ", sequenceName = "CONF_TOTEM_SEQ",allocationSize=1) -@Table(name = "CONF_TOTEM") -public class ConfTotem implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_TOTEM_SEQ") - @Column(name = "CONFTOTEM_ID") - private Integer confTotemId; - @Column(name = "VALOR") - private String valor; - @Column(name = "CHAVE") - private String chave; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getConfTotemId() { - return confTotemId; - } - public void setConfTotemId(Integer confTotemId) { - this.confTotemId = confTotemId; - } - - public ConfTotem() { - super(); - } - - public String getValor() { - return valor; - } - public void setValor(String valor) { - this.valor = valor; - } - - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getChave() { - return chave; - } - public void setChave(String chave) { - this.chave = chave; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((confTotemId == null) ? 0 : confTotemId.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfTotem other = (ConfTotem) obj; - if (confTotemId == null) { - if (other.confTotemId != null) - return false; - } else if (!confTotemId.equals(other.confTotemId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CONF_TOTEM_SEQ", sequenceName = "CONF_TOTEM_SEQ",allocationSize=1) +@Table(name = "CONF_TOTEM") +public class ConfTotem implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONF_TOTEM_SEQ") + @Column(name = "CONFTOTEM_ID") + private Integer confTotemId; + @Column(name = "VALOR") + private String valor; + @Column(name = "CHAVE") + private String chave; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getConfTotemId() { + return confTotemId; + } + public void setConfTotemId(Integer confTotemId) { + this.confTotemId = confTotemId; + } + + public ConfTotem() { + super(); + } + + public String getValor() { + return valor; + } + public void setValor(String valor) { + this.valor = valor; + } + + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getChave() { + return chave; + } + public void setChave(String chave) { + this.chave = chave; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((confTotemId == null) ? 0 : confTotemId.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfTotem other = (ConfTotem) obj; + if (confTotemId == null) { + if (other.confTotemId != null) + return false; + } else if (!confTotemId.equals(other.confTotemId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfTotemVentaRapida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfTotemVentaRapida.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ConfTotemVentaRapida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfTotemVentaRapida.java index 9cdb5c24e..af0b0ab27 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfTotemVentaRapida.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfTotemVentaRapida.java @@ -1,139 +1,139 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author wallace - */ -@Entity -@SequenceGenerator(name = "CONFTOTEM_VENTARAPIDA_SEQ", sequenceName = "CONFTOTEM_VENTARAPIDA_SEQ", allocationSize = 1) -@Table(name = "CONF_TOTEM_VENTARAPIDA") -public class ConfTotemVentaRapida implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFTOTEM_VENTARAPIDA_SEQ") - @Column(name = "CONFTOTEMVENTARAPIDA_ID") - private Integer confTotemVentaRapidaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @ManyToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origen; - @ManyToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - - public ConfTotemVentaRapida() { - super(); - } - - public ConfTotemVentaRapida(Parada origem, Parada destino) { - this.origen = origem; - this.destino = destino; - } - - public Integer getConfTotemVentaRapidaOri() { - return confTotemVentaRapidaId; - } - - public void setConfTotemVentaRapidaId(Integer confTotemVentaRapidaId) { - this.confTotemVentaRapidaId = confTotemVentaRapidaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((destino == null) ? 0 : destino.hashCode()); - result = prime * result + ((origen == null) ? 0 : origen.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfTotemVentaRapida other = (ConfTotemVentaRapida) obj; - if (destino == null) { - if (other.destino != null) - return false; - } else if (!destino.equals(other.destino)) - return false; - if (origen == null) { - if (other.origen != null) - return false; - } else if (!origen.equals(other.origen)) - return false; - return true; - } - - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author wallace + */ +@Entity +@SequenceGenerator(name = "CONFTOTEM_VENTARAPIDA_SEQ", sequenceName = "CONFTOTEM_VENTARAPIDA_SEQ", allocationSize = 1) +@Table(name = "CONF_TOTEM_VENTARAPIDA") +public class ConfTotemVentaRapida implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFTOTEM_VENTARAPIDA_SEQ") + @Column(name = "CONFTOTEMVENTARAPIDA_ID") + private Integer confTotemVentaRapidaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @ManyToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origen; + @ManyToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + + public ConfTotemVentaRapida() { + super(); + } + + public ConfTotemVentaRapida(Parada origem, Parada destino) { + this.origen = origem; + this.destino = destino; + } + + public Integer getConfTotemVentaRapidaOri() { + return confTotemVentaRapidaId; + } + + public void setConfTotemVentaRapidaId(Integer confTotemVentaRapidaId) { + this.confTotemVentaRapidaId = confTotemVentaRapidaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((destino == null) ? 0 : destino.hashCode()); + result = prime * result + ((origen == null) ? 0 : origen.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfTotemVentaRapida other = (ConfTotemVentaRapida) obj; + if (destino == null) { + if (other.destino != null) + return false; + } else if (!destino.equals(other.destino)) + return false; + if (origen == null) { + if (other.origen != null) + return false; + } else if (!origen.equals(other.origen)) + return false; + return true; + } + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Conferencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java index d92453ac9..0350786d4 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Conferencia.java @@ -1,289 +1,289 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import com.rjconsultores.ventaboletos.enums.comissao.CoresConferencia; - -@Entity -@Table(name = "CONFERENCIA") -@SequenceGenerator(name = "CONFERENCIA_SEQ", sequenceName = "CONFERENCIA_SEQ", allocationSize = 1) -public class Conferencia implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFERENCIA_SEQ") - @Column(name = "CONFERENCIA_ID") - private Long conferenciaId; - - @Temporal(TemporalType.DATE) - @Column(name = "DATAMOVIMENTO") - private Date datamovimento; - - @Column(name = "INDBOLETOGERADO") - private Boolean indboletogerado; - - @Column(name = "INDCONFERIDO") - private Boolean indconferido; - - @Column(name = "INDPENDENCIA") - private Boolean indpendencia; - - @Column(name = "INDSEMMOVIMENTO") - private Boolean indsemmovimento; - - @Column(name = "INDMALOTERECEBIDO") - private Boolean indmaloterecebido; - - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "DATAMALOTE") - private Date datamalote; - - @Column(name = "USUARIO_MALOTE_ID") - private Integer usuarioMaloteId; - - @Transient - private CoresConferencia cor; - - @Transient - private String numfoliosistema; - - @Transient - private boolean semPendenciaConferencia; - - @Transient - private String competencia; - - @Transient - private Date dataInicial; - - @Transient - private Date dataFinal; - - public Conferencia() { - super(); - this.indboletogerado = Boolean.FALSE; - this.indconferido = Boolean.FALSE; - this.indpendencia = Boolean.FALSE; - this.indsemmovimento = Boolean.FALSE; - this.indmaloterecebido = Boolean.FALSE; - } - - public Long getConferenciaId() { - return conferenciaId; - } - - public void setConferenciaId(Long conferenciaId) { - this.conferenciaId = conferenciaId; - } - - public Date getDatamovimento() { - return datamovimento; - } - - public void setDatamovimento(Date datamovimento) { - this.datamovimento = datamovimento; - } - - public Boolean getIndboletogerado() { - return indboletogerado; - } - - public void setIndboletogerado(Boolean indboletogerado) { - this.indboletogerado = indboletogerado; - } - - public Boolean getIndconferido() { - return indconferido; - } - - public void setIndconferido(Boolean indconferido) { - this.indconferido = indconferido; - } - - public Boolean getIndpendencia() { - return indpendencia; - } - - public void setIndpendencia(Boolean indpendencia) { - this.indpendencia = indpendencia; - } - - public Boolean getIndsemmovimento() { - return indsemmovimento; - } - - public void setIndsemmovimento(Boolean indsemmovimento) { - this.indsemmovimento = indsemmovimento; - } - - public Boolean getIndmaloterecebido() { - return indmaloterecebido; - } - - public void setIndmaloterecebido(Boolean indmaloterecebido) { - this.indmaloterecebido = indmaloterecebido; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conferenciaId == null) ? 0 : conferenciaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - Conferencia other = (Conferencia) obj; - if (conferenciaId == null) { - if (other.conferenciaId != null) - return false; - } else if (!conferenciaId.equals(other.conferenciaId)) - return false; - return true; - } - - public CoresConferencia getCor() { - return cor; - } - - public void setCor(CoresConferencia cor) { - this.cor = cor; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public String getNumfoliosistema() { - return numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public Date getDatamalote() { - return datamalote; - } - - public void setDatamalote(Date datamalote) { - this.datamalote = datamalote; - } - - public Integer getUsuarioMaloteId() { - return usuarioMaloteId; - } - - public void setUsuarioMaloteId(Integer usuarioMaloteId) { - this.usuarioMaloteId = usuarioMaloteId; - } - - public boolean isSemPendenciaConferencia() { - return semPendenciaConferencia; - } - - public void setSemPendenciaConferencia(boolean semPendenciaConferencia) { - this.semPendenciaConferencia = semPendenciaConferencia; - } - - public String getCompetencia() { - return competencia; - } - - public void setCompetencia(String competencia) { - this.competencia = competencia; - } - - public Date getDataInicial() { - return dataInicial; - } - - public void setDataInicial(Date dataInicial) { - this.dataInicial = dataInicial; - } - - public Date getDataFinal() { - return dataFinal; - } - - public void setDataFinal(Date dataFinal) { - this.dataFinal = dataFinal; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import com.rjconsultores.ventaboletos.enums.comissao.CoresConferencia; + +@Entity +@Table(name = "CONFERENCIA") +@SequenceGenerator(name = "CONFERENCIA_SEQ", sequenceName = "CONFERENCIA_SEQ", allocationSize = 1) +public class Conferencia implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFERENCIA_SEQ") + @Column(name = "CONFERENCIA_ID") + private Long conferenciaId; + + @Temporal(TemporalType.DATE) + @Column(name = "DATAMOVIMENTO") + private Date datamovimento; + + @Column(name = "INDBOLETOGERADO") + private Boolean indboletogerado; + + @Column(name = "INDCONFERIDO") + private Boolean indconferido; + + @Column(name = "INDPENDENCIA") + private Boolean indpendencia; + + @Column(name = "INDSEMMOVIMENTO") + private Boolean indsemmovimento; + + @Column(name = "INDMALOTERECEBIDO") + private Boolean indmaloterecebido; + + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "DATAMALOTE") + private Date datamalote; + + @Column(name = "USUARIO_MALOTE_ID") + private Integer usuarioMaloteId; + + @Transient + private CoresConferencia cor; + + @Transient + private String numfoliosistema; + + @Transient + private boolean semPendenciaConferencia; + + @Transient + private String competencia; + + @Transient + private Date dataInicial; + + @Transient + private Date dataFinal; + + public Conferencia() { + super(); + this.indboletogerado = Boolean.FALSE; + this.indconferido = Boolean.FALSE; + this.indpendencia = Boolean.FALSE; + this.indsemmovimento = Boolean.FALSE; + this.indmaloterecebido = Boolean.FALSE; + } + + public Long getConferenciaId() { + return conferenciaId; + } + + public void setConferenciaId(Long conferenciaId) { + this.conferenciaId = conferenciaId; + } + + public Date getDatamovimento() { + return datamovimento; + } + + public void setDatamovimento(Date datamovimento) { + this.datamovimento = datamovimento; + } + + public Boolean getIndboletogerado() { + return indboletogerado; + } + + public void setIndboletogerado(Boolean indboletogerado) { + this.indboletogerado = indboletogerado; + } + + public Boolean getIndconferido() { + return indconferido; + } + + public void setIndconferido(Boolean indconferido) { + this.indconferido = indconferido; + } + + public Boolean getIndpendencia() { + return indpendencia; + } + + public void setIndpendencia(Boolean indpendencia) { + this.indpendencia = indpendencia; + } + + public Boolean getIndsemmovimento() { + return indsemmovimento; + } + + public void setIndsemmovimento(Boolean indsemmovimento) { + this.indsemmovimento = indsemmovimento; + } + + public Boolean getIndmaloterecebido() { + return indmaloterecebido; + } + + public void setIndmaloterecebido(Boolean indmaloterecebido) { + this.indmaloterecebido = indmaloterecebido; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conferenciaId == null) ? 0 : conferenciaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + Conferencia other = (Conferencia) obj; + if (conferenciaId == null) { + if (other.conferenciaId != null) + return false; + } else if (!conferenciaId.equals(other.conferenciaId)) + return false; + return true; + } + + public CoresConferencia getCor() { + return cor; + } + + public void setCor(CoresConferencia cor) { + this.cor = cor; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public String getNumfoliosistema() { + return numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public Date getDatamalote() { + return datamalote; + } + + public void setDatamalote(Date datamalote) { + this.datamalote = datamalote; + } + + public Integer getUsuarioMaloteId() { + return usuarioMaloteId; + } + + public void setUsuarioMaloteId(Integer usuarioMaloteId) { + this.usuarioMaloteId = usuarioMaloteId; + } + + public boolean isSemPendenciaConferencia() { + return semPendenciaConferencia; + } + + public void setSemPendenciaConferencia(boolean semPendenciaConferencia) { + this.semPendenciaConferencia = semPendenciaConferencia; + } + + public String getCompetencia() { + return competencia; + } + + public void setCompetencia(String competencia) { + this.competencia = competencia; + } + + public Date getDataInicial() { + return dataInicial; + } + + public void setDataInicial(Date dataInicial) { + this.dataInicial = dataInicial; + } + + public Date getDataFinal() { + return dataFinal; + } + + public void setDataFinal(Date dataFinal) { + this.dataFinal = dataFinal; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConferenciaPendencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConferenciaPendencia.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConferenciaPendencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConferenciaPendencia.java index 2551d6151..e7e458489 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConferenciaPendencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConferenciaPendencia.java @@ -1,127 +1,127 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CONFERENCIA_PENDENCIA") -@SequenceGenerator(name = "CONFERENCIA_PENDENCIA_SEQ", sequenceName = "CONFERENCIA_PENDENCIA_SEQ", allocationSize = 1) -public class ConferenciaPendencia implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFERENCIA_PENDENCIA_SEQ") - @Column(name = "CONFERENCIAPENDENCIA_ID") - private Integer conferenciapendenciaId; - - @Column(name = "DESCPENDENCIA") - private String descpendencia; - - @Column(name = "ACTIVO") - private boolean activo; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - public ConferenciaPendencia() { - super(); - } - - public ConferenciaPendencia(Integer conferenciapendenciaId, String descpendencia) { - this(); - this.conferenciapendenciaId = conferenciapendenciaId; - this.descpendencia = descpendencia; - } - - public Integer getConferenciapendenciaId() { - return conferenciapendenciaId; - } - - public void setConferenciapendenciaId(Integer conferenciapendenciaId) { - this.conferenciapendenciaId = conferenciapendenciaId; - } - - public String getDescpendencia() { - return descpendencia; - } - - public void setDescpendencia(String descpendencia) { - this.descpendencia = descpendencia; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conferenciapendenciaId == null) ? 0 : conferenciapendenciaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ConferenciaPendencia)) - return false; - ConferenciaPendencia other = (ConferenciaPendencia) obj; - if (getConferenciapendenciaId() == null) { - if (other.getConferenciapendenciaId() != null) - return false; - } else if (!getConferenciapendenciaId().equals(other.getConferenciapendenciaId())) - return false; - return true; - } - - @Override - public String toString() { - return getDescpendencia(); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CONFERENCIA_PENDENCIA") +@SequenceGenerator(name = "CONFERENCIA_PENDENCIA_SEQ", sequenceName = "CONFERENCIA_PENDENCIA_SEQ", allocationSize = 1) +public class ConferenciaPendencia implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFERENCIA_PENDENCIA_SEQ") + @Column(name = "CONFERENCIAPENDENCIA_ID") + private Integer conferenciapendenciaId; + + @Column(name = "DESCPENDENCIA") + private String descpendencia; + + @Column(name = "ACTIVO") + private boolean activo; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + public ConferenciaPendencia() { + super(); + } + + public ConferenciaPendencia(Integer conferenciapendenciaId, String descpendencia) { + this(); + this.conferenciapendenciaId = conferenciapendenciaId; + this.descpendencia = descpendencia; + } + + public Integer getConferenciapendenciaId() { + return conferenciapendenciaId; + } + + public void setConferenciapendenciaId(Integer conferenciapendenciaId) { + this.conferenciapendenciaId = conferenciapendenciaId; + } + + public String getDescpendencia() { + return descpendencia; + } + + public void setDescpendencia(String descpendencia) { + this.descpendencia = descpendencia; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conferenciapendenciaId == null) ? 0 : conferenciapendenciaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ConferenciaPendencia)) + return false; + ConferenciaPendencia other = (ConferenciaPendencia) obj; + if (getConferenciapendenciaId() == null) { + if (other.getConferenciapendenciaId() != null) + return false; + } else if (!getConferenciapendenciaId().equals(other.getConferenciapendenciaId())) + return false; + return true; + } + + @Override + public String toString() { + return getDescpendencia(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfigRestriccionPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfigRestriccionPago.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConfigRestriccionPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfigRestriccionPago.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProducto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProducto.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProducto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProducto.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProductoParada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProductoParada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProductoParada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProductoParada.java index 4159ca9eb..004ce3016 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProductoParada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConfiguracionProductoParada.java @@ -1,81 +1,81 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CONFIG_PRODUCTO_PARADA_SEQ", sequenceName = "CONFIG_PRODUCTO_PARADA_SEQ", allocationSize = 1) -@Table(name = "CONFIG_PRODUCTO_PARADA") -public class ConfiguracionProductoParada { - - @Id - @Basic(optional = false) - @Column(name = "CONFIGPRODUCTOPARADA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFIG_PRODUCTO_PARADA_SEQ") - private Long configuracionProductoParadaId; - @ManyToOne - @JoinColumn(name = "CONFIGURACIONPRODUCTO_ID") - private ConfiguracionProducto configuracionProducto; - @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada paradaId; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "ACTIVO") - private Boolean activo; - - public Long getConfiguracionProductoParadaId() { - return configuracionProductoParadaId; - } - public void setConfiguracionProductoParadaId(Long configuracionProductoParadaId) { - this.configuracionProductoParadaId = configuracionProductoParadaId; - } - public ConfiguracionProducto getConfiguracionProducto() { - return configuracionProducto; - } - public void setConfiguracionProducto(ConfiguracionProducto configuracionProducto) { - this.configuracionProducto = configuracionProducto; - } - - public Parada getParadaId() { - return paradaId; - } - public void setParadaId(Parada paradaId) { - this.paradaId = paradaId; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CONFIG_PRODUCTO_PARADA_SEQ", sequenceName = "CONFIG_PRODUCTO_PARADA_SEQ", allocationSize = 1) +@Table(name = "CONFIG_PRODUCTO_PARADA") +public class ConfiguracionProductoParada { + + @Id + @Basic(optional = false) + @Column(name = "CONFIGPRODUCTOPARADA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONFIG_PRODUCTO_PARADA_SEQ") + private Long configuracionProductoParadaId; + @ManyToOne + @JoinColumn(name = "CONFIGURACIONPRODUCTO_ID") + private ConfiguracionProducto configuracionProducto; + @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada paradaId; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "ACTIVO") + private Boolean activo; + + public Long getConfiguracionProductoParadaId() { + return configuracionProductoParadaId; + } + public void setConfiguracionProductoParadaId(Long configuracionProductoParadaId) { + this.configuracionProductoParadaId = configuracionProductoParadaId; + } + public ConfiguracionProducto getConfiguracionProducto() { + return configuracionProducto; + } + public void setConfiguracionProducto(ConfiguracionProducto configuracionProducto) { + this.configuracionProducto = configuracionProducto; + } + + public Parada getParadaId() { + return paradaId; + } + public void setParadaId(Parada paradaId) { + this.paradaId = paradaId; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Constante.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Constante.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Constante.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Constante.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java index fcdba62b7..2a6ed0e65 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContaCorrentePtoVta.java @@ -1,405 +1,405 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "CONTA_CORRENTE_PTOVTA") -@SequenceGenerator(name = "CONTA_CORRENTE_PTOVTA_SEQ", sequenceName = "CONTA_CORRENTE_PTOVTA_SEQ", allocationSize = 1) -public class ContaCorrentePtoVta implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONTA_CORRENTE_PTOVTA_SEQ") - @Column(name = "CONTACORRENTEPTOVTA_ID") - private Long contaCorrentePtoVtaId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Temporal(TemporalType.DATE) - @Column(name = "FECHOROPERACION") - private Date fecHorOperacion; - - @Column(name = "DESCOPERACION") - private String descOperacion; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "TURNO_ID") - private Turno turno; - - @Temporal(TemporalType.DATE) - @Column(name = "FECCORTE") - private Date fecCorte; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "TIPOOPERACIONCC_ID") - private TipoOperacionCC tipoOperacionCC; - - @Column(name = "IMPORTE") - private BigDecimal importe; - - @Column(name = "IMPORTETARIFA") - private BigDecimal importeTotalTarifa; - - @Column(name = "IMPORTEPEDAGIO") - private BigDecimal importeTotalPedagio; - - @Column(name = "IMPORTETAXAEMBARQUE") - private BigDecimal importeTotalTasaAbordaje; - - @Column(name = "IMPORTESEGURO") - private BigDecimal importeTotalSeguro; - - @Column(name = "IMPORTEINGRESO") - private BigDecimal importeTotalIngreso; - - @Column(name = "IMPORTEEGRESO") - private BigDecimal importeTotalEgreso; - - @Column(name = "IMPORTEDEVOLUCION") - private BigDecimal importeTotalDevolucion; - - @Column(name = "IMPORTETROCA") - private BigDecimal importeTotalTransferencia; - - @Column(name = "IMPORTETOTALEFECTIVO") - private BigDecimal importeTotalEfectivo; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIOMODIF_ID") - private Integer usuarioModifId; - - @Column(name = "TOTALVENTA_SEGOPCIONAL") - private BigDecimal totalVentaSegOpcional; - - @Column(name = "TOTALCANC_SEGOPCIONAL") - private BigDecimal totalCancSegOpcional; - - @Column(name = "FECHAMENTOCNTCORRENTE_ID") - private Long fechamentocntcorrenteId; - - @Column(name = "IND_COMISSAO") - private Boolean indComissao; - - @Column(name = "IMPORTETOTALDEBITO") - private BigDecimal importetotalDebito; - - @Column(name = "IMPORTETOTALCREDITO") - private BigDecimal importetotalCredito; - - public ContaCorrentePtoVta() { - super(); - } - - public ContaCorrentePtoVta(Long contaCorrentePtoVtaId) { - this(); - this.contaCorrentePtoVtaId = contaCorrentePtoVtaId; - } - - public Long getContaCorrentePtoVtaId() { - return contaCorrentePtoVtaId; - } - - public void setContaCorrentePtoVtaId(Long contaCorrentePtoVtaId) { - this.contaCorrentePtoVtaId = contaCorrentePtoVtaId; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Date getFecHorOperacion() { - return fecHorOperacion; - } - - public void setFecHorOperacion(Date fecHorOperacion) { - this.fecHorOperacion = fecHorOperacion; - } - - public String getDescOperacion() { - return descOperacion; - } - - public void setDescOperacion(String descOperacion) { - this.descOperacion = descOperacion; - } - - public Turno getTurno() { - return turno; - } - - public void setTurno(Turno turno) { - this.turno = turno; - } - - public Date getFecCorte() { - return fecCorte; - } - - public void setFecCorte(Date fecCorte) { - this.fecCorte = fecCorte; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public TipoOperacionCC getTipoOperacionCC() { - return tipoOperacionCC; - } - - public void setTipoOperacionCC(TipoOperacionCC tipoOperacionCC) { - this.tipoOperacionCC = tipoOperacionCC; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioModifId() { - return usuarioModifId; - } - - public void setUsuarioModifId(Integer usuarioModifId) { - this.usuarioModifId = usuarioModifId; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public BigDecimal getImporteTotalTarifa() { - return importeTotalTarifa; - } - - public void setImporteTotalTarifa(BigDecimal importeTotalTarifa) { - this.importeTotalTarifa = importeTotalTarifa; - } - - public BigDecimal getImporteTotalPedagio() { - return importeTotalPedagio; - } - - public void setImporteTotalPedagio(BigDecimal importeTotalPedagio) { - this.importeTotalPedagio = importeTotalPedagio; - } - - public BigDecimal getImporteTotalTasaAbordaje() { - return importeTotalTasaAbordaje; - } - - public void setImporteTotalTasaAbordaje(BigDecimal importeTotalTasaAbordaje) { - this.importeTotalTasaAbordaje = importeTotalTasaAbordaje; - } - - public BigDecimal getImporteTotalSeguro() { - return importeTotalSeguro; - } - - public void setImporteTotalSeguro(BigDecimal importeTotalSeguro) { - this.importeTotalSeguro = importeTotalSeguro; - } - - public BigDecimal getImporteTotalIngreso() { - return importeTotalIngreso; - } - - public void setImporteTotalIngreso(BigDecimal importeTotalIngreso) { - this.importeTotalIngreso = importeTotalIngreso; - } - - public BigDecimal getImporteTotalEgreso() { - return importeTotalEgreso; - } - - public void setImporteTotalEgreso(BigDecimal importeTotalEgreso) { - this.importeTotalEgreso = importeTotalEgreso; - } - - public BigDecimal getImporteTotalDevolucion() { - return importeTotalDevolucion; - } - - public void setImporteTotalDevolucion(BigDecimal importeTotalDevolucion) { - this.importeTotalDevolucion = importeTotalDevolucion; - } - - public BigDecimal getImporteTotalTransferencia() { - return importeTotalTransferencia; - } - - public void setImporteTotalTransferencia(BigDecimal importeTotalTransferencia) { - this.importeTotalTransferencia = importeTotalTransferencia; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((contaCorrentePtoVtaId == null) ? 0 : contaCorrentePtoVtaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ContaCorrentePtoVta other = (ContaCorrentePtoVta) obj; - if (contaCorrentePtoVtaId == null) { - if (other.contaCorrentePtoVtaId != null) - return false; - } else if (!contaCorrentePtoVtaId.equals(other.contaCorrentePtoVtaId)) - return false; - - return true; - } - - @Override - public String toString() { - try { - return "ContaCorrentePtoVta [contaCorrentePtoVtaId=" - + contaCorrentePtoVtaId + ", puntoVenta=" + puntoVenta.getPuntoventaId() - + ", empresa=" + empresa.getEmpresaId() + ", fecHorOperacion=" - + fecHorOperacion + ", descOperacion=" + descOperacion - + ", turno=" + turno.getTurnoId() + ", fecCorte=" + fecCorte + ", usuario=" - + usuario.getUsuarioId() + ", tipoOperacionCC=" + tipoOperacionCC.getTipoOperacionCCId() - + ", importe=" + importe + ", importeTotalTarifa=" - + importeTotalTarifa + ", importeTotalPedagio=" - + importeTotalPedagio + ", importeTotalTasaAbordaje=" - + importeTotalTasaAbordaje + ", importeTotalSeguro=" - + importeTotalSeguro + ", importeTotalIngreso=" - + importeTotalIngreso + ", importeTotalEgreso=" - + importeTotalEgreso + ", importeTotalDevolucion=" - + importeTotalDevolucion + ", importeTotalTransferencia=" - + importeTotalTransferencia + ", activo=" + activo - + ", fecmodif=" + fecmodif + ", usuarioModifId=" - + usuarioModifId + "]"; - } catch (Throwable e) { - return super.toString(); - } - } - - public BigDecimal getTotalVentaSegOpcional() { - return totalVentaSegOpcional; - } - - public void setTotalVentaSegOpcional(BigDecimal totalVentaSegOpcional) { - this.totalVentaSegOpcional = totalVentaSegOpcional; - } - - public BigDecimal getTotalCancSegOpcional() { - return totalCancSegOpcional; - } - - public void setTotalCancSegOpcional(BigDecimal totalCancSegOpcional) { - this.totalCancSegOpcional = totalCancSegOpcional; - } - - public BigDecimal getImporteTotalEfectivo() { - return importeTotalEfectivo; - } - - public void setImporteTotalEfectivo(BigDecimal importeTotalEfectivo) { - this.importeTotalEfectivo = importeTotalEfectivo; - } - - public Long getFechamentocntcorrenteId() { - return fechamentocntcorrenteId; - } - - public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { - this.fechamentocntcorrenteId = fechamentocntcorrenteId; - } - - public Boolean getIndComissao() { - return indComissao; - } - - public void setIndComissao(Boolean indComissao) { - this.indComissao = indComissao; - } - - public BigDecimal getImportetotalDebito() { - return importetotalDebito; - } - - public void setImportetotalDebito(BigDecimal importetotalDebito) { - this.importetotalDebito = importetotalDebito; - } - - public BigDecimal getImportetotalCredito() { - return importetotalCredito; - } - - public void setImportetotalCredito(BigDecimal importetotalCredito) { - this.importetotalCredito = importetotalCredito; - } - +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "CONTA_CORRENTE_PTOVTA") +@SequenceGenerator(name = "CONTA_CORRENTE_PTOVTA_SEQ", sequenceName = "CONTA_CORRENTE_PTOVTA_SEQ", allocationSize = 1) +public class ContaCorrentePtoVta implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONTA_CORRENTE_PTOVTA_SEQ") + @Column(name = "CONTACORRENTEPTOVTA_ID") + private Long contaCorrentePtoVtaId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Temporal(TemporalType.DATE) + @Column(name = "FECHOROPERACION") + private Date fecHorOperacion; + + @Column(name = "DESCOPERACION") + private String descOperacion; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TURNO_ID") + private Turno turno; + + @Temporal(TemporalType.DATE) + @Column(name = "FECCORTE") + private Date fecCorte; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TIPOOPERACIONCC_ID") + private TipoOperacionCC tipoOperacionCC; + + @Column(name = "IMPORTE") + private BigDecimal importe; + + @Column(name = "IMPORTETARIFA") + private BigDecimal importeTotalTarifa; + + @Column(name = "IMPORTEPEDAGIO") + private BigDecimal importeTotalPedagio; + + @Column(name = "IMPORTETAXAEMBARQUE") + private BigDecimal importeTotalTasaAbordaje; + + @Column(name = "IMPORTESEGURO") + private BigDecimal importeTotalSeguro; + + @Column(name = "IMPORTEINGRESO") + private BigDecimal importeTotalIngreso; + + @Column(name = "IMPORTEEGRESO") + private BigDecimal importeTotalEgreso; + + @Column(name = "IMPORTEDEVOLUCION") + private BigDecimal importeTotalDevolucion; + + @Column(name = "IMPORTETROCA") + private BigDecimal importeTotalTransferencia; + + @Column(name = "IMPORTETOTALEFECTIVO") + private BigDecimal importeTotalEfectivo; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIOMODIF_ID") + private Integer usuarioModifId; + + @Column(name = "TOTALVENTA_SEGOPCIONAL") + private BigDecimal totalVentaSegOpcional; + + @Column(name = "TOTALCANC_SEGOPCIONAL") + private BigDecimal totalCancSegOpcional; + + @Column(name = "FECHAMENTOCNTCORRENTE_ID") + private Long fechamentocntcorrenteId; + + @Column(name = "IND_COMISSAO") + private Boolean indComissao; + + @Column(name = "IMPORTETOTALDEBITO") + private BigDecimal importetotalDebito; + + @Column(name = "IMPORTETOTALCREDITO") + private BigDecimal importetotalCredito; + + public ContaCorrentePtoVta() { + super(); + } + + public ContaCorrentePtoVta(Long contaCorrentePtoVtaId) { + this(); + this.contaCorrentePtoVtaId = contaCorrentePtoVtaId; + } + + public Long getContaCorrentePtoVtaId() { + return contaCorrentePtoVtaId; + } + + public void setContaCorrentePtoVtaId(Long contaCorrentePtoVtaId) { + this.contaCorrentePtoVtaId = contaCorrentePtoVtaId; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Date getFecHorOperacion() { + return fecHorOperacion; + } + + public void setFecHorOperacion(Date fecHorOperacion) { + this.fecHorOperacion = fecHorOperacion; + } + + public String getDescOperacion() { + return descOperacion; + } + + public void setDescOperacion(String descOperacion) { + this.descOperacion = descOperacion; + } + + public Turno getTurno() { + return turno; + } + + public void setTurno(Turno turno) { + this.turno = turno; + } + + public Date getFecCorte() { + return fecCorte; + } + + public void setFecCorte(Date fecCorte) { + this.fecCorte = fecCorte; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public TipoOperacionCC getTipoOperacionCC() { + return tipoOperacionCC; + } + + public void setTipoOperacionCC(TipoOperacionCC tipoOperacionCC) { + this.tipoOperacionCC = tipoOperacionCC; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioModifId() { + return usuarioModifId; + } + + public void setUsuarioModifId(Integer usuarioModifId) { + this.usuarioModifId = usuarioModifId; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public BigDecimal getImporteTotalTarifa() { + return importeTotalTarifa; + } + + public void setImporteTotalTarifa(BigDecimal importeTotalTarifa) { + this.importeTotalTarifa = importeTotalTarifa; + } + + public BigDecimal getImporteTotalPedagio() { + return importeTotalPedagio; + } + + public void setImporteTotalPedagio(BigDecimal importeTotalPedagio) { + this.importeTotalPedagio = importeTotalPedagio; + } + + public BigDecimal getImporteTotalTasaAbordaje() { + return importeTotalTasaAbordaje; + } + + public void setImporteTotalTasaAbordaje(BigDecimal importeTotalTasaAbordaje) { + this.importeTotalTasaAbordaje = importeTotalTasaAbordaje; + } + + public BigDecimal getImporteTotalSeguro() { + return importeTotalSeguro; + } + + public void setImporteTotalSeguro(BigDecimal importeTotalSeguro) { + this.importeTotalSeguro = importeTotalSeguro; + } + + public BigDecimal getImporteTotalIngreso() { + return importeTotalIngreso; + } + + public void setImporteTotalIngreso(BigDecimal importeTotalIngreso) { + this.importeTotalIngreso = importeTotalIngreso; + } + + public BigDecimal getImporteTotalEgreso() { + return importeTotalEgreso; + } + + public void setImporteTotalEgreso(BigDecimal importeTotalEgreso) { + this.importeTotalEgreso = importeTotalEgreso; + } + + public BigDecimal getImporteTotalDevolucion() { + return importeTotalDevolucion; + } + + public void setImporteTotalDevolucion(BigDecimal importeTotalDevolucion) { + this.importeTotalDevolucion = importeTotalDevolucion; + } + + public BigDecimal getImporteTotalTransferencia() { + return importeTotalTransferencia; + } + + public void setImporteTotalTransferencia(BigDecimal importeTotalTransferencia) { + this.importeTotalTransferencia = importeTotalTransferencia; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((contaCorrentePtoVtaId == null) ? 0 : contaCorrentePtoVtaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ContaCorrentePtoVta other = (ContaCorrentePtoVta) obj; + if (contaCorrentePtoVtaId == null) { + if (other.contaCorrentePtoVtaId != null) + return false; + } else if (!contaCorrentePtoVtaId.equals(other.contaCorrentePtoVtaId)) + return false; + + return true; + } + + @Override + public String toString() { + try { + return "ContaCorrentePtoVta [contaCorrentePtoVtaId=" + + contaCorrentePtoVtaId + ", puntoVenta=" + puntoVenta.getPuntoventaId() + + ", empresa=" + empresa.getEmpresaId() + ", fecHorOperacion=" + + fecHorOperacion + ", descOperacion=" + descOperacion + + ", turno=" + turno.getTurnoId() + ", fecCorte=" + fecCorte + ", usuario=" + + usuario.getUsuarioId() + ", tipoOperacionCC=" + tipoOperacionCC.getTipoOperacionCCId() + + ", importe=" + importe + ", importeTotalTarifa=" + + importeTotalTarifa + ", importeTotalPedagio=" + + importeTotalPedagio + ", importeTotalTasaAbordaje=" + + importeTotalTasaAbordaje + ", importeTotalSeguro=" + + importeTotalSeguro + ", importeTotalIngreso=" + + importeTotalIngreso + ", importeTotalEgreso=" + + importeTotalEgreso + ", importeTotalDevolucion=" + + importeTotalDevolucion + ", importeTotalTransferencia=" + + importeTotalTransferencia + ", activo=" + activo + + ", fecmodif=" + fecmodif + ", usuarioModifId=" + + usuarioModifId + "]"; + } catch (Throwable e) { + return super.toString(); + } + } + + public BigDecimal getTotalVentaSegOpcional() { + return totalVentaSegOpcional; + } + + public void setTotalVentaSegOpcional(BigDecimal totalVentaSegOpcional) { + this.totalVentaSegOpcional = totalVentaSegOpcional; + } + + public BigDecimal getTotalCancSegOpcional() { + return totalCancSegOpcional; + } + + public void setTotalCancSegOpcional(BigDecimal totalCancSegOpcional) { + this.totalCancSegOpcional = totalCancSegOpcional; + } + + public BigDecimal getImporteTotalEfectivo() { + return importeTotalEfectivo; + } + + public void setImporteTotalEfectivo(BigDecimal importeTotalEfectivo) { + this.importeTotalEfectivo = importeTotalEfectivo; + } + + public Long getFechamentocntcorrenteId() { + return fechamentocntcorrenteId; + } + + public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { + this.fechamentocntcorrenteId = fechamentocntcorrenteId; + } + + public Boolean getIndComissao() { + return indComissao; + } + + public void setIndComissao(Boolean indComissao) { + this.indComissao = indComissao; + } + + public BigDecimal getImportetotalDebito() { + return importetotalDebito; + } + + public void setImportetotalDebito(BigDecimal importetotalDebito) { + this.importetotalDebito = importetotalDebito; + } + + public BigDecimal getImportetotalCredito() { + return importetotalCredito; + } + + public void setImportetotalCredito(BigDecimal importetotalCredito) { + this.importetotalCredito = importetotalCredito; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ContaMD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContaMD.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ContaMD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContaMD.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ControleEstoqueMigracao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ControleEstoqueMigracao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ControleEstoqueMigracao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ControleEstoqueMigracao.java index 12e8e5e28..6f67648ef 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ControleEstoqueMigracao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ControleEstoqueMigracao.java @@ -1,81 +1,81 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * AbastoCentral generated by hbm2java - */ -@Entity -@Table(name = "CTRL_EST_MIGRACAO") -public class ControleEstoqueMigracao implements java.io.Serializable { - - private Long ctrlestmigracaoId; - private PuntoVenta puntoventa; - private Date fecmodif; - private Integer usuarioId; - - public ControleEstoqueMigracao() { - } - - public ControleEstoqueMigracao(PuntoVenta _puntoventa, Date _fecmodif, Integer _usuarioId) { - puntoventa = _puntoventa; - fecmodif = _fecmodif; - usuarioId = _usuarioId; - } - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - public PuntoVenta getPuntoventa() { - return this.puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @SequenceGenerator(name = "CTRL_EST_MIGRACAO_SEQ", sequenceName = "CTRL_EST_MIGRACAO_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_EST_MIGRACAO_SEQ") - @Column(name = "CTRLESTMIGRACAO_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getCtrlestmigracaoId() { - return ctrlestmigracaoId; - } - - public void setCtrlestmigracaoId(Long ctrlestmigracaoId) { - this.ctrlestmigracaoId = ctrlestmigracaoId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * AbastoCentral generated by hbm2java + */ +@Entity +@Table(name = "CTRL_EST_MIGRACAO") +public class ControleEstoqueMigracao implements java.io.Serializable { + + private Long ctrlestmigracaoId; + private PuntoVenta puntoventa; + private Date fecmodif; + private Integer usuarioId; + + public ControleEstoqueMigracao() { + } + + public ControleEstoqueMigracao(PuntoVenta _puntoventa, Date _fecmodif, Integer _usuarioId) { + puntoventa = _puntoventa; + fecmodif = _fecmodif; + usuarioId = _usuarioId; + } + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + public PuntoVenta getPuntoventa() { + return this.puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @SequenceGenerator(name = "CTRL_EST_MIGRACAO_SEQ", sequenceName = "CTRL_EST_MIGRACAO_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_EST_MIGRACAO_SEQ") + @Column(name = "CTRLESTMIGRACAO_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getCtrlestmigracaoId() { + return ctrlestmigracaoId; + } + + public void setCtrlestmigracaoId(Long ctrlestmigracaoId) { + this.ctrlestmigracaoId = ctrlestmigracaoId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Convenio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Convenio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Convenio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Convenio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanha.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanha.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanha.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanha.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaEmpresa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaEmpresa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaPuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioCampanhaPuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioEmpresa.java index 675ce5a87..192b7924a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConvenioEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioEmpresa.java @@ -1,106 +1,106 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name="CONVENIO_EMPRESA_SEQ", sequenceName="CONVENIO_EMPRESA_SEQ", allocationSize=1) -@Table(name="CONVENIO_EMPRESA") -public class ConvenioEmpresa implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_EMPRESA_SEQ") - @Column(name = "CONVENIOEMPRESA_ID") - private Integer convenioEmpresaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") - @ManyToOne - private Convenio convenio; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - - public Integer getConvenioEmpresaId() { - return convenioEmpresaId; - } - public void setConvenioEmpresaId(Integer convenioEmpresaId) { - this.convenioEmpresaId = convenioEmpresaId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Convenio getConvenio() { - return convenio; - } - public void setConvenio(Convenio convenio) { - this.convenio = convenio; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (convenioEmpresaId != null ? convenioEmpresaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ConvenioEmpresa)) { - return false; - } - ConvenioEmpresa other = (ConvenioEmpresa) object; - if ((this.convenioEmpresaId == null && other.convenioEmpresaId != null) || (this.convenioEmpresaId != null && !this.convenioEmpresaId.equals(other.convenioEmpresaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ConvenioEmpresa[convenioEmpresaId=" + convenioEmpresaId + "]"; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name="CONVENIO_EMPRESA_SEQ", sequenceName="CONVENIO_EMPRESA_SEQ", allocationSize=1) +@Table(name="CONVENIO_EMPRESA") +public class ConvenioEmpresa implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_EMPRESA_SEQ") + @Column(name = "CONVENIOEMPRESA_ID") + private Integer convenioEmpresaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @ManyToOne + private Convenio convenio; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + + public Integer getConvenioEmpresaId() { + return convenioEmpresaId; + } + public void setConvenioEmpresaId(Integer convenioEmpresaId) { + this.convenioEmpresaId = convenioEmpresaId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Convenio getConvenio() { + return convenio; + } + public void setConvenio(Convenio convenio) { + this.convenio = convenio; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (convenioEmpresaId != null ? convenioEmpresaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ConvenioEmpresa)) { + return false; + } + ConvenioEmpresa other = (ConvenioEmpresa) object; + if ((this.convenioEmpresaId == null && other.convenioEmpresaId != null) || (this.convenioEmpresaId != null && !this.convenioEmpresaId.equals(other.convenioEmpresaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ConvenioEmpresa[convenioEmpresaId=" + convenioEmpresaId + "]"; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioPuntoVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioPuntoVenta.java index f912b818d..b64402861 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConvenioPuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioPuntoVenta.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name="CONVENIO_PTOVTA_SEQ", sequenceName="CONVENIO_PTOVTA_SEQ", allocationSize=1) -@Table(name="CONVENIO_PTOVTA") -public class ConvenioPuntoVenta implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_PTOVTA_SEQ") - @Column(name = "CONVENIOPTOVTA_ID") - private Integer convenioPuntoVentaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") - @ManyToOne - private Convenio convenio; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - - @Override - public int hashCode() { - int hash = 0; - hash += (convenioPuntoVentaId != null ? convenioPuntoVentaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ConvenioPuntoVenta)) { - return false; - } - ConvenioPuntoVenta other = (ConvenioPuntoVenta) object; - if ((this.convenioPuntoVentaId == null && other.convenioPuntoVentaId != null) || (this.convenioPuntoVentaId != null && !this.convenioPuntoVentaId.equals(other.convenioPuntoVentaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ConvenioPuntoVenta[convenioPuntoVentaId=" + convenioPuntoVentaId + "]"; - } - - public Integer getConvenioPuntoVentaId() { - return convenioPuntoVentaId; - } - - public void setConvenioPuntoVentaId(Integer convenioPuntoVentaId) { - this.convenioPuntoVentaId = convenioPuntoVentaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Convenio getConvenio() { - return convenio; - } - - public void setConvenio(Convenio convenio) { - this.convenio = convenio; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name="CONVENIO_PTOVTA_SEQ", sequenceName="CONVENIO_PTOVTA_SEQ", allocationSize=1) +@Table(name="CONVENIO_PTOVTA") +public class ConvenioPuntoVenta implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_PTOVTA_SEQ") + @Column(name = "CONVENIOPTOVTA_ID") + private Integer convenioPuntoVentaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @ManyToOne + private Convenio convenio; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + + @Override + public int hashCode() { + int hash = 0; + hash += (convenioPuntoVentaId != null ? convenioPuntoVentaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ConvenioPuntoVenta)) { + return false; + } + ConvenioPuntoVenta other = (ConvenioPuntoVenta) object; + if ((this.convenioPuntoVentaId == null && other.convenioPuntoVentaId != null) || (this.convenioPuntoVentaId != null && !this.convenioPuntoVentaId.equals(other.convenioPuntoVentaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ConvenioPuntoVenta[convenioPuntoVentaId=" + convenioPuntoVentaId + "]"; + } + + public Integer getConvenioPuntoVentaId() { + return convenioPuntoVentaId; + } + + public void setConvenioPuntoVentaId(Integer convenioPuntoVentaId) { + this.convenioPuntoVentaId = convenioPuntoVentaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Convenio getConvenio() { + return convenio; + } + + public void setConvenio(Convenio convenio) { + this.convenio = convenio; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioRuta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioRuta.java index 5a93bc136..d791c280f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConvenioRuta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioRuta.java @@ -1,106 +1,106 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name="CONVENIO_RUTA_SEQ", sequenceName="CONVENIO_RUTA_SEQ", allocationSize=1) -@Table(name="CONVENIO_RUTA") -public class ConvenioRuta implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_RUTA_SEQ") - @Column(name = "CONVENIORUTA_ID") - private Integer convenioRutaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") - @ManyToOne - private Convenio convenio; - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - - public Integer getConvenioRutaId() { - return convenioRutaId; - } - public void setConvenioRutaId(Integer convenioRutaId) { - this.convenioRutaId = convenioRutaId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Convenio getConvenio() { - return convenio; - } - public void setConvenio(Convenio convenio) { - this.convenio = convenio; - } - public Ruta getRuta() { - return ruta; - } - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (convenioRutaId != null ? convenioRutaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ConvenioRuta)) { - return false; - } - ConvenioRuta other = (ConvenioRuta) object; - if ((this.convenioRutaId == null && other.convenioRutaId != null) || (this.convenioRutaId != null && !this.convenioRutaId.equals(other.convenioRutaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ConvenioRuta[convenioRutaId=" + convenioRutaId + "]"; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name="CONVENIO_RUTA_SEQ", sequenceName="CONVENIO_RUTA_SEQ", allocationSize=1) +@Table(name="CONVENIO_RUTA") +public class ConvenioRuta implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_RUTA_SEQ") + @Column(name = "CONVENIORUTA_ID") + private Integer convenioRutaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @ManyToOne + private Convenio convenio; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + + public Integer getConvenioRutaId() { + return convenioRutaId; + } + public void setConvenioRutaId(Integer convenioRutaId) { + this.convenioRutaId = convenioRutaId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Convenio getConvenio() { + return convenio; + } + public void setConvenio(Convenio convenio) { + this.convenio = convenio; + } + public Ruta getRuta() { + return ruta; + } + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (convenioRutaId != null ? convenioRutaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ConvenioRuta)) { + return false; + } + ConvenioRuta other = (ConvenioRuta) object; + if ((this.convenioRutaId == null && other.convenioRutaId != null) || (this.convenioRutaId != null && !this.convenioRutaId.equals(other.convenioRutaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ConvenioRuta[convenioRutaId=" + convenioRutaId + "]"; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioTramo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioTramo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioTramo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioTramo.java index 9521bfff9..dfca0a4a2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConvenioTramo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioTramo.java @@ -1,142 +1,142 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name="CONVENIO_TRAMO_SEQ", sequenceName="CONVENIO_TRAMO_SEQ", allocationSize=1) -@Table(name="CONVENIO_TRAMO") -public class ConvenioTramo implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_TRAMO_SEQ") - @Column(name = "CONVENIOTRAMO_ID") - private Integer convenioTramoId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") - @ManyToOne - private Convenio convenio; - @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada paradaOrigem; - @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada paradaDestino; - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final ConvenioTramo other = (ConvenioTramo) obj; - if (this.activo != other.activo && (this.activo == null || !this.activo.equals(other.activo))) { - return false; - } - if (this.convenio != other.convenio && (this.convenio == null || !this.convenio.equals(other.convenio))) { - return false; - } - if (this.paradaOrigem != other.paradaOrigem && (this.paradaOrigem == null || !this.paradaOrigem.equals(other.paradaOrigem))) { - return false; - } - if (this.paradaDestino != other.paradaDestino && (this.paradaDestino == null || !this.paradaDestino.equals(other.paradaDestino))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 73 * hash + (this.activo != null ? this.activo.hashCode() : 0); - hash = 73 * hash + (this.convenio != null ? this.convenio.hashCode() : 0); - hash = 73 * hash + (this.paradaOrigem != null ? this.paradaOrigem.hashCode() : 0); - hash = 73 * hash + (this.paradaDestino != null ? this.paradaDestino.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ConvenioTramo[conveniaTramoId=" + convenioTramoId + "]"; - } - - public Integer getConvenioTramoId() { - return convenioTramoId; - } - - public void setConvenioTramoId(Integer convenioTramoId) { - this.convenioTramoId = convenioTramoId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Convenio getConvenio() { - return convenio; - } - - public void setConvenio(Convenio convenio) { - this.convenio = convenio; - } - - public Parada getParadaOrigem() { - return paradaOrigem; - } - - public void setParadaOrigem(Parada paradaOrigem) { - this.paradaOrigem = paradaOrigem; - } - - public Parada getParadaDestino() { - return paradaDestino; - } - - public void setParadaDestino(Parada paradaDestino) { - this.paradaDestino = paradaDestino; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name="CONVENIO_TRAMO_SEQ", sequenceName="CONVENIO_TRAMO_SEQ", allocationSize=1) +@Table(name="CONVENIO_TRAMO") +public class ConvenioTramo implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_TRAMO_SEQ") + @Column(name = "CONVENIOTRAMO_ID") + private Integer convenioTramoId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @ManyToOne + private Convenio convenio; + @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada paradaOrigem; + @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada paradaDestino; + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ConvenioTramo other = (ConvenioTramo) obj; + if (this.activo != other.activo && (this.activo == null || !this.activo.equals(other.activo))) { + return false; + } + if (this.convenio != other.convenio && (this.convenio == null || !this.convenio.equals(other.convenio))) { + return false; + } + if (this.paradaOrigem != other.paradaOrigem && (this.paradaOrigem == null || !this.paradaOrigem.equals(other.paradaOrigem))) { + return false; + } + if (this.paradaDestino != other.paradaDestino && (this.paradaDestino == null || !this.paradaDestino.equals(other.paradaDestino))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 73 * hash + (this.activo != null ? this.activo.hashCode() : 0); + hash = 73 * hash + (this.convenio != null ? this.convenio.hashCode() : 0); + hash = 73 * hash + (this.paradaOrigem != null ? this.paradaOrigem.hashCode() : 0); + hash = 73 * hash + (this.paradaDestino != null ? this.paradaDestino.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ConvenioTramo[conveniaTramoId=" + convenioTramoId + "]"; + } + + public Integer getConvenioTramoId() { + return convenioTramoId; + } + + public void setConvenioTramoId(Integer convenioTramoId) { + this.convenioTramoId = convenioTramoId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Convenio getConvenio() { + return convenio; + } + + public void setConvenio(Convenio convenio) { + this.convenio = convenio; + } + + public Parada getParadaOrigem() { + return paradaOrigem; + } + + public void setParadaOrigem(Parada paradaOrigem) { + this.paradaOrigem = paradaOrigem; + } + + public Parada getParadaDestino() { + return paradaDestino; + } + + public void setParadaDestino(Parada paradaDestino) { + this.paradaDestino = paradaDestino; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioTransportadora.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioTransportadora.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioTransportadora.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioTransportadora.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioUsuario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioUsuario.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ConvenioUsuario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioUsuario.java index 8d4e2ec6b..668fc812a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConvenioUsuario.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ConvenioUsuario.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name="CONVENIO_USUARIO_SEQ", sequenceName="CONVENIO_USUARIO_SEQ", allocationSize=1) -@Table(name="CONVENIO_USUARIO") -public class ConvenioUsuario implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_USUARIO_SEQ") - @Column(name = "CONVENIOUSUARIO_ID") - private Integer convenioUsuarioId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") - @ManyToOne - private Convenio convenio; - @JoinColumn(name = "USUARIOCONVENIO_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuario; - - @Override - public int hashCode() { - int hash = 0; - hash += (convenioUsuarioId != null ? convenioUsuarioId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ConvenioUsuario)) { - return false; - } - ConvenioUsuario other = (ConvenioUsuario) object; - if ((this.convenioUsuarioId == null && other.convenioUsuarioId != null) || (this.convenioUsuarioId != null && !this.convenioUsuarioId.equals(other.convenioUsuarioId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ConvenioUsuario[convenioUsuarioId=" + convenioUsuarioId + "]"; - } - - public Integer getConvenioUsuarioId() { - return convenioUsuarioId; - } - - public void setConvenioUsuarioId(Integer convenioUsuarioId) { - this.convenioUsuarioId = convenioUsuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Convenio getConvenio() { - return convenio; - } - - public void setConvenio(Convenio convenio) { - this.convenio = convenio; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name="CONVENIO_USUARIO_SEQ", sequenceName="CONVENIO_USUARIO_SEQ", allocationSize=1) +@Table(name="CONVENIO_USUARIO") +public class ConvenioUsuario implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CONVENIO_USUARIO_SEQ") + @Column(name = "CONVENIOUSUARIO_ID") + private Integer convenioUsuarioId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @ManyToOne + private Convenio convenio; + @JoinColumn(name = "USUARIOCONVENIO_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuario; + + @Override + public int hashCode() { + int hash = 0; + hash += (convenioUsuarioId != null ? convenioUsuarioId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ConvenioUsuario)) { + return false; + } + ConvenioUsuario other = (ConvenioUsuario) object; + if ((this.convenioUsuarioId == null && other.convenioUsuarioId != null) || (this.convenioUsuarioId != null && !this.convenioUsuarioId.equals(other.convenioUsuarioId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ConvenioUsuario[convenioUsuarioId=" + convenioUsuarioId + "]"; + } + + public Integer getConvenioUsuarioId() { + return convenioUsuarioId; + } + + public void setConvenioUsuarioId(Integer convenioUsuarioId) { + this.convenioUsuarioId = convenioUsuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Convenio getConvenio() { + return convenio; + } + + public void setConvenio(Convenio convenio) { + this.convenio = convenio; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/Corrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Corrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Corrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Corrida.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CorridaCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CorridaCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CorridaCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CorridaCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CorridaInfo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CorridaInfo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CorridaInfo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CorridaInfo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CorridaTramo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CorridaTramo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CorridaTramo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CorridaTramo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Cortesia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cortesia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Cortesia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cortesia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CortesiaBeneficiario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CortesiaBeneficiario.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CortesiaBeneficiario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CortesiaBeneficiario.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CortesiaDireccion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CortesiaDireccion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CortesiaDireccion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CortesiaDireccion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Cotacao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cotacao.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Cotacao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cotacao.java index 71bbbae7b..0110b8df3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Cotacao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Cotacao.java @@ -1,106 +1,106 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - - -@Entity -@SequenceGenerator(name = "COTACAO_SEQ", sequenceName = "COTACAO_SEQ", allocationSize = 1) -@Table(name = "COTACAO") -public class Cotacao implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "COTACAO_SEQ") - @Column(name = "COTACAO_ID") - private Integer cotacaoId; - @OneToOne - @JoinColumn(name = "MONEDA_ID") - private Moneda moneda; - @Column(name = "VALOR", precision = 7) - private BigDecimal valor; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getCotacaoId() { - return cotacaoId; - } - - public void setCotacaoId(Integer cotacaoId) { - this.cotacaoId = cotacaoId; - } - - public Moneda getMoneda() { - return moneda; - } - - public void setMoneda(Moneda moneda) { - this.moneda = moneda; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Cotacao)) { - return false; - } - Cotacao other = (Cotacao) object; - if ((this.cotacaoId == null && other.cotacaoId != null) || (this.cotacaoId != null && !this.cotacaoId.equals(other.cotacaoId))) { - return false; - } - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + + +@Entity +@SequenceGenerator(name = "COTACAO_SEQ", sequenceName = "COTACAO_SEQ", allocationSize = 1) +@Table(name = "COTACAO") +public class Cotacao implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "COTACAO_SEQ") + @Column(name = "COTACAO_ID") + private Integer cotacaoId; + @OneToOne + @JoinColumn(name = "MONEDA_ID") + private Moneda moneda; + @Column(name = "VALOR", precision = 7) + private BigDecimal valor; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getCotacaoId() { + return cotacaoId; + } + + public void setCotacaoId(Integer cotacaoId) { + this.cotacaoId = cotacaoId; + } + + public Moneda getMoneda() { + return moneda; + } + + public void setMoneda(Moneda moneda) { + this.moneda = moneda; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Cotacao)) { + return false; + } + Cotacao other = (Cotacao) object; + if ((this.cotacaoId == null && other.cotacaoId != null) || (this.cotacaoId != null && !this.cotacaoId.equals(other.cotacaoId))) { + return false; + } + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CtrlFechamentoCaixa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlFechamentoCaixa.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CtrlFechamentoCaixa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlFechamentoCaixa.java index fa78aa02f..49f22b960 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CtrlFechamentoCaixa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlFechamentoCaixa.java @@ -1,96 +1,96 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; - -/** - * Classe que controla a rotina de retenção de comissão após o fechamento do caixa - * - * @author wilian - * @since 29/11/2018 - * - */ -@Entity -@SequenceGenerator(name = "CTRL_FECHAMENTO_CAIXA_SEQ", sequenceName = "CTRL_FECHAMENTO_CAIXA_SEQ", allocationSize = 1) -@Table(name = "CTRL_FECHAMENTO_CAIXA") -public class CtrlFechamentoCaixa implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_FECHAMENTO_CAIXA_SEQ") - @Column(name = "CTRLFECHAMENTOCAIXA_ID") - private Long ctrlfechamentocaixaId; - - @Column(name = "FECCORTE") - @Temporal(TemporalType.DATE) - private Date feccorte; - - @Enumerated(EnumType.STRING) - @Column(name = "FECHAMENTO_STATUS") - private CtrlFechamentoCaixaStatus status; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.DATE) - private Date fecmodif; - - @Column(name = "ACTIVO") - private boolean activo; - - public Long getCtrlfechamentocaixaId() { - return ctrlfechamentocaixaId; - } - - public void setCtrlfechamentocaixaId(Long ctrlfechamentocaixaId) { - this.ctrlfechamentocaixaId = ctrlfechamentocaixaId; - } - - public Date getFeccorte() { - return feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public CtrlFechamentoCaixaStatus getStatus() { - return status; - } - - public void setStatus(CtrlFechamentoCaixaStatus status) { - this.status = status; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; + +/** + * Classe que controla a rotina de retenção de comissão após o fechamento do caixa + * + * @author wilian + * @since 29/11/2018 + * + */ +@Entity +@SequenceGenerator(name = "CTRL_FECHAMENTO_CAIXA_SEQ", sequenceName = "CTRL_FECHAMENTO_CAIXA_SEQ", allocationSize = 1) +@Table(name = "CTRL_FECHAMENTO_CAIXA") +public class CtrlFechamentoCaixa implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_FECHAMENTO_CAIXA_SEQ") + @Column(name = "CTRLFECHAMENTOCAIXA_ID") + private Long ctrlfechamentocaixaId; + + @Column(name = "FECCORTE") + @Temporal(TemporalType.DATE) + private Date feccorte; + + @Enumerated(EnumType.STRING) + @Column(name = "FECHAMENTO_STATUS") + private CtrlFechamentoCaixaStatus status; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.DATE) + private Date fecmodif; + + @Column(name = "ACTIVO") + private boolean activo; + + public Long getCtrlfechamentocaixaId() { + return ctrlfechamentocaixaId; + } + + public void setCtrlfechamentocaixaId(Long ctrlfechamentocaixaId) { + this.ctrlfechamentocaixaId = ctrlfechamentocaixaId; + } + + public Date getFeccorte() { + return feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public CtrlFechamentoCaixaStatus getStatus() { + return status; + } + + public void setStatus(CtrlFechamentoCaixaStatus status) { + this.status = status; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieBPe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieBPe.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/CtrlSerieBPe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieBPe.java index c4211c99e..e10fe3faf 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieBPe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieBPe.java @@ -1,110 +1,110 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CTRL_SERIE_BPE_SEQ", sequenceName = "CTRL_SERIE_BPE_SEQ", allocationSize = 1) -@Table(name = "CTRL_SERIE_BPE") -public class CtrlSerieBPe { - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_SERIE_BPE_SEQ") - @Column(name = "CTRLSERIEBPE_ID") - private Long ctrlSerieBPeId; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @ManyToOne - @JoinColumn(name = "ESTADO_ID", referencedColumnName = "ESTADO_ID") - private Estado estado; - - @Column(name = "NUMSERIE") - private String serie; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public CtrlSerieBPe() { - - } - - public Long getCtrlSerieBPeId() { - return ctrlSerieBPeId; - } - - public void setCtrlSerieBPeId(Long ctrlSerieBPeId) { - this.ctrlSerieBPeId = ctrlSerieBPeId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CTRL_SERIE_BPE_SEQ", sequenceName = "CTRL_SERIE_BPE_SEQ", allocationSize = 1) +@Table(name = "CTRL_SERIE_BPE") +public class CtrlSerieBPe { + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_SERIE_BPE_SEQ") + @Column(name = "CTRLSERIEBPE_ID") + private Long ctrlSerieBPeId; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @ManyToOne + @JoinColumn(name = "ESTADO_ID", referencedColumnName = "ESTADO_ID") + private Estado estado; + + @Column(name = "NUMSERIE") + private String serie; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public CtrlSerieBPe() { + + } + + public Long getCtrlSerieBPeId() { + return ctrlSerieBPeId; + } + + public void setCtrlSerieBPeId(Long ctrlSerieBPeId) { + this.ctrlSerieBPeId = ctrlSerieBPeId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieEmbarcada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieEmbarcada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CtrlSerieEmbarcada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieEmbarcada.java index 89004b272..e47425cff 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieEmbarcada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CtrlSerieEmbarcada.java @@ -1,180 +1,180 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CTRL_SERIE_EMBARCADA_SEQ", sequenceName = "CTRL_SERIE_EMBARCADA_SEQ", allocationSize = 1) -@Table(name = "CTRL_SERIE_EMBARCADA") -public class CtrlSerieEmbarcada implements Serializable { - private static final long serialVersionUID = 3608706761067496642L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_SERIE_EMBARCADA_SEQ") - @Column(name = "CTRLSERIEEMBARCADA_ID") - private Long ctrlSerieEmbarcadaId; - @ManyToOne - @JoinColumn(name = "DISPOSITIVOEMBARCADA_ID", referencedColumnName = "DISPOSITIVOEMBARCADA_ID") - private DispositivoEmbarcada dispositivoEmbarcada; - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - private PuntoVenta puntoventa; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne - @JoinColumn(name = "ESTADO_ID", referencedColumnName = "ESTADO_ID") - private Estado estado; - @Column(name = "SERIE") - private String serie; - @Column(name = "NUMEROINICIAL") - private String numeroInicial; - @Column(name = "NUMEROCORRENTE") - private String numeroCorrente; - @Column(name = "IND_BAIXADO") - private Boolean indBaixado; - @Column(name = "IND_REUTILIZADO") - private Boolean indReutilizado; - @OneToOne - @JoinColumn(name = "CTRLSERIEEMBARCADASEQ_ID", referencedColumnName = "CTRLSERIEEMBARCADA_ID") - private CtrlSerieEmbarcada ctrlSerieEmbarcadaSeq; - @Column(name = "ACTIVO") - private Boolean activo; - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public CtrlSerieEmbarcada() { - - } - - public Long getCtrlSerieEmbarcadaId() { - return ctrlSerieEmbarcadaId; - } - - public void setCtrlSerieEmbarcadaId(Long ctrlSerieEmbarcadaId) { - this.ctrlSerieEmbarcadaId = ctrlSerieEmbarcadaId; - } - - public DispositivoEmbarcada getDispositivoEmbarcada() { - return dispositivoEmbarcada; - } - - public void setDispositivoEmbarcada(DispositivoEmbarcada dispositivoEmbarcada) { - this.dispositivoEmbarcada = dispositivoEmbarcada; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getNumeroInicial() { - return numeroInicial; - } - - public void setNumeroInicial(String numeroInicial) { - this.numeroInicial = numeroInicial; - } - - public String getNumeroCorrente() { - return numeroCorrente; - } - - public void setNumeroCorrente(String numeroCorrente) { - this.numeroCorrente = numeroCorrente; - } - - public Boolean getIndBaixado() { - return indBaixado; - } - - public void setIndBaixado(Boolean indBaixado) { - this.indBaixado = indBaixado; - } - - public Boolean getIndReutilizado() { - return indReutilizado; - } - - public void setIndReutilizado(Boolean indReutilizado) { - this.indReutilizado = indReutilizado; - } - - public CtrlSerieEmbarcada getCtrlSerieEmbarcadaSeq() { - return ctrlSerieEmbarcadaSeq; - } - - public void setCtrlSerieEmbarcadaSeq(CtrlSerieEmbarcada ctrlSerieEmbarcadaSeq) { - this.ctrlSerieEmbarcadaSeq = ctrlSerieEmbarcadaSeq; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CTRL_SERIE_EMBARCADA_SEQ", sequenceName = "CTRL_SERIE_EMBARCADA_SEQ", allocationSize = 1) +@Table(name = "CTRL_SERIE_EMBARCADA") +public class CtrlSerieEmbarcada implements Serializable { + private static final long serialVersionUID = 3608706761067496642L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CTRL_SERIE_EMBARCADA_SEQ") + @Column(name = "CTRLSERIEEMBARCADA_ID") + private Long ctrlSerieEmbarcadaId; + @ManyToOne + @JoinColumn(name = "DISPOSITIVOEMBARCADA_ID", referencedColumnName = "DISPOSITIVOEMBARCADA_ID") + private DispositivoEmbarcada dispositivoEmbarcada; + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + private PuntoVenta puntoventa; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne + @JoinColumn(name = "ESTADO_ID", referencedColumnName = "ESTADO_ID") + private Estado estado; + @Column(name = "SERIE") + private String serie; + @Column(name = "NUMEROINICIAL") + private String numeroInicial; + @Column(name = "NUMEROCORRENTE") + private String numeroCorrente; + @Column(name = "IND_BAIXADO") + private Boolean indBaixado; + @Column(name = "IND_REUTILIZADO") + private Boolean indReutilizado; + @OneToOne + @JoinColumn(name = "CTRLSERIEEMBARCADASEQ_ID", referencedColumnName = "CTRLSERIEEMBARCADA_ID") + private CtrlSerieEmbarcada ctrlSerieEmbarcadaSeq; + @Column(name = "ACTIVO") + private Boolean activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public CtrlSerieEmbarcada() { + + } + + public Long getCtrlSerieEmbarcadaId() { + return ctrlSerieEmbarcadaId; + } + + public void setCtrlSerieEmbarcadaId(Long ctrlSerieEmbarcadaId) { + this.ctrlSerieEmbarcadaId = ctrlSerieEmbarcadaId; + } + + public DispositivoEmbarcada getDispositivoEmbarcada() { + return dispositivoEmbarcada; + } + + public void setDispositivoEmbarcada(DispositivoEmbarcada dispositivoEmbarcada) { + this.dispositivoEmbarcada = dispositivoEmbarcada; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getNumeroInicial() { + return numeroInicial; + } + + public void setNumeroInicial(String numeroInicial) { + this.numeroInicial = numeroInicial; + } + + public String getNumeroCorrente() { + return numeroCorrente; + } + + public void setNumeroCorrente(String numeroCorrente) { + this.numeroCorrente = numeroCorrente; + } + + public Boolean getIndBaixado() { + return indBaixado; + } + + public void setIndBaixado(Boolean indBaixado) { + this.indBaixado = indBaixado; + } + + public Boolean getIndReutilizado() { + return indReutilizado; + } + + public void setIndReutilizado(Boolean indReutilizado) { + this.indReutilizado = indReutilizado; + } + + public CtrlSerieEmbarcada getCtrlSerieEmbarcadaSeq() { + return ctrlSerieEmbarcadaSeq; + } + + public void setCtrlSerieEmbarcadaSeq(CtrlSerieEmbarcada ctrlSerieEmbarcadaSeq) { + this.ctrlSerieEmbarcadaSeq = ctrlSerieEmbarcadaSeq; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/CuponConvenio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CuponConvenio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CuponConvenio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CuponConvenio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CuponSecretaria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Curso.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Curso.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Curso.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Curso.java index f32d9498b..2a0714d29 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Curso.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Curso.java @@ -1,100 +1,100 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "CURSO_SEQ", sequenceName = "CURSO_SEQ", allocationSize = 1) -@Table(name = "CURSO") -public class Curso implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "CURSO_SEQ") - @Basic(optional = false) - @Column(name = "CURSO_ID") - private Integer cursoId; - @Column(name = "NOMCURSO") - private String nomcurso; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @ManyToMany - @JoinTable(name = "CLIENTE_CURSO", joinColumns = { @JoinColumn(name = "CURSO_ID") }, - inverseJoinColumns = { @JoinColumn(name = "CLIENTE_ID") }) - private List clienteList; - - public Integer getCursoId() { - return cursoId; - } - - public void setCursoId(Integer cursoId) { - this.cursoId = cursoId; - } - - public String getNomcurso() { - return nomcurso; - } - - public void setNomcurso(String nomcurso) { - this.nomcurso = nomcurso; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getClienteList() { - return clienteList; - } - - public void setClienteList(List clienteList) { - this.clienteList = clienteList; - } - - @Override - public String toString() { - return this.nomcurso; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CURSO_SEQ", sequenceName = "CURSO_SEQ", allocationSize = 1) +@Table(name = "CURSO") +public class Curso implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CURSO_SEQ") + @Basic(optional = false) + @Column(name = "CURSO_ID") + private Integer cursoId; + @Column(name = "NOMCURSO") + private String nomcurso; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @ManyToMany + @JoinTable(name = "CLIENTE_CURSO", joinColumns = { @JoinColumn(name = "CURSO_ID") }, + inverseJoinColumns = { @JoinColumn(name = "CLIENTE_ID") }) + private List clienteList; + + public Integer getCursoId() { + return cursoId; + } + + public void setCursoId(Integer cursoId) { + this.cursoId = cursoId; + } + + public String getNomcurso() { + return nomcurso; + } + + public void setNomcurso(String nomcurso) { + this.nomcurso = nomcurso; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getClienteList() { + return clienteList; + } + + public void setClienteList(List clienteList) { + this.clienteList = clienteList; + } + + @Override + public String toString() { + return this.nomcurso; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Custom.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Custom.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Custom.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Custom.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/CustomIdGenerator.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CustomIdGenerator.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/CustomIdGenerator.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CustomIdGenerator.java index 528f7937f..2085c92ff 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CustomIdGenerator.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/CustomIdGenerator.java @@ -1,74 +1,74 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Properties; - -import org.apache.commons.lang.StringUtils; -import org.hibernate.HibernateException; -import org.hibernate.MappingException; -import org.hibernate.dialect.Dialect; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.Configurable; -import org.hibernate.id.IdentifierGenerator; - -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; - -public class CustomIdGenerator implements IdentifierGenerator, Configurable { - - private String seqName; - private Integer tamanho; - - public Serializable generate(SessionImplementor session, Object object) - throws HibernateException { - - Connection connection = session.connection(); - try { - - PreparedStatement ps = connection - .prepareStatement("SELECT " + seqName + ".NEXTVAL AS NEXTVAL FROM DUAL"); - - ResultSet rs = ps.executeQuery(); - - if (rs.next()) { - Integer id = rs.getInt("NEXTVAL"); - String newValue = id.toString(); - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.HABILITAR_CUSTOM_SEQUENCE.getDescricao())) { - newValue = "1" + (StringUtils.leftPad(id.toString(), tamanho, "0")); - } - return Integer.valueOf(newValue); - } - - } catch (SQLException e) { - e.printStackTrace(); - } - return null; - } - - @Override - public void configure(org.hibernate.type.Type arg0, Properties arg1, Dialect arg2) throws MappingException { - setTamanho(Integer.valueOf(arg1.getProperty("tamanho"))); - setSeqName(arg1.getProperty("seqName")); - } - - public Integer getTamanho() { - return tamanho; - } - - public void setTamanho(Integer tamanho) { - this.tamanho = tamanho; - } - - public String getSeqName() { - return seqName; - } - - public void setSeqName(String seqName) { - this.seqName = seqName; - } - +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Properties; + +import org.apache.commons.lang.StringUtils; +import org.hibernate.HibernateException; +import org.hibernate.MappingException; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.Configurable; +import org.hibernate.id.IdentifierGenerator; + +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; + +public class CustomIdGenerator implements IdentifierGenerator, Configurable { + + private String seqName; + private Integer tamanho; + + public Serializable generate(SessionImplementor session, Object object) + throws HibernateException { + + Connection connection = session.connection(); + try { + + PreparedStatement ps = connection + .prepareStatement("SELECT " + seqName + ".NEXTVAL AS NEXTVAL FROM DUAL"); + + ResultSet rs = ps.executeQuery(); + + if (rs.next()) { + Integer id = rs.getInt("NEXTVAL"); + String newValue = id.toString(); + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.HABILITAR_CUSTOM_SEQUENCE.getDescricao())) { + newValue = "1" + (StringUtils.leftPad(id.toString(), tamanho, "0")); + } + return Integer.valueOf(newValue); + } + + } catch (SQLException e) { + e.printStackTrace(); + } + return null; + } + + @Override + public void configure(org.hibernate.type.Type arg0, Properties arg1, Dialect arg2) throws MappingException { + setTamanho(Integer.valueOf(arg1.getProperty("tamanho"))); + setSeqName(arg1.getProperty("seqName")); + } + + public Integer getTamanho() { + return tamanho; + } + + public void setTamanho(Integer tamanho) { + this.tamanho = tamanho; + } + + public String getSeqName() { + return seqName; + } + + public void setSeqName(String seqName) { + this.seqName = seqName; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/DepositoBancario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DepositoBancario.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/DepositoBancario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DepositoBancario.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/DescontoComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DescontoComissao.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/DescontoComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DescontoComissao.java index 099feaff8..73343f1d2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/DescontoComissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DescontoComissao.java @@ -1,185 +1,185 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "DESCONTO_COMISSAO") -@SequenceGenerator(name = "DESCONTO_COMISSAO_SEQ", sequenceName = "DESCONTO_COMISSAO_SEQ", allocationSize = 1) -public class DescontoComissao implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "DESCONTO_COMISSAO_SEQ") - @Column(name = "DESCONTOCOMISSAO_ID") - private Long descontocomissaoId; - - @Column(name = "PRECO") - private BigDecimal preco; - - @Column(name = "DATAINICIAL") - @Temporal(TemporalType.DATE) - private Date datainicial; - - @Column(name = "DATAFINAL") - @Temporal(TemporalType.DATE) - private Date datafinal; - - @Column(name = "OBSERVACAO") - private String observacao; - - @Column(name = "ACTIVO") - private boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.DATE) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ITEMDESCONTO_ID") - private ItemDesconto itemDesconto; - - public Long getDescontocomissaoId() { - return descontocomissaoId; - } - - public void setDescontocomissaoId(Long descontocomissaoId) { - this.descontocomissaoId = descontocomissaoId; - } - - public BigDecimal getPreco() { - return preco; - } - - public void setPreco(BigDecimal preco) { - this.preco = preco; - } - - public Date getDatainicial() { - return datainicial; - } - - public void setDatainicial(Date datainicial) { - this.datainicial = datainicial; - } - - public Date getDatafinal() { - return datafinal; - } - - public void setDatafinal(Date datafinal) { - this.datafinal = datafinal; - } - - public String getObservacao() { - return observacao; - } - - public void setObservacao(String observacao) { - this.observacao = observacao; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public ItemDesconto getItemDesconto() { - return itemDesconto; - } - - public void setItemDesconto(ItemDesconto itemDesconto) { - this.itemDesconto = itemDesconto; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((descontocomissaoId == null) ? 0 : descontocomissaoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DescontoComissao other = (DescontoComissao) obj; - if (descontocomissaoId == null) { - if (other.descontocomissaoId != null) - return false; - } else if (!descontocomissaoId.equals(other.descontocomissaoId)) - return false; - return true; - } - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "DESCONTO_COMISSAO") +@SequenceGenerator(name = "DESCONTO_COMISSAO_SEQ", sequenceName = "DESCONTO_COMISSAO_SEQ", allocationSize = 1) +public class DescontoComissao implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "DESCONTO_COMISSAO_SEQ") + @Column(name = "DESCONTOCOMISSAO_ID") + private Long descontocomissaoId; + + @Column(name = "PRECO") + private BigDecimal preco; + + @Column(name = "DATAINICIAL") + @Temporal(TemporalType.DATE) + private Date datainicial; + + @Column(name = "DATAFINAL") + @Temporal(TemporalType.DATE) + private Date datafinal; + + @Column(name = "OBSERVACAO") + private String observacao; + + @Column(name = "ACTIVO") + private boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.DATE) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "ITEMDESCONTO_ID") + private ItemDesconto itemDesconto; + + public Long getDescontocomissaoId() { + return descontocomissaoId; + } + + public void setDescontocomissaoId(Long descontocomissaoId) { + this.descontocomissaoId = descontocomissaoId; + } + + public BigDecimal getPreco() { + return preco; + } + + public void setPreco(BigDecimal preco) { + this.preco = preco; + } + + public Date getDatainicial() { + return datainicial; + } + + public void setDatainicial(Date datainicial) { + this.datainicial = datainicial; + } + + public Date getDatafinal() { + return datafinal; + } + + public void setDatafinal(Date datafinal) { + this.datafinal = datafinal; + } + + public String getObservacao() { + return observacao; + } + + public void setObservacao(String observacao) { + this.observacao = observacao; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public ItemDesconto getItemDesconto() { + return itemDesconto; + } + + public void setItemDesconto(ItemDesconto itemDesconto) { + this.itemDesconto = itemDesconto; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((descontocomissaoId == null) ? 0 : descontocomissaoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DescontoComissao other = (DescontoComissao) obj; + if (descontocomissaoId == null) { + if (other.descontocomissaoId != null) + return false; + } else if (!descontocomissaoId.equals(other.descontocomissaoId)) + return false; + return true; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/DescontoContrato.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DescontoContrato.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/DescontoContrato.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DescontoContrato.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java index 9756d4ca6..b7393261a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java @@ -1,210 +1,210 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "DET_ABASTO_BOLETO_SEQ", sequenceName = "DET_ABASTO_BOLETO_SEQ", allocationSize = 1) -@Table(name = "DET_ABASTO_BOLETO") -public class DetAbastoBoleto implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "DET_ABASTO_BOLETO_SEQ") - @Column(name = "DETABASTOBOLETO_ID") - private Integer detabastoboletoId; - @Column(name = "NUMMOVIMIENTO") - private Long nummovimiento; - @Column(name = "NUMSERIEPREIMPRESA") - private String numseriepreimpresa; - @Column(name = "NUMFOLIOINICIAL") - private String numfolioinicial; - @Column(name = "NUMFOLIOFINAL") - private String numfoliofinal; - @Column(name = "STATUSFIRMA") - private Boolean statusfirma; - @Column(name = "STATUSOPERACION") - private Integer statusoperacion; - @Column(name = "STATUSENVIO") - private Boolean statusenvio; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "INDINUTILIZA") - private Boolean indinutiliza; - @JoinColumn(name = "ABASTOBOLETO_ID", referencedColumnName = "ABASTOBOLETO_ID") - @ManyToOne - private AbastoBoleto abastoBoleto; - @JoinColumn(name = "AIDF_ID", referencedColumnName = "AIDF_ID") - @ManyToOne - private Aidf aidf; - - public Integer getDetabastoboletoId() { - return detabastoboletoId; - } - - public void setDetabastoboletoId(Integer detabastoboletoId) { - this.detabastoboletoId = detabastoboletoId; - } - - public Long getNummovimiento() { - return nummovimiento; - } - - public void setNummovimiento(Long nummovimiento) { - this.nummovimiento = nummovimiento; - } - - public String getNumseriepreimpresa() { - return numseriepreimpresa; - } - - public void setNumseriepreimpresa(String numseriepreimpresa) { - this.numseriepreimpresa = numseriepreimpresa; - } - - public String getNumfolioinicial() { - return numfolioinicial; - } - - public Long getFolioInicial() { - return Long.valueOf(numfolioinicial); - } - - public void setNumfolioinicial(String numfolioinicial) { - this.numfolioinicial = numfolioinicial; - } - - public String getNumfoliofinal() { - return numfoliofinal; - } - - public Long getFolioFinal() { - return Long.valueOf(numfoliofinal); - } - - public void setNumfoliofinal(String numfoliofinal) { - this.numfoliofinal = numfoliofinal; - } - - public Boolean getStatusfirma() { - return statusfirma; - } - - public void setStatusfirma(Boolean statusfirma) { - this.statusfirma = statusfirma; - } - - public Integer getStatusoperacion() { - return statusoperacion; - } - - public void setStatusoperacion(Integer statusoperacion) { - this.statusoperacion = statusoperacion; - } - - public Boolean getStatusenvio() { - return statusenvio; - } - - public void setStatusenvio(Boolean statusenvio) { - this.statusenvio = statusenvio; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndinutiliza() { - return indinutiliza; - } - - public void setIndinutiliza(Boolean indinutiliza) { - this.indinutiliza = indinutiliza; - } - - public AbastoBoleto getAbastoBoleto() { - return abastoBoleto; - } - - public void setAbastoBoleto(AbastoBoleto abastoBoleto) { - this.abastoBoleto = abastoBoleto; - } - - public Aidf getAidf() { - return aidf; - } - - public void setAidf(Aidf aidf) { - this.aidf = aidf; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((detabastoboletoId == null) ? 0 : detabastoboletoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DetAbastoBoleto other = (DetAbastoBoleto) obj; - if (detabastoboletoId == null) { - if (other.detabastoboletoId != null) - return false; - } else if (!detabastoboletoId.equals(other.detabastoboletoId)) - return false; - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto [detabastoboletoId=" + detabastoboletoId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "DET_ABASTO_BOLETO_SEQ", sequenceName = "DET_ABASTO_BOLETO_SEQ", allocationSize = 1) +@Table(name = "DET_ABASTO_BOLETO") +public class DetAbastoBoleto implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "DET_ABASTO_BOLETO_SEQ") + @Column(name = "DETABASTOBOLETO_ID") + private Integer detabastoboletoId; + @Column(name = "NUMMOVIMIENTO") + private Long nummovimiento; + @Column(name = "NUMSERIEPREIMPRESA") + private String numseriepreimpresa; + @Column(name = "NUMFOLIOINICIAL") + private String numfolioinicial; + @Column(name = "NUMFOLIOFINAL") + private String numfoliofinal; + @Column(name = "STATUSFIRMA") + private Boolean statusfirma; + @Column(name = "STATUSOPERACION") + private Integer statusoperacion; + @Column(name = "STATUSENVIO") + private Boolean statusenvio; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "INDINUTILIZA") + private Boolean indinutiliza; + @JoinColumn(name = "ABASTOBOLETO_ID", referencedColumnName = "ABASTOBOLETO_ID") + @ManyToOne + private AbastoBoleto abastoBoleto; + @JoinColumn(name = "AIDF_ID", referencedColumnName = "AIDF_ID") + @ManyToOne + private Aidf aidf; + + public Integer getDetabastoboletoId() { + return detabastoboletoId; + } + + public void setDetabastoboletoId(Integer detabastoboletoId) { + this.detabastoboletoId = detabastoboletoId; + } + + public Long getNummovimiento() { + return nummovimiento; + } + + public void setNummovimiento(Long nummovimiento) { + this.nummovimiento = nummovimiento; + } + + public String getNumseriepreimpresa() { + return numseriepreimpresa; + } + + public void setNumseriepreimpresa(String numseriepreimpresa) { + this.numseriepreimpresa = numseriepreimpresa; + } + + public String getNumfolioinicial() { + return numfolioinicial; + } + + public Long getFolioInicial() { + return Long.valueOf(numfolioinicial); + } + + public void setNumfolioinicial(String numfolioinicial) { + this.numfolioinicial = numfolioinicial; + } + + public String getNumfoliofinal() { + return numfoliofinal; + } + + public Long getFolioFinal() { + return Long.valueOf(numfoliofinal); + } + + public void setNumfoliofinal(String numfoliofinal) { + this.numfoliofinal = numfoliofinal; + } + + public Boolean getStatusfirma() { + return statusfirma; + } + + public void setStatusfirma(Boolean statusfirma) { + this.statusfirma = statusfirma; + } + + public Integer getStatusoperacion() { + return statusoperacion; + } + + public void setStatusoperacion(Integer statusoperacion) { + this.statusoperacion = statusoperacion; + } + + public Boolean getStatusenvio() { + return statusenvio; + } + + public void setStatusenvio(Boolean statusenvio) { + this.statusenvio = statusenvio; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndinutiliza() { + return indinutiliza; + } + + public void setIndinutiliza(Boolean indinutiliza) { + this.indinutiliza = indinutiliza; + } + + public AbastoBoleto getAbastoBoleto() { + return abastoBoleto; + } + + public void setAbastoBoleto(AbastoBoleto abastoBoleto) { + this.abastoBoleto = abastoBoleto; + } + + public Aidf getAidf() { + return aidf; + } + + public void setAidf(Aidf aidf) { + this.aidf = aidf; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((detabastoboletoId == null) ? 0 : detabastoboletoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DetAbastoBoleto other = (DetAbastoBoleto) obj; + if (detabastoboletoId == null) { + if (other.detabastoboletoId != null) + return false; + } else if (!detabastoboletoId.equals(other.detabastoboletoId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto [detabastoboletoId=" + detabastoboletoId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/DetDiagramaAutobus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DetDiagramaAutobus.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/DetDiagramaAutobus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DetDiagramaAutobus.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/DiagramaAutobus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DiagramaAutobus.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/DiagramaAutobus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DiagramaAutobus.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Disponibilidad.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Disponibilidad.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Disponibilidad.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Disponibilidad.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcada.java index c39821a24..b8d17ec15 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcada.java @@ -1,201 +1,201 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "DISPOSITIVO_EMBARCADA_SEQ", sequenceName = "DISPOSITIVO_EMBARCADA_SEQ", allocationSize = 1) -@Table(name = "DISPOSITIVO_EMBARCADA") -public class DispositivoEmbarcada { - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "DISPOSITIVO_EMBARCADA_SEQ") - @Column(name = "DISPOSITIVOEMBARCADA_ID") - private Long dispositivoEmbarcadaId; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - @Column(name = "DESCRICAO") - private String descricao; - @Column(name = "REGISTRO") - private String registro; - @Column(name = "IMEI") - private String imei; - @Column(name = "IND_DISP_BLOQUEADO") - private Boolean indDispBloqueado; - @Column(name = "MOTIVO_DISP_BLOQUEADO") - private String motivoDispBloqueado; - @Column(name = "IND_DISP_MANUTENCAO") - private Boolean indDispManutencao; - @Column(name = "MOTIVO_DISP_MANUTENCAO") - private String motivoDispManutencao; - @Column(name = "IND_DISP_BAIXADO") - private Boolean indDispBaixado; - @Column(name = "MOTIVO_DISP_BAIXADO") - private String motivoDispBaixado; - @Column(name = "ACTIVO") - private Boolean activo; - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @OneToOne - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - private Usuario usuario; - - @OneToMany(mappedBy="dispositivoEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private List series = new ArrayList(); - - @Column(name = "IND_VENDE_BPE") - private Boolean indVendeNaoBpe; - - @Column(name = "VERSAO") - private String versaoUltimaSinc; - - @Column(name = "FECHORSINC") - private Date dataUltimaSinc; - - public Long getDispositivoEmbarcadaId() { - return dispositivoEmbarcadaId; - } - public void setDispositivoEmbarcadaId(Long dispositivoEmbarcadaId) { - this.dispositivoEmbarcadaId = dispositivoEmbarcadaId; - } - - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - public String getDescricao() { - return descricao; - } - public void setDescricao(String descricao) { - this.descricao = descricao; - } - public String getRegistro() { - return registro; - } - public void setRegistro(String registro) { - this.registro = registro; - } - public String getImei() { - return imei; - } - public void setImei(String imei) { - this.imei = imei; - } - public Boolean getIndDispBloqueado() { - return indDispBloqueado; - } - public void setIndDispBloqueado(Boolean indDispBloqueado) { - this.indDispBloqueado = indDispBloqueado; - } - public String getMotivoDispBloqueado() { - return motivoDispBloqueado; - } - public void setMotivoDispBloqueado(String motivoDispBloqueado) { - this.motivoDispBloqueado = motivoDispBloqueado; - } - public Boolean getIndDispManutencao() { - return indDispManutencao; - } - public void setIndDispManutencao(Boolean indDispManutencao) { - this.indDispManutencao = indDispManutencao; - } - public String getMotivoDispManutencao() { - return motivoDispManutencao; - } - public void setMotivoDispManutencao(String motivoDispManutencao) { - this.motivoDispManutencao = motivoDispManutencao; - } - public Boolean getIndDispBaixado() { - return indDispBaixado; - } - public void setIndDispBaixado(Boolean indDispBaixado) { - this.indDispBaixado = indDispBaixado; - } - public String getMotivoDispBaixado() { - return motivoDispBaixado; - } - public void setMotivoDispBaixado(String motivoDispBaixado) { - this.motivoDispBaixado = motivoDispBaixado; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Usuario getUsuario() { - return usuario; - } - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - public List getSeries() { - return series; - } - public void setSeries(List series) { - this.series = series; - } - - public Boolean getIndVendeNaoBpe() { - return indVendeNaoBpe; - } - public void setIndVendeNaoBpe(Boolean indVendeNaoBpe) { - this.indVendeNaoBpe = indVendeNaoBpe; - } - public String getVersaoUltimaSinc() { - return versaoUltimaSinc; - } - public void setVersaoUltimaSinc(String versaoUltimaSinc) { - this.versaoUltimaSinc = versaoUltimaSinc; - } - public Date getDataUltimaSinc() { - return dataUltimaSinc; - } - public void setDataUltimaSinc(Date dataUltimaSinc) { - this.dataUltimaSinc = dataUltimaSinc; - } - @Override - public String toString() { - return this.getDescricao(); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "DISPOSITIVO_EMBARCADA_SEQ", sequenceName = "DISPOSITIVO_EMBARCADA_SEQ", allocationSize = 1) +@Table(name = "DISPOSITIVO_EMBARCADA") +public class DispositivoEmbarcada { + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "DISPOSITIVO_EMBARCADA_SEQ") + @Column(name = "DISPOSITIVOEMBARCADA_ID") + private Long dispositivoEmbarcadaId; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + @Column(name = "DESCRICAO") + private String descricao; + @Column(name = "REGISTRO") + private String registro; + @Column(name = "IMEI") + private String imei; + @Column(name = "IND_DISP_BLOQUEADO") + private Boolean indDispBloqueado; + @Column(name = "MOTIVO_DISP_BLOQUEADO") + private String motivoDispBloqueado; + @Column(name = "IND_DISP_MANUTENCAO") + private Boolean indDispManutencao; + @Column(name = "MOTIVO_DISP_MANUTENCAO") + private String motivoDispManutencao; + @Column(name = "IND_DISP_BAIXADO") + private Boolean indDispBaixado; + @Column(name = "MOTIVO_DISP_BAIXADO") + private String motivoDispBaixado; + @Column(name = "ACTIVO") + private Boolean activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @OneToOne + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + private Usuario usuario; + + @OneToMany(mappedBy="dispositivoEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List series = new ArrayList(); + + @Column(name = "IND_VENDE_BPE") + private Boolean indVendeNaoBpe; + + @Column(name = "VERSAO") + private String versaoUltimaSinc; + + @Column(name = "FECHORSINC") + private Date dataUltimaSinc; + + public Long getDispositivoEmbarcadaId() { + return dispositivoEmbarcadaId; + } + public void setDispositivoEmbarcadaId(Long dispositivoEmbarcadaId) { + this.dispositivoEmbarcadaId = dispositivoEmbarcadaId; + } + + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + public String getRegistro() { + return registro; + } + public void setRegistro(String registro) { + this.registro = registro; + } + public String getImei() { + return imei; + } + public void setImei(String imei) { + this.imei = imei; + } + public Boolean getIndDispBloqueado() { + return indDispBloqueado; + } + public void setIndDispBloqueado(Boolean indDispBloqueado) { + this.indDispBloqueado = indDispBloqueado; + } + public String getMotivoDispBloqueado() { + return motivoDispBloqueado; + } + public void setMotivoDispBloqueado(String motivoDispBloqueado) { + this.motivoDispBloqueado = motivoDispBloqueado; + } + public Boolean getIndDispManutencao() { + return indDispManutencao; + } + public void setIndDispManutencao(Boolean indDispManutencao) { + this.indDispManutencao = indDispManutencao; + } + public String getMotivoDispManutencao() { + return motivoDispManutencao; + } + public void setMotivoDispManutencao(String motivoDispManutencao) { + this.motivoDispManutencao = motivoDispManutencao; + } + public Boolean getIndDispBaixado() { + return indDispBaixado; + } + public void setIndDispBaixado(Boolean indDispBaixado) { + this.indDispBaixado = indDispBaixado; + } + public String getMotivoDispBaixado() { + return motivoDispBaixado; + } + public void setMotivoDispBaixado(String motivoDispBaixado) { + this.motivoDispBaixado = motivoDispBaixado; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Usuario getUsuario() { + return usuario; + } + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + public List getSeries() { + return series; + } + public void setSeries(List series) { + this.series = series; + } + + public Boolean getIndVendeNaoBpe() { + return indVendeNaoBpe; + } + public void setIndVendeNaoBpe(Boolean indVendeNaoBpe) { + this.indVendeNaoBpe = indVendeNaoBpe; + } + public String getVersaoUltimaSinc() { + return versaoUltimaSinc; + } + public void setVersaoUltimaSinc(String versaoUltimaSinc) { + this.versaoUltimaSinc = versaoUltimaSinc; + } + public Date getDataUltimaSinc() { + return dataUltimaSinc; + } + public void setDataUltimaSinc(Date dataUltimaSinc) { + this.dataUltimaSinc = dataUltimaSinc; + } + @Override + public String toString() { + return this.getDescricao(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcadaHistorico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcadaHistorico.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcadaHistorico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcadaHistorico.java index 9b2226eee..dc2ddea42 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcadaHistorico.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/DispositivoEmbarcadaHistorico.java @@ -1,86 +1,86 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "DISPOSITIVO_EMBARCADA_HIST_SEQ", sequenceName = "DISPOSITIVO_EMBARCADA_HIST_SEQ", allocationSize = 1) -@Table(name = "DISPOSITIVO_EMBARCADA_HIST") -public class DispositivoEmbarcadaHistorico { - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "DISPOSITIVO_EMBARCADA_HIST_SEQ") - @Column(name = "DISPOSITIVO_EMBARCADA_HIST_ID") - private Long dispositivoEmbarcadaHistId; - @JoinColumn(name = "DISPOSITIVOEMBARCADA_ID", referencedColumnName = "DISPOSITIVOEMBARCADA_ID") - @ManyToOne - private DispositivoEmbarcada dispositivoEmbarcada; - @Column(name = "DESCRICAO", length = 500) - private String descricao; - @Column(name = "ACTIVO") - private Boolean activo; - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "TIPO_BLOQUEIO_DISP_EMBARCADA") - private Integer tipoBloqueioDispositivoEmbarcada; - public Long getDispositivoEmbarcadaHistId() { - return dispositivoEmbarcadaHistId; - } - public void setDispositivoEmbarcadaHistId(Long dispositivoEmbarcadaHistId) { - this.dispositivoEmbarcadaHistId = dispositivoEmbarcadaHistId; - } - public DispositivoEmbarcada getDispositivoEmbarcada() { - return dispositivoEmbarcada; - } - public void setDispositivoEmbarcada(DispositivoEmbarcada dispositivoEmbarcada) { - this.dispositivoEmbarcada = dispositivoEmbarcada; - } - public String getDescricao() { - return descricao; - } - public void setDescricao(String descricao) { - this.descricao = descricao; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Integer getTipoBloqueioDispositivoEmbarcada() { - return tipoBloqueioDispositivoEmbarcada; - } - public void setTipoBloqueioDispositivoEmbarcada(Integer tipoBloqueioDispositivoEmbarcada) { - this.tipoBloqueioDispositivoEmbarcada = tipoBloqueioDispositivoEmbarcada; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "DISPOSITIVO_EMBARCADA_HIST_SEQ", sequenceName = "DISPOSITIVO_EMBARCADA_HIST_SEQ", allocationSize = 1) +@Table(name = "DISPOSITIVO_EMBARCADA_HIST") +public class DispositivoEmbarcadaHistorico { + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "DISPOSITIVO_EMBARCADA_HIST_SEQ") + @Column(name = "DISPOSITIVO_EMBARCADA_HIST_ID") + private Long dispositivoEmbarcadaHistId; + @JoinColumn(name = "DISPOSITIVOEMBARCADA_ID", referencedColumnName = "DISPOSITIVOEMBARCADA_ID") + @ManyToOne + private DispositivoEmbarcada dispositivoEmbarcada; + @Column(name = "DESCRICAO", length = 500) + private String descricao; + @Column(name = "ACTIVO") + private Boolean activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "TIPO_BLOQUEIO_DISP_EMBARCADA") + private Integer tipoBloqueioDispositivoEmbarcada; + public Long getDispositivoEmbarcadaHistId() { + return dispositivoEmbarcadaHistId; + } + public void setDispositivoEmbarcadaHistId(Long dispositivoEmbarcadaHistId) { + this.dispositivoEmbarcadaHistId = dispositivoEmbarcadaHistId; + } + public DispositivoEmbarcada getDispositivoEmbarcada() { + return dispositivoEmbarcada; + } + public void setDispositivoEmbarcada(DispositivoEmbarcada dispositivoEmbarcada) { + this.dispositivoEmbarcada = dispositivoEmbarcada; + } + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Integer getTipoBloqueioDispositivoEmbarcada() { + return tipoBloqueioDispositivoEmbarcada; + } + public void setTipoBloqueioDispositivoEmbarcada(Integer tipoBloqueioDispositivoEmbarcada) { + this.tipoBloqueioDispositivoEmbarcada = tipoBloqueioDispositivoEmbarcada; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Division.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Division.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Division.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Division.java index 74c2feb6e..5920a57b5 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Division.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Division.java @@ -1,155 +1,155 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@SequenceGenerator(name = "DIVISION_SEQ", sequenceName = "DIVISION_SEQ", allocationSize = 1) -@Table(name = "DIVISION") -public class Division implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "DIVISION_SEQ") - @Column(name = "DIVISION_ID") - private Integer divisionId; - - @Column(name = "NOMBDIVISION") - private String nombDivion; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private Division divisionClone; - - public Division() { - - } - - public Division(Integer divisionId) { - this.divisionId = divisionId; - } - - public Integer getDivisionId() { - return divisionId; - } - - public void setDivisionId(Integer divisionId) { - this.divisionId = divisionId; - } - - public String getNombDivion() { - return nombDivion; - } - - public void setNombDivion(String nombDivion) { - this.nombDivion = nombDivion; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((divisionId == null) ? 0 : divisionId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof Division)) - return false; - Division other = (Division) obj; - if (getDivisionId() == null) { - if (other.getDivisionId() != null) - return false; - } else if (!getDivisionId().equals(other.getDivisionId())) - return false; - return true; - } - - @Override - public String toString() { - return this.getNombDivion(); - } - - @Override - public void clonar() throws CloneNotSupportedException { - divisionClone = new Division(); - divisionClone = (Division) this.clone(); - } - - @Override - public Division getCloneObject() { - return divisionClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getDivisionId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@SequenceGenerator(name = "DIVISION_SEQ", sequenceName = "DIVISION_SEQ", allocationSize = 1) +@Table(name = "DIVISION") +public class Division implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "DIVISION_SEQ") + @Column(name = "DIVISION_ID") + private Integer divisionId; + + @Column(name = "NOMBDIVISION") + private String nombDivion; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private Division divisionClone; + + public Division() { + + } + + public Division(Integer divisionId) { + this.divisionId = divisionId; + } + + public Integer getDivisionId() { + return divisionId; + } + + public void setDivisionId(Integer divisionId) { + this.divisionId = divisionId; + } + + public String getNombDivion() { + return nombDivion; + } + + public void setNombDivion(String nombDivion) { + this.nombDivion = nombDivion; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((divisionId == null) ? 0 : divisionId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof Division)) + return false; + Division other = (Division) obj; + if (getDivisionId() == null) { + if (other.getDivisionId() != null) + return false; + } else if (!getDivisionId().equals(other.getDivisionId())) + return false; + return true; + } + + @Override + public String toString() { + return this.getNombDivion(); + } + + @Override + public void clonar() throws CloneNotSupportedException { + divisionClone = new Division(); + divisionClone = (Division) this.clone(); + } + + @Override + public Division getCloneObject() { + return divisionClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getDivisionId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmbarcadaDispOperador.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmbarcadaDispOperador.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/EmbarcadaDispOperador.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmbarcadaDispOperador.java index 007a0ac6b..50b26d77d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmbarcadaDispOperador.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmbarcadaDispOperador.java @@ -1,104 +1,104 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "EMBARCADADISPOPERADOR_SEQ", sequenceName = "EMBARCADADISPOPERADOR_SEQ", allocationSize = 1) -@Table(name = "EMBARCADA_DISP_OPERADOR") -public class EmbarcadaDispOperador { - - public EmbarcadaDispOperador() { - // TODO Auto-generated constructor stub - } - - public EmbarcadaDispOperador(Long usuarioId, Long dispositivoEmbarcadaId, Long puntoVentaId, Date fecmodif, Boolean activo) { - this.usuarioId = usuarioId; - this.dispositivoEmbarcadaId = dispositivoEmbarcadaId; - this.puntoVentaId = puntoVentaId; - this.activo = activo !=null ? activo : Boolean.TRUE; - this.fecmodif = fecmodif !=null ? fecmodif : new Date(); - - } - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMBARCADADISPOPERADOR_SEQ") - @Column(name = "EMBARCADADISPOPERADOR_ID") - private Long embarcadaDispOperador; - - @Column(name = "DISPOSITIVOEMBARCADA_ID") - private Long dispositivoEmbarcadaId; - - @Column(name = "USUARIO_ID") - private Long usuarioId; - - @Column(name = "PUNTOVENTA_ID") - private Long puntoVentaId; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "ACTIVO") - private Boolean activo; - - public Long getEmbarcadaDispOperador() { - return embarcadaDispOperador; - } - - public void setEmbarcadaDispOperador(Long embarcadaDispOperador) { - this.embarcadaDispOperador = embarcadaDispOperador; - } - - public Long getDispositivoEmbarcadaId() { - return dispositivoEmbarcadaId; - } - - public void setDispositivoEmbarcadaId(Long dispositivoEmbarcadaId) { - this.dispositivoEmbarcadaId = dispositivoEmbarcadaId; - } - - public Long getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Long usuarioId) { - this.usuarioId = usuarioId; - } - - public Long getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Long puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "EMBARCADADISPOPERADOR_SEQ", sequenceName = "EMBARCADADISPOPERADOR_SEQ", allocationSize = 1) +@Table(name = "EMBARCADA_DISP_OPERADOR") +public class EmbarcadaDispOperador { + + public EmbarcadaDispOperador() { + // TODO Auto-generated constructor stub + } + + public EmbarcadaDispOperador(Long usuarioId, Long dispositivoEmbarcadaId, Long puntoVentaId, Date fecmodif, Boolean activo) { + this.usuarioId = usuarioId; + this.dispositivoEmbarcadaId = dispositivoEmbarcadaId; + this.puntoVentaId = puntoVentaId; + this.activo = activo !=null ? activo : Boolean.TRUE; + this.fecmodif = fecmodif !=null ? fecmodif : new Date(); + + } + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMBARCADADISPOPERADOR_SEQ") + @Column(name = "EMBARCADADISPOPERADOR_ID") + private Long embarcadaDispOperador; + + @Column(name = "DISPOSITIVOEMBARCADA_ID") + private Long dispositivoEmbarcadaId; + + @Column(name = "USUARIO_ID") + private Long usuarioId; + + @Column(name = "PUNTOVENTA_ID") + private Long puntoVentaId; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "ACTIVO") + private Boolean activo; + + public Long getEmbarcadaDispOperador() { + return embarcadaDispOperador; + } + + public void setEmbarcadaDispOperador(Long embarcadaDispOperador) { + this.embarcadaDispOperador = embarcadaDispOperador; + } + + public Long getDispositivoEmbarcadaId() { + return dispositivoEmbarcadaId; + } + + public void setDispositivoEmbarcadaId(Long dispositivoEmbarcadaId) { + this.dispositivoEmbarcadaId = dispositivoEmbarcadaId; + } + + public Long getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Long usuarioId) { + this.usuarioId = usuarioId; + } + + public Long getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Long puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmbarqueCatracaRodoviaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmbarqueCatracaRodoviaria.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmbarqueCatracaRodoviaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmbarqueCatracaRodoviaria.java index 625e985b7..d7583aa3d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmbarqueCatracaRodoviaria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmbarqueCatracaRodoviaria.java @@ -1,116 +1,116 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@Table(name = "EMBARQUE_CATRACA_RODOVIARIA") -@SequenceGenerator(name = "EMBARQUE_CATRACA_ROD_SEQ", sequenceName = "EMBARQUE_CATRACA_ROD_SEQ", allocationSize = 1) -public class EmbarqueCatracaRodoviaria implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "EMBARQUECATRACARODOVIARIA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMBARQUE_CATRACA_ROD_SEQ") - private Integer embarqueCatracaRodoviariaId; - - @Column - private Boolean activo; - - @ManyToOne(targetEntity = Empresa.class) - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @ManyToOne(targetEntity = Parada.class) - @JoinColumn(name = "PARADA_ID") - private Parada parada; - - @Column - private Integer sequenciaRod; - - @Column(name = "EMPRESAROD_ID") - private Integer empresaRod; - - @ManyToOne(targetEntity = Usuario.class) - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - @Column - private Date fecModif; - - public Integer getEmbarqueCatracaRodoviariaId() { - return embarqueCatracaRodoviariaId; - } - - public void setEmbarqueCatracaRodoviariaId(Integer embarqueCatracaRodoviariaId) { - this.embarqueCatracaRodoviariaId = embarqueCatracaRodoviariaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa emrpesa) { - this.empresa = emrpesa; - } - - public Parada getParada() { - return parada; - } - - public void setParada(Parada parada) { - this.parada = parada; - } - - public Integer getSequenciaRod() { - return sequenciaRod; - } - - public void setSequenciaRod(Integer sequenciaRod) { - this.sequenciaRod = sequenciaRod; - } - - public Integer getEmpresaRod() { - return empresaRod; - } - - public void setEmpresaRod(Integer empresaRod) { - this.empresaRod = empresaRod; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public Date getFecModif() { - return fecModif; - } - - public void setFecModif(Date fecModif) { - this.fecModif = fecModif; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@Table(name = "EMBARQUE_CATRACA_RODOVIARIA") +@SequenceGenerator(name = "EMBARQUE_CATRACA_ROD_SEQ", sequenceName = "EMBARQUE_CATRACA_ROD_SEQ", allocationSize = 1) +public class EmbarqueCatracaRodoviaria implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "EMBARQUECATRACARODOVIARIA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMBARQUE_CATRACA_ROD_SEQ") + private Integer embarqueCatracaRodoviariaId; + + @Column + private Boolean activo; + + @ManyToOne(targetEntity = Empresa.class) + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @ManyToOne(targetEntity = Parada.class) + @JoinColumn(name = "PARADA_ID") + private Parada parada; + + @Column + private Integer sequenciaRod; + + @Column(name = "EMPRESAROD_ID") + private Integer empresaRod; + + @ManyToOne(targetEntity = Usuario.class) + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + @Column + private Date fecModif; + + public Integer getEmbarqueCatracaRodoviariaId() { + return embarqueCatracaRodoviariaId; + } + + public void setEmbarqueCatracaRodoviariaId(Integer embarqueCatracaRodoviariaId) { + this.embarqueCatracaRodoviariaId = embarqueCatracaRodoviariaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa emrpesa) { + this.empresa = emrpesa; + } + + public Parada getParada() { + return parada; + } + + public void setParada(Parada parada) { + this.parada = parada; + } + + public Integer getSequenciaRod() { + return sequenciaRod; + } + + public void setSequenciaRod(Integer sequenciaRod) { + this.sequenciaRod = sequenciaRod; + } + + public Integer getEmpresaRod() { + return empresaRod; + } + + public void setEmpresaRod(Integer empresaRod) { + this.empresaRod = empresaRod; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Date getFecModif() { + return fecModif; + } + + public void setFecModif(Date fecModif) { + this.fecModif = fecModif; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empleado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Empleado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Empleado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Empleado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Empresa.java similarity index 99% rename from src/com/rjconsultores/ventaboletos/entidad/Empresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Empresa.java index 5738cbe0c..7e866e48a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Empresa.java @@ -434,7 +434,7 @@ public class Empresa implements Serializable, Auditavel { @Temporal(TemporalType.TIME) @AuditarAtributo(pattern = "HH:mm") private Date horaFimEmbarque; - + @Transient @NaoAuditar private Empresa empresaClone; @@ -1550,7 +1550,7 @@ public class Empresa implements Serializable, Auditavel { public void setIndCheckinBloqueadoRemarcacao(Boolean indCheckinBloqueadoRemarcacao) { this.indCheckinBloqueadoRemarcacao = indCheckinBloqueadoRemarcacao; - } + } public Boolean getIndAgrupLocConexao() { return indAgrupLocConexao!=null ? indAgrupLocConexao : Boolean.FALSE; @@ -1559,7 +1559,7 @@ public class Empresa implements Serializable, Auditavel { public void setIndAgrupLocConexao(Boolean indAgrupLocConexao) { this.indAgrupLocConexao = indAgrupLocConexao; } - + public Boolean getIndLimitaCategoriaPorCorrida() { return IndLimitaCategoriaPorCorrida; diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java index 3024de118..b7bae505b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java @@ -1,145 +1,145 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "EMPRESA_ADYEN_CONFIG_SEQ", sequenceName = "EMPRESA_ADYEN_CONFIG_SEQ", allocationSize = 1) -@Table(name = "EMPRESA_ADYEN_CONFIG") -public class EmpresaAdyenConfig implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_ADYEN_CONFIG_SEQ") - @Column(name = "EMPRESAADYENCONFIG_ID") - private Integer empresaAdyenConfigId; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "APIKEY") - private String apiKey; - @Column(name = "INDPRODUCAO") - private Boolean indProducao; - @Column(name = "MERCHANTACCOUNTADYEN") - private String merchantAccountAdyen; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public EmpresaAdyenConfig() { - - } - - public Integer getEmpresaAdyenConfigId() { - return empresaAdyenConfigId; - } - - public void setEmpresaAdyenConfigId(Integer empresaAdyenConfigId) { - this.empresaAdyenConfigId = empresaAdyenConfigId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public String getApiKey() { - return apiKey; - } - - public void setApiKey(String apiKey) { - this.apiKey = apiKey; - } - - public Boolean getIndProducao() { - return indProducao; - } - - public void setIndProducao(Boolean indProducao) { - this.indProducao = indProducao; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getMerchantAccountAdyen() { - return merchantAccountAdyen; - } - - public void setMerchantAccountAdyen(String merchantAccountAdyen) { - this.merchantAccountAdyen = merchantAccountAdyen; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((empresaAdyenConfigId == null) ? 0 : empresaAdyenConfigId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EmpresaAdyenConfig other = (EmpresaAdyenConfig) obj; - if (empresaAdyenConfigId == null) { - if (other.empresaAdyenConfigId != null) - return false; - } else if (!empresaAdyenConfigId.equals(other.empresaAdyenConfigId)) - return false; - return true; - } - - @Override - public String toString() { - return String.valueOf(this.getEmpresaAdyenConfigId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "EMPRESA_ADYEN_CONFIG_SEQ", sequenceName = "EMPRESA_ADYEN_CONFIG_SEQ", allocationSize = 1) +@Table(name = "EMPRESA_ADYEN_CONFIG") +public class EmpresaAdyenConfig implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_ADYEN_CONFIG_SEQ") + @Column(name = "EMPRESAADYENCONFIG_ID") + private Integer empresaAdyenConfigId; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "APIKEY") + private String apiKey; + @Column(name = "INDPRODUCAO") + private Boolean indProducao; + @Column(name = "MERCHANTACCOUNTADYEN") + private String merchantAccountAdyen; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public EmpresaAdyenConfig() { + + } + + public Integer getEmpresaAdyenConfigId() { + return empresaAdyenConfigId; + } + + public void setEmpresaAdyenConfigId(Integer empresaAdyenConfigId) { + this.empresaAdyenConfigId = empresaAdyenConfigId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public Boolean getIndProducao() { + return indProducao; + } + + public void setIndProducao(Boolean indProducao) { + this.indProducao = indProducao; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getMerchantAccountAdyen() { + return merchantAccountAdyen; + } + + public void setMerchantAccountAdyen(String merchantAccountAdyen) { + this.merchantAccountAdyen = merchantAccountAdyen; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((empresaAdyenConfigId == null) ? 0 : empresaAdyenConfigId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EmpresaAdyenConfig other = (EmpresaAdyenConfig) obj; + if (empresaAdyenConfigId == null) { + if (other.empresaAdyenConfigId != null) + return false; + } else if (!empresaAdyenConfigId.equals(other.empresaAdyenConfigId)) + return false; + return true; + } + + @Override + public String toString() { + return String.valueOf(this.getEmpresaAdyenConfigId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaAsistenciaDeViajeConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaAsistenciaDeViajeConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaAsistenciaDeViajeConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaAsistenciaDeViajeConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaCertificadoConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaCertificadoConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaCertificadoConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaCertificadoConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaCieloLinkConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaCieloLinkConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaCieloLinkConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaCieloLinkConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaComprovantePassagemConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaComprovantePassagemConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaComprovantePassagemConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaComprovantePassagemConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaConfigLayout.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaConfigLayout.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaConfigLayout.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaConfigLayout.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java index 87a00cb7b..7c4424ce7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java @@ -1,161 +1,161 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name="EMPRESA_CONTABANCARIA_SEQ", sequenceName="EMPRESA_CONTABANCARIA_SEQ", allocationSize=1) -@Table(name="EMPRESA_CONTABANCARIA") -public class EmpresaContaBancaria implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer empresaContaBancariaId; - private Empresa empresa; - private InstiFinanceira instituicaoFinandeira; - private String numConta; - private String numAgencia; - private String numIntegracion; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_CONTABANCARIA_SEQ") - @Column(name = "EMPRESACONTABANCARIA_ID") - public Integer getEmpresaContaBancariaId() { - return empresaContaBancariaId; - } - - public void setEmpresaContaBancariaId(Integer empresaContaBancariaId) { - this.empresaContaBancariaId = empresaContaBancariaId; - } - - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @JoinColumn(name = "INSTIFINANCEIRA_ID", referencedColumnName = "INSTIFINANCEIRA_ID") - @ManyToOne - public InstiFinanceira getInstituicaoFinandeira() { - return instituicaoFinandeira; - } - - public void setInstituicaoFinandeira(InstiFinanceira instituicaoFinandeira) { - this.instituicaoFinandeira = instituicaoFinandeira; - } - - @Column(name = "NUMCONTA") - public String getNumConta() { - return numConta; - } - - public void setNumConta(String numConta) { - this.numConta = numConta; - } - - @Column(name = "NUMAGENCIA") - public String getNumAgencia() { - return numAgencia; - } - - public void setNumAgencia(String numAgencia) { - this.numAgencia = numAgencia; - } - - @Column(name = "ACTIVO") - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID") - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Column(name = "NUMINTEGRACION") - public String getNumIntegracion() { - return numIntegracion; - } - - public void setNumIntegracion(String numIntegracion) { - this.numIntegracion = numIntegracion; - } - - @Override - public boolean equals(Object old) { - - if (!(old instanceof EmpresaContaBancaria)) { - return false; - } - - EmpresaContaBancaria oldObject = (EmpresaContaBancaria) old; - - if(this.getInstituicaoFinandeira().equals(oldObject.getInstituicaoFinandeira()) && - this.getNumAgencia().equals(oldObject.getNumAgencia()) && this.getNumConta().equals(oldObject.getNumConta()) && - (this.getNumIntegracion() != null && this.getNumIntegracion().equals(oldObject.getNumIntegracion())) && - this.getActivo().equals(oldObject.getActivo())) { - return true; - } - - if(this.empresaContaBancariaId == null && oldObject.empresaContaBancariaId == null) { - return false; - } - - if ((this.empresaContaBancariaId == null && oldObject.empresaContaBancariaId != null) || (this.empresaContaBancariaId != null && !this.empresaContaBancariaId.equals(oldObject.empresaContaBancariaId))) { - return false; - } - - return Boolean.TRUE; - } - - @Override - public String toString() { - return getNumConta() + " - " + getNumAgencia() + " - " + getNumIntegracion() + " - " + getInstituicaoFinandeira().getNome(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (empresaContaBancariaId != null ? empresaContaBancariaId.hashCode() : 0); - return hash; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name="EMPRESA_CONTABANCARIA_SEQ", sequenceName="EMPRESA_CONTABANCARIA_SEQ", allocationSize=1) +@Table(name="EMPRESA_CONTABANCARIA") +public class EmpresaContaBancaria implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer empresaContaBancariaId; + private Empresa empresa; + private InstiFinanceira instituicaoFinandeira; + private String numConta; + private String numAgencia; + private String numIntegracion; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_CONTABANCARIA_SEQ") + @Column(name = "EMPRESACONTABANCARIA_ID") + public Integer getEmpresaContaBancariaId() { + return empresaContaBancariaId; + } + + public void setEmpresaContaBancariaId(Integer empresaContaBancariaId) { + this.empresaContaBancariaId = empresaContaBancariaId; + } + + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @JoinColumn(name = "INSTIFINANCEIRA_ID", referencedColumnName = "INSTIFINANCEIRA_ID") + @ManyToOne + public InstiFinanceira getInstituicaoFinandeira() { + return instituicaoFinandeira; + } + + public void setInstituicaoFinandeira(InstiFinanceira instituicaoFinandeira) { + this.instituicaoFinandeira = instituicaoFinandeira; + } + + @Column(name = "NUMCONTA") + public String getNumConta() { + return numConta; + } + + public void setNumConta(String numConta) { + this.numConta = numConta; + } + + @Column(name = "NUMAGENCIA") + public String getNumAgencia() { + return numAgencia; + } + + public void setNumAgencia(String numAgencia) { + this.numAgencia = numAgencia; + } + + @Column(name = "ACTIVO") + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID") + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Column(name = "NUMINTEGRACION") + public String getNumIntegracion() { + return numIntegracion; + } + + public void setNumIntegracion(String numIntegracion) { + this.numIntegracion = numIntegracion; + } + + @Override + public boolean equals(Object old) { + + if (!(old instanceof EmpresaContaBancaria)) { + return false; + } + + EmpresaContaBancaria oldObject = (EmpresaContaBancaria) old; + + if(this.getInstituicaoFinandeira().equals(oldObject.getInstituicaoFinandeira()) && + this.getNumAgencia().equals(oldObject.getNumAgencia()) && this.getNumConta().equals(oldObject.getNumConta()) && + (this.getNumIntegracion() != null && this.getNumIntegracion().equals(oldObject.getNumIntegracion())) && + this.getActivo().equals(oldObject.getActivo())) { + return true; + } + + if(this.empresaContaBancariaId == null && oldObject.empresaContaBancariaId == null) { + return false; + } + + if ((this.empresaContaBancariaId == null && oldObject.empresaContaBancariaId != null) || (this.empresaContaBancariaId != null && !this.empresaContaBancariaId.equals(oldObject.empresaContaBancariaId))) { + return false; + } + + return Boolean.TRUE; + } + + @Override + public String toString() { + return getNumConta() + " - " + getNumAgencia() + " - " + getNumIntegracion() + " - " + getInstituicaoFinandeira().getNome(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (empresaContaBancariaId != null ? empresaContaBancariaId.hashCode() : 0); + return hash; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaCrediBancoConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaCrediBancoConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaCrediBancoConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaCrediBancoConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmail.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmail.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaEmail.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmail.java index 845412fce..49b42675d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmail.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmail.java @@ -1,196 +1,196 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "EMPRESA_EMAIL_SEQ", sequenceName = "EMPRESA_EMAIL_SEQ", allocationSize = 1) -@Table(name = "EMPRESA_EMAIL") -public class EmpresaEmail implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_EMAIL_SEQ") - @Column(name = "EMPRESAEMAIL_ID") - private Integer empresaEmailId; - @Column(name = "TEXTOEMAIL") - private String textoEmail; - @Column(name = "TEXTOEMAILFISCAL") - private String textoEmailFiscal; - @Column(name = "TEXTOCUPOMEMBARQUE") - private String textoCupomEmbarque; - @Column(name = "ASSUNTO") - private String assunto; - @Column(name = "ASSUNTOFISCAL") - private String assuntoFiscal; - @Column(name = "EMAILDE") - private String emailDe; - @Column(name = "EMAILCOPIAOCULTA") - private String emailCopiaOculta; - @Column(name = "DESTINATARIO") - private String destinatario; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public EmpresaEmail() { - - } - - public Integer getEmpresaEmailId() { - return empresaEmailId; - } - - public void setEmpresaEmailId(Integer empresaEmailId) { - this.empresaEmailId = empresaEmailId; - } - - public String getTextoEmail() { - return textoEmail; - } - - public void setTextoEmail(String textoEmail) { - this.textoEmail = textoEmail; - } - - public String getTextoCupomEmbarque() { - return textoCupomEmbarque; - } - - public void setTextoCupomEmbarque(String textoCupomEmbarque) { - this.textoCupomEmbarque = textoCupomEmbarque; - } - - public String getTextoEmailFiscal() { - return textoEmailFiscal; - } - - public void setTextoEmailFiscal(String textoEmailFiscal) { - this.textoEmailFiscal = textoEmailFiscal; - } - - public String getAssunto() { - return assunto; - } - - public void setAssunto(String assunto) { - this.assunto = assunto; - } - - public String getAssuntoFiscal() { - return assuntoFiscal; - } - - public void setAssuntoFiscal(String assuntoFiscal) { - this.assuntoFiscal = assuntoFiscal; - } - - public String getEmailDe() { - return emailDe; - } - - public String getEmailCopiaOculta() { - return emailCopiaOculta; - } - - public void setEmailCopiaOculta(String emailCopiaOculta) { - this.emailCopiaOculta = emailCopiaOculta; - } - - public String getDestinatario() { - return destinatario; - } - - public void setDestinatario(String destinatario) { - this.destinatario = destinatario; - } - - public void setEmailDe(String emailDe) { - this.emailDe = emailDe; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((empresaEmailId == null) ? 0 : empresaEmailId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EmpresaEmail other = (EmpresaEmail) obj; - if (empresaEmailId == null) { - if (other.empresaEmailId != null) - return false; - } else if (!empresaEmailId.equals(other.empresaEmailId)) - return false; - return true; - } - - @Override - public String toString() { - return String.valueOf(this.getEmpresaEmailId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "EMPRESA_EMAIL_SEQ", sequenceName = "EMPRESA_EMAIL_SEQ", allocationSize = 1) +@Table(name = "EMPRESA_EMAIL") +public class EmpresaEmail implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_EMAIL_SEQ") + @Column(name = "EMPRESAEMAIL_ID") + private Integer empresaEmailId; + @Column(name = "TEXTOEMAIL") + private String textoEmail; + @Column(name = "TEXTOEMAILFISCAL") + private String textoEmailFiscal; + @Column(name = "TEXTOCUPOMEMBARQUE") + private String textoCupomEmbarque; + @Column(name = "ASSUNTO") + private String assunto; + @Column(name = "ASSUNTOFISCAL") + private String assuntoFiscal; + @Column(name = "EMAILDE") + private String emailDe; + @Column(name = "EMAILCOPIAOCULTA") + private String emailCopiaOculta; + @Column(name = "DESTINATARIO") + private String destinatario; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public EmpresaEmail() { + + } + + public Integer getEmpresaEmailId() { + return empresaEmailId; + } + + public void setEmpresaEmailId(Integer empresaEmailId) { + this.empresaEmailId = empresaEmailId; + } + + public String getTextoEmail() { + return textoEmail; + } + + public void setTextoEmail(String textoEmail) { + this.textoEmail = textoEmail; + } + + public String getTextoCupomEmbarque() { + return textoCupomEmbarque; + } + + public void setTextoCupomEmbarque(String textoCupomEmbarque) { + this.textoCupomEmbarque = textoCupomEmbarque; + } + + public String getTextoEmailFiscal() { + return textoEmailFiscal; + } + + public void setTextoEmailFiscal(String textoEmailFiscal) { + this.textoEmailFiscal = textoEmailFiscal; + } + + public String getAssunto() { + return assunto; + } + + public void setAssunto(String assunto) { + this.assunto = assunto; + } + + public String getAssuntoFiscal() { + return assuntoFiscal; + } + + public void setAssuntoFiscal(String assuntoFiscal) { + this.assuntoFiscal = assuntoFiscal; + } + + public String getEmailDe() { + return emailDe; + } + + public String getEmailCopiaOculta() { + return emailCopiaOculta; + } + + public void setEmailCopiaOculta(String emailCopiaOculta) { + this.emailCopiaOculta = emailCopiaOculta; + } + + public String getDestinatario() { + return destinatario; + } + + public void setDestinatario(String destinatario) { + this.destinatario = destinatario; + } + + public void setEmailDe(String emailDe) { + this.emailDe = emailDe; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((empresaEmailId == null) ? 0 : empresaEmailId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EmpresaEmail other = (EmpresaEmail) obj; + if (empresaEmailId == null) { + if (other.empresaEmailId != null) + return false; + } else if (!empresaEmailId.equals(other.empresaEmailId)) + return false; + return true; + } + + @Override + public String toString() { + return String.valueOf(this.getEmpresaEmailId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java index abba3426c..bfd623d7d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailConfig.java @@ -1,178 +1,178 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.apache.commons.lang.BooleanUtils; - -@Entity -@SequenceGenerator(name = "EMPRESA_EMAIL_CONFIG_SEQ", sequenceName = "EMPRESA_EMAIL_CONFIG_SEQ", allocationSize = 1) -@Table(name = "EMPRESA_EMAIL_CONFIG") -public class EmpresaEmailConfig implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_EMAIL_CONFIG_SEQ") - @Column(name = "EMPRESAEMAILCONFIG_ID") - private Integer empresaEmailConfigId; - @Column(name = "SMTP") - private String smtp; - @Column(name = "SENHA") - private String senha; - @Column(name = "SMTPPORTA") - private String smtpPorta; - @Column(name = "SMTPEMAIL") - private String smtpEmail; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "INDAUTENTICACAO") - private Boolean indAutenticacao; - @Column(name = "TIPOAUTORIZACAO") - private String tipoAutorizacao; - - public EmpresaEmailConfig() { - - } - - public Integer getEmpresaEmailConfigId() { - return empresaEmailConfigId; - } - - public void setEmpresaEmailConfigId(Integer empresaEmailConfigId) { - this.empresaEmailConfigId = empresaEmailConfigId; - } - - public String getSmtp() { - return smtp; - } - - public void setSmtp(String smtp) { - this.smtp = smtp; - } - - public String getSenha() { - return senha; - } - - public void setSenha(String senha) { - this.senha = senha; - } - - public String getSmtpPorta() { - return smtpPorta; - } - - public void setSmtpPorta(String smtpPorta) { - this.smtpPorta = smtpPorta; - } - - public String getSmtpEmail() { - return smtpEmail; - } - - public void setSmtpEmail(String smtpEmail) { - this.smtpEmail = smtpEmail; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndAutenticacao() { - return BooleanUtils.toBooleanDefaultIfNull(indAutenticacao, true) ; - } - - public void setIndAutenticacao(Boolean indAutenticacao) { - this.indAutenticacao = indAutenticacao; - } - - public String getTipoAutorizacao() { - return tipoAutorizacao; - } - - public void setTipoAutorizacao(String tipoAutorizacao) { - this.tipoAutorizacao = tipoAutorizacao; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((empresaEmailConfigId == null) ? 0 : empresaEmailConfigId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EmpresaEmailConfig other = (EmpresaEmailConfig) obj; - if (empresaEmailConfigId == null) { - if (other.empresaEmailConfigId != null) - return false; - } else if (!empresaEmailConfigId.equals(other.empresaEmailConfigId)) - return false; - return true; - } - - @Override - public String toString() { - return String.valueOf(this.getEmpresaEmailConfigId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.apache.commons.lang.BooleanUtils; + +@Entity +@SequenceGenerator(name = "EMPRESA_EMAIL_CONFIG_SEQ", sequenceName = "EMPRESA_EMAIL_CONFIG_SEQ", allocationSize = 1) +@Table(name = "EMPRESA_EMAIL_CONFIG") +public class EmpresaEmailConfig implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_EMAIL_CONFIG_SEQ") + @Column(name = "EMPRESAEMAILCONFIG_ID") + private Integer empresaEmailConfigId; + @Column(name = "SMTP") + private String smtp; + @Column(name = "SENHA") + private String senha; + @Column(name = "SMTPPORTA") + private String smtpPorta; + @Column(name = "SMTPEMAIL") + private String smtpEmail; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "INDAUTENTICACAO") + private Boolean indAutenticacao; + @Column(name = "TIPOAUTORIZACAO") + private String tipoAutorizacao; + + public EmpresaEmailConfig() { + + } + + public Integer getEmpresaEmailConfigId() { + return empresaEmailConfigId; + } + + public void setEmpresaEmailConfigId(Integer empresaEmailConfigId) { + this.empresaEmailConfigId = empresaEmailConfigId; + } + + public String getSmtp() { + return smtp; + } + + public void setSmtp(String smtp) { + this.smtp = smtp; + } + + public String getSenha() { + return senha; + } + + public void setSenha(String senha) { + this.senha = senha; + } + + public String getSmtpPorta() { + return smtpPorta; + } + + public void setSmtpPorta(String smtpPorta) { + this.smtpPorta = smtpPorta; + } + + public String getSmtpEmail() { + return smtpEmail; + } + + public void setSmtpEmail(String smtpEmail) { + this.smtpEmail = smtpEmail; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndAutenticacao() { + return BooleanUtils.toBooleanDefaultIfNull(indAutenticacao, true) ; + } + + public void setIndAutenticacao(Boolean indAutenticacao) { + this.indAutenticacao = indAutenticacao; + } + + public String getTipoAutorizacao() { + return tipoAutorizacao; + } + + public void setTipoAutorizacao(String tipoAutorizacao) { + this.tipoAutorizacao = tipoAutorizacao; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((empresaEmailConfigId == null) ? 0 : empresaEmailConfigId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EmpresaEmailConfig other = (EmpresaEmailConfig) obj; + if (empresaEmailConfigId == null) { + if (other.empresaEmailConfigId != null) + return false; + } else if (!empresaEmailConfigId.equals(other.empresaEmailConfigId)) + return false; + return true; + } + + @Override + public String toString() { + return String.valueOf(this.getEmpresaEmailConfigId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailEComerce.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailEComerce.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailEComerce.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailEComerce.java index 6c2ed5749..b8a39aae0 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailEComerce.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailEComerce.java @@ -1,248 +1,248 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "EMPRESA_EMAIL_ECOMERCE_SEQ", sequenceName = "EMPRESA_EMAIL_ECOMERCE_SEQ", allocationSize = 1) -@Table(name = "EMPRESA_EMAIL_ECOMERCE") -public class EmpresaEmailEComerce implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_EMAIL_ECOMERCE_SEQ") - @Column(name = "EMPRESAEMAILECOMERCE_ID") - private Integer empresaEmailEComerceId; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "SMTP") - private String smtp; - @Column(name = "SENHA") - private String senha; - @Column(name = "SMTPPORTA") - private String smtpPorta; - @Column(name = "SMTPEMAIL") - private String smtpEmail; - @Column(name = "TEXTOEMAIL") - private String textoEmail; - @Column(name = "TEXTOCUPOMEMBARQUE") - private String textoCupomEmbarque; - @Column(name = "ASSUNTO") - private String assunto; - @Column(name = "EMAILDE") - private String emailDe; - @Column(name = "EMAILCOPIAOCULTA") - private String emailCopiaOculta; - @Column(name = "TIPOOPERACAO") - private String tipoOperacao; - @Column(name = "TIPOAUTORIZACAO") - private String tipoAutorizacao; - @Column(name = "INDAUTENTICACAO") - private Boolean indAutenticacao; - - @Column(name = "ANEXO1") - private String anexo1; - - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public EmpresaEmailEComerce() { - - } - - public Integer getEmpresaEmailEComerceId() { - return empresaEmailEComerceId; - } - - public void setEmpresaEmailEComerceId(Integer empresaEmailEComerceId) { - this.empresaEmailEComerceId = empresaEmailEComerceId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public String getSmtp() { - return smtp; - } - - public void setSmtp(String smtp) { - this.smtp = smtp; - } - - public String getSenha() { - return senha; - } - - public void setSenha(String senha) { - this.senha = senha; - } - - public String getSmtpPorta() { - return smtpPorta; - } - - public void setSmtpPorta(String smtpPorta) { - this.smtpPorta = smtpPorta; - } - - public String getSmtpEmail() { - return smtpEmail; - } - - public void setSmtpEmail(String smtpEmail) { - this.smtpEmail = smtpEmail; - } - - public String getTextoEmail() { - return textoEmail; - } - - public void setTextoEmail(String textoEmail) { - this.textoEmail = textoEmail; - } - - public String getTextoCupomEmbarque() { - return textoCupomEmbarque; - } - - public void setTextoCupomEmbarque(String textoCupomEmbarque) { - this.textoCupomEmbarque = textoCupomEmbarque; - } - - public String getAssunto() { - return assunto; - } - - public void setAssunto(String assunto) { - this.assunto = assunto; - } - - public String getEmailDe() { - return emailDe; - } - - public void setEmailDe(String emailDe) { - this.emailDe = emailDe; - } - - public String getEmailCopiaOculta() { - return emailCopiaOculta; - } - - public void setEmailCopiaOculta(String emailCopiaOculta) { - this.emailCopiaOculta = emailCopiaOculta; - } - - public String getTipoOperacao() { - return tipoOperacao; - } - - public void setTipoOperacao(String tipoOperacao) { - this.tipoOperacao = tipoOperacao; - } - - public String getTipoAutorizacao() { - return tipoAutorizacao; - } - - public void setTipoAutorizacao(String tipoAutorizacao) { - this.tipoAutorizacao = tipoAutorizacao; - } - - public Boolean getIndAutenticacao() { - return indAutenticacao; - } - - public void setIndAutenticacao(Boolean indAutenticacao) { - this.indAutenticacao = indAutenticacao; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getAnexo1() { - return anexo1; - } - - public void setAnexo1(String anexo1) { - this.anexo1 = anexo1; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((empresaEmailEComerceId == null) ? 0 : empresaEmailEComerceId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EmpresaEmailEComerce other = (EmpresaEmailEComerce) obj; - if (empresaEmailEComerceId == null) { - if (other.empresaEmailEComerceId != null) - return false; - } else if (!empresaEmailEComerceId.equals(other.empresaEmailEComerceId)) - return false; - return true; - } - - @Override - public String toString() { - return String.valueOf(this.getEmpresaEmailEComerceId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "EMPRESA_EMAIL_ECOMERCE_SEQ", sequenceName = "EMPRESA_EMAIL_ECOMERCE_SEQ", allocationSize = 1) +@Table(name = "EMPRESA_EMAIL_ECOMERCE") +public class EmpresaEmailEComerce implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_EMAIL_ECOMERCE_SEQ") + @Column(name = "EMPRESAEMAILECOMERCE_ID") + private Integer empresaEmailEComerceId; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "SMTP") + private String smtp; + @Column(name = "SENHA") + private String senha; + @Column(name = "SMTPPORTA") + private String smtpPorta; + @Column(name = "SMTPEMAIL") + private String smtpEmail; + @Column(name = "TEXTOEMAIL") + private String textoEmail; + @Column(name = "TEXTOCUPOMEMBARQUE") + private String textoCupomEmbarque; + @Column(name = "ASSUNTO") + private String assunto; + @Column(name = "EMAILDE") + private String emailDe; + @Column(name = "EMAILCOPIAOCULTA") + private String emailCopiaOculta; + @Column(name = "TIPOOPERACAO") + private String tipoOperacao; + @Column(name = "TIPOAUTORIZACAO") + private String tipoAutorizacao; + @Column(name = "INDAUTENTICACAO") + private Boolean indAutenticacao; + + @Column(name = "ANEXO1") + private String anexo1; + + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public EmpresaEmailEComerce() { + + } + + public Integer getEmpresaEmailEComerceId() { + return empresaEmailEComerceId; + } + + public void setEmpresaEmailEComerceId(Integer empresaEmailEComerceId) { + this.empresaEmailEComerceId = empresaEmailEComerceId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public String getSmtp() { + return smtp; + } + + public void setSmtp(String smtp) { + this.smtp = smtp; + } + + public String getSenha() { + return senha; + } + + public void setSenha(String senha) { + this.senha = senha; + } + + public String getSmtpPorta() { + return smtpPorta; + } + + public void setSmtpPorta(String smtpPorta) { + this.smtpPorta = smtpPorta; + } + + public String getSmtpEmail() { + return smtpEmail; + } + + public void setSmtpEmail(String smtpEmail) { + this.smtpEmail = smtpEmail; + } + + public String getTextoEmail() { + return textoEmail; + } + + public void setTextoEmail(String textoEmail) { + this.textoEmail = textoEmail; + } + + public String getTextoCupomEmbarque() { + return textoCupomEmbarque; + } + + public void setTextoCupomEmbarque(String textoCupomEmbarque) { + this.textoCupomEmbarque = textoCupomEmbarque; + } + + public String getAssunto() { + return assunto; + } + + public void setAssunto(String assunto) { + this.assunto = assunto; + } + + public String getEmailDe() { + return emailDe; + } + + public void setEmailDe(String emailDe) { + this.emailDe = emailDe; + } + + public String getEmailCopiaOculta() { + return emailCopiaOculta; + } + + public void setEmailCopiaOculta(String emailCopiaOculta) { + this.emailCopiaOculta = emailCopiaOculta; + } + + public String getTipoOperacao() { + return tipoOperacao; + } + + public void setTipoOperacao(String tipoOperacao) { + this.tipoOperacao = tipoOperacao; + } + + public String getTipoAutorizacao() { + return tipoAutorizacao; + } + + public void setTipoAutorizacao(String tipoAutorizacao) { + this.tipoAutorizacao = tipoAutorizacao; + } + + public Boolean getIndAutenticacao() { + return indAutenticacao; + } + + public void setIndAutenticacao(Boolean indAutenticacao) { + this.indAutenticacao = indAutenticacao; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getAnexo1() { + return anexo1; + } + + public void setAnexo1(String anexo1) { + this.anexo1 = anexo1; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((empresaEmailEComerceId == null) ? 0 : empresaEmailEComerceId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EmpresaEmailEComerce other = (EmpresaEmailEComerce) obj; + if (empresaEmailEComerceId == null) { + if (other.empresaEmailEComerceId != null) + return false; + } else if (!empresaEmailEComerceId.equals(other.empresaEmailEComerceId)) + return false; + return true; + } + + @Override + public String toString() { + return String.valueOf(this.getEmpresaEmailEComerceId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java index 874d6449f..92f16acd9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEmailFlexBus.java @@ -1,232 +1,232 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.apache.commons.lang.BooleanUtils; - -@Entity -@SequenceGenerator(name = "EMP_EMAIL_FLEXBUS_SEQ", sequenceName = "EMP_EMAIL_FLEXBUS_SEQ", allocationSize = 1) -@Table(name = "EMPRESA_EMAIL_FLEXBUS") -public class EmpresaEmailFlexBus implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMP_EMAIL_FLEXBUS_SEQ") - @Column(name = "EMPRESAEMAILFLEXBUS_ID") - private Integer empresaEmailFlexBusId; - - @Column(name = "SMTP") - private String smtp; - - @Column(name = "SENHA") - private String senha; - - @Column(name = "SMTPPORTA") - private String smtpPorta; - - @Column(name = "SMTPEMAIL") - private String smtpEmail; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "INDAUTENTICACAO") - private Boolean indAutenticacao; - - @Column(name = "TEXTOEMAIL") - private String textoEmail; - - @Column(name = "ASSUNTO") - private String assunto; - - @Column(name = "EMAILDE") - private String emailDe; - - @Column(name = "EMAILCOPIAOCULTA") - private String emailCopiaOculta; - - @Column(name = "TIPOAUTORIZACAO") - private String tipoAutorizacao; - - public EmpresaEmailFlexBus() { - - } - - public Integer getEmpresaEmailFlexBusId() { - return empresaEmailFlexBusId; - } - - public void setEmpresaEmailFlexBusId(Integer empresaEmailFlexBusId) { - this.empresaEmailFlexBusId = empresaEmailFlexBusId; - } - - public String getSmtp() { - return smtp; - } - - public void setSmtp(String smtp) { - this.smtp = smtp; - } - - public String getSenha() { - return senha; - } - - public void setSenha(String senha) { - this.senha = senha; - } - - public String getSmtpPorta() { - return smtpPorta; - } - - public void setSmtpPorta(String smtpPorta) { - this.smtpPorta = smtpPorta; - } - - public String getSmtpEmail() { - return smtpEmail; - } - - public void setSmtpEmail(String smtpEmail) { - this.smtpEmail = smtpEmail; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndAutenticacao() { - return BooleanUtils.toBooleanDefaultIfNull(indAutenticacao, true) ; - } - - public void setIndAutenticacao(Boolean indAutenticacao) { - this.indAutenticacao = indAutenticacao; - } - - public String getTextoEmail() { - return textoEmail; - } - - public void setTextoEmail(String textoEmail) { - this.textoEmail = textoEmail; - } - - public String getAssunto() { - return assunto; - } - - public void setAssunto(String assunto) { - this.assunto = assunto; - } - - public String getEmailDe() { - return emailDe; - } - - public void setEmailDe(String emailDe) { - this.emailDe = emailDe; - } - - public String getEmailCopiaOculta() { - return emailCopiaOculta; - } - - public void setEmailCopiaOculta(String emailCopiaOculta) { - this.emailCopiaOculta = emailCopiaOculta; - } - - public String getTipoAutorizacao() { - return tipoAutorizacao; - } - - public void setTipoAutorizacao(String tipoAutorizacao) { - this.tipoAutorizacao = tipoAutorizacao; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((empresaEmailFlexBusId == null) ? 0 : empresaEmailFlexBusId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EmpresaEmailFlexBus other = (EmpresaEmailFlexBus) obj; - if (empresaEmailFlexBusId == null) { - if (other.empresaEmailFlexBusId != null) - return false; - } else if (!empresaEmailFlexBusId.equals(other.empresaEmailFlexBusId)) - return false; - return true; - } - - @Override - public String toString() { - return String.valueOf(this.getEmpresaEmailFlexBusId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.apache.commons.lang.BooleanUtils; + +@Entity +@SequenceGenerator(name = "EMP_EMAIL_FLEXBUS_SEQ", sequenceName = "EMP_EMAIL_FLEXBUS_SEQ", allocationSize = 1) +@Table(name = "EMPRESA_EMAIL_FLEXBUS") +public class EmpresaEmailFlexBus implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMP_EMAIL_FLEXBUS_SEQ") + @Column(name = "EMPRESAEMAILFLEXBUS_ID") + private Integer empresaEmailFlexBusId; + + @Column(name = "SMTP") + private String smtp; + + @Column(name = "SENHA") + private String senha; + + @Column(name = "SMTPPORTA") + private String smtpPorta; + + @Column(name = "SMTPEMAIL") + private String smtpEmail; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "INDAUTENTICACAO") + private Boolean indAutenticacao; + + @Column(name = "TEXTOEMAIL") + private String textoEmail; + + @Column(name = "ASSUNTO") + private String assunto; + + @Column(name = "EMAILDE") + private String emailDe; + + @Column(name = "EMAILCOPIAOCULTA") + private String emailCopiaOculta; + + @Column(name = "TIPOAUTORIZACAO") + private String tipoAutorizacao; + + public EmpresaEmailFlexBus() { + + } + + public Integer getEmpresaEmailFlexBusId() { + return empresaEmailFlexBusId; + } + + public void setEmpresaEmailFlexBusId(Integer empresaEmailFlexBusId) { + this.empresaEmailFlexBusId = empresaEmailFlexBusId; + } + + public String getSmtp() { + return smtp; + } + + public void setSmtp(String smtp) { + this.smtp = smtp; + } + + public String getSenha() { + return senha; + } + + public void setSenha(String senha) { + this.senha = senha; + } + + public String getSmtpPorta() { + return smtpPorta; + } + + public void setSmtpPorta(String smtpPorta) { + this.smtpPorta = smtpPorta; + } + + public String getSmtpEmail() { + return smtpEmail; + } + + public void setSmtpEmail(String smtpEmail) { + this.smtpEmail = smtpEmail; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndAutenticacao() { + return BooleanUtils.toBooleanDefaultIfNull(indAutenticacao, true) ; + } + + public void setIndAutenticacao(Boolean indAutenticacao) { + this.indAutenticacao = indAutenticacao; + } + + public String getTextoEmail() { + return textoEmail; + } + + public void setTextoEmail(String textoEmail) { + this.textoEmail = textoEmail; + } + + public String getAssunto() { + return assunto; + } + + public void setAssunto(String assunto) { + this.assunto = assunto; + } + + public String getEmailDe() { + return emailDe; + } + + public void setEmailDe(String emailDe) { + this.emailDe = emailDe; + } + + public String getEmailCopiaOculta() { + return emailCopiaOculta; + } + + public void setEmailCopiaOculta(String emailCopiaOculta) { + this.emailCopiaOculta = emailCopiaOculta; + } + + public String getTipoAutorizacao() { + return tipoAutorizacao; + } + + public void setTipoAutorizacao(String tipoAutorizacao) { + this.tipoAutorizacao = tipoAutorizacao; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((empresaEmailFlexBusId == null) ? 0 : empresaEmailFlexBusId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EmpresaEmailFlexBus other = (EmpresaEmailFlexBus) obj; + if (empresaEmailFlexBusId == null) { + if (other.empresaEmailFlexBusId != null) + return false; + } else if (!empresaEmailFlexBusId.equals(other.empresaEmailFlexBusId)) + return false; + return true; + } + + @Override + public String toString() { + return String.valueOf(this.getEmpresaEmailFlexBusId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaEquivalencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEquivalencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaEquivalencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaEquivalencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaImposto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaImposto.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaImposto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaImposto.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaIziPayConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaIziPayConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaIziPayConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaIziPayConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaMercadoPagoConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaMercadoPagoConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaMercadoPagoConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaMercadoPagoConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaNequiConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaNequiConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaNequiConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaNequiConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaPMArtespConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaPMArtespConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaPMArtespConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaPMArtespConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaRecargaConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaRecargaConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaRecargaConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaRecargaConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaSaferConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaSaferConfig.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaSaferConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaSaferConfig.java index 9f04461c2..3e622ac64 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaSaferConfig.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaSaferConfig.java @@ -1,157 +1,157 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "EMPRESA_SAFER_CONFIG_SEQ", sequenceName = "EMPRESA_SAFER_CONFIG_SEQ", allocationSize = 1) -@Table(name = "EMPRESA_SAFER_CONFIG") -public class EmpresaSaferConfig implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_SAFER_CONFIG_SEQ") - @Column(name = "EMPRESASAFERCONFIG_ID") - private Integer empresaSaferConfigId; - @Column(name = "PARTNERID") - private String partnerId; - @Column(name = "CONTRACTID") - private String contractId; - @Column(name = "SENHA") - private String senha; - @Column(name = "CERTIFICADO") - private byte[] certificado; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public EmpresaSaferConfig() { - - } - - public Integer getEmpresaSaferConfigId() { - return empresaSaferConfigId; - } - - public void setEmpresaSaferConfigId(Integer empresaSaferConfigId) { - this.empresaSaferConfigId = empresaSaferConfigId; - } - - public String getPartnerId() { - return partnerId; - } - - public void setPartnerId(String partnerId) { - this.partnerId = partnerId; - } - - public String getContractId() { - return contractId; - } - - public void setContractId(String contractId) { - this.contractId = contractId; - } - - public String getSenha() { - return senha; - } - - public void setSenha(String senha) { - this.senha = senha; - } - - public byte[] getCertificado() { - return certificado; - } - - public void setCertificado(byte[] certificado) { - this.certificado = certificado; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((empresaSaferConfigId == null) ? 0 : empresaSaferConfigId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EmpresaSaferConfig other = (EmpresaSaferConfig) obj; - if (empresaSaferConfigId == null) { - if (other.empresaSaferConfigId != null) - return false; - } else if (!empresaSaferConfigId.equals(other.empresaSaferConfigId)) - return false; - return true; - } - - @Override - public String toString() { - return String.valueOf(this.getEmpresaSaferConfigId()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "EMPRESA_SAFER_CONFIG_SEQ", sequenceName = "EMPRESA_SAFER_CONFIG_SEQ", allocationSize = 1) +@Table(name = "EMPRESA_SAFER_CONFIG") +public class EmpresaSaferConfig implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_SAFER_CONFIG_SEQ") + @Column(name = "EMPRESASAFERCONFIG_ID") + private Integer empresaSaferConfigId; + @Column(name = "PARTNERID") + private String partnerId; + @Column(name = "CONTRACTID") + private String contractId; + @Column(name = "SENHA") + private String senha; + @Column(name = "CERTIFICADO") + private byte[] certificado; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public EmpresaSaferConfig() { + + } + + public Integer getEmpresaSaferConfigId() { + return empresaSaferConfigId; + } + + public void setEmpresaSaferConfigId(Integer empresaSaferConfigId) { + this.empresaSaferConfigId = empresaSaferConfigId; + } + + public String getPartnerId() { + return partnerId; + } + + public void setPartnerId(String partnerId) { + this.partnerId = partnerId; + } + + public String getContractId() { + return contractId; + } + + public void setContractId(String contractId) { + this.contractId = contractId; + } + + public String getSenha() { + return senha; + } + + public void setSenha(String senha) { + this.senha = senha; + } + + public byte[] getCertificado() { + return certificado; + } + + public void setCertificado(byte[] certificado) { + this.certificado = certificado; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((empresaSaferConfigId == null) ? 0 : empresaSaferConfigId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EmpresaSaferConfig other = (EmpresaSaferConfig) obj; + if (empresaSaferConfigId == null) { + if (other.empresaSaferConfigId != null) + return false; + } else if (!empresaSaferConfigId.equals(other.empresaSaferConfigId)) + return false; + return true; + } + + @Override + public String toString() { + return String.valueOf(this.getEmpresaSaferConfigId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaSicfeConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaSicfeConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaSicfeConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaSicfeConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaTrocoSimples.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaTrocoSimples.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EmpresaTrocoSimples.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaTrocoSimples.java index 60e70d845..41e4e3ec8 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaTrocoSimples.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EmpresaTrocoSimples.java @@ -1,167 +1,167 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - - -@Entity -@Table(name = "EMPRESA_TROCOSIMPLES") -@SequenceGenerator(name = "EMPRESA_TROCOSIMPLES_SEQ", sequenceName = "EMPRESA_TROCOSIMPLES_SEQ", allocationSize = 1) -public class EmpresaTrocoSimples implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_TROCOSIMPLES_SEQ") - @Column(name = "EMPRESA_TROCOSIMPLES_ID") - private Long empresaTrocoSimplesId; - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "RAZAO_SOCIAL") - private String razaoSocial; - - @Column(name = "NOME_FANTASIA") - private String nomeFantasia; - - @Column(name = "CNPJ") - private String cnpj; - - @Column(name = "TELEFONE") - private String telefone; - - @Column(name = "ENDERECO") - private String endereco; - - @Column(name = "VALOR_SUGERIR_TROCO") - private BigDecimal valorSugerirTroco; - - @Column(name = "TOKEN_EMPRESA") - private String tokenEmpresa; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @OneToOne - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - public Long getEmpresaTrocoSimplesId() { - return empresaTrocoSimplesId; - } - - public void setEmpresaTrocoSimplesId(Long empresaTrocoSimplesId) { - this.empresaTrocoSimplesId = empresaTrocoSimplesId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public String getRazaoSocial() { - return razaoSocial; - } - - public void setRazaoSocial(String razaoSocial) { - this.razaoSocial = razaoSocial; - } - - public String getNomeFantasia() { - return nomeFantasia; - } - - public void setNomeFantasia(String nomeFantasia) { - this.nomeFantasia = nomeFantasia; - } - - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - public String getTelefone() { - return telefone; - } - - public void setTelefone(String telefone) { - this.telefone = telefone; - } - - public String getEndereco() { - return endereco; - } - - public void setEndereco(String endereco) { - this.endereco = endereco; - } - - public BigDecimal getValorSugerirTroco() { - return valorSugerirTroco; - } - - public void setValorSugerirTroco(BigDecimal valorSugerirTroco) { - this.valorSugerirTroco = valorSugerirTroco; - } - - public String getTokenEmpresa() { - return tokenEmpresa; - } - - public void setTokenEmpresa(String tokenEmpresa) { - this.tokenEmpresa = tokenEmpresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + + +@Entity +@Table(name = "EMPRESA_TROCOSIMPLES") +@SequenceGenerator(name = "EMPRESA_TROCOSIMPLES_SEQ", sequenceName = "EMPRESA_TROCOSIMPLES_SEQ", allocationSize = 1) +public class EmpresaTrocoSimples implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EMPRESA_TROCOSIMPLES_SEQ") + @Column(name = "EMPRESA_TROCOSIMPLES_ID") + private Long empresaTrocoSimplesId; + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "RAZAO_SOCIAL") + private String razaoSocial; + + @Column(name = "NOME_FANTASIA") + private String nomeFantasia; + + @Column(name = "CNPJ") + private String cnpj; + + @Column(name = "TELEFONE") + private String telefone; + + @Column(name = "ENDERECO") + private String endereco; + + @Column(name = "VALOR_SUGERIR_TROCO") + private BigDecimal valorSugerirTroco; + + @Column(name = "TOKEN_EMPRESA") + private String tokenEmpresa; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @OneToOne + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + public Long getEmpresaTrocoSimplesId() { + return empresaTrocoSimplesId; + } + + public void setEmpresaTrocoSimplesId(Long empresaTrocoSimplesId) { + this.empresaTrocoSimplesId = empresaTrocoSimplesId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public String getRazaoSocial() { + return razaoSocial; + } + + public void setRazaoSocial(String razaoSocial) { + this.razaoSocial = razaoSocial; + } + + public String getNomeFantasia() { + return nomeFantasia; + } + + public void setNomeFantasia(String nomeFantasia) { + this.nomeFantasia = nomeFantasia; + } + + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + public String getTelefone() { + return telefone; + } + + public void setTelefone(String telefone) { + this.telefone = telefone; + } + + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public BigDecimal getValorSugerirTroco() { + return valorSugerirTroco; + } + + public void setValorSugerirTroco(BigDecimal valorSugerirTroco) { + this.valorSugerirTroco = valorSugerirTroco; + } + + public String getTokenEmpresa() { + return tokenEmpresa; + } + + public void setTokenEmpresa(String tokenEmpresa) { + this.tokenEmpresa = tokenEmpresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EnderecoApanhe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EnderecoApanhe.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EnderecoApanhe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EnderecoApanhe.java index 20730a7ac..2d3efbde6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EnderecoApanhe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EnderecoApanhe.java @@ -1,221 +1,221 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; - -@Entity -@Table(name = "ENDERECO_APANHE") -@SequenceGenerator(name = "ENDERECO_APANHE_SEQ", sequenceName = "ENDERECO_APANHE_SEQ", allocationSize = 1) -public class EnderecoApanhe implements Serializable, Cloneable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ENDERECO_APANHE_SEQ") - @Column(name = "ENDERECOAPANHE_ID") - private Long enderecoapanheId; - - @Enumerated(EnumType.ORDINAL) - @Column(name = "LOCAL") - private LocalEnderecoApanhe localEnderecoApanhe; - - @Column(name = "CEP") - private String cep; - - @Column(name = "ENDERECO") - private String endereco; - - @Column(name = "CIDADE") - private String cidade; - - @Column(name = "NUMERO") - private String numero; - - @Column(name = "BAIRRO") - private String bairro; - - @Column(name = "COMPLEMENTO") - private String complemento; - - @Column(name = "REFERENCIA") - private String referencia; - - @Column(name = "DESCHOTEL") - private String deschotel; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "VENDAPACOTE_ID") - private VendaPacote vendaPacote; - - public Long getEnderecoapanheId() { - return enderecoapanheId; - } - - public void setEnderecoapanheId(Long enderecoapanheId) { - this.enderecoapanheId = enderecoapanheId; - } - - public LocalEnderecoApanhe getLocalEnderecoApanhe() { - return localEnderecoApanhe; - } - - public void setLocalEnderecoApanhe(LocalEnderecoApanhe localEnderecoApanhe) { - this.localEnderecoApanhe = localEnderecoApanhe; - } - - public String getCep() { - return cep; - } - - public void setCep(String cep) { - this.cep = cep; - } - - public String getEndereco() { - return endereco; - } - - public void setEndereco(String endereco) { - this.endereco = endereco; - } - - public String getCidade() { - return cidade; - } - - public void setCidade(String cidade) { - this.cidade = cidade; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getReferencia() { - return referencia; - } - - public void setReferencia(String referencia) { - this.referencia = referencia; - } - - public String getDeschotel() { - return deschotel; - } - - public void setDeschotel(String deschotel) { - this.deschotel = deschotel; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((enderecoapanheId == null) ? 0 : enderecoapanheId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EnderecoApanhe other = (EnderecoApanhe) obj; - if (enderecoapanheId == null) { - if (other.enderecoapanheId != null) - return false; - } else if (!enderecoapanheId.equals(other.enderecoapanheId)) - return false; - return true; - } - - public VendaPacote getVendaPacote() { - return vendaPacote; - } - - public void setVendaPacote(VendaPacote vendaPacote) { - this.vendaPacote = vendaPacote; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; + +@Entity +@Table(name = "ENDERECO_APANHE") +@SequenceGenerator(name = "ENDERECO_APANHE_SEQ", sequenceName = "ENDERECO_APANHE_SEQ", allocationSize = 1) +public class EnderecoApanhe implements Serializable, Cloneable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ENDERECO_APANHE_SEQ") + @Column(name = "ENDERECOAPANHE_ID") + private Long enderecoapanheId; + + @Enumerated(EnumType.ORDINAL) + @Column(name = "LOCAL") + private LocalEnderecoApanhe localEnderecoApanhe; + + @Column(name = "CEP") + private String cep; + + @Column(name = "ENDERECO") + private String endereco; + + @Column(name = "CIDADE") + private String cidade; + + @Column(name = "NUMERO") + private String numero; + + @Column(name = "BAIRRO") + private String bairro; + + @Column(name = "COMPLEMENTO") + private String complemento; + + @Column(name = "REFERENCIA") + private String referencia; + + @Column(name = "DESCHOTEL") + private String deschotel; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "VENDAPACOTE_ID") + private VendaPacote vendaPacote; + + public Long getEnderecoapanheId() { + return enderecoapanheId; + } + + public void setEnderecoapanheId(Long enderecoapanheId) { + this.enderecoapanheId = enderecoapanheId; + } + + public LocalEnderecoApanhe getLocalEnderecoApanhe() { + return localEnderecoApanhe; + } + + public void setLocalEnderecoApanhe(LocalEnderecoApanhe localEnderecoApanhe) { + this.localEnderecoApanhe = localEnderecoApanhe; + } + + public String getCep() { + return cep; + } + + public void setCep(String cep) { + this.cep = cep; + } + + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getReferencia() { + return referencia; + } + + public void setReferencia(String referencia) { + this.referencia = referencia; + } + + public String getDeschotel() { + return deschotel; + } + + public void setDeschotel(String deschotel) { + this.deschotel = deschotel; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((enderecoapanheId == null) ? 0 : enderecoapanheId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EnderecoApanhe other = (EnderecoApanhe) obj; + if (enderecoapanheId == null) { + if (other.enderecoapanheId != null) + return false; + } else if (!enderecoapanheId.equals(other.enderecoapanheId)) + return false; + return true; + } + + public VendaPacote getVendaPacote() { + return vendaPacote; + } + + public void setVendaPacote(VendaPacote vendaPacote) { + this.vendaPacote = vendaPacote; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Escola.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Escola.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Escola.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Escola.java index 013f59db7..b19fe85db 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Escola.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Escola.java @@ -1,96 +1,96 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "ESCOLA_SEQ", sequenceName = "ESCOLA_SEQ", allocationSize = 1) -@Table(name = "ESCOLA") -public class Escola implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESCOLA_SEQ") - @Basic(optional = false) - @Column(name = "ESCOLA_ID") - private Integer escolaId; - @Column(name = "NOMESCOLA") - private String nombescola; - @JoinColumn(name = "CIUDAD_ID", referencedColumnName = "CIUDAD_ID") - @ManyToOne - private Ciudad ciudad; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getEscolaId() { - return escolaId; - } - - public void setEscolaId(Integer escolaId) { - this.escolaId = escolaId; - } - - public String getNombescola() { - return nombescola; - } - - public void setNombescola(String nombescola) { - this.nombescola = nombescola; - } - - public Ciudad getCiudad() { - return ciudad; - } - - public void setCiudad(Ciudad ciudad) { - this.ciudad = ciudad; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return this.nombescola; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "ESCOLA_SEQ", sequenceName = "ESCOLA_SEQ", allocationSize = 1) +@Table(name = "ESCOLA") +public class Escola implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESCOLA_SEQ") + @Basic(optional = false) + @Column(name = "ESCOLA_ID") + private Integer escolaId; + @Column(name = "NOMESCOLA") + private String nombescola; + @JoinColumn(name = "CIUDAD_ID", referencedColumnName = "CIUDAD_ID") + @ManyToOne + private Ciudad ciudad; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getEscolaId() { + return escolaId; + } + + public void setEscolaId(Integer escolaId) { + this.escolaId = escolaId; + } + + public String getNombescola() { + return nombescola; + } + + public void setNombescola(String nombescola) { + this.nombescola = nombescola; + } + + public Ciudad getCiudad() { + return ciudad; + } + + public void setCiudad(Ciudad ciudad) { + this.ciudad = ciudad; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return this.nombescola; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaAgrupacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaAgrupacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaAgrupacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaAgrupacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaAsiento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaAsiento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaAsiento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaAsiento.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaEmbarqueDesembarque.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaEmbarqueDesembarque.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaEmbarqueDesembarque.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaEmbarqueDesembarque.java index b8758ab0f..e2f8f29e7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaEmbarqueDesembarque.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaEmbarqueDesembarque.java @@ -1,221 +1,221 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@SequenceGenerator(name = "ESQUEMA_CORRIDA_EMB_DESEM_SEQ", sequenceName = "ESQUEMA_CORRIDA_EMB_DESEM_SEQ", allocationSize = 1) -@Table(name = "ESQUEMA_CORRIDA_EMBRQ_DESEMBRQ") -public class EsquemaCorridaEmbarqueDesembarque implements java.io.Serializable, Auditavel { - - private static final long serialVersionUID = -6308295160991190414L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESQUEMA_CORRIDA_EMB_DESEM_SEQ") - @Column(name = "ESQUEMACORRIDAEMBRQDESEMBRQ_ID", unique = true, nullable = false, precision = 7, scale = 0) - private Integer esquemaCorridaEmbarqueDesembarqueId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ESQUEMACORRIDA_ID", nullable = false) - @NaoAuditar - private EsquemaCorrida esquemaCorrida; - - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "PARADA_ID", nullable = false) - private Parada parada; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "EMBARQUE", precision = 1, scale = 0) - private Boolean embarque; - - @Column(name = "DESEMBARQUE", precision = 1, scale = 0) - private Boolean desembarque; - - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "PARADA_EMB_DES_ID") - private Parada localDesembarqueEmbarque; - - @Column(name = "IS_VISUALIZAR_NA_API", precision = 1, scale = 0) - private Boolean isVisualizarNaAPI; - - @Transient - @NaoAuditar - private EsquemaCorridaEmbarqueDesembarque esquemaCorridaEmbarqueDesembarqueClone; - - public EsquemaCorridaEmbarqueDesembarque() { - } - - public EsquemaCorridaEmbarqueDesembarque(Integer esquemacorridaembrqdesembrqId, EsquemaCorrida esquemaCorrida, - Parada parada) { - this.esquemaCorridaEmbarqueDesembarqueId = esquemacorridaembrqdesembrqId; - this.esquemaCorrida = esquemaCorrida; - this.parada = parada; - } - - public EsquemaCorridaEmbarqueDesembarque(Integer esquemacorridaembrqdesembrqId, EsquemaCorrida esquemaCorrida, Parada parada, - Boolean activo, Date fecmodif, Integer usuarioId) { - this.esquemaCorridaEmbarqueDesembarqueId = esquemacorridaembrqdesembrqId; - this.esquemaCorrida = esquemaCorrida; - this.parada = parada; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getEsquemaCorridaEmbarqueDesembarqueId() { - return this.esquemaCorridaEmbarqueDesembarqueId; - } - - public void setEsquemaCorridaEmbarqueDesembarqueId(Integer esquemaCorridaEmbarqueDesembarqueId) { - this.esquemaCorridaEmbarqueDesembarqueId = esquemaCorridaEmbarqueDesembarqueId; - } - - public EsquemaCorrida getEsquemaCorrida() { - return this.esquemaCorrida; - } - - public void setEsquemaCorrida(EsquemaCorrida esquemaCorrida) { - this.esquemaCorrida = esquemaCorrida; - } - - public Parada getParada() { - return this.parada; - } - - public void setParada(Parada parada) { - this.parada = parada; - } - - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getEmbarque() { - return embarque; - } - - public void setEmbarque(Boolean embarque) { - this.embarque = embarque; - } - - public Boolean getDesembarque() { - return desembarque; - } - - public void setDesembarque(Boolean desembarque) { - this.desembarque = desembarque; - } - - @Override - public String toString() { - return parada != null ? parada.getDescparada() : ""; - } - - public Parada getLocalDesembarqueEmbarque() { - return localDesembarqueEmbarque; - } - - public void setLocalDesembarqueEmbarque(Parada localDesembarqueEmbarque) { - this.localDesembarqueEmbarque = localDesembarqueEmbarque; - } - - public Boolean getIsVisualizarNaAPI() { - return isVisualizarNaAPI; - } - - public void setIsVisualizarNaAPI(Boolean isVisualizarNaAPI) { - this.isVisualizarNaAPI = isVisualizarNaAPI; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getEsquemaCorridaEmbarqueDesembarqueId() == null) ? 0 : getEsquemaCorridaEmbarqueDesembarqueId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof EsquemaCorridaEmbarqueDesembarque)) - return false; - EsquemaCorridaEmbarqueDesembarque other = (EsquemaCorridaEmbarqueDesembarque) obj; - if (getEsquemaCorridaEmbarqueDesembarqueId() == null) { - if (other.getEsquemaCorridaEmbarqueDesembarqueId() != null) - return false; - } else if (!getEsquemaCorridaEmbarqueDesembarqueId().equals(other.getEsquemaCorridaEmbarqueDesembarqueId())) - return false; - return true; - } - - @Override - public void clonar() throws CloneNotSupportedException { - esquemaCorridaEmbarqueDesembarqueClone = new EsquemaCorridaEmbarqueDesembarque(); - esquemaCorridaEmbarqueDesembarqueClone = (EsquemaCorridaEmbarqueDesembarque) this.clone(); - - } - - @Override - public EsquemaCorridaEmbarqueDesembarque getCloneObject() throws CloneNotSupportedException { - return esquemaCorridaEmbarqueDesembarqueClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s] - Embarque [%s] - Desemb. [%s]", - getEsquemaCorridaEmbarqueDesembarqueId(), getParada() != null ? getParada().getDescparada() : "", - getEsquemaCorridaEmbarqueDesembarqueId(), getLocalDesembarqueEmbarque() != null ? getLocalDesembarqueEmbarque().getDescparada() : ""); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@SequenceGenerator(name = "ESQUEMA_CORRIDA_EMB_DESEM_SEQ", sequenceName = "ESQUEMA_CORRIDA_EMB_DESEM_SEQ", allocationSize = 1) +@Table(name = "ESQUEMA_CORRIDA_EMBRQ_DESEMBRQ") +public class EsquemaCorridaEmbarqueDesembarque implements java.io.Serializable, Auditavel { + + private static final long serialVersionUID = -6308295160991190414L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESQUEMA_CORRIDA_EMB_DESEM_SEQ") + @Column(name = "ESQUEMACORRIDAEMBRQDESEMBRQ_ID", unique = true, nullable = false, precision = 7, scale = 0) + private Integer esquemaCorridaEmbarqueDesembarqueId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "ESQUEMACORRIDA_ID", nullable = false) + @NaoAuditar + private EsquemaCorrida esquemaCorrida; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "PARADA_ID", nullable = false) + private Parada parada; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "EMBARQUE", precision = 1, scale = 0) + private Boolean embarque; + + @Column(name = "DESEMBARQUE", precision = 1, scale = 0) + private Boolean desembarque; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "PARADA_EMB_DES_ID") + private Parada localDesembarqueEmbarque; + + @Column(name = "IS_VISUALIZAR_NA_API", precision = 1, scale = 0) + private Boolean isVisualizarNaAPI; + + @Transient + @NaoAuditar + private EsquemaCorridaEmbarqueDesembarque esquemaCorridaEmbarqueDesembarqueClone; + + public EsquemaCorridaEmbarqueDesembarque() { + } + + public EsquemaCorridaEmbarqueDesembarque(Integer esquemacorridaembrqdesembrqId, EsquemaCorrida esquemaCorrida, + Parada parada) { + this.esquemaCorridaEmbarqueDesembarqueId = esquemacorridaembrqdesembrqId; + this.esquemaCorrida = esquemaCorrida; + this.parada = parada; + } + + public EsquemaCorridaEmbarqueDesembarque(Integer esquemacorridaembrqdesembrqId, EsquemaCorrida esquemaCorrida, Parada parada, + Boolean activo, Date fecmodif, Integer usuarioId) { + this.esquemaCorridaEmbarqueDesembarqueId = esquemacorridaembrqdesembrqId; + this.esquemaCorrida = esquemaCorrida; + this.parada = parada; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getEsquemaCorridaEmbarqueDesembarqueId() { + return this.esquemaCorridaEmbarqueDesembarqueId; + } + + public void setEsquemaCorridaEmbarqueDesembarqueId(Integer esquemaCorridaEmbarqueDesembarqueId) { + this.esquemaCorridaEmbarqueDesembarqueId = esquemaCorridaEmbarqueDesembarqueId; + } + + public EsquemaCorrida getEsquemaCorrida() { + return this.esquemaCorrida; + } + + public void setEsquemaCorrida(EsquemaCorrida esquemaCorrida) { + this.esquemaCorrida = esquemaCorrida; + } + + public Parada getParada() { + return this.parada; + } + + public void setParada(Parada parada) { + this.parada = parada; + } + + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getEmbarque() { + return embarque; + } + + public void setEmbarque(Boolean embarque) { + this.embarque = embarque; + } + + public Boolean getDesembarque() { + return desembarque; + } + + public void setDesembarque(Boolean desembarque) { + this.desembarque = desembarque; + } + + @Override + public String toString() { + return parada != null ? parada.getDescparada() : ""; + } + + public Parada getLocalDesembarqueEmbarque() { + return localDesembarqueEmbarque; + } + + public void setLocalDesembarqueEmbarque(Parada localDesembarqueEmbarque) { + this.localDesembarqueEmbarque = localDesembarqueEmbarque; + } + + public Boolean getIsVisualizarNaAPI() { + return isVisualizarNaAPI; + } + + public void setIsVisualizarNaAPI(Boolean isVisualizarNaAPI) { + this.isVisualizarNaAPI = isVisualizarNaAPI; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getEsquemaCorridaEmbarqueDesembarqueId() == null) ? 0 : getEsquemaCorridaEmbarqueDesembarqueId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof EsquemaCorridaEmbarqueDesembarque)) + return false; + EsquemaCorridaEmbarqueDesembarque other = (EsquemaCorridaEmbarqueDesembarque) obj; + if (getEsquemaCorridaEmbarqueDesembarqueId() == null) { + if (other.getEsquemaCorridaEmbarqueDesembarqueId() != null) + return false; + } else if (!getEsquemaCorridaEmbarqueDesembarqueId().equals(other.getEsquemaCorridaEmbarqueDesembarqueId())) + return false; + return true; + } + + @Override + public void clonar() throws CloneNotSupportedException { + esquemaCorridaEmbarqueDesembarqueClone = new EsquemaCorridaEmbarqueDesembarque(); + esquemaCorridaEmbarqueDesembarqueClone = (EsquemaCorridaEmbarqueDesembarque) this.clone(); + + } + + @Override + public EsquemaCorridaEmbarqueDesembarque getCloneObject() throws CloneNotSupportedException { + return esquemaCorridaEmbarqueDesembarqueClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s] - Embarque [%s] - Desemb. [%s]", + getEsquemaCorridaEmbarqueDesembarqueId(), getParada() != null ? getParada().getDescparada() : "", + getEsquemaCorridaEmbarqueDesembarqueId(), getLocalDesembarqueEmbarque() != null ? getLocalDesembarqueEmbarque().getDescparada() : ""); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaInfo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaInfo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaInfo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorridaInfo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaOperacional.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaOperacional.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaOperacional.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaOperacional.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java index 0c7d8bd2e..50950d116 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java @@ -1,242 +1,242 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Rafius - */ -@Entity -@SequenceGenerator(name = "ESQUEMA_TRAMO_SEQ", sequenceName = "ESQUEMA_TRAMO_SEQ", allocationSize = 1) -@Table(name = "ESQUEMA_TRAMO") -public class EsquemaTramo implements Serializable, Comparable, Auditavel, Cloneable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @Column(name = "ESQUEMATRAMO_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESQUEMA_TRAMO_SEQ") - private Integer esquematramoId; - - @Column(name = "NUMSECUENCIA") - private Short numsecuencia; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - - private Integer usuarioId; - @Column(name = "TIEMPOESTANCIA") - @Temporal(javax.persistence.TemporalType.TIMESTAMP) - private Date tiempoEstancia; - - @JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID") - @ManyToOne - private Tramo tramo; - - @JoinColumn(name = "ESQUEMACORRIDA_ID", referencedColumnName = "ESQUEMACORRIDA_ID") - @ManyToOne - @NaoAuditar - private EsquemaCorrida esquemaCorrida; - - @Column(name = "PLATAFORMA") - private String plataforma; - - @Column(name = "EXCEPCIONRECORRIDO") - private Date excepcionRecorrido; - - @Column(name = "TIPO_PASSAGEM") - private String tipoPassagem; - - @Transient - @NaoAuditar - private EsquemaTramo esquemaTramoClone; - - public Date getTiempoEstancia() { - return tiempoEstancia; - } - - public void setTiempoEstancia(Date tiempoEstancia) { - this.tiempoEstancia = tiempoEstancia; - } - - public EsquemaTramo() { - } - - public EsquemaTramo(Integer esquematramoId) { - this.esquematramoId = esquematramoId; - } - - public Integer getEsquematramoId() { - return esquematramoId; - } - - public void setEsquematramoId(Integer esquematramoId) { - this.esquematramoId = esquematramoId; - } - - public Short getNumsecuencia() { - return numsecuencia; - } - - public void setNumsecuencia(Short numsecuencia) { - this.numsecuencia = numsecuencia; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Tramo getTramo() { - return tramo; - } - - public void setTramo(Tramo tramo) { - this.tramo = tramo; - } - - public EsquemaCorrida getEsquemaCorrida() { - return esquemaCorrida; - } - - public void setEsquemaCorrida(EsquemaCorrida esquemaCorrida) { - this.esquemaCorrida = esquemaCorrida; - } - - public String getPlataforma() { - return plataforma; - } - - public void setPlataforma(String plataforma) { - this.plataforma = plataforma; - } - - public Date getExcepcionRecorrido() { - return excepcionRecorrido; - } - - public void setExcepcionRecorrido(Date excepcionRecorrido) { - this.excepcionRecorrido = excepcionRecorrido; - } - - public String getTipoPassagem() { - return tipoPassagem; - } - - public void setTipoPassagem(String tipoPassagem) { - this.tipoPassagem = tipoPassagem; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (getEsquematramoId() != null ? getEsquematramoId().hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof EsquemaTramo)) { - return false; - } - EsquemaTramo other = (EsquemaTramo) object; - if ((this.getEsquematramoId() == null && other.getEsquematramoId() != null) || (this.getEsquematramoId() != null && !this.getEsquematramoId().equals(other.getEsquematramoId()))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.test.EsquemaTramo[esquematramoId=" + esquematramoId + "]"; - } - - @Override - public int compareTo(EsquemaTramo o) { - if (this.numsecuencia > o.getNumsecuencia()) { - return 1; - } else if (this.numsecuencia < o.getNumsecuencia()) { - return -1; - } - return 0; - } - - @Override - public void clonar() throws CloneNotSupportedException { - esquemaTramoClone = new EsquemaTramo(); - esquemaTramoClone = (EsquemaTramo) this.clone(); - Hibernate.initialize(esquemaTramoClone.getTramo()); - } - - @Override - public EsquemaTramo getCloneObject() throws CloneNotSupportedException { - return esquemaTramoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("EsquemaTramo - Sequencia [%s] - Origem [%s] - Destino [%s]", getNumsecuencia(), - getTramo() != null && getTramo().getOrigem() != null ? getTramo().getOrigem().getDescparada() : "", - getTramo() != null && getTramo().getDestino() != null ? getTramo().getDestino().getDescparada() : ""); - } - - @Override - public EsquemaTramo clone() throws CloneNotSupportedException { - EsquemaTramo clone = null; - try { - clone = (EsquemaTramo) super.clone(); - } - catch (CloneNotSupportedException e) { - throw new RuntimeException(e); - } - return clone; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Rafius + */ +@Entity +@SequenceGenerator(name = "ESQUEMA_TRAMO_SEQ", sequenceName = "ESQUEMA_TRAMO_SEQ", allocationSize = 1) +@Table(name = "ESQUEMA_TRAMO") +public class EsquemaTramo implements Serializable, Comparable, Auditavel, Cloneable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @Column(name = "ESQUEMATRAMO_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESQUEMA_TRAMO_SEQ") + private Integer esquematramoId; + + @Column(name = "NUMSECUENCIA") + private Short numsecuencia; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + + private Integer usuarioId; + @Column(name = "TIEMPOESTANCIA") + @Temporal(javax.persistence.TemporalType.TIMESTAMP) + private Date tiempoEstancia; + + @JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID") + @ManyToOne + private Tramo tramo; + + @JoinColumn(name = "ESQUEMACORRIDA_ID", referencedColumnName = "ESQUEMACORRIDA_ID") + @ManyToOne + @NaoAuditar + private EsquemaCorrida esquemaCorrida; + + @Column(name = "PLATAFORMA") + private String plataforma; + + @Column(name = "EXCEPCIONRECORRIDO") + private Date excepcionRecorrido; + + @Column(name = "TIPO_PASSAGEM") + private String tipoPassagem; + + @Transient + @NaoAuditar + private EsquemaTramo esquemaTramoClone; + + public Date getTiempoEstancia() { + return tiempoEstancia; + } + + public void setTiempoEstancia(Date tiempoEstancia) { + this.tiempoEstancia = tiempoEstancia; + } + + public EsquemaTramo() { + } + + public EsquemaTramo(Integer esquematramoId) { + this.esquematramoId = esquematramoId; + } + + public Integer getEsquematramoId() { + return esquematramoId; + } + + public void setEsquematramoId(Integer esquematramoId) { + this.esquematramoId = esquematramoId; + } + + public Short getNumsecuencia() { + return numsecuencia; + } + + public void setNumsecuencia(Short numsecuencia) { + this.numsecuencia = numsecuencia; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Tramo getTramo() { + return tramo; + } + + public void setTramo(Tramo tramo) { + this.tramo = tramo; + } + + public EsquemaCorrida getEsquemaCorrida() { + return esquemaCorrida; + } + + public void setEsquemaCorrida(EsquemaCorrida esquemaCorrida) { + this.esquemaCorrida = esquemaCorrida; + } + + public String getPlataforma() { + return plataforma; + } + + public void setPlataforma(String plataforma) { + this.plataforma = plataforma; + } + + public Date getExcepcionRecorrido() { + return excepcionRecorrido; + } + + public void setExcepcionRecorrido(Date excepcionRecorrido) { + this.excepcionRecorrido = excepcionRecorrido; + } + + public String getTipoPassagem() { + return tipoPassagem; + } + + public void setTipoPassagem(String tipoPassagem) { + this.tipoPassagem = tipoPassagem; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (getEsquematramoId() != null ? getEsquematramoId().hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof EsquemaTramo)) { + return false; + } + EsquemaTramo other = (EsquemaTramo) object; + if ((this.getEsquematramoId() == null && other.getEsquematramoId() != null) || (this.getEsquematramoId() != null && !this.getEsquematramoId().equals(other.getEsquematramoId()))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.test.EsquemaTramo[esquematramoId=" + esquematramoId + "]"; + } + + @Override + public int compareTo(EsquemaTramo o) { + if (this.numsecuencia > o.getNumsecuencia()) { + return 1; + } else if (this.numsecuencia < o.getNumsecuencia()) { + return -1; + } + return 0; + } + + @Override + public void clonar() throws CloneNotSupportedException { + esquemaTramoClone = new EsquemaTramo(); + esquemaTramoClone = (EsquemaTramo) this.clone(); + Hibernate.initialize(esquemaTramoClone.getTramo()); + } + + @Override + public EsquemaTramo getCloneObject() throws CloneNotSupportedException { + return esquemaTramoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("EsquemaTramo - Sequencia [%s] - Origem [%s] - Destino [%s]", getNumsecuencia(), + getTramo() != null && getTramo().getOrigem() != null ? getTramo().getOrigem().getDescparada() : "", + getTramo() != null && getTramo().getDestino() != null ? getTramo().getDestino().getDescparada() : ""); + } + + @Override + public EsquemaTramo clone() throws CloneNotSupportedException { + EsquemaTramo clone = null; + try { + clone = (EsquemaTramo) super.clone(); + } + catch (CloneNotSupportedException e) { + throw new RuntimeException(e); + } + return clone; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Estacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Estacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Estacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Estacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EstacionImpresora.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionImpresora.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/EstacionImpresora.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionImpresora.java index b0af46d5e..346c556e4 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EstacionImpresora.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionImpresora.java @@ -1,144 +1,144 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "ESTACION_IMPRESORA_SEQ", sequenceName = "ESTACION_IMPRESORA_SEQ", allocationSize = 1) -@Table(name = "ESTACION_IMPRESORA ") -public class EstacionImpresora implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESTACION_IMPRESORA_SEQ") - @Column(name = "ESTACIONIMPRESORA_ID") - private Integer estacionImpresoraId; - @ManyToOne - @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") - private Estacion estacion; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "NOMBIMPRESORA") - private String nombImpresora; - @Column(name = "NOMBARCHIVOLAYOUT") - private String nombArchivoLayout; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "TIPOIMPRESSORA") - private Integer tipoImpressora; - @ManyToOne - @JoinColumn(name = "ESTACIONCENTRAL_ID", referencedColumnName = "ESTACION_ID") - private Estacion estacionCentral; - @Column(name = "NOMBARCHIVOLAYOUTINTERNACIONAL") - private String nombArchivoLayoutIternacional; - - public Integer getEstacionImpresoraId() { - return estacionImpresoraId; - } - - public void setEstacionImpresoraId(Integer estacionImpresoraId) { - this.estacionImpresoraId = estacionImpresoraId; - } - - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public String getNombImpresora() { - return nombImpresora; - } - - public void setNombImpresora(String nombImpresora) { - this.nombImpresora = nombImpresora; - } - - public String getNombArchivoLayout() { - return nombArchivoLayout; - } - - public void setNombArchivoLayout(String nombArchivoLayout) { - this.nombArchivoLayout = nombArchivoLayout; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getTipoImpressora() { - return tipoImpressora; - } - - public void setTipoImpressora(Integer tipoImpressora) { - this.tipoImpressora = tipoImpressora; - } - - public Estacion getEstacionCentral() { - return estacionCentral; - } - - public void setEstacionCentral(Estacion estacionCentral) { - this.estacionCentral = estacionCentral; - } - - public String getNombArchivoLayoutIternacional() { - return nombArchivoLayoutIternacional; - } - - public void setNombArchivoLayoutIternacional(String nombArchivoLayoutIternacional) { - this.nombArchivoLayoutIternacional = nombArchivoLayoutIternacional; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "ESTACION_IMPRESORA_SEQ", sequenceName = "ESTACION_IMPRESORA_SEQ", allocationSize = 1) +@Table(name = "ESTACION_IMPRESORA ") +public class EstacionImpresora implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESTACION_IMPRESORA_SEQ") + @Column(name = "ESTACIONIMPRESORA_ID") + private Integer estacionImpresoraId; + @ManyToOne + @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") + private Estacion estacion; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "NOMBIMPRESORA") + private String nombImpresora; + @Column(name = "NOMBARCHIVOLAYOUT") + private String nombArchivoLayout; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "TIPOIMPRESSORA") + private Integer tipoImpressora; + @ManyToOne + @JoinColumn(name = "ESTACIONCENTRAL_ID", referencedColumnName = "ESTACION_ID") + private Estacion estacionCentral; + @Column(name = "NOMBARCHIVOLAYOUTINTERNACIONAL") + private String nombArchivoLayoutIternacional; + + public Integer getEstacionImpresoraId() { + return estacionImpresoraId; + } + + public void setEstacionImpresoraId(Integer estacionImpresoraId) { + this.estacionImpresoraId = estacionImpresoraId; + } + + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public String getNombImpresora() { + return nombImpresora; + } + + public void setNombImpresora(String nombImpresora) { + this.nombImpresora = nombImpresora; + } + + public String getNombArchivoLayout() { + return nombArchivoLayout; + } + + public void setNombArchivoLayout(String nombArchivoLayout) { + this.nombArchivoLayout = nombArchivoLayout; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getTipoImpressora() { + return tipoImpressora; + } + + public void setTipoImpressora(Integer tipoImpressora) { + this.tipoImpressora = tipoImpressora; + } + + public Estacion getEstacionCentral() { + return estacionCentral; + } + + public void setEstacionCentral(Estacion estacionCentral) { + this.estacionCentral = estacionCentral; + } + + public String getNombArchivoLayoutIternacional() { + return nombArchivoLayoutIternacional; + } + + public void setNombArchivoLayoutIternacional(String nombArchivoLayoutIternacional) { + this.nombArchivoLayoutIternacional = nombArchivoLayoutIternacional; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EstacionRioCard.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionRioCard.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/EstacionRioCard.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionRioCard.java index b03fd2d6c..d1b021524 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EstacionRioCard.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionRioCard.java @@ -1,143 +1,143 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author RJ - */ -@Entity -@Table(name = "ESTACION_RIOCARD") -@SequenceGenerator(name = "ESTACION_RIOCARD_SEQ", sequenceName = "ESTACION_RIOCARD_SEQ", allocationSize = 1) -public class EstacionRioCard implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESTACION_RIOCARD_SEQ") - @Column(name = "ESTACIONRIOCARD_ID") - private Integer estacionRioCardId; - @Column(name = "OPERADORA") - private String operadora; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne - @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") - private Estacion estacion; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - public EstacionRioCard() { - } - - public EstacionRioCard(Integer estacionRioCardId) { - this.estacionRioCardId = estacionRioCardId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (estacionRioCardId != null ? estacionRioCardId.hashCode() : 0); - return hash; - } - - public Integer getEstacionRioCardId() { - return estacionRioCardId; - } - - public void setEstacionRioCardId(Integer estacionRioCardId) { - this.estacionRioCardId = estacionRioCardId; - } - - public String getOperadora() { - return operadora; - } - - public void setOperadora(String operadora) { - this.operadora = operadora; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are - // not set - if (!(object instanceof EstacionRioCard)) { - return false; - } - EstacionRioCard other = (EstacionRioCard) object; - if ((this.estacionRioCardId == null && other.estacionRioCardId != null) || (this.estacionRioCardId != null && !this.estacionRioCardId.equals(other.estacionRioCardId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.EstacionRiocard[ estacionRioCardId=" + estacionRioCardId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author RJ + */ +@Entity +@Table(name = "ESTACION_RIOCARD") +@SequenceGenerator(name = "ESTACION_RIOCARD_SEQ", sequenceName = "ESTACION_RIOCARD_SEQ", allocationSize = 1) +public class EstacionRioCard implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESTACION_RIOCARD_SEQ") + @Column(name = "ESTACIONRIOCARD_ID") + private Integer estacionRioCardId; + @Column(name = "OPERADORA") + private String operadora; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne + @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") + private Estacion estacion; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + public EstacionRioCard() { + } + + public EstacionRioCard(Integer estacionRioCardId) { + this.estacionRioCardId = estacionRioCardId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (estacionRioCardId != null ? estacionRioCardId.hashCode() : 0); + return hash; + } + + public Integer getEstacionRioCardId() { + return estacionRioCardId; + } + + public void setEstacionRioCardId(Integer estacionRioCardId) { + this.estacionRioCardId = estacionRioCardId; + } + + public String getOperadora() { + return operadora; + } + + public void setOperadora(String operadora) { + this.operadora = operadora; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are + // not set + if (!(object instanceof EstacionRioCard)) { + return false; + } + EstacionRioCard other = (EstacionRioCard) object; + if ((this.estacionRioCardId == null && other.estacionRioCardId != null) || (this.estacionRioCardId != null && !this.estacionRioCardId.equals(other.estacionRioCardId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.EstacionRiocard[ estacionRioCardId=" + estacionRioCardId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/EstacionSitef.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionSitef.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/EstacionSitef.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionSitef.java index 8dabf164e..33f047d7c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EstacionSitef.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EstacionSitef.java @@ -1,236 +1,236 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.Parameter; -import org.hibernate.annotations.Type; - -import com.rjconsultores.ventaboletos.enums.TipoIntegracaoTEF; - -/** - * - * @author RJ - */ -@Entity -@Table(name = "ESTACION_SITEF") -@SequenceGenerator(name = "ESTACION_SITEF_SEQ", sequenceName = "ESTACION_SITEF_SEQ", allocationSize = 1) -public class EstacionSitef implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESTACION_SITEF_SEQ") - @Column(name = "ESTACIONSITEF_ID") - private Integer estacionsitefId; - @Column(name = "NUMEMPRESA") - private String numempresa; - @Column(name = "NUMFILIAL") - private Integer numfilial; - @Column(name = "NUMPDV") - private String numpdv; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne - @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") - private Estacion estacion; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "IPSERVIDOR") - private String ipServidor; - @Column(name = "SENHA_CONFIG") - private String senhaConfig; - - @Type(type = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate", parameters = { - @Parameter(name = "type", value = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate"), - @Parameter(name = "class", value = "com.rjconsultores.ventaboletos.enums.TipoIntegracaoTEF"), - @Parameter(name = "sqlType", value = "12")/*Types.VARCHAR*/, - @Parameter(name = "enumName", value = "true")}) - @Column(name = "TIPO_INTEGRACAO") - private com.rjconsultores.ventaboletos.enums.TipoIntegracaoTEF tipoIntegracao; - - @Column(name = "CNPJ") - private String cnpj; - - @Column(name = "NUMERODESERIE") - private String numeroDeSerie; - - @Column(name = "DESCRICAO") - private String descricao; - - public EstacionSitef() { - } - - public EstacionSitef(Integer estacionsitefId) { - this.estacionsitefId = estacionsitefId; - } - - public Integer getEstacionsitefId() { - return estacionsitefId; - } - - public void setEstacionsitefId(Integer estacionsitefId) { - this.estacionsitefId = estacionsitefId; - } - - public String getNumempresa() { - return numempresa; - } - - public void setNumempresa(String numempresa) { - this.numempresa = numempresa; - } - - public Integer getNumfilial() { - return numfilial; - } - - public void setNumfilial(Integer numfilial) { - this.numfilial = numfilial; - } - - public String getNumpdv() { - return numpdv; - } - - public void setNumpdv(String numpdv) { - this.numpdv = numpdv; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (estacionsitefId != null ? estacionsitefId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are - // not set - if (!(object instanceof EstacionSitef)) { - return false; - } - EstacionSitef other = (EstacionSitef) object; - if ((this.estacionsitefId == null && other.estacionsitefId != null) || (this.estacionsitefId != null && !this.estacionsitefId.equals(other.estacionsitefId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.EstacionSitef[ estacionsitefId=" + estacionsitefId + " ]"; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - - public String getIpServidor() { - return ipServidor; - } - - public void setIpServidor(String ipServidor) { - this.ipServidor = ipServidor; - } - - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - public TipoIntegracaoTEF getTipoIntegracao() { - return tipoIntegracao; - } - - public void setTipoIntegracao(TipoIntegracaoTEF tipoIntegracao) { - this.tipoIntegracao = tipoIntegracao; - } - - public String getSenhaConfig() { - return senhaConfig; - } - - public void setSenhaConfig(String senhaConfig) { - this.senhaConfig = senhaConfig; - } - - public String getNumeroDeSerie() { - return numeroDeSerie; - } - - public void setNumeroDeSerie(String numeroDeSerie) { - this.numeroDeSerie = numeroDeSerie; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.Parameter; +import org.hibernate.annotations.Type; + +import com.rjconsultores.ventaboletos.enums.TipoIntegracaoTEF; + +/** + * + * @author RJ + */ +@Entity +@Table(name = "ESTACION_SITEF") +@SequenceGenerator(name = "ESTACION_SITEF_SEQ", sequenceName = "ESTACION_SITEF_SEQ", allocationSize = 1) +public class EstacionSitef implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESTACION_SITEF_SEQ") + @Column(name = "ESTACIONSITEF_ID") + private Integer estacionsitefId; + @Column(name = "NUMEMPRESA") + private String numempresa; + @Column(name = "NUMFILIAL") + private Integer numfilial; + @Column(name = "NUMPDV") + private String numpdv; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne + @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") + private Estacion estacion; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "IPSERVIDOR") + private String ipServidor; + @Column(name = "SENHA_CONFIG") + private String senhaConfig; + + @Type(type = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate", parameters = { + @Parameter(name = "type", value = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate"), + @Parameter(name = "class", value = "com.rjconsultores.ventaboletos.enums.TipoIntegracaoTEF"), + @Parameter(name = "sqlType", value = "12")/*Types.VARCHAR*/, + @Parameter(name = "enumName", value = "true")}) + @Column(name = "TIPO_INTEGRACAO") + private com.rjconsultores.ventaboletos.enums.TipoIntegracaoTEF tipoIntegracao; + + @Column(name = "CNPJ") + private String cnpj; + + @Column(name = "NUMERODESERIE") + private String numeroDeSerie; + + @Column(name = "DESCRICAO") + private String descricao; + + public EstacionSitef() { + } + + public EstacionSitef(Integer estacionsitefId) { + this.estacionsitefId = estacionsitefId; + } + + public Integer getEstacionsitefId() { + return estacionsitefId; + } + + public void setEstacionsitefId(Integer estacionsitefId) { + this.estacionsitefId = estacionsitefId; + } + + public String getNumempresa() { + return numempresa; + } + + public void setNumempresa(String numempresa) { + this.numempresa = numempresa; + } + + public Integer getNumfilial() { + return numfilial; + } + + public void setNumfilial(Integer numfilial) { + this.numfilial = numfilial; + } + + public String getNumpdv() { + return numpdv; + } + + public void setNumpdv(String numpdv) { + this.numpdv = numpdv; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (estacionsitefId != null ? estacionsitefId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are + // not set + if (!(object instanceof EstacionSitef)) { + return false; + } + EstacionSitef other = (EstacionSitef) object; + if ((this.estacionsitefId == null && other.estacionsitefId != null) || (this.estacionsitefId != null && !this.estacionsitefId.equals(other.estacionsitefId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.EstacionSitef[ estacionsitefId=" + estacionsitefId + " ]"; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + + public String getIpServidor() { + return ipServidor; + } + + public void setIpServidor(String ipServidor) { + this.ipServidor = ipServidor; + } + + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + public TipoIntegracaoTEF getTipoIntegracao() { + return tipoIntegracao; + } + + public void setTipoIntegracao(TipoIntegracaoTEF tipoIntegracao) { + this.tipoIntegracao = tipoIntegracao; + } + + public String getSenhaConfig() { + return senhaConfig; + } + + public void setSenhaConfig(String senhaConfig) { + this.senhaConfig = senhaConfig; + } + + public String getNumeroDeSerie() { + return numeroDeSerie; + } + + public void setNumeroDeSerie(String numeroDeSerie) { + this.numeroDeSerie = numeroDeSerie; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Estado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Estado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Estado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Estado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/EventoExtra.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EventoExtra.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/EventoExtra.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/EventoExtra.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ExcecaoGrupoContrato.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcecaoGrupoContrato.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ExcecaoGrupoContrato.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcecaoGrupoContrato.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeaje.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeaje.java index eafc45a8b..3e751e780 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeaje.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeaje.java @@ -1,118 +1,118 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.Filter; -import org.hibernate.annotations.FilterDef; - -@Entity -@FilterDef(name="ativo") -@SequenceGenerator(name = "EXCEPCION_PEAJE_SEQ", sequenceName = "EXCEPCION_PEAJE_SEQ", allocationSize = 1) -@Table(name = "EXCEPCION_PEAJE") -public class ExcepcionPeaje implements Serializable,Comparable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @Column(name = "EXCEPCIONPEAJE_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EXCEPCION_PEAJE_SEQ") - private Integer excepcionPeajeId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "RUTA_ID") - @OneToOne - private Ruta ruta; - @OneToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origem; - @OneToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - @OneToMany(mappedBy = "excepcionPeaje", cascade = CascadeType.ALL)//, fetch = FetchType.EAGER - @Filter(name="ativo", condition="ACTIVO = 1") - private List lsExcepcionPeajeVigencia = new ArrayList(); - - public Integer getExcepcionPeajeId() { - return excepcionPeajeId; - } - public void setExcepcionPeajeId(Integer excepcionPeajeId) { - this.excepcionPeajeId = excepcionPeajeId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Ruta getRuta() { - return ruta; - } - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - public Parada getOrigem() { - return origem; - } - public void setOrigem(Parada origem) { - this.origem = origem; - } - public Parada getDestino() { - return destino; - } - public void setDestino(Parada destino) { - this.destino = destino; - } - - public List getLsExcepcionPeajeVigencia() { - return lsExcepcionPeajeVigencia; - } - public void setLsExcepcionPeajeVigencia(List lsExcepcionPeajeVigencia) { - this.lsExcepcionPeajeVigencia = lsExcepcionPeajeVigencia; - } - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje[excepcionPeajeId=" + excepcionPeajeId + "]"; - } - @Override - public int compareTo(ExcepcionPeaje excepcionPeaje) { - return this.getExcepcionPeajeId().intValue() - excepcionPeaje.getExcepcionPeajeId().intValue(); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; + +@Entity +@FilterDef(name="ativo") +@SequenceGenerator(name = "EXCEPCION_PEAJE_SEQ", sequenceName = "EXCEPCION_PEAJE_SEQ", allocationSize = 1) +@Table(name = "EXCEPCION_PEAJE") +public class ExcepcionPeaje implements Serializable,Comparable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @Column(name = "EXCEPCIONPEAJE_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EXCEPCION_PEAJE_SEQ") + private Integer excepcionPeajeId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "RUTA_ID") + @OneToOne + private Ruta ruta; + @OneToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origem; + @OneToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + @OneToMany(mappedBy = "excepcionPeaje", cascade = CascadeType.ALL)//, fetch = FetchType.EAGER + @Filter(name="ativo", condition="ACTIVO = 1") + private List lsExcepcionPeajeVigencia = new ArrayList(); + + public Integer getExcepcionPeajeId() { + return excepcionPeajeId; + } + public void setExcepcionPeajeId(Integer excepcionPeajeId) { + this.excepcionPeajeId = excepcionPeajeId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Ruta getRuta() { + return ruta; + } + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + public Parada getOrigem() { + return origem; + } + public void setOrigem(Parada origem) { + this.origem = origem; + } + public Parada getDestino() { + return destino; + } + public void setDestino(Parada destino) { + this.destino = destino; + } + + public List getLsExcepcionPeajeVigencia() { + return lsExcepcionPeajeVigencia; + } + public void setLsExcepcionPeajeVigencia(List lsExcepcionPeajeVigencia) { + this.lsExcepcionPeajeVigencia = lsExcepcionPeajeVigencia; + } + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje[excepcionPeajeId=" + excepcionPeajeId + "]"; + } + @Override + public int compareTo(ExcepcionPeaje excepcionPeaje) { + return this.getExcepcionPeajeId().intValue() - excepcionPeaje.getExcepcionPeajeId().intValue(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeajeVigencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeajeVigencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeajeVigencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeajeVigencia.java index f3279f55c..f6de59fa3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeajeVigencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionPeajeVigencia.java @@ -1,268 +1,268 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "EXCEPCION_PEAJE_VIGENCIA_SEQ", sequenceName = "EXCEPCION_PEAJE_VIGENCIA_SEQ", allocationSize = 1) -@Table(name = "EXCEPCION_PEAJE_VIGENCIA") -public class ExcepcionPeajeVigencia implements Serializable ,Comparable { - -private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @Column(name = "EXCEPCIONPEAJEVIGENCIA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "EXCEPCION_PEAJE_VIGENCIA_SEQ") - private Integer excepcionPeajeVigenciaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "EXCEPCIONPEAJE_ID" , referencedColumnName = "EXCEPCIONPEAJE_ID") - private ExcepcionPeaje excepcionPeaje; - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "CASETAPEAJE_ID" , referencedColumnName = "CASETAPEAJE_ID") - private CasetaPeaje casetaPeaje; - @Column(name = "FECHAVENTAINI") - @Temporal(TemporalType.TIMESTAMP) - private java.util.Date fecVentaIni; - @Column(name = "FECHAVENTAFIN") - @Temporal(TemporalType.TIMESTAMP) - private java.util.Date fecVentaFin; - @Column(name = "FECHORINICIO") - @Temporal(TemporalType.TIME) - private Date horaIni; - @Column(name = "FECHORFINAL") - @Temporal(TemporalType.TIME) - private Date horaFin; - @Column(name = "INDLUNES") - private Boolean INDLUNES; - @Column(name = "INDMARTES") - private Boolean INDMARTES; - @Column(name = "INDMIERCOLES") - private Boolean INDMIERCOLES; - @Column(name = "INDJUEVES") - private Boolean INDJUEVES; - @Column(name = "INDVIERNES") - private Boolean INDVIERNES; - @Column(name = "INDSABADO") - private Boolean INDSABADO; - @Column(name = "INDDOMINGO") - private Boolean INDDOMINGO; - @Column(name = "PRECIO") - private BigDecimal precio; - - public Integer getExcepcionPeajeVigenciaId() { - return excepcionPeajeVigenciaId; - } - - - public void setExcepcionPeajeVigenciaId(Integer excepcionPeajeVigenciaId) { - this.excepcionPeajeVigenciaId = excepcionPeajeVigenciaId; - } - - - public Boolean getActivo() { - return activo; - } - - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - - public Date getFecmodif() { - return fecmodif; - } - - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - - public Integer getUsuarioId() { - return usuarioId; - } - - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - public ExcepcionPeaje getExcepcionPeaje() { - return excepcionPeaje; - } - - - public void setExcepcionPeaje(ExcepcionPeaje excepcionPeaje) { - this.excepcionPeaje = excepcionPeaje; - } - - - public java.util.Date getFecVentaIni() { - return fecVentaIni; - } - - - public void setFecVentaIni(java.util.Date fecVentaIni) { - this.fecVentaIni = fecVentaIni; - } - - - public java.util.Date getFecVentaFin() { - return fecVentaFin; - } - - - public void setFecVentaFin(java.util.Date fecVentaFin) { - this.fecVentaFin = fecVentaFin; - } - - - public Date getHoraIni() { - return horaIni; - } - - - public void setHoraIni(Date horaIni) { - this.horaIni = horaIni; - } - - - public Date getHoraFin() { - return horaFin; - } - - - public void setHoraFin(Date horaFin) { - this.horaFin = horaFin; - } - - - public Boolean getINDLUNES() { - return INDLUNES; - } - - - public void setINDLUNES(Boolean iNDLUNES) { - INDLUNES = iNDLUNES; - } - - - public Boolean getINDMARTES() { - return INDMARTES; - } - - - public void setINDMARTES(Boolean iNDMARTES) { - INDMARTES = iNDMARTES; - } - - - public Boolean getINDMIERCOLES() { - return INDMIERCOLES; - } - - - public void setINDMIERCOLES(Boolean iNDMIERCOLES) { - INDMIERCOLES = iNDMIERCOLES; - } - - - public Boolean getINDJUEVES() { - return INDJUEVES; - } - - - public void setINDJUEVES(Boolean iNDJUEVES) { - INDJUEVES = iNDJUEVES; - } - - - public Boolean getINDVIERNES() { - return INDVIERNES; - } - - - public void setINDVIERNES(Boolean iNDVIERNES) { - INDVIERNES = iNDVIERNES; - } - - - public Boolean getINDSABADO() { - return INDSABADO; - } - - - public void setINDSABADO(Boolean iNDSABADO) { - INDSABADO = iNDSABADO; - } - - - public Boolean getINDDOMINGO() { - return INDDOMINGO; - } - - - public void setINDDOMINGO(Boolean iNDDOMINGO) { - INDDOMINGO = iNDDOMINGO; - } - - - public BigDecimal getPrecio() { - return precio; - } - - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - - public CasetaPeaje getCasetaPeaje() { - return casetaPeaje; - } - - - public void setCasetaPeaje(CasetaPeaje casetaPeaje) { - this.casetaPeaje = casetaPeaje; - } - - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia[excepcionPeajeVigenciaId=" + excepcionPeajeVigenciaId + "]"; - } - - @Override - public int compareTo(ExcepcionPeajeVigencia excepcionPeajeVigencia) { - if(excepcionPeajeVigencia.getExcepcionPeajeVigenciaId() != null){ - return this.getExcepcionPeajeVigenciaId().intValue() - excepcionPeajeVigencia.getExcepcionPeajeVigenciaId().intValue(); - }else{ - return -1; - } - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "EXCEPCION_PEAJE_VIGENCIA_SEQ", sequenceName = "EXCEPCION_PEAJE_VIGENCIA_SEQ", allocationSize = 1) +@Table(name = "EXCEPCION_PEAJE_VIGENCIA") +public class ExcepcionPeajeVigencia implements Serializable ,Comparable { + +private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @Column(name = "EXCEPCIONPEAJEVIGENCIA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "EXCEPCION_PEAJE_VIGENCIA_SEQ") + private Integer excepcionPeajeVigenciaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "EXCEPCIONPEAJE_ID" , referencedColumnName = "EXCEPCIONPEAJE_ID") + private ExcepcionPeaje excepcionPeaje; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "CASETAPEAJE_ID" , referencedColumnName = "CASETAPEAJE_ID") + private CasetaPeaje casetaPeaje; + @Column(name = "FECHAVENTAINI") + @Temporal(TemporalType.TIMESTAMP) + private java.util.Date fecVentaIni; + @Column(name = "FECHAVENTAFIN") + @Temporal(TemporalType.TIMESTAMP) + private java.util.Date fecVentaFin; + @Column(name = "FECHORINICIO") + @Temporal(TemporalType.TIME) + private Date horaIni; + @Column(name = "FECHORFINAL") + @Temporal(TemporalType.TIME) + private Date horaFin; + @Column(name = "INDLUNES") + private Boolean INDLUNES; + @Column(name = "INDMARTES") + private Boolean INDMARTES; + @Column(name = "INDMIERCOLES") + private Boolean INDMIERCOLES; + @Column(name = "INDJUEVES") + private Boolean INDJUEVES; + @Column(name = "INDVIERNES") + private Boolean INDVIERNES; + @Column(name = "INDSABADO") + private Boolean INDSABADO; + @Column(name = "INDDOMINGO") + private Boolean INDDOMINGO; + @Column(name = "PRECIO") + private BigDecimal precio; + + public Integer getExcepcionPeajeVigenciaId() { + return excepcionPeajeVigenciaId; + } + + + public void setExcepcionPeajeVigenciaId(Integer excepcionPeajeVigenciaId) { + this.excepcionPeajeVigenciaId = excepcionPeajeVigenciaId; + } + + + public Boolean getActivo() { + return activo; + } + + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + + public Date getFecmodif() { + return fecmodif; + } + + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + + public Integer getUsuarioId() { + return usuarioId; + } + + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + public ExcepcionPeaje getExcepcionPeaje() { + return excepcionPeaje; + } + + + public void setExcepcionPeaje(ExcepcionPeaje excepcionPeaje) { + this.excepcionPeaje = excepcionPeaje; + } + + + public java.util.Date getFecVentaIni() { + return fecVentaIni; + } + + + public void setFecVentaIni(java.util.Date fecVentaIni) { + this.fecVentaIni = fecVentaIni; + } + + + public java.util.Date getFecVentaFin() { + return fecVentaFin; + } + + + public void setFecVentaFin(java.util.Date fecVentaFin) { + this.fecVentaFin = fecVentaFin; + } + + + public Date getHoraIni() { + return horaIni; + } + + + public void setHoraIni(Date horaIni) { + this.horaIni = horaIni; + } + + + public Date getHoraFin() { + return horaFin; + } + + + public void setHoraFin(Date horaFin) { + this.horaFin = horaFin; + } + + + public Boolean getINDLUNES() { + return INDLUNES; + } + + + public void setINDLUNES(Boolean iNDLUNES) { + INDLUNES = iNDLUNES; + } + + + public Boolean getINDMARTES() { + return INDMARTES; + } + + + public void setINDMARTES(Boolean iNDMARTES) { + INDMARTES = iNDMARTES; + } + + + public Boolean getINDMIERCOLES() { + return INDMIERCOLES; + } + + + public void setINDMIERCOLES(Boolean iNDMIERCOLES) { + INDMIERCOLES = iNDMIERCOLES; + } + + + public Boolean getINDJUEVES() { + return INDJUEVES; + } + + + public void setINDJUEVES(Boolean iNDJUEVES) { + INDJUEVES = iNDJUEVES; + } + + + public Boolean getINDVIERNES() { + return INDVIERNES; + } + + + public void setINDVIERNES(Boolean iNDVIERNES) { + INDVIERNES = iNDVIERNES; + } + + + public Boolean getINDSABADO() { + return INDSABADO; + } + + + public void setINDSABADO(Boolean iNDSABADO) { + INDSABADO = iNDSABADO; + } + + + public Boolean getINDDOMINGO() { + return INDDOMINGO; + } + + + public void setINDDOMINGO(Boolean iNDDOMINGO) { + INDDOMINGO = iNDDOMINGO; + } + + + public BigDecimal getPrecio() { + return precio; + } + + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + + public CasetaPeaje getCasetaPeaje() { + return casetaPeaje; + } + + + public void setCasetaPeaje(CasetaPeaje casetaPeaje) { + this.casetaPeaje = casetaPeaje; + } + + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia[excepcionPeajeVigenciaId=" + excepcionPeajeVigenciaId + "]"; + } + + @Override + public int compareTo(ExcepcionPeajeVigencia excepcionPeajeVigencia) { + if(excepcionPeajeVigencia.getExcepcionPeajeVigenciaId() != null){ + return this.getExcepcionPeajeVigenciaId().intValue() - excepcionPeajeVigencia.getExcepcionPeajeVigenciaId().intValue(); + }else{ + return -1; + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ExcepcionRedondo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionRedondo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ExcepcionRedondo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ExcepcionRedondo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java index 6e6e68f88..5cf96dfbb 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java @@ -1,268 +1,268 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "FECHAMENTO_BOLETO") -public class FechamentoBoleto implements java.io.Serializable{ - - private static final long serialVersionUID = 1L; - - @SequenceGenerator(name = "FECHAMENTO_BOLETO_SEQ", sequenceName = "FECHAMENTO_BOLETO_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_BOLETO_SEQ") - @Column(name = "FECHAMENTOBOLETO_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long fechamentoboletoId; - - @JoinColumn(name = "FECHAMENTOCNTCORRENTE_ID", referencedColumnName="FECHAMENTOCNTCORRENTE_ID") - @ManyToOne - private FechamentoCntcorrente fechamentoCntcorrente; - - @Column(name = "NOSSONUMERO") - private String nossonumero; - - @Column(name = "FECDOCUMENTO", length = 7) - @Temporal(TemporalType.TIMESTAMP) - private Date fecdocumento; - - @Column(name = "FECVENCIMENTO", length = 7) - @Temporal(TemporalType.TIMESTAMP) - private Date fecvencimento; - - @Column(name = "FECBAIXA", length = 7) - @Temporal(TemporalType.TIMESTAMP) - private Date fecbaixa; - - @Column(name = "VALORDOCUMENTO") - private BigDecimal valordocumento; - - @Column(name = "VALOR_JUROS") - private BigDecimal valorjuros; - - @Column(name = "DESCONTOS") - private BigDecimal descontos; - - @Column(name = "DEDUCOES") - private BigDecimal deducoes; - - @Column(name = "MORA") - private BigDecimal mora; - - @Column(name = "ACRESCIMOS") - private BigDecimal acrescimos; - - @Column(name = "VALOR_COBRADO") - private BigDecimal valorCobrado; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "STATUS") - private String status; - - @Column(name = "TIPO_PAGAMENTO") - private String tipoPagamento; - - @Column(name = "REMESSA_ID") - private Long remessaId; - - @Column(name = "PORC_MULTA", precision = 5, scale = 2) - private BigDecimal porcentagemMulta; - - @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; - } - - public void setFechamentoboletoId(Long fechamentoboletoId) { - this.fechamentoboletoId = fechamentoboletoId; - } - - public FechamentoCntcorrente getFechamentoCntcorrente() { - return fechamentoCntcorrente; - } - - public void setFechamentoCntcorrente(FechamentoCntcorrente fechamentoCntcorrente) { - this.fechamentoCntcorrente = fechamentoCntcorrente; - } - - public String getNossonumero() { - return nossonumero; - } - - public void setNossonumero(String nossonumero) { - this.nossonumero = nossonumero; - } - - public Date getFecdocumento() { - return fecdocumento; - } - - public void setFecdocumento(Date fecdocumento) { - this.fecdocumento = fecdocumento; - } - - public Date getFecvencimento() { - return fecvencimento; - } - - public void setFecvencimento(Date fecvencimento) { - this.fecvencimento = fecvencimento; - } - - public BigDecimal getValordocumento() { - return valordocumento; - } - - public void setValordocumento(BigDecimal valordocumento) { - this.valordocumento = valordocumento; - } - - public BigDecimal getDescontos() { - return descontos; - } - - public void setDescontos(BigDecimal descontos) { - this.descontos = descontos; - } - - public BigDecimal getDeducoes() { - return deducoes; - } - - public void setDeducoes(BigDecimal deducoes) { - this.deducoes = deducoes; - } - - public BigDecimal getMora() { - return mora; - } - - public void setMora(BigDecimal mora) { - this.mora = mora; - } - - public BigDecimal getAcrescimos() { - return acrescimos; - } - - public void setAcrescimos(BigDecimal acrescimos) { - this.acrescimos = acrescimos; - } - - public BigDecimal getValorCobrado() { - return valorCobrado; - } - - public void setValorCobrado(BigDecimal valorCobrado) { - this.valorCobrado = valorCobrado; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Long getRemessaId() { - return remessaId; - } - - public void setRemessaId(Long remessaId) { - this.remessaId = remessaId; - } - - public BigDecimal getPorcentagemMulta() { - return porcentagemMulta; - } - - public void setPorcentagemMulta(BigDecimal porcentagemMulta) { - this.porcentagemMulta = porcentagemMulta; - } - - public BigDecimal getPorcentagemMora() { - return porcentagemMora; - } - - 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; - } - - public String getTipoPagamento() { - return tipoPagamento; - } - - public void setTipoPagamento(String tipoPagamento) { - this.tipoPagamento = tipoPagamento; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "FECHAMENTO_BOLETO") +public class FechamentoBoleto implements java.io.Serializable{ + + private static final long serialVersionUID = 1L; + + @SequenceGenerator(name = "FECHAMENTO_BOLETO_SEQ", sequenceName = "FECHAMENTO_BOLETO_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_BOLETO_SEQ") + @Column(name = "FECHAMENTOBOLETO_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long fechamentoboletoId; + + @JoinColumn(name = "FECHAMENTOCNTCORRENTE_ID", referencedColumnName="FECHAMENTOCNTCORRENTE_ID") + @ManyToOne + private FechamentoCntcorrente fechamentoCntcorrente; + + @Column(name = "NOSSONUMERO") + private String nossonumero; + + @Column(name = "FECDOCUMENTO", length = 7) + @Temporal(TemporalType.TIMESTAMP) + private Date fecdocumento; + + @Column(name = "FECVENCIMENTO", length = 7) + @Temporal(TemporalType.TIMESTAMP) + private Date fecvencimento; + + @Column(name = "FECBAIXA", length = 7) + @Temporal(TemporalType.TIMESTAMP) + private Date fecbaixa; + + @Column(name = "VALORDOCUMENTO") + private BigDecimal valordocumento; + + @Column(name = "VALOR_JUROS") + private BigDecimal valorjuros; + + @Column(name = "DESCONTOS") + private BigDecimal descontos; + + @Column(name = "DEDUCOES") + private BigDecimal deducoes; + + @Column(name = "MORA") + private BigDecimal mora; + + @Column(name = "ACRESCIMOS") + private BigDecimal acrescimos; + + @Column(name = "VALOR_COBRADO") + private BigDecimal valorCobrado; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "STATUS") + private String status; + + @Column(name = "TIPO_PAGAMENTO") + private String tipoPagamento; + + @Column(name = "REMESSA_ID") + private Long remessaId; + + @Column(name = "PORC_MULTA", precision = 5, scale = 2) + private BigDecimal porcentagemMulta; + + @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; + } + + public void setFechamentoboletoId(Long fechamentoboletoId) { + this.fechamentoboletoId = fechamentoboletoId; + } + + public FechamentoCntcorrente getFechamentoCntcorrente() { + return fechamentoCntcorrente; + } + + public void setFechamentoCntcorrente(FechamentoCntcorrente fechamentoCntcorrente) { + this.fechamentoCntcorrente = fechamentoCntcorrente; + } + + public String getNossonumero() { + return nossonumero; + } + + public void setNossonumero(String nossonumero) { + this.nossonumero = nossonumero; + } + + public Date getFecdocumento() { + return fecdocumento; + } + + public void setFecdocumento(Date fecdocumento) { + this.fecdocumento = fecdocumento; + } + + public Date getFecvencimento() { + return fecvencimento; + } + + public void setFecvencimento(Date fecvencimento) { + this.fecvencimento = fecvencimento; + } + + public BigDecimal getValordocumento() { + return valordocumento; + } + + public void setValordocumento(BigDecimal valordocumento) { + this.valordocumento = valordocumento; + } + + public BigDecimal getDescontos() { + return descontos; + } + + public void setDescontos(BigDecimal descontos) { + this.descontos = descontos; + } + + public BigDecimal getDeducoes() { + return deducoes; + } + + public void setDeducoes(BigDecimal deducoes) { + this.deducoes = deducoes; + } + + public BigDecimal getMora() { + return mora; + } + + public void setMora(BigDecimal mora) { + this.mora = mora; + } + + public BigDecimal getAcrescimos() { + return acrescimos; + } + + public void setAcrescimos(BigDecimal acrescimos) { + this.acrescimos = acrescimos; + } + + public BigDecimal getValorCobrado() { + return valorCobrado; + } + + public void setValorCobrado(BigDecimal valorCobrado) { + this.valorCobrado = valorCobrado; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Long getRemessaId() { + return remessaId; + } + + public void setRemessaId(Long remessaId) { + this.remessaId = remessaId; + } + + public BigDecimal getPorcentagemMulta() { + return porcentagemMulta; + } + + public void setPorcentagemMulta(BigDecimal porcentagemMulta) { + this.porcentagemMulta = porcentagemMulta; + } + + public BigDecimal getPorcentagemMora() { + return porcentagemMora; + } + + 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; + } + + public String getTipoPagamento() { + return tipoPagamento; + } + + public void setTipoPagamento(String tipoPagamento) { + this.tipoPagamento = tipoPagamento; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FechamentoCntcorrente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoCntcorrente.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/FechamentoCntcorrente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoCntcorrente.java index 1a939709f..7a6de826f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FechamentoCntcorrente.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoCntcorrente.java @@ -1,181 +1,181 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import com.rjconsultores.ventaboletos.enums.StatusIntegracaoSap; - -@Entity -@Table(name = "FECHAMENTO_CNTCORRENTE") -public class FechamentoCntcorrente { - - @SequenceGenerator(name = "FECHAMENTO_CNTCORRENTE_SEQ", sequenceName = "FECHAMENTO_CNTCORRENTE_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_CNTCORRENTE_SEQ") - @Column(name = "FECHAMENTOCNTCORRENTE_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long fechamentocntcorrenteId; - - @Column(name = "TOTAL") - private BigDecimal total; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECFECHAMENTO", length = 7) - private Date fecfechamento; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECINIFECHAMENTO", length = 7) - private Date fecinifechamento; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECFINFECHAMENTO", length = 7) - private Date fecfinfechamento; - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventa; - - @JoinColumn(name = "EMPRESA_ID", referencedColumnName="EMPRESA_ID") - @ManyToOne - private Empresa empresa; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "INDCOMISSAO") - private Boolean indComissao; - - @Column(name = "INDEMAILENVIADO") - private Boolean indemailenviado; - - @Column(name = "INDINTEGRADOSAP") - @Enumerated(EnumType.ORDINAL) - private StatusIntegracaoSap integradoSap; - - public Long getFechamentocntcorrenteId() { - return fechamentocntcorrenteId; - } - - public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { - this.fechamentocntcorrenteId = fechamentocntcorrenteId; - } - - public BigDecimal getTotal() { - return total; - } - - public void setTotal(BigDecimal total) { - this.total = total; - } - - public Date getFecfechamento() { - return fecfechamento; - } - - public void setFecfechamento(Date fecfechamento) { - this.fecfechamento = fecfechamento; - } - - public Date getFecinifechamento() { - return fecinifechamento; - } - - public void setFecinifechamento(Date fecinifechamento) { - this.fecinifechamento = fecinifechamento; - } - - public Date getFecfinfechamento() { - return fecfinfechamento; - } - - public void setFecfinfechamento(Date fecfinfechamento) { - this.fecfinfechamento = fecfinfechamento; - } - - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Boolean getIndComissao() { - return indComissao; - } - - public void setIndComissao(Boolean indComissao) { - this.indComissao = indComissao; - } - - public Boolean getIndemailenviado() { - return indemailenviado; - } - - public void setIndemailenviado(Boolean indemailenviado) { - this.indemailenviado = indemailenviado; - } - - public StatusIntegracaoSap getIntegradoSap() { - return integradoSap; - } - - public void setIntegradoSap(StatusIntegracaoSap integradoSap) { - this.integradoSap = integradoSap; - } - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import com.rjconsultores.ventaboletos.enums.StatusIntegracaoSap; + +@Entity +@Table(name = "FECHAMENTO_CNTCORRENTE") +public class FechamentoCntcorrente { + + @SequenceGenerator(name = "FECHAMENTO_CNTCORRENTE_SEQ", sequenceName = "FECHAMENTO_CNTCORRENTE_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_CNTCORRENTE_SEQ") + @Column(name = "FECHAMENTOCNTCORRENTE_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long fechamentocntcorrenteId; + + @Column(name = "TOTAL") + private BigDecimal total; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECFECHAMENTO", length = 7) + private Date fecfechamento; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECINIFECHAMENTO", length = 7) + private Date fecinifechamento; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECFINFECHAMENTO", length = 7) + private Date fecfinfechamento; + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventa; + + @JoinColumn(name = "EMPRESA_ID", referencedColumnName="EMPRESA_ID") + @ManyToOne + private Empresa empresa; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "INDCOMISSAO") + private Boolean indComissao; + + @Column(name = "INDEMAILENVIADO") + private Boolean indemailenviado; + + @Column(name = "INDINTEGRADOSAP") + @Enumerated(EnumType.ORDINAL) + private StatusIntegracaoSap integradoSap; + + public Long getFechamentocntcorrenteId() { + return fechamentocntcorrenteId; + } + + public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { + this.fechamentocntcorrenteId = fechamentocntcorrenteId; + } + + public BigDecimal getTotal() { + return total; + } + + public void setTotal(BigDecimal total) { + this.total = total; + } + + public Date getFecfechamento() { + return fecfechamento; + } + + public void setFecfechamento(Date fecfechamento) { + this.fecfechamento = fecfechamento; + } + + public Date getFecinifechamento() { + return fecinifechamento; + } + + public void setFecinifechamento(Date fecinifechamento) { + this.fecinifechamento = fecinifechamento; + } + + public Date getFecfinfechamento() { + return fecfinfechamento; + } + + public void setFecfinfechamento(Date fecfinfechamento) { + this.fecfinfechamento = fecfinfechamento; + } + + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Boolean getIndComissao() { + return indComissao; + } + + public void setIndComissao(Boolean indComissao) { + this.indComissao = indComissao; + } + + public Boolean getIndemailenviado() { + return indemailenviado; + } + + public void setIndemailenviado(Boolean indemailenviado) { + this.indemailenviado = indemailenviado; + } + + public StatusIntegracaoSap getIntegradoSap() { + return integradoSap; + } + + public void setIntegradoSap(StatusIntegracaoSap integradoSap) { + this.integradoSap = integradoSap; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamgeral.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamgeral.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FechamentoParamgeral.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamgeral.java index 346b171d2..8f869e364 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamgeral.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamgeral.java @@ -1,356 +1,356 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "FECHAMENTO_PARAMGERAL") -public class FechamentoParamgeral implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - - @SequenceGenerator(name = "FECHAMENTO_PARAMGERAL_SEQ", sequenceName = "FECHAMENTO_PARAMGERAL_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_PARAMGERAL_SEQ") - @Column(name = "FECHAMENTOPARAMGERAL_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long fechamentoparamgeralId; - - @JoinColumn(name = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - - @Column(name = "BOLETO_BANCO_COD", length = 4) - private String boletoBancoCod; - - @Column(name = "BOLETO_BANCO_AGENCIA", length = 10) - private String boletoBancoAgencia; - - @Column(name = "BOLETO_BANCO_AGENCIA_DIGITO", length = 10) - private String boletoBancoAgenciaDigito; - - @Column(name = "BOLETO_BANCO_CONTA", length = 10) - private String boletoBancoConta; - - @Column(name = "BOLETO_BANCO_CONTA_DIGITO", length = 1) - private String boletoBancoContaDigito; - - @Column(name = "BOLETO_BANCO_CARTEIRA", length = 3) - private String boletoBancoCarteira; - - @Column(name = "BOLETO_BANCO_CARTEIRA_VARIAVEL", length = 3) - private String boletoBancoCarteiraVariavel; - - @Column(name = "BOLETO_DIAS_VENC", length = 3) - private Integer boletoDiasVenc; - - @Column(name = "BOLETO_JUROS", precision = 5, scale = 2) - private BigDecimal boletoJuros; - - @Column(name = "BOLETO_MULTA", precision = 5, scale = 2) - private BigDecimal boletoMulta; - - @Column(name = "COD_EMP_BANCO", precision = 7, scale = 0) - private String codConvenio; - - @Column(name = "BOLETO_BANCO_INSTRUCAO", precision = 255) - private String boletoBancoInstrucao; - - @Column(name = "BOLETO_BANCO_INSTRUCAO2", precision = 255) - private String boletoBancoInstrucao2; - - @Column(name = "BOLETO_BANCO_INSTRUCAO3", precision = 255) - private String boletoBancoInstrucao3; - - @Column(name = "BOLETO_BANCO_INSTRUCAO_SACADO", precision = 255) - private String boletoBancoInstrucaoSacado; - - @Column(name = "COUNT_REMESSA", precision = 15, scale = 0) - private Long countRemessa; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - public FechamentoParamgeral() { - super(); - } - - public FechamentoParamgeral(Empresa empresa, String boletoBancoCod, - String boletoBancoAgencia, String boletoBancoConta, - String boletoBancoContaDigito, String boletoBancoCarteira, - Integer boletoDiasVenc, Date fecmodif, Integer usuarioId, - Boolean activo) { - this(); - this.empresa = empresa; - this.boletoBancoCod = boletoBancoCod; - this.boletoBancoAgencia = boletoBancoAgencia; - this.boletoBancoConta = boletoBancoConta; - this.boletoBancoContaDigito = boletoBancoContaDigito; - this.boletoBancoCarteira = boletoBancoCarteira; - this.boletoDiasVenc = boletoDiasVenc; - - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.activo = activo; - } - - public FechamentoParamgeral(Long fechamentoparamgeralId, Empresa empresa, String boletoBancoCod, - String boletoBancoAgencia, String boletoBancoAgenciaDigito, String boletoBancoConta, - String boletoBancoContaDigito, String boletoBancoCarteira, String boletoBancoCarteiraVariavel, - Integer boletoDiasVenc, BigDecimal boletoJuros, BigDecimal boletoMulta, - String codConvenio, String boletoBancoInstrucao, String boletoBancoInstrucao2, - String boletoBancoInstrucao3, String boletoBancoInstrucaoSacado, Long countRemessa, - Date fecmodif, Integer usuarioId, Boolean activo) { - super(); - this.fechamentoparamgeralId = fechamentoparamgeralId; - this.empresa = empresa; - this.boletoBancoCod = boletoBancoCod; - this.boletoBancoAgencia = boletoBancoAgencia; - this.boletoBancoAgenciaDigito = boletoBancoAgenciaDigito; - this.boletoBancoConta = boletoBancoConta; - this.boletoBancoContaDigito = boletoBancoContaDigito; - this.boletoBancoCarteira = boletoBancoCarteira; - this.boletoBancoCarteiraVariavel = boletoBancoCarteiraVariavel; - this.boletoDiasVenc = boletoDiasVenc; - this.boletoJuros = boletoJuros; - this.boletoMulta = boletoMulta; - this.codConvenio = codConvenio; - this.boletoBancoInstrucao = boletoBancoInstrucao; - this.boletoBancoInstrucao2 = boletoBancoInstrucao2; - this.boletoBancoInstrucao3 = boletoBancoInstrucao3; - this.boletoBancoInstrucaoSacado = boletoBancoInstrucaoSacado; - this.countRemessa = countRemessa; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.activo = activo; - } - - public FechamentoParamgeral(Empresa empresa, String boletoBancoCod, - String boletoBancoAgencia, String boletoBancoConta, - String boletoBancoContaDigito, String boletoBancoCarteira, - Integer boletoDiasVenc, Integer usuarioId) { - this(); - this.empresa = empresa; - this.boletoBancoCod = boletoBancoCod; - this.boletoBancoAgencia = boletoBancoAgencia; - this.boletoBancoConta = boletoBancoConta; - this.boletoBancoContaDigito = boletoBancoContaDigito; - this.boletoBancoCarteira = boletoBancoCarteira; - this.boletoDiasVenc = boletoDiasVenc; - - this.fecmodif = new Date(); - this.usuarioId = usuarioId; - this.activo = true; - } - - public Long getFechamentoparamgeralId() { - return fechamentoparamgeralId; - } - - public void setFechamentoparamgeralId(Long fechamentoparamgeralId) { - this.fechamentoparamgeralId = fechamentoparamgeralId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public String getBoletoBancoCod() { - return boletoBancoCod; - } - - public void setBoletoBancoCod(String boletoBancoCod) { - this.boletoBancoCod = boletoBancoCod; - } - - public String getBoletoBancoAgencia() { - return boletoBancoAgencia; - } - - public void setBoletoBancoAgencia(String boletoBancoAgencia) { - this.boletoBancoAgencia = boletoBancoAgencia; - } - - public String getBoletoBancoAgenciaDigito() { - return boletoBancoAgenciaDigito; - } - - public void setBoletoBancoAgenciaDigito(String boletoBancoAgenciaDigito) { - this.boletoBancoAgenciaDigito = boletoBancoAgenciaDigito; - } - - public String getBoletoBancoConta() { - return boletoBancoConta; - } - - public void setBoletoBancoConta(String boletoBancoConta) { - this.boletoBancoConta = boletoBancoConta; - } - - public String getBoletoBancoContaDigito() { - return boletoBancoContaDigito; - } - - public void setBoletoBancoContaDigito(String boletoBancoContaDigito) { - this.boletoBancoContaDigito = boletoBancoContaDigito; - } - - public String getBoletoBancoCarteira() { - return boletoBancoCarteira; - } - - public void setBoletoBancoCarteira(String boletoBancoCarteira) { - this.boletoBancoCarteira = boletoBancoCarteira; - } - - public String getBoletoBancoCarteiraVariavel() { - return boletoBancoCarteiraVariavel; - } - - public void setBoletoBancoCarteiraVariavel(String boletoBancoCarteiraVariavel) { - this.boletoBancoCarteiraVariavel = boletoBancoCarteiraVariavel; - } - - public Integer getBoletoDiasVenc() { - return boletoDiasVenc; - } - - public void setBoletoDiasVenc(Integer boletoDiasVenc) { - this.boletoDiasVenc = boletoDiasVenc; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getCodConvenio() { - return codConvenio; - } - - public void setCodConvenio(String codConvenio) { - this.codConvenio = codConvenio; - } - - public String getBoletoBancoInstrucao() { - return boletoBancoInstrucao; - } - - public void setBoletoBancoInstrucao(String boletoBancoInstrucao) { - this.boletoBancoInstrucao = boletoBancoInstrucao; - } - - public String getBoletoBancoInstrucao2() { - return boletoBancoInstrucao2; - } - - public void setBoletoBancoInstrucao2(String boletoBancoInstrucao2) { - this.boletoBancoInstrucao2 = boletoBancoInstrucao2; - } - - public String getBoletoBancoInstrucao3() { - return boletoBancoInstrucao3; - } - - public void setBoletoBancoInstrucao3(String boletoBancoInstrucao3) { - this.boletoBancoInstrucao3 = boletoBancoInstrucao3; - } - - public String getBoletoBancoInstrucaoSacado() { - return boletoBancoInstrucaoSacado; - } - - public void setBoletoBancoInstrucaoSacado(String boletoBancoInstrucaoSacado) { - this.boletoBancoInstrucaoSacado = boletoBancoInstrucaoSacado; - } - - public Long getCountRemessa() { - return countRemessa; - } - - public void setCountRemessa(Long countRemessa) { - this.countRemessa = countRemessa; - } - - public BigDecimal getBoletoJuros() { - return boletoJuros; - } - - public void setBoletoJuros(BigDecimal boletoJuros) { - this.boletoJuros = boletoJuros; - } - - public BigDecimal getBoletoMulta() { - return boletoMulta; - } - - public void setBoletoMulta(BigDecimal boletoMulta) { - this.boletoMulta = boletoMulta; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((fechamentoparamgeralId == null) ? 0 : fechamentoparamgeralId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof FechamentoParamgeral)) - return false; - FechamentoParamgeral other = (FechamentoParamgeral) obj; - if (fechamentoparamgeralId == null) { - if (other.fechamentoparamgeralId != null) - return false; - } else if (!fechamentoparamgeralId.equals(other.fechamentoparamgeralId)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "FECHAMENTO_PARAMGERAL") +public class FechamentoParamgeral implements java.io.Serializable { + + private static final long serialVersionUID = 1L; + + @SequenceGenerator(name = "FECHAMENTO_PARAMGERAL_SEQ", sequenceName = "FECHAMENTO_PARAMGERAL_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_PARAMGERAL_SEQ") + @Column(name = "FECHAMENTOPARAMGERAL_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long fechamentoparamgeralId; + + @JoinColumn(name = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + + @Column(name = "BOLETO_BANCO_COD", length = 4) + private String boletoBancoCod; + + @Column(name = "BOLETO_BANCO_AGENCIA", length = 10) + private String boletoBancoAgencia; + + @Column(name = "BOLETO_BANCO_AGENCIA_DIGITO", length = 10) + private String boletoBancoAgenciaDigito; + + @Column(name = "BOLETO_BANCO_CONTA", length = 10) + private String boletoBancoConta; + + @Column(name = "BOLETO_BANCO_CONTA_DIGITO", length = 1) + private String boletoBancoContaDigito; + + @Column(name = "BOLETO_BANCO_CARTEIRA", length = 3) + private String boletoBancoCarteira; + + @Column(name = "BOLETO_BANCO_CARTEIRA_VARIAVEL", length = 3) + private String boletoBancoCarteiraVariavel; + + @Column(name = "BOLETO_DIAS_VENC", length = 3) + private Integer boletoDiasVenc; + + @Column(name = "BOLETO_JUROS", precision = 5, scale = 2) + private BigDecimal boletoJuros; + + @Column(name = "BOLETO_MULTA", precision = 5, scale = 2) + private BigDecimal boletoMulta; + + @Column(name = "COD_EMP_BANCO", precision = 7, scale = 0) + private String codConvenio; + + @Column(name = "BOLETO_BANCO_INSTRUCAO", precision = 255) + private String boletoBancoInstrucao; + + @Column(name = "BOLETO_BANCO_INSTRUCAO2", precision = 255) + private String boletoBancoInstrucao2; + + @Column(name = "BOLETO_BANCO_INSTRUCAO3", precision = 255) + private String boletoBancoInstrucao3; + + @Column(name = "BOLETO_BANCO_INSTRUCAO_SACADO", precision = 255) + private String boletoBancoInstrucaoSacado; + + @Column(name = "COUNT_REMESSA", precision = 15, scale = 0) + private Long countRemessa; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + public FechamentoParamgeral() { + super(); + } + + public FechamentoParamgeral(Empresa empresa, String boletoBancoCod, + String boletoBancoAgencia, String boletoBancoConta, + String boletoBancoContaDigito, String boletoBancoCarteira, + Integer boletoDiasVenc, Date fecmodif, Integer usuarioId, + Boolean activo) { + this(); + this.empresa = empresa; + this.boletoBancoCod = boletoBancoCod; + this.boletoBancoAgencia = boletoBancoAgencia; + this.boletoBancoConta = boletoBancoConta; + this.boletoBancoContaDigito = boletoBancoContaDigito; + this.boletoBancoCarteira = boletoBancoCarteira; + this.boletoDiasVenc = boletoDiasVenc; + + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.activo = activo; + } + + public FechamentoParamgeral(Long fechamentoparamgeralId, Empresa empresa, String boletoBancoCod, + String boletoBancoAgencia, String boletoBancoAgenciaDigito, String boletoBancoConta, + String boletoBancoContaDigito, String boletoBancoCarteira, String boletoBancoCarteiraVariavel, + Integer boletoDiasVenc, BigDecimal boletoJuros, BigDecimal boletoMulta, + String codConvenio, String boletoBancoInstrucao, String boletoBancoInstrucao2, + String boletoBancoInstrucao3, String boletoBancoInstrucaoSacado, Long countRemessa, + Date fecmodif, Integer usuarioId, Boolean activo) { + super(); + this.fechamentoparamgeralId = fechamentoparamgeralId; + this.empresa = empresa; + this.boletoBancoCod = boletoBancoCod; + this.boletoBancoAgencia = boletoBancoAgencia; + this.boletoBancoAgenciaDigito = boletoBancoAgenciaDigito; + this.boletoBancoConta = boletoBancoConta; + this.boletoBancoContaDigito = boletoBancoContaDigito; + this.boletoBancoCarteira = boletoBancoCarteira; + this.boletoBancoCarteiraVariavel = boletoBancoCarteiraVariavel; + this.boletoDiasVenc = boletoDiasVenc; + this.boletoJuros = boletoJuros; + this.boletoMulta = boletoMulta; + this.codConvenio = codConvenio; + this.boletoBancoInstrucao = boletoBancoInstrucao; + this.boletoBancoInstrucao2 = boletoBancoInstrucao2; + this.boletoBancoInstrucao3 = boletoBancoInstrucao3; + this.boletoBancoInstrucaoSacado = boletoBancoInstrucaoSacado; + this.countRemessa = countRemessa; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.activo = activo; + } + + public FechamentoParamgeral(Empresa empresa, String boletoBancoCod, + String boletoBancoAgencia, String boletoBancoConta, + String boletoBancoContaDigito, String boletoBancoCarteira, + Integer boletoDiasVenc, Integer usuarioId) { + this(); + this.empresa = empresa; + this.boletoBancoCod = boletoBancoCod; + this.boletoBancoAgencia = boletoBancoAgencia; + this.boletoBancoConta = boletoBancoConta; + this.boletoBancoContaDigito = boletoBancoContaDigito; + this.boletoBancoCarteira = boletoBancoCarteira; + this.boletoDiasVenc = boletoDiasVenc; + + this.fecmodif = new Date(); + this.usuarioId = usuarioId; + this.activo = true; + } + + public Long getFechamentoparamgeralId() { + return fechamentoparamgeralId; + } + + public void setFechamentoparamgeralId(Long fechamentoparamgeralId) { + this.fechamentoparamgeralId = fechamentoparamgeralId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public String getBoletoBancoCod() { + return boletoBancoCod; + } + + public void setBoletoBancoCod(String boletoBancoCod) { + this.boletoBancoCod = boletoBancoCod; + } + + public String getBoletoBancoAgencia() { + return boletoBancoAgencia; + } + + public void setBoletoBancoAgencia(String boletoBancoAgencia) { + this.boletoBancoAgencia = boletoBancoAgencia; + } + + public String getBoletoBancoAgenciaDigito() { + return boletoBancoAgenciaDigito; + } + + public void setBoletoBancoAgenciaDigito(String boletoBancoAgenciaDigito) { + this.boletoBancoAgenciaDigito = boletoBancoAgenciaDigito; + } + + public String getBoletoBancoConta() { + return boletoBancoConta; + } + + public void setBoletoBancoConta(String boletoBancoConta) { + this.boletoBancoConta = boletoBancoConta; + } + + public String getBoletoBancoContaDigito() { + return boletoBancoContaDigito; + } + + public void setBoletoBancoContaDigito(String boletoBancoContaDigito) { + this.boletoBancoContaDigito = boletoBancoContaDigito; + } + + public String getBoletoBancoCarteira() { + return boletoBancoCarteira; + } + + public void setBoletoBancoCarteira(String boletoBancoCarteira) { + this.boletoBancoCarteira = boletoBancoCarteira; + } + + public String getBoletoBancoCarteiraVariavel() { + return boletoBancoCarteiraVariavel; + } + + public void setBoletoBancoCarteiraVariavel(String boletoBancoCarteiraVariavel) { + this.boletoBancoCarteiraVariavel = boletoBancoCarteiraVariavel; + } + + public Integer getBoletoDiasVenc() { + return boletoDiasVenc; + } + + public void setBoletoDiasVenc(Integer boletoDiasVenc) { + this.boletoDiasVenc = boletoDiasVenc; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getCodConvenio() { + return codConvenio; + } + + public void setCodConvenio(String codConvenio) { + this.codConvenio = codConvenio; + } + + public String getBoletoBancoInstrucao() { + return boletoBancoInstrucao; + } + + public void setBoletoBancoInstrucao(String boletoBancoInstrucao) { + this.boletoBancoInstrucao = boletoBancoInstrucao; + } + + public String getBoletoBancoInstrucao2() { + return boletoBancoInstrucao2; + } + + public void setBoletoBancoInstrucao2(String boletoBancoInstrucao2) { + this.boletoBancoInstrucao2 = boletoBancoInstrucao2; + } + + public String getBoletoBancoInstrucao3() { + return boletoBancoInstrucao3; + } + + public void setBoletoBancoInstrucao3(String boletoBancoInstrucao3) { + this.boletoBancoInstrucao3 = boletoBancoInstrucao3; + } + + public String getBoletoBancoInstrucaoSacado() { + return boletoBancoInstrucaoSacado; + } + + public void setBoletoBancoInstrucaoSacado(String boletoBancoInstrucaoSacado) { + this.boletoBancoInstrucaoSacado = boletoBancoInstrucaoSacado; + } + + public Long getCountRemessa() { + return countRemessa; + } + + public void setCountRemessa(Long countRemessa) { + this.countRemessa = countRemessa; + } + + public BigDecimal getBoletoJuros() { + return boletoJuros; + } + + public void setBoletoJuros(BigDecimal boletoJuros) { + this.boletoJuros = boletoJuros; + } + + public BigDecimal getBoletoMulta() { + return boletoMulta; + } + + public void setBoletoMulta(BigDecimal boletoMulta) { + this.boletoMulta = boletoMulta; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((fechamentoparamgeralId == null) ? 0 : fechamentoparamgeralId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof FechamentoParamgeral)) + return false; + FechamentoParamgeral other = (FechamentoParamgeral) obj; + if (fechamentoparamgeralId == null) { + if (other.fechamentoparamgeralId != null) + return false; + } else if (!fechamentoparamgeralId.equals(other.fechamentoparamgeralId)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamptovta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamptovta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FechamentoParamptovta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamptovta.java index ab5c96614..69723f7d6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamptovta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FechamentoParamptovta.java @@ -1,155 +1,155 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@Table(name = "FECHAMENTO_PARAMPTOVTA") -public class FechamentoParamptovta implements Serializable { - - private static final long serialVersionUID = 1L; - - private Long fechamentoparamptovtaId; - private PuntoVenta puntoventa; - private Empresa empresa; - private Integer intervalofechamento; - private Date fecmodif; - private Integer usuarioId; - private Boolean activo; - private Integer diasemtransito; - private String tipopagamento; - - - public FechamentoParamptovta() { - } - - public FechamentoParamptovta( PuntoVenta puntoventa, Empresa empresa, Integer usuarioId) { - this.puntoventa = puntoventa; - this.empresa = empresa; - - this.fecmodif = new Date(); - this.usuarioId = usuarioId; - this.activo = true; - } - - public FechamentoParamptovta( - PuntoVenta puntoventa, Empresa empresa, Integer intervalofechamento, - Date fecmodif, Integer usuarioId, Boolean activo) { - this.puntoventa = puntoventa; - this.empresa = empresa; - this.intervalofechamento = intervalofechamento; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.activo = activo; - } - - - @SequenceGenerator(name = "FECHAMENTO_PARAMPTOVTA_SEQ", sequenceName = "FECHAMENTO_PARAMPTOVTA_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_PARAMPTOVTA_SEQ") - @Column(name = "FECHAMENTOPARAMPTOVTA_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getFechamentoparamptovtaId() { - return this.fechamentoparamptovtaId; - } - - public void setFechamentoparamptovtaId(Long fechamentoparamptovtaId) { - this.fechamentoparamptovtaId = fechamentoparamptovtaId; - } - - public void setIntervalofechamento(Integer intervalofechamento) { - this.intervalofechamento = intervalofechamento; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - @JoinColumn(name = "EMPRESA_ID") - @ManyToOne - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Column(name = "INTERVALOFECHAMENTO", length = 2) - public Integer getIntervalofechamento() { - return intervalofechamento; - } - - @Column(name = "DIASEMTRANSITO", length = 2) - public Integer getDiasemtransito() { - return diasemtransito; - } - - public void setDiasemtransito(Integer diasemtransito) { - this.diasemtransito = diasemtransito; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("FechamentoParamptovta [fechamentoparamptovtaId=").append(fechamentoparamptovtaId).append(", puntoventa=").append(puntoventa).append(", empresa=").append(empresa).append(", intervalofechamento=").append(intervalofechamento).append(", fecmodif=").append(fecmodif).append(", usuarioId=").append(usuarioId).append(", activo=").append(activo).append(", diasemtransito=").append(diasemtransito).append("]"); - return builder.toString(); - } - - @Column(name = "TIPOPAGAMENTO", length = 1) - public String getTipopagamento() { - return tipopagamento; - } - - public void setTipopagamento(String tipopagamento) { - this.tipopagamento = tipopagamento; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@Table(name = "FECHAMENTO_PARAMPTOVTA") +public class FechamentoParamptovta implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long fechamentoparamptovtaId; + private PuntoVenta puntoventa; + private Empresa empresa; + private Integer intervalofechamento; + private Date fecmodif; + private Integer usuarioId; + private Boolean activo; + private Integer diasemtransito; + private String tipopagamento; + + + public FechamentoParamptovta() { + } + + public FechamentoParamptovta( PuntoVenta puntoventa, Empresa empresa, Integer usuarioId) { + this.puntoventa = puntoventa; + this.empresa = empresa; + + this.fecmodif = new Date(); + this.usuarioId = usuarioId; + this.activo = true; + } + + public FechamentoParamptovta( + PuntoVenta puntoventa, Empresa empresa, Integer intervalofechamento, + Date fecmodif, Integer usuarioId, Boolean activo) { + this.puntoventa = puntoventa; + this.empresa = empresa; + this.intervalofechamento = intervalofechamento; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.activo = activo; + } + + + @SequenceGenerator(name = "FECHAMENTO_PARAMPTOVTA_SEQ", sequenceName = "FECHAMENTO_PARAMPTOVTA_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FECHAMENTO_PARAMPTOVTA_SEQ") + @Column(name = "FECHAMENTOPARAMPTOVTA_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getFechamentoparamptovtaId() { + return this.fechamentoparamptovtaId; + } + + public void setFechamentoparamptovtaId(Long fechamentoparamptovtaId) { + this.fechamentoparamptovtaId = fechamentoparamptovtaId; + } + + public void setIntervalofechamento(Integer intervalofechamento) { + this.intervalofechamento = intervalofechamento; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + @JoinColumn(name = "EMPRESA_ID") + @ManyToOne + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Column(name = "INTERVALOFECHAMENTO", length = 2) + public Integer getIntervalofechamento() { + return intervalofechamento; + } + + @Column(name = "DIASEMTRANSITO", length = 2) + public Integer getDiasemtransito() { + return diasemtransito; + } + + public void setDiasemtransito(Integer diasemtransito) { + this.diasemtransito = diasemtransito; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("FechamentoParamptovta [fechamentoparamptovtaId=").append(fechamentoparamptovtaId).append(", puntoventa=").append(puntoventa).append(", empresa=").append(empresa).append(", intervalofechamento=").append(intervalofechamento).append(", fecmodif=").append(fecmodif).append(", usuarioId=").append(usuarioId).append(", activo=").append(activo).append(", diasemtransito=").append(diasemtransito).append("]"); + return builder.toString(); + } + + @Column(name = "TIPOPAGAMENTO", length = 1) + public String getTipopagamento() { + return tipopagamento; + } + + public void setTipopagamento(String tipopagamento) { + this.tipopagamento = tipopagamento; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Feriado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Feriado.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/Feriado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Feriado.java index cc9ab0c86..191f9465b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Feriado.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Feriado.java @@ -1,158 +1,158 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author Rafius - */ -@Entity -@SequenceGenerator(name = "FERIADO_SEQ", sequenceName = "FERIADO_SEQ", allocationSize = 1) -@Table(name = "FERIADO") -public class Feriado implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @Column(name = "FERIADO_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FERIADO_SEQ") - private Integer feriadoId; - @Column(name = "FECFERIADO") - @Temporal(TemporalType.DATE) - private Date fecferiado; - @Column(name = "DESCFERIADO") - private String descferiado; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToOne - @JoinColumn(name = "ESTADO_ID") - private Estado estado; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - public Feriado(Integer feriadoId, Date fecferiado, String descferiado) { - super(); - this.feriadoId = feriadoId; - this.fecferiado = fecferiado; - this.descferiado = descferiado; - } - - public Feriado() { - } - - public Feriado(Integer feriadoId) { - this.feriadoId = feriadoId; - } - - public Integer getFeriadoId() { - return feriadoId; - } - - public void setFeriadoId(Integer feriadoId) { - this.feriadoId = feriadoId; - } - - public Date getFecferiado() { - return fecferiado; - } - - public void setFecferiado(Date fecferiado) { - this.fecferiado = fecferiado; - } - - public String getDescferiado() { - return descferiado; - } - - public void setDescferiado(String descferiado) { - this.descferiado = descferiado; - } - - public Date getFecmodif() { - return fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (feriadoId != null ? feriadoId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Feriado)) { - return false; - } - Feriado other = (Feriado) object; - if ((this.feriadoId == null && other.feriadoId != null) || (this.feriadoId != null && !this.feriadoId.equals(other.feriadoId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return this.descferiado; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author Rafius + */ +@Entity +@SequenceGenerator(name = "FERIADO_SEQ", sequenceName = "FERIADO_SEQ", allocationSize = 1) +@Table(name = "FERIADO") +public class Feriado implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @Column(name = "FERIADO_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FERIADO_SEQ") + private Integer feriadoId; + @Column(name = "FECFERIADO") + @Temporal(TemporalType.DATE) + private Date fecferiado; + @Column(name = "DESCFERIADO") + private String descferiado; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToOne + @JoinColumn(name = "ESTADO_ID") + private Estado estado; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + public Feriado(Integer feriadoId, Date fecferiado, String descferiado) { + super(); + this.feriadoId = feriadoId; + this.fecferiado = fecferiado; + this.descferiado = descferiado; + } + + public Feriado() { + } + + public Feriado(Integer feriadoId) { + this.feriadoId = feriadoId; + } + + public Integer getFeriadoId() { + return feriadoId; + } + + public void setFeriadoId(Integer feriadoId) { + this.feriadoId = feriadoId; + } + + public Date getFecferiado() { + return fecferiado; + } + + public void setFecferiado(Date fecferiado) { + this.fecferiado = fecferiado; + } + + public String getDescferiado() { + return descferiado; + } + + public void setDescferiado(String descferiado) { + this.descferiado = descferiado; + } + + public Date getFecmodif() { + return fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (feriadoId != null ? feriadoId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Feriado)) { + return false; + } + Feriado other = (Feriado) object; + if ((this.feriadoId == null && other.feriadoId != null) || (this.feriadoId != null && !this.feriadoId.equals(other.feriadoId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return this.descferiado; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FiscalAliquotaEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalAliquotaEmpresa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/FiscalAliquotaEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalAliquotaEmpresa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/FiscalFormapagoEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalFormapagoEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FiscalFormapagoEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalFormapagoEmpresa.java index b525120ad..837e8698c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FiscalFormapagoEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalFormapagoEmpresa.java @@ -1,134 +1,134 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "FISCAL_FORMAPAGO_EMP_SEQ", sequenceName = "FISCAL_FORMAPAGO_EMP_SEQ", allocationSize = 1) -@Table(name = "FISCAL_FORMAPAGO_EMPRESA") -public class FiscalFormapagoEmpresa { - - @Id - @Basic(optional = false) - @Column(name = "FISCALFORMAPAGOEMPRESA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_FORMAPAGO_EMP_SEQ") - private Long fiscalformapagoempresaId; - @Column(name = "TIPOFORMAPAGO") - private String tipoformapago; - @Column(name = "DESCRICAO") - private String descricao; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @ManyToOne - @JoinColumn(name = "FORMAPAGO_ID") - private FormaPago formaPago; - @Column(name = "INDVINCULADO") - private Boolean indVinculado; - - - public String getDescricao() { - return descricao; - } - public void setDescricao(String descricao) { - this.descricao = descricao; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public FormaPago getFormaPago() { - return formaPago; - } - public void setFormaPago(FormaPago formaPago) { - this.formaPago = formaPago; - } - public Long getFiscalformapagoempresaId() { - return fiscalformapagoempresaId; - } - public void setFiscalformapagoempresaId(Long fiscalformapagoempresaId) { - this.fiscalformapagoempresaId = fiscalformapagoempresaId; - } - public String getTipoformapago() { - return tipoformapago; - } - public void setTipoformapago(String tipoformapago) { - this.tipoformapago = tipoformapago; - } - - public Boolean getIndVinculado() { - return indVinculado; - } - public void setIndVinculado(Boolean indVinculado) { - this.indVinculado = indVinculado; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); - result = prime * result + ((tipoformapago == null) ? 0 : tipoformapago.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - FiscalFormapagoEmpresa other = (FiscalFormapagoEmpresa) obj; - if (empresa == null) { - if (other.empresa != null) - return false; - } else if (!empresa.equals(other.empresa)) - return false; - if (tipoformapago == null) { - if (other.tipoformapago != null) - return false; - } else if (!tipoformapago.equals(other.tipoformapago)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "FISCAL_FORMAPAGO_EMP_SEQ", sequenceName = "FISCAL_FORMAPAGO_EMP_SEQ", allocationSize = 1) +@Table(name = "FISCAL_FORMAPAGO_EMPRESA") +public class FiscalFormapagoEmpresa { + + @Id + @Basic(optional = false) + @Column(name = "FISCALFORMAPAGOEMPRESA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_FORMAPAGO_EMP_SEQ") + private Long fiscalformapagoempresaId; + @Column(name = "TIPOFORMAPAGO") + private String tipoformapago; + @Column(name = "DESCRICAO") + private String descricao; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @ManyToOne + @JoinColumn(name = "FORMAPAGO_ID") + private FormaPago formaPago; + @Column(name = "INDVINCULADO") + private Boolean indVinculado; + + + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public FormaPago getFormaPago() { + return formaPago; + } + public void setFormaPago(FormaPago formaPago) { + this.formaPago = formaPago; + } + public Long getFiscalformapagoempresaId() { + return fiscalformapagoempresaId; + } + public void setFiscalformapagoempresaId(Long fiscalformapagoempresaId) { + this.fiscalformapagoempresaId = fiscalformapagoempresaId; + } + public String getTipoformapago() { + return tipoformapago; + } + public void setTipoformapago(String tipoformapago) { + this.tipoformapago = tipoformapago; + } + + public Boolean getIndVinculado() { + return indVinculado; + } + public void setIndVinculado(Boolean indVinculado) { + this.indVinculado = indVinculado; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); + result = prime * result + ((tipoformapago == null) ? 0 : tipoformapago.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + FiscalFormapagoEmpresa other = (FiscalFormapagoEmpresa) obj; + if (empresa == null) { + if (other.empresa != null) + return false; + } else if (!empresa.equals(other.empresa)) + return false; + if (tipoformapago == null) { + if (other.tipoformapago != null) + return false; + } else if (!tipoformapago.equals(other.tipoformapago)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressora.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressora.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/FiscalImpressora.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressora.java index d3638a1da..f43d25f99 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressora.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressora.java @@ -1,228 +1,228 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "FISCAL_IMPRESSORA") -public class FiscalImpressora implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @Column(name = "FISCALIMPRESSORA_ID") - private Integer fiscalimpressoraId; - - @Column(name = "MARCA") - private String marca; - - @Column(name = "MODELO") - private String modelo; - - @Column(name = "VERSIONSB") - private String versionsb; - - @Column(name = "CNIEE") - private String cniee; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "NUMSERIE20") - private String numserie20; - - @Column(name = "NUMEROIDENTIFICACAO") - private String numeroIdentificacao; - - @JoinColumn(name = "ESTADOLOCAL_ID", referencedColumnName = "ESTADO_ID") - @ManyToOne - private Estado estado; - - @JoinColumn(name = "ESTADOLACRE_ID", referencedColumnName = "ESTADO_ID") - @ManyToOne - private Estado estadoLacre; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "INDBLOQUEAECF") - private Boolean indBloqueaECF; - - @Column(name = "INDVALIDAESTADO") - private Boolean indValidaEstado; - - public FiscalImpressora() { - super(); - } - - public FiscalImpressora(Integer fiscalimpressoraId) { - this(); - setFiscalimpressoraId(fiscalimpressoraId); - } - - public Integer getFiscalimpressoraId() { - return fiscalimpressoraId; - } - - public void setFiscalimpressoraId(Integer fiscalimpressoraId) { - this.fiscalimpressoraId = fiscalimpressoraId; - } - - public String getMarca() { - return marca; - } - - public void setMarca(String marca) { - this.marca = marca; - } - - public String getModelo() { - return modelo; - } - - public void setModelo(String modelo) { - this.modelo = modelo; - } - - public String getVersionsb() { - return versionsb; - } - - public void setVersionsb(String versionsb) { - this.versionsb = versionsb; - } - - public String getCniee() { - return cniee; - } - - public void setCniee(String cniee) { - this.cniee = cniee; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((fiscalimpressoraId == null) ? 0 : fiscalimpressoraId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof FiscalImpressora)) - return false; - FiscalImpressora other = (FiscalImpressora) obj; - if (fiscalimpressoraId == null) { - if (other.fiscalimpressoraId != null) - return false; - } else if (!fiscalimpressoraId.equals(other.fiscalimpressoraId)) - return false; - return true; - } - - public String getNumserie20() { - return numserie20; - } - - public void setNumserie20(String numserie20) { - this.numserie20 = numserie20; - } - - public String getNumeroIdentificacao() { - return numeroIdentificacao; - } - - public void setNumeroIdentificacao(String numeroIdentificacao) { - this.numeroIdentificacao = numeroIdentificacao; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public Estado getEstadoLacre() { - return estadoLacre; - } - - public void setEstadoLacre(Estado estadoLacre) { - this.estadoLacre = estadoLacre; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getIndBloqueaECF() { - return indBloqueaECF; - } - - public void setIndBloqueaECF(Boolean indBloqueaECF) { - this.indBloqueaECF = indBloqueaECF; - } - - public Boolean getIndValidaEstado() { - return indValidaEstado; - } - - public void setIndValidaEstado(Boolean indValidaEstado) { - this.indValidaEstado = indValidaEstado; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "FISCAL_IMPRESSORA") +public class FiscalImpressora implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @Column(name = "FISCALIMPRESSORA_ID") + private Integer fiscalimpressoraId; + + @Column(name = "MARCA") + private String marca; + + @Column(name = "MODELO") + private String modelo; + + @Column(name = "VERSIONSB") + private String versionsb; + + @Column(name = "CNIEE") + private String cniee; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "NUMSERIE20") + private String numserie20; + + @Column(name = "NUMEROIDENTIFICACAO") + private String numeroIdentificacao; + + @JoinColumn(name = "ESTADOLOCAL_ID", referencedColumnName = "ESTADO_ID") + @ManyToOne + private Estado estado; + + @JoinColumn(name = "ESTADOLACRE_ID", referencedColumnName = "ESTADO_ID") + @ManyToOne + private Estado estadoLacre; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "INDBLOQUEAECF") + private Boolean indBloqueaECF; + + @Column(name = "INDVALIDAESTADO") + private Boolean indValidaEstado; + + public FiscalImpressora() { + super(); + } + + public FiscalImpressora(Integer fiscalimpressoraId) { + this(); + setFiscalimpressoraId(fiscalimpressoraId); + } + + public Integer getFiscalimpressoraId() { + return fiscalimpressoraId; + } + + public void setFiscalimpressoraId(Integer fiscalimpressoraId) { + this.fiscalimpressoraId = fiscalimpressoraId; + } + + public String getMarca() { + return marca; + } + + public void setMarca(String marca) { + this.marca = marca; + } + + public String getModelo() { + return modelo; + } + + public void setModelo(String modelo) { + this.modelo = modelo; + } + + public String getVersionsb() { + return versionsb; + } + + public void setVersionsb(String versionsb) { + this.versionsb = versionsb; + } + + public String getCniee() { + return cniee; + } + + public void setCniee(String cniee) { + this.cniee = cniee; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((fiscalimpressoraId == null) ? 0 : fiscalimpressoraId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof FiscalImpressora)) + return false; + FiscalImpressora other = (FiscalImpressora) obj; + if (fiscalimpressoraId == null) { + if (other.fiscalimpressoraId != null) + return false; + } else if (!fiscalimpressoraId.equals(other.fiscalimpressoraId)) + return false; + return true; + } + + public String getNumserie20() { + return numserie20; + } + + public void setNumserie20(String numserie20) { + this.numserie20 = numserie20; + } + + public String getNumeroIdentificacao() { + return numeroIdentificacao; + } + + public void setNumeroIdentificacao(String numeroIdentificacao) { + this.numeroIdentificacao = numeroIdentificacao; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public Estado getEstadoLacre() { + return estadoLacre; + } + + public void setEstadoLacre(Estado estadoLacre) { + this.estadoLacre = estadoLacre; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getIndBloqueaECF() { + return indBloqueaECF; + } + + public void setIndBloqueaECF(Boolean indBloqueaECF) { + this.indBloqueaECF = indBloqueaECF; + } + + public Boolean getIndValidaEstado() { + return indValidaEstado; + } + + public void setIndValidaEstado(Boolean indValidaEstado) { + this.indValidaEstado = indValidaEstado; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressoraEstado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressoraEstado.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FiscalImpressoraEstado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressoraEstado.java index dccdd632b..938a8aeac 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressoraEstado.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalImpressoraEstado.java @@ -1,129 +1,129 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "FISCAL_IMPRESSORA_ESTADO_SEQ", sequenceName = "FISCAL_IMPRESSORA_ESTADO_SEQ", allocationSize = 1) -@Table(name = "FISCAL_IMPRESSORA_ESTADO") -public class FiscalImpressoraEstado implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_IMPRESSORA_ESTADO_SEQ") - @Column(name = "FISCALIMPESTADO_ID") - private Integer fiscalImpressoraEstadoId; - - @JoinColumn(name = "FISCALIMPRESSORA_ID", referencedColumnName = "FISCALIMPRESSORA_ID") - @ManyToOne - private FiscalImpressora fiscalImpressora; - - @JoinColumn(name = "ESTADO_ID", referencedColumnName = "ESTADO_ID") - @ManyToOne - private Estado estado; - - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Basic(optional = false) - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public FiscalImpressoraEstado() { - super(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (fiscalImpressoraEstadoId != null ? fiscalImpressoraEstadoId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof FiscalImpressoraEstado)) { - return false; - } - FiscalImpressoraEstado other = (FiscalImpressoraEstado) object; - if ((this.getFiscalImpressoraEstadoId() == null && other.getFiscalImpressoraEstadoId() != null) || (this.getFiscalImpressoraEstadoId() != null && !this.getFiscalImpressoraEstadoId().equals(other.getFiscalImpressoraEstadoId()))) { - return false; - } - return true; - } - - @Override - public String toString() { - return this.getEstado().getNombestado(); - } - - public Integer getFiscalImpressoraEstadoId() { - return fiscalImpressoraEstadoId; - } - - public void setFiscalImpressoraEstadoId(Integer fiscalImpressoraEstadoId) { - this.fiscalImpressoraEstadoId = fiscalImpressoraEstadoId; - } - - public FiscalImpressora getFiscalImpressora() { - return fiscalImpressora; - } - - public void setFiscalImpressora(FiscalImpressora fiscalImpressora) { - this.fiscalImpressora = fiscalImpressora; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "FISCAL_IMPRESSORA_ESTADO_SEQ", sequenceName = "FISCAL_IMPRESSORA_ESTADO_SEQ", allocationSize = 1) +@Table(name = "FISCAL_IMPRESSORA_ESTADO") +public class FiscalImpressoraEstado implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_IMPRESSORA_ESTADO_SEQ") + @Column(name = "FISCALIMPESTADO_ID") + private Integer fiscalImpressoraEstadoId; + + @JoinColumn(name = "FISCALIMPRESSORA_ID", referencedColumnName = "FISCALIMPRESSORA_ID") + @ManyToOne + private FiscalImpressora fiscalImpressora; + + @JoinColumn(name = "ESTADO_ID", referencedColumnName = "ESTADO_ID") + @ManyToOne + private Estado estado; + + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public FiscalImpressoraEstado() { + super(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (fiscalImpressoraEstadoId != null ? fiscalImpressoraEstadoId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof FiscalImpressoraEstado)) { + return false; + } + FiscalImpressoraEstado other = (FiscalImpressoraEstado) object; + if ((this.getFiscalImpressoraEstadoId() == null && other.getFiscalImpressoraEstadoId() != null) || (this.getFiscalImpressoraEstadoId() != null && !this.getFiscalImpressoraEstadoId().equals(other.getFiscalImpressoraEstadoId()))) { + return false; + } + return true; + } + + @Override + public String toString() { + return this.getEstado().getNombestado(); + } + + public Integer getFiscalImpressoraEstadoId() { + return fiscalImpressoraEstadoId; + } + + public void setFiscalImpressoraEstadoId(Integer fiscalImpressoraEstadoId) { + this.fiscalImpressoraEstadoId = fiscalImpressoraEstadoId; + } + + public FiscalImpressora getFiscalImpressora() { + return fiscalImpressora; + } + + public void setFiscalImpressora(FiscalImpressora fiscalImpressora) { + this.fiscalImpressora = fiscalImpressora; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FiscalRelgerencialEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalRelgerencialEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FiscalRelgerencialEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalRelgerencialEmpresa.java index 06c6eda0d..6aabc3dfe 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FiscalRelgerencialEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalRelgerencialEmpresa.java @@ -1,114 +1,114 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -@Entity -@SequenceGenerator(name = "FISCAL_RELGERENCIAL_EMP_SEQ", sequenceName = "FISCAL_RELGERENCIAL_EMP_SEQ", allocationSize = 1) -@Table(name = "FISCAL_RELGERENCIAL_EMPRESA") -public class FiscalRelgerencialEmpresa { - - @Id - @Basic(optional = false) - @Column(name = "FISCALRELGERENCIAL_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_RELGERENCIAL_EMP_SEQ") - private Long fiscalrelgerencialId; - @Column(name = "TIPORELGERENCIAL") - private String tiporelgerencial; - @Column(name = "DESCRICAO") - private String descricao; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getFiscalrelgerencialId() { - return fiscalrelgerencialId; - } - public void setFiscalrelgerencialId(Long relgerencialId) { - this.fiscalrelgerencialId = relgerencialId; - } - public String getTiporelgerencial() { - return tiporelgerencial; - } - public void setTiporelgerencial(String tiporelgerencial) { - this.tiporelgerencial = tiporelgerencial; - } - public String getDescricao() { - return descricao; - } - public void setDescricao(String descricao) { - this.descricao = descricao; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); - result = prime * result + ((tiporelgerencial == null) ? 0 : tiporelgerencial.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - FiscalRelgerencialEmpresa other = (FiscalRelgerencialEmpresa) obj; - if (empresa == null) { - if (other.empresa != null) - return false; - } else if (!empresa.equals(other.empresa)) - return false; - if (tiporelgerencial == null) { - if (other.tiporelgerencial != null) - return false; - } else if (!tiporelgerencial.equals(other.tiporelgerencial)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +@Entity +@SequenceGenerator(name = "FISCAL_RELGERENCIAL_EMP_SEQ", sequenceName = "FISCAL_RELGERENCIAL_EMP_SEQ", allocationSize = 1) +@Table(name = "FISCAL_RELGERENCIAL_EMPRESA") +public class FiscalRelgerencialEmpresa { + + @Id + @Basic(optional = false) + @Column(name = "FISCALRELGERENCIAL_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_RELGERENCIAL_EMP_SEQ") + private Long fiscalrelgerencialId; + @Column(name = "TIPORELGERENCIAL") + private String tiporelgerencial; + @Column(name = "DESCRICAO") + private String descricao; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getFiscalrelgerencialId() { + return fiscalrelgerencialId; + } + public void setFiscalrelgerencialId(Long relgerencialId) { + this.fiscalrelgerencialId = relgerencialId; + } + public String getTiporelgerencial() { + return tiporelgerencial; + } + public void setTiporelgerencial(String tiporelgerencial) { + this.tiporelgerencial = tiporelgerencial; + } + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); + result = prime * result + ((tiporelgerencial == null) ? 0 : tiporelgerencial.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + FiscalRelgerencialEmpresa other = (FiscalRelgerencialEmpresa) obj; + if (empresa == null) { + if (other.empresa != null) + return false; + } else if (!empresa.equals(other.empresa)) + return false; + if (tiporelgerencial == null) { + if (other.tiporelgerencial != null) + return false; + } else if (!tiporelgerencial.equals(other.tiporelgerencial)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FiscalTotnaofiscalEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalTotnaofiscalEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FiscalTotnaofiscalEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalTotnaofiscalEmpresa.java index bae49059b..762b4dbd2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FiscalTotnaofiscalEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FiscalTotnaofiscalEmpresa.java @@ -1,125 +1,125 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -@Entity -@SequenceGenerator(name = "FISCAL_TOTNAOFISCAL_EMP_SEQ", sequenceName = "FISCAL_TOTNAOFISCAL_EMP_SEQ", allocationSize = 1) -@Table(name = "FISCAL_TOTNAOFISCAL_EMPRESA") -public class FiscalTotnaofiscalEmpresa { - - @Id - @Basic(optional = false) - @Column(name = "FISCALTOTNAOFISCAL_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_TOTNAOFISCAL_EMP_SEQ") - private Long fiscaltotnaofiscalId; - @Column(name = "TIPOTOTALIZADOR") - private String tipototalizador; - @Column(name = "DESCRICAO") - private String descricao; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne - @JoinColumn(name = "TIPOEVENTOEXTRA_ID") - private TipoEventoExtra tipoeventoextra; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - - public String getTipototalizador() { - return tipototalizador; - } - public void setTipototalizador(String tipototalizador) { - this.tipototalizador = tipototalizador; - } - public String getDescricao() { - return descricao; - } - public void setDescricao(String descricao) { - this.descricao = descricao; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public TipoEventoExtra getTipoeventoextra() { - return tipoeventoextra; - } - public void setTipoeventoextra(TipoEventoExtra tipoeventoextra) { - this.tipoeventoextra = tipoeventoextra; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Long getFiscaltotnaofiscalId() { - return fiscaltotnaofiscalId; - } - public void setFiscaltotnaofiscalId(Long fiscaltotnaofiscalId) { - this.fiscaltotnaofiscalId = fiscaltotnaofiscalId; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); - result = prime * result + ((tipototalizador == null) ? 0 : tipototalizador.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - FiscalTotnaofiscalEmpresa other = (FiscalTotnaofiscalEmpresa) obj; - if (empresa == null) { - if (other.empresa != null) - return false; - } else if (!empresa.equals(other.empresa)) - return false; - if (tipototalizador == null) { - if (other.tipototalizador != null) - return false; - } else if (!tipototalizador.equals(other.tipototalizador)) - return false; - return true; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +@Entity +@SequenceGenerator(name = "FISCAL_TOTNAOFISCAL_EMP_SEQ", sequenceName = "FISCAL_TOTNAOFISCAL_EMP_SEQ", allocationSize = 1) +@Table(name = "FISCAL_TOTNAOFISCAL_EMPRESA") +public class FiscalTotnaofiscalEmpresa { + + @Id + @Basic(optional = false) + @Column(name = "FISCALTOTNAOFISCAL_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FISCAL_TOTNAOFISCAL_EMP_SEQ") + private Long fiscaltotnaofiscalId; + @Column(name = "TIPOTOTALIZADOR") + private String tipototalizador; + @Column(name = "DESCRICAO") + private String descricao; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne + @JoinColumn(name = "TIPOEVENTOEXTRA_ID") + private TipoEventoExtra tipoeventoextra; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + + public String getTipototalizador() { + return tipototalizador; + } + public void setTipototalizador(String tipototalizador) { + this.tipototalizador = tipototalizador; + } + public String getDescricao() { + return descricao; + } + public void setDescricao(String descricao) { + this.descricao = descricao; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public TipoEventoExtra getTipoeventoextra() { + return tipoeventoextra; + } + public void setTipoeventoextra(TipoEventoExtra tipoeventoextra) { + this.tipoeventoextra = tipoeventoextra; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Long getFiscaltotnaofiscalId() { + return fiscaltotnaofiscalId; + } + public void setFiscaltotnaofiscalId(Long fiscaltotnaofiscalId) { + this.fiscaltotnaofiscalId = fiscaltotnaofiscalId; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); + result = prime * result + ((tipototalizador == null) ? 0 : tipototalizador.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + FiscalTotnaofiscalEmpresa other = (FiscalTotnaofiscalEmpresa) obj; + if (empresa == null) { + if (other.empresa != null) + return false; + } else if (!empresa.equals(other.empresa)) + return false; + if (tipototalizador == null) { + if (other.tipototalizador != null) + return false; + } else if (!tipototalizador.equals(other.tipototalizador)) + return false; + return true; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FolioPreimpreso.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FolioPreimpreso.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/FolioPreimpreso.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FolioPreimpreso.java index 43d73390e..ee836f9b3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/FolioPreimpreso.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FolioPreimpreso.java @@ -1,181 +1,181 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Parameter; - -@Entity -@SequenceGenerator(name = "FOLIO_PREIMPRESO_SEQ", sequenceName = "FOLIO_PREIMPRESO_SEQ", allocationSize = 1) -@Table(name = "FOLIO_PREIMPRESO") -public class FolioPreimpreso implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GenericGenerator(name = "FOLIO_PREIMPRESO_SEQ", strategy = "com.rjconsultores.ventaboletos.entidad.CustomIdGenerator" , - parameters = { - @Parameter(name="tamanho", value="8"), - @Parameter(name="seqName", value="FOLIO_PREIMPRESO_SEQ") - } ) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "FOLIO_PREIMPRESO_SEQ") - @Column(name = "FOLIOPREIMPRESO_ID") - private Integer foliopreimpresoId; - @Column(name = "NUMESERIE") - private String numeserie; - @Column(name = "FOLIOPREIMPRESO") - private String foliopreimpreso; - @Column(name = "INDREPLICA") - private Long indreplica; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "NODO_ID") - private Integer nodoId; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") - @ManyToOne - private Estacion estacion; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - - public Integer getFoliopreimpresoId() { - return foliopreimpresoId; - } - - public void setFoliopreimpresoId(Integer foliopreimpresoId) { - this.foliopreimpresoId = foliopreimpresoId; - } - - public String getNumeserie() { - return numeserie; - } - - public void setNumeserie(String numeserie) { - this.numeserie = numeserie; - } - - public String getFoliopreimpreso() { - return foliopreimpreso; - } - - public void setFoliopreimpreso(String foliopreimpreso) { - this.foliopreimpreso = foliopreimpreso; - } - - public Long getIndreplica() { - return indreplica; - } - - public void setIndreplica(Long indreplica) { - this.indreplica = indreplica; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getNodoId() { - return nodoId; - } - - public void setNodoId(Integer nodoId) { - this.nodoId = nodoId; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((foliopreimpresoId == null) ? 0 : foliopreimpresoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - FolioPreimpreso other = (FolioPreimpreso) obj; - if (foliopreimpresoId == null) { - if (other.foliopreimpresoId != null) - return false; - } else if (!foliopreimpresoId.equals(other.foliopreimpresoId)) - return false; - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.FolioPreimpreso [foliopreimpresoId=" + foliopreimpresoId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; + +@Entity +@SequenceGenerator(name = "FOLIO_PREIMPRESO_SEQ", sequenceName = "FOLIO_PREIMPRESO_SEQ", allocationSize = 1) +@Table(name = "FOLIO_PREIMPRESO") +public class FolioPreimpreso implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GenericGenerator(name = "FOLIO_PREIMPRESO_SEQ", strategy = "com.rjconsultores.ventaboletos.entidad.CustomIdGenerator" , + parameters = { + @Parameter(name="tamanho", value="8"), + @Parameter(name="seqName", value="FOLIO_PREIMPRESO_SEQ") + } ) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "FOLIO_PREIMPRESO_SEQ") + @Column(name = "FOLIOPREIMPRESO_ID") + private Integer foliopreimpresoId; + @Column(name = "NUMESERIE") + private String numeserie; + @Column(name = "FOLIOPREIMPRESO") + private String foliopreimpreso; + @Column(name = "INDREPLICA") + private Long indreplica; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "NODO_ID") + private Integer nodoId; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") + @ManyToOne + private Estacion estacion; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + + public Integer getFoliopreimpresoId() { + return foliopreimpresoId; + } + + public void setFoliopreimpresoId(Integer foliopreimpresoId) { + this.foliopreimpresoId = foliopreimpresoId; + } + + public String getNumeserie() { + return numeserie; + } + + public void setNumeserie(String numeserie) { + this.numeserie = numeserie; + } + + public String getFoliopreimpreso() { + return foliopreimpreso; + } + + public void setFoliopreimpreso(String foliopreimpreso) { + this.foliopreimpreso = foliopreimpreso; + } + + public Long getIndreplica() { + return indreplica; + } + + public void setIndreplica(Long indreplica) { + this.indreplica = indreplica; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getNodoId() { + return nodoId; + } + + public void setNodoId(Integer nodoId) { + this.nodoId = nodoId; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((foliopreimpresoId == null) ? 0 : foliopreimpresoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + FolioPreimpreso other = (FolioPreimpreso) obj; + if (foliopreimpresoId == null) { + if (other.foliopreimpresoId != null) + return false; + } else if (!foliopreimpresoId.equals(other.foliopreimpresoId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.FolioPreimpreso [foliopreimpresoId=" + foliopreimpresoId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/FormaPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/FormaPagoDet.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FormaPagoDet.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/FormaPagoDet.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FormaPagoDet.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/FuncionSistema.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FuncionSistema.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/FuncionSistema.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/FuncionSistema.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_Pricing.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_Pricing.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_Pricing.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_Pricing.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingAsiento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingAsiento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingAsiento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingAsiento.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingCategoria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingCategoria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingClase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingClase.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingClase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingClase.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingClasseTarifaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingClasseTarifaria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingClasseTarifaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingClasseTarifaria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingCorrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingCorrida.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingDia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingDia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingDia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingDia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecifico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecifico.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecifico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecifico.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoAgencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoAgencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoAgencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoAgencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCanalVendas.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCanalVendas.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCanalVendas.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCanalVendas.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCategoria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoCategoria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoOcupacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoOcupacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoOcupacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingEspecificoOcupacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingFormapago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingFormapago.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingFormapago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingFormapago.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingGestao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingGestao.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingGestao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingGestao.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingHistorico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingHistorico.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingHistorico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingHistorico.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingImporte.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingImporte.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingImporte.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingImporte.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingMarca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingMarca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingMercado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingMercado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingMercado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingMercado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingOcupaAntecipa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingOcupaAntecipa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingOcupaAntecipa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingOcupaAntecipa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingPuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingPuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingRuta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingRuta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoPtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoPtoVta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoPtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoPtoVta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingTipoServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GP_PricingVigencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingVigencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GP_PricingVigencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GP_PricingVigencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GrupoCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoCategoria.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/GrupoCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoCategoria.java index ead37c077..1318ea5b1 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/GrupoCategoria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoCategoria.java @@ -1,102 +1,102 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "GRUPO_CATEGORIA_SEQ", sequenceName = "GRUPO_CATEGORIA_SEQ", allocationSize = 1) -@Table(name = "GRUPO_CATEGORIA") -public class GrupoCategoria implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "GRUPO_CATEGORIA_SEQ") - @Column(name = "GRUPOCATEGORIA_ID") - private Integer grupoCategoriaId; - @Column(name = "DESCGRUPO") - private String descGrupo; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Override - public int hashCode() { - int hash = 0; - hash += (grupoCategoriaId != null ? grupoCategoriaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are - // not set - if (!(object instanceof GrupoCategoria)) { - return false; - } - GrupoCategoria other = (GrupoCategoria) object; - if ((this.grupoCategoriaId == null && other.grupoCategoriaId != null) || (this.grupoCategoriaId != null && !this.grupoCategoriaId.equals(other.grupoCategoriaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return this.getDescGrupo(); - } - - public Integer getGrupoCategoriaId() { - return grupoCategoriaId; - } - - public void setGrupoCategoriaId(Integer grupoCategoriaId) { - this.grupoCategoriaId = grupoCategoriaId; - } - - public String getDescGrupo() { - return descGrupo; - } - - public void setDescGrupo(String descGrupo) { - this.descGrupo = descGrupo; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "GRUPO_CATEGORIA_SEQ", sequenceName = "GRUPO_CATEGORIA_SEQ", allocationSize = 1) +@Table(name = "GRUPO_CATEGORIA") +public class GrupoCategoria implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "GRUPO_CATEGORIA_SEQ") + @Column(name = "GRUPOCATEGORIA_ID") + private Integer grupoCategoriaId; + @Column(name = "DESCGRUPO") + private String descGrupo; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Override + public int hashCode() { + int hash = 0; + hash += (grupoCategoriaId != null ? grupoCategoriaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are + // not set + if (!(object instanceof GrupoCategoria)) { + return false; + } + GrupoCategoria other = (GrupoCategoria) object; + if ((this.grupoCategoriaId == null && other.grupoCategoriaId != null) || (this.grupoCategoriaId != null && !this.grupoCategoriaId.equals(other.grupoCategoriaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return this.getDescGrupo(); + } + + public Integer getGrupoCategoriaId() { + return grupoCategoriaId; + } + + public void setGrupoCategoriaId(Integer grupoCategoriaId) { + this.grupoCategoriaId = grupoCategoriaId; + } + + public String getDescGrupo() { + return descGrupo; + } + + public void setDescGrupo(String descGrupo) { + this.descGrupo = descGrupo; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GrupoCortesia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoCortesia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GrupoCortesia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoCortesia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/GrupoRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoRuta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/GrupoRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/GrupoRuta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/HeaderTabelaEsquemaCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HeaderTabelaEsquemaCorrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/HeaderTabelaEsquemaCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HeaderTabelaEsquemaCorrida.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/HistoricoFormaPagoPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HistoricoFormaPagoPuntoVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/HistoricoFormaPagoPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HistoricoFormaPagoPuntoVenta.java index 752066441..e6ceea7c6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/HistoricoFormaPagoPuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HistoricoFormaPagoPuntoVenta.java @@ -1,183 +1,183 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "HistoricoFormaPagoPuntoVenta", tela = "auditarClasse.HistoricoFormaPagoPuntoVenta") -@Entity -@SequenceGenerator(name = "HIST_FORMAPAGOPUNTOVENTA_SEQ", sequenceName = "HIST_FORMAPAGOPUNTOVENTA_SEQ", allocationSize = 1) -@Table(name = "HIST_FORMAPAGO_PUNTOVENTA") -public class HistoricoFormaPagoPuntoVenta implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "HIST_FORMAPAGOPUNTOVENTA_SEQ") - @Column(name = "HIST_FORMAPAGO_PUNTOVENTA_ID") - private Integer historicoFormaPagoPuntoVentaId; - - @Column(name = "IND_INCLUSAO") - private Boolean indInclusao; - - @Column(name = "MOTIVO") - private String motivo; - - @Column(name = "FEC_ALTERACAO") - @Temporal(TemporalType.TIMESTAMP) - private Date fecAlteracao; - - @NaoAuditar - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @Column(name = "FORMAPAGO_ID") - private Integer formaPagoId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "EMPRESA_ID") - private Integer empresaId; - - @Transient - @NaoAuditar - private HistoricoFormaPagoPuntoVenta historicoPuntoVentaClone; - - - public Integer getHistoricoFormaPagoPuntoVentaId() { - return historicoFormaPagoPuntoVentaId; - } - - public void setHistoricoFormaPagoPuntoVentaId(Integer historicoFormaPagoPuntoVentaId) { - this.historicoFormaPagoPuntoVentaId = historicoFormaPagoPuntoVentaId; - } - - public Boolean getIndInclusao() { - return indInclusao; - } - - public void setIndInclusao(Boolean indInclusao) { - this.indInclusao = indInclusao; - } - - public Date getFecAlteracao() { - return fecAlteracao; - } - - public void setFecAlteracao(Date fecAlteracao) { - this.fecAlteracao = fecAlteracao; - } - - public HistoricoFormaPagoPuntoVenta getHistoricoPuntoVentaClone() { - return historicoPuntoVentaClone; - } - - public void setHistoricoPuntoVentaClone(HistoricoFormaPagoPuntoVenta historicoPuntoVentaClone) { - this.historicoPuntoVentaClone = historicoPuntoVentaClone; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getMotivo() { - return motivo; - } - - public void setMotivo(String motivo) { - this.motivo = motivo; - } - - public Integer getFormaPagoId() { - return formaPagoId; - } - - public void setFormaPagoId(Integer formaPagoId) { - this.formaPagoId = formaPagoId; - } - - @Override - public void clonar() throws CloneNotSupportedException { - historicoPuntoVentaClone = new HistoricoFormaPagoPuntoVenta(); - historicoPuntoVentaClone = (HistoricoFormaPagoPuntoVenta) this.clone(); - Hibernate.initialize(historicoPuntoVentaClone.getPuntoVenta()); - - } - - @Override - public HistoricoFormaPagoPuntoVenta getCloneObject() throws CloneNotSupportedException { - return historicoPuntoVentaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getHistoricoFormaPagoPuntoVentaId()); - } - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "HistoricoFormaPagoPuntoVenta", tela = "auditarClasse.HistoricoFormaPagoPuntoVenta") +@Entity +@SequenceGenerator(name = "HIST_FORMAPAGOPUNTOVENTA_SEQ", sequenceName = "HIST_FORMAPAGOPUNTOVENTA_SEQ", allocationSize = 1) +@Table(name = "HIST_FORMAPAGO_PUNTOVENTA") +public class HistoricoFormaPagoPuntoVenta implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "HIST_FORMAPAGOPUNTOVENTA_SEQ") + @Column(name = "HIST_FORMAPAGO_PUNTOVENTA_ID") + private Integer historicoFormaPagoPuntoVentaId; + + @Column(name = "IND_INCLUSAO") + private Boolean indInclusao; + + @Column(name = "MOTIVO") + private String motivo; + + @Column(name = "FEC_ALTERACAO") + @Temporal(TemporalType.TIMESTAMP) + private Date fecAlteracao; + + @NaoAuditar + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @Column(name = "FORMAPAGO_ID") + private Integer formaPagoId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "EMPRESA_ID") + private Integer empresaId; + + @Transient + @NaoAuditar + private HistoricoFormaPagoPuntoVenta historicoPuntoVentaClone; + + + public Integer getHistoricoFormaPagoPuntoVentaId() { + return historicoFormaPagoPuntoVentaId; + } + + public void setHistoricoFormaPagoPuntoVentaId(Integer historicoFormaPagoPuntoVentaId) { + this.historicoFormaPagoPuntoVentaId = historicoFormaPagoPuntoVentaId; + } + + public Boolean getIndInclusao() { + return indInclusao; + } + + public void setIndInclusao(Boolean indInclusao) { + this.indInclusao = indInclusao; + } + + public Date getFecAlteracao() { + return fecAlteracao; + } + + public void setFecAlteracao(Date fecAlteracao) { + this.fecAlteracao = fecAlteracao; + } + + public HistoricoFormaPagoPuntoVenta getHistoricoPuntoVentaClone() { + return historicoPuntoVentaClone; + } + + public void setHistoricoPuntoVentaClone(HistoricoFormaPagoPuntoVenta historicoPuntoVentaClone) { + this.historicoPuntoVentaClone = historicoPuntoVentaClone; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getMotivo() { + return motivo; + } + + public void setMotivo(String motivo) { + this.motivo = motivo; + } + + public Integer getFormaPagoId() { + return formaPagoId; + } + + public void setFormaPagoId(Integer formaPagoId) { + this.formaPagoId = formaPagoId; + } + + @Override + public void clonar() throws CloneNotSupportedException { + historicoPuntoVentaClone = new HistoricoFormaPagoPuntoVenta(); + historicoPuntoVentaClone = (HistoricoFormaPagoPuntoVenta) this.clone(); + Hibernate.initialize(historicoPuntoVentaClone.getPuntoVenta()); + + } + + @Override + public HistoricoFormaPagoPuntoVenta getCloneObject() throws CloneNotSupportedException { + return historicoPuntoVentaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getHistoricoFormaPagoPuntoVentaId()); + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/HistoricoPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HistoricoPuntoVenta.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/HistoricoPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HistoricoPuntoVenta.java index 251839f19..0c0c272f2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/HistoricoPuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/HistoricoPuntoVenta.java @@ -1,156 +1,156 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "HistoricoPuntoVenta", tela = "auditarClasse.HistoricoPuntoVenta") -@Entity -@SequenceGenerator(name = "HIST_PUNTOVENTA_SEQ", sequenceName = "HIST_PUNTOVENTA_SEQ", allocationSize = 1) -@Table(name = "HIST_PUNTOVENTA") -public class HistoricoPuntoVenta implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "HIST_PUNTOVENTA_SEQ") - @Column(name = "HIST_PUNTOVENTA_ID") - private Integer historicoPuntoVentaId; - - @Column(name = "IND_BLOQUEIO") - private Boolean indBloqueio; - - @Column(name = "FEC_BLOQUEIO") - @Temporal(TemporalType.TIMESTAMP) - private Date fecBloqueio; - - @NaoAuditar - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - - @Column(name = "MOTIVO_BLOQUEIO") - private String motivoBloqueio; - - @Transient - @NaoAuditar - private HistoricoPuntoVenta historicoPuntoVentaClone; - - public Integer getHistoricoPuntoVentaId() { - return historicoPuntoVentaId; - } - - public void setHistoricoPuntoVentaId(Integer historicoPuntoVentaId) { - this.historicoPuntoVentaId = historicoPuntoVentaId; - } - - public Boolean getIndBloqueio() { - return indBloqueio; - } - - public void setIndBloqueio(Boolean indBloqueio) { - this.indBloqueio = indBloqueio; - } - - public Date getFecBloqueio() { - return fecBloqueio; - } - - public void setFecBloqueio(Date fecBloqueio) { - this.fecBloqueio = fecBloqueio; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public void clonar() throws CloneNotSupportedException { - historicoPuntoVentaClone = new HistoricoPuntoVenta(); - historicoPuntoVentaClone = (HistoricoPuntoVenta) this.clone(); - Hibernate.initialize(historicoPuntoVentaClone.getPuntoVenta()); - - } - - @Override - public HistoricoPuntoVenta getCloneObject() throws CloneNotSupportedException { - return historicoPuntoVentaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getHistoricoPuntoVentaId()); - } - - public String getMotivoBloqueio() { - return motivoBloqueio; - } - - public void setMotivoBloqueio(String motivoBloqueio) { - this.motivoBloqueio = motivoBloqueio; - } - - - - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "HistoricoPuntoVenta", tela = "auditarClasse.HistoricoPuntoVenta") +@Entity +@SequenceGenerator(name = "HIST_PUNTOVENTA_SEQ", sequenceName = "HIST_PUNTOVENTA_SEQ", allocationSize = 1) +@Table(name = "HIST_PUNTOVENTA") +public class HistoricoPuntoVenta implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "HIST_PUNTOVENTA_SEQ") + @Column(name = "HIST_PUNTOVENTA_ID") + private Integer historicoPuntoVentaId; + + @Column(name = "IND_BLOQUEIO") + private Boolean indBloqueio; + + @Column(name = "FEC_BLOQUEIO") + @Temporal(TemporalType.TIMESTAMP) + private Date fecBloqueio; + + @NaoAuditar + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + + @Column(name = "MOTIVO_BLOQUEIO") + private String motivoBloqueio; + + @Transient + @NaoAuditar + private HistoricoPuntoVenta historicoPuntoVentaClone; + + public Integer getHistoricoPuntoVentaId() { + return historicoPuntoVentaId; + } + + public void setHistoricoPuntoVentaId(Integer historicoPuntoVentaId) { + this.historicoPuntoVentaId = historicoPuntoVentaId; + } + + public Boolean getIndBloqueio() { + return indBloqueio; + } + + public void setIndBloqueio(Boolean indBloqueio) { + this.indBloqueio = indBloqueio; + } + + public Date getFecBloqueio() { + return fecBloqueio; + } + + public void setFecBloqueio(Date fecBloqueio) { + this.fecBloqueio = fecBloqueio; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public void clonar() throws CloneNotSupportedException { + historicoPuntoVentaClone = new HistoricoPuntoVenta(); + historicoPuntoVentaClone = (HistoricoPuntoVenta) this.clone(); + Hibernate.initialize(historicoPuntoVentaClone.getPuntoVenta()); + + } + + @Override + public HistoricoPuntoVenta getCloneObject() throws CloneNotSupportedException { + return historicoPuntoVentaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getHistoricoPuntoVentaId()); + } + + public String getMotivoBloqueio() { + return motivoBloqueio; + } + + public void setMotivoBloqueio(String motivoBloqueio) { + this.motivoBloqueio = motivoBloqueio; + } + + + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Hotel.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Hotel.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/entidad/Hotel.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Hotel.java index b1fd4b9ac..10067196f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Hotel.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Hotel.java @@ -1,199 +1,199 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "HOTEL") -@SequenceGenerator(name = "HOTEL_SEQ", sequenceName = "HOTEL_SEQ", allocationSize = 1) -public class Hotel implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "HOTEL_SEQ") - @Column(name = "HOTEL_ID") - private Long hotelId; - - @Column(name = "DESCHOTEL") - private String deschotel; - - @Column(name = "CEP") - private String cep; - - @Column(name = "ENDERECO") - private String endereco; - - @Column(name = "NUMERO") - private String numero; - - @Column(name = "COMPLEMENTO") - private String complemento; - - @Column(name = "BAIRRO") - private String bairro; - - @Column(name = "CIDADE") - private String cidade; - - @Column(name = "ESTADO") - private String estado; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.DATE) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "DESCTELEFONE") - private String desctelefone; - - public Long getHotelId() { - return hotelId; - } - - public void setHotelId(Long hotelId) { - this.hotelId = hotelId; - } - - public String getDeschotel() { - return deschotel; - } - - public void setDeschotel(String deschotel) { - this.deschotel = deschotel; - } - - public String getCep() { - return cep; - } - - public void setCep(String cep) { - this.cep = cep; - } - - public String getEndereco() { - return endereco; - } - - public void setEndereco(String endereco) { - this.endereco = endereco; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public String getCidade() { - return cidade; - } - - public void setCidade(String cidade) { - this.cidade = cidade; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return getDeschotel(); - } - - public String getDesctelefone() { - return desctelefone; - } - - public void setDesctelefone(String desctelefone) { - this.desctelefone = desctelefone; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((hotelId == null) ? 0 : hotelId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - Hotel other = (Hotel) obj; - if (hotelId == null) { - if (other.hotelId != null) - return false; - } else if (!hotelId.equals(other.hotelId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "HOTEL") +@SequenceGenerator(name = "HOTEL_SEQ", sequenceName = "HOTEL_SEQ", allocationSize = 1) +public class Hotel implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "HOTEL_SEQ") + @Column(name = "HOTEL_ID") + private Long hotelId; + + @Column(name = "DESCHOTEL") + private String deschotel; + + @Column(name = "CEP") + private String cep; + + @Column(name = "ENDERECO") + private String endereco; + + @Column(name = "NUMERO") + private String numero; + + @Column(name = "COMPLEMENTO") + private String complemento; + + @Column(name = "BAIRRO") + private String bairro; + + @Column(name = "CIDADE") + private String cidade; + + @Column(name = "ESTADO") + private String estado; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.DATE) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "DESCTELEFONE") + private String desctelefone; + + public Long getHotelId() { + return hotelId; + } + + public void setHotelId(Long hotelId) { + this.hotelId = hotelId; + } + + public String getDeschotel() { + return deschotel; + } + + public void setDeschotel(String deschotel) { + this.deschotel = deschotel; + } + + public String getCep() { + return cep; + } + + public void setCep(String cep) { + this.cep = cep; + } + + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return getDeschotel(); + } + + public String getDesctelefone() { + return desctelefone; + } + + public void setDesctelefone(String desctelefone) { + this.desctelefone = desctelefone; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((hotelId == null) ? 0 : hotelId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + Hotel other = (Hotel) obj; + if (hotelId == null) { + if (other.hotelId != null) + return false; + } else if (!hotelId.equals(other.hotelId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Imagem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Imagem.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Imagem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Imagem.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ImpresionLayoutConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ImpresionLayoutConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ImpresionLayoutConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ImpresionLayoutConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/InscricaoEstadual.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/InscricaoEstadual.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/InscricaoEstadual.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/InscricaoEstadual.java index fb0d0258e..57c8224bb 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/InscricaoEstadual.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/InscricaoEstadual.java @@ -1,279 +1,279 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "INSCRICAO_ESTADUAL") -public class InscricaoEstadual { - private Long inscricaoestadualId; - - private Empresa empresa; - private Estado estado; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private String numInscricaoEstadual; - private String logradouro; - private String numero; - private String complemento; - private String cep; - private String bairro; - private Ciudad cidade; - private String cnpj; - private String equivalenciaAG; - private Boolean isBPe; - private Boolean indHabilitaIEDescentralizada; - private Parada origemIEDescentralizada; - private Boolean indFormaPagoOutrosSemCartao; - private String numInscricaoMunicipal; - - - public InscricaoEstadual() { - super(); - } - - public InscricaoEstadual(String inscricaoEstadual, Empresa empresa, Estado estado, Integer usuarioId, - String logradouro, String numero, String complemento, String cep, String bairro, Ciudad cidade, String cnpj,String numInscricaoMunicipal) { - super(); - this.numInscricaoEstadual = inscricaoEstadual; - this.empresa = empresa; - this.estado = estado; - this.fecmodif = new Date(); - this.activo = true; - this.usuarioId = usuarioId; - this.logradouro = logradouro; - this.numero=numero; - this.complemento=complemento; - this.cep=cep; - this.bairro=bairro; - this.cidade=cidade; - this.cnpj=cnpj; - this.numInscricaoMunicipal =numInscricaoMunicipal; - } - - @SequenceGenerator(name = "INSCRICAO_ESTADUAL_SEQ", sequenceName = "INSCRICAO_ESTADUAL_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "INSCRICAO_ESTADUAL_SEQ") - @Column(name = "INSCRICAOESTADUAL_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getInscricaoestadualId() { - return inscricaoestadualId; - } - - public void setInscricaoestadualId(Long inscricaoestadualId) { - this.inscricaoestadualId = inscricaoestadualId; - } - - @Column(name = "NUMINSCRICAOESTADUAL", length = 20) - public String getNumInscricaoEstadual() { - return numInscricaoEstadual; - } - - public void setNumInscricaoEstadual(String inscricaoEstadual) { - this.numInscricaoEstadual = inscricaoEstadual; - } - - @JoinColumn(name = "EMPRESA_ID") - @ManyToOne - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @JoinColumn(name = "ESTADO_ID") - @ManyToOne - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - @Column(name = "LOGRADOURO") - public String getLogradouro() { - return logradouro; - } - - public void setLogradouro(String logradouro) { - this.logradouro = logradouro; - } - - @Column(name = "NUMERO") - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - @Column(name = "COMPLEMENTO") - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - @Column(name = "CEP") - public String getCep() { - return cep; - } - - public void setCep(String cep) { - this.cep = cep; - } - - @Column(name = "BAIRRO") - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - @OneToOne(cascade = CascadeType.MERGE) - @JoinColumn(name = "CIUDAD_ID") - public Ciudad getCidade() { - return cidade; - } - - public void setCidade(Ciudad cidade) { - this.cidade = cidade; - } - - @Column(name = "CNPJ") - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - @Column(name = "EQUIVALENCIAAG") - public String getEquivalenciaAG() { - return equivalenciaAG; - } - - public void setEquivalenciaAG(String equivalenciaAG) { - this.equivalenciaAG = equivalenciaAG; - } - - @Column(name = "INDBPE") - public Boolean getIsBPe() { - return isBPe; - } - - public void setIsBPe(Boolean isBPe) { - this.isBPe = isBPe; - } - - @Column(name="NUMINSCRICAOMUNICIPAL") - public String getNumInscricaoMunicipal() { - return numInscricaoMunicipal; - } - - public void setNumInscricaoMunicipal(String numInscricaoMunicipal) { - this.numInscricaoMunicipal = numInscricaoMunicipal; - } - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getInscricaoestadualId() == null) ? 0 : getInscricaoestadualId().hashCode()); - return result; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof InscricaoEstadual)) { - return false; - } - InscricaoEstadual other = (InscricaoEstadual) object; - if ((this.getInscricaoestadualId() == null && other.getInscricaoestadualId() != null) || (this.getInscricaoestadualId() != null && !this.getInscricaoestadualId().equals(other.getInscricaoestadualId()))) { - return false; - } - return true; - } - - @Override - public String toString() { - return String.format("%s-%s", estado.getCveestado(), numInscricaoEstadual); - } - - @ManyToOne - @JoinColumn(name = "ORIGEM_ID_IEDESCENTRALIZADA") - public Parada getOrigemIEDescentralizada() { - return origemIEDescentralizada; - } - - public void setOrigemIEDescentralizada(Parada origemIEDescentralizada) { - this.origemIEDescentralizada = origemIEDescentralizada; - } - - @Column(name = "INDHABILITAIEDESCENTRALIZADA") - public Boolean getIndHabilitaIEDescentralizada() { - return indHabilitaIEDescentralizada != null ? indHabilitaIEDescentralizada : false; - } - - public void setIndHabilitaIEDescentralizada(Boolean indHabilitaIEDescentralizada) { - this.indHabilitaIEDescentralizada = indHabilitaIEDescentralizada; - } - - public Boolean getIndFormaPagoOutrosSemCartao() { - return indFormaPagoOutrosSemCartao; - } - - public void setIndFormaPagoOutrosSemCartao(Boolean indFormaPagoOutrosSemCartao) { - this.indFormaPagoOutrosSemCartao = indFormaPagoOutrosSemCartao; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "INSCRICAO_ESTADUAL") +public class InscricaoEstadual { + private Long inscricaoestadualId; + + private Empresa empresa; + private Estado estado; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private String numInscricaoEstadual; + private String logradouro; + private String numero; + private String complemento; + private String cep; + private String bairro; + private Ciudad cidade; + private String cnpj; + private String equivalenciaAG; + private Boolean isBPe; + private Boolean indHabilitaIEDescentralizada; + private Parada origemIEDescentralizada; + private Boolean indFormaPagoOutrosSemCartao; + private String numInscricaoMunicipal; + + + public InscricaoEstadual() { + super(); + } + + public InscricaoEstadual(String inscricaoEstadual, Empresa empresa, Estado estado, Integer usuarioId, + String logradouro, String numero, String complemento, String cep, String bairro, Ciudad cidade, String cnpj,String numInscricaoMunicipal) { + super(); + this.numInscricaoEstadual = inscricaoEstadual; + this.empresa = empresa; + this.estado = estado; + this.fecmodif = new Date(); + this.activo = true; + this.usuarioId = usuarioId; + this.logradouro = logradouro; + this.numero=numero; + this.complemento=complemento; + this.cep=cep; + this.bairro=bairro; + this.cidade=cidade; + this.cnpj=cnpj; + this.numInscricaoMunicipal =numInscricaoMunicipal; + } + + @SequenceGenerator(name = "INSCRICAO_ESTADUAL_SEQ", sequenceName = "INSCRICAO_ESTADUAL_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "INSCRICAO_ESTADUAL_SEQ") + @Column(name = "INSCRICAOESTADUAL_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getInscricaoestadualId() { + return inscricaoestadualId; + } + + public void setInscricaoestadualId(Long inscricaoestadualId) { + this.inscricaoestadualId = inscricaoestadualId; + } + + @Column(name = "NUMINSCRICAOESTADUAL", length = 20) + public String getNumInscricaoEstadual() { + return numInscricaoEstadual; + } + + public void setNumInscricaoEstadual(String inscricaoEstadual) { + this.numInscricaoEstadual = inscricaoEstadual; + } + + @JoinColumn(name = "EMPRESA_ID") + @ManyToOne + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @JoinColumn(name = "ESTADO_ID") + @ManyToOne + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + @Column(name = "LOGRADOURO") + public String getLogradouro() { + return logradouro; + } + + public void setLogradouro(String logradouro) { + this.logradouro = logradouro; + } + + @Column(name = "NUMERO") + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + @Column(name = "COMPLEMENTO") + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + @Column(name = "CEP") + public String getCep() { + return cep; + } + + public void setCep(String cep) { + this.cep = cep; + } + + @Column(name = "BAIRRO") + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + @OneToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "CIUDAD_ID") + public Ciudad getCidade() { + return cidade; + } + + public void setCidade(Ciudad cidade) { + this.cidade = cidade; + } + + @Column(name = "CNPJ") + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + @Column(name = "EQUIVALENCIAAG") + public String getEquivalenciaAG() { + return equivalenciaAG; + } + + public void setEquivalenciaAG(String equivalenciaAG) { + this.equivalenciaAG = equivalenciaAG; + } + + @Column(name = "INDBPE") + public Boolean getIsBPe() { + return isBPe; + } + + public void setIsBPe(Boolean isBPe) { + this.isBPe = isBPe; + } + + @Column(name="NUMINSCRICAOMUNICIPAL") + public String getNumInscricaoMunicipal() { + return numInscricaoMunicipal; + } + + public void setNumInscricaoMunicipal(String numInscricaoMunicipal) { + this.numInscricaoMunicipal = numInscricaoMunicipal; + } + + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getInscricaoestadualId() == null) ? 0 : getInscricaoestadualId().hashCode()); + return result; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof InscricaoEstadual)) { + return false; + } + InscricaoEstadual other = (InscricaoEstadual) object; + if ((this.getInscricaoestadualId() == null && other.getInscricaoestadualId() != null) || (this.getInscricaoestadualId() != null && !this.getInscricaoestadualId().equals(other.getInscricaoestadualId()))) { + return false; + } + return true; + } + + @Override + public String toString() { + return String.format("%s-%s", estado.getCveestado(), numInscricaoEstadual); + } + + @ManyToOne + @JoinColumn(name = "ORIGEM_ID_IEDESCENTRALIZADA") + public Parada getOrigemIEDescentralizada() { + return origemIEDescentralizada; + } + + public void setOrigemIEDescentralizada(Parada origemIEDescentralizada) { + this.origemIEDescentralizada = origemIEDescentralizada; + } + + @Column(name = "INDHABILITAIEDESCENTRALIZADA") + public Boolean getIndHabilitaIEDescentralizada() { + return indHabilitaIEDescentralizada != null ? indHabilitaIEDescentralizada : false; + } + + public void setIndHabilitaIEDescentralizada(Boolean indHabilitaIEDescentralizada) { + this.indHabilitaIEDescentralizada = indHabilitaIEDescentralizada; + } + + public Boolean getIndFormaPagoOutrosSemCartao() { + return indFormaPagoOutrosSemCartao; + } + + public void setIndFormaPagoOutrosSemCartao(Boolean indFormaPagoOutrosSemCartao) { + this.indFormaPagoOutrosSemCartao = indFormaPagoOutrosSemCartao; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/InstiFinanceira.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/InstiFinanceira.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/InstiFinanceira.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/InstiFinanceira.java index 18b140162..ec977334d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/InstiFinanceira.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/InstiFinanceira.java @@ -1,159 +1,159 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author Rafael - */ -@Entity -@SequenceGenerator(name = "INSTI_FINANCEIRA_SEQ", sequenceName = "INSTI_FINANCEIRA_SEQ", allocationSize = 1) -@Table(name = "INSTI_FINANCEIRA") - -public class InstiFinanceira implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "INSTI_FINANCEIRA_SEQ") - @Column(name = "INSTIFINANCEIRA_ID") - private Integer instFinanceiraId; - - @Column(name = "NOME") - private String nome; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "CODIGO") - private String codigo; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @OneToMany(cascade = CascadeType.ALL, mappedBy = "instiFinanceiraId") - private List ptovtaAgenciaList; - - public InstiFinanceira() { - } - - public InstiFinanceira(Integer instFinanceiraId) { - this.instFinanceiraId = instFinanceiraId; - } - - public InstiFinanceira(Integer instFinanceiraId, String codigo, String nome, Boolean activo, Date fecmodif, int usuarioId) { - this.instFinanceiraId = instFinanceiraId; - this.codigo = codigo; - this.nome = nome; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - - public Integer getInstFinanceiraId() { - return instFinanceiraId; - } - - public void setInstFinanceiraId(Integer instFinanceiraId) { - this.instFinanceiraId = instFinanceiraId; - } - - public String getNome() { - return nome; - } - - public void setNome(String nome) { - this.nome = nome; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public List getPtovtaAgenciaList() { - return ptovtaAgenciaList; - } - - public void setPtovtaAgenciaList(List ptovtaAgenciaList) { - this.ptovtaAgenciaList = ptovtaAgenciaList; - } - - public String getCodigo() { - return codigo; - } - - public void setCodigo(String codigo) { - this.codigo = codigo; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (instFinanceiraId != null ? instFinanceiraId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof InstiFinanceira)) { - return false; - } - InstiFinanceira other = (InstiFinanceira) object; - if ((this.instFinanceiraId == null && other.instFinanceiraId != null) || (this.instFinanceiraId != null && !this.instFinanceiraId.equals(other.instFinanceiraId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return this.nome; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author Rafael + */ +@Entity +@SequenceGenerator(name = "INSTI_FINANCEIRA_SEQ", sequenceName = "INSTI_FINANCEIRA_SEQ", allocationSize = 1) +@Table(name = "INSTI_FINANCEIRA") + +public class InstiFinanceira implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "INSTI_FINANCEIRA_SEQ") + @Column(name = "INSTIFINANCEIRA_ID") + private Integer instFinanceiraId; + + @Column(name = "NOME") + private String nome; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "CODIGO") + private String codigo; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "instiFinanceiraId") + private List ptovtaAgenciaList; + + public InstiFinanceira() { + } + + public InstiFinanceira(Integer instFinanceiraId) { + this.instFinanceiraId = instFinanceiraId; + } + + public InstiFinanceira(Integer instFinanceiraId, String codigo, String nome, Boolean activo, Date fecmodif, int usuarioId) { + this.instFinanceiraId = instFinanceiraId; + this.codigo = codigo; + this.nome = nome; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + + public Integer getInstFinanceiraId() { + return instFinanceiraId; + } + + public void setInstFinanceiraId(Integer instFinanceiraId) { + this.instFinanceiraId = instFinanceiraId; + } + + public String getNome() { + return nome; + } + + public void setNome(String nome) { + this.nome = nome; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public List getPtovtaAgenciaList() { + return ptovtaAgenciaList; + } + + public void setPtovtaAgenciaList(List ptovtaAgenciaList) { + this.ptovtaAgenciaList = ptovtaAgenciaList; + } + + public String getCodigo() { + return codigo; + } + + public void setCodigo(String codigo) { + this.codigo = codigo; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (instFinanceiraId != null ? instFinanceiraId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof InstiFinanceira)) { + return false; + } + InstiFinanceira other = (InstiFinanceira) object; + if ((this.instFinanceiraId == null && other.instFinanceiraId != null) || (this.instFinanceiraId != null && !this.instFinanceiraId.equals(other.instFinanceiraId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return this.nome; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/IntegracaoTotvs.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/IntegracaoTotvs.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/IntegracaoTotvs.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/IntegracaoTotvs.java index d8da89f72..78f23bb23 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/IntegracaoTotvs.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/IntegracaoTotvs.java @@ -1,134 +1,134 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "INTEGRACAOTOTVS_SEQ", sequenceName = "INTEGRACAOTOTVS_SEQ", allocationSize = 1) -@Table(name = "INTEGRACAO_TOTVS") -public class IntegracaoTotvs implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "INTEGRACAOTOTVS_SEQ") - @Column(name = "INTEGRACAOTOTVS_ID") - private Integer integracaoTotvsId; - @Column(name = "DESC_INTEGRACAO") - private String descIntegracao; - @Column(name = "ESQUEMACORRIDA_ID") - private Integer esquemaCorridaId; - @Column(name = "FECFIN") - private Date fecFin; - @Column(name = "FECINI") - private Date fecInicio; - @Column(name = "FECMODIF") - private Date fecmodif; - @Column(name = "PUNTOVENTA_ID") - private Integer puntoVentaId; - @Column(name = "EMPRESA_ID") - private Integer empresaId; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "QTDEREGISTROSATUALIZADOS") - private Integer qtdadeResgistrosAtualizados; - - @Column(name = "ACTIVO") - private Boolean activo; - - public Integer getIntegracaoTotvsId() { - return integracaoTotvsId; - } - - public void setIntegracaoTotvsId(Integer integracaoTotvsId) { - this.integracaoTotvsId = integracaoTotvsId; - } - - public String getDescIntegracao() { - return descIntegracao; - } - - public void setDescIntegracao(String descIntegracao) { - this.descIntegracao = descIntegracao; - } - - public Integer getEsquemaCorridaId() { - return esquemaCorridaId; - } - - public void setEsquemaCorridaId(Integer esquemaCorridaId) { - this.esquemaCorridaId = esquemaCorridaId; - } - - public Date getFecFin() { - return fecFin; - } - - public void setFecFin(Date fecFin) { - this.fecFin = fecFin; - } - - public Date getFecInicio() { - return fecInicio; - } - - public void setFecInicio(Date fecInicio) { - this.fecInicio = fecInicio; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Integer getQtdadeResgistrosAtualizados() { - return qtdadeResgistrosAtualizados; - } - - public void setQtdadeResgistrosAtualizados(Integer qtdadeResgistrosAtualizados) { - this.qtdadeResgistrosAtualizados = qtdadeResgistrosAtualizados; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "INTEGRACAOTOTVS_SEQ", sequenceName = "INTEGRACAOTOTVS_SEQ", allocationSize = 1) +@Table(name = "INTEGRACAO_TOTVS") +public class IntegracaoTotvs implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "INTEGRACAOTOTVS_SEQ") + @Column(name = "INTEGRACAOTOTVS_ID") + private Integer integracaoTotvsId; + @Column(name = "DESC_INTEGRACAO") + private String descIntegracao; + @Column(name = "ESQUEMACORRIDA_ID") + private Integer esquemaCorridaId; + @Column(name = "FECFIN") + private Date fecFin; + @Column(name = "FECINI") + private Date fecInicio; + @Column(name = "FECMODIF") + private Date fecmodif; + @Column(name = "PUNTOVENTA_ID") + private Integer puntoVentaId; + @Column(name = "EMPRESA_ID") + private Integer empresaId; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "QTDEREGISTROSATUALIZADOS") + private Integer qtdadeResgistrosAtualizados; + + @Column(name = "ACTIVO") + private Boolean activo; + + public Integer getIntegracaoTotvsId() { + return integracaoTotvsId; + } + + public void setIntegracaoTotvsId(Integer integracaoTotvsId) { + this.integracaoTotvsId = integracaoTotvsId; + } + + public String getDescIntegracao() { + return descIntegracao; + } + + public void setDescIntegracao(String descIntegracao) { + this.descIntegracao = descIntegracao; + } + + public Integer getEsquemaCorridaId() { + return esquemaCorridaId; + } + + public void setEsquemaCorridaId(Integer esquemaCorridaId) { + this.esquemaCorridaId = esquemaCorridaId; + } + + public Date getFecFin() { + return fecFin; + } + + public void setFecFin(Date fecFin) { + this.fecFin = fecFin; + } + + public Date getFecInicio() { + return fecInicio; + } + + public void setFecInicio(Date fecInicio) { + this.fecInicio = fecInicio; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Integer getQtdadeResgistrosAtualizados() { + return qtdadeResgistrosAtualizados; + } + + public void setQtdadeResgistrosAtualizados(Integer qtdadeResgistrosAtualizados) { + this.qtdadeResgistrosAtualizados = qtdadeResgistrosAtualizados; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ItemAdicional.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ItemAdicional.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ItemAdicional.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ItemAdicional.java index 28e80731a..b7a53d3a3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ItemAdicional.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ItemAdicional.java @@ -1,136 +1,136 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "ITEM_ADICIONAL") -@SequenceGenerator(name = "ITEM_ADICIONAL_SEQ", sequenceName = "ITEM_ADICIONAL_SEQ", allocationSize = 1) -public class ItemAdicional implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ITEM_ADICIONAL_SEQ") - @Column(name = "ITEMADICIONAL_ID") - private Integer itemadicionalId; - @Column(name = "DESCITEMADICIONAL") - private String descitemadicional; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @ManyToMany - @JoinTable(name = "PACOTE_ITEM", joinColumns = { @JoinColumn(name = "ITEMADICIONAL_ID") }, - inverseJoinColumns = { @JoinColumn(name = "PACOTE_ID") }) - private List pacoteList; - - public ItemAdicional() { - } - - public ItemAdicional(Integer itemadicionalId, String descitemadicional, Boolean activo, Date fecmodif, Integer usuarioId) { - super(); - this.itemadicionalId = itemadicionalId; - this.descitemadicional = descitemadicional; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getItemadicionalId() { - return itemadicionalId; - } - - public void setItemadicionalId(Integer itemadicionalId) { - this.itemadicionalId = itemadicionalId; - } - - public String getDescitemadicional() { - return descitemadicional; - } - - public void setDescitemadicional(String descitemadicional) { - this.descitemadicional = descitemadicional; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getPacoteList() { - return pacoteList; - } - - public void setPacoteList(List pacoteList) { - this.pacoteList = pacoteList; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((itemadicionalId == null) ? 0 : itemadicionalId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ItemAdicional other = (ItemAdicional) obj; - if (itemadicionalId == null) { - if (other.itemadicionalId != null) - return false; - } else if (!itemadicionalId.equals(other.itemadicionalId)) - return false; - return true; - } - - @Override - public String toString() { - return this.getDescitemadicional() + " - " + this.getItemadicionalId(); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "ITEM_ADICIONAL") +@SequenceGenerator(name = "ITEM_ADICIONAL_SEQ", sequenceName = "ITEM_ADICIONAL_SEQ", allocationSize = 1) +public class ItemAdicional implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ITEM_ADICIONAL_SEQ") + @Column(name = "ITEMADICIONAL_ID") + private Integer itemadicionalId; + @Column(name = "DESCITEMADICIONAL") + private String descitemadicional; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @ManyToMany + @JoinTable(name = "PACOTE_ITEM", joinColumns = { @JoinColumn(name = "ITEMADICIONAL_ID") }, + inverseJoinColumns = { @JoinColumn(name = "PACOTE_ID") }) + private List pacoteList; + + public ItemAdicional() { + } + + public ItemAdicional(Integer itemadicionalId, String descitemadicional, Boolean activo, Date fecmodif, Integer usuarioId) { + super(); + this.itemadicionalId = itemadicionalId; + this.descitemadicional = descitemadicional; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getItemadicionalId() { + return itemadicionalId; + } + + public void setItemadicionalId(Integer itemadicionalId) { + this.itemadicionalId = itemadicionalId; + } + + public String getDescitemadicional() { + return descitemadicional; + } + + public void setDescitemadicional(String descitemadicional) { + this.descitemadicional = descitemadicional; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getPacoteList() { + return pacoteList; + } + + public void setPacoteList(List pacoteList) { + this.pacoteList = pacoteList; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((itemadicionalId == null) ? 0 : itemadicionalId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ItemAdicional other = (ItemAdicional) obj; + if (itemadicionalId == null) { + if (other.itemadicionalId != null) + return false; + } else if (!itemadicionalId.equals(other.itemadicionalId)) + return false; + return true; + } + + @Override + public String toString() { + return this.getDescitemadicional() + " - " + this.getItemadicionalId(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ItemDesconto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ItemDesconto.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ItemDesconto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ItemDesconto.java index 2b40a3059..8c3bf1f74 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ItemDesconto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ItemDesconto.java @@ -1,101 +1,101 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.NumberFormat; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "ITEM_DESCONTO_SEQ", sequenceName = "ITEM_DESCONTO_SEQ", allocationSize = 1) -@Table(name = "ITEM_DESCONTO") -public class ItemDesconto implements Serializable { - - private static final long serialVersionUID = 1L; - - private static NumberFormat NF = NumberFormat.getInstance(); - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ITEM_DESCONTO_SEQ") - @Column(name = "ITEMDESCONTO_ID") - private Long itemdescontoId; - - @Column(name = "NOMITEMDESCONTO") - private String nomitemdesconto; - - @Column(name = "PRECO") - private BigDecimal preco; - - @Column(name = "ACTIVO") - private boolean activo; - - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getItemdescontoId() { - return itemdescontoId; - } - - public void setItemdescontoId(Long itemdescontoId) { - this.itemdescontoId = itemdescontoId; - } - - public String getNomitemdesconto() { - return nomitemdesconto; - } - - public void setNomitemdesconto(String nomitemdesconto) { - this.nomitemdesconto = nomitemdesconto; - } - - public BigDecimal getPreco() { - return preco; - } - - public void setPreco(BigDecimal preco) { - this.preco = preco; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - NF.setMinimumFractionDigits(2); - return this.getNomitemdesconto() + " - " + NF.format(this.getPreco()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "ITEM_DESCONTO_SEQ", sequenceName = "ITEM_DESCONTO_SEQ", allocationSize = 1) +@Table(name = "ITEM_DESCONTO") +public class ItemDesconto implements Serializable { + + private static final long serialVersionUID = 1L; + + private static NumberFormat NF = NumberFormat.getInstance(); + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ITEM_DESCONTO_SEQ") + @Column(name = "ITEMDESCONTO_ID") + private Long itemdescontoId; + + @Column(name = "NOMITEMDESCONTO") + private String nomitemdesconto; + + @Column(name = "PRECO") + private BigDecimal preco; + + @Column(name = "ACTIVO") + private boolean activo; + + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getItemdescontoId() { + return itemdescontoId; + } + + public void setItemdescontoId(Long itemdescontoId) { + this.itemdescontoId = itemdescontoId; + } + + public String getNomitemdesconto() { + return nomitemdesconto; + } + + public void setNomitemdesconto(String nomitemdesconto) { + this.nomitemdesconto = nomitemdesconto; + } + + public BigDecimal getPreco() { + return preco; + } + + public void setPreco(BigDecimal preco) { + this.preco = preco; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + NF.setMinimumFractionDigits(2); + return this.getNomitemdesconto() + " - " + NF.format(this.getPreco()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogAuditoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogAuditoria.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/LogAuditoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogAuditoria.java index 8c985860e..b205bd8be 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/LogAuditoria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogAuditoria.java @@ -1,200 +1,200 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "LOG_AUDITORIA_SEQ", sequenceName = "LOG_AUDITORIA_SEQ", allocationSize = 1) -@Table(name = "LOG_AUDITORIA") -public class LogAuditoria implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_AUDITORIA_SEQ") - @Column(name = "LOGAUDITORIA_ID") - private Long logauditoriaId; - - @Column(name = "ID_AUDITADO") - private String idAuditado; - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "VALOR_ANTERIOR") - private String valorAnterior; - - @Column(name = "VALOR_NOVO") - private String valorNovo; - - @Column(name = "CAMPO_ALTERADO") - private String campoAlterado; - - @Column(name = "CLASSE_ALTERADA") - private String classeAlterada; - - @Column(name = "CLASSE_PRINCIPAL") - private String classePrincipal; - - @Column(name = "TELA") - private String tela; - - @Column(name = "TIPO_ALTERACAO") - private String tipoAlteracao; - - @Column(name = "ACTIVO") - private boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @ManyToOne - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - public Long getLogauditoriaId() { - return logauditoriaId; - } - - public void setLogauditoriaId(Long logauditoriaId) { - this.logauditoriaId = logauditoriaId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public String getValorAnterior() { - return valorAnterior; - } - - public void setValorAnterior(String valorAnterior) { - this.valorAnterior = valorAnterior; - } - - public String getValorNovo() { - return valorNovo; - } - - public void setValorNovo(String valorNovo) { - this.valorNovo = valorNovo; - } - - public String getCampoAlterado() { - return campoAlterado; - } - - public void setCampoAlterado(String campoAlterado) { - this.campoAlterado = campoAlterado; - } - - public String getClasseAlterada() { - return classeAlterada; - } - - public void setClasseAlterada(String classeAlterada) { - this.classeAlterada = classeAlterada; - } - - public String getClassePrincipal() { - return classePrincipal; - } - - public void setClassePrincipal(String classePrincipal) { - this.classePrincipal = classePrincipal; - } - - public String getTela() { - return tela; - } - - public void setTela(String tela) { - this.tela = tela; - } - - public String getTipoAlteracao() { - return tipoAlteracao; - } - - public void setTipoAlteracao(String tipoAlteracao) { - this.tipoAlteracao = tipoAlteracao; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getLogauditoriaId() == null) ? 0 : getLogauditoriaId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof LogAuditoria)) - return false; - LogAuditoria other = (LogAuditoria) obj; - if (getLogauditoriaId() == null) { - if (other.getLogauditoriaId() != null) - return false; - } else if (!getLogauditoriaId().equals(other.getLogauditoriaId())) - return false; - return true; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public String getIdAuditado() { - return idAuditado; - } - - public void setIdAuditado(String idAuditado) { - this.idAuditado = idAuditado; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "LOG_AUDITORIA_SEQ", sequenceName = "LOG_AUDITORIA_SEQ", allocationSize = 1) +@Table(name = "LOG_AUDITORIA") +public class LogAuditoria implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_AUDITORIA_SEQ") + @Column(name = "LOGAUDITORIA_ID") + private Long logauditoriaId; + + @Column(name = "ID_AUDITADO") + private String idAuditado; + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "VALOR_ANTERIOR") + private String valorAnterior; + + @Column(name = "VALOR_NOVO") + private String valorNovo; + + @Column(name = "CAMPO_ALTERADO") + private String campoAlterado; + + @Column(name = "CLASSE_ALTERADA") + private String classeAlterada; + + @Column(name = "CLASSE_PRINCIPAL") + private String classePrincipal; + + @Column(name = "TELA") + private String tela; + + @Column(name = "TIPO_ALTERACAO") + private String tipoAlteracao; + + @Column(name = "ACTIVO") + private boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @ManyToOne + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + public Long getLogauditoriaId() { + return logauditoriaId; + } + + public void setLogauditoriaId(Long logauditoriaId) { + this.logauditoriaId = logauditoriaId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public String getValorAnterior() { + return valorAnterior; + } + + public void setValorAnterior(String valorAnterior) { + this.valorAnterior = valorAnterior; + } + + public String getValorNovo() { + return valorNovo; + } + + public void setValorNovo(String valorNovo) { + this.valorNovo = valorNovo; + } + + public String getCampoAlterado() { + return campoAlterado; + } + + public void setCampoAlterado(String campoAlterado) { + this.campoAlterado = campoAlterado; + } + + public String getClasseAlterada() { + return classeAlterada; + } + + public void setClasseAlterada(String classeAlterada) { + this.classeAlterada = classeAlterada; + } + + public String getClassePrincipal() { + return classePrincipal; + } + + public void setClassePrincipal(String classePrincipal) { + this.classePrincipal = classePrincipal; + } + + public String getTela() { + return tela; + } + + public void setTela(String tela) { + this.tela = tela; + } + + public String getTipoAlteracao() { + return tipoAlteracao; + } + + public void setTipoAlteracao(String tipoAlteracao) { + this.tipoAlteracao = tipoAlteracao; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getLogauditoriaId() == null) ? 0 : getLogauditoriaId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof LogAuditoria)) + return false; + LogAuditoria other = (LogAuditoria) obj; + if (getLogauditoriaId() == null) { + if (other.getLogauditoriaId() != null) + return false; + } else if (!getLogauditoriaId().equals(other.getLogauditoriaId())) + return false; + return true; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public String getIdAuditado() { + return idAuditado; + } + + public void setIdAuditado(String idAuditado) { + this.idAuditado = idAuditado; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java index 004335732..a548069ea 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java @@ -1,286 +1,286 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; -import com.rjconsultores.ventaboletos.enums.comissao.TipoLogConferencia; - -@Entity -@Table(name = "LOG_CONFERENCIA") -@SequenceGenerator(name = "LOG_CONFERENCIA_SEQ", sequenceName = "LOG_CONFERENCIA_SEQ", allocationSize = 1) -public class LogConferencia implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_CONFERENCIA_SEQ") - @Column(name = "LOGCONFERENCIA_ID") - private Long logconferenciaId; - - @Column(name = "OBSERVACAO") - private String observacao; - - @Column(name = "PRECO") - private BigDecimal preco; - - @Column(name = "ACTIVO") - private boolean activo; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "BOLETO_ID") - private Long boletoId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CONFERENCIA_ID") - private Conferencia conferencia; - - @Enumerated(EnumType.ORDINAL) - @Column(name = "STATUS") - private StatusLogConferencia status; - - @Column(name = "EVENTOEXTRA_ID") - private Long eventoextraId; - - @Column(name = "OCD_ID") - private Long ocdId; - - @Enumerated(EnumType.ORDINAL) - @Column(name = "TIPO") - private TipoLogConferencia tipo; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CONTACORRENTEPTOVTA_ID") - private ContaCorrentePtoVta contaCorrentePtoVta; - - @Column(name = "INDCREDITO") - private Short indcredito; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "TIPOINFORMATIVOCOMISSAO_ID") - private TipoInformativoComissao tipoInformativoComissao; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CONFERENCIAPENDENCIA_ID") - private ConferenciaPendencia conferenciaPendencia; - - @Column(name = "INDMESMODIA") - private Boolean indmesmodia; - - @Column(name = "CAJA_ID") - private Long cajaId; - - @Column(name = "TRANSACAOORIGINAL_ID", precision = 15, scale = 0) - private Long transacaoOriginalId; - - public Long getLogconferenciaId() { - return logconferenciaId; - } - - public void setLogconferenciaId(Long logconferenciaId) { - this.logconferenciaId = logconferenciaId; - } - - public String getObservacao() { - return observacao; - } - - public void setObservacao(String observacao) { - this.observacao = observacao; - } - - public BigDecimal getPreco() { - return preco; - } - - public void setPreco(BigDecimal preco) { - this.preco = preco; - } - - public boolean isActivo() { - return activo; - } - - public void setActivo(boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public Conferencia getConferencia() { - return conferencia; - } - - public void setConferencia(Conferencia conferencia) { - this.conferencia = conferencia; - } - - public StatusLogConferencia getStatus() { - return status; - } - - public void setStatus(StatusLogConferencia status) { - this.status = status; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - LogConferencia other = (LogConferencia) obj; - if (logconferenciaId == null) { - if (other.logconferenciaId != null) - return false; - } else if (!logconferenciaId.equals(other.logconferenciaId)) - return false; - return true; - } - - public Long getEventoextraId() { - return eventoextraId; - } - - public void setEventoextraId(Long eventoextraId) { - this.eventoextraId = eventoextraId; - } - - public Long getOcdId() { - return ocdId; - } - - public void setOcdId(Long ocdId) { - this.ocdId = ocdId; - } - - public TipoLogConferencia getTipo() { - return tipo; - } - - public void setTipo(TipoLogConferencia tipo) { - this.tipo = tipo; - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public ContaCorrentePtoVta getContaCorrentePtoVta() { - return contaCorrentePtoVta; - } - - public void setContaCorrentePtoVta(ContaCorrentePtoVta contaCorrentePtoVta) { - this.contaCorrentePtoVta = contaCorrentePtoVta; - } - - /** - * Tipos de movimentos
- * 0 - Débito
- * 1 - Crédito
- * 2 - Informativo
- */ - public Short isIndcredito() { - return indcredito; - } - - public void setIndcredito(Short indcredito) { - this.indcredito = indcredito; - } - - public TipoInformativoComissao getTipoInformativoComissao() { - return tipoInformativoComissao; - } - - public void setTipoInformativoComissao(TipoInformativoComissao tipoInformativoComissao) { - this.tipoInformativoComissao = tipoInformativoComissao; - } - - public ConferenciaPendencia getConferenciaPendencia() { - return conferenciaPendencia; - } - - public void setConferenciaPendencia(ConferenciaPendencia conferenciaPendencia) { - this.conferenciaPendencia = conferenciaPendencia; - } - - public Short getIndcredito() { - return indcredito; - } - - public Boolean getIndmesmodia() { - return indmesmodia; - } - - public void setIndmesmodia(Boolean indmesmodia) { - this.indmesmodia = indmesmodia; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public Long getTransacaoOriginalId() { - return transacaoOriginalId; - } - - public void setTransacaoOriginalId(Long transacaoOriginalId) { - this.transacaoOriginalId = transacaoOriginalId; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; +import com.rjconsultores.ventaboletos.enums.comissao.TipoLogConferencia; + +@Entity +@Table(name = "LOG_CONFERENCIA") +@SequenceGenerator(name = "LOG_CONFERENCIA_SEQ", sequenceName = "LOG_CONFERENCIA_SEQ", allocationSize = 1) +public class LogConferencia implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_CONFERENCIA_SEQ") + @Column(name = "LOGCONFERENCIA_ID") + private Long logconferenciaId; + + @Column(name = "OBSERVACAO") + private String observacao; + + @Column(name = "PRECO") + private BigDecimal preco; + + @Column(name = "ACTIVO") + private boolean activo; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "BOLETO_ID") + private Long boletoId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CONFERENCIA_ID") + private Conferencia conferencia; + + @Enumerated(EnumType.ORDINAL) + @Column(name = "STATUS") + private StatusLogConferencia status; + + @Column(name = "EVENTOEXTRA_ID") + private Long eventoextraId; + + @Column(name = "OCD_ID") + private Long ocdId; + + @Enumerated(EnumType.ORDINAL) + @Column(name = "TIPO") + private TipoLogConferencia tipo; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CONTACORRENTEPTOVTA_ID") + private ContaCorrentePtoVta contaCorrentePtoVta; + + @Column(name = "INDCREDITO") + private Short indcredito; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TIPOINFORMATIVOCOMISSAO_ID") + private TipoInformativoComissao tipoInformativoComissao; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CONFERENCIAPENDENCIA_ID") + private ConferenciaPendencia conferenciaPendencia; + + @Column(name = "INDMESMODIA") + private Boolean indmesmodia; + + @Column(name = "CAJA_ID") + private Long cajaId; + + @Column(name = "TRANSACAOORIGINAL_ID", precision = 15, scale = 0) + private Long transacaoOriginalId; + + public Long getLogconferenciaId() { + return logconferenciaId; + } + + public void setLogconferenciaId(Long logconferenciaId) { + this.logconferenciaId = logconferenciaId; + } + + public String getObservacao() { + return observacao; + } + + public void setObservacao(String observacao) { + this.observacao = observacao; + } + + public BigDecimal getPreco() { + return preco; + } + + public void setPreco(BigDecimal preco) { + this.preco = preco; + } + + public boolean isActivo() { + return activo; + } + + public void setActivo(boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Conferencia getConferencia() { + return conferencia; + } + + public void setConferencia(Conferencia conferencia) { + this.conferencia = conferencia; + } + + public StatusLogConferencia getStatus() { + return status; + } + + public void setStatus(StatusLogConferencia status) { + this.status = status; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + LogConferencia other = (LogConferencia) obj; + if (logconferenciaId == null) { + if (other.logconferenciaId != null) + return false; + } else if (!logconferenciaId.equals(other.logconferenciaId)) + return false; + return true; + } + + public Long getEventoextraId() { + return eventoextraId; + } + + public void setEventoextraId(Long eventoextraId) { + this.eventoextraId = eventoextraId; + } + + public Long getOcdId() { + return ocdId; + } + + public void setOcdId(Long ocdId) { + this.ocdId = ocdId; + } + + public TipoLogConferencia getTipo() { + return tipo; + } + + public void setTipo(TipoLogConferencia tipo) { + this.tipo = tipo; + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public ContaCorrentePtoVta getContaCorrentePtoVta() { + return contaCorrentePtoVta; + } + + public void setContaCorrentePtoVta(ContaCorrentePtoVta contaCorrentePtoVta) { + this.contaCorrentePtoVta = contaCorrentePtoVta; + } + + /** + * Tipos de movimentos
+ * 0 - Débito
+ * 1 - Crédito
+ * 2 - Informativo
+ */ + public Short isIndcredito() { + return indcredito; + } + + public void setIndcredito(Short indcredito) { + this.indcredito = indcredito; + } + + public TipoInformativoComissao getTipoInformativoComissao() { + return tipoInformativoComissao; + } + + public void setTipoInformativoComissao(TipoInformativoComissao tipoInformativoComissao) { + this.tipoInformativoComissao = tipoInformativoComissao; + } + + public ConferenciaPendencia getConferenciaPendencia() { + return conferenciaPendencia; + } + + public void setConferenciaPendencia(ConferenciaPendencia conferenciaPendencia) { + this.conferenciaPendencia = conferenciaPendencia; + } + + public Short getIndcredito() { + return indcredito; + } + + public Boolean getIndmesmodia() { + return indmesmodia; + } + + public void setIndmesmodia(Boolean indmesmodia) { + this.indmesmodia = indmesmodia; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public Long getTransacaoOriginalId() { + return transacaoOriginalId; + } + + public void setTransacaoOriginalId(Long transacaoOriginalId) { + this.transacaoOriginalId = transacaoOriginalId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogDespesaReceitaDiversa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogDespesaReceitaDiversa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/LogDespesaReceitaDiversa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogDespesaReceitaDiversa.java index 51f231ca7..49c224868 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/LogDespesaReceitaDiversa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogDespesaReceitaDiversa.java @@ -1,80 +1,80 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "LOG_DESPESAS_RECEITAS_DIV_SEQ", sequenceName = "LOG_DESPESAS_RECEITAS_DIV_SEQ", allocationSize = 1) -@Table(name = "LOG_DESPESAS_RECEITAS_DIV") -public class LogDespesaReceitaDiversa { - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_DESPESAS_RECEITAS_DIV_SEQ") - @Column(name = "DESPESASRECEITASDIV_ID") - private Long despesaReceitaDivId; - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuario; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @Column(name = "DATA_EXEC") - private Date dataExecucao; - @Column(name = "DATA_INICIO") - private Date dataInicio; - @Column(name = "DATA_FIM") - private Date dataFim; - @Column(name = "PROCESSADO") - private Boolean indProcessado; - - public Long getDespesaReceitaDivId() { - return despesaReceitaDivId; - } - public void setDespesaReceitaDivId(Long despesaReceitaDivId) { - this.despesaReceitaDivId = despesaReceitaDivId; - } - public Usuario getUsuario() { - return usuario; - } - public void setUsuario(Usuario usuarioId) { - this.usuario = usuarioId; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresaId) { - this.empresa = empresaId; - } - public Date getDataExecucao() { - return dataExecucao; - } - public void setDataExecucao(Date dataExecucao) { - this.dataExecucao = dataExecucao; - } - public Date getDataInicio() { - return dataInicio; - } - public void setDataInicio(Date dataInicio) { - this.dataInicio = dataInicio; - } - public Date getDataFim() { - return dataFim; - } - public void setDataFim(Date dataFim) { - this.dataFim = dataFim; - } - public Boolean getIndProcessado() { - return indProcessado; - } - public void setIndProcessado(Boolean indProcessado) { - this.indProcessado = indProcessado; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "LOG_DESPESAS_RECEITAS_DIV_SEQ", sequenceName = "LOG_DESPESAS_RECEITAS_DIV_SEQ", allocationSize = 1) +@Table(name = "LOG_DESPESAS_RECEITAS_DIV") +public class LogDespesaReceitaDiversa { + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_DESPESAS_RECEITAS_DIV_SEQ") + @Column(name = "DESPESASRECEITASDIV_ID") + private Long despesaReceitaDivId; + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuario; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @Column(name = "DATA_EXEC") + private Date dataExecucao; + @Column(name = "DATA_INICIO") + private Date dataInicio; + @Column(name = "DATA_FIM") + private Date dataFim; + @Column(name = "PROCESSADO") + private Boolean indProcessado; + + public Long getDespesaReceitaDivId() { + return despesaReceitaDivId; + } + public void setDespesaReceitaDivId(Long despesaReceitaDivId) { + this.despesaReceitaDivId = despesaReceitaDivId; + } + public Usuario getUsuario() { + return usuario; + } + public void setUsuario(Usuario usuarioId) { + this.usuario = usuarioId; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresaId) { + this.empresa = empresaId; + } + public Date getDataExecucao() { + return dataExecucao; + } + public void setDataExecucao(Date dataExecucao) { + this.dataExecucao = dataExecucao; + } + public Date getDataInicio() { + return dataInicio; + } + public void setDataInicio(Date dataInicio) { + this.dataInicio = dataInicio; + } + public Date getDataFim() { + return dataFim; + } + public void setDataFim(Date dataFim) { + this.dataFim = dataFim; + } + public Boolean getIndProcessado() { + return indProcessado; + } + public void setIndProcessado(Boolean indProcessado) { + this.indProcessado = indProcessado; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogHistoricoContingencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogHistoricoContingencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/LogHistoricoContingencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogHistoricoContingencia.java index e4cb4e07d..d061c4469 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/LogHistoricoContingencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/LogHistoricoContingencia.java @@ -1,135 +1,135 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author vjcor - * - */ -@Entity -@Table(name = "LOG_HISTORICO_CONTINGENCIA") -@SequenceGenerator(name = "LOG_HISTORICO_CONTINGENCIA_SEQ", sequenceName = "LOG_HISTORICO_CONTINGENCIA_SEQ", allocationSize = 1) -public class LogHistoricoContingencia implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_HISTORICO_CONTINGENCIA_SEQ") - @Column(name = "LOGHISTORICOCONTINGENCIA_ID") - private Long logHistoricoContingenciaId; - - @Column(name = "MOTIVO") - private String motivo; - - @OneToOne - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - @Column(name = "DATAHORA") - @Temporal(TemporalType.TIMESTAMP) - private Date dataHora; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @OneToOne - @JoinColumn(name = "ESTADO_ID") - private Estado estado; - - @Column(name = "STATUS") - private String status; - - @Column(name = "IND_AMBIENTE") - private Integer ambiente; - - @Column(name = "INDAUTOMATICA") - private Boolean indautomatica; - - public Long getLogHistoricoContingenciaId() { - return logHistoricoContingenciaId; - } - - public void setLogHistoricoContingenciaId(Long logHistoricoContingenciaId) { - this.logHistoricoContingenciaId = logHistoricoContingenciaId; - } - - public String getMotivo() { - return motivo; - } - - public void setMotivo(String motivo) { - this.motivo = motivo; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public Date getDataHora() { - return dataHora; - } - - public void setDataHora(Date dataHora) { - this.dataHora = dataHora; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Integer getAmbiente() { - return ambiente; - } - - public void setAmbiente(Integer ambiente) { - this.ambiente = ambiente; - } - - public Boolean getIndautomatica() { - return indautomatica == null ? false : indautomatica; - } - - public void setIndautomatica(Boolean indautomatica) { - this.indautomatica = indautomatica; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author vjcor + * + */ +@Entity +@Table(name = "LOG_HISTORICO_CONTINGENCIA") +@SequenceGenerator(name = "LOG_HISTORICO_CONTINGENCIA_SEQ", sequenceName = "LOG_HISTORICO_CONTINGENCIA_SEQ", allocationSize = 1) +public class LogHistoricoContingencia implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "LOG_HISTORICO_CONTINGENCIA_SEQ") + @Column(name = "LOGHISTORICOCONTINGENCIA_ID") + private Long logHistoricoContingenciaId; + + @Column(name = "MOTIVO") + private String motivo; + + @OneToOne + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + @Column(name = "DATAHORA") + @Temporal(TemporalType.TIMESTAMP) + private Date dataHora; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @OneToOne + @JoinColumn(name = "ESTADO_ID") + private Estado estado; + + @Column(name = "STATUS") + private String status; + + @Column(name = "IND_AMBIENTE") + private Integer ambiente; + + @Column(name = "INDAUTOMATICA") + private Boolean indautomatica; + + public Long getLogHistoricoContingenciaId() { + return logHistoricoContingenciaId; + } + + public void setLogHistoricoContingenciaId(Long logHistoricoContingenciaId) { + this.logHistoricoContingenciaId = logHistoricoContingenciaId; + } + + public String getMotivo() { + return motivo; + } + + public void setMotivo(String motivo) { + this.motivo = motivo; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Date getDataHora() { + return dataHora; + } + + public void setDataHora(Date dataHora) { + this.dataHora = dataHora; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Integer getAmbiente() { + return ambiente; + } + + public void setAmbiente(Integer ambiente) { + this.ambiente = ambiente; + } + + public Boolean getIndautomatica() { + return indautomatica == null ? false : indautomatica; + } + + public void setIndautomatica(Boolean indautomatica) { + this.indautomatica = indautomatica; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Marca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Marca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Marca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Marca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MarcaAutobus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaAutobus.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MarcaAutobus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaAutobus.java index ba08b7d71..b94ffc0f6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MarcaAutobus.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaAutobus.java @@ -1,87 +1,87 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "MARCA_AUTOBUS_SEQ", sequenceName = "MARCA_AUTOBUS_SEQ", allocationSize = 1) -@Table(name = "MARCA_AUTOBUS") -public class MarcaAutobus implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MARCA_AUTOBUS_SEQ") - @Column(name = "MARCAAUTOBUS_ID") - private Long marcaAutobusId; - @Column(name = "DESCMARCA") - private String descmarca; - @Column(name = "ACTIVO") - private Boolean activo; - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getMarcaAutobusId() { - return marcaAutobusId; - } - public void setMarcaAutobusId(Long marcaAutobusId) { - this.marcaAutobusId = marcaAutobusId; - } - public String getDescmarca() { - return descmarca; - } - public void setDescmarca(String descmarca) { - this.descmarca = descmarca; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString(){ - return this.descmarca; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof MarcaAutobus)) { - return false; - } - MarcaAutobus other = (MarcaAutobus) object; - if ((this.marcaAutobusId == null && other.marcaAutobusId != null) || (this.marcaAutobusId != null && !this.marcaAutobusId.equals(other.marcaAutobusId))) { - return false; - } - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "MARCA_AUTOBUS_SEQ", sequenceName = "MARCA_AUTOBUS_SEQ", allocationSize = 1) +@Table(name = "MARCA_AUTOBUS") +public class MarcaAutobus implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MARCA_AUTOBUS_SEQ") + @Column(name = "MARCAAUTOBUS_ID") + private Long marcaAutobusId; + @Column(name = "DESCMARCA") + private String descmarca; + @Column(name = "ACTIVO") + private Boolean activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getMarcaAutobusId() { + return marcaAutobusId; + } + public void setMarcaAutobusId(Long marcaAutobusId) { + this.marcaAutobusId = marcaAutobusId; + } + public String getDescmarca() { + return descmarca; + } + public void setDescmarca(String descmarca) { + this.descmarca = descmarca; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString(){ + return this.descmarca; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof MarcaAutobus)) { + return false; + } + MarcaAutobus other = (MarcaAutobus) object; + if ((this.marcaAutobusId == null && other.marcaAutobusId != null) || (this.marcaAutobusId != null && !this.marcaAutobusId.equals(other.marcaAutobusId))) { + return false; + } + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicioPK.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicioPK.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicioPK.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MarcaClaseServicioPK.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MensagemRecusa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensagemRecusa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MensagemRecusa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensagemRecusa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Mensaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Mensaje.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Mensaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Mensaje.java index 936961619..d436d17a0 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Mensaje.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Mensaje.java @@ -1,180 +1,180 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "MENSAJE_SEQ", sequenceName = "MENSAJE_SEQ", allocationSize = 1) -@Table(name = "MENSAJE") -public class Mensaje implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer mensajeId; - private Date fecIni; - private Date fecFin; - private String descripcion; - private Boolean indTipo; - private Boolean activo; - private Date fecModif; - private Integer usuarioId; - private List mensajesPuntoVenda; - private List mensajesEmpresa; - private List mensajesUsuario; - - public Mensaje() { - mensajesPuntoVenda = new ArrayList(); - mensajesEmpresa = new ArrayList(); - mensajesUsuario = new ArrayList(); - } - - @Id - @Column(name = "MENSAJE_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_SEQ") - @Basic(optional = false) - public Integer getMensajeId() { - return mensajeId; - } - - public void setMensajeId(Integer mensajeId) { - this.mensajeId = mensajeId; - } - - @Column(name = "FECINI") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecIni() { - return fecIni; - } - - public void setFecIni(Date fecIni) { - this.fecIni = fecIni; - } - - @Column(name = "FECFIN") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecFin() { - return fecFin; - } - - public void setFecFin(Date fecFin) { - this.fecFin = fecFin; - } - - @Column(name = "DESCRIPCION") - public String getDescripcion() { - return descripcion; - } - - public void setDescripcion(String descripcion) { - this.descripcion = descripcion; - } - - @Column(name = "INDTIPO") - public Boolean getIndTipo() { - return indTipo; - } - - public void setIndTipo(Boolean indTipo) { - this.indTipo = indTipo; - } - - @Column(name = "ACTIVO") - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecModif() { - return fecModif; - } - - public void setFecModif(Date fecModif) { - this.fecModif = fecModif; - } - - @Column(name = "USUARIO_ID") - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") - public List getMensajesPuntoVenda() { - return mensajesPuntoVenda; - } - - public void setMensajesPuntoVenda(List mensajesPuntoVenda) { - this.mensajesPuntoVenda = mensajesPuntoVenda; - } - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") - public List getMensajesEmpresa() { - return mensajesEmpresa; - } - - public void setMensajesEmpresa(List mensajesEmpresa) { - this.mensajesEmpresa = mensajesEmpresa; - } - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") - public List getMensajesUsuario() { - return mensajesUsuario; - } - - public void setMensajesUsuario(List mensajesUsuario) { - this.mensajesUsuario = mensajesUsuario; - } - - @Override - public String toString() { - return mensajeId == null ? "null" : this.mensajeId.toString(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (mensajeId != null ? mensajeId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Mensaje)) { - return false; - } - Mensaje other = (Mensaje) object; - if ((this.mensajeId == null && other.mensajeId != null) || (this.mensajeId != null && !this.mensajeId.equals(other.mensajeId))) { - return false; - } - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "MENSAJE_SEQ", sequenceName = "MENSAJE_SEQ", allocationSize = 1) +@Table(name = "MENSAJE") +public class Mensaje implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer mensajeId; + private Date fecIni; + private Date fecFin; + private String descripcion; + private Boolean indTipo; + private Boolean activo; + private Date fecModif; + private Integer usuarioId; + private List mensajesPuntoVenda; + private List mensajesEmpresa; + private List mensajesUsuario; + + public Mensaje() { + mensajesPuntoVenda = new ArrayList(); + mensajesEmpresa = new ArrayList(); + mensajesUsuario = new ArrayList(); + } + + @Id + @Column(name = "MENSAJE_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_SEQ") + @Basic(optional = false) + public Integer getMensajeId() { + return mensajeId; + } + + public void setMensajeId(Integer mensajeId) { + this.mensajeId = mensajeId; + } + + @Column(name = "FECINI") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecIni() { + return fecIni; + } + + public void setFecIni(Date fecIni) { + this.fecIni = fecIni; + } + + @Column(name = "FECFIN") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecFin() { + return fecFin; + } + + public void setFecFin(Date fecFin) { + this.fecFin = fecFin; + } + + @Column(name = "DESCRIPCION") + public String getDescripcion() { + return descripcion; + } + + public void setDescripcion(String descripcion) { + this.descripcion = descripcion; + } + + @Column(name = "INDTIPO") + public Boolean getIndTipo() { + return indTipo; + } + + public void setIndTipo(Boolean indTipo) { + this.indTipo = indTipo; + } + + @Column(name = "ACTIVO") + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecModif() { + return fecModif; + } + + public void setFecModif(Date fecModif) { + this.fecModif = fecModif; + } + + @Column(name = "USUARIO_ID") + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") + public List getMensajesPuntoVenda() { + return mensajesPuntoVenda; + } + + public void setMensajesPuntoVenda(List mensajesPuntoVenda) { + this.mensajesPuntoVenda = mensajesPuntoVenda; + } + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") + public List getMensajesEmpresa() { + return mensajesEmpresa; + } + + public void setMensajesEmpresa(List mensajesEmpresa) { + this.mensajesEmpresa = mensajesEmpresa; + } + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") + public List getMensajesUsuario() { + return mensajesUsuario; + } + + public void setMensajesUsuario(List mensajesUsuario) { + this.mensajesUsuario = mensajesUsuario; + } + + @Override + public String toString() { + return mensajeId == null ? "null" : this.mensajeId.toString(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (mensajeId != null ? mensajeId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Mensaje)) { + return false; + } + Mensaje other = (Mensaje) object; + if ((this.mensajeId == null && other.mensajeId != null) || (this.mensajeId != null && !this.mensajeId.equals(other.mensajeId))) { + return false; + } + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MensajeEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajeEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MensajeEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajeEmpresa.java index c991f1ef3..f367eca4f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MensajeEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajeEmpresa.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "MENSAJE_EMPRESA_SEQ", sequenceName = "MENSAJE_EMPRESA_SEQ", allocationSize = 1) -@Table(name = "MENSAJE_EMPRESA") -public class MensajeEmpresa implements Serializable{ - - private static final long serialVersionUID = 1L; - - private Integer mensajeEmpresaId; - private Mensaje mensaje; - private Empresa empresa; - private Boolean activo; - private Date fecModif; - private Integer usuarioId; - - @Id - @Column(name = "MENSAJE_EMPRESA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_EMPRESA_SEQ") - @Basic(optional = false) - public Integer getMensajeEmpresaId() { - return mensajeEmpresaId; - } - - public void setMensajeEmpresaId(Integer mensajeEmpresaId) { - this.mensajeEmpresaId = mensajeEmpresaId; - } - - @ManyToOne - @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") - public Mensaje getMensaje() { - return mensaje; - } - - public void setMensaje(Mensaje mensaje) { - this.mensaje = mensaje; - } - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Column(name = "ACTIVO") - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecModif() { - return fecModif; - } - - public void setFecModif(Date fecModif) { - this.fecModif = fecModif; - } - - @Column(name = "USUARIO_ID") - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return mensajeEmpresaId == null ? "null" : this.mensajeEmpresaId.toString(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (mensajeEmpresaId != null ? mensajeEmpresaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof MensajeEmpresa)) { - return false; - } - MensajeEmpresa other = (MensajeEmpresa) object; - if ((this.mensajeEmpresaId == null && other.mensajeEmpresaId != null) || (this.mensajeEmpresaId != null && !this.mensajeEmpresaId.equals(other.mensajeEmpresaId))) { - return false; - } - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "MENSAJE_EMPRESA_SEQ", sequenceName = "MENSAJE_EMPRESA_SEQ", allocationSize = 1) +@Table(name = "MENSAJE_EMPRESA") +public class MensajeEmpresa implements Serializable{ + + private static final long serialVersionUID = 1L; + + private Integer mensajeEmpresaId; + private Mensaje mensaje; + private Empresa empresa; + private Boolean activo; + private Date fecModif; + private Integer usuarioId; + + @Id + @Column(name = "MENSAJE_EMPRESA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_EMPRESA_SEQ") + @Basic(optional = false) + public Integer getMensajeEmpresaId() { + return mensajeEmpresaId; + } + + public void setMensajeEmpresaId(Integer mensajeEmpresaId) { + this.mensajeEmpresaId = mensajeEmpresaId; + } + + @ManyToOne + @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") + public Mensaje getMensaje() { + return mensaje; + } + + public void setMensaje(Mensaje mensaje) { + this.mensaje = mensaje; + } + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Column(name = "ACTIVO") + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecModif() { + return fecModif; + } + + public void setFecModif(Date fecModif) { + this.fecModif = fecModif; + } + + @Column(name = "USUARIO_ID") + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return mensajeEmpresaId == null ? "null" : this.mensajeEmpresaId.toString(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (mensajeEmpresaId != null ? mensajeEmpresaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof MensajeEmpresa)) { + return false; + } + MensajeEmpresa other = (MensajeEmpresa) object; + if ((this.mensajeEmpresaId == null && other.mensajeEmpresaId != null) || (this.mensajeEmpresaId != null && !this.mensajeEmpresaId.equals(other.mensajeEmpresaId))) { + return false; + } + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MensajePuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajePuntoVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MensajePuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajePuntoVenta.java index 1d6299b1c..b5cedb8d7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MensajePuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajePuntoVenta.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "MENSAJE_PUNTO_VENTA_SEQ", sequenceName = "MENSAJE_PUNTO_VENTA_SEQ", allocationSize = 1) -@Table(name = "MENSAJE_PUNTO_VENTA") -public class MensajePuntoVenta implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer mensajePuntoVendaId; - private Mensaje mensaje; - private PuntoVenta puntoVenda; - private Boolean activo; - private Date fecModif; - private Integer usuarioId; - - @Id - @Column(name = "MENSAJE_PUNTO_VENTA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_PUNTO_VENTA_SEQ") - @Basic(optional = false) - public Integer getMensajePuntoVendaId() { - return mensajePuntoVendaId; - } - - public void setMensajePuntoVendaId(Integer mensajePuntoVendaId) { - this.mensajePuntoVendaId = mensajePuntoVendaId; - } - - @ManyToOne - @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") - public Mensaje getMensaje() { - return mensaje; - } - - public void setMensaje(Mensaje mensaje) { - this.mensaje = mensaje; - } - - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - public PuntoVenta getPuntoVenda() { - return puntoVenda; - } - - public void setPuntoVenda(PuntoVenta puntoVenda) { - this.puntoVenda = puntoVenda; - } - - @Column(name = "ACTIVO") - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecModif() { - return fecModif; - } - - public void setFecModif(Date fecModif) { - this.fecModif = fecModif; - } - - @Column(name = "USUARIO_ID") - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return mensajePuntoVendaId == null ? "null" : this.mensajePuntoVendaId.toString(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (mensajePuntoVendaId != null ? mensajePuntoVendaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof MensajePuntoVenta)) { - return false; - } - MensajePuntoVenta other = (MensajePuntoVenta) object; - if ((this.mensajePuntoVendaId == null && other.mensajePuntoVendaId != null) || (this.mensajePuntoVendaId != null && !this.mensajePuntoVendaId.equals(other.mensajePuntoVendaId))) { - return false; - } - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "MENSAJE_PUNTO_VENTA_SEQ", sequenceName = "MENSAJE_PUNTO_VENTA_SEQ", allocationSize = 1) +@Table(name = "MENSAJE_PUNTO_VENTA") +public class MensajePuntoVenta implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer mensajePuntoVendaId; + private Mensaje mensaje; + private PuntoVenta puntoVenda; + private Boolean activo; + private Date fecModif; + private Integer usuarioId; + + @Id + @Column(name = "MENSAJE_PUNTO_VENTA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_PUNTO_VENTA_SEQ") + @Basic(optional = false) + public Integer getMensajePuntoVendaId() { + return mensajePuntoVendaId; + } + + public void setMensajePuntoVendaId(Integer mensajePuntoVendaId) { + this.mensajePuntoVendaId = mensajePuntoVendaId; + } + + @ManyToOne + @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") + public Mensaje getMensaje() { + return mensaje; + } + + public void setMensaje(Mensaje mensaje) { + this.mensaje = mensaje; + } + + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + public PuntoVenta getPuntoVenda() { + return puntoVenda; + } + + public void setPuntoVenda(PuntoVenta puntoVenda) { + this.puntoVenda = puntoVenda; + } + + @Column(name = "ACTIVO") + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecModif() { + return fecModif; + } + + public void setFecModif(Date fecModif) { + this.fecModif = fecModif; + } + + @Column(name = "USUARIO_ID") + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return mensajePuntoVendaId == null ? "null" : this.mensajePuntoVendaId.toString(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (mensajePuntoVendaId != null ? mensajePuntoVendaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof MensajePuntoVenta)) { + return false; + } + MensajePuntoVenta other = (MensajePuntoVenta) object; + if ((this.mensajePuntoVendaId == null && other.mensajePuntoVendaId != null) || (this.mensajePuntoVendaId != null && !this.mensajePuntoVendaId.equals(other.mensajePuntoVendaId))) { + return false; + } + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MensajeUsuario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajeUsuario.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MensajeUsuario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajeUsuario.java index 3faf6e181..9518c1c2c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MensajeUsuario.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MensajeUsuario.java @@ -1,125 +1,125 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "MENSAJE_USUARIO_SEQ", sequenceName = "MENSAJE_USUARIO_SEQ", allocationSize = 1) -@Table(name = "MENSAJE_USUARIO") -public class MensajeUsuario { - - private Integer mensajeUsuarioId; - private Mensaje mensaje; - private Usuario usuario; - private Date fecLeido; - private Date fecModif; - private Boolean activo; - private Integer usuarioModifId; - - @Id - @Column(name = "MENSAJE_USUARIO_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_USUARIO_SEQ") - @Basic(optional = false) - public Integer getMensajeUsuarioId() { - return mensajeUsuarioId; - } - - public void setMensajeUsuarioId(Integer mensajeUsuarioId) { - this.mensajeUsuarioId = mensajeUsuarioId; - } - - @ManyToOne - @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") - public Mensaje getMensaje() { - return mensaje; - } - - public void setMensaje(Mensaje mensaje) { - this.mensaje = mensaje; - } - - @ManyToOne - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - @Column(name = "FECLEIDO") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecLeido() { - return fecLeido; - } - - public void setFecLeido(Date fecLeido) { - this.fecLeido = fecLeido; - } - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecModif() { - return fecModif; - } - - public void setFecModif(Date fecModif) { - this.fecModif = fecModif; - } - - @Column(name = "ACTIVO") - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Column(name = "USUARIOMODIF_ID ") - public Integer getUsuarioModifId() { - return usuarioModifId; - } - - public void setUsuarioModifId(Integer usuarioModifId) { - this.usuarioModifId = usuarioModifId; - } - - @Override - public String toString() { - return mensajeUsuarioId == null ? "null" : this.mensajeUsuarioId.toString(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (mensajeUsuarioId != null ? mensajeUsuarioId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof MensajeUsuario)) { - return false; - } - MensajeUsuario other = (MensajeUsuario) object; - if ((this.mensajeUsuarioId == null && other.mensajeUsuarioId != null) || (this.mensajeUsuarioId != null && !this.mensajeUsuarioId.equals(other.mensajeUsuarioId))) { - return false; - } - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "MENSAJE_USUARIO_SEQ", sequenceName = "MENSAJE_USUARIO_SEQ", allocationSize = 1) +@Table(name = "MENSAJE_USUARIO") +public class MensajeUsuario { + + private Integer mensajeUsuarioId; + private Mensaje mensaje; + private Usuario usuario; + private Date fecLeido; + private Date fecModif; + private Boolean activo; + private Integer usuarioModifId; + + @Id + @Column(name = "MENSAJE_USUARIO_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MENSAJE_USUARIO_SEQ") + @Basic(optional = false) + public Integer getMensajeUsuarioId() { + return mensajeUsuarioId; + } + + public void setMensajeUsuarioId(Integer mensajeUsuarioId) { + this.mensajeUsuarioId = mensajeUsuarioId; + } + + @ManyToOne + @JoinColumn(name = "MENSAJE_ID", referencedColumnName = "MENSAJE_ID") + public Mensaje getMensaje() { + return mensaje; + } + + public void setMensaje(Mensaje mensaje) { + this.mensaje = mensaje; + } + + @ManyToOne + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + @Column(name = "FECLEIDO") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecLeido() { + return fecLeido; + } + + public void setFecLeido(Date fecLeido) { + this.fecLeido = fecLeido; + } + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecModif() { + return fecModif; + } + + public void setFecModif(Date fecModif) { + this.fecModif = fecModif; + } + + @Column(name = "ACTIVO") + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Column(name = "USUARIOMODIF_ID ") + public Integer getUsuarioModifId() { + return usuarioModifId; + } + + public void setUsuarioModifId(Integer usuarioModifId) { + this.usuarioModifId = usuarioModifId; + } + + @Override + public String toString() { + return mensajeUsuarioId == null ? "null" : this.mensajeUsuarioId.toString(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (mensajeUsuarioId != null ? mensajeUsuarioId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof MensajeUsuario)) { + return false; + } + MensajeUsuario other = (MensajeUsuario) object; + if ((this.mensajeUsuarioId == null && other.mensajeUsuarioId != null) || (this.mensajeUsuarioId != null && !this.mensajeUsuarioId.equals(other.mensajeUsuarioId))) { + return false; + } + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MercadoCompetido.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MercadoCompetido.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MercadoCompetido.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MercadoCompetido.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MerchantBancario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MerchantBancario.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MerchantBancario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MerchantBancario.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Moneda.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Moneda.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Moneda.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Moneda.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCF.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCF.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCF.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCF.java index bed7519d7..d3585e452 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCF.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCF.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "MONITORAMENTO_CCF_SEQ", sequenceName = "MONITORAMENTO_CCF_SEQ", allocationSize = 1) -@Table(name = "MONITORAMENTO_CCF") -public class MonitoramentoCCF { - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MONITORAMENTO_CCF_SEQ") - @Column(name = "MONITORAMENTOCCF_ID") - private Integer monitoramentoCcfId; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "UF_INSTALACAO", referencedColumnName = "ESTADO_ID") - @ManyToOne - private Estado estadoInstalacao; - @JoinColumn(name = "FISCALIMPRESSORA_ID", referencedColumnName = "FISCALIMPRESSORA_ID") - @ManyToOne - private FiscalImpressora impressora; - @Column(name = "DATA_OCORRENCIA") - private Date dataOcorrencia; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventa; - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuario; - @Column(name = "SEQUENCIA_CCF_QUEBRADA") - private Integer sequenciaCCFQuebrada; - @Column(name = "DATA_MONITORAMENTO") - private Date dataMonitoramento; - @Column(name = "DIAS_ALERTA_ABERTO") - private Date diasAlertaAberto; - @Column(name = "REPROCESSADO") - private Boolean reprocessado; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - private Date fecmodif; - @JoinColumn(name = "USUARIOMODIF_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuarioModif; - - - public Integer getMonitoramentoCcfId() { - return monitoramentoCcfId; - } - public void setMonitoramentoCcfId(Integer monitoramentoCcfId) { - this.monitoramentoCcfId = monitoramentoCcfId; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Estado getEstadoInstalacao() { - return estadoInstalacao; - } - public void setEstadoInstalacao(Estado estadoInstalacao) { - this.estadoInstalacao = estadoInstalacao; - } - public Date getDataOcorrencia() { - return dataOcorrencia; - } - public void setDataOcorrencia(Date dataOcorrencia) { - this.dataOcorrencia = dataOcorrencia; - } - public PuntoVenta getPuntoventa() { - return puntoventa; - } - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - public Usuario getUsuario() { - return usuario; - } - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - public Integer getSequenciaCCFQuebrada() { - return sequenciaCCFQuebrada; - } - public void setSequenciaCCFQuebrada(Integer sequenciaCCFQuebrada) { - this.sequenciaCCFQuebrada = sequenciaCCFQuebrada; - } - public Date getDataMonitoramento() { - return dataMonitoramento; - } - public void setDataMonitoramento(Date dataMonitoramento) { - this.dataMonitoramento = dataMonitoramento; - } - public Date getDiasAlertaAberto() { - return diasAlertaAberto; - } - public void setDiasAlertaAberto(Date diasAlertaAberto) { - this.diasAlertaAberto = diasAlertaAberto; - } - public Boolean getReprocessado() { - return reprocessado; - } - public void setReprocessado(Boolean reprocessado) { - this.reprocessado = reprocessado; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Usuario getUsuarioModif() { - return usuarioModif; - } - public void setUsuarioModif(Usuario usuarioModif) { - this.usuarioModif = usuarioModif; - } - public FiscalImpressora getImpressora() { - return impressora; - } - public void setImpressora(FiscalImpressora impressora) { - this.impressora = impressora; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "MONITORAMENTO_CCF_SEQ", sequenceName = "MONITORAMENTO_CCF_SEQ", allocationSize = 1) +@Table(name = "MONITORAMENTO_CCF") +public class MonitoramentoCCF { + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MONITORAMENTO_CCF_SEQ") + @Column(name = "MONITORAMENTOCCF_ID") + private Integer monitoramentoCcfId; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "UF_INSTALACAO", referencedColumnName = "ESTADO_ID") + @ManyToOne + private Estado estadoInstalacao; + @JoinColumn(name = "FISCALIMPRESSORA_ID", referencedColumnName = "FISCALIMPRESSORA_ID") + @ManyToOne + private FiscalImpressora impressora; + @Column(name = "DATA_OCORRENCIA") + private Date dataOcorrencia; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventa; + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuario; + @Column(name = "SEQUENCIA_CCF_QUEBRADA") + private Integer sequenciaCCFQuebrada; + @Column(name = "DATA_MONITORAMENTO") + private Date dataMonitoramento; + @Column(name = "DIAS_ALERTA_ABERTO") + private Date diasAlertaAberto; + @Column(name = "REPROCESSADO") + private Boolean reprocessado; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + private Date fecmodif; + @JoinColumn(name = "USUARIOMODIF_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuarioModif; + + + public Integer getMonitoramentoCcfId() { + return monitoramentoCcfId; + } + public void setMonitoramentoCcfId(Integer monitoramentoCcfId) { + this.monitoramentoCcfId = monitoramentoCcfId; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Estado getEstadoInstalacao() { + return estadoInstalacao; + } + public void setEstadoInstalacao(Estado estadoInstalacao) { + this.estadoInstalacao = estadoInstalacao; + } + public Date getDataOcorrencia() { + return dataOcorrencia; + } + public void setDataOcorrencia(Date dataOcorrencia) { + this.dataOcorrencia = dataOcorrencia; + } + public PuntoVenta getPuntoventa() { + return puntoventa; + } + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + public Usuario getUsuario() { + return usuario; + } + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + public Integer getSequenciaCCFQuebrada() { + return sequenciaCCFQuebrada; + } + public void setSequenciaCCFQuebrada(Integer sequenciaCCFQuebrada) { + this.sequenciaCCFQuebrada = sequenciaCCFQuebrada; + } + public Date getDataMonitoramento() { + return dataMonitoramento; + } + public void setDataMonitoramento(Date dataMonitoramento) { + this.dataMonitoramento = dataMonitoramento; + } + public Date getDiasAlertaAberto() { + return diasAlertaAberto; + } + public void setDiasAlertaAberto(Date diasAlertaAberto) { + this.diasAlertaAberto = diasAlertaAberto; + } + public Boolean getReprocessado() { + return reprocessado; + } + public void setReprocessado(Boolean reprocessado) { + this.reprocessado = reprocessado; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Usuario getUsuarioModif() { + return usuarioModif; + } + public void setUsuarioModif(Usuario usuarioModif) { + this.usuarioModif = usuarioModif; + } + public FiscalImpressora getImpressora() { + return impressora; + } + public void setImpressora(FiscalImpressora impressora) { + this.impressora = impressora; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCFR2.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCFR2.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCFR2.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCFR2.java index 7c156b89f..7cc27a160 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCFR2.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCCFR2.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.entidad; - -public class MonitoramentoCCFR2 { - public Integer cooinicio; - public Integer coofim; - public String numserie20; - public Integer estadoId; - public Integer empresaId; - public Integer puntoventaId; - public Integer fiscalImpressoraId; -} +package com.rjconsultores.ventaboletos.entidad; + +public class MonitoramentoCCFR2 { + public Integer cooinicio; + public Integer coofim; + public String numserie20; + public Integer estadoId; + public Integer empresaId; + public Integer puntoventaId; + public Integer fiscalImpressoraId; +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCRZ.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCRZ.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCRZ.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCRZ.java index d07359776..9739115b6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCRZ.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MonitoramentoCRZ.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "MONITORAMENTO_CRZ_SEQ", sequenceName = "MONITORAMENTO_CRZ_SEQ", allocationSize = 1) -@Table(name = "MONITORAMENTO_CRZ") -public class MonitoramentoCRZ { - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "MONITORAMENTO_CRZ_SEQ") - @Column(name = "MONITORAMENTOCRZ_ID") - private Integer monitoramentoCrzId; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "UF_INSTALACAO", referencedColumnName = "ESTADO_ID") - @ManyToOne - private Estado estadoInstalacao; - @JoinColumn(name = "FISCALIMPRESSORA_ID", referencedColumnName = "FISCALIMPRESSORA_ID") - @ManyToOne - private FiscalImpressora impressora; - @Column(name = "DATA_REDUCAOZ_FALTANTE") - private Date dataReducaoZFaltante; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventa; - @JoinColumn(name = "ULTIMO_USUARIO_ECF_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario ultimoUsuarioECF; - @Column(name = "SEQUENCIA_CRZ_QUEBRADA") - private Integer sequenciaCRZQuebrada; - @Column(name = "DATA_MONITORAMENTO") - private Date dataMonitoramento; - @Column(name = "DIAS_ALERTA_ABERTO") - private Date diasAlertaAberto; - @Column(name = "REPROCESSADO") - private Boolean reprocessado; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - private Date fecmodif; - @JoinColumn(name = "USUARIOMODIF_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuarioModif; - - public Integer getMonitoramentoCrzId() { - return monitoramentoCrzId; - } - public void setMonitoramentoCrzId(Integer monitoramentoCrzId) { - this.monitoramentoCrzId = monitoramentoCrzId; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Estado getEstadoInstalacao() { - return estadoInstalacao; - } - public void setEstadoInstalacao(Estado estadoInstalacao) { - this.estadoInstalacao = estadoInstalacao; - } - public Date getDataReducaoZFaltante() { - return dataReducaoZFaltante; - } - public void setDataReducaoZFaltante(Date dataReducaoZFaltante) { - this.dataReducaoZFaltante = dataReducaoZFaltante; - } - public PuntoVenta getPuntoventa() { - return puntoventa; - } - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - public Usuario getUltimoUsuarioECF() { - return ultimoUsuarioECF; - } - public void setUltimoUsuarioECF(Usuario ultimoUsuarioECF) { - this.ultimoUsuarioECF = ultimoUsuarioECF; - } - public Integer getSequenciaCRZQuebrada() { - return sequenciaCRZQuebrada; - } - public void setSequenciaCRZQuebrada(Integer sequenciaCRZQuebrada) { - this.sequenciaCRZQuebrada = sequenciaCRZQuebrada; - } - public Date getDataMonitoramento() { - return dataMonitoramento; - } - public void setDataMonitoramento(Date dataMonitoramento) { - this.dataMonitoramento = dataMonitoramento; - } - public Date getDiasAlertaAberto() { - return diasAlertaAberto; - } - public void setDiasAlertaAberto(Date diasAlertaAberto) { - this.diasAlertaAberto = diasAlertaAberto; - } - public Boolean getReprocessado() { - return reprocessado; - } - public void setReprocessado(Boolean reprocessado) { - this.reprocessado = reprocessado; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Usuario getUsuarioModif() { - return usuarioModif; - } - public void setUsuarioModif(Usuario usuarioModif) { - this.usuarioModif = usuarioModif; - } - public FiscalImpressora getImpressora() { - return impressora; - } - public void setImpressora(FiscalImpressora impressora) { - this.impressora = impressora; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "MONITORAMENTO_CRZ_SEQ", sequenceName = "MONITORAMENTO_CRZ_SEQ", allocationSize = 1) +@Table(name = "MONITORAMENTO_CRZ") +public class MonitoramentoCRZ { + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "MONITORAMENTO_CRZ_SEQ") + @Column(name = "MONITORAMENTOCRZ_ID") + private Integer monitoramentoCrzId; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "UF_INSTALACAO", referencedColumnName = "ESTADO_ID") + @ManyToOne + private Estado estadoInstalacao; + @JoinColumn(name = "FISCALIMPRESSORA_ID", referencedColumnName = "FISCALIMPRESSORA_ID") + @ManyToOne + private FiscalImpressora impressora; + @Column(name = "DATA_REDUCAOZ_FALTANTE") + private Date dataReducaoZFaltante; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventa; + @JoinColumn(name = "ULTIMO_USUARIO_ECF_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario ultimoUsuarioECF; + @Column(name = "SEQUENCIA_CRZ_QUEBRADA") + private Integer sequenciaCRZQuebrada; + @Column(name = "DATA_MONITORAMENTO") + private Date dataMonitoramento; + @Column(name = "DIAS_ALERTA_ABERTO") + private Date diasAlertaAberto; + @Column(name = "REPROCESSADO") + private Boolean reprocessado; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + private Date fecmodif; + @JoinColumn(name = "USUARIOMODIF_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuarioModif; + + public Integer getMonitoramentoCrzId() { + return monitoramentoCrzId; + } + public void setMonitoramentoCrzId(Integer monitoramentoCrzId) { + this.monitoramentoCrzId = monitoramentoCrzId; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Estado getEstadoInstalacao() { + return estadoInstalacao; + } + public void setEstadoInstalacao(Estado estadoInstalacao) { + this.estadoInstalacao = estadoInstalacao; + } + public Date getDataReducaoZFaltante() { + return dataReducaoZFaltante; + } + public void setDataReducaoZFaltante(Date dataReducaoZFaltante) { + this.dataReducaoZFaltante = dataReducaoZFaltante; + } + public PuntoVenta getPuntoventa() { + return puntoventa; + } + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + public Usuario getUltimoUsuarioECF() { + return ultimoUsuarioECF; + } + public void setUltimoUsuarioECF(Usuario ultimoUsuarioECF) { + this.ultimoUsuarioECF = ultimoUsuarioECF; + } + public Integer getSequenciaCRZQuebrada() { + return sequenciaCRZQuebrada; + } + public void setSequenciaCRZQuebrada(Integer sequenciaCRZQuebrada) { + this.sequenciaCRZQuebrada = sequenciaCRZQuebrada; + } + public Date getDataMonitoramento() { + return dataMonitoramento; + } + public void setDataMonitoramento(Date dataMonitoramento) { + this.dataMonitoramento = dataMonitoramento; + } + public Date getDiasAlertaAberto() { + return diasAlertaAberto; + } + public void setDiasAlertaAberto(Date diasAlertaAberto) { + this.diasAlertaAberto = diasAlertaAberto; + } + public Boolean getReprocessado() { + return reprocessado; + } + public void setReprocessado(Boolean reprocessado) { + this.reprocessado = reprocessado; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Usuario getUsuarioModif() { + return usuarioModif; + } + public void setUsuarioModif(Usuario usuarioModif) { + this.usuarioModif = usuarioModif; + } + public FiscalImpressora getImpressora() { + return impressora; + } + public void setImpressora(FiscalImpressora impressora) { + this.impressora = impressora; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/MotivoCancelVendaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoCancelVendaPacote.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MotivoCancelVendaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoCancelVendaPacote.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MotivoCancelacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoCancelacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MotivoCancelacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoCancelacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MotivoDevolucaoBilhete.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoDevolucaoBilhete.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MotivoDevolucaoBilhete.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoDevolucaoBilhete.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MotivoReimpresion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoReimpresion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MotivoReimpresion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoReimpresion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MotivoViaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoViaje.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MotivoViaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivoViaje.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/MotivocancelacionEquivalencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivocancelacionEquivalencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/MotivocancelacionEquivalencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/MotivocancelacionEquivalencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Nodo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Nodo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Nodo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Nodo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/NotaCreditoVendaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/NotaCreditoVendaPacote.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/NotaCreditoVendaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/NotaCreditoVendaPacote.java index 1f023e549..e7fe2f58d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/NotaCreditoVendaPacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/NotaCreditoVendaPacote.java @@ -1,220 +1,220 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "NOTA_CREDITO_VENDA_PACOTE", schema = "VTABOL") -public class NotaCreditoVendaPacote implements java.io.Serializable { - - private static final long serialVersionUID = -4838838474645281215L; - - @Id - @Column(name = "NOTACREDITOVENDAPACOTE_ID", unique = true, nullable = false, precision = 7, scale = 0) - private Long notaCreditoVendaPacoteId; - - @Column(name = "MOTIVOCANCELVENDAPACOTE_ID", precision = 7, scale = 0) - private Integer motivocancelvendapacoteId; - - @ManyToOne - @JoinColumn(name = "VENDAPACOTECANCELAMENTO_ID") - private VendaPacote vendapacotecancelamento; - - @ManyToOne - @JoinColumn(name = "VENDAPACOTEPAGAMENTO_ID") - private VendaPacote vendapacotepagamento; - - @Temporal(TemporalType.DATE) - @Column(name = "DATAPAGAMENTO", length = 7) - private Date datapagamento; - - @Column(name = "VALOR", nullable = false, precision = 7) - private BigDecimal valor; - - @Column(name = "SITUACAO", nullable = false, precision = 1, scale = 0) - private Integer situacao; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", nullable = false, length = 7) - private Date fecmodif; - - @Column(name = "ACTIVO", nullable = false, precision = 1, scale = 0) - private Boolean activo; - - @Column(name = "SALDO_PAGAR", precision = 7) - private BigDecimal saldoPagar; - - @Column(name = "PUNTOVENTA_ID", precision = 7, scale = 0) - private Integer puntoventaId; - - @Column(name = "PUNTOVENTAPAGAMENTO_ID", precision = 7, scale = 0) - private Integer puntoventapagamentoId; - - @Column(name = "USUARIOPAGAMENTO_ID", precision = 7, scale = 0) - private Integer usuariopagamentoId; - - @Temporal(TemporalType.DATE) - @Column(name = "DATANOTACREDITO", length = 7) - private Date datanotacredito; - - @OneToMany(mappedBy = "notaCreditoVendaPacote") - private List cajaDiversosList; - - @OneToMany(mappedBy = "notaCreditoVendaPacote") - private List ocdDatosPagamentoList; - - public Long getNotaCreditoVendaPacoteId() { - return notaCreditoVendaPacoteId; - } - - public void setNotaCreditoVendaPacoteId(Long notaCreditoVendaPacoteId) { - this.notaCreditoVendaPacoteId = notaCreditoVendaPacoteId; - } - - public Integer getMotivocancelvendapacoteId() { - return motivocancelvendapacoteId; - } - - public void setMotivocancelvendapacoteId(Integer motivocancelvendapacoteId) { - this.motivocancelvendapacoteId = motivocancelvendapacoteId; - } - - public Date getDatapagamento() { - return datapagamento; - } - - public void setDatapagamento(Date datapagamento) { - this.datapagamento = datapagamento; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public Integer isSituacao() { - return situacao; - } - - public void setSituacao(Integer situacao) { - this.situacao = situacao; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public BigDecimal getSaldoPagar() { - return saldoPagar; - } - - public void setSaldoPagar(BigDecimal saldoPagar) { - this.saldoPagar = saldoPagar; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Integer getPuntoventapagamentoId() { - return puntoventapagamentoId; - } - - public void setPuntoventapagamentoId(Integer puntoventapagamentoId) { - this.puntoventapagamentoId = puntoventapagamentoId; - } - - public Integer getUsuariopagamentoId() { - return usuariopagamentoId; - } - - public void setUsuariopagamentoId(Integer usuariopagamentoId) { - this.usuariopagamentoId = usuariopagamentoId; - } - - public Date getDatanotacredito() { - return datanotacredito; - } - - public void setDatanotacredito(Date datanotacredito) { - this.datanotacredito = datanotacredito; - } - - public List getCajaDiversosList() { - return cajaDiversosList; - } - - public void setCajaDiversosList(List cajaDiversos) { - this.cajaDiversosList = cajaDiversos; - } - - public List getOcdDatosPagamentoList() { - return ocdDatosPagamentoList; - } - - public void setOcdDatosPagamentoList(List ocdDatosPagamentos) { - this.ocdDatosPagamentoList = ocdDatosPagamentos; - } - - public Integer getSituacao() { - return situacao; - } - - public VendaPacote getVendapacotecancelamento() { - return vendapacotecancelamento; - } - - public void setVendapacotecancelamento(VendaPacote vendapacotecancelamento) { - this.vendapacotecancelamento = vendapacotecancelamento; - } - - public VendaPacote getVendapacotepagamento() { - return vendapacotepagamento; - } - - public void setVendapacotepagamento(VendaPacote vendapacotepagamento) { - this.vendapacotepagamento = vendapacotepagamento; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "NOTA_CREDITO_VENDA_PACOTE", schema = "VTABOL") +public class NotaCreditoVendaPacote implements java.io.Serializable { + + private static final long serialVersionUID = -4838838474645281215L; + + @Id + @Column(name = "NOTACREDITOVENDAPACOTE_ID", unique = true, nullable = false, precision = 7, scale = 0) + private Long notaCreditoVendaPacoteId; + + @Column(name = "MOTIVOCANCELVENDAPACOTE_ID", precision = 7, scale = 0) + private Integer motivocancelvendapacoteId; + + @ManyToOne + @JoinColumn(name = "VENDAPACOTECANCELAMENTO_ID") + private VendaPacote vendapacotecancelamento; + + @ManyToOne + @JoinColumn(name = "VENDAPACOTEPAGAMENTO_ID") + private VendaPacote vendapacotepagamento; + + @Temporal(TemporalType.DATE) + @Column(name = "DATAPAGAMENTO", length = 7) + private Date datapagamento; + + @Column(name = "VALOR", nullable = false, precision = 7) + private BigDecimal valor; + + @Column(name = "SITUACAO", nullable = false, precision = 1, scale = 0) + private Integer situacao; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", nullable = false, length = 7) + private Date fecmodif; + + @Column(name = "ACTIVO", nullable = false, precision = 1, scale = 0) + private Boolean activo; + + @Column(name = "SALDO_PAGAR", precision = 7) + private BigDecimal saldoPagar; + + @Column(name = "PUNTOVENTA_ID", precision = 7, scale = 0) + private Integer puntoventaId; + + @Column(name = "PUNTOVENTAPAGAMENTO_ID", precision = 7, scale = 0) + private Integer puntoventapagamentoId; + + @Column(name = "USUARIOPAGAMENTO_ID", precision = 7, scale = 0) + private Integer usuariopagamentoId; + + @Temporal(TemporalType.DATE) + @Column(name = "DATANOTACREDITO", length = 7) + private Date datanotacredito; + + @OneToMany(mappedBy = "notaCreditoVendaPacote") + private List cajaDiversosList; + + @OneToMany(mappedBy = "notaCreditoVendaPacote") + private List ocdDatosPagamentoList; + + public Long getNotaCreditoVendaPacoteId() { + return notaCreditoVendaPacoteId; + } + + public void setNotaCreditoVendaPacoteId(Long notaCreditoVendaPacoteId) { + this.notaCreditoVendaPacoteId = notaCreditoVendaPacoteId; + } + + public Integer getMotivocancelvendapacoteId() { + return motivocancelvendapacoteId; + } + + public void setMotivocancelvendapacoteId(Integer motivocancelvendapacoteId) { + this.motivocancelvendapacoteId = motivocancelvendapacoteId; + } + + public Date getDatapagamento() { + return datapagamento; + } + + public void setDatapagamento(Date datapagamento) { + this.datapagamento = datapagamento; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public Integer isSituacao() { + return situacao; + } + + public void setSituacao(Integer situacao) { + this.situacao = situacao; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public BigDecimal getSaldoPagar() { + return saldoPagar; + } + + public void setSaldoPagar(BigDecimal saldoPagar) { + this.saldoPagar = saldoPagar; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Integer getPuntoventapagamentoId() { + return puntoventapagamentoId; + } + + public void setPuntoventapagamentoId(Integer puntoventapagamentoId) { + this.puntoventapagamentoId = puntoventapagamentoId; + } + + public Integer getUsuariopagamentoId() { + return usuariopagamentoId; + } + + public void setUsuariopagamentoId(Integer usuariopagamentoId) { + this.usuariopagamentoId = usuariopagamentoId; + } + + public Date getDatanotacredito() { + return datanotacredito; + } + + public void setDatanotacredito(Date datanotacredito) { + this.datanotacredito = datanotacredito; + } + + public List getCajaDiversosList() { + return cajaDiversosList; + } + + public void setCajaDiversosList(List cajaDiversos) { + this.cajaDiversosList = cajaDiversos; + } + + public List getOcdDatosPagamentoList() { + return ocdDatosPagamentoList; + } + + public void setOcdDatosPagamentoList(List ocdDatosPagamentos) { + this.ocdDatosPagamentoList = ocdDatosPagamentos; + } + + public Integer getSituacao() { + return situacao; + } + + public VendaPacote getVendapacotecancelamento() { + return vendapacotecancelamento; + } + + public void setVendapacotecancelamento(VendaPacote vendapacotecancelamento) { + this.vendapacotecancelamento = vendapacotecancelamento; + } + + public VendaPacote getVendapacotepagamento() { + return vendapacotepagamento; + } + + public void setVendapacotepagamento(VendaPacote vendapacotepagamento) { + this.vendapacotepagamento = vendapacotepagamento; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OCD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCD.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/OCD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCD.java index bd5c15003..75ace6215 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OCD.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCD.java @@ -1,334 +1,334 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "OCD") -public class OCD implements java.io.Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - @SequenceGenerator(name = "OCD_SEQ", sequenceName = "OCD_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "OCD_SEQ") - @Column(name = "OCD_ID", unique = true, nullable = false, precision = 15, scale = 0) - private Long ocdId; - - @JoinColumn(name = "BOLETO_ID") - @ManyToOne(fetch = FetchType.LAZY) - private Boleto boleto; - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - - @Column(name = "NUMTARJETA",length=16) - private String numtarjeta; - @Column(name = "NUMAUTORIZACION",length=15) - private String numautorizacion; - @Column(name = "NSU",length=6) - private String nsu; - - @Column(name = "NUMOPERACION", length = 36) - private String numoperacion; - - @Temporal(TemporalType.DATE) - @Column(name = "FECPAGAR", length = 7) - private Date fecpagar; - @Column(name = "VALOR_PAGAR", precision = 7, scale = 2) - private BigDecimal valorPagar; - @Column(name = "SALDO_PAGAR", precision = 7, scale = 2) - private BigDecimal saldoPagar; - @Column(name = "VALOR_TARJETA", precision = 7, scale = 2) - private BigDecimal valorTarjeta; - @Column(name = "PENALIZACION", precision = 7, scale = 2) - private BigDecimal penalizacion; - - @Column(name = "USUARIOINC_ID", precision = 7, scale = 0) - private Integer usuarioIncId; - @Temporal(TemporalType.DATE) - @Column(name = "FECINC", length = 7) - private Date fecinc; - - @Column(name = "INDPAGO", precision = 1, scale = 0) - private Boolean indpago; - @Column(name = "USUARIOPAGO_ID", precision = 7, scale = 0) - private Integer usuarioPagoId; - @Temporal(TemporalType.DATE) - @Column(name = "FECPAGO", length = 7) - private Date fecpago; - @JoinColumn(name = "PUNTOVENTAPAGO_ID") - @ManyToOne - private PuntoVenta puntoVentaPago; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @OneToMany(mappedBy = "ocd") - private List ocdDatosPagamentos; - - public OCD(){ - - } - - public OCD(Long ocdId, Boleto boleto, PuntoVenta puntoVenta, - String numoperacion, Date fecpagar, BigDecimal valorPagar, - BigDecimal penalizacion, Integer usuarioIncId, Date fecinc, - Boolean indpago, Integer usuarioPagoId, Date fecpago, - PuntoVenta puntoVentaPago, Date fecmodif, Integer usuarioId, - Boolean activo) { - super(); - this.ocdId = ocdId; - this.boleto = boleto; - this.puntoVenta = puntoVenta; - this.numoperacion = numoperacion; - this.fecpagar = fecpagar; - this.valorPagar = valorPagar; - this.penalizacion = penalizacion; - this.usuarioIncId = usuarioIncId; - this.fecinc = fecinc; - this.indpago = indpago; - this.usuarioPagoId = usuarioPagoId; - this.fecpago = fecpago; - this.puntoVentaPago = puntoVentaPago; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.activo = activo; - } - - - public OCD(Long ocdId, Boleto boleto, PuntoVenta puntoVenta, - String numoperacion, Date fecpagar, BigDecimal valorPagar, - BigDecimal penalizacion, Integer usuarioIncId) { - super(); - this.ocdId = ocdId; - this.boleto = boleto; - this.puntoVenta = puntoVenta; - this.numoperacion = numoperacion; - this.fecpagar = fecpagar; - this.valorPagar = valorPagar; - this.penalizacion = penalizacion; - this.usuarioIncId = usuarioIncId; - - this.fecinc = new Date(); - this.indpago = Boolean.FALSE; - - this.fecmodif = new Date(); - this.usuarioId = usuarioIncId; - this.activo = Boolean.TRUE; - } - - public Long getOcdId() { - return ocdId; - } - public void setOcdId(Long ocdId) { - this.ocdId = ocdId; - } - - public String getNumoperacion() { - return numoperacion; - } - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public Date getFecpagar() { - return fecpagar; - } - public void setFecpagar(Date fecpagar) { - this.fecpagar = fecpagar; - } - - public BigDecimal getValorPagar() { - return valorPagar; - } - public void setValorPagar(BigDecimal valorPagar) { - this.valorPagar = valorPagar; - } - - public BigDecimal getPenalizacion() { - return penalizacion; - } - public void setPenalizacion(BigDecimal penalizacion) { - this.penalizacion = penalizacion; - } - - public Integer getUsuarioIncId() { - return usuarioIncId; - } - public void setUsuarioIncId(Integer usuarioIncId) { - this.usuarioIncId = usuarioIncId; - } - - public Date getFecinc() { - return fecinc; - } - public void setFecinc(Date fecinc) { - this.fecinc = fecinc; - } - - public Boolean getIndpago() { - return indpago; - } - public void setIndpago(Boolean indpago) { - this.indpago = indpago; - } - - public Integer getUsuarioPagoId() { - return usuarioPagoId; - } - public void setUsuarioPagoId(Integer usuarioPagoId) { - this.usuarioPagoId = usuarioPagoId; - } - - public Date getFecpago() { - return fecpago; - } - public void setFecpago(Date fecpago) { - this.fecpago = fecpago; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public PuntoVenta getPuntoVentaPago() { - return puntoVentaPago; - } - - public void setPuntoVentaPago(PuntoVenta puntoVentaPago) { - this.puntoVentaPago = puntoVentaPago; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getNumtarjeta() { - return numtarjeta; - } - - public void setNumtarjeta(String numtarjeta) { - this.numtarjeta = numtarjeta; - } - public String getNumautorizacion() { - return numautorizacion; - } - - public void setNumautorizacion(String numautorizacion) { - this.numautorizacion = numautorizacion; - } - - public String getNsu() { - return nsu; - } - - public void setNsu(String nsu) { - this.nsu = nsu; - } - - public List getOcdDatosPagamentos() { - return ocdDatosPagamentos; - } - - public void setOcdDatosPagamentos(List ocdDatosPagamentos) { - this.ocdDatosPagamentos = ocdDatosPagamentos; - } - - public BigDecimal getSaldoPagar() { - return saldoPagar; - } - - public void setSaldoPagar(BigDecimal saldoPagar) { - this.saldoPagar = saldoPagar; - } - - public Boleto getBoleto() { - return boleto; - } - - public void setBoleto(Boleto boleto) { - this.boleto = boleto; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ocdId == null) ? 0 : ocdId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - OCD other = (OCD) obj; - if (ocdId == null) { - if (other.ocdId != null) - return false; - } else if (!ocdId.equals(other.ocdId)) - return false; - return true; - } - - public BigDecimal getValorTarjeta() { - return valorTarjeta; - } - - public void setValorTarjeta(BigDecimal valorTarjeta) { - this.valorTarjeta = valorTarjeta; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "OCD") +public class OCD implements java.io.Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @SequenceGenerator(name = "OCD_SEQ", sequenceName = "OCD_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "OCD_SEQ") + @Column(name = "OCD_ID", unique = true, nullable = false, precision = 15, scale = 0) + private Long ocdId; + + @JoinColumn(name = "BOLETO_ID") + @ManyToOne(fetch = FetchType.LAZY) + private Boleto boleto; + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + + @Column(name = "NUMTARJETA",length=16) + private String numtarjeta; + @Column(name = "NUMAUTORIZACION",length=15) + private String numautorizacion; + @Column(name = "NSU",length=6) + private String nsu; + + @Column(name = "NUMOPERACION", length = 36) + private String numoperacion; + + @Temporal(TemporalType.DATE) + @Column(name = "FECPAGAR", length = 7) + private Date fecpagar; + @Column(name = "VALOR_PAGAR", precision = 7, scale = 2) + private BigDecimal valorPagar; + @Column(name = "SALDO_PAGAR", precision = 7, scale = 2) + private BigDecimal saldoPagar; + @Column(name = "VALOR_TARJETA", precision = 7, scale = 2) + private BigDecimal valorTarjeta; + @Column(name = "PENALIZACION", precision = 7, scale = 2) + private BigDecimal penalizacion; + + @Column(name = "USUARIOINC_ID", precision = 7, scale = 0) + private Integer usuarioIncId; + @Temporal(TemporalType.DATE) + @Column(name = "FECINC", length = 7) + private Date fecinc; + + @Column(name = "INDPAGO", precision = 1, scale = 0) + private Boolean indpago; + @Column(name = "USUARIOPAGO_ID", precision = 7, scale = 0) + private Integer usuarioPagoId; + @Temporal(TemporalType.DATE) + @Column(name = "FECPAGO", length = 7) + private Date fecpago; + @JoinColumn(name = "PUNTOVENTAPAGO_ID") + @ManyToOne + private PuntoVenta puntoVentaPago; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @OneToMany(mappedBy = "ocd") + private List ocdDatosPagamentos; + + public OCD(){ + + } + + public OCD(Long ocdId, Boleto boleto, PuntoVenta puntoVenta, + String numoperacion, Date fecpagar, BigDecimal valorPagar, + BigDecimal penalizacion, Integer usuarioIncId, Date fecinc, + Boolean indpago, Integer usuarioPagoId, Date fecpago, + PuntoVenta puntoVentaPago, Date fecmodif, Integer usuarioId, + Boolean activo) { + super(); + this.ocdId = ocdId; + this.boleto = boleto; + this.puntoVenta = puntoVenta; + this.numoperacion = numoperacion; + this.fecpagar = fecpagar; + this.valorPagar = valorPagar; + this.penalizacion = penalizacion; + this.usuarioIncId = usuarioIncId; + this.fecinc = fecinc; + this.indpago = indpago; + this.usuarioPagoId = usuarioPagoId; + this.fecpago = fecpago; + this.puntoVentaPago = puntoVentaPago; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.activo = activo; + } + + + public OCD(Long ocdId, Boleto boleto, PuntoVenta puntoVenta, + String numoperacion, Date fecpagar, BigDecimal valorPagar, + BigDecimal penalizacion, Integer usuarioIncId) { + super(); + this.ocdId = ocdId; + this.boleto = boleto; + this.puntoVenta = puntoVenta; + this.numoperacion = numoperacion; + this.fecpagar = fecpagar; + this.valorPagar = valorPagar; + this.penalizacion = penalizacion; + this.usuarioIncId = usuarioIncId; + + this.fecinc = new Date(); + this.indpago = Boolean.FALSE; + + this.fecmodif = new Date(); + this.usuarioId = usuarioIncId; + this.activo = Boolean.TRUE; + } + + public Long getOcdId() { + return ocdId; + } + public void setOcdId(Long ocdId) { + this.ocdId = ocdId; + } + + public String getNumoperacion() { + return numoperacion; + } + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public Date getFecpagar() { + return fecpagar; + } + public void setFecpagar(Date fecpagar) { + this.fecpagar = fecpagar; + } + + public BigDecimal getValorPagar() { + return valorPagar; + } + public void setValorPagar(BigDecimal valorPagar) { + this.valorPagar = valorPagar; + } + + public BigDecimal getPenalizacion() { + return penalizacion; + } + public void setPenalizacion(BigDecimal penalizacion) { + this.penalizacion = penalizacion; + } + + public Integer getUsuarioIncId() { + return usuarioIncId; + } + public void setUsuarioIncId(Integer usuarioIncId) { + this.usuarioIncId = usuarioIncId; + } + + public Date getFecinc() { + return fecinc; + } + public void setFecinc(Date fecinc) { + this.fecinc = fecinc; + } + + public Boolean getIndpago() { + return indpago; + } + public void setIndpago(Boolean indpago) { + this.indpago = indpago; + } + + public Integer getUsuarioPagoId() { + return usuarioPagoId; + } + public void setUsuarioPagoId(Integer usuarioPagoId) { + this.usuarioPagoId = usuarioPagoId; + } + + public Date getFecpago() { + return fecpago; + } + public void setFecpago(Date fecpago) { + this.fecpago = fecpago; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public PuntoVenta getPuntoVentaPago() { + return puntoVentaPago; + } + + public void setPuntoVentaPago(PuntoVenta puntoVentaPago) { + this.puntoVentaPago = puntoVentaPago; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getNumtarjeta() { + return numtarjeta; + } + + public void setNumtarjeta(String numtarjeta) { + this.numtarjeta = numtarjeta; + } + public String getNumautorizacion() { + return numautorizacion; + } + + public void setNumautorizacion(String numautorizacion) { + this.numautorizacion = numautorizacion; + } + + public String getNsu() { + return nsu; + } + + public void setNsu(String nsu) { + this.nsu = nsu; + } + + public List getOcdDatosPagamentos() { + return ocdDatosPagamentos; + } + + public void setOcdDatosPagamentos(List ocdDatosPagamentos) { + this.ocdDatosPagamentos = ocdDatosPagamentos; + } + + public BigDecimal getSaldoPagar() { + return saldoPagar; + } + + public void setSaldoPagar(BigDecimal saldoPagar) { + this.saldoPagar = saldoPagar; + } + + public Boleto getBoleto() { + return boleto; + } + + public void setBoleto(Boleto boleto) { + this.boleto = boleto; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ocdId == null) ? 0 : ocdId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + OCD other = (OCD) obj; + if (ocdId == null) { + if (other.ocdId != null) + return false; + } else if (!ocdId.equals(other.ocdId)) + return false; + return true; + } + + public BigDecimal getValorTarjeta() { + return valorTarjeta; + } + + public void setValorTarjeta(BigDecimal valorTarjeta) { + this.valorTarjeta = valorTarjeta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OCDDatosPagamento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDDatosPagamento.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/OCDDatosPagamento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDDatosPagamento.java index 5924b96b3..5f979eaa6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OCDDatosPagamento.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDDatosPagamento.java @@ -1,156 +1,156 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - -@Entity -@Table(name = "OCD_DATOS_PAGAMENTO") -public class OCDDatosPagamento implements Serializable { - - private static final long serialVersionUID = 4354050654434171301L; - - @Id - @Column(name = "OCDDATOSPAGAMENTO_ID") - private Integer ocdDatosPagamentoId; - - @ManyToOne - @JoinColumn(name = "OCD_ID") - private OCD ocd; - - @Column(name = "TITULARCUENTA") - private String titularcuenta; - - @Column(name = "IDENTIFICACION") - private String identificacion; - - @Column(name = "BANCO") - private String banco; - - @Column(name = "CUENTABANCO") - private String cuentabanco; - - @Column(name = "AGENCIA") - private String agencia; - - @Column(name = "EMAIL") - private String email; - - @Column(name = "TELEFONO") - private String telefono; - - @ManyToOne - @JoinColumn(name = "NOTACREDITOVENDAPACOTE_ID") - private NotaCreditoVendaPacote notaCreditoVendaPacote; - - public OCD getOcd() { - return ocd; - } - - public void setOcd(OCD ocd) { - this.ocd = ocd; - } - - public String getTitularcuenta() { - return titularcuenta; - } - - public void setTitularcuenta(String titularcuenta) { - this.titularcuenta = titularcuenta; - } - - public String getIdentificacion() { - return identificacion; - } - - public void setIdentificacion(String identificacion) { - this.identificacion = identificacion; - } - - public String getBanco() { - return banco; - } - - public void setBanco(String banco) { - this.banco = banco; - } - - public String getCuentabanco() { - return cuentabanco; - } - - public void setCuentabanco(String cuentabanco) { - this.cuentabanco = cuentabanco; - } - - public String getAgencia() { - return agencia; - } - - public void setAgencia(String agencia) { - this.agencia = agencia; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getTelefono() { - return telefono; - } - - public void setTelefono(String telefono) { - this.telefono = telefono; - } - - public Integer getOcdDatosPagamentoId() { - return ocdDatosPagamentoId; - } - - public void setOcdDatosPagamentoId(Integer ocdDatosPagamentoId) { - this.ocdDatosPagamentoId = ocdDatosPagamentoId; - } - - public NotaCreditoVendaPacote getNotaCreditoVendaPacote() { - return notaCreditoVendaPacote; - } - - public void setNotaCreditoVendaPacote(NotaCreditoVendaPacote notaCreditoVendaPacote) { - this.notaCreditoVendaPacote = notaCreditoVendaPacote; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ocdDatosPagamentoId == null) ? 0 : ocdDatosPagamentoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - OCDDatosPagamento other = (OCDDatosPagamento) obj; - if (ocdDatosPagamentoId == null) { - if (other.ocdDatosPagamentoId != null) - return false; - } else if (!ocdDatosPagamentoId.equals(other.ocdDatosPagamentoId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +@Entity +@Table(name = "OCD_DATOS_PAGAMENTO") +public class OCDDatosPagamento implements Serializable { + + private static final long serialVersionUID = 4354050654434171301L; + + @Id + @Column(name = "OCDDATOSPAGAMENTO_ID") + private Integer ocdDatosPagamentoId; + + @ManyToOne + @JoinColumn(name = "OCD_ID") + private OCD ocd; + + @Column(name = "TITULARCUENTA") + private String titularcuenta; + + @Column(name = "IDENTIFICACION") + private String identificacion; + + @Column(name = "BANCO") + private String banco; + + @Column(name = "CUENTABANCO") + private String cuentabanco; + + @Column(name = "AGENCIA") + private String agencia; + + @Column(name = "EMAIL") + private String email; + + @Column(name = "TELEFONO") + private String telefono; + + @ManyToOne + @JoinColumn(name = "NOTACREDITOVENDAPACOTE_ID") + private NotaCreditoVendaPacote notaCreditoVendaPacote; + + public OCD getOcd() { + return ocd; + } + + public void setOcd(OCD ocd) { + this.ocd = ocd; + } + + public String getTitularcuenta() { + return titularcuenta; + } + + public void setTitularcuenta(String titularcuenta) { + this.titularcuenta = titularcuenta; + } + + public String getIdentificacion() { + return identificacion; + } + + public void setIdentificacion(String identificacion) { + this.identificacion = identificacion; + } + + public String getBanco() { + return banco; + } + + public void setBanco(String banco) { + this.banco = banco; + } + + public String getCuentabanco() { + return cuentabanco; + } + + public void setCuentabanco(String cuentabanco) { + this.cuentabanco = cuentabanco; + } + + public String getAgencia() { + return agencia; + } + + public void setAgencia(String agencia) { + this.agencia = agencia; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getTelefono() { + return telefono; + } + + public void setTelefono(String telefono) { + this.telefono = telefono; + } + + public Integer getOcdDatosPagamentoId() { + return ocdDatosPagamentoId; + } + + public void setOcdDatosPagamentoId(Integer ocdDatosPagamentoId) { + this.ocdDatosPagamentoId = ocdDatosPagamentoId; + } + + public NotaCreditoVendaPacote getNotaCreditoVendaPacote() { + return notaCreditoVendaPacote; + } + + public void setNotaCreditoVendaPacote(NotaCreditoVendaPacote notaCreditoVendaPacote) { + this.notaCreditoVendaPacote = notaCreditoVendaPacote; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ocdDatosPagamentoId == null) ? 0 : ocdDatosPagamentoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + OCDDatosPagamento other = (OCDDatosPagamento) obj; + if (ocdDatosPagamentoId == null) { + if (other.ocdDatosPagamentoId != null) + return false; + } else if (!ocdDatosPagamentoId.equals(other.ocdDatosPagamentoId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OCDParam.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java index 49cb89c6b..34ea66cca 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDParam.java @@ -1,297 +1,297 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; - -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Entity -@Table(name = "OCD_PARAM") -public class OCDParam implements java.io.Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - private Long ocdparamId; - private BigDecimal penalizacion; - private Integer diasPagar; - private PuntoVenta puntoventa; - private Empresa empresa; - private Estado estado; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private Boolean indOCDDefault; - private Boolean indOCDTroca; - private Boolean indOCDTransferencia; - private Boolean indPenalizacionOCD; - private Boolean indOcdDinheiro; - private Boolean indtotalbilhete; - private Boolean indsempregerarapagar; - private Boolean indOCDPorFormadePagamento; - private BigDecimal tiempoLimitePenalizacion; - private List listOCDPtoVtaParam; - private Boolean indEstornoPix; - private Boolean indReembolsoAdmin; - - public OCDParam(Long ocdparamId, BigDecimal penalizacion, Integer diasPagar, PuntoVenta puntoventa, Empresa empresa, - Estado estado, Boolean activo, Date fecmodif, Integer usuarioId) { - super(); - this.ocdparamId = ocdparamId; - this.penalizacion = penalizacion; - this.diasPagar = diasPagar; - this.puntoventa = puntoventa; - this.empresa = empresa; - this.estado = estado; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public OCDParam() { - /* ... */} - - @SequenceGenerator(name = "OCD_PARAM_SEQ", sequenceName = "OCD_PARAM_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "OCD_PARAM_SEQ") - @Column(name = "OCDPARAM_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getOcdparamId() { - return ocdparamId; - } - - public void setOcdparamId(Long ocdparamId) { - this.ocdparamId = ocdparamId; - } - - @Column(name = "PENALIZACION", length = 10) - public BigDecimal getPenalizacion() { - return penalizacion; - } - - public void setPenalizacion(BigDecimal penalizacion) { - this.penalizacion = penalizacion; - } - - @Column(name = "DIAS_PAGAR", length = 10) - public Integer getDiasPagar() { - return diasPagar; - } - - public void setDiasPagar(Integer diasPagar) { - this.diasPagar = diasPagar; - } - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - @JoinColumn(name = "EMPRESA_ID") - @ManyToOne - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @JoinColumn(name = "ESTADO_ID") - @ManyToOne - public Estado getEstado() { - return estado; - } - - public void setEstado(Estado estado) { - this.estado = estado; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Column(name = "INDOCDDEFAULT") - public Boolean getIndOCDDefault() { - return indOCDDefault; - } - - public void setIndOCDDefault(Boolean indOCDDefault) { - this.indOCDDefault = indOCDDefault; - } - - @Column(name = "INDOCDTROCA") - public Boolean getIndOCDTroca() { - return indOCDTroca; - } - - public void setIndOCDTroca(Boolean indOCDTroca) { - this.indOCDTroca = indOCDTroca; - } - - public Boolean getIndPenalizacionOCD() { - return indPenalizacionOCD; - } - - public void setIndPenalizacionOCD(Boolean indPenalizacionOCD) { - this.indPenalizacionOCD = indPenalizacionOCD; - } - - /** - * @return the indOcdDinheiro - */ - @Column(name = "INDOCDDINHEIRO") - public Boolean getIndOcdDinheiro() { - return indOcdDinheiro; - } - - /** - * @param indOcdDinheiro the indOcdDinheiro to set - */ - public void setIndOcdDinheiro(Boolean indOcdDinheiro) { - this.indOcdDinheiro = indOcdDinheiro; - } - - @Column(name = "INDOCDTRANSFERENCIA") - public Boolean getIndOCDTransferencia() { - return indOCDTransferencia; - } - - public void setIndOCDTransferencia(Boolean indOCDTransferencia) { - this.indOCDTransferencia = indOCDTransferencia; - } - - @Column(name = "INDTOTALBILHETE") - public Boolean getIndtotalbilhete() { - return indtotalbilhete; - } - - public void setIndtotalbilhete(Boolean indtotalbilhete) { - this.indtotalbilhete = indtotalbilhete; - } - - @Column(name = "TIEMPOLIMITEPENALIZACION") - public BigDecimal getTiempoLimitePenalizacion() { - return tiempoLimitePenalizacion; - } - - public void setTiempoLimitePenalizacion(BigDecimal tiempoLimitePenalizacion) { - this.tiempoLimitePenalizacion = tiempoLimitePenalizacion; - } - - @Column(name = "INDOCDFORMAPAGAMENTO") - public Boolean getIndOCDPorFormadePagamento() { - return indOCDPorFormadePagamento; - } - - public void setIndOCDPorFormadePagamento(Boolean indOCDPorFormadePagamento) { - this.indOCDPorFormadePagamento = indOCDPorFormadePagamento; - } - - public OCDPtoVtaParam addOCDPtoVtaParam(OCDPtoVtaParam ocdPtoVtaParam) { - OCDPtoVtaParam ocd = new OCDPtoVtaParam(); - ocd.setPuntoventa(ocdPtoVtaParam.getPuntoventa()); - ocd.setOcdParam(ocdPtoVtaParam.getOcdParam()); - ocd.setActivo(Boolean.TRUE); - ocd.setFecmodif(Calendar.getInstance().getTime()); - ocd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - this.listOCDPtoVtaParam.add(ocd); - return ocd; - } - - public void removePtovtaOCDParam(OCDPtoVtaParam ocdPtoVtaParam) { - this.listOCDPtoVtaParam.remove(ocdPtoVtaParam); - - } - - /** - * @return the listOCDPtoVtaParam - * - */ - @OneToMany(cascade = CascadeType.ALL, mappedBy = "ocdParam") - @LazyCollection(LazyCollectionOption.FALSE) - public List getListOCDPtoVtaParam() { - return listOCDPtoVtaParam; - } - - /** - * @param listOCDPtoVtaParam the listOCDPtoVtaParam to set - */ - public void setListOCDPtoVtaParam(List listOCDPtoVtaParam) { - this.listOCDPtoVtaParam = listOCDPtoVtaParam; - } - - @Column(name = "INDSEMPREGERARAPAGAR") - public Boolean getIndsempregerarapagar() { - return indsempregerarapagar; - } - - public void setIndsempregerarapagar(Boolean indsempregerarapagar) { - this.indsempregerarapagar = indsempregerarapagar; - } - - public Boolean getIndEstornoPix() { - return indEstornoPix == null ? false : indEstornoPix; - } - - public void setIndEstornoPix(Boolean indEstornoPix) { - this.indEstornoPix = indEstornoPix; - } - @Column(name = "INDREEMBOLSOADMIN") - public Boolean getIndReembolsoAdmin() { - return indReembolsoAdmin==null?false:indReembolsoAdmin; - } - - public void setIndReembolsoAdmin(Boolean indReembolsoAdmin) { - this.indReembolsoAdmin = indReembolsoAdmin; - } - +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Entity +@Table(name = "OCD_PARAM") +public class OCDParam implements java.io.Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + private Long ocdparamId; + private BigDecimal penalizacion; + private Integer diasPagar; + private PuntoVenta puntoventa; + private Empresa empresa; + private Estado estado; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private Boolean indOCDDefault; + private Boolean indOCDTroca; + private Boolean indOCDTransferencia; + private Boolean indPenalizacionOCD; + private Boolean indOcdDinheiro; + private Boolean indtotalbilhete; + private Boolean indsempregerarapagar; + private Boolean indOCDPorFormadePagamento; + private BigDecimal tiempoLimitePenalizacion; + private List listOCDPtoVtaParam; + private Boolean indEstornoPix; + private Boolean indReembolsoAdmin; + + public OCDParam(Long ocdparamId, BigDecimal penalizacion, Integer diasPagar, PuntoVenta puntoventa, Empresa empresa, + Estado estado, Boolean activo, Date fecmodif, Integer usuarioId) { + super(); + this.ocdparamId = ocdparamId; + this.penalizacion = penalizacion; + this.diasPagar = diasPagar; + this.puntoventa = puntoventa; + this.empresa = empresa; + this.estado = estado; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public OCDParam() { + /* ... */} + + @SequenceGenerator(name = "OCD_PARAM_SEQ", sequenceName = "OCD_PARAM_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "OCD_PARAM_SEQ") + @Column(name = "OCDPARAM_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getOcdparamId() { + return ocdparamId; + } + + public void setOcdparamId(Long ocdparamId) { + this.ocdparamId = ocdparamId; + } + + @Column(name = "PENALIZACION", length = 10) + public BigDecimal getPenalizacion() { + return penalizacion; + } + + public void setPenalizacion(BigDecimal penalizacion) { + this.penalizacion = penalizacion; + } + + @Column(name = "DIAS_PAGAR", length = 10) + public Integer getDiasPagar() { + return diasPagar; + } + + public void setDiasPagar(Integer diasPagar) { + this.diasPagar = diasPagar; + } + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + @JoinColumn(name = "EMPRESA_ID") + @ManyToOne + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @JoinColumn(name = "ESTADO_ID") + @ManyToOne + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Column(name = "INDOCDDEFAULT") + public Boolean getIndOCDDefault() { + return indOCDDefault; + } + + public void setIndOCDDefault(Boolean indOCDDefault) { + this.indOCDDefault = indOCDDefault; + } + + @Column(name = "INDOCDTROCA") + public Boolean getIndOCDTroca() { + return indOCDTroca; + } + + public void setIndOCDTroca(Boolean indOCDTroca) { + this.indOCDTroca = indOCDTroca; + } + + public Boolean getIndPenalizacionOCD() { + return indPenalizacionOCD; + } + + public void setIndPenalizacionOCD(Boolean indPenalizacionOCD) { + this.indPenalizacionOCD = indPenalizacionOCD; + } + + /** + * @return the indOcdDinheiro + */ + @Column(name = "INDOCDDINHEIRO") + public Boolean getIndOcdDinheiro() { + return indOcdDinheiro; + } + + /** + * @param indOcdDinheiro the indOcdDinheiro to set + */ + public void setIndOcdDinheiro(Boolean indOcdDinheiro) { + this.indOcdDinheiro = indOcdDinheiro; + } + + @Column(name = "INDOCDTRANSFERENCIA") + public Boolean getIndOCDTransferencia() { + return indOCDTransferencia; + } + + public void setIndOCDTransferencia(Boolean indOCDTransferencia) { + this.indOCDTransferencia = indOCDTransferencia; + } + + @Column(name = "INDTOTALBILHETE") + public Boolean getIndtotalbilhete() { + return indtotalbilhete; + } + + public void setIndtotalbilhete(Boolean indtotalbilhete) { + this.indtotalbilhete = indtotalbilhete; + } + + @Column(name = "TIEMPOLIMITEPENALIZACION") + public BigDecimal getTiempoLimitePenalizacion() { + return tiempoLimitePenalizacion; + } + + public void setTiempoLimitePenalizacion(BigDecimal tiempoLimitePenalizacion) { + this.tiempoLimitePenalizacion = tiempoLimitePenalizacion; + } + + @Column(name = "INDOCDFORMAPAGAMENTO") + public Boolean getIndOCDPorFormadePagamento() { + return indOCDPorFormadePagamento; + } + + public void setIndOCDPorFormadePagamento(Boolean indOCDPorFormadePagamento) { + this.indOCDPorFormadePagamento = indOCDPorFormadePagamento; + } + + public OCDPtoVtaParam addOCDPtoVtaParam(OCDPtoVtaParam ocdPtoVtaParam) { + OCDPtoVtaParam ocd = new OCDPtoVtaParam(); + ocd.setPuntoventa(ocdPtoVtaParam.getPuntoventa()); + ocd.setOcdParam(ocdPtoVtaParam.getOcdParam()); + ocd.setActivo(Boolean.TRUE); + ocd.setFecmodif(Calendar.getInstance().getTime()); + ocd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + this.listOCDPtoVtaParam.add(ocd); + return ocd; + } + + public void removePtovtaOCDParam(OCDPtoVtaParam ocdPtoVtaParam) { + this.listOCDPtoVtaParam.remove(ocdPtoVtaParam); + + } + + /** + * @return the listOCDPtoVtaParam + * + */ + @OneToMany(cascade = CascadeType.ALL, mappedBy = "ocdParam") + @LazyCollection(LazyCollectionOption.FALSE) + public List getListOCDPtoVtaParam() { + return listOCDPtoVtaParam; + } + + /** + * @param listOCDPtoVtaParam the listOCDPtoVtaParam to set + */ + public void setListOCDPtoVtaParam(List listOCDPtoVtaParam) { + this.listOCDPtoVtaParam = listOCDPtoVtaParam; + } + + @Column(name = "INDSEMPREGERARAPAGAR") + public Boolean getIndsempregerarapagar() { + return indsempregerarapagar; + } + + public void setIndsempregerarapagar(Boolean indsempregerarapagar) { + this.indsempregerarapagar = indsempregerarapagar; + } + + public Boolean getIndEstornoPix() { + return indEstornoPix == null ? false : indEstornoPix; + } + + public void setIndEstornoPix(Boolean indEstornoPix) { + this.indEstornoPix = indEstornoPix; + } + @Column(name = "INDREEMBOLSOADMIN") + public Boolean getIndReembolsoAdmin() { + return indReembolsoAdmin==null?false:indReembolsoAdmin; + } + + public void setIndReembolsoAdmin(Boolean indReembolsoAdmin) { + this.indReembolsoAdmin = indReembolsoAdmin; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/OCDPtoVtaParam.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDPtoVtaParam.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/OCDPtoVtaParam.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDPtoVtaParam.java index fd7bccc00..d5997df92 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OCDPtoVtaParam.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OCDPtoVtaParam.java @@ -1,94 +1,94 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author Thiago - * - */ -@Entity -@Table(name = "OCD_PTOVTA_PARAM") -public class OCDPtoVtaParam { - - private Long ocdPtoVtaParamId; - private OCDParam ocdParam; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private PuntoVenta puntoventa; - - @SequenceGenerator(name = "OCD_PTOVTA_PARAM_SEQ", sequenceName = "OCD_PTOVTA_PARAM_SEQ", allocationSize = 1) - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "OCD_PTOVTA_PARAM_SEQ") - @Column(name = "OCDPTOVTAPARAM_ID", unique = true, nullable = false, precision = 15, scale = 0) - public Long getOcdPtoVtaParamId() { - return ocdPtoVtaParamId; - } - - public void setOcdPtoVtaParamId(Long ocdPtoVtaParamId) { - this.ocdPtoVtaParamId = ocdPtoVtaParamId; - } - - @JoinColumn(name = "OCDPARAM_ID", referencedColumnName="OCDPARAM_ID") - @ManyToOne - public OCDParam getOcdParam() { - return ocdParam; - } - - public void setOcdParam(OCDParam ocdParam) { - this.ocdParam = ocdParam; - } - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @JoinColumn(name = "PUNTOVENTA_ID") - @ManyToOne - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - -} +/** + * + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author Thiago + * + */ +@Entity +@Table(name = "OCD_PTOVTA_PARAM") +public class OCDPtoVtaParam { + + private Long ocdPtoVtaParamId; + private OCDParam ocdParam; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private PuntoVenta puntoventa; + + @SequenceGenerator(name = "OCD_PTOVTA_PARAM_SEQ", sequenceName = "OCD_PTOVTA_PARAM_SEQ", allocationSize = 1) + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "OCD_PTOVTA_PARAM_SEQ") + @Column(name = "OCDPTOVTAPARAM_ID", unique = true, nullable = false, precision = 15, scale = 0) + public Long getOcdPtoVtaParamId() { + return ocdPtoVtaParamId; + } + + public void setOcdPtoVtaParamId(Long ocdPtoVtaParamId) { + this.ocdPtoVtaParamId = ocdPtoVtaParamId; + } + + @JoinColumn(name = "OCDPARAM_ID", referencedColumnName="OCDPARAM_ID") + @ManyToOne + public OCDParam getOcdParam() { + return ocdParam; + } + + public void setOcdParam(OCDParam ocdParam) { + this.ocdParam = ocdParam; + } + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @JoinColumn(name = "PUNTOVENTA_ID") + @ManyToOne + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java index 17c2a154c..e364e9bc5 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java @@ -1,169 +1,169 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.Where; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarID; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@Table(name = "OPERADOR_EMBARCADA") -@AuditarClasse(nome = "OPERADOR_EMBARCADA", tela = "auditarClasse.OperadorEmbarcada") -@SequenceGenerator(name = "OPERADOR_EMBARCADA_SEQ", sequenceName = "OPERADOR_EMBARCADA_SEQ", allocationSize = 1) -public class OperadorEmbarcada implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "OPERADOR_EMBARCADA_SEQ") - @Column(name = "OPERADOR_EMBARCADA_ID") - @AuditarID - private Long operadorEmbarcadaId; - - @OneToOne - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @Fetch(FetchMode.SELECT) - @Where(clause="activo=1") - private List linhas; - - @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @Fetch(FetchMode.SELECT) - @Where(clause="activo=1") - private List servicos; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Transient - @NaoAuditar - private OperadorEmbarcada operadorClone; - - public Long getOperadorEmbarcadaId() { - return operadorEmbarcadaId; - } - - public void setOperadorEmbarcadaId(Long operadorEmbarcadaId) { - this.operadorEmbarcadaId = operadorEmbarcadaId; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public List getLinhas() { - List tmp = new ArrayList(); - - if (linhas != null) { - for (OperadorEmbarcadaLinha es : linhas) { - if (es.getActivo()) { - tmp.add(es); - } - } - } - - return tmp; - } - - public void setLinhas(List linhas) { - this.linhas = linhas; - } - - public List getServicos() { - List tmp = new ArrayList(); - - if (servicos != null) { - for (OperadorEmbarcadaServico es : servicos) { - if (es.getActivo()) { - tmp.add(es); - } - } - } - - return tmp; - } - - public void setServicos(List servicos) { - this.servicos = servicos; - } - - public Boolean getActivo() { - return activo == null ? false : activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return this.usuario.getUsuarioId(); - } - - public String getUsername() { - return this.usuario.getClaveUsuario(); - } - - public String getName() { - return usuario.getName(); - } - - @Override - public void clonar() throws CloneNotSupportedException { - operadorClone = new OperadorEmbarcada(); - operadorClone = (OperadorEmbarcada) this.clone(); - } - - @Override - public OperadorEmbarcada getCloneObject() throws CloneNotSupportedException { - return operadorClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOperadorEmbarcadaId()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.Where; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarID; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@Table(name = "OPERADOR_EMBARCADA") +@AuditarClasse(nome = "OPERADOR_EMBARCADA", tela = "auditarClasse.OperadorEmbarcada") +@SequenceGenerator(name = "OPERADOR_EMBARCADA_SEQ", sequenceName = "OPERADOR_EMBARCADA_SEQ", allocationSize = 1) +public class OperadorEmbarcada implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "OPERADOR_EMBARCADA_SEQ") + @Column(name = "OPERADOR_EMBARCADA_ID") + @AuditarID + private Long operadorEmbarcadaId; + + @OneToOne + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @Fetch(FetchMode.SELECT) + @Where(clause="activo=1") + private List linhas; + + @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @Fetch(FetchMode.SELECT) + @Where(clause="activo=1") + private List servicos; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Transient + @NaoAuditar + private OperadorEmbarcada operadorClone; + + public Long getOperadorEmbarcadaId() { + return operadorEmbarcadaId; + } + + public void setOperadorEmbarcadaId(Long operadorEmbarcadaId) { + this.operadorEmbarcadaId = operadorEmbarcadaId; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public List getLinhas() { + List tmp = new ArrayList(); + + if (linhas != null) { + for (OperadorEmbarcadaLinha es : linhas) { + if (es.getActivo()) { + tmp.add(es); + } + } + } + + return tmp; + } + + public void setLinhas(List linhas) { + this.linhas = linhas; + } + + public List getServicos() { + List tmp = new ArrayList(); + + if (servicos != null) { + for (OperadorEmbarcadaServico es : servicos) { + if (es.getActivo()) { + tmp.add(es); + } + } + } + + return tmp; + } + + public void setServicos(List servicos) { + this.servicos = servicos; + } + + public Boolean getActivo() { + return activo == null ? false : activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return this.usuario.getUsuarioId(); + } + + public String getUsername() { + return this.usuario.getClaveUsuario(); + } + + public String getName() { + return usuario.getName(); + } + + @Override + public void clonar() throws CloneNotSupportedException { + operadorClone = new OperadorEmbarcada(); + operadorClone = (OperadorEmbarcada) this.clone(); + } + + @Override + public OperadorEmbarcada getCloneObject() throws CloneNotSupportedException { + return operadorClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOperadorEmbarcadaId()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaLinha.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaLinha.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaLinha.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaLinha.java index f78cd5fbe..3ee57ef94 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaLinha.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaLinha.java @@ -1,108 +1,108 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarID; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@Table(name = "OPERADOR_EMBARCADA_LINHA") -@AuditarClasse(nome = "OPERADOR_EMBARCADA_LINHA", tela = "auditarClasse.OperadorEmbarcadaLinha") -@SequenceGenerator(name = "OPERADOR_EMBARCADA_LINHA_SEQ", sequenceName = "OPERADOR_EMBARCADA_LINHA_SEQ", allocationSize = 1) -public class OperadorEmbarcadaLinha implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "OPERADOR_EMBARCADA_LINHA_SEQ") - @Column(name = "OPERADOR_EMBARCADA_LINHA_ID") - @AuditarID - private Long operadorEmbarcadaLinhaId; - - @ManyToOne - @JoinColumn(name = "OPERADOR_EMBARCADA_ID", referencedColumnName = "OPERADOR_EMBARCADA_ID") - private OperadorEmbarcada operadorEmbarcada; - - @OneToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Transient - @NaoAuditar - private OperadorEmbarcadaLinha operadorClone; - - public Long getOperadorEmbarcadaLinhaId() { - return operadorEmbarcadaLinhaId; - } - - public void setOperadorEmbarcadaLinhaId(Long operadorEmbarcadaLinhaId) { - this.operadorEmbarcadaLinhaId = operadorEmbarcadaLinhaId; - } - - public OperadorEmbarcada getOperadorEmbarcada() { - return operadorEmbarcada; - } - - public void setOperadorEmbarcada(OperadorEmbarcada operadorEmbarcada) { - this.operadorEmbarcada = operadorEmbarcada; - } - - public Boolean getActivo() { - return activo == null ? false : activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - @Override - public void clonar() throws CloneNotSupportedException { - operadorClone = new OperadorEmbarcadaLinha(); - operadorClone = (OperadorEmbarcadaLinha) this.clone(); - } - - @Override - public OperadorEmbarcadaLinha getCloneObject() throws CloneNotSupportedException { - return operadorClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOperadorEmbarcadaLinhaId() + "- linha: " + ruta.getRutaId() + " - " + ruta.getDescruta()); - } - - @Override - public String toString() { - return ruta.getNumRuta(); - } - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarID; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@Table(name = "OPERADOR_EMBARCADA_LINHA") +@AuditarClasse(nome = "OPERADOR_EMBARCADA_LINHA", tela = "auditarClasse.OperadorEmbarcadaLinha") +@SequenceGenerator(name = "OPERADOR_EMBARCADA_LINHA_SEQ", sequenceName = "OPERADOR_EMBARCADA_LINHA_SEQ", allocationSize = 1) +public class OperadorEmbarcadaLinha implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "OPERADOR_EMBARCADA_LINHA_SEQ") + @Column(name = "OPERADOR_EMBARCADA_LINHA_ID") + @AuditarID + private Long operadorEmbarcadaLinhaId; + + @ManyToOne + @JoinColumn(name = "OPERADOR_EMBARCADA_ID", referencedColumnName = "OPERADOR_EMBARCADA_ID") + private OperadorEmbarcada operadorEmbarcada; + + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Transient + @NaoAuditar + private OperadorEmbarcadaLinha operadorClone; + + public Long getOperadorEmbarcadaLinhaId() { + return operadorEmbarcadaLinhaId; + } + + public void setOperadorEmbarcadaLinhaId(Long operadorEmbarcadaLinhaId) { + this.operadorEmbarcadaLinhaId = operadorEmbarcadaLinhaId; + } + + public OperadorEmbarcada getOperadorEmbarcada() { + return operadorEmbarcada; + } + + public void setOperadorEmbarcada(OperadorEmbarcada operadorEmbarcada) { + this.operadorEmbarcada = operadorEmbarcada; + } + + public Boolean getActivo() { + return activo == null ? false : activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + @Override + public void clonar() throws CloneNotSupportedException { + operadorClone = new OperadorEmbarcadaLinha(); + operadorClone = (OperadorEmbarcadaLinha) this.clone(); + } + + @Override + public OperadorEmbarcadaLinha getCloneObject() throws CloneNotSupportedException { + return operadorClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOperadorEmbarcadaLinhaId() + "- linha: " + ruta.getRutaId() + " - " + ruta.getDescruta()); + } + + @Override + public String toString() { + return ruta.getNumRuta(); + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java index 6ae07afab..479546796 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java @@ -1,108 +1,108 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarID; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@Table(name = "OPERADOR_EMBARCADA_SERVICO") -@AuditarClasse(nome = "OPERADOR_EMBARCADA_SERVICO", tela = "auditarClasse.OperadorEmbarcadaServico") -@SequenceGenerator(name = "OPERADOR_EMBARCADA_SERVICO_SEQ", sequenceName = "OPERADOR_EMBARCADA_SERVICO_SEQ", allocationSize = 1) -public class OperadorEmbarcadaServico implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "OPERADOR_EMBARCADA_SERVICO_SEQ") - @Column(name = "OPERADOR_EMBARCADA_SERVICO_ID") - @AuditarID - private Long operadorEmbarcadaServicoId; - - @ManyToOne - @JoinColumn(name = "OPERADOR_EMBARCADA_ID", referencedColumnName = "OPERADOR_EMBARCADA_ID") - private OperadorEmbarcada operadorEmbarcada; - - @OneToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "ESQUEMA_CORRIDA_ID") - private EsquemaCorrida corrida; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Transient - @NaoAuditar - private OperadorEmbarcadaServico operadorClone; - - public Long getOperadorEmbarcadaServicoId() { - return operadorEmbarcadaServicoId; - } - - public void setOperadorEmbarcadaServicoId(Long operadorEmbarcadaServicoId) { - this.operadorEmbarcadaServicoId = operadorEmbarcadaServicoId; - } - - public OperadorEmbarcada getOperadorEmbarcada() { - return operadorEmbarcada; - } - - public void setOperadorEmbarcada(OperadorEmbarcada operadorEmbarcada) { - this.operadorEmbarcada = operadorEmbarcada; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public EsquemaCorrida getCorrida() { - return corrida; - } - - public void setCorrida(EsquemaCorrida corrida) { - this.corrida = corrida; - } - - @Override - public void clonar() throws CloneNotSupportedException { - operadorClone = new OperadorEmbarcadaServico(); - operadorClone = (OperadorEmbarcadaServico) this.clone(); - } - - @Override - public OperadorEmbarcadaServico getCloneObject() throws CloneNotSupportedException { - return operadorClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOperadorEmbarcadaServicoId() + "- servico: " + corrida.getNumCorrida() + " - " + corrida.getInfoCorrida()); - } - - @Override - public String toString() { - return "" + corrida.getNumCorrida(); - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarID; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@Table(name = "OPERADOR_EMBARCADA_SERVICO") +@AuditarClasse(nome = "OPERADOR_EMBARCADA_SERVICO", tela = "auditarClasse.OperadorEmbarcadaServico") +@SequenceGenerator(name = "OPERADOR_EMBARCADA_SERVICO_SEQ", sequenceName = "OPERADOR_EMBARCADA_SERVICO_SEQ", allocationSize = 1) +public class OperadorEmbarcadaServico implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "OPERADOR_EMBARCADA_SERVICO_SEQ") + @Column(name = "OPERADOR_EMBARCADA_SERVICO_ID") + @AuditarID + private Long operadorEmbarcadaServicoId; + + @ManyToOne + @JoinColumn(name = "OPERADOR_EMBARCADA_ID", referencedColumnName = "OPERADOR_EMBARCADA_ID") + private OperadorEmbarcada operadorEmbarcada; + + @OneToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "ESQUEMA_CORRIDA_ID") + private EsquemaCorrida corrida; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Transient + @NaoAuditar + private OperadorEmbarcadaServico operadorClone; + + public Long getOperadorEmbarcadaServicoId() { + return operadorEmbarcadaServicoId; + } + + public void setOperadorEmbarcadaServicoId(Long operadorEmbarcadaServicoId) { + this.operadorEmbarcadaServicoId = operadorEmbarcadaServicoId; + } + + public OperadorEmbarcada getOperadorEmbarcada() { + return operadorEmbarcada; + } + + public void setOperadorEmbarcada(OperadorEmbarcada operadorEmbarcada) { + this.operadorEmbarcada = operadorEmbarcada; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public EsquemaCorrida getCorrida() { + return corrida; + } + + public void setCorrida(EsquemaCorrida corrida) { + this.corrida = corrida; + } + + @Override + public void clonar() throws CloneNotSupportedException { + operadorClone = new OperadorEmbarcadaServico(); + operadorClone = (OperadorEmbarcadaServico) this.clone(); + } + + @Override + public OperadorEmbarcadaServico getCloneObject() throws CloneNotSupportedException { + return operadorClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOperadorEmbarcadaServicoId() + "- servico: " + corrida.getNumCorrida() + " - " + corrida.getInfoCorrida()); + } + + @Override + public String toString() { + return "" + corrida.getNumCorrida(); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java index 602a6ec71..b9a2f4d18 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java @@ -1,467 +1,467 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "ORGAO_CANCELACION", tela = "auditarClasse.OrgaoCancelacion") -@Entity -@Table(name = "ORGAO_CANCELACION") -@SequenceGenerator(name = "ORGAO_CANCELACION_SEQ", sequenceName = "ORGAO_CANCELACION_SEQ", allocationSize = 1) -public class OrgaoCancelacion implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_CANCELACION_SEQ") - @Column(name = "ORGAOCANCELACION_ID") - private Integer orgaoCancelacionId; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgao; - @Column(name = "PORCMULTA") - private BigDecimal porcmulta; - @Column(name = "PORCCAMBIO") - private BigDecimal porccambio; - @Column(name = "PORCCAMBIOEMBARCADO") - private BigDecimal porcCambioEmbarcado; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "TIEMPOLIMITE") - private Integer tiempolimite; - - @Column(name = "TIEMPOLIMITE_MIN") - private Integer tiempolimiteMin; - - @Column(name = "TIEMPOLIMITECAMBIO") - private Integer tiempolimiteCambio; - - @Column(name = "TIEMPOLIMITECAMBIO_MIN") - private Integer tiempolimiteCambioMin; - - @Column(name = "INDNAOPERMITETRANSFERENCIA") - private Boolean indnaopermitetransferencia; - @Column(name = "INDSOLICITADATOSTARJETA") - private Boolean indSolicitaDatosTarjeta; - @Column(name = "INDMULTATRANSFERENCIA") - private Boolean indMultaTransferencia; - @Column(name = "INDDEVOLUCAOTRANSFERENCIA") - private Boolean indDevolucaoTransferencia; - @Column(name = "INDCOBRANCATRANSFERENCIA") - private Boolean indCobrancaTransferencia; - @Column(name = "INDORGAOCONCEDENTETRANSF") - private Boolean indOrgaoconcedentetransf; - @Column(name = "INDMULTADEVOLUCAOABERTO") - private Boolean indMultaDevolucaoAberto; - @Column(name = "INDPERMITEDEVTOTALRIOCARD") - private Boolean IndPermiteDevolucaoTotalRioCard; - @Column(name = "PORCCOMISSAOVENDA") - private BigDecimal porcMultaResolAgerba; - @Column(name = "QTDE_LIMITE_TRANSF_REAT") - private Integer qtdeLimiteTransfReat; - - @Column(name = "TEMPOLIMITE_APOS_SAIDA_H") - private Integer tempolimiteAposSaidaH; - - @Column(name = "TEMPOLIMITE_APOS_SAIDA_MIN") - private Integer tempolimiteAposSaidaMin; - - @Column(name = "TROCA_MESMO_DIA_ANTES_H") - private Integer trocaMesmoDiaAntesHora; - - @Column(name = "TROCA_MESMO_DIA_ANTES_MIN") - private Integer trocaMesmoDiaAntesMin; - - @Column(name = "TROCA_MESMO_DIA_APOS_H") - private Integer trocaMesmoDiaAposHora; - - @Column(name = "TROCA_MESMO_DIA_APOS_MIN") - private Integer trocaMesmoDiaAposMin; - - @Column(name = "TEMPO_TROCA_POLTRONA_H") - private Integer tempoTrocaPoltronaH; - - @Column(name = "TEMPO_TROCA_POLTRONA_MIN") - private Integer tempoTrocaPoltronaMin; - - @Column(name = "INDBLOQUEIOREMARCADO") - private Boolean indBloqueioRemarcado; - - @Column(name = "INDPERMPAGMULTAPREESTORNO") - private Boolean indPermPagMultaPreEstorno; - - - @Column(name = "INDIMPRIMECOMPROVANTETRANS") - private Boolean indImprimeComprovanteTransferencia; - - @Column(name = "TEMPOCANCELNAOPRESENCIALHORA") - private Integer tempoCancelNaoPresencialHora; - - @Column(name = "TEMPOCANCELNAOPRESENCIALMIN") - private Integer tempoCancelNaoPresencialMin; - - @Column(name = "INDDEVOLUCAOTROCA") - private Boolean indDevolucaoTroca; - - @Column(name = "INDCOBRANCATROCA") - private Boolean indCobrancaTroca; - - @Transient - @NaoAuditar - private OrgaoCancelacion orgaoCancelacionClone; - - public Integer getOrgaoCancelacionId() { - return orgaoCancelacionId; - } - public void setOrgaoCancelacionId(Integer orgaoCancelacionId) { - this.orgaoCancelacionId = orgaoCancelacionId; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public OrgaoConcedente getOrgao() { - return orgao; - } - public void setOrgao(OrgaoConcedente orgao) { - this.orgao = orgao; - } - public BigDecimal getPorcmulta() { - return porcmulta; - } - public void setPorcmulta(BigDecimal porcmulta) { - this.porcmulta = porcmulta; - } - public BigDecimal getPorccambio() { - return porccambio; - } - public void setPorccambio(BigDecimal porccambio) { - this.porccambio = porccambio; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Integer getTiempolimite() { - return tiempolimite; - } - public void setTiempolimite(Integer tiempolimite) { - this.tiempolimite = tiempolimite; - } - public Integer getTiempolimiteCambio() { - return tiempolimiteCambio; - } - public void setTiempolimiteCambio(Integer tiempolimiteCambio) { - this.tiempolimiteCambio = tiempolimiteCambio; - } - public Boolean getIndnaopermitetransferencia() { - return indnaopermitetransferencia; - } - public void setIndnaopermitetransferencia(Boolean indnaopermitetransferencia) { - this.indnaopermitetransferencia = indnaopermitetransferencia; - } - /** - * @return the porcCambioEmbarcado - */ - public BigDecimal getPorcCambioEmbarcado() { - return porcCambioEmbarcado; - } - /** - * @param porcCambioEmbarcado the porcCambioEmbarcado to set - */ - public void setPorcCambioEmbarcado(BigDecimal porcCambioEmbarcado) { - this.porcCambioEmbarcado = porcCambioEmbarcado; - } - public Boolean getIndSolicitaDatosTarjeta() { - return indSolicitaDatosTarjeta; - } - public void setIndSolicitaDatosTarjeta(Boolean indSolicitaDatosTarjeta) { - this.indSolicitaDatosTarjeta = indSolicitaDatosTarjeta; - } - - /** - * @return the indMultaTransferencia - */ - public Boolean getIndMultaTransferencia() { - return indMultaTransferencia; - } - - /** - * @param indMultaTransferencia - * the indMultaTransferencia to set - */ - public void setIndMultaTransferencia(Boolean indMultaTransferencia) { - this.indMultaTransferencia = indMultaTransferencia; - } - - /** - * @return the indDevolucaoTransferencia - */ - public Boolean getIndDevolucaoTransferencia() { - return indDevolucaoTransferencia; - } - - /** - * @param indDevolucaoTransferencia - * the indDevolucaoTransferencia to set - */ - public void setIndDevolucaoTransferencia(Boolean indDevolucaoTransferencia) { - this.indDevolucaoTransferencia = indDevolucaoTransferencia; - } - - /** - * @return the indCobrancaTransferencia - */ - public Boolean getIndCobrancaTransferencia() { - return indCobrancaTransferencia; - } - - /** - * @param indCobrancaTransferencia - * the indCobrancaTransferencia to set - */ - public void setIndCobrancaTransferencia(Boolean indCobrancaTransferencia) { - this.indCobrancaTransferencia = indCobrancaTransferencia; - } - - /** - * @return the indOrgaoconcedentetransf - */ - public Boolean getIndOrgaoconcedentetransf() { - return indOrgaoconcedentetransf; - } - - /** - * @param indOrgaoconcedentetransf - * the indOrgaoconcedentetransf to set - */ - public void setIndOrgaoconcedentetransf(Boolean indOrgaoconcedentetransf) { - this.indOrgaoconcedentetransf = indOrgaoconcedentetransf; - } - public Boolean getIndMultaDevolucaoAberto() { - return indMultaDevolucaoAberto; - } - public void setIndMultaDevolucaoAberto(Boolean indMultaDevolucaoAberto) { - this.indMultaDevolucaoAberto = indMultaDevolucaoAberto; - } - public Boolean getIndPermiteDevolucaoTotalRioCard() { - return IndPermiteDevolucaoTotalRioCard == null ? false : IndPermiteDevolucaoTotalRioCard; - } - public void setIndPermiteDevolucaoTotalRioCard(Boolean indPermiteDevolucaoTotalRioCard) { - IndPermiteDevolucaoTotalRioCard = indPermiteDevolucaoTotalRioCard; - } - public BigDecimal getPorcMultaResolAgerba() { - return porcMultaResolAgerba; - } - public void setPorcMultaResolAgerba(BigDecimal porMultaResolAgerba) { - this.porcMultaResolAgerba = porMultaResolAgerba; - } - - public Integer getQtdeLimiteTransfReat() { - return qtdeLimiteTransfReat; - } - public void setQtdeLimiteTransfReat(Integer qtdeLimiteTransfReat) { - this.qtdeLimiteTransfReat = qtdeLimiteTransfReat; - } - - public Integer getTiempolimiteMin() { - return tiempolimiteMin == null ? 0 : tiempolimiteMin; - } - - public void setTiempolimiteMin(Integer tiempolimiteMin) { - this.tiempolimiteMin = tiempolimiteMin; - } - - public Integer getTiempolimiteCambioMin() { - return tiempolimiteCambioMin == null ? 0 : tiempolimiteCambioMin; - } - - public void setTiempolimiteCambioMin(Integer tiempolimiteCambioMin) { - this.tiempolimiteCambioMin = tiempolimiteCambioMin; - } - - public Integer getTempolimiteAposSaidaH() { - return tempolimiteAposSaidaH == null ? 0 : tempolimiteAposSaidaH; - } - - public void setTempolimiteAposSaidaH(Integer tempolimiteAposSaidaH) { - this.tempolimiteAposSaidaH = tempolimiteAposSaidaH; - } - - public Integer getTempolimiteAposSaidaMin() { - return tempolimiteAposSaidaMin == null ? 0 : tempolimiteAposSaidaMin; - } - - public void setTempolimiteAposSaidaMin(Integer tempolimiteAposSaidaMin) { - this.tempolimiteAposSaidaMin = tempolimiteAposSaidaMin; - } - - public Integer getTrocaMesmoDiaAntesHora() { - return trocaMesmoDiaAntesHora == null ? 0 : trocaMesmoDiaAntesHora; - } - - public void setTrocaMesmoDiaAntesHora(Integer trocaMesmoDiaAntesHora) { - this.trocaMesmoDiaAntesHora = trocaMesmoDiaAntesHora; - } - - public Integer getTrocaMesmoDiaAntesMin() { - return trocaMesmoDiaAntesMin == null ? 0 : trocaMesmoDiaAntesMin; - } - - public void setTrocaMesmoDiaAntesMin(Integer trocaMesmoDiaAntesMin) { - this.trocaMesmoDiaAntesMin = trocaMesmoDiaAntesMin; - } - - public Integer getTrocaMesmoDiaAposHora() { - return trocaMesmoDiaAposHora == null ? 0 : trocaMesmoDiaAposHora; - } - - public void setTrocaMesmoDiaAposHora(Integer trocaMesmoDiaAposHora) { - this.trocaMesmoDiaAposHora = trocaMesmoDiaAposHora; - } - - public Integer getTrocaMesmoDiaAposMin() { - return trocaMesmoDiaAposMin == null ? 0 : trocaMesmoDiaAposMin; - } - - public void setTrocaMesmoDiaAposMin(Integer trocaMesmoDiaAposMin) { - this.trocaMesmoDiaAposMin = trocaMesmoDiaAposMin; - } - - public Integer getTempoTrocaPoltronaH() { - return tempoTrocaPoltronaH == null ? 0 : tempoTrocaPoltronaH; - } - - public void setTempoTrocaPoltronaH(Integer tempoTrocaPoltronaH) { - this.tempoTrocaPoltronaH = tempoTrocaPoltronaH; - } - - public Integer getTempoTrocaPoltronaMin() { - return tempoTrocaPoltronaMin == null ? 0 : tempoTrocaPoltronaMin; - } - - public void setTempoTrocaPoltronaMin(Integer tempoTrocaPoltronaMin) { - this.tempoTrocaPoltronaMin = tempoTrocaPoltronaMin; - } - public Boolean getIndBloqueioRemarcado() { - return indBloqueioRemarcado; - } - - public void setIndBloqueioRemarcado(Boolean indBloqueioRemarcado) { - this.indBloqueioRemarcado = indBloqueioRemarcado; - } - - - public Boolean getIndPermPagMultaPreEstorno() { - return indPermPagMultaPreEstorno; - } - - public void setIndPermPagMultaPreEstorno(Boolean indPermPagMultaPreEstorno) { - this.indPermPagMultaPreEstorno = indPermPagMultaPreEstorno; - } - - - - public Boolean getIndImprimeComprovanteTransferencia() { - return indImprimeComprovanteTransferencia; - } - public void setIndImprimeComprovanteTransferencia(Boolean indImprimeComprovanteTransferencia) { - this.indImprimeComprovanteTransferencia = indImprimeComprovanteTransferencia; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - orgaoCancelacionClone = new OrgaoCancelacion(); - orgaoCancelacionClone = (OrgaoCancelacion) this.clone(); - Hibernate.initialize(orgaoCancelacionClone.getOrgao()); - - } - @Override - public OrgaoCancelacion getCloneObject() throws CloneNotSupportedException { - return orgaoCancelacionClone; - } - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrgaoCancelacionId()); - } - - public Integer getTempoCancelNaoPresencialHora() { - return tempoCancelNaoPresencialHora == null ? 0 : tempoCancelNaoPresencialHora; - } - - public void setTempoCancelNaoPresencialHora(Integer tempoCancelNaoPresencialHora) { - this.tempoCancelNaoPresencialHora = tempoCancelNaoPresencialHora; - } - - public Integer getTempoCancelNaoPresencialMin() { - return tempoCancelNaoPresencialMin == null ? 0 : tempoCancelNaoPresencialMin; - } - - public void setTempoCancelNaoPresencialMin(Integer tempoCancelNaoPresencialMin) { - this.tempoCancelNaoPresencialMin = tempoCancelNaoPresencialMin; - } - - public Boolean getIndDevolucaoTroca() { - return indDevolucaoTroca == null ? true : indDevolucaoTroca; - } - - public void setIndDevolucaoTroca(Boolean indDevolucaoTroca) { - this.indDevolucaoTroca = indDevolucaoTroca; - } - - public Boolean getIndCobrancaTroca() { - return indCobrancaTroca == null ? true : indCobrancaTroca; - } - - public void setIndCobrancaTroca(Boolean indCobrancaTroca) { - this.indCobrancaTroca = indCobrancaTroca; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "ORGAO_CANCELACION", tela = "auditarClasse.OrgaoCancelacion") +@Entity +@Table(name = "ORGAO_CANCELACION") +@SequenceGenerator(name = "ORGAO_CANCELACION_SEQ", sequenceName = "ORGAO_CANCELACION_SEQ", allocationSize = 1) +public class OrgaoCancelacion implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_CANCELACION_SEQ") + @Column(name = "ORGAOCANCELACION_ID") + private Integer orgaoCancelacionId; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgao; + @Column(name = "PORCMULTA") + private BigDecimal porcmulta; + @Column(name = "PORCCAMBIO") + private BigDecimal porccambio; + @Column(name = "PORCCAMBIOEMBARCADO") + private BigDecimal porcCambioEmbarcado; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "TIEMPOLIMITE") + private Integer tiempolimite; + + @Column(name = "TIEMPOLIMITE_MIN") + private Integer tiempolimiteMin; + + @Column(name = "TIEMPOLIMITECAMBIO") + private Integer tiempolimiteCambio; + + @Column(name = "TIEMPOLIMITECAMBIO_MIN") + private Integer tiempolimiteCambioMin; + + @Column(name = "INDNAOPERMITETRANSFERENCIA") + private Boolean indnaopermitetransferencia; + @Column(name = "INDSOLICITADATOSTARJETA") + private Boolean indSolicitaDatosTarjeta; + @Column(name = "INDMULTATRANSFERENCIA") + private Boolean indMultaTransferencia; + @Column(name = "INDDEVOLUCAOTRANSFERENCIA") + private Boolean indDevolucaoTransferencia; + @Column(name = "INDCOBRANCATRANSFERENCIA") + private Boolean indCobrancaTransferencia; + @Column(name = "INDORGAOCONCEDENTETRANSF") + private Boolean indOrgaoconcedentetransf; + @Column(name = "INDMULTADEVOLUCAOABERTO") + private Boolean indMultaDevolucaoAberto; + @Column(name = "INDPERMITEDEVTOTALRIOCARD") + private Boolean IndPermiteDevolucaoTotalRioCard; + @Column(name = "PORCCOMISSAOVENDA") + private BigDecimal porcMultaResolAgerba; + @Column(name = "QTDE_LIMITE_TRANSF_REAT") + private Integer qtdeLimiteTransfReat; + + @Column(name = "TEMPOLIMITE_APOS_SAIDA_H") + private Integer tempolimiteAposSaidaH; + + @Column(name = "TEMPOLIMITE_APOS_SAIDA_MIN") + private Integer tempolimiteAposSaidaMin; + + @Column(name = "TROCA_MESMO_DIA_ANTES_H") + private Integer trocaMesmoDiaAntesHora; + + @Column(name = "TROCA_MESMO_DIA_ANTES_MIN") + private Integer trocaMesmoDiaAntesMin; + + @Column(name = "TROCA_MESMO_DIA_APOS_H") + private Integer trocaMesmoDiaAposHora; + + @Column(name = "TROCA_MESMO_DIA_APOS_MIN") + private Integer trocaMesmoDiaAposMin; + + @Column(name = "TEMPO_TROCA_POLTRONA_H") + private Integer tempoTrocaPoltronaH; + + @Column(name = "TEMPO_TROCA_POLTRONA_MIN") + private Integer tempoTrocaPoltronaMin; + + @Column(name = "INDBLOQUEIOREMARCADO") + private Boolean indBloqueioRemarcado; + + @Column(name = "INDPERMPAGMULTAPREESTORNO") + private Boolean indPermPagMultaPreEstorno; + + + @Column(name = "INDIMPRIMECOMPROVANTETRANS") + private Boolean indImprimeComprovanteTransferencia; + + @Column(name = "TEMPOCANCELNAOPRESENCIALHORA") + private Integer tempoCancelNaoPresencialHora; + + @Column(name = "TEMPOCANCELNAOPRESENCIALMIN") + private Integer tempoCancelNaoPresencialMin; + + @Column(name = "INDDEVOLUCAOTROCA") + private Boolean indDevolucaoTroca; + + @Column(name = "INDCOBRANCATROCA") + private Boolean indCobrancaTroca; + + @Transient + @NaoAuditar + private OrgaoCancelacion orgaoCancelacionClone; + + public Integer getOrgaoCancelacionId() { + return orgaoCancelacionId; + } + public void setOrgaoCancelacionId(Integer orgaoCancelacionId) { + this.orgaoCancelacionId = orgaoCancelacionId; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public OrgaoConcedente getOrgao() { + return orgao; + } + public void setOrgao(OrgaoConcedente orgao) { + this.orgao = orgao; + } + public BigDecimal getPorcmulta() { + return porcmulta; + } + public void setPorcmulta(BigDecimal porcmulta) { + this.porcmulta = porcmulta; + } + public BigDecimal getPorccambio() { + return porccambio; + } + public void setPorccambio(BigDecimal porccambio) { + this.porccambio = porccambio; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Integer getTiempolimite() { + return tiempolimite; + } + public void setTiempolimite(Integer tiempolimite) { + this.tiempolimite = tiempolimite; + } + public Integer getTiempolimiteCambio() { + return tiempolimiteCambio; + } + public void setTiempolimiteCambio(Integer tiempolimiteCambio) { + this.tiempolimiteCambio = tiempolimiteCambio; + } + public Boolean getIndnaopermitetransferencia() { + return indnaopermitetransferencia; + } + public void setIndnaopermitetransferencia(Boolean indnaopermitetransferencia) { + this.indnaopermitetransferencia = indnaopermitetransferencia; + } + /** + * @return the porcCambioEmbarcado + */ + public BigDecimal getPorcCambioEmbarcado() { + return porcCambioEmbarcado; + } + /** + * @param porcCambioEmbarcado the porcCambioEmbarcado to set + */ + public void setPorcCambioEmbarcado(BigDecimal porcCambioEmbarcado) { + this.porcCambioEmbarcado = porcCambioEmbarcado; + } + public Boolean getIndSolicitaDatosTarjeta() { + return indSolicitaDatosTarjeta; + } + public void setIndSolicitaDatosTarjeta(Boolean indSolicitaDatosTarjeta) { + this.indSolicitaDatosTarjeta = indSolicitaDatosTarjeta; + } + + /** + * @return the indMultaTransferencia + */ + public Boolean getIndMultaTransferencia() { + return indMultaTransferencia; + } + + /** + * @param indMultaTransferencia + * the indMultaTransferencia to set + */ + public void setIndMultaTransferencia(Boolean indMultaTransferencia) { + this.indMultaTransferencia = indMultaTransferencia; + } + + /** + * @return the indDevolucaoTransferencia + */ + public Boolean getIndDevolucaoTransferencia() { + return indDevolucaoTransferencia; + } + + /** + * @param indDevolucaoTransferencia + * the indDevolucaoTransferencia to set + */ + public void setIndDevolucaoTransferencia(Boolean indDevolucaoTransferencia) { + this.indDevolucaoTransferencia = indDevolucaoTransferencia; + } + + /** + * @return the indCobrancaTransferencia + */ + public Boolean getIndCobrancaTransferencia() { + return indCobrancaTransferencia; + } + + /** + * @param indCobrancaTransferencia + * the indCobrancaTransferencia to set + */ + public void setIndCobrancaTransferencia(Boolean indCobrancaTransferencia) { + this.indCobrancaTransferencia = indCobrancaTransferencia; + } + + /** + * @return the indOrgaoconcedentetransf + */ + public Boolean getIndOrgaoconcedentetransf() { + return indOrgaoconcedentetransf; + } + + /** + * @param indOrgaoconcedentetransf + * the indOrgaoconcedentetransf to set + */ + public void setIndOrgaoconcedentetransf(Boolean indOrgaoconcedentetransf) { + this.indOrgaoconcedentetransf = indOrgaoconcedentetransf; + } + public Boolean getIndMultaDevolucaoAberto() { + return indMultaDevolucaoAberto; + } + public void setIndMultaDevolucaoAberto(Boolean indMultaDevolucaoAberto) { + this.indMultaDevolucaoAberto = indMultaDevolucaoAberto; + } + public Boolean getIndPermiteDevolucaoTotalRioCard() { + return IndPermiteDevolucaoTotalRioCard == null ? false : IndPermiteDevolucaoTotalRioCard; + } + public void setIndPermiteDevolucaoTotalRioCard(Boolean indPermiteDevolucaoTotalRioCard) { + IndPermiteDevolucaoTotalRioCard = indPermiteDevolucaoTotalRioCard; + } + public BigDecimal getPorcMultaResolAgerba() { + return porcMultaResolAgerba; + } + public void setPorcMultaResolAgerba(BigDecimal porMultaResolAgerba) { + this.porcMultaResolAgerba = porMultaResolAgerba; + } + + public Integer getQtdeLimiteTransfReat() { + return qtdeLimiteTransfReat; + } + public void setQtdeLimiteTransfReat(Integer qtdeLimiteTransfReat) { + this.qtdeLimiteTransfReat = qtdeLimiteTransfReat; + } + + public Integer getTiempolimiteMin() { + return tiempolimiteMin == null ? 0 : tiempolimiteMin; + } + + public void setTiempolimiteMin(Integer tiempolimiteMin) { + this.tiempolimiteMin = tiempolimiteMin; + } + + public Integer getTiempolimiteCambioMin() { + return tiempolimiteCambioMin == null ? 0 : tiempolimiteCambioMin; + } + + public void setTiempolimiteCambioMin(Integer tiempolimiteCambioMin) { + this.tiempolimiteCambioMin = tiempolimiteCambioMin; + } + + public Integer getTempolimiteAposSaidaH() { + return tempolimiteAposSaidaH == null ? 0 : tempolimiteAposSaidaH; + } + + public void setTempolimiteAposSaidaH(Integer tempolimiteAposSaidaH) { + this.tempolimiteAposSaidaH = tempolimiteAposSaidaH; + } + + public Integer getTempolimiteAposSaidaMin() { + return tempolimiteAposSaidaMin == null ? 0 : tempolimiteAposSaidaMin; + } + + public void setTempolimiteAposSaidaMin(Integer tempolimiteAposSaidaMin) { + this.tempolimiteAposSaidaMin = tempolimiteAposSaidaMin; + } + + public Integer getTrocaMesmoDiaAntesHora() { + return trocaMesmoDiaAntesHora == null ? 0 : trocaMesmoDiaAntesHora; + } + + public void setTrocaMesmoDiaAntesHora(Integer trocaMesmoDiaAntesHora) { + this.trocaMesmoDiaAntesHora = trocaMesmoDiaAntesHora; + } + + public Integer getTrocaMesmoDiaAntesMin() { + return trocaMesmoDiaAntesMin == null ? 0 : trocaMesmoDiaAntesMin; + } + + public void setTrocaMesmoDiaAntesMin(Integer trocaMesmoDiaAntesMin) { + this.trocaMesmoDiaAntesMin = trocaMesmoDiaAntesMin; + } + + public Integer getTrocaMesmoDiaAposHora() { + return trocaMesmoDiaAposHora == null ? 0 : trocaMesmoDiaAposHora; + } + + public void setTrocaMesmoDiaAposHora(Integer trocaMesmoDiaAposHora) { + this.trocaMesmoDiaAposHora = trocaMesmoDiaAposHora; + } + + public Integer getTrocaMesmoDiaAposMin() { + return trocaMesmoDiaAposMin == null ? 0 : trocaMesmoDiaAposMin; + } + + public void setTrocaMesmoDiaAposMin(Integer trocaMesmoDiaAposMin) { + this.trocaMesmoDiaAposMin = trocaMesmoDiaAposMin; + } + + public Integer getTempoTrocaPoltronaH() { + return tempoTrocaPoltronaH == null ? 0 : tempoTrocaPoltronaH; + } + + public void setTempoTrocaPoltronaH(Integer tempoTrocaPoltronaH) { + this.tempoTrocaPoltronaH = tempoTrocaPoltronaH; + } + + public Integer getTempoTrocaPoltronaMin() { + return tempoTrocaPoltronaMin == null ? 0 : tempoTrocaPoltronaMin; + } + + public void setTempoTrocaPoltronaMin(Integer tempoTrocaPoltronaMin) { + this.tempoTrocaPoltronaMin = tempoTrocaPoltronaMin; + } + public Boolean getIndBloqueioRemarcado() { + return indBloqueioRemarcado; + } + + public void setIndBloqueioRemarcado(Boolean indBloqueioRemarcado) { + this.indBloqueioRemarcado = indBloqueioRemarcado; + } + + + public Boolean getIndPermPagMultaPreEstorno() { + return indPermPagMultaPreEstorno; + } + + public void setIndPermPagMultaPreEstorno(Boolean indPermPagMultaPreEstorno) { + this.indPermPagMultaPreEstorno = indPermPagMultaPreEstorno; + } + + + + public Boolean getIndImprimeComprovanteTransferencia() { + return indImprimeComprovanteTransferencia; + } + public void setIndImprimeComprovanteTransferencia(Boolean indImprimeComprovanteTransferencia) { + this.indImprimeComprovanteTransferencia = indImprimeComprovanteTransferencia; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + orgaoCancelacionClone = new OrgaoCancelacion(); + orgaoCancelacionClone = (OrgaoCancelacion) this.clone(); + Hibernate.initialize(orgaoCancelacionClone.getOrgao()); + + } + @Override + public OrgaoCancelacion getCloneObject() throws CloneNotSupportedException { + return orgaoCancelacionClone; + } + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrgaoCancelacionId()); + } + + public Integer getTempoCancelNaoPresencialHora() { + return tempoCancelNaoPresencialHora == null ? 0 : tempoCancelNaoPresencialHora; + } + + public void setTempoCancelNaoPresencialHora(Integer tempoCancelNaoPresencialHora) { + this.tempoCancelNaoPresencialHora = tempoCancelNaoPresencialHora; + } + + public Integer getTempoCancelNaoPresencialMin() { + return tempoCancelNaoPresencialMin == null ? 0 : tempoCancelNaoPresencialMin; + } + + public void setTempoCancelNaoPresencialMin(Integer tempoCancelNaoPresencialMin) { + this.tempoCancelNaoPresencialMin = tempoCancelNaoPresencialMin; + } + + public Boolean getIndDevolucaoTroca() { + return indDevolucaoTroca == null ? true : indDevolucaoTroca; + } + + public void setIndDevolucaoTroca(Boolean indDevolucaoTroca) { + this.indDevolucaoTroca = indDevolucaoTroca; + } + + public Boolean getIndCobrancaTroca() { + return indCobrancaTroca == null ? true : indCobrancaTroca; + } + + public void setIndCobrancaTroca(Boolean indCobrancaTroca) { + this.indCobrancaTroca = indCobrancaTroca; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoComprovanteCustomizado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoComprovanteCustomizado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/OrgaoComprovanteCustomizado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoComprovanteCustomizado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java index 19fdf222a..83721d91b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java @@ -1,487 +1,487 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.apache.commons.lang.BooleanUtils; -import org.hibernate.annotations.Where; - -import br.com.rjconsultores.auditador.annotations.AuditarAtributo; -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarID; -import br.com.rjconsultores.auditador.annotations.AuditarLista; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "OrgaoConcedente", tela = "auditarClasse.OrgaoConcedente") -@Entity -@SequenceGenerator(name = "ORGAO_CONCEDENTE_SEQ", sequenceName = "ORGAO_CONCEDENTE_SEQ", allocationSize = 1) -@Table(name = "ORGAO_CONCEDENTE") -public class OrgaoConcedente implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - public final static Integer CODIGO_ARTESP = 21; - public final static Integer CODIGO_ANTT = 3; - @AuditarID - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_CONCEDENTE_SEQ") - @Column(name = "ORGAOCONCEDENTE_ID") - private Integer orgaoConcedenteId; - @AuditarAtributo(nome = "DESC ORGAO") - @Column(name = "DESCORGAO") - private String descOrgao; - @Column(name = "INDDEFAULTSEGURO") - private Boolean indDefaultSeguro; - @Column(name = "INDSUBSEGURO") - private Boolean indSubSeguro; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @AuditarLista(auditarEntidades = true, nome = "CategoriaOrgao") - @OneToMany(mappedBy = "orgao") - private List categoriaOrgaoList; - @Column(name = "INDNOMDOCOBLIGATORIO") - private Boolean indNomDocObligatorio; - @AuditarLista(auditarEntidades = true, nome = "OrgaoCancelacion") - @OneToMany(mappedBy = "orgao") - private List orgaoCancelacionList; - @AuditarAtributo(nome = "INDICE PEDADIO") - @Column(name = "INDICEPEAJE") - private BigDecimal indicePeaje; - @AuditarAtributo(nome = "Idade Idoso") - @Column(name = "IDADE_IDOSO") - private Integer idadeIdoso; - @Column(name = "IDADE_MINIMA") - private Integer idadeMinima; - @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") - @ManyToOne() - private Categoria categoria; - @Column(name = "INDUTILIZAICMS") - private Boolean indUtilizaICMS; - @Column(name = "INDMULTATODASREMARCACOES") - private Boolean indmultatodasremarcacoes; - @Column(name = "INDVALDOCOBLIGATORIOMONITRIP") - private Boolean indValDocObligatorioMonitrip; - @Column(name = "INDVALDOCOBLIGATORIOEMBARCADA") - private Boolean indValDocObligatorioEmbarcada; - @Column(name = "TAXACONVENIENCIAPORC") - private BigDecimal taxaConvenienciaPorc; - @Column(name = "MAXTAXACONVENIENCIAPORTARIFA") - private BigDecimal maximoTaxaConvenienciaPorTarifa; - @Column(name = "MENSAGEMRECIBOTXCONVENIENCIA") - private String mensagemReciboTaxaDeConveniencia; - - @OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL) - @NaoAuditar - private List classesIndicePeaje; - - @AuditarLista(auditarEntidades = true, nome = "OrgaoEmpParam") - @OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL) - @Where(clause = "activo=1") - private List orgaoEmpParams; - - @Column(name = "COEFICIENTETARIFA") - private BigDecimal coeficiente; - - @Column(name = "MENSAGEM_INTRANSFERIVEL") - private String mensagemPassagemIntrasferivel; - - @Column(name = "INDNAOIMPPOLCONSUMIDOR") - private Boolean indNaoImprimirPoliticasConsumidor; - - @Column(name = "TAXA_CONVENIENCIA_SVI") - private BigDecimal taxaConvenienciaSVI; - - @Transient - @NaoAuditar - private OrgaoConcedente orgaoConcedenteClone; - - @AuditarAtributo(nome = "Idade Minima Jovem") - @Column(name = "IDADE_MIN_JOVEM") - private Integer idadeMinimaJovem; - - @AuditarAtributo(nome = "Idade Maxima Jovem") - @Column(name = "IDADE_MAX_JOVEM") - private Integer idadeMaximaJovem; - - - @Column(name = "CUSTOMIZARODAPECUPOMEMBARQUE") - @NaoAuditar - private String customizacaoRodapeCupomDeEmbarque; - - - @Column(name = "CAMPOCUSTOMVOUCHER") - @NaoAuditar - private String campoCustomVoucher; - - @Column(name = "INDIMPRCUPOMVOUCHERCUSTOMIZADO") - @NaoAuditar - private Boolean indImprimeCupomVoucherCustomizado; - - - public void addParametro(OrgaoCancelacion param) { - this.orgaoCancelacionList.add(param); - } - - public void removeParametro(OrgaoCancelacion param) { - this.orgaoCancelacionList.remove(param); - } - - public Integer getOrgaoConcedenteId() { - return orgaoConcedenteId; - } - - public void setOrgaoConcedenteId(Integer orgaoConcedenteId) { - this.orgaoConcedenteId = orgaoConcedenteId; - } - - public String getDescOrgao() { - return descOrgao; - } - - public void setDescOrgao(String descOrgao) { - this.descOrgao = descOrgao; - } - - public Boolean getIndSubSeguro() { - return indSubSeguro; - } - - public void setIndSubSeguro(Boolean indSubSeguro) { - this.indSubSeguro = indSubSeguro; - } - - public Boolean getIndDefaultSeguro() { - return indDefaultSeguro; - } - - public void setIndDefaultSeguro(Boolean indDefaultSeguro) { - this.indDefaultSeguro = indDefaultSeguro; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getCategoriaOrgaoList() { - return categoriaOrgaoList; - } - - public void setCategoriaOrgaoList(List categoriaOrgaoList) { - this.categoriaOrgaoList = categoriaOrgaoList; - } - - public Boolean getIndNomDocObligatorio() { - return BooleanUtils.isTrue(indNomDocObligatorio); - } - - public void setIndNomDocObligatorio(Boolean indNomDocObligatorio) { - this.indNomDocObligatorio = indNomDocObligatorio; - } - - public List getOrgaoCancelacionList() { - return orgaoCancelacionList; - } - - public void setOrgaoCancelacionList(List orgaoCancelacionList) { - this.orgaoCancelacionList = orgaoCancelacionList; - } - - public BigDecimal getIndicePeaje() { - return indicePeaje; - } - - public void setIndicePeaje(BigDecimal indicePeaje) { - this.indicePeaje = indicePeaje; - } - - public Integer getIdadeIdoso() { - return idadeIdoso; - } - - public void setIdadeIdoso(Integer idadeIdoso) { - this.idadeIdoso = idadeIdoso; - } - - public List getClassesIndicePeaje() { - List lsClasseIndicePeaje = new ArrayList(); - for (ClasseIndicePeaje classeIndicePeaje : this.classesIndicePeaje) { - if (classeIndicePeaje.getActivo()) { - lsClasseIndicePeaje.add(classeIndicePeaje); - } - } - return this.classesIndicePeaje = lsClasseIndicePeaje; - } - - public void setClassesIndicePeaje(List classesIndicePeaje) { - this.classesIndicePeaje = classesIndicePeaje; - } - - public Integer getIdadeMinima() { - return idadeMinima; - } - - public void setIdadeMinima(Integer idadeMinima) { - this.idadeMinima = idadeMinima; - } - - public Categoria getCategoria() { - return categoria; - } - - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - - @Override - public String toString() { - return descOrgao; - } - - public Boolean getIndUtilizaICMS() { - return indUtilizaICMS; - } - - public void setIndUtilizaICMS(Boolean indUtilizaICMS) { - this.indUtilizaICMS = indUtilizaICMS; - } - - public List getOrgaoEmpParams() { - return orgaoEmpParams; - } - - public void setOrgaoEmpParams(List orgaoEmpParams) { - this.orgaoEmpParams = orgaoEmpParams; - } - - public Boolean getIndmultatodasremarcacoes() { - return indmultatodasremarcacoes; - } - - public void setIndmultatodasremarcacoes(Boolean indmultatodasremarcacoes) { - this.indmultatodasremarcacoes = indmultatodasremarcacoes; - } - - public Boolean getIndValDocObligatorioMonitrip() { - return BooleanUtils.toBoolean(indValDocObligatorioMonitrip); - } - - public void setIndValDocObligatorioMonitrip(Boolean indValDocObligatorioMonitrip) { - this.indValDocObligatorioMonitrip = indValDocObligatorioMonitrip; - } - - public BigDecimal getCoeficiente() { - return coeficiente; - } - - public void setCoeficiente(BigDecimal coeficiente) { - this.coeficiente = coeficiente; - } - - public String getMensagemPassagemIntrasferivel() { - return mensagemPassagemIntrasferivel; - } - - public void setMensagemPassagemIntrasferivel(String mensagemPassagemIntrasferivel) { - this.mensagemPassagemIntrasferivel = mensagemPassagemIntrasferivel; - } - - - public Boolean getIndValDocObligatorioEmbarcada() { - return indValDocObligatorioEmbarcada; - } - - public void setIndValDocObligatorioEmbarcada(Boolean indValDocObligatorioEmbarcada) { - this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada; - } - - public BigDecimal getTaxaConvenienciaPorc() { - return taxaConvenienciaPorc; - } - - public void setTaxaConvenienciaPorc(BigDecimal taxaConvenienciaPorc) { - this.taxaConvenienciaPorc = taxaConvenienciaPorc; - } - - public BigDecimal getMaximoTaxaConvenienciaPorTarifa() { - return maximoTaxaConvenienciaPorTarifa; - } - - public void setMaximoTaxaConvenienciaPorTarifa(BigDecimal maximoTaxaConvenienciaPorTarifa) { - this.maximoTaxaConvenienciaPorTarifa = maximoTaxaConvenienciaPorTarifa; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((orgaoConcedenteId == null) ? 0 : orgaoConcedenteId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - OrgaoConcedente other = (OrgaoConcedente) obj; - if (orgaoConcedenteId == null) { - if (other.orgaoConcedenteId != null) - return false; - } else if (!orgaoConcedenteId.equals(other.orgaoConcedenteId)) - return false; - return true; - } - - public Boolean getIndNaoImprimirPoliticasConsumidor() { - return indNaoImprimirPoliticasConsumidor; - } - - public void setIndNaoImprimirPoliticasConsumidor(Boolean indNaoImprimirPoliticasConsumidor) { - this.indNaoImprimirPoliticasConsumidor = indNaoImprimirPoliticasConsumidor; - } - - public BigDecimal getTaxaConvenienciaSVI() { - return taxaConvenienciaSVI; - } - - public void setTaxaConvenienciaSVI(BigDecimal taxaConvenienciaSVI) { - this.taxaConvenienciaSVI = taxaConvenienciaSVI; - } - - public String getMensagemReciboTaxaDeConveniencia() { - return mensagemReciboTaxaDeConveniencia; - } - - public void setMensagemReciboTaxaDeConveniencia(String mensagemReciboTaxaDeConveniencia) { - this.mensagemReciboTaxaDeConveniencia = mensagemReciboTaxaDeConveniencia; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - orgaoConcedenteClone = new OrgaoConcedente(); - orgaoConcedenteClone = (OrgaoConcedente) this.clone(); - - if(this.getCategoriaOrgaoList() != null) { - List lsClones = new ArrayList(); - for (CategoriaOrgao categoriaOrgao : this.getCategoriaOrgaoList()) { - if(BooleanUtils.isTrue(categoriaOrgao.getActivo())) { - categoriaOrgao.clonar(); - lsClones.add(categoriaOrgao.getCloneObject()); - } - } - orgaoConcedenteClone.setCategoriaOrgaoList(lsClones); - } - - if(this.getOrgaoCancelacionList() != null) { - List lsClones = new ArrayList(); - for (OrgaoCancelacion orgaoCancelacion : this.getOrgaoCancelacionList()) { - if(BooleanUtils.isTrue(orgaoCancelacion.getActivo())) { - orgaoCancelacion.clonar(); - lsClones.add(orgaoCancelacion.getCloneObject()); - } - } - orgaoConcedenteClone.setOrgaoCancelacionList(lsClones); - } - } - - @Override - public OrgaoConcedente getCloneObject() throws CloneNotSupportedException { - return orgaoConcedenteClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrgaoConcedenteId()); - } - - public Integer getIdadeMinimaJovem() { - return idadeMinimaJovem; - } - - public void setIdadeMinimaJovem(Integer idadeMinimaJovem) { - this.idadeMinimaJovem = idadeMinimaJovem; - } - - public Integer getIdadeMaximaJovem() { - return idadeMaximaJovem; - } - - public void setIdadeMaximaJovem(Integer idadeMaximaJovem) { - this.idadeMaximaJovem = idadeMaximaJovem; - } - - public String getCustomizacaoRodapeCupomDeEmbarque() { - return customizacaoRodapeCupomDeEmbarque; - } - - public void setCustomizacaoRodapeCupomDeEmbarque(String customizacaoRodapeCupomDeEmbarque) { - this.customizacaoRodapeCupomDeEmbarque = customizacaoRodapeCupomDeEmbarque; - } - - public String getCampoCustomVoucher() { - return campoCustomVoucher; - } - - public void setCampoCustomVoucher(String campoCustomVoucher) { - this.campoCustomVoucher = campoCustomVoucher; - } - - public Boolean getIndImprimeCupomVoucherCustomizado() { - return indImprimeCupomVoucherCustomizado; - } - - public void setIndImprimeCupomVoucherCustomizado(Boolean indImprimeCupomVoucherCustomizado) { - this.indImprimeCupomVoucherCustomizado = indImprimeCupomVoucherCustomizado; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.apache.commons.lang.BooleanUtils; +import org.hibernate.annotations.Where; + +import br.com.rjconsultores.auditador.annotations.AuditarAtributo; +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarID; +import br.com.rjconsultores.auditador.annotations.AuditarLista; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "OrgaoConcedente", tela = "auditarClasse.OrgaoConcedente") +@Entity +@SequenceGenerator(name = "ORGAO_CONCEDENTE_SEQ", sequenceName = "ORGAO_CONCEDENTE_SEQ", allocationSize = 1) +@Table(name = "ORGAO_CONCEDENTE") +public class OrgaoConcedente implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + public final static Integer CODIGO_ARTESP = 21; + public final static Integer CODIGO_ANTT = 3; + @AuditarID + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_CONCEDENTE_SEQ") + @Column(name = "ORGAOCONCEDENTE_ID") + private Integer orgaoConcedenteId; + @AuditarAtributo(nome = "DESC ORGAO") + @Column(name = "DESCORGAO") + private String descOrgao; + @Column(name = "INDDEFAULTSEGURO") + private Boolean indDefaultSeguro; + @Column(name = "INDSUBSEGURO") + private Boolean indSubSeguro; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @AuditarLista(auditarEntidades = true, nome = "CategoriaOrgao") + @OneToMany(mappedBy = "orgao") + private List categoriaOrgaoList; + @Column(name = "INDNOMDOCOBLIGATORIO") + private Boolean indNomDocObligatorio; + @AuditarLista(auditarEntidades = true, nome = "OrgaoCancelacion") + @OneToMany(mappedBy = "orgao") + private List orgaoCancelacionList; + @AuditarAtributo(nome = "INDICE PEDADIO") + @Column(name = "INDICEPEAJE") + private BigDecimal indicePeaje; + @AuditarAtributo(nome = "Idade Idoso") + @Column(name = "IDADE_IDOSO") + private Integer idadeIdoso; + @Column(name = "IDADE_MINIMA") + private Integer idadeMinima; + @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") + @ManyToOne() + private Categoria categoria; + @Column(name = "INDUTILIZAICMS") + private Boolean indUtilizaICMS; + @Column(name = "INDMULTATODASREMARCACOES") + private Boolean indmultatodasremarcacoes; + @Column(name = "INDVALDOCOBLIGATORIOMONITRIP") + private Boolean indValDocObligatorioMonitrip; + @Column(name = "INDVALDOCOBLIGATORIOEMBARCADA") + private Boolean indValDocObligatorioEmbarcada; + @Column(name = "TAXACONVENIENCIAPORC") + private BigDecimal taxaConvenienciaPorc; + @Column(name = "MAXTAXACONVENIENCIAPORTARIFA") + private BigDecimal maximoTaxaConvenienciaPorTarifa; + @Column(name = "MENSAGEMRECIBOTXCONVENIENCIA") + private String mensagemReciboTaxaDeConveniencia; + + @OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL) + @NaoAuditar + private List classesIndicePeaje; + + @AuditarLista(auditarEntidades = true, nome = "OrgaoEmpParam") + @OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL) + @Where(clause = "activo=1") + private List orgaoEmpParams; + + @Column(name = "COEFICIENTETARIFA") + private BigDecimal coeficiente; + + @Column(name = "MENSAGEM_INTRANSFERIVEL") + private String mensagemPassagemIntrasferivel; + + @Column(name = "INDNAOIMPPOLCONSUMIDOR") + private Boolean indNaoImprimirPoliticasConsumidor; + + @Column(name = "TAXA_CONVENIENCIA_SVI") + private BigDecimal taxaConvenienciaSVI; + + @Transient + @NaoAuditar + private OrgaoConcedente orgaoConcedenteClone; + + @AuditarAtributo(nome = "Idade Minima Jovem") + @Column(name = "IDADE_MIN_JOVEM") + private Integer idadeMinimaJovem; + + @AuditarAtributo(nome = "Idade Maxima Jovem") + @Column(name = "IDADE_MAX_JOVEM") + private Integer idadeMaximaJovem; + + + @Column(name = "CUSTOMIZARODAPECUPOMEMBARQUE") + @NaoAuditar + private String customizacaoRodapeCupomDeEmbarque; + + + @Column(name = "CAMPOCUSTOMVOUCHER") + @NaoAuditar + private String campoCustomVoucher; + + @Column(name = "INDIMPRCUPOMVOUCHERCUSTOMIZADO") + @NaoAuditar + private Boolean indImprimeCupomVoucherCustomizado; + + + public void addParametro(OrgaoCancelacion param) { + this.orgaoCancelacionList.add(param); + } + + public void removeParametro(OrgaoCancelacion param) { + this.orgaoCancelacionList.remove(param); + } + + public Integer getOrgaoConcedenteId() { + return orgaoConcedenteId; + } + + public void setOrgaoConcedenteId(Integer orgaoConcedenteId) { + this.orgaoConcedenteId = orgaoConcedenteId; + } + + public String getDescOrgao() { + return descOrgao; + } + + public void setDescOrgao(String descOrgao) { + this.descOrgao = descOrgao; + } + + public Boolean getIndSubSeguro() { + return indSubSeguro; + } + + public void setIndSubSeguro(Boolean indSubSeguro) { + this.indSubSeguro = indSubSeguro; + } + + public Boolean getIndDefaultSeguro() { + return indDefaultSeguro; + } + + public void setIndDefaultSeguro(Boolean indDefaultSeguro) { + this.indDefaultSeguro = indDefaultSeguro; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getCategoriaOrgaoList() { + return categoriaOrgaoList; + } + + public void setCategoriaOrgaoList(List categoriaOrgaoList) { + this.categoriaOrgaoList = categoriaOrgaoList; + } + + public Boolean getIndNomDocObligatorio() { + return BooleanUtils.isTrue(indNomDocObligatorio); + } + + public void setIndNomDocObligatorio(Boolean indNomDocObligatorio) { + this.indNomDocObligatorio = indNomDocObligatorio; + } + + public List getOrgaoCancelacionList() { + return orgaoCancelacionList; + } + + public void setOrgaoCancelacionList(List orgaoCancelacionList) { + this.orgaoCancelacionList = orgaoCancelacionList; + } + + public BigDecimal getIndicePeaje() { + return indicePeaje; + } + + public void setIndicePeaje(BigDecimal indicePeaje) { + this.indicePeaje = indicePeaje; + } + + public Integer getIdadeIdoso() { + return idadeIdoso; + } + + public void setIdadeIdoso(Integer idadeIdoso) { + this.idadeIdoso = idadeIdoso; + } + + public List getClassesIndicePeaje() { + List lsClasseIndicePeaje = new ArrayList(); + for (ClasseIndicePeaje classeIndicePeaje : this.classesIndicePeaje) { + if (classeIndicePeaje.getActivo()) { + lsClasseIndicePeaje.add(classeIndicePeaje); + } + } + return this.classesIndicePeaje = lsClasseIndicePeaje; + } + + public void setClassesIndicePeaje(List classesIndicePeaje) { + this.classesIndicePeaje = classesIndicePeaje; + } + + public Integer getIdadeMinima() { + return idadeMinima; + } + + public void setIdadeMinima(Integer idadeMinima) { + this.idadeMinima = idadeMinima; + } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + @Override + public String toString() { + return descOrgao; + } + + public Boolean getIndUtilizaICMS() { + return indUtilizaICMS; + } + + public void setIndUtilizaICMS(Boolean indUtilizaICMS) { + this.indUtilizaICMS = indUtilizaICMS; + } + + public List getOrgaoEmpParams() { + return orgaoEmpParams; + } + + public void setOrgaoEmpParams(List orgaoEmpParams) { + this.orgaoEmpParams = orgaoEmpParams; + } + + public Boolean getIndmultatodasremarcacoes() { + return indmultatodasremarcacoes; + } + + public void setIndmultatodasremarcacoes(Boolean indmultatodasremarcacoes) { + this.indmultatodasremarcacoes = indmultatodasremarcacoes; + } + + public Boolean getIndValDocObligatorioMonitrip() { + return BooleanUtils.toBoolean(indValDocObligatorioMonitrip); + } + + public void setIndValDocObligatorioMonitrip(Boolean indValDocObligatorioMonitrip) { + this.indValDocObligatorioMonitrip = indValDocObligatorioMonitrip; + } + + public BigDecimal getCoeficiente() { + return coeficiente; + } + + public void setCoeficiente(BigDecimal coeficiente) { + this.coeficiente = coeficiente; + } + + public String getMensagemPassagemIntrasferivel() { + return mensagemPassagemIntrasferivel; + } + + public void setMensagemPassagemIntrasferivel(String mensagemPassagemIntrasferivel) { + this.mensagemPassagemIntrasferivel = mensagemPassagemIntrasferivel; + } + + + public Boolean getIndValDocObligatorioEmbarcada() { + return indValDocObligatorioEmbarcada; + } + + public void setIndValDocObligatorioEmbarcada(Boolean indValDocObligatorioEmbarcada) { + this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada; + } + + public BigDecimal getTaxaConvenienciaPorc() { + return taxaConvenienciaPorc; + } + + public void setTaxaConvenienciaPorc(BigDecimal taxaConvenienciaPorc) { + this.taxaConvenienciaPorc = taxaConvenienciaPorc; + } + + public BigDecimal getMaximoTaxaConvenienciaPorTarifa() { + return maximoTaxaConvenienciaPorTarifa; + } + + public void setMaximoTaxaConvenienciaPorTarifa(BigDecimal maximoTaxaConvenienciaPorTarifa) { + this.maximoTaxaConvenienciaPorTarifa = maximoTaxaConvenienciaPorTarifa; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((orgaoConcedenteId == null) ? 0 : orgaoConcedenteId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + OrgaoConcedente other = (OrgaoConcedente) obj; + if (orgaoConcedenteId == null) { + if (other.orgaoConcedenteId != null) + return false; + } else if (!orgaoConcedenteId.equals(other.orgaoConcedenteId)) + return false; + return true; + } + + public Boolean getIndNaoImprimirPoliticasConsumidor() { + return indNaoImprimirPoliticasConsumidor; + } + + public void setIndNaoImprimirPoliticasConsumidor(Boolean indNaoImprimirPoliticasConsumidor) { + this.indNaoImprimirPoliticasConsumidor = indNaoImprimirPoliticasConsumidor; + } + + public BigDecimal getTaxaConvenienciaSVI() { + return taxaConvenienciaSVI; + } + + public void setTaxaConvenienciaSVI(BigDecimal taxaConvenienciaSVI) { + this.taxaConvenienciaSVI = taxaConvenienciaSVI; + } + + public String getMensagemReciboTaxaDeConveniencia() { + return mensagemReciboTaxaDeConveniencia; + } + + public void setMensagemReciboTaxaDeConveniencia(String mensagemReciboTaxaDeConveniencia) { + this.mensagemReciboTaxaDeConveniencia = mensagemReciboTaxaDeConveniencia; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + orgaoConcedenteClone = new OrgaoConcedente(); + orgaoConcedenteClone = (OrgaoConcedente) this.clone(); + + if(this.getCategoriaOrgaoList() != null) { + List lsClones = new ArrayList(); + for (CategoriaOrgao categoriaOrgao : this.getCategoriaOrgaoList()) { + if(BooleanUtils.isTrue(categoriaOrgao.getActivo())) { + categoriaOrgao.clonar(); + lsClones.add(categoriaOrgao.getCloneObject()); + } + } + orgaoConcedenteClone.setCategoriaOrgaoList(lsClones); + } + + if(this.getOrgaoCancelacionList() != null) { + List lsClones = new ArrayList(); + for (OrgaoCancelacion orgaoCancelacion : this.getOrgaoCancelacionList()) { + if(BooleanUtils.isTrue(orgaoCancelacion.getActivo())) { + orgaoCancelacion.clonar(); + lsClones.add(orgaoCancelacion.getCloneObject()); + } + } + orgaoConcedenteClone.setOrgaoCancelacionList(lsClones); + } + } + + @Override + public OrgaoConcedente getCloneObject() throws CloneNotSupportedException { + return orgaoConcedenteClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrgaoConcedenteId()); + } + + public Integer getIdadeMinimaJovem() { + return idadeMinimaJovem; + } + + public void setIdadeMinimaJovem(Integer idadeMinimaJovem) { + this.idadeMinimaJovem = idadeMinimaJovem; + } + + public Integer getIdadeMaximaJovem() { + return idadeMaximaJovem; + } + + public void setIdadeMaximaJovem(Integer idadeMaximaJovem) { + this.idadeMaximaJovem = idadeMaximaJovem; + } + + public String getCustomizacaoRodapeCupomDeEmbarque() { + return customizacaoRodapeCupomDeEmbarque; + } + + public void setCustomizacaoRodapeCupomDeEmbarque(String customizacaoRodapeCupomDeEmbarque) { + this.customizacaoRodapeCupomDeEmbarque = customizacaoRodapeCupomDeEmbarque; + } + + public String getCampoCustomVoucher() { + return campoCustomVoucher; + } + + public void setCampoCustomVoucher(String campoCustomVoucher) { + this.campoCustomVoucher = campoCustomVoucher; + } + + public Boolean getIndImprimeCupomVoucherCustomizado() { + return indImprimeCupomVoucherCustomizado; + } + + public void setIndImprimeCupomVoucherCustomizado(Boolean indImprimeCupomVoucherCustomizado) { + this.indImprimeCupomVoucherCustomizado = indImprimeCupomVoucherCustomizado; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java index e71a52a33..9ce601789 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java @@ -1,243 +1,243 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; -@AuditarClasse(nome = "OrgaoEmpParam", tela = "auditarClasse.OrgaoEmpParam") -@Entity -@SequenceGenerator(name = "ORGAO_EMP_PARAM_SEQ", sequenceName = "ORGAO_EMP_PARAM_SEQ", allocationSize = 1) -@Table(name = "ORGAO_EMP_PARAM") -public class OrgaoEmpParam implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_EMP_PARAM_SEQ") - @Column(name = "ORGAOEMPPARAM_ID") - private Integer orgaoempparamId; - - @Column(name = "INDEMITESEGUNDAVIA") - private Boolean indemitesegundavia; - - @Column(name = "INDDOISCUPOMEMBARQUE") - private Boolean inddoiscupomembarque; - - @Column(name = "INDNAORESTRINGE2VIABPE") - private Boolean indNaoRestringe2ViaBPe; - - @ManyToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "CODEMPRESAPORORGAO", length=30) - private String codEmpresaPorOrgao; - - @Column(name = "INDICEEXCESSODEPAGAGEM") - private BigDecimal indiceExcessoDeBagagem; - - @Column(name = "PESOEXCESSODEBAGAGEMFRANQUIA") - private Integer pesoExcessoDeBagagemFranquia; - - @Column(name = "PESOEXTRAEXCESSODEBAGAGEM") - private Integer pesoExtraExcessoDeBagagem; - - @Column(name = "INDEMITE2VIAAPOSSAIDA") - private Boolean chkIndEmite2ViaAposSaida; - - @Transient - @NaoAuditar - private OrgaoEmpParam orgaoEmpParamClone; - - public String getCodEmpresaPorOrgao() { - return codEmpresaPorOrgao; - } - - public void setCodEmpresaPorOrgao(String codEmpresaPorOrgao) { - this.codEmpresaPorOrgao = codEmpresaPorOrgao; - } - - public Integer getOrgaoempparamId() { - return orgaoempparamId; - } - - public void setOrgaoempparamId(Integer orgaoempparamId) { - this.orgaoempparamId = orgaoempparamId; - } - - public Boolean getIndemitesegundavia() { - return indemitesegundavia; - } - - public void setIndemitesegundavia(Boolean indemitesegundavia) { - this.indemitesegundavia = indemitesegundavia; - } - - public Boolean getInddoiscupomembarque() { - return inddoiscupomembarque; - } - - public void setInddoiscupomembarque(Boolean inddoiscupomembarque) { - this.inddoiscupomembarque = inddoiscupomembarque; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndNaoRestringe2ViaBPe() { - return indNaoRestringe2ViaBPe == null ? false : indNaoRestringe2ViaBPe; - } - - public void setIndNaoRestringe2ViaBPe(Boolean indNaoRestringe2ViaBPe) { - this.indNaoRestringe2ViaBPe = indNaoRestringe2ViaBPe; - } - - - - public BigDecimal getIndiceExcessoDeBagagem() { - return indiceExcessoDeBagagem; - } - - public void setIndiceExcessoDeBagagem(BigDecimal indiceExcessoDeBagagem) { - this.indiceExcessoDeBagagem = indiceExcessoDeBagagem; - } - - - public Integer getPesoExcessoDeBagagemFranquia() { - return pesoExcessoDeBagagemFranquia; - } - - public void setPesoExcessoDeBagagemFranquia(Integer pesoExcessoDeBagagemFranquia) { - this.pesoExcessoDeBagagemFranquia = pesoExcessoDeBagagemFranquia; - } - - public Integer getPesoExtraExcessoDeBagagem() { - return pesoExtraExcessoDeBagagem; - } - - public void setPesoExtraExcessoDeBagagem(Integer pesoExtraExcessoDeBagagem) { - this.pesoExtraExcessoDeBagagem = pesoExtraExcessoDeBagagem; - } - - public Boolean getChkIndEmite2ViaAposSaida() { - return chkIndEmite2ViaAposSaida == null ? false : chkIndEmite2ViaAposSaida; - } - - public void setChkIndEmite2ViaAposSaida(Boolean chkIndEmite2ViaAposSaida) { - this.chkIndEmite2ViaAposSaida = chkIndEmite2ViaAposSaida; - } - - @Override - public void clonar() throws CloneNotSupportedException { - orgaoEmpParamClone = new OrgaoEmpParam(); - orgaoEmpParamClone = (OrgaoEmpParam) this.clone(); - Hibernate.initialize(orgaoEmpParamClone.getOrgaoConcedente()); - } - - @Override - public OrgaoEmpParam getCloneObject() throws CloneNotSupportedException { - return orgaoEmpParamClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getOrgaoempparamId()); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((orgaoempparamId == null) ? 0 : orgaoempparamId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof OrgaoEmpParam)) - return false; - OrgaoEmpParam other = (OrgaoEmpParam) obj; - if (getOrgaoempparamId() == null) { - if (other.getOrgaoempparamId() != null) - return false; - } else if (!getOrgaoempparamId().equals(other.getOrgaoempparamId())) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; +@AuditarClasse(nome = "OrgaoEmpParam", tela = "auditarClasse.OrgaoEmpParam") +@Entity +@SequenceGenerator(name = "ORGAO_EMP_PARAM_SEQ", sequenceName = "ORGAO_EMP_PARAM_SEQ", allocationSize = 1) +@Table(name = "ORGAO_EMP_PARAM") +public class OrgaoEmpParam implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_EMP_PARAM_SEQ") + @Column(name = "ORGAOEMPPARAM_ID") + private Integer orgaoempparamId; + + @Column(name = "INDEMITESEGUNDAVIA") + private Boolean indemitesegundavia; + + @Column(name = "INDDOISCUPOMEMBARQUE") + private Boolean inddoiscupomembarque; + + @Column(name = "INDNAORESTRINGE2VIABPE") + private Boolean indNaoRestringe2ViaBPe; + + @ManyToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "CODEMPRESAPORORGAO", length=30) + private String codEmpresaPorOrgao; + + @Column(name = "INDICEEXCESSODEPAGAGEM") + private BigDecimal indiceExcessoDeBagagem; + + @Column(name = "PESOEXCESSODEBAGAGEMFRANQUIA") + private Integer pesoExcessoDeBagagemFranquia; + + @Column(name = "PESOEXTRAEXCESSODEBAGAGEM") + private Integer pesoExtraExcessoDeBagagem; + + @Column(name = "INDEMITE2VIAAPOSSAIDA") + private Boolean chkIndEmite2ViaAposSaida; + + @Transient + @NaoAuditar + private OrgaoEmpParam orgaoEmpParamClone; + + public String getCodEmpresaPorOrgao() { + return codEmpresaPorOrgao; + } + + public void setCodEmpresaPorOrgao(String codEmpresaPorOrgao) { + this.codEmpresaPorOrgao = codEmpresaPorOrgao; + } + + public Integer getOrgaoempparamId() { + return orgaoempparamId; + } + + public void setOrgaoempparamId(Integer orgaoempparamId) { + this.orgaoempparamId = orgaoempparamId; + } + + public Boolean getIndemitesegundavia() { + return indemitesegundavia; + } + + public void setIndemitesegundavia(Boolean indemitesegundavia) { + this.indemitesegundavia = indemitesegundavia; + } + + public Boolean getInddoiscupomembarque() { + return inddoiscupomembarque; + } + + public void setInddoiscupomembarque(Boolean inddoiscupomembarque) { + this.inddoiscupomembarque = inddoiscupomembarque; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndNaoRestringe2ViaBPe() { + return indNaoRestringe2ViaBPe == null ? false : indNaoRestringe2ViaBPe; + } + + public void setIndNaoRestringe2ViaBPe(Boolean indNaoRestringe2ViaBPe) { + this.indNaoRestringe2ViaBPe = indNaoRestringe2ViaBPe; + } + + + + public BigDecimal getIndiceExcessoDeBagagem() { + return indiceExcessoDeBagagem; + } + + public void setIndiceExcessoDeBagagem(BigDecimal indiceExcessoDeBagagem) { + this.indiceExcessoDeBagagem = indiceExcessoDeBagagem; + } + + + public Integer getPesoExcessoDeBagagemFranquia() { + return pesoExcessoDeBagagemFranquia; + } + + public void setPesoExcessoDeBagagemFranquia(Integer pesoExcessoDeBagagemFranquia) { + this.pesoExcessoDeBagagemFranquia = pesoExcessoDeBagagemFranquia; + } + + public Integer getPesoExtraExcessoDeBagagem() { + return pesoExtraExcessoDeBagagem; + } + + public void setPesoExtraExcessoDeBagagem(Integer pesoExtraExcessoDeBagagem) { + this.pesoExtraExcessoDeBagagem = pesoExtraExcessoDeBagagem; + } + + public Boolean getChkIndEmite2ViaAposSaida() { + return chkIndEmite2ViaAposSaida == null ? false : chkIndEmite2ViaAposSaida; + } + + public void setChkIndEmite2ViaAposSaida(Boolean chkIndEmite2ViaAposSaida) { + this.chkIndEmite2ViaAposSaida = chkIndEmite2ViaAposSaida; + } + + @Override + public void clonar() throws CloneNotSupportedException { + orgaoEmpParamClone = new OrgaoEmpParam(); + orgaoEmpParamClone = (OrgaoEmpParam) this.clone(); + Hibernate.initialize(orgaoEmpParamClone.getOrgaoConcedente()); + } + + @Override + public OrgaoEmpParam getCloneObject() throws CloneNotSupportedException { + return orgaoEmpParamClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getOrgaoempparamId()); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((orgaoempparamId == null) ? 0 : orgaoempparamId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof OrgaoEmpParam)) + return false; + OrgaoEmpParam other = (OrgaoEmpParam) obj; + if (getOrgaoempparamId() == null) { + if (other.getOrgaoempparamId() != null) + return false; + } else if (!getOrgaoempparamId().equals(other.getOrgaoempparamId())) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java index c784c90a9..cce82adde 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java @@ -1,191 +1,191 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "ORGAO_TRAMO_SEQ", sequenceName = "ORGAO_TRAMO_SEQ", allocationSize = 1) -@Table(name = "ORGAO_TRAMO") -public class OrgaoTramo implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_TRAMO_SEQ") - @Basic(optional = false) - @Column(name = "ORGAOTRAMO_ID") - private Integer orgaoTramoId; - @OneToOne - @JoinColumn(name = "TRAMO_ID") - private Tramo tramo; - @OneToOne - @JoinColumn(name = "COEFICIENTETARIFA1_ID") - private CoeficienteTarifa coeficienteTarifa1; - @Column(name = "KMCOEFICIENTE1") - private BigDecimal kmCoeficiente1; - @OneToOne - @JoinColumn(name = "COEFICIENTETARIFA2_ID") - private CoeficienteTarifa coeficienteTarifa2; - @Column(name = "KMCOEFICIENTE2") - private BigDecimal kmCoeficiente2; - @OneToOne - @JoinColumn(name = "COEFICIENTETARIFA3_ID") - private CoeficienteTarifa coeficienteTarifa3; - @Column(name = "KMCOEFICIENTE3") - private BigDecimal kmCoeficiente3; - @OneToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - @OneToOne - @JoinColumn(name = "CLASESERVICIO_ID") - private ClaseServicio claseServicio; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getOrgaoTramoId() { - return orgaoTramoId; - } - - public void setOrgaoTramoId(Integer orgaoTramoId) { - this.orgaoTramoId = orgaoTramoId; - } - - public Tramo getTramo() { - return tramo; - } - - public void setTramo(Tramo tramo) { - this.tramo = tramo; - } - - public CoeficienteTarifa getCoeficienteTarifa1() { - return coeficienteTarifa1; - } - - public void setCoeficienteTarifa1(CoeficienteTarifa coeficienteTarifa1) { - this.coeficienteTarifa1 = coeficienteTarifa1; - } - - public BigDecimal getKmCoeficiente1() { - return kmCoeficiente1; - } - - public void setKmCoeficiente1(BigDecimal kmCoeficiente1) { - this.kmCoeficiente1 = kmCoeficiente1; - } - - public CoeficienteTarifa getCoeficienteTarifa2() { - return coeficienteTarifa2; - } - - public void setCoeficienteTarifa2(CoeficienteTarifa coeficienteTarifa2) { - this.coeficienteTarifa2 = coeficienteTarifa2; - } - - public BigDecimal getKmCoeficiente2() { - return kmCoeficiente2; - } - - public void setKmCoeficiente2(BigDecimal kmCoeficiente2) { - this.kmCoeficiente2 = kmCoeficiente2; - } - - public CoeficienteTarifa getCoeficienteTarifa3() { - return coeficienteTarifa3; - } - - public void setCoeficienteTarifa3(CoeficienteTarifa coeficienteTarifa3) { - this.coeficienteTarifa3 = coeficienteTarifa3; - } - - public BigDecimal getKmCoeficiente3() { - return kmCoeficiente3; - } - - public void setKmCoeficiente3(BigDecimal kmCoeficiente3) { - this.kmCoeficiente3 = kmCoeficiente3; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((orgaoTramoId == null) ? 0 : orgaoTramoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - OrgaoTramo other = (OrgaoTramo) obj; - if (orgaoTramoId == null) { - if (other.orgaoTramoId != null) - return false; - } else if (!orgaoTramoId.equals(other.orgaoTramoId)) - return false; - return true; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "ORGAO_TRAMO_SEQ", sequenceName = "ORGAO_TRAMO_SEQ", allocationSize = 1) +@Table(name = "ORGAO_TRAMO") +public class OrgaoTramo implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "ORGAO_TRAMO_SEQ") + @Basic(optional = false) + @Column(name = "ORGAOTRAMO_ID") + private Integer orgaoTramoId; + @OneToOne + @JoinColumn(name = "TRAMO_ID") + private Tramo tramo; + @OneToOne + @JoinColumn(name = "COEFICIENTETARIFA1_ID") + private CoeficienteTarifa coeficienteTarifa1; + @Column(name = "KMCOEFICIENTE1") + private BigDecimal kmCoeficiente1; + @OneToOne + @JoinColumn(name = "COEFICIENTETARIFA2_ID") + private CoeficienteTarifa coeficienteTarifa2; + @Column(name = "KMCOEFICIENTE2") + private BigDecimal kmCoeficiente2; + @OneToOne + @JoinColumn(name = "COEFICIENTETARIFA3_ID") + private CoeficienteTarifa coeficienteTarifa3; + @Column(name = "KMCOEFICIENTE3") + private BigDecimal kmCoeficiente3; + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + @OneToOne + @JoinColumn(name = "CLASESERVICIO_ID") + private ClaseServicio claseServicio; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getOrgaoTramoId() { + return orgaoTramoId; + } + + public void setOrgaoTramoId(Integer orgaoTramoId) { + this.orgaoTramoId = orgaoTramoId; + } + + public Tramo getTramo() { + return tramo; + } + + public void setTramo(Tramo tramo) { + this.tramo = tramo; + } + + public CoeficienteTarifa getCoeficienteTarifa1() { + return coeficienteTarifa1; + } + + public void setCoeficienteTarifa1(CoeficienteTarifa coeficienteTarifa1) { + this.coeficienteTarifa1 = coeficienteTarifa1; + } + + public BigDecimal getKmCoeficiente1() { + return kmCoeficiente1; + } + + public void setKmCoeficiente1(BigDecimal kmCoeficiente1) { + this.kmCoeficiente1 = kmCoeficiente1; + } + + public CoeficienteTarifa getCoeficienteTarifa2() { + return coeficienteTarifa2; + } + + public void setCoeficienteTarifa2(CoeficienteTarifa coeficienteTarifa2) { + this.coeficienteTarifa2 = coeficienteTarifa2; + } + + public BigDecimal getKmCoeficiente2() { + return kmCoeficiente2; + } + + public void setKmCoeficiente2(BigDecimal kmCoeficiente2) { + this.kmCoeficiente2 = kmCoeficiente2; + } + + public CoeficienteTarifa getCoeficienteTarifa3() { + return coeficienteTarifa3; + } + + public void setCoeficienteTarifa3(CoeficienteTarifa coeficienteTarifa3) { + this.coeficienteTarifa3 = coeficienteTarifa3; + } + + public BigDecimal getKmCoeficiente3() { + return kmCoeficiente3; + } + + public void setKmCoeficiente3(BigDecimal kmCoeficiente3) { + this.kmCoeficiente3 = kmCoeficiente3; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((orgaoTramoId == null) ? 0 : orgaoTramoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + OrgaoTramo other = (OrgaoTramo) obj; + if (orgaoTramoId == null) { + if (other.orgaoTramoId != null) + return false; + } else if (!orgaoTramoId.equals(other.orgaoTramoId)) + return false; + return true; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Pacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pacote.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Pacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pacote.java index 403901c11..1b3d0411d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Pacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pacote.java @@ -1,219 +1,219 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "PACOTE") -@SequenceGenerator(name = "PACOTE_SEQ", sequenceName = "PACOTE_SEQ", allocationSize = 1) -public class Pacote implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_SEQ") - @Column(name = "PACOTE_ID") - private Integer pacoteId; - @Column(name = "NOMPACOTE") - private String nompacote; - @Column(name = "DESCPACOTE") - private String descpacote; - @Column(name = "INDVENDAAGENCIA") - private Boolean indvendaagencia; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @ManyToMany - @JoinTable(name = "PACOTE_ITEM", joinColumns = { @JoinColumn(name = "PACOTE_ID") }, - inverseJoinColumns = { @JoinColumn(name = "ITEMADICIONAL_ID") }) - private List itemAdicionalList; - - @ManyToMany - @JoinTable(name = "PACOTE_TARIFA", joinColumns = { @JoinColumn(name = "PACOTE_ID") }, - inverseJoinColumns = { @JoinColumn(name = "TIPOTARIFAPACOTE_ID") }) - private List tipoTarifaPacoteList; - - public Pacote() { - super(); - } - - public Pacote(Integer pacoteId, String nompacote) { - this(); - this.pacoteId = pacoteId; - this.nompacote = nompacote; - } - - public Pacote(Integer pacoteId, String nompacote, String descpacote, Boolean indvendaagencia, Boolean activo, Date fecmodif, Integer usuarioId, Ruta ruta) { - this(); - this.pacoteId = pacoteId; - this.nompacote = nompacote; - this.descpacote = descpacote; - this.indvendaagencia = indvendaagencia; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.ruta = ruta; - } - - public Integer getPacoteId() { - return pacoteId; - } - - public void setPacoteId(Integer pacoteId) { - this.pacoteId = pacoteId; - } - - public String getNompacote() { - return nompacote; - } - - public void setNompacote(String nompacote) { - this.nompacote = nompacote; - } - - public String getDescpacote() { - return descpacote; - } - - public void setDescpacote(String descpacote) { - this.descpacote = descpacote; - } - - public Boolean getIndvendaagencia() { - return indvendaagencia; - } - - public void setIndvendaagencia(Boolean indvendaagencia) { - this.indvendaagencia = indvendaagencia; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public List getItemAdicionalList() { - if (this.itemAdicionalList == null || this.itemAdicionalList.isEmpty()) - return new ArrayList(); - - List aux = new ArrayList(); - for (ItemAdicional item : this.itemAdicionalList) { - if (item.getActivo()) - aux.add(item); - } - return aux; - } - - public void setItemAdicionalList(List itemAdicionalList) { - this.itemAdicionalList = itemAdicionalList; - } - - public List getTipoTarifaPacoteList() { - if (this.tipoTarifaPacoteList == null || this.tipoTarifaPacoteList.isEmpty()) - return new ArrayList(); - - List aux = new ArrayList(); - for (TipoTarifaPacote item : this.tipoTarifaPacoteList) { - if (item.getActivo()) - aux.add(item); - } - return aux; - } - - public void setTipoTarifaPacoteList(List tipoTarifaPacoteList) { - this.tipoTarifaPacoteList = tipoTarifaPacoteList; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((pacoteId == null) ? 0 : pacoteId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Pacote other = (Pacote) obj; - if (pacoteId == null) { - if (other.pacoteId != null) - return false; - } else if (!pacoteId.equals(other.pacoteId)) - return false; - return true; - } - - @Override - public String toString() { - return this.getNompacote(); - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "PACOTE") +@SequenceGenerator(name = "PACOTE_SEQ", sequenceName = "PACOTE_SEQ", allocationSize = 1) +public class Pacote implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_SEQ") + @Column(name = "PACOTE_ID") + private Integer pacoteId; + @Column(name = "NOMPACOTE") + private String nompacote; + @Column(name = "DESCPACOTE") + private String descpacote; + @Column(name = "INDVENDAAGENCIA") + private Boolean indvendaagencia; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @ManyToMany + @JoinTable(name = "PACOTE_ITEM", joinColumns = { @JoinColumn(name = "PACOTE_ID") }, + inverseJoinColumns = { @JoinColumn(name = "ITEMADICIONAL_ID") }) + private List itemAdicionalList; + + @ManyToMany + @JoinTable(name = "PACOTE_TARIFA", joinColumns = { @JoinColumn(name = "PACOTE_ID") }, + inverseJoinColumns = { @JoinColumn(name = "TIPOTARIFAPACOTE_ID") }) + private List tipoTarifaPacoteList; + + public Pacote() { + super(); + } + + public Pacote(Integer pacoteId, String nompacote) { + this(); + this.pacoteId = pacoteId; + this.nompacote = nompacote; + } + + public Pacote(Integer pacoteId, String nompacote, String descpacote, Boolean indvendaagencia, Boolean activo, Date fecmodif, Integer usuarioId, Ruta ruta) { + this(); + this.pacoteId = pacoteId; + this.nompacote = nompacote; + this.descpacote = descpacote; + this.indvendaagencia = indvendaagencia; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.ruta = ruta; + } + + public Integer getPacoteId() { + return pacoteId; + } + + public void setPacoteId(Integer pacoteId) { + this.pacoteId = pacoteId; + } + + public String getNompacote() { + return nompacote; + } + + public void setNompacote(String nompacote) { + this.nompacote = nompacote; + } + + public String getDescpacote() { + return descpacote; + } + + public void setDescpacote(String descpacote) { + this.descpacote = descpacote; + } + + public Boolean getIndvendaagencia() { + return indvendaagencia; + } + + public void setIndvendaagencia(Boolean indvendaagencia) { + this.indvendaagencia = indvendaagencia; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public List getItemAdicionalList() { + if (this.itemAdicionalList == null || this.itemAdicionalList.isEmpty()) + return new ArrayList(); + + List aux = new ArrayList(); + for (ItemAdicional item : this.itemAdicionalList) { + if (item.getActivo()) + aux.add(item); + } + return aux; + } + + public void setItemAdicionalList(List itemAdicionalList) { + this.itemAdicionalList = itemAdicionalList; + } + + public List getTipoTarifaPacoteList() { + if (this.tipoTarifaPacoteList == null || this.tipoTarifaPacoteList.isEmpty()) + return new ArrayList(); + + List aux = new ArrayList(); + for (TipoTarifaPacote item : this.tipoTarifaPacoteList) { + if (item.getActivo()) + aux.add(item); + } + return aux; + } + + public void setTipoTarifaPacoteList(List tipoTarifaPacoteList) { + this.tipoTarifaPacoteList = tipoTarifaPacoteList; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((pacoteId == null) ? 0 : pacoteId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Pacote other = (Pacote) obj; + if (pacoteId == null) { + if (other.pacoteId != null) + return false; + } else if (!pacoteId.equals(other.pacoteId)) + return false; + return true; + } + + @Override + public String toString() { + return this.getNompacote(); + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PacoteConvenio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteConvenio.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PacoteConvenio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteConvenio.java index fda565adc..d887689d7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PacoteConvenio.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteConvenio.java @@ -1,88 +1,88 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "PACOTE_CONVENIO") -@SequenceGenerator(name = "PACOTE_CONVENIO_SEQ", sequenceName = "PACOTE_CONVENIO_SEQ", allocationSize = 1) -public class PacoteConvenio implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_CONVENIO_SEQ") - @Column(name = "PACOTECONVENIO_ID") - private Long pacoteconvenioId; - - @Column(name = "NOMCONVENIO") - private String nomconvenio; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.DATE) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getPacoteconvenioId() { - return pacoteconvenioId; - } - - public void setPacoteconvenioId(Long pacoteconvenioId) { - this.pacoteconvenioId = pacoteconvenioId; - } - - public String getNomconvenio() { - return nomconvenio; - } - - public void setNomconvenio(String nomconvenio) { - this.nomconvenio = nomconvenio; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return getNomconvenio(); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "PACOTE_CONVENIO") +@SequenceGenerator(name = "PACOTE_CONVENIO_SEQ", sequenceName = "PACOTE_CONVENIO_SEQ", allocationSize = 1) +public class PacoteConvenio implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_CONVENIO_SEQ") + @Column(name = "PACOTECONVENIO_ID") + private Long pacoteconvenioId; + + @Column(name = "NOMCONVENIO") + private String nomconvenio; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.DATE) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getPacoteconvenioId() { + return pacoteconvenioId; + } + + public void setPacoteconvenioId(Long pacoteconvenioId) { + this.pacoteconvenioId = pacoteconvenioId; + } + + public String getNomconvenio() { + return nomconvenio; + } + + public void setNomconvenio(String nomconvenio) { + this.nomconvenio = nomconvenio; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return getNomconvenio(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PacoteDescontoBilhete.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteDescontoBilhete.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PacoteDescontoBilhete.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteDescontoBilhete.java index b4d805012..39d3dd0d5 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PacoteDescontoBilhete.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteDescontoBilhete.java @@ -1,108 +1,108 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "PACOTE_DESCONTO_BILHETE") -@SequenceGenerator(name = "PACOTE_DESCONTO_BILHETE_SEQ", sequenceName = "PACOTE_DESCONTO_BILHETE_SEQ", allocationSize = 1) -public class PacoteDescontoBilhete implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "PACOTEDESCONTOBILHETE_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_DESCONTO_BILHETE_SEQ") - private Long pacotedescontobilheteId; - - @Column(name = "PERCDESCONTO") - private BigDecimal percdesconto; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - @ManyToOne - @JoinColumn(name = "PACOTE_ID") - private Pacote pacote; - - @ManyToOne - @JoinColumn(name = "CLASESERVICIO_ID") - private ClaseServicio claseServicio; - - public Long getPacotedescontobilheteId() { - return pacotedescontobilheteId; - } - - public void setPacotedescontobilheteId(Long pacotedescontobilheteId) { - this.pacotedescontobilheteId = pacotedescontobilheteId; - } - - public BigDecimal getPercdesconto() { - return percdesconto; - } - - public void setPercdesconto(BigDecimal percdesconto) { - this.percdesconto = percdesconto; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Pacote getPacote() { - return pacote; - } - - public void setPacote(Pacote pacote) { - this.pacote = pacote; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "PACOTE_DESCONTO_BILHETE") +@SequenceGenerator(name = "PACOTE_DESCONTO_BILHETE_SEQ", sequenceName = "PACOTE_DESCONTO_BILHETE_SEQ", allocationSize = 1) +public class PacoteDescontoBilhete implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "PACOTEDESCONTOBILHETE_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_DESCONTO_BILHETE_SEQ") + private Long pacotedescontobilheteId; + + @Column(name = "PERCDESCONTO") + private BigDecimal percdesconto; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + @ManyToOne + @JoinColumn(name = "PACOTE_ID") + private Pacote pacote; + + @ManyToOne + @JoinColumn(name = "CLASESERVICIO_ID") + private ClaseServicio claseServicio; + + public Long getPacotedescontobilheteId() { + return pacotedescontobilheteId; + } + + public void setPacotedescontobilheteId(Long pacotedescontobilheteId) { + this.pacotedescontobilheteId = pacotedescontobilheteId; + } + + public BigDecimal getPercdesconto() { + return percdesconto; + } + + public void setPercdesconto(BigDecimal percdesconto) { + this.percdesconto = percdesconto; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Pacote getPacote() { + return pacote; + } + + public void setPacote(Pacote pacote) { + this.pacote = pacote; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PacoteFormapago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteFormapago.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PacoteFormapago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteFormapago.java index 19a6b287e..fa3f2d08b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PacoteFormapago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteFormapago.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "PACOTE_FORMAPAGO_SEQ", sequenceName = "PACOTE_FORMAPAGO_SEQ", allocationSize = 1) -@Table(name = "PACOTE_FORMAPAGO") -public class PacoteFormapago implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "PACOTEFORMAPAGO_ID") - private Long pacoteformapagoId; - - @Column(name = "VALOR") - private BigDecimal valor; - - @ManyToOne - @JoinColumn(name = "VENDAPACOTE_ID") - private VendaPacote vendaPacote; - - @ManyToOne - @JoinColumn(name = "FORMAPAGO_ID") - private FormaPago formaPago; - - public Long getPacoteformapagoId() { - return pacoteformapagoId; - } - - public void setPacoteformapagoId(Long pacoteformapagoId) { - this.pacoteformapagoId = pacoteformapagoId; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public VendaPacote getVendaPacote() { - return vendaPacote; - } - - public void setVendaPacote(VendaPacote vendaPacote) { - this.vendaPacote = vendaPacote; - } - - public FormaPago getFormaPago() { - return formaPago; - } - - public void setFormaPago(FormaPago formaPago) { - this.formaPago = formaPago; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "PACOTE_FORMAPAGO_SEQ", sequenceName = "PACOTE_FORMAPAGO_SEQ", allocationSize = 1) +@Table(name = "PACOTE_FORMAPAGO") +public class PacoteFormapago implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "PACOTEFORMAPAGO_ID") + private Long pacoteformapagoId; + + @Column(name = "VALOR") + private BigDecimal valor; + + @ManyToOne + @JoinColumn(name = "VENDAPACOTE_ID") + private VendaPacote vendaPacote; + + @ManyToOne + @JoinColumn(name = "FORMAPAGO_ID") + private FormaPago formaPago; + + public Long getPacoteformapagoId() { + return pacoteformapagoId; + } + + public void setPacoteformapagoId(Long pacoteformapagoId) { + this.pacoteformapagoId = pacoteformapagoId; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public VendaPacote getVendaPacote() { + return vendaPacote; + } + + public void setVendaPacote(VendaPacote vendaPacote) { + this.vendaPacote = vendaPacote; + } + + public FormaPago getFormaPago() { + return formaPago; + } + + public void setFormaPago(FormaPago formaPago) { + this.formaPago = formaPago; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PacoteItem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteItem.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PacoteItem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteItem.java index f501de97f..fb3c3edbe 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PacoteItem.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteItem.java @@ -1,126 +1,126 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "PACOTE_ITEM") -@SequenceGenerator(name = "PACOTE_ITEM_SEQ", sequenceName = "PACOTE_ITEM_SEQ", allocationSize = 1) -public class PacoteItem implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_ITEM_SEQ") - @Column(name = "PACOTEITEM_ID") - private Integer pacoteItemId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PACOTE_ID", referencedColumnName = "PACOTE_ID") - @ManyToOne - private Pacote pacote; - @JoinColumn(name = "ITEMADICIONAL_ID", referencedColumnName = "ITEMADICIONAL_ID") - @ManyToOne - private ItemAdicional itemAdicional; - - public PacoteItem() { - super(); - } - - public Integer getPacoteItemId() { - return pacoteItemId; - } - - public void setPacoteItemId(Integer pacoteItemId) { - this.pacoteItemId = pacoteItemId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((pacoteItemId == null) ? 0 : pacoteItemId.hashCode()); - return result; - } - - public Pacote getPacote() { - return pacote; - } - - public void setPacote(Pacote pacote) { - this.pacote = pacote; - } - - public ItemAdicional getItemAdicional() { - return itemAdicional; - } - - public void setItemAdicional(ItemAdicional itemAdicional) { - this.itemAdicional = itemAdicional; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PacoteItem other = (PacoteItem) obj; - if (pacoteItemId == null) { - if (other.pacoteItemId != null) - return false; - } else if (!pacoteItemId.equals(other.pacoteItemId)) - return false; - return true; - } - - @Override - public String toString() { - return "PacoteItem [pacoteItemId=" + pacoteItemId + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pacoteId=" + pacote + ", itemadicionalId=" + itemAdicional + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "PACOTE_ITEM") +@SequenceGenerator(name = "PACOTE_ITEM_SEQ", sequenceName = "PACOTE_ITEM_SEQ", allocationSize = 1) +public class PacoteItem implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_ITEM_SEQ") + @Column(name = "PACOTEITEM_ID") + private Integer pacoteItemId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PACOTE_ID", referencedColumnName = "PACOTE_ID") + @ManyToOne + private Pacote pacote; + @JoinColumn(name = "ITEMADICIONAL_ID", referencedColumnName = "ITEMADICIONAL_ID") + @ManyToOne + private ItemAdicional itemAdicional; + + public PacoteItem() { + super(); + } + + public Integer getPacoteItemId() { + return pacoteItemId; + } + + public void setPacoteItemId(Integer pacoteItemId) { + this.pacoteItemId = pacoteItemId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((pacoteItemId == null) ? 0 : pacoteItemId.hashCode()); + return result; + } + + public Pacote getPacote() { + return pacote; + } + + public void setPacote(Pacote pacote) { + this.pacote = pacote; + } + + public ItemAdicional getItemAdicional() { + return itemAdicional; + } + + public void setItemAdicional(ItemAdicional itemAdicional) { + this.itemAdicional = itemAdicional; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PacoteItem other = (PacoteItem) obj; + if (pacoteItemId == null) { + if (other.pacoteItemId != null) + return false; + } else if (!pacoteItemId.equals(other.pacoteItemId)) + return false; + return true; + } + + @Override + public String toString() { + return "PacoteItem [pacoteItemId=" + pacoteItemId + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pacoteId=" + pacote + ", itemadicionalId=" + itemAdicional + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PacoteTarifa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteTarifa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PacoteTarifa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteTarifa.java index 4ab3441a6..8a3ac297f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PacoteTarifa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PacoteTarifa.java @@ -1,167 +1,167 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "PACOTE_TARIFA") -@SequenceGenerator(name = "PACOTE_TARIFA_SEQ", sequenceName = "PACOTE_TARIFA_SEQ", allocationSize = 1) -public class PacoteTarifa implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_TARIFA_SEQ") - @Column(name = "PACOTETARIFA_ID ") - private Integer pacotetarifaId; - @Column(name = "TARIFA") - private BigDecimal tarifa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PACOTE_ID", referencedColumnName = "PACOTE_ID") - @ManyToOne - private Pacote pacote; - @JoinColumn(name = "TIPOTARIFAPACOTE_ID", referencedColumnName = "TIPOTARIFAPACOTE_ID") - @ManyToOne - private TipoTarifaPacote tipoTarifaPacote; - @Column(name = "INDVENDAWEB") - private Boolean indvendaweb; - @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") - @ManyToOne - private Categoria categoria; - - - public PacoteTarifa() { - super(); - } - - public PacoteTarifa(Integer pacotetarifaId, Boolean activo, Date fecmodif, Integer usuarioId) { - super(); - this.pacotetarifaId = pacotetarifaId; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getPacotetarifaId() { - return pacotetarifaId; - } - - public void setPacotetarifaId(Integer pacotetarifaId) { - this.pacotetarifaId = pacotetarifaId; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Pacote getPacote() { - return pacote; - } - - public void setPacote(Pacote pacote) { - this.pacote = pacote; - } - - public TipoTarifaPacote getTipoTarifaPacote() { - return tipoTarifaPacote; - } - - public void setTipoTarifaPacote(TipoTarifaPacote tipoTarifaPacote) { - this.tipoTarifaPacote = tipoTarifaPacote; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((pacotetarifaId == null) ? 0 : pacotetarifaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof PacoteTarifa)) - return false; - PacoteTarifa other = (PacoteTarifa) obj; - if (pacotetarifaId == null) { - if (other.pacotetarifaId != null) - return false; - } else if (!pacotetarifaId.equals(other.pacotetarifaId)) - return false; - return true; - } - - @Override - public String toString() { - return "PacoteTarifa [pacotetarifaId=" + pacotetarifaId + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pacote=" + pacote + ", tipoTarifaPacote=" + tipoTarifaPacote + "]"; - } - - public Boolean getIndvendaweb() { - return indvendaweb; - } - - public void setIndvendaweb(Boolean indvendaweb) { - this.indvendaweb = indvendaweb; - } - - public Categoria getCategoria() { - return categoria; - } - - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "PACOTE_TARIFA") +@SequenceGenerator(name = "PACOTE_TARIFA_SEQ", sequenceName = "PACOTE_TARIFA_SEQ", allocationSize = 1) +public class PacoteTarifa implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PACOTE_TARIFA_SEQ") + @Column(name = "PACOTETARIFA_ID ") + private Integer pacotetarifaId; + @Column(name = "TARIFA") + private BigDecimal tarifa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PACOTE_ID", referencedColumnName = "PACOTE_ID") + @ManyToOne + private Pacote pacote; + @JoinColumn(name = "TIPOTARIFAPACOTE_ID", referencedColumnName = "TIPOTARIFAPACOTE_ID") + @ManyToOne + private TipoTarifaPacote tipoTarifaPacote; + @Column(name = "INDVENDAWEB") + private Boolean indvendaweb; + @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") + @ManyToOne + private Categoria categoria; + + + public PacoteTarifa() { + super(); + } + + public PacoteTarifa(Integer pacotetarifaId, Boolean activo, Date fecmodif, Integer usuarioId) { + super(); + this.pacotetarifaId = pacotetarifaId; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getPacotetarifaId() { + return pacotetarifaId; + } + + public void setPacotetarifaId(Integer pacotetarifaId) { + this.pacotetarifaId = pacotetarifaId; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Pacote getPacote() { + return pacote; + } + + public void setPacote(Pacote pacote) { + this.pacote = pacote; + } + + public TipoTarifaPacote getTipoTarifaPacote() { + return tipoTarifaPacote; + } + + public void setTipoTarifaPacote(TipoTarifaPacote tipoTarifaPacote) { + this.tipoTarifaPacote = tipoTarifaPacote; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((pacotetarifaId == null) ? 0 : pacotetarifaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof PacoteTarifa)) + return false; + PacoteTarifa other = (PacoteTarifa) obj; + if (pacotetarifaId == null) { + if (other.pacotetarifaId != null) + return false; + } else if (!pacotetarifaId.equals(other.pacotetarifaId)) + return false; + return true; + } + + @Override + public String toString() { + return "PacoteTarifa [pacotetarifaId=" + pacotetarifaId + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pacote=" + pacote + ", tipoTarifaPacote=" + tipoTarifaPacote + "]"; + } + + public Boolean getIndvendaweb() { + return indvendaweb; + } + + public void setIndvendaweb(Boolean indvendaweb) { + this.indvendaweb = indvendaweb; + } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Pais.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pais.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Pais.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pais.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Parada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Parada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Parada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Parada.java index b9d1cc0e1..c705c0061 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Parada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Parada.java @@ -1,468 +1,468 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; - -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Administrador - */ -@Entity -@SequenceGenerator(name = "PARADA_SEQ", sequenceName = "PARADA_SEQ", allocationSize = 1) -@Table(name = "PARADA") -public class Parada implements Serializable, Auditavel { - public static Integer ID_PARADA_TODOS = -1; - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_SEQ") - @Column(name = "PARADA_ID") - private Integer paradaId; - @Basic(optional = false) - @Column(name = "DESCPARADA") - private String descparada; - @Column(name = "CVEPARADA") - private String cveparada; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToOne - @JoinColumn(name = "CIUDAD_ID") - private Ciudad ciudad; - @OneToOne - @JoinColumn(name = "TIPOPARADA_ID") - private TipoParada tipoParada; - @OneToMany(mappedBy = "origem") - private List corridaList; - @OneToMany(mappedBy = "destino") - private List corridaList1; - @OneToMany(mappedBy = "paradaOrigem") - private List reservacionMercadoList; - @OneToMany(mappedBy = "paradaDestino") - private List reservacionMercadoList1; - @OneToMany(mappedBy = "destino") - private List categoriaMercadoDestinoList; - @OneToMany(mappedBy = "origem") - private List categoriaMercadoOrigemList; - @OneToOne - @JoinColumn(name = "NODO_ID") - private Nodo nodo; - @OneToMany(mappedBy = "origem") - private List tramoOrigemList; - @OneToMany(mappedBy = "destino") - private List tramoDestinoList; - @Column(name = "CODANTT") - private Integer codantt; - @Column(name = "CODANTTAUX") - private Integer codanttaux; - @Column(name = "DESCPROCON") - private String descProcon; - @Column(name="INDVENDETOTEM") - private Boolean indVendeTotem; - @Column(name="INDVISIBLEINTERNET") - private Boolean indVisibleInternet; - @OneToOne - @JoinColumn(name = "AGRUPAMENTOPARADA_ID") - private AgrupamentoParada agrupamentoParada; - - @ManyToOne - @JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID") - private RegionMetropolitana regionMetropolitana; - - @OneToMany(mappedBy = "parada", fetch = FetchType.EAGER, cascade = javax.persistence.CascadeType.ALL) - @Fetch(value = FetchMode.SUBSELECT) - private List codigosOrgaosConcedentes = new ArrayList(); - - @Column(name="INDINTEGRACAOW2I") - private Boolean indIntegracaoW2i; - - @Column(name="INDDISPONIBLETOTALBUS") - private Boolean indDisponibleTotalBus; - - @Column(name="CODSIGMA") - private String codSigma; - - @Transient - @NaoAuditar - private Parada paradaClone; - - @Transient - @NaoAuditar - Boolean isParadaConexaoRutaExcluida; - - @Column(name="latitude") - private BigDecimal latitude; - - @Column(name="longitude") - private BigDecimal longitude; - - @OneToOne - @JoinColumn(name = "IMPRESIONLAYOUTCONFIG_ID") - private ImpresionLayoutConfig impresionLayoutConfig; - - - public Boolean getIsParadaConexaoRutaExcluida() { - return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida; - } - - public void setIsParadaConexaoRutaExcluida(Boolean isParadaConexaoRutaExcluida) { - this.isParadaConexaoRutaExcluida = isParadaConexaoRutaExcluida; - } - - public Parada() { - super(); - } - - public Parada(Integer paradaId) { - this(); - - this.paradaId = paradaId; - } - - public Parada(Integer paradaId, String cveparada, String descparada) { - this(paradaId); - this.cveparada = cveparada; - this.descparada = descparada; - } - - public List getCategoriaMercadoDestinoList() { - return categoriaMercadoDestinoList; - } - - public void setCategoriaMercadoDestinoList(List categoriaMercadoDestinoList) { - this.categoriaMercadoDestinoList = categoriaMercadoDestinoList; - } - - public List getCategoriaMercadoOrigemList() { - return categoriaMercadoOrigemList; - } - - public void setCategoriaMercadoOrigemList(List categoriaMercadoOrigemList) { - this.categoriaMercadoOrigemList = categoriaMercadoOrigemList; - } - - public String getDescparada() { - return descparada; - } - - public void setDescparada(String descparada) { - this.descparada = descparada; - } - - public Integer getParadaId() { - return paradaId; - } - - public void setParadaId(Integer paradaId) { - this.paradaId = paradaId; - } - - public List getReservacionMercadoList() { - return reservacionMercadoList; - } - - public void setReservacionMercadoList(List reservacionMercadoList) { - this.reservacionMercadoList = reservacionMercadoList; - } - - public List getReservacionMercadoList1() { - return reservacionMercadoList1; - } - - public void setReservacionMercadoList1(List reservacionMercadoList1) { - this.reservacionMercadoList1 = reservacionMercadoList1; - } - - public String getCveparada() { - return cveparada; - } - - public void setCveparada(String cveparada) { - this.cveparada = cveparada; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getCorridaList() { - return corridaList; - } - - public void setCorridaList(List corridaList) { - this.corridaList = corridaList; - } - - public List getCorridaList1() { - return corridaList1; - } - - public void setCorridaList1(List corridaList1) { - this.corridaList1 = corridaList1; - } - - public List getTramoDestinoList() { - return tramoDestinoList; - } - - public void setTramoDestinoList(List tramoDestinoList) { - this.tramoDestinoList = tramoDestinoList; - } - - public List getTramoOrigemList() { - return tramoOrigemList; - } - - public void setTramoOrigemList(List tramoOrigemList) { - this.tramoOrigemList = tramoOrigemList; - } - - public Ciudad getCiudad() { - return ciudad; - } - - public void setCiudad(Ciudad ciudad) { - this.ciudad = ciudad; - } - - public TipoParada getTipoParada() { - return tipoParada; - } - - public void setTipoParada(TipoParada tipoParada) { - this.tipoParada = tipoParada; - } - - public Nodo getNodo() { - return nodo; - } - - public void setNodo(Nodo nodo) { - this.nodo = nodo; - } - - public Integer getCodantt() { - return codantt; - } - - public void setCodantt(Integer codantt) { - this.codantt = codantt; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (getParadaId() != null ? getParadaId().hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof Parada)) { - return false; - } - Parada other = (Parada) object; - if ((this.getParadaId() == null && other.getParadaId() != null) || (this.getParadaId() != null && this.getParadaId().intValue() != other.getParadaId().intValue())) { - return false; - } - return true; - } - - @Override - public String toString() { - return getDescparada(); - } - - public String toStringCve() { - return getCveparada(); - } - - public RegionMetropolitana getRegionMetropolitana() { - return regionMetropolitana; - } - - public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) { - this.regionMetropolitana = regionMetropolitana; - } - - public List getCodigosOrgaosConcedentes() { - return codigosOrgaosConcedentes; - } - - public void setCodigosOrgaosConcedentes(List codigosOrgaosConcedentes) { - this.codigosOrgaosConcedentes = codigosOrgaosConcedentes; - } - - public void addCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) { - this.codigosOrgaosConcedentes.add(codigo); - } - - public void removeCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) { - this.codigosOrgaosConcedentes.remove(codigo); - } - - public String getDescProcon() { - return descProcon; - } - - public void setDescProcon(String descProcon) { - this.descProcon = descProcon; - } - - public Boolean getIndVendeTotem() { - return indVendeTotem; - } - - public void setIndVendeTotem(Boolean indVendeTotem) { - this.indVendeTotem = indVendeTotem; - } - - public Integer getCodanttaux() { - return codanttaux; - } - - public void setCodanttaux(Integer codanttaux) { - this.codanttaux = codanttaux; - } - - public Boolean getIndVisibleInternet() { - return indVisibleInternet; - } - - public void setIndVisibleInternet(Boolean indVisibleInternet) { - this.indVisibleInternet = indVisibleInternet; - } - - public Boolean getIndIntegracaoW2i() { - return indIntegracaoW2i == null ? false : indIntegracaoW2i; - } - - public void setIndIntegracaoW2i(Boolean indIntegracaoW2i) { - this.indIntegracaoW2i = indIntegracaoW2i; - } - - public Boolean getIndDisponibleTotalBus() { - return indDisponibleTotalBus; - } - - public void setIndDisponibleTotalBus(Boolean indDisponibleTotalBus) { - this.indDisponibleTotalBus = indDisponibleTotalBus; - } - - public AgrupamentoParada getAgrupamentoParada() { - return agrupamentoParada; - } - - public void setAgrupamentoParada(AgrupamentoParada agrupamentoParada) { - this.agrupamentoParada = agrupamentoParada; - } - - public String getCodSigma() { - return codSigma; - } - - public void setCodSigma(String codSigma) { - this.codSigma = codSigma; - } - - @Override - public void clonar() throws CloneNotSupportedException { - paradaClone = new Parada(); - paradaClone = (Parada) this.clone(); - } - - @Override - public Parada getCloneObject() throws CloneNotSupportedException { - return paradaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("EsquemaAsientoID [%s]", getParadaId()); - } - - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - public BigDecimal getLatitude() { - return latitude; - } - - public void setLatitude(BigDecimal latitude) { - this.latitude = latitude; - } - - public BigDecimal getLongitude() { - return longitude; - } - - public void setLongitude(BigDecimal longitude) { - this.longitude = longitude; - } - - public ImpresionLayoutConfig getImpresionLayoutConfig() { - return impresionLayoutConfig; - } - - public void setImpresionLayoutConfig(ImpresionLayoutConfig impresionLayoutConfig) { - this.impresionLayoutConfig = impresionLayoutConfig; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; + +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Administrador + */ +@Entity +@SequenceGenerator(name = "PARADA_SEQ", sequenceName = "PARADA_SEQ", allocationSize = 1) +@Table(name = "PARADA") +public class Parada implements Serializable, Auditavel { + public static Integer ID_PARADA_TODOS = -1; + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_SEQ") + @Column(name = "PARADA_ID") + private Integer paradaId; + @Basic(optional = false) + @Column(name = "DESCPARADA") + private String descparada; + @Column(name = "CVEPARADA") + private String cveparada; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToOne + @JoinColumn(name = "CIUDAD_ID") + private Ciudad ciudad; + @OneToOne + @JoinColumn(name = "TIPOPARADA_ID") + private TipoParada tipoParada; + @OneToMany(mappedBy = "origem") + private List corridaList; + @OneToMany(mappedBy = "destino") + private List corridaList1; + @OneToMany(mappedBy = "paradaOrigem") + private List reservacionMercadoList; + @OneToMany(mappedBy = "paradaDestino") + private List reservacionMercadoList1; + @OneToMany(mappedBy = "destino") + private List categoriaMercadoDestinoList; + @OneToMany(mappedBy = "origem") + private List categoriaMercadoOrigemList; + @OneToOne + @JoinColumn(name = "NODO_ID") + private Nodo nodo; + @OneToMany(mappedBy = "origem") + private List tramoOrigemList; + @OneToMany(mappedBy = "destino") + private List tramoDestinoList; + @Column(name = "CODANTT") + private Integer codantt; + @Column(name = "CODANTTAUX") + private Integer codanttaux; + @Column(name = "DESCPROCON") + private String descProcon; + @Column(name="INDVENDETOTEM") + private Boolean indVendeTotem; + @Column(name="INDVISIBLEINTERNET") + private Boolean indVisibleInternet; + @OneToOne + @JoinColumn(name = "AGRUPAMENTOPARADA_ID") + private AgrupamentoParada agrupamentoParada; + + @ManyToOne + @JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID") + private RegionMetropolitana regionMetropolitana; + + @OneToMany(mappedBy = "parada", fetch = FetchType.EAGER, cascade = javax.persistence.CascadeType.ALL) + @Fetch(value = FetchMode.SUBSELECT) + private List codigosOrgaosConcedentes = new ArrayList(); + + @Column(name="INDINTEGRACAOW2I") + private Boolean indIntegracaoW2i; + + @Column(name="INDDISPONIBLETOTALBUS") + private Boolean indDisponibleTotalBus; + + @Column(name="CODSIGMA") + private String codSigma; + + @Transient + @NaoAuditar + private Parada paradaClone; + + @Transient + @NaoAuditar + Boolean isParadaConexaoRutaExcluida; + + @Column(name="latitude") + private BigDecimal latitude; + + @Column(name="longitude") + private BigDecimal longitude; + + @OneToOne + @JoinColumn(name = "IMPRESIONLAYOUTCONFIG_ID") + private ImpresionLayoutConfig impresionLayoutConfig; + + + public Boolean getIsParadaConexaoRutaExcluida() { + return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida; + } + + public void setIsParadaConexaoRutaExcluida(Boolean isParadaConexaoRutaExcluida) { + this.isParadaConexaoRutaExcluida = isParadaConexaoRutaExcluida; + } + + public Parada() { + super(); + } + + public Parada(Integer paradaId) { + this(); + + this.paradaId = paradaId; + } + + public Parada(Integer paradaId, String cveparada, String descparada) { + this(paradaId); + this.cveparada = cveparada; + this.descparada = descparada; + } + + public List getCategoriaMercadoDestinoList() { + return categoriaMercadoDestinoList; + } + + public void setCategoriaMercadoDestinoList(List categoriaMercadoDestinoList) { + this.categoriaMercadoDestinoList = categoriaMercadoDestinoList; + } + + public List getCategoriaMercadoOrigemList() { + return categoriaMercadoOrigemList; + } + + public void setCategoriaMercadoOrigemList(List categoriaMercadoOrigemList) { + this.categoriaMercadoOrigemList = categoriaMercadoOrigemList; + } + + public String getDescparada() { + return descparada; + } + + public void setDescparada(String descparada) { + this.descparada = descparada; + } + + public Integer getParadaId() { + return paradaId; + } + + public void setParadaId(Integer paradaId) { + this.paradaId = paradaId; + } + + public List getReservacionMercadoList() { + return reservacionMercadoList; + } + + public void setReservacionMercadoList(List reservacionMercadoList) { + this.reservacionMercadoList = reservacionMercadoList; + } + + public List getReservacionMercadoList1() { + return reservacionMercadoList1; + } + + public void setReservacionMercadoList1(List reservacionMercadoList1) { + this.reservacionMercadoList1 = reservacionMercadoList1; + } + + public String getCveparada() { + return cveparada; + } + + public void setCveparada(String cveparada) { + this.cveparada = cveparada; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getCorridaList() { + return corridaList; + } + + public void setCorridaList(List corridaList) { + this.corridaList = corridaList; + } + + public List getCorridaList1() { + return corridaList1; + } + + public void setCorridaList1(List corridaList1) { + this.corridaList1 = corridaList1; + } + + public List getTramoDestinoList() { + return tramoDestinoList; + } + + public void setTramoDestinoList(List tramoDestinoList) { + this.tramoDestinoList = tramoDestinoList; + } + + public List getTramoOrigemList() { + return tramoOrigemList; + } + + public void setTramoOrigemList(List tramoOrigemList) { + this.tramoOrigemList = tramoOrigemList; + } + + public Ciudad getCiudad() { + return ciudad; + } + + public void setCiudad(Ciudad ciudad) { + this.ciudad = ciudad; + } + + public TipoParada getTipoParada() { + return tipoParada; + } + + public void setTipoParada(TipoParada tipoParada) { + this.tipoParada = tipoParada; + } + + public Nodo getNodo() { + return nodo; + } + + public void setNodo(Nodo nodo) { + this.nodo = nodo; + } + + public Integer getCodantt() { + return codantt; + } + + public void setCodantt(Integer codantt) { + this.codantt = codantt; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (getParadaId() != null ? getParadaId().hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof Parada)) { + return false; + } + Parada other = (Parada) object; + if ((this.getParadaId() == null && other.getParadaId() != null) || (this.getParadaId() != null && this.getParadaId().intValue() != other.getParadaId().intValue())) { + return false; + } + return true; + } + + @Override + public String toString() { + return getDescparada(); + } + + public String toStringCve() { + return getCveparada(); + } + + public RegionMetropolitana getRegionMetropolitana() { + return regionMetropolitana; + } + + public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) { + this.regionMetropolitana = regionMetropolitana; + } + + public List getCodigosOrgaosConcedentes() { + return codigosOrgaosConcedentes; + } + + public void setCodigosOrgaosConcedentes(List codigosOrgaosConcedentes) { + this.codigosOrgaosConcedentes = codigosOrgaosConcedentes; + } + + public void addCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) { + this.codigosOrgaosConcedentes.add(codigo); + } + + public void removeCodOrgaoConcedente(ParadaCodOrgaoConcedente codigo) { + this.codigosOrgaosConcedentes.remove(codigo); + } + + public String getDescProcon() { + return descProcon; + } + + public void setDescProcon(String descProcon) { + this.descProcon = descProcon; + } + + public Boolean getIndVendeTotem() { + return indVendeTotem; + } + + public void setIndVendeTotem(Boolean indVendeTotem) { + this.indVendeTotem = indVendeTotem; + } + + public Integer getCodanttaux() { + return codanttaux; + } + + public void setCodanttaux(Integer codanttaux) { + this.codanttaux = codanttaux; + } + + public Boolean getIndVisibleInternet() { + return indVisibleInternet; + } + + public void setIndVisibleInternet(Boolean indVisibleInternet) { + this.indVisibleInternet = indVisibleInternet; + } + + public Boolean getIndIntegracaoW2i() { + return indIntegracaoW2i == null ? false : indIntegracaoW2i; + } + + public void setIndIntegracaoW2i(Boolean indIntegracaoW2i) { + this.indIntegracaoW2i = indIntegracaoW2i; + } + + public Boolean getIndDisponibleTotalBus() { + return indDisponibleTotalBus; + } + + public void setIndDisponibleTotalBus(Boolean indDisponibleTotalBus) { + this.indDisponibleTotalBus = indDisponibleTotalBus; + } + + public AgrupamentoParada getAgrupamentoParada() { + return agrupamentoParada; + } + + public void setAgrupamentoParada(AgrupamentoParada agrupamentoParada) { + this.agrupamentoParada = agrupamentoParada; + } + + public String getCodSigma() { + return codSigma; + } + + public void setCodSigma(String codSigma) { + this.codSigma = codSigma; + } + + @Override + public void clonar() throws CloneNotSupportedException { + paradaClone = new Parada(); + paradaClone = (Parada) this.clone(); + } + + @Override + public Parada getCloneObject() throws CloneNotSupportedException { + return paradaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("EsquemaAsientoID [%s]", getParadaId()); + } + + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + public BigDecimal getLatitude() { + return latitude; + } + + public void setLatitude(BigDecimal latitude) { + this.latitude = latitude; + } + + public BigDecimal getLongitude() { + return longitude; + } + + public void setLongitude(BigDecimal longitude) { + this.longitude = longitude; + } + + public ImpresionLayoutConfig getImpresionLayoutConfig() { + return impresionLayoutConfig; + } + + public void setImpresionLayoutConfig(ImpresionLayoutConfig impresionLayoutConfig) { + this.impresionLayoutConfig = impresionLayoutConfig; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java index 739f0170f..3774f6a3c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaCodOrgaoConcedente.java @@ -1,81 +1,81 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "PARADA_CODORGAOCONCEDENTE_SEQ", sequenceName = "PARADA_CODORGAOCONCEDENTE_SEQ", allocationSize = 1) -@Table(name = "PARADA_COD_ORGAOCONCEDENTE") -public class ParadaCodOrgaoConcedente implements Serializable { - /** - * - */ - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_CODORGAOCONCEDENTE_SEQ") - @Column(name = "PARADACODORGAOCONCEDENTE_ID") - private Integer paradaCodOrgaoConcedenteId; - @OneToOne - @JoinColumn(name = "PARADA_ID") - private Parada parada; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoConcedente; - @Column(name = "CODIGO") - private String codigo; - public Integer getParadaCodOrgaoConcedenteId() { - return paradaCodOrgaoConcedenteId; - } - public void setParadaCodOrgaoConcedenteId(Integer paradaCodOrgaoConcedenteId) { - this.paradaCodOrgaoConcedenteId = paradaCodOrgaoConcedenteId; - } - public Parada getParada() { - return parada; - } - public void setParada(Parada parada) { - this.parada = parada; - } - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - public String getCodigo() { - return codigo; - } - public void setCodigo(String codigo) { - this.codigo = codigo; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (getParadaCodOrgaoConcedenteId() != null ? getParadaCodOrgaoConcedenteId().hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof ParadaCodOrgaoConcedente)) { - return false; - } - ParadaCodOrgaoConcedente other = (ParadaCodOrgaoConcedente) object; - if ((this.getParadaCodOrgaoConcedenteId() == null && other.getParadaCodOrgaoConcedenteId() != null) || (this.getParadaCodOrgaoConcedenteId() != null && !this.getParadaCodOrgaoConcedenteId().equals(other.getParadaCodOrgaoConcedenteId()))) { - return false; - } - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "PARADA_CODORGAOCONCEDENTE_SEQ", sequenceName = "PARADA_CODORGAOCONCEDENTE_SEQ", allocationSize = 1) +@Table(name = "PARADA_COD_ORGAOCONCEDENTE") +public class ParadaCodOrgaoConcedente implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARADA_CODORGAOCONCEDENTE_SEQ") + @Column(name = "PARADACODORGAOCONCEDENTE_ID") + private Integer paradaCodOrgaoConcedenteId; + @OneToOne + @JoinColumn(name = "PARADA_ID") + private Parada parada; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoConcedente; + @Column(name = "CODIGO") + private String codigo; + public Integer getParadaCodOrgaoConcedenteId() { + return paradaCodOrgaoConcedenteId; + } + public void setParadaCodOrgaoConcedenteId(Integer paradaCodOrgaoConcedenteId) { + this.paradaCodOrgaoConcedenteId = paradaCodOrgaoConcedenteId; + } + public Parada getParada() { + return parada; + } + public void setParada(Parada parada) { + this.parada = parada; + } + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + public String getCodigo() { + return codigo; + } + public void setCodigo(String codigo) { + this.codigo = codigo; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (getParadaCodOrgaoConcedenteId() != null ? getParadaCodOrgaoConcedenteId().hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof ParadaCodOrgaoConcedente)) { + return false; + } + ParadaCodOrgaoConcedente other = (ParadaCodOrgaoConcedente) object; + if ((this.getParadaCodOrgaoConcedenteId() == null && other.getParadaCodOrgaoConcedenteId() != null) || (this.getParadaCodOrgaoConcedenteId() != null && !this.getParadaCodOrgaoConcedenteId().equals(other.getParadaCodOrgaoConcedenteId()))) { + return false; + } + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParadaEquivalencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaEquivalencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParadaEquivalencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaEquivalencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParadaEsquema.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaEsquema.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParadaEsquema.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaEsquema.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParadaSecuencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuenciaCombinacaoLinha.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuenciaCombinacaoLinha.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ParadaSecuenciaCombinacaoLinha.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuenciaCombinacaoLinha.java index ba4731715..9af958767 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuenciaCombinacaoLinha.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParadaSecuenciaCombinacaoLinha.java @@ -1,65 +1,65 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.List; - -/** - * - * @author Eduardo Classe responsável pela geração das linhas automaticamente identificando origem e destino - */ -public class ParadaSecuenciaCombinacaoLinha { - - private ParadaSecuencia origem; - private List destinos; - private Via via; - private String kmReal = ""; - private String kmEntradaSaida = ""; - private String tempoReal = ""; - - public String getKmReal() { - return kmReal; - } - - public void setKmReal(String kmReal) { - this.kmReal = kmReal; - } - - public String getKmEntradaSaida() { - return kmEntradaSaida; - } - - public void setKmEntradaSaida(String kmEntradaSaida) { - this.kmEntradaSaida = kmEntradaSaida; - } - - public String getTempoReal() { - return tempoReal; - } - - public void setTempoReal(String tempoReal) { - this.tempoReal = tempoReal; - } - - public ParadaSecuencia getOrigem() { - return origem; - } - - public void setOrigem(ParadaSecuencia origem) { - this.origem = origem; - } - - public List getDestinos() { - return destinos; - } - - public void setDestinos(List destinos) { - this.destinos = destinos; - } - - public Via getVia() { - return via; - } - - public void setVia(Via via) { - this.via = via; - } +package com.rjconsultores.ventaboletos.entidad; + +import java.util.List; + +/** + * + * @author Eduardo Classe responsável pela geração das linhas automaticamente identificando origem e destino + */ +public class ParadaSecuenciaCombinacaoLinha { + + private ParadaSecuencia origem; + private List destinos; + private Via via; + private String kmReal = ""; + private String kmEntradaSaida = ""; + private String tempoReal = ""; + + public String getKmReal() { + return kmReal; + } + + public void setKmReal(String kmReal) { + this.kmReal = kmReal; + } + + public String getKmEntradaSaida() { + return kmEntradaSaida; + } + + public void setKmEntradaSaida(String kmEntradaSaida) { + this.kmEntradaSaida = kmEntradaSaida; + } + + public String getTempoReal() { + return tempoReal; + } + + public void setTempoReal(String tempoReal) { + this.tempoReal = tempoReal; + } + + public ParadaSecuencia getOrigem() { + return origem; + } + + public void setOrigem(ParadaSecuencia origem) { + this.origem = origem; + } + + public List getDestinos() { + return destinos; + } + + public void setDestinos(List destinos) { + this.destinos = destinos; + } + + public Via getVia() { + return via; + } + + public void setVia(Via via) { + this.via = via; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaMasivo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaMasivo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaMasivo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaMasivo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaPunto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaPunto.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaPunto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamAcumulaPunto.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamArticulo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamArticulo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ParamArticulo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamArticulo.java index 2bc51217c..a0adf01d7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ParamArticulo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamArticulo.java @@ -1,79 +1,79 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "PARAM_ARTICULO_SEQ", sequenceName = "PARAM_ARTICULO_SEQ", allocationSize = 1) -@Table(name = "PARAM_ARTICULO") -public class ParamArticulo implements Serializable{ - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARAM_ARTICULO_SEQ") - @Basic(optional = false) - @Column(name = "PARAMARTICULO_ID") - private Integer paramArticuloID; - @Column(name = "CONCEPTO") - private String concepto; - @Column(name = "ARTICULO") - private String articulo; - - public Integer getParamArticuloID() { - return paramArticuloID; - } - public void setParamArticuloID(Integer paramArticuloID) { - this.paramArticuloID = paramArticuloID; - } - public String getConcepto() { - return concepto; - } - public void setConcepto(String concepto) { - this.concepto = concepto; - } - public String getArticulo() { - return articulo; - } - public void setArticulo(String articulo) { - this.articulo = articulo; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((paramArticuloID == null) ? 0 : paramArticuloID.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ParamArticulo other = (ParamArticulo) obj; - if (paramArticuloID == null) { - if (other.paramArticuloID != null) - return false; - } else if (!paramArticuloID.equals(other.paramArticuloID)) - return false; - return true; - } - @Override - public String toString() { - return this.getParamArticuloID() + " - " + this.getConcepto(); - } - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "PARAM_ARTICULO_SEQ", sequenceName = "PARAM_ARTICULO_SEQ", allocationSize = 1) +@Table(name = "PARAM_ARTICULO") +public class ParamArticulo implements Serializable{ + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PARAM_ARTICULO_SEQ") + @Basic(optional = false) + @Column(name = "PARAMARTICULO_ID") + private Integer paramArticuloID; + @Column(name = "CONCEPTO") + private String concepto; + @Column(name = "ARTICULO") + private String articulo; + + public Integer getParamArticuloID() { + return paramArticuloID; + } + public void setParamArticuloID(Integer paramArticuloID) { + this.paramArticuloID = paramArticuloID; + } + public String getConcepto() { + return concepto; + } + public void setConcepto(String concepto) { + this.concepto = concepto; + } + public String getArticulo() { + return articulo; + } + public void setArticulo(String articulo) { + this.articulo = articulo; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((paramArticuloID == null) ? 0 : paramArticuloID.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ParamArticulo other = (ParamArticulo) obj; + if (paramArticuloID == null) { + if (other.paramArticuloID != null) + return false; + } else if (!paramArticuloID.equals(other.paramArticuloID)) + return false; + return true; + } + @Override + public String toString() { + return this.getParamArticuloID() + " - " + this.getConcepto(); + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamCanjePunto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamCanjePunto.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParamCanjePunto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamCanjePunto.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamCompraPunto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamCompraPunto.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParamCompraPunto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamCompraPunto.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamConexion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamConexion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/ParamConexion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamConexion.java index 8cf16f497..07e68ec74 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ParamConexion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamConexion.java @@ -1,133 +1,133 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * - * @author gleimar - */ -@Entity -@Table(name = "PARAM_CONEXION") -public class ParamConexion implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "PARAM_CONEXION_ID") - private Integer paramConexionId; - @Column(name = "DESCPARAMETRO") - private String descparametro; - @Column(name = "NOMBPARAMETRO") - private String nombparametro; - @Column(name = "VALOR_PARAMETRO") - private Integer valorParametro; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "ACTIVO") - private Boolean activo; - - public ParamConexion() { - } - - public ParamConexion(Integer paramConexionId) { - this.paramConexionId = paramConexionId; - } - - public Integer getParamConexionId() { - return paramConexionId; - } - - public void setParamConexionId(Integer paramConexionId) { - this.paramConexionId = paramConexionId; - } - - public String getDescparametro() { - return descparametro; - } - - public void setDescparametro(String descparametro) { - this.descparametro = descparametro; - } - - public String getNombparametro() { - return nombparametro; - } - - public void setNombparametro(String nombparametro) { - this.nombparametro = nombparametro; - } - - public Integer getValorParametro() { - return valorParametro; - } - - public void setValorParametro(Integer valorParametro) { - this.valorParametro = valorParametro; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (paramConexionId != null ? paramConexionId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ParamConexion)) { - return false; - } - ParamConexion other = (ParamConexion) object; - if ((this.paramConexionId == null && other.paramConexionId != null) || (this.paramConexionId != null && !this.paramConexionId.equals(other.paramConexionId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.entidad.ParamConexion[ paramConexionId=" + paramConexionId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author gleimar + */ +@Entity +@Table(name = "PARAM_CONEXION") +public class ParamConexion implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Column(name = "PARAM_CONEXION_ID") + private Integer paramConexionId; + @Column(name = "DESCPARAMETRO") + private String descparametro; + @Column(name = "NOMBPARAMETRO") + private String nombparametro; + @Column(name = "VALOR_PARAMETRO") + private Integer valorParametro; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "ACTIVO") + private Boolean activo; + + public ParamConexion() { + } + + public ParamConexion(Integer paramConexionId) { + this.paramConexionId = paramConexionId; + } + + public Integer getParamConexionId() { + return paramConexionId; + } + + public void setParamConexionId(Integer paramConexionId) { + this.paramConexionId = paramConexionId; + } + + public String getDescparametro() { + return descparametro; + } + + public void setDescparametro(String descparametro) { + this.descparametro = descparametro; + } + + public String getNombparametro() { + return nombparametro; + } + + public void setNombparametro(String nombparametro) { + this.nombparametro = nombparametro; + } + + public Integer getValorParametro() { + return valorParametro; + } + + public void setValorParametro(Integer valorParametro) { + this.valorParametro = valorParametro; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (paramConexionId != null ? paramConexionId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ParamConexion)) { + return false; + } + ParamConexion other = (ParamConexion) object; + if ((this.paramConexionId == null && other.paramConexionId != null) || (this.paramConexionId != null && !this.paramConexionId.equals(other.paramConexionId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.entidad.ParamConexion[ paramConexionId=" + paramConexionId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamCostoTarjeta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamCostoTarjeta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParamCostoTarjeta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamCostoTarjeta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ParamRecoleccion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamRecoleccion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ParamRecoleccion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ParamRecoleccion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Peaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Peaje.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/Peaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Peaje.java index 691dfa3b3..2d14da4b4 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Peaje.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Peaje.java @@ -1,139 +1,139 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PEAJE_SEQ", sequenceName = "PEAJE_SEQ", allocationSize = 1) -@Table(name = "PEAJE") -public class Peaje implements Serializable{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PEAJE_SEQ") - @Column(name = "PEAJE_ID") - private Integer pejaeId; - @OneToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - @OneToOne - @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") - private Parada origem; - @OneToOne - @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") - private Parada destino; - @OneToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - @OneToOne - @JoinColumn(name = "CASETAPEAJE_ID", referencedColumnName = "CASETAPEAJE_ID") - private CasetaPeaje casetaPeaje; - @Column(name = "CANTASIENTOS") - private BigDecimal cantAsientos; - @Column(name = "CANTEIXOS") - private BigDecimal cantEixos; - @Column(name = "IMPORTEPEAJE") - private BigDecimal importePeaje; - @Column(name = "INDICEPEAJE") - private BigDecimal indicePeaje; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - public Integer getPejaeId() { - return pejaeId; - } - public void setPejaeId(Integer pejaeId) { - this.pejaeId = pejaeId; - } - public Ruta getRuta() { - return ruta; - } - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - public Parada getOrigem() { - return origem; - } - public void setOrigem(Parada origem) { - this.origem = origem; - } - public Parada getDestino() { - return destino; - } - public void setDestino(Parada destino) { - this.destino = destino; - } - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - public CasetaPeaje getCasetaPeaje() { - return casetaPeaje; - } - public void setCasetaPeaje(CasetaPeaje casetaPeaje) { - this.casetaPeaje = casetaPeaje; - } - public BigDecimal getCantAsientos() { - return cantAsientos; - } - public void setCantAsientos(BigDecimal cantAsientos) { - this.cantAsientos = cantAsientos; - } - public BigDecimal getCantEixos() { - return cantEixos; - } - public void setCantEixos(BigDecimal cantEixos) { - this.cantEixos = cantEixos; - } - public BigDecimal getImportePeaje() { - return importePeaje; - } - public void setImportePeaje(BigDecimal importePeaje) { - this.importePeaje = importePeaje; - } - public BigDecimal getIndicePeaje() { - return indicePeaje; - } - public void setIndicePeaje(BigDecimal indicePeaje) { - this.indicePeaje = indicePeaje; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PEAJE_SEQ", sequenceName = "PEAJE_SEQ", allocationSize = 1) +@Table(name = "PEAJE") +public class Peaje implements Serializable{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PEAJE_SEQ") + @Column(name = "PEAJE_ID") + private Integer pejaeId; + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + @OneToOne + @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") + private Parada origem; + @OneToOne + @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") + private Parada destino; + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + @OneToOne + @JoinColumn(name = "CASETAPEAJE_ID", referencedColumnName = "CASETAPEAJE_ID") + private CasetaPeaje casetaPeaje; + @Column(name = "CANTASIENTOS") + private BigDecimal cantAsientos; + @Column(name = "CANTEIXOS") + private BigDecimal cantEixos; + @Column(name = "IMPORTEPEAJE") + private BigDecimal importePeaje; + @Column(name = "INDICEPEAJE") + private BigDecimal indicePeaje; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + public Integer getPejaeId() { + return pejaeId; + } + public void setPejaeId(Integer pejaeId) { + this.pejaeId = pejaeId; + } + public Ruta getRuta() { + return ruta; + } + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + public Parada getOrigem() { + return origem; + } + public void setOrigem(Parada origem) { + this.origem = origem; + } + public Parada getDestino() { + return destino; + } + public void setDestino(Parada destino) { + this.destino = destino; + } + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + public CasetaPeaje getCasetaPeaje() { + return casetaPeaje; + } + public void setCasetaPeaje(CasetaPeaje casetaPeaje) { + this.casetaPeaje = casetaPeaje; + } + public BigDecimal getCantAsientos() { + return cantAsientos; + } + public void setCantAsientos(BigDecimal cantAsientos) { + this.cantAsientos = cantAsientos; + } + public BigDecimal getCantEixos() { + return cantEixos; + } + public void setCantEixos(BigDecimal cantEixos) { + this.cantEixos = cantEixos; + } + public BigDecimal getImportePeaje() { + return importePeaje; + } + public void setImportePeaje(BigDecimal importePeaje) { + this.importePeaje = importePeaje; + } + public BigDecimal getIndicePeaje() { + return indicePeaje; + } + public void setIndicePeaje(BigDecimal indicePeaje) { + this.indicePeaje = indicePeaje; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Perfil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Perfil.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Perfil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Perfil.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PerfilFuncion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PerfilFuncion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PerfilFuncion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PerfilFuncion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PeriodoVacacional.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PeriodoVacacional.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PeriodoVacacional.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PeriodoVacacional.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Plaza.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Plaza.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Plaza.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Plaza.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PrecioFixoPedagio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecioFixoPedagio.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PrecioFixoPedagio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecioFixoPedagio.java index 993ac8322..d98cdb0b0 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PrecioFixoPedagio.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecioFixoPedagio.java @@ -1,180 +1,180 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author Bruno Neves - * - */ -@Entity -@SequenceGenerator(name = "PRECIO_FIXO_PEDAGIO_SEQ", sequenceName = "PRECIO_FIXO_PEDAGIO_SEQ", allocationSize = 1) -@Table(name = "PRECIO_FIXO_PEDAGIO") -public class PrecioFixoPedagio implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRECIO_FIXO_PEDAGIO_SEQ") - @Column(name = "PRECIOFIXOPEDAGIO_ID") - private Integer precioFixoId; - - @ManyToOne - @JoinColumn(name = "PRACAPEDAGIO_ID", referencedColumnName = "CASETAPEAJE_ID") - private CasetaPeaje pracaPedagioId; - - @OneToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedenteId; - - @OneToOne - @JoinColumn(name = "CLASSESERVICO_ID", referencedColumnName = "CLASESERVICIO_ID") - private ClaseServicio classeId; - - @Column(name = "VALORFIXO") - private BigDecimal valorFixo; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - - public Integer getPrecioFixoId() { - return precioFixoId; - } - - public void setPrecioFixoId(Integer precioFixoId) { - this.precioFixoId = precioFixoId; - } - - public CasetaPeaje getPracaPedagioId() { - return pracaPedagioId; - } - - public void setPracaPedagioId(CasetaPeaje pracaPedagioId) { - this.pracaPedagioId = pracaPedagioId; - } - - public OrgaoConcedente getOrgaoConcedenteId() { - return orgaoConcedenteId; - } - - public void setOrgaoConcedenteId(OrgaoConcedente orgaoConcedenteId) { - this.orgaoConcedenteId = orgaoConcedenteId; - } - - public ClaseServicio getClasseId() { - return classeId; - } - - public void setClasseId(ClaseServicio classeId) { - this.classeId = classeId; - } - - public BigDecimal getValorFixo() { - return valorFixo; - } - - public void setValorFixo(BigDecimal valorFixo) { - this.valorFixo = valorFixo; - } - - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((classeId == null) ? 0 : classeId.hashCode()); - result = prime * result + ((orgaoConcedenteId == null) ? 0 : orgaoConcedenteId.hashCode()); - result = prime * result + ((pracaPedagioId == null) ? 0 : pracaPedagioId.hashCode()); - result = prime * result + ((precioFixoId == null) ? 0 : precioFixoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PrecioFixoPedagio other = (PrecioFixoPedagio) obj; - if (classeId == null) { - if (other.classeId != null) - return false; - } else if (!classeId.equals(other.classeId)) - return false; - if (orgaoConcedenteId == null) { - if (other.orgaoConcedenteId != null) - return false; - } else if (!orgaoConcedenteId.equals(other.orgaoConcedenteId)) - return false; - if (pracaPedagioId == null) { - if (other.pracaPedagioId != null) - return false; - } else if (!pracaPedagioId.equals(other.pracaPedagioId)) - return false; - if (precioFixoId == null) { - if (other.precioFixoId != null) - return false; - } else if (!precioFixoId.equals(other.precioFixoId)) - return false; - return true; - } - - - -} +/** + * + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author Bruno Neves + * + */ +@Entity +@SequenceGenerator(name = "PRECIO_FIXO_PEDAGIO_SEQ", sequenceName = "PRECIO_FIXO_PEDAGIO_SEQ", allocationSize = 1) +@Table(name = "PRECIO_FIXO_PEDAGIO") +public class PrecioFixoPedagio implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRECIO_FIXO_PEDAGIO_SEQ") + @Column(name = "PRECIOFIXOPEDAGIO_ID") + private Integer precioFixoId; + + @ManyToOne + @JoinColumn(name = "PRACAPEDAGIO_ID", referencedColumnName = "CASETAPEAJE_ID") + private CasetaPeaje pracaPedagioId; + + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedenteId; + + @OneToOne + @JoinColumn(name = "CLASSESERVICO_ID", referencedColumnName = "CLASESERVICIO_ID") + private ClaseServicio classeId; + + @Column(name = "VALORFIXO") + private BigDecimal valorFixo; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + + public Integer getPrecioFixoId() { + return precioFixoId; + } + + public void setPrecioFixoId(Integer precioFixoId) { + this.precioFixoId = precioFixoId; + } + + public CasetaPeaje getPracaPedagioId() { + return pracaPedagioId; + } + + public void setPracaPedagioId(CasetaPeaje pracaPedagioId) { + this.pracaPedagioId = pracaPedagioId; + } + + public OrgaoConcedente getOrgaoConcedenteId() { + return orgaoConcedenteId; + } + + public void setOrgaoConcedenteId(OrgaoConcedente orgaoConcedenteId) { + this.orgaoConcedenteId = orgaoConcedenteId; + } + + public ClaseServicio getClasseId() { + return classeId; + } + + public void setClasseId(ClaseServicio classeId) { + this.classeId = classeId; + } + + public BigDecimal getValorFixo() { + return valorFixo; + } + + public void setValorFixo(BigDecimal valorFixo) { + this.valorFixo = valorFixo; + } + + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((classeId == null) ? 0 : classeId.hashCode()); + result = prime * result + ((orgaoConcedenteId == null) ? 0 : orgaoConcedenteId.hashCode()); + result = prime * result + ((pracaPedagioId == null) ? 0 : pracaPedagioId.hashCode()); + result = prime * result + ((precioFixoId == null) ? 0 : precioFixoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PrecioFixoPedagio other = (PrecioFixoPedagio) obj; + if (classeId == null) { + if (other.classeId != null) + return false; + } else if (!classeId.equals(other.classeId)) + return false; + if (orgaoConcedenteId == null) { + if (other.orgaoConcedenteId != null) + return false; + } else if (!orgaoConcedenteId.equals(other.orgaoConcedenteId)) + return false; + if (pracaPedagioId == null) { + if (other.pracaPedagioId != null) + return false; + } else if (!pracaPedagioId.equals(other.pracaPedagioId)) + return false; + if (precioFixoId == null) { + if (other.precioFixoId != null) + return false; + } else if (!precioFixoId.equals(other.precioFixoId)) + return false; + return true; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PrecioVentaja.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecioVentaja.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PrecioVentaja.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecioVentaja.java index c09c728f3..71ee787c7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PrecioVentaja.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecioVentaja.java @@ -1,212 +1,212 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author Thiago - * - */ -@Entity -@SequenceGenerator(name = "PRECIO_VENTAJA_SEQ", sequenceName = "PRECIO_VENTAJA_SEQ", allocationSize = 1) -@Table(name = "PRECIO_VENTAJA") -public class PrecioVentaja implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRECIO_VENTAJA_SEQ") - @Column(name = "PRECIOVENTAJA_ID") - private Integer precioVentajaId; - - @OneToOne - @JoinColumn(name = "RUTA_ORIGINAL_ID", referencedColumnName = "RUTA_ID") - private Ruta rutaOriginalId; - - @OneToOne - @JoinColumn(name = "ORIGEN_ORIGINAL_ID", referencedColumnName = "PARADA_ID") - private Parada origenOriginalId; - - @OneToOne - @JoinColumn(name = "DESTINO_ORIGINAL_ID", referencedColumnName = "PARADA_ID") - private Parada destinoOriginalId; - - @Column(name = "INDPREFIXOORIGEN") - private Boolean indPrefixoOrigen; - - @Column(name = "FECINICIO") - @Temporal(TemporalType.TIMESTAMP) - private Date fechaInicio; - - @Column(name = "FECFINAL") - @Temporal(TemporalType.TIMESTAMP) - private Date fechaFinal; - - @OneToOne - @JoinColumn(name = "RUTA_PRECIO_ID", referencedColumnName = "RUTA_ID") - private Ruta rutaPrecioId; - - @Column(name = "CORRIDA_ID") - private Integer corridaId; - - @OneToOne - @JoinColumn(name = "ORIGEN_PRECIO_ID", referencedColumnName = "PARADA_ID") - private Parada origenPrecioId; - - @OneToOne - @JoinColumn(name = "DESTINO_PRECIO_ID", referencedColumnName = "PARADA_ID") - private Parada destinoPrecioId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "INDCLASSEAPROVEITAMENTO") - private Boolean indClasseAproveitamento; - - public Integer getPrecioVentajaId() { - return precioVentajaId; - } - - public void setPrecioVentajaId(Integer precioVentajaId) { - this.precioVentajaId = precioVentajaId; - } - - public Ruta getRutaOriginalId() { - return rutaOriginalId; - } - - public void setRutaOriginalId(Ruta rutaOriginalId) { - this.rutaOriginalId = rutaOriginalId; - } - - public Parada getOrigenOriginalId() { - return origenOriginalId; - } - - public void setOrigenOriginalId(Parada origenOriginalId) { - this.origenOriginalId = origenOriginalId; - } - - public Parada getDestinoOriginalId() { - return destinoOriginalId; - } - - public void setDestinoOriginalId(Parada destinoOriginalId) { - this.destinoOriginalId = destinoOriginalId; - } - - public Boolean getIndPrefixoOrigen() { - return indPrefixoOrigen; - } - - public void setIndPrefixoOrigen(Boolean indPrefixoOrigen) { - this.indPrefixoOrigen = indPrefixoOrigen; - } - - public Date getFechaInicio() { - return fechaInicio; - } - - public void setFechaInicio(Date fechaInicio) { - this.fechaInicio = fechaInicio; - } - - public Date getFechaFinal() { - return fechaFinal; - } - - public void setFechaFinal(Date fechaFinal) { - this.fechaFinal = fechaFinal; - } - - public Ruta getRutaPrecioId() { - return rutaPrecioId; - } - - public void setRutaPrecioId(Ruta rutaPrecioId) { - this.rutaPrecioId = rutaPrecioId; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Parada getOrigenPrecioId() { - return origenPrecioId; - } - - public void setOrigenPrecioId(Parada origenPrecioId) { - this.origenPrecioId = origenPrecioId; - } - - public Parada getDestinoPrecioId() { - return destinoPrecioId; - } - - public void setDestinoPrecioId(Parada destinoPrecioId) { - this.destinoPrecioId = destinoPrecioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndClasseAproveitamento() { - return indClasseAproveitamento == null ? false : indClasseAproveitamento; - } - - public void setIndClasseAproveitamento(Boolean indClasseAproveitamento) { - this.indClasseAproveitamento = indClasseAproveitamento; - } -} +/** + * + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author Thiago + * + */ +@Entity +@SequenceGenerator(name = "PRECIO_VENTAJA_SEQ", sequenceName = "PRECIO_VENTAJA_SEQ", allocationSize = 1) +@Table(name = "PRECIO_VENTAJA") +public class PrecioVentaja implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRECIO_VENTAJA_SEQ") + @Column(name = "PRECIOVENTAJA_ID") + private Integer precioVentajaId; + + @OneToOne + @JoinColumn(name = "RUTA_ORIGINAL_ID", referencedColumnName = "RUTA_ID") + private Ruta rutaOriginalId; + + @OneToOne + @JoinColumn(name = "ORIGEN_ORIGINAL_ID", referencedColumnName = "PARADA_ID") + private Parada origenOriginalId; + + @OneToOne + @JoinColumn(name = "DESTINO_ORIGINAL_ID", referencedColumnName = "PARADA_ID") + private Parada destinoOriginalId; + + @Column(name = "INDPREFIXOORIGEN") + private Boolean indPrefixoOrigen; + + @Column(name = "FECINICIO") + @Temporal(TemporalType.TIMESTAMP) + private Date fechaInicio; + + @Column(name = "FECFINAL") + @Temporal(TemporalType.TIMESTAMP) + private Date fechaFinal; + + @OneToOne + @JoinColumn(name = "RUTA_PRECIO_ID", referencedColumnName = "RUTA_ID") + private Ruta rutaPrecioId; + + @Column(name = "CORRIDA_ID") + private Integer corridaId; + + @OneToOne + @JoinColumn(name = "ORIGEN_PRECIO_ID", referencedColumnName = "PARADA_ID") + private Parada origenPrecioId; + + @OneToOne + @JoinColumn(name = "DESTINO_PRECIO_ID", referencedColumnName = "PARADA_ID") + private Parada destinoPrecioId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "INDCLASSEAPROVEITAMENTO") + private Boolean indClasseAproveitamento; + + public Integer getPrecioVentajaId() { + return precioVentajaId; + } + + public void setPrecioVentajaId(Integer precioVentajaId) { + this.precioVentajaId = precioVentajaId; + } + + public Ruta getRutaOriginalId() { + return rutaOriginalId; + } + + public void setRutaOriginalId(Ruta rutaOriginalId) { + this.rutaOriginalId = rutaOriginalId; + } + + public Parada getOrigenOriginalId() { + return origenOriginalId; + } + + public void setOrigenOriginalId(Parada origenOriginalId) { + this.origenOriginalId = origenOriginalId; + } + + public Parada getDestinoOriginalId() { + return destinoOriginalId; + } + + public void setDestinoOriginalId(Parada destinoOriginalId) { + this.destinoOriginalId = destinoOriginalId; + } + + public Boolean getIndPrefixoOrigen() { + return indPrefixoOrigen; + } + + public void setIndPrefixoOrigen(Boolean indPrefixoOrigen) { + this.indPrefixoOrigen = indPrefixoOrigen; + } + + public Date getFechaInicio() { + return fechaInicio; + } + + public void setFechaInicio(Date fechaInicio) { + this.fechaInicio = fechaInicio; + } + + public Date getFechaFinal() { + return fechaFinal; + } + + public void setFechaFinal(Date fechaFinal) { + this.fechaFinal = fechaFinal; + } + + public Ruta getRutaPrecioId() { + return rutaPrecioId; + } + + public void setRutaPrecioId(Ruta rutaPrecioId) { + this.rutaPrecioId = rutaPrecioId; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Parada getOrigenPrecioId() { + return origenPrecioId; + } + + public void setOrigenPrecioId(Parada origenPrecioId) { + this.origenPrecioId = origenPrecioId; + } + + public Parada getDestinoPrecioId() { + return destinoPrecioId; + } + + public void setDestinoPrecioId(Parada destinoPrecioId) { + this.destinoPrecioId = destinoPrecioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndClasseAproveitamento() { + return indClasseAproveitamento == null ? false : indClasseAproveitamento; + } + + public void setIndClasseAproveitamento(Boolean indClasseAproveitamento) { + this.indClasseAproveitamento = indClasseAproveitamento; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PrecoApanhe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecoApanhe.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PrecoApanhe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecoApanhe.java index 541dbfa73..12e1c6475 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PrecoApanhe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PrecoApanhe.java @@ -1,146 +1,146 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "PRECO_APANHE") -@SequenceGenerator(name = "PRECO_APANHE_SEQ", sequenceName = "PRECO_APANHE_SEQ", allocationSize = 1) -public class PrecoApanhe implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRECO_APANHE_SEQ") - @Column(name = "PRECOAPANHE_ID") - private Long precoapanheId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "HOTEL_ID") - private Hotel hotel; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "COLONIA_ID") - private Colonia colonia; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CIUDAD_ID") - private Ciudad ciudad; - - @Column(name = "PRECO", columnDefinition = "NUMBER(5,2)") - private BigDecimal preco; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.DATE) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getPrecoapanheId() { - return precoapanheId; - } - - public void setPrecoapanheId(Long precoapanheId) { - this.precoapanheId = precoapanheId; - } - - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - public Colonia getColonia() { - return colonia; - } - - public void setColonia(Colonia colonia) { - this.colonia = colonia; - } - - public Ciudad getCiudad() { - return ciudad; - } - - public void setCiudad(Ciudad ciudad) { - this.ciudad = ciudad; - } - - public BigDecimal getPreco() { - return preco; - } - - public void setPreco(BigDecimal preco) { - this.preco = preco; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((precoapanheId == null) ? 0 : precoapanheId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - PrecoApanhe other = (PrecoApanhe) obj; - if (precoapanheId == null) { - if (other.precoapanheId != null) - return false; - } else if (!precoapanheId.equals(other.precoapanheId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "PRECO_APANHE") +@SequenceGenerator(name = "PRECO_APANHE_SEQ", sequenceName = "PRECO_APANHE_SEQ", allocationSize = 1) +public class PrecoApanhe implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRECO_APANHE_SEQ") + @Column(name = "PRECOAPANHE_ID") + private Long precoapanheId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "HOTEL_ID") + private Hotel hotel; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "COLONIA_ID") + private Colonia colonia; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CIUDAD_ID") + private Ciudad ciudad; + + @Column(name = "PRECO", columnDefinition = "NUMBER(5,2)") + private BigDecimal preco; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.DATE) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getPrecoapanheId() { + return precoapanheId; + } + + public void setPrecoapanheId(Long precoapanheId) { + this.precoapanheId = precoapanheId; + } + + public Hotel getHotel() { + return hotel; + } + + public void setHotel(Hotel hotel) { + this.hotel = hotel; + } + + public Colonia getColonia() { + return colonia; + } + + public void setColonia(Colonia colonia) { + this.colonia = colonia; + } + + public Ciudad getCiudad() { + return ciudad; + } + + public void setCiudad(Ciudad ciudad) { + this.ciudad = ciudad; + } + + public BigDecimal getPreco() { + return preco; + } + + public void setPreco(BigDecimal preco) { + this.preco = preco; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((precoapanheId == null) ? 0 : precoapanheId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + PrecoApanhe other = (PrecoApanhe) obj; + if (precoapanheId == null) { + if (other.precoapanheId != null) + return false; + } else if (!precoapanheId.equals(other.precoapanheId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Pricing.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pricing.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Pricing.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Pricing.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingAsiento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingAsiento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingAsiento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingAsiento.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCategoria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCategoria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingClase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingClase.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingClase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingClase.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingClasseTarifaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingClasseTarifaria.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingClasseTarifaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingClasseTarifaria.java index ce99b803b..1fd65bba2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingClasseTarifaria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingClasseTarifaria.java @@ -1,136 +1,136 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_CLASSE_TARIFARIA_SEQ", sequenceName = "PRICING_CLASSE_TARIFARIA_SEQ", allocationSize = 1) -@Table(name = "PRICING_CLASSE_TARIFARIA") -public class PricingClasseTarifaria implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_CLASSE_TARIFARIA_SEQ") - @Column(name = "PRICINGCLASSETARIFARIA_ID") - private Integer pricingClasseTarifariaId; - @Column(name = "DESCCLASSE_TARIFARIA") - private String descClasseTarifaria; - @Column(name = "SIGLA") - private String sigla; - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Basic(optional = false) - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public PricingClasseTarifaria() { - super(); - } - - public PricingClasseTarifaria(Integer pricingClasseTarifariaId) { - this(); - this.pricingClasseTarifariaId = pricingClasseTarifariaId; - } - - public Integer getPricingClasseTarifariaId() { - return pricingClasseTarifariaId; - } - - public void setPricingClasseTarifariaId(Integer pricingClasseTarifariaId) { - this.pricingClasseTarifariaId = pricingClasseTarifariaId; - } - - public String getDescClasseTarifaria() { - return descClasseTarifaria; - } - - public void setDescClasseTarifaria(String descClasseTarifaria) { - this.descClasseTarifaria = descClasseTarifaria; - } - - public String getSigla() { - return sigla; - } - - public void setSigla(String sigla) { - this.sigla = sigla; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((pricingClasseTarifariaId == null) ? 0 : pricingClasseTarifariaId.hashCode()); - result = prime * result + ((sigla == null) ? 0 : sigla.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PricingClasseTarifaria other = (PricingClasseTarifaria) obj; - if (pricingClasseTarifariaId == null) { - if (other.pricingClasseTarifariaId != null) - return false; - } else if (!pricingClasseTarifariaId.equals(other.pricingClasseTarifariaId)) - return false; - if (sigla == null) { - if (other.sigla != null) - return false; - } else if (!sigla.equals(other.sigla)) - return false; - return true; - } - - @Override - public String toString() { - return descClasseTarifaria + " - " + sigla; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_CLASSE_TARIFARIA_SEQ", sequenceName = "PRICING_CLASSE_TARIFARIA_SEQ", allocationSize = 1) +@Table(name = "PRICING_CLASSE_TARIFARIA") +public class PricingClasseTarifaria implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_CLASSE_TARIFARIA_SEQ") + @Column(name = "PRICINGCLASSETARIFARIA_ID") + private Integer pricingClasseTarifariaId; + @Column(name = "DESCCLASSE_TARIFARIA") + private String descClasseTarifaria; + @Column(name = "SIGLA") + private String sigla; + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public PricingClasseTarifaria() { + super(); + } + + public PricingClasseTarifaria(Integer pricingClasseTarifariaId) { + this(); + this.pricingClasseTarifariaId = pricingClasseTarifariaId; + } + + public Integer getPricingClasseTarifariaId() { + return pricingClasseTarifariaId; + } + + public void setPricingClasseTarifariaId(Integer pricingClasseTarifariaId) { + this.pricingClasseTarifariaId = pricingClasseTarifariaId; + } + + public String getDescClasseTarifaria() { + return descClasseTarifaria; + } + + public void setDescClasseTarifaria(String descClasseTarifaria) { + this.descClasseTarifaria = descClasseTarifaria; + } + + public String getSigla() { + return sigla; + } + + public void setSigla(String sigla) { + this.sigla = sigla; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((pricingClasseTarifariaId == null) ? 0 : pricingClasseTarifariaId.hashCode()); + result = prime * result + ((sigla == null) ? 0 : sigla.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingClasseTarifaria other = (PricingClasseTarifaria) obj; + if (pricingClasseTarifariaId == null) { + if (other.pricingClasseTarifariaId != null) + return false; + } else if (!pricingClasseTarifariaId.equals(other.pricingClasseTarifariaId)) + return false; + if (sigla == null) { + if (other.sigla != null) + return false; + } else if (!sigla.equals(other.sigla)) + return false; + return true; + } + + @Override + public String toString() { + return descClasseTarifaria + " - " + sigla; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingConexao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingConexao.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingConexao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingConexao.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCorrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCorrida.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCtrl.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PricingCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCtrl.java index 108a98b65..dae57e13a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingCtrl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingCtrl.java @@ -1,97 +1,97 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_CTRL_SEQ", sequenceName = "PRICING_CTRL_SEQ", allocationSize = 1) -@Table(name = "PRICING_CTRL") -public class PricingCtrl implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_CTRL_SEQ") - @Column(name = "PRICINGCTRL_ID") - private Integer pricingctrlId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getPricingctrlId() { - return pricingctrlId; - } - - public void setPricingctrlId(Integer pricingctrlId) { - this.pricingctrlId = pricingctrlId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getPricingctrlId() == null) ? 0 : getPricingctrlId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof PricingCtrl)) - return false; - PricingCtrl other = (PricingCtrl) obj; - if (getPricingctrlId() == null) { - if (other.getPricingctrlId() != null) - return false; - } else if (!getPricingctrlId().equals(other.getPricingctrlId())) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_CTRL_SEQ", sequenceName = "PRICING_CTRL_SEQ", allocationSize = 1) +@Table(name = "PRICING_CTRL") +public class PricingCtrl implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_CTRL_SEQ") + @Column(name = "PRICINGCTRL_ID") + private Integer pricingctrlId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getPricingctrlId() { + return pricingctrlId; + } + + public void setPricingctrlId(Integer pricingctrlId) { + this.pricingctrlId = pricingctrlId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getPricingctrlId() == null) ? 0 : getPricingctrlId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof PricingCtrl)) + return false; + PricingCtrl other = (PricingCtrl) obj; + if (getPricingctrlId() == null) { + if (other.getPricingctrlId() != null) + return false; + } else if (!getPricingctrlId().equals(other.getPricingctrlId())) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingDia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingDia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingDia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingDia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java index 4a0d07a75..7ab826cc0 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java @@ -1,132 +1,132 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_ESP_PUNTOV_SEQ", sequenceName = "PRICING_ESP_PUNTOV_SEQ", allocationSize = 1) -@Table(name = "PRICING_ESP_PUNTO_VENTA") -public class PricingEspecificoAgencia implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESP_PUNTOV_SEQ") - @Column(name = "PRICINGESPPUNTOVENTA_ID") - private Integer pricingEspecificoAgenciaId; - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID",referencedColumnName = "PUNTOVENTA_ID") - private PuntoVenta puntoVenta; - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Basic(optional = false) - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") - @ManyToOne - private PricingEspecifico pricingEspecifico; - - public PricingEspecificoAgencia() { - super(); - } - public PricingEspecificoAgencia(PuntoVenta puntoVenta, PricingEspecifico pricingEspecifico, Integer usuarioId) { - super(); - - this.puntoVenta = puntoVenta; - this.pricingEspecifico = pricingEspecifico; - this.usuarioId = usuarioId; - this.fecmodif = new Date(); - this.activo = Boolean.TRUE; - } - public Integer getPricingEspecificoAgenciaId() { - return pricingEspecificoAgenciaId; - } - public void setPricingEspecificoAgenciaId(Integer pricingEspecificoAgenciaId) { - this.pricingEspecificoAgenciaId = pricingEspecificoAgenciaId; - } - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public PricingEspecifico getPricingEspecifico() { - return pricingEspecifico; - } - public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { - this.pricingEspecifico = pricingEspecifico; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); - result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PricingEspecificoAgencia other = (PricingEspecificoAgencia) obj; - if (activo == null) { - if (other.activo != null) - return false; - } else if (!activo.equals(other.activo)) - return false; - if (pricingEspecifico == null) { - if (other.pricingEspecifico != null) - return false; - } else if (!pricingEspecifico.equals(other.pricingEspecifico)) - return false; - if (puntoVenta == null) { - if (other.puntoVenta != null) - return false; - } else if (!puntoVenta.equals(other.puntoVenta)) - return false; - return true; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_ESP_PUNTOV_SEQ", sequenceName = "PRICING_ESP_PUNTOV_SEQ", allocationSize = 1) +@Table(name = "PRICING_ESP_PUNTO_VENTA") +public class PricingEspecificoAgencia implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESP_PUNTOV_SEQ") + @Column(name = "PRICINGESPPUNTOVENTA_ID") + private Integer pricingEspecificoAgenciaId; + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID",referencedColumnName = "PUNTOVENTA_ID") + private PuntoVenta puntoVenta; + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") + @ManyToOne + private PricingEspecifico pricingEspecifico; + + public PricingEspecificoAgencia() { + super(); + } + public PricingEspecificoAgencia(PuntoVenta puntoVenta, PricingEspecifico pricingEspecifico, Integer usuarioId) { + super(); + + this.puntoVenta = puntoVenta; + this.pricingEspecifico = pricingEspecifico; + this.usuarioId = usuarioId; + this.fecmodif = new Date(); + this.activo = Boolean.TRUE; + } + public Integer getPricingEspecificoAgenciaId() { + return pricingEspecificoAgenciaId; + } + public void setPricingEspecificoAgenciaId(Integer pricingEspecificoAgenciaId) { + this.pricingEspecificoAgenciaId = pricingEspecificoAgenciaId; + } + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public PricingEspecifico getPricingEspecifico() { + return pricingEspecifico; + } + public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { + this.pricingEspecifico = pricingEspecifico; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); + result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingEspecificoAgencia other = (PricingEspecificoAgencia) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (pricingEspecifico == null) { + if (other.pricingEspecifico != null) + return false; + } else if (!pricingEspecifico.equals(other.pricingEspecifico)) + return false; + if (puntoVenta == null) { + if (other.puntoVenta != null) + return false; + } else if (!puntoVenta.equals(other.puntoVenta)) + return false; + return true; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java index 36de8da77..f8488c6c2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java @@ -1,141 +1,141 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * @author Bruno Rodrigo - * - */ -@Entity -@SequenceGenerator(name = "PRICING_ESP_CANAL_SEQ", sequenceName = "PRICING_ESP_CANAL_SEQ", allocationSize = 1) -@Table(name = "PRICING_ESP_CANAL_VENTA") -public class PricingEspecificoCanalVendas implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESP_CANAL_SEQ") - @Column(name = "PRICINGESPCANAL_ID") - private Integer pricingEspecificoCanalId; - @ManyToOne - @JoinColumn(name = "TIPOPTOVTA_ID", referencedColumnName = "TIPOPTOVTA_ID") - private TipoPuntoVenta tipoPtovta; - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Basic(optional = false) - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") - @ManyToOne - private PricingEspecifico pricingEspecifico; - - public PricingEspecificoCanalVendas() { - super(); - } - public PricingEspecificoCanalVendas(TipoPuntoVenta tipoPtovta, PricingEspecifico pricingEspecifico, Integer usuarioId) { - super(); - - this.tipoPtovta = tipoPtovta; - this.pricingEspecifico = pricingEspecifico; - this.usuarioId = usuarioId; - this.fecmodif = new Date(); - this.activo = Boolean.TRUE; - } - - public Integer getPricingEspecificoCanalId() { - return pricingEspecificoCanalId; - } - public void setPricingEspecificoCanalId(Integer pricingEspecificoCanalId) { - this.pricingEspecificoCanalId = pricingEspecificoCanalId; - } - public TipoPuntoVenta getTipoPtovta() { - return tipoPtovta; - } - public void setTipoPtovta(TipoPuntoVenta tipoPtovta) { - this.tipoPtovta = tipoPtovta; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public PricingEspecifico getPricingEspecifico() { - return pricingEspecifico; - } - public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { - this.pricingEspecifico = pricingEspecifico; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); - result = prime * result + ((tipoPtovta == null) ? 0 : tipoPtovta.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PricingEspecificoCanalVendas other = (PricingEspecificoCanalVendas) obj; - if (activo == null) { - if (other.activo != null) - return false; - } else if (!activo.equals(other.activo)) - return false; - if (pricingEspecifico == null) { - if (other.pricingEspecifico != null) - return false; - } else if (!pricingEspecifico.equals(other.pricingEspecifico)) - return false; - if (tipoPtovta == null) { - if (other.tipoPtovta != null) - return false; - } else if (!tipoPtovta.equals(other.tipoPtovta)) - return false; - return true; - } - @Override - public String toString() { - return "PricingEspecificoCanalVendas [tipoPtovta=" + tipoPtovta + ", activo=" + activo + "]"; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * @author Bruno Rodrigo + * + */ +@Entity +@SequenceGenerator(name = "PRICING_ESP_CANAL_SEQ", sequenceName = "PRICING_ESP_CANAL_SEQ", allocationSize = 1) +@Table(name = "PRICING_ESP_CANAL_VENTA") +public class PricingEspecificoCanalVendas implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESP_CANAL_SEQ") + @Column(name = "PRICINGESPCANAL_ID") + private Integer pricingEspecificoCanalId; + @ManyToOne + @JoinColumn(name = "TIPOPTOVTA_ID", referencedColumnName = "TIPOPTOVTA_ID") + private TipoPuntoVenta tipoPtovta; + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") + @ManyToOne + private PricingEspecifico pricingEspecifico; + + public PricingEspecificoCanalVendas() { + super(); + } + public PricingEspecificoCanalVendas(TipoPuntoVenta tipoPtovta, PricingEspecifico pricingEspecifico, Integer usuarioId) { + super(); + + this.tipoPtovta = tipoPtovta; + this.pricingEspecifico = pricingEspecifico; + this.usuarioId = usuarioId; + this.fecmodif = new Date(); + this.activo = Boolean.TRUE; + } + + public Integer getPricingEspecificoCanalId() { + return pricingEspecificoCanalId; + } + public void setPricingEspecificoCanalId(Integer pricingEspecificoCanalId) { + this.pricingEspecificoCanalId = pricingEspecificoCanalId; + } + public TipoPuntoVenta getTipoPtovta() { + return tipoPtovta; + } + public void setTipoPtovta(TipoPuntoVenta tipoPtovta) { + this.tipoPtovta = tipoPtovta; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public PricingEspecifico getPricingEspecifico() { + return pricingEspecifico; + } + public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { + this.pricingEspecifico = pricingEspecifico; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); + result = prime * result + ((tipoPtovta == null) ? 0 : tipoPtovta.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingEspecificoCanalVendas other = (PricingEspecificoCanalVendas) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (pricingEspecifico == null) { + if (other.pricingEspecifico != null) + return false; + } else if (!pricingEspecifico.equals(other.pricingEspecifico)) + return false; + if (tipoPtovta == null) { + if (other.tipoPtovta != null) + return false; + } else if (!tipoPtovta.equals(other.tipoPtovta)) + return false; + return true; + } + @Override + public String toString() { + return "PricingEspecificoCanalVendas [tipoPtovta=" + tipoPtovta + ", activo=" + activo + "]"; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCategoria.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCategoria.java index 793e9df8e..475a9f84d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCategoria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCategoria.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_ESP_CATEGORIA_SEQ", sequenceName = "PRICING_ESP_CATEGORIA_SEQ", allocationSize = 1) -@Table(name = "PRICING_ESPECIFICO_CATEGORIA") -public class PricingEspecificoCategoria implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer pricingEspecificoCategoriaId; - private PricingEspecifico pricingEspecifico; - private Categoria categoria; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - - public PricingEspecificoCategoria() { - super(); - } - - public PricingEspecificoCategoria(Categoria categoria, PricingEspecifico pricingEspecifico, Integer usuarioId) { - this.pricingEspecifico = pricingEspecifico; - this.categoria = categoria; - this.usuarioId = usuarioId; - this.activo = true; - this.fecmodif = new Date(); - } - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESP_CATEGORIA_SEQ") - @Column(name = "PRICINGESPECIFICO_CATEGORIAID") - public Integer getPricingEspecificoCategoriaId() { - return pricingEspecificoCategoriaId; - } - - public void setPricingEspecificoCategoriaId(Integer pricingEspecificoCategoriaId) { - this.pricingEspecificoCategoriaId = pricingEspecificoCategoriaId; - } - - @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") - @ManyToOne - public PricingEspecifico getPricingEspecifico() { - return pricingEspecifico; - } - - public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { - this.pricingEspecifico = pricingEspecifico; - } - - @ManyToOne - @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") - public Categoria getCategoria() { - return categoria; - } - - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - - @Column(name = "ACTIVO") - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Basic(optional = false) - @Column(name = "USUARIO_ID") - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); - result = prime * result + ((categoria == null) ? 0 : categoria.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PricingEspecificoCategoria other = (PricingEspecificoCategoria) obj; - if (activo == null) { - if (other.activo != null) - return false; - } else if (!activo.equals(other.activo)) - return false; - if (pricingEspecifico == null) { - if (other.pricingEspecifico != null) - return false; - } else if (!pricingEspecifico.equals(other.pricingEspecifico)) - return false; - if (categoria == null) { - if (other.categoria != null) - return false; - } else if (!categoria.equals(other.categoria)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_ESP_CATEGORIA_SEQ", sequenceName = "PRICING_ESP_CATEGORIA_SEQ", allocationSize = 1) +@Table(name = "PRICING_ESPECIFICO_CATEGORIA") +public class PricingEspecificoCategoria implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pricingEspecificoCategoriaId; + private PricingEspecifico pricingEspecifico; + private Categoria categoria; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + + public PricingEspecificoCategoria() { + super(); + } + + public PricingEspecificoCategoria(Categoria categoria, PricingEspecifico pricingEspecifico, Integer usuarioId) { + this.pricingEspecifico = pricingEspecifico; + this.categoria = categoria; + this.usuarioId = usuarioId; + this.activo = true; + this.fecmodif = new Date(); + } + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESP_CATEGORIA_SEQ") + @Column(name = "PRICINGESPECIFICO_CATEGORIAID") + public Integer getPricingEspecificoCategoriaId() { + return pricingEspecificoCategoriaId; + } + + public void setPricingEspecificoCategoriaId(Integer pricingEspecificoCategoriaId) { + this.pricingEspecificoCategoriaId = pricingEspecificoCategoriaId; + } + + @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") + @ManyToOne + public PricingEspecifico getPricingEspecifico() { + return pricingEspecifico; + } + + public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { + this.pricingEspecifico = pricingEspecifico; + } + + @ManyToOne + @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + @Column(name = "ACTIVO") + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Basic(optional = false) + @Column(name = "USUARIO_ID") + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); + result = prime * result + ((categoria == null) ? 0 : categoria.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingEspecificoCategoria other = (PricingEspecificoCategoria) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (pricingEspecifico == null) { + if (other.pricingEspecifico != null) + return false; + } else if (!pricingEspecifico.equals(other.pricingEspecifico)) + return false; + if (categoria == null) { + if (other.categoria != null) + return false; + } else if (!categoria.equals(other.categoria)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java index 648088001..ce07bae02 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java @@ -1,172 +1,172 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_ESPECIFICO_OCUP_SEQ", sequenceName = "PRICING_ESPECIFICO_OCUP_SEQ", allocationSize = 1) -@Table(name = "PRICING_ESPECIFICO_OCUPACION") -public class PricingEspecificoOcupacion implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESPECIFICO_OCUP_SEQ") - @Column(name = "PRICINGESPECIFICOOCUPACION_ID") - private Integer pricingEspecificoOcupacionId; - @Column(name = "OCUPACIONINICIAL") - private BigDecimal ocupacioninicial; - @Column(name = "OCUPACIONFINAL") - private BigDecimal ocupacionfinal; - @Column(name = "TARIFA") - private BigDecimal tarifa; - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Basic(optional = false) - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "DESCUENTO") - private BigDecimal descuento; - - @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") - @ManyToOne - private PricingEspecifico pricingEspecifico; - - public PricingEspecificoOcupacion() { - super(); - } - - public PricingEspecificoOcupacion(BigDecimal ocupacioninicial, BigDecimal ocupacionfinal, BigDecimal tarifa, Boolean activo, Date fecmodif, Integer usuarioId, BigDecimal descuento, PricingEspecifico pricingEspecifico) { - super(); - this.ocupacioninicial = ocupacioninicial; - this.ocupacionfinal = ocupacionfinal; - this.tarifa = tarifa; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.descuento = descuento; - this.pricingEspecifico = pricingEspecifico; - } - - public Integer getPricingEspecificoOcupacionId() { - return pricingEspecificoOcupacionId; - } - - public void setPricingEspecificoOcupacionId(Integer pricingEspecificoOcupacionId) { - this.pricingEspecificoOcupacionId = pricingEspecificoOcupacionId; - } - - public BigDecimal getOcupacioninicial() { - return ocupacioninicial; - } - - public void setOcupacioninicial(BigDecimal ocupacioninicial) { - this.ocupacioninicial = ocupacioninicial; - } - - public BigDecimal getOcupacionfinal() { - return ocupacionfinal; - } - - public void setOcupacionfinal(BigDecimal ocupacionfinal) { - this.ocupacionfinal = ocupacionfinal; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public PricingEspecifico getPricingEspecifico() { - return pricingEspecifico; - } - - public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { - this.pricingEspecifico = pricingEspecifico; - } - - public BigDecimal getDescuento() { - return descuento; - } - - public void setDescuento(BigDecimal descuento) { - this.descuento = descuento; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((pricingEspecificoOcupacionId == null) ? 0 : pricingEspecificoOcupacionId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PricingEspecificoOcupacion other = (PricingEspecificoOcupacion) obj; - if (pricingEspecificoOcupacionId == null) { - if (other.pricingEspecificoOcupacionId != null) - return false; - } else if (!pricingEspecificoOcupacionId.equals(other.pricingEspecificoOcupacionId)) - return false; - return true; - } - - @Override - public String toString() { - return "PricingEspecificoOcupacion [pricingEspecificoOcupacionId=" + pricingEspecificoOcupacionId + ", ocupacioninicial=" + ocupacioninicial + ", ocupacionfinal=" + ocupacionfinal + ", tarifa=" + tarifa + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pricingEspecifico=" + pricingEspecifico + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_ESPECIFICO_OCUP_SEQ", sequenceName = "PRICING_ESPECIFICO_OCUP_SEQ", allocationSize = 1) +@Table(name = "PRICING_ESPECIFICO_OCUPACION") +public class PricingEspecificoOcupacion implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESPECIFICO_OCUP_SEQ") + @Column(name = "PRICINGESPECIFICOOCUPACION_ID") + private Integer pricingEspecificoOcupacionId; + @Column(name = "OCUPACIONINICIAL") + private BigDecimal ocupacioninicial; + @Column(name = "OCUPACIONFINAL") + private BigDecimal ocupacionfinal; + @Column(name = "TARIFA") + private BigDecimal tarifa; + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "DESCUENTO") + private BigDecimal descuento; + + @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") + @ManyToOne + private PricingEspecifico pricingEspecifico; + + public PricingEspecificoOcupacion() { + super(); + } + + public PricingEspecificoOcupacion(BigDecimal ocupacioninicial, BigDecimal ocupacionfinal, BigDecimal tarifa, Boolean activo, Date fecmodif, Integer usuarioId, BigDecimal descuento, PricingEspecifico pricingEspecifico) { + super(); + this.ocupacioninicial = ocupacioninicial; + this.ocupacionfinal = ocupacionfinal; + this.tarifa = tarifa; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.descuento = descuento; + this.pricingEspecifico = pricingEspecifico; + } + + public Integer getPricingEspecificoOcupacionId() { + return pricingEspecificoOcupacionId; + } + + public void setPricingEspecificoOcupacionId(Integer pricingEspecificoOcupacionId) { + this.pricingEspecificoOcupacionId = pricingEspecificoOcupacionId; + } + + public BigDecimal getOcupacioninicial() { + return ocupacioninicial; + } + + public void setOcupacioninicial(BigDecimal ocupacioninicial) { + this.ocupacioninicial = ocupacioninicial; + } + + public BigDecimal getOcupacionfinal() { + return ocupacionfinal; + } + + public void setOcupacionfinal(BigDecimal ocupacionfinal) { + this.ocupacionfinal = ocupacionfinal; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public PricingEspecifico getPricingEspecifico() { + return pricingEspecifico; + } + + public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { + this.pricingEspecifico = pricingEspecifico; + } + + public BigDecimal getDescuento() { + return descuento; + } + + public void setDescuento(BigDecimal descuento) { + this.descuento = descuento; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((pricingEspecificoOcupacionId == null) ? 0 : pricingEspecificoOcupacionId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingEspecificoOcupacion other = (PricingEspecificoOcupacion) obj; + if (pricingEspecificoOcupacionId == null) { + if (other.pricingEspecificoOcupacionId != null) + return false; + } else if (!pricingEspecificoOcupacionId.equals(other.pricingEspecificoOcupacionId)) + return false; + return true; + } + + @Override + public String toString() { + return "PricingEspecificoOcupacion [pricingEspecificoOcupacionId=" + pricingEspecificoOcupacionId + ", ocupacioninicial=" + ocupacioninicial + ", ocupacionfinal=" + ocupacionfinal + ", tarifa=" + tarifa + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pricingEspecifico=" + pricingEspecifico + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingFormapago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingFormapago.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingFormapago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingFormapago.java index 28b8462e9..022b35ec9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingFormapago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingFormapago.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_FORMAPAGO_SEQ", sequenceName = "PRICING_FORMAPAGO_SEQ", allocationSize = 1) -@Table(name = "PRICING_FORMAPAGO") -public class PricingFormapago implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_FORMAPAGO_SEQ") - @Column(name = "PRICINGFORMAPAGO_ID") - private Integer pricingformapagoId; - @Column(name = "INDEXCEPCION") - private Boolean indexcepcion; - @Column(name = "ACTIVO") - private Integer activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID") - @ManyToOne - private Pricing pricing; - @JoinColumn(name = "FORMAPAGO_ID", referencedColumnName = "FORMAPAGO_ID") - @ManyToOne - private FormaPago formaPago; - - public PricingFormapago() { - } - - public PricingFormapago(Integer pricingformapagoId) { - this.pricingformapagoId = pricingformapagoId; - } - - public PricingFormapago(Integer pricingformapagoId, Boolean indexcepcion, Integer activo, Date fecmodif, Integer usuarioId, Pricing pricing, FormaPago formaPago) { - this.pricingformapagoId = pricingformapagoId; - this.indexcepcion = indexcepcion; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.pricing = pricing; - this.formaPago = formaPago; - } - - public Integer getPricingformapagoId() { - return pricingformapagoId; - } - - public void setPricingformapagoId(Integer pricingformapagoId) { - this.pricingformapagoId = pricingformapagoId; - } - - public Boolean getIndexcepcion() { - return indexcepcion; - } - - public void setIndexcepcion(Boolean indexcepcion) { - this.indexcepcion = indexcepcion; - } - - public Integer getActivo() { - return activo; - } - - public void setActivo(Integer activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Pricing getPricing() { - return pricing; - } - - public void setPricing(Pricing pricing) { - this.pricing = pricing; - } - - public FormaPago getFormaPago() { - return formaPago; - } - - public void setFormaPago(FormaPago formaPago) { - this.formaPago = formaPago; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (pricingformapagoId != null ? pricingformapagoId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof PricingFormapago)) { - return false; - } - PricingFormapago other = (PricingFormapago) object; - if ((this.pricingformapagoId == null && other.pricingformapagoId != null) || (this.pricingformapagoId != null && !this.pricingformapagoId.equals(other.pricingformapagoId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PricingFormapago[pricingformapagoId=" + pricingformapagoId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_FORMAPAGO_SEQ", sequenceName = "PRICING_FORMAPAGO_SEQ", allocationSize = 1) +@Table(name = "PRICING_FORMAPAGO") +public class PricingFormapago implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_FORMAPAGO_SEQ") + @Column(name = "PRICINGFORMAPAGO_ID") + private Integer pricingformapagoId; + @Column(name = "INDEXCEPCION") + private Boolean indexcepcion; + @Column(name = "ACTIVO") + private Integer activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID") + @ManyToOne + private Pricing pricing; + @JoinColumn(name = "FORMAPAGO_ID", referencedColumnName = "FORMAPAGO_ID") + @ManyToOne + private FormaPago formaPago; + + public PricingFormapago() { + } + + public PricingFormapago(Integer pricingformapagoId) { + this.pricingformapagoId = pricingformapagoId; + } + + public PricingFormapago(Integer pricingformapagoId, Boolean indexcepcion, Integer activo, Date fecmodif, Integer usuarioId, Pricing pricing, FormaPago formaPago) { + this.pricingformapagoId = pricingformapagoId; + this.indexcepcion = indexcepcion; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.pricing = pricing; + this.formaPago = formaPago; + } + + public Integer getPricingformapagoId() { + return pricingformapagoId; + } + + public void setPricingformapagoId(Integer pricingformapagoId) { + this.pricingformapagoId = pricingformapagoId; + } + + public Boolean getIndexcepcion() { + return indexcepcion; + } + + public void setIndexcepcion(Boolean indexcepcion) { + this.indexcepcion = indexcepcion; + } + + public Integer getActivo() { + return activo; + } + + public void setActivo(Integer activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Pricing getPricing() { + return pricing; + } + + public void setPricing(Pricing pricing) { + this.pricing = pricing; + } + + public FormaPago getFormaPago() { + return formaPago; + } + + public void setFormaPago(FormaPago formaPago) { + this.formaPago = formaPago; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (pricingformapagoId != null ? pricingformapagoId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof PricingFormapago)) { + return false; + } + PricingFormapago other = (PricingFormapago) object; + if ((this.pricingformapagoId == null && other.pricingformapagoId != null) || (this.pricingformapagoId != null && !this.pricingformapagoId.equals(other.pricingformapagoId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PricingFormapago[pricingformapagoId=" + pricingformapagoId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingImporte.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingImporte.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingImporte.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingImporte.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingMarca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingMarca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingMercado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingMercado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingMercado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingMercado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingOcupaAntecipa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingOcupaAntecipa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PricingOcupaAntecipa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingOcupaAntecipa.java index e7da8b816..5333bbd8a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingOcupaAntecipa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingOcupaAntecipa.java @@ -1,199 +1,199 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PRICING_OCUPA_ANTECIPA_SEQ", sequenceName = "PRICING_OCUPA_ANTECIPA_SEQ", allocationSize = 1) -@Table(name = "PRICING_OCUPA_ANTECIPA") -public class PricingOcupaAntecipa implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_OCUPA_ANTECIPA_SEQ") - @Column(name = "PRICINGOCUPAANTECIPA_ID") - private Integer pricingocupaantecipaId; - @Column(name = "CANTDIASMIN") - private Integer cantdiasmin; - @Column(name = "CANTDIASMAX") - private Integer cantdiasmax; - @Column(name = "CANTASIENTOSMIN") - private Integer cantasientosmin; - @Column(name = "CANTASIENTOSMAX") - private Integer cantasientosmax; - @Column(name = "PORCENTAJE") - private BigDecimal porcentaje; - @Column(name = "OCUPACIONINICIAL") - private BigDecimal ocupacioninicial; - @Column(name = "OCUPACIONFINAL") - private BigDecimal ocupacionfinal; - @Column(name = "IMPORTE") - private BigDecimal importe; - @Basic(optional = false) - @Column(name = "ACTIVO") - private Integer activo; - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Basic(optional = false) - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID") - @ManyToOne - private Pricing pricing; - @JoinColumn(name = "PRICINGCLASSETARIFARIA_ID", referencedColumnName = "PRICINGCLASSETARIFARIA_ID") - @ManyToOne - private PricingClasseTarifaria pricingClasseTarifaria; - - public Integer getPricingocupaantecipaId() { - return pricingocupaantecipaId; - } - - public void setPricingocupaantecipaId(Integer pricingocupaantecipaId) { - this.pricingocupaantecipaId = pricingocupaantecipaId; - } - - public Integer getCantdiasmin() { - return cantdiasmin; - } - - public void setCantdiasmin(Integer cantdiasmin) { - this.cantdiasmin = cantdiasmin; - } - - public Integer getCantdiasmax() { - return cantdiasmax; - } - - public void setCantdiasmax(Integer cantdiasmax) { - this.cantdiasmax = cantdiasmax; - } - - public Integer getCantasientosmin() { - return cantasientosmin; - } - - public void setCantasientosmin(Integer cantasientosmin) { - this.cantasientosmin = cantasientosmin; - } - - public Integer getCantasientosmax() { - return cantasientosmax; - } - - public void setCantasientosmax(Integer cantasientosmax) { - this.cantasientosmax = cantasientosmax; - } - - public BigDecimal getPorcentaje() { - return porcentaje; - } - - public void setPorcentaje(BigDecimal porcentaje) { - this.porcentaje = porcentaje; - } - - public BigDecimal getOcupacioninicial() { - return ocupacioninicial; - } - - public void setOcupacioninicial(BigDecimal ocupacioninicial) { - this.ocupacioninicial = ocupacioninicial; - } - - public BigDecimal getOcupacionfinal() { - return ocupacionfinal; - } - - public void setOcupacionfinal(BigDecimal ocupacionfinal) { - this.ocupacionfinal = ocupacionfinal; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public Integer getActivo() { - return activo; - } - - public void setActivo(Integer activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Pricing getPricing() { - return pricing; - } - - public void setPricing(Pricing pricing) { - this.pricing = pricing; - } - - public PricingClasseTarifaria getPricingClasseTarifaria() { - return pricingClasseTarifaria; - } - - public void setPricingClasseTarifaria(PricingClasseTarifaria pricingClasseTarifaria) { - this.pricingClasseTarifaria = pricingClasseTarifaria; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (pricingocupaantecipaId != null ? pricingocupaantecipaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof PricingOcupaAntecipa)) { - return false; - } - PricingOcupaAntecipa other = (PricingOcupaAntecipa) object; - if ((this.pricingocupaantecipaId == null && other.pricingocupaantecipaId != null) || (this.pricingocupaantecipaId != null && !this.pricingocupaantecipaId.equals(other.pricingocupaantecipaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa[ pricingocupaantecipaId=" + pricingocupaantecipaId + " ]"; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PRICING_OCUPA_ANTECIPA_SEQ", sequenceName = "PRICING_OCUPA_ANTECIPA_SEQ", allocationSize = 1) +@Table(name = "PRICING_OCUPA_ANTECIPA") +public class PricingOcupaAntecipa implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_OCUPA_ANTECIPA_SEQ") + @Column(name = "PRICINGOCUPAANTECIPA_ID") + private Integer pricingocupaantecipaId; + @Column(name = "CANTDIASMIN") + private Integer cantdiasmin; + @Column(name = "CANTDIASMAX") + private Integer cantdiasmax; + @Column(name = "CANTASIENTOSMIN") + private Integer cantasientosmin; + @Column(name = "CANTASIENTOSMAX") + private Integer cantasientosmax; + @Column(name = "PORCENTAJE") + private BigDecimal porcentaje; + @Column(name = "OCUPACIONINICIAL") + private BigDecimal ocupacioninicial; + @Column(name = "OCUPACIONFINAL") + private BigDecimal ocupacionfinal; + @Column(name = "IMPORTE") + private BigDecimal importe; + @Basic(optional = false) + @Column(name = "ACTIVO") + private Integer activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PRICING_ID", referencedColumnName = "PRICING_ID") + @ManyToOne + private Pricing pricing; + @JoinColumn(name = "PRICINGCLASSETARIFARIA_ID", referencedColumnName = "PRICINGCLASSETARIFARIA_ID") + @ManyToOne + private PricingClasseTarifaria pricingClasseTarifaria; + + public Integer getPricingocupaantecipaId() { + return pricingocupaantecipaId; + } + + public void setPricingocupaantecipaId(Integer pricingocupaantecipaId) { + this.pricingocupaantecipaId = pricingocupaantecipaId; + } + + public Integer getCantdiasmin() { + return cantdiasmin; + } + + public void setCantdiasmin(Integer cantdiasmin) { + this.cantdiasmin = cantdiasmin; + } + + public Integer getCantdiasmax() { + return cantdiasmax; + } + + public void setCantdiasmax(Integer cantdiasmax) { + this.cantdiasmax = cantdiasmax; + } + + public Integer getCantasientosmin() { + return cantasientosmin; + } + + public void setCantasientosmin(Integer cantasientosmin) { + this.cantasientosmin = cantasientosmin; + } + + public Integer getCantasientosmax() { + return cantasientosmax; + } + + public void setCantasientosmax(Integer cantasientosmax) { + this.cantasientosmax = cantasientosmax; + } + + public BigDecimal getPorcentaje() { + return porcentaje; + } + + public void setPorcentaje(BigDecimal porcentaje) { + this.porcentaje = porcentaje; + } + + public BigDecimal getOcupacioninicial() { + return ocupacioninicial; + } + + public void setOcupacioninicial(BigDecimal ocupacioninicial) { + this.ocupacioninicial = ocupacioninicial; + } + + public BigDecimal getOcupacionfinal() { + return ocupacionfinal; + } + + public void setOcupacionfinal(BigDecimal ocupacionfinal) { + this.ocupacionfinal = ocupacionfinal; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public Integer getActivo() { + return activo; + } + + public void setActivo(Integer activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Pricing getPricing() { + return pricing; + } + + public void setPricing(Pricing pricing) { + this.pricing = pricing; + } + + public PricingClasseTarifaria getPricingClasseTarifaria() { + return pricingClasseTarifaria; + } + + public void setPricingClasseTarifaria(PricingClasseTarifaria pricingClasseTarifaria) { + this.pricingClasseTarifaria = pricingClasseTarifaria; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (pricingocupaantecipaId != null ? pricingocupaantecipaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof PricingOcupaAntecipa)) { + return false; + } + PricingOcupaAntecipa other = (PricingOcupaAntecipa) object; + if ((this.pricingocupaantecipaId == null && other.pricingocupaantecipaId != null) || (this.pricingocupaantecipaId != null && !this.pricingocupaantecipaId.equals(other.pricingocupaantecipaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa[ pricingocupaantecipaId=" + pricingocupaantecipaId + " ]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingPuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingPuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingRuta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingRuta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingTipoPtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingTipoPtoVta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingTipoPtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingTipoPtoVta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingTipoServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingTipoServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingTipoServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingTipoServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingVigencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingVigencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PricingVigencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PricingVigencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdClaseServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdClaseServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdClaseServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdClaseServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdFormaPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdFormaPago.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdFormaPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdFormaPago.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdMarca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdMarca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdMercado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdMercado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdMercado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdMercado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdPrecio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdPrecio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdPrecio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdPrecio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdPuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdPuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdRuta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdRuta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdTipoptovta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdTipoptovta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdTipoptovta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdTipoptovta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProdVigencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdVigencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProdVigencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProdVigencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ProductoServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProductoServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ProductoServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ProductoServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaCheckin.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaCheckin.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtoVtaCheckin.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaCheckin.java index 38ed81215..4d36ed67b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaCheckin.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaCheckin.java @@ -1,167 +1,167 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author RJ - */ -@AuditarClasse(nome = "PtoVtaCheckin", tela = "auditarClasse.PtoVtaCheckin") -@Entity -@SequenceGenerator(name = "PTOVTA_CHECKIN_SEQ", sequenceName = "PTOVTA_CHECKIN_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_CHECKIN") -public class PtoVtaCheckin implements Serializable, Auditavel{ - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_CHECKIN_SEQ") - @Column(name = "PTOVTACHECKIN_ID") - private Integer ptoVtaCheckinId; - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @OneToOne - private PuntoVenta puntoventaId; - - @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada paradaId; - - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @Transient - @NaoAuditar - private PtoVtaCheckin ptoVtaCheckinClone; - - public PtoVtaCheckin() { - } - - public PtoVtaCheckin(Integer ptoVtaCheckinId) { - this.ptoVtaCheckinId = ptoVtaCheckinId; - } - - public Integer getPtoVtaCheckinId() { - return ptoVtaCheckinId; - } - - public void setPtoVtaCheckinId(Integer ptoVtaCheckinId) { - this.ptoVtaCheckinId = ptoVtaCheckinId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Parada getParadaId() { - return paradaId; - } - - public void setParadaId(Parada paradaId) { - this.paradaId = paradaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptoVtaCheckinClone = new PtoVtaCheckin(); - ptoVtaCheckinClone = (PtoVtaCheckin) this.clone(); - Hibernate.initialize(ptoVtaCheckinClone.getPuntoventaId()); - - } - - @Override - public PtoVtaCheckin getCloneObject() throws CloneNotSupportedException { - return ptoVtaCheckinClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtoVtaCheckinId()); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptoVtaCheckinId != null ? ptoVtaCheckinId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof PtoVtaCheckin)) { - return false; - } - PtoVtaCheckin other = (PtoVtaCheckin) object; - if ((this.ptoVtaCheckinId == null && other.ptoVtaCheckinId != null) || (this.ptoVtaCheckinId != null && !this.ptoVtaCheckinId.equals(other.ptoVtaCheckinId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin[ ptoVtaCheckinId=" + ptoVtaCheckinId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author RJ + */ +@AuditarClasse(nome = "PtoVtaCheckin", tela = "auditarClasse.PtoVtaCheckin") +@Entity +@SequenceGenerator(name = "PTOVTA_CHECKIN_SEQ", sequenceName = "PTOVTA_CHECKIN_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_CHECKIN") +public class PtoVtaCheckin implements Serializable, Auditavel{ + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_CHECKIN_SEQ") + @Column(name = "PTOVTACHECKIN_ID") + private Integer ptoVtaCheckinId; + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @OneToOne + private PuntoVenta puntoventaId; + + @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada paradaId; + + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @Transient + @NaoAuditar + private PtoVtaCheckin ptoVtaCheckinClone; + + public PtoVtaCheckin() { + } + + public PtoVtaCheckin(Integer ptoVtaCheckinId) { + this.ptoVtaCheckinId = ptoVtaCheckinId; + } + + public Integer getPtoVtaCheckinId() { + return ptoVtaCheckinId; + } + + public void setPtoVtaCheckinId(Integer ptoVtaCheckinId) { + this.ptoVtaCheckinId = ptoVtaCheckinId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Parada getParadaId() { + return paradaId; + } + + public void setParadaId(Parada paradaId) { + this.paradaId = paradaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptoVtaCheckinClone = new PtoVtaCheckin(); + ptoVtaCheckinClone = (PtoVtaCheckin) this.clone(); + Hibernate.initialize(ptoVtaCheckinClone.getPuntoventaId()); + + } + + @Override + public PtoVtaCheckin getCloneObject() throws CloneNotSupportedException { + return ptoVtaCheckinClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtoVtaCheckinId()); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptoVtaCheckinId != null ? ptoVtaCheckinId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof PtoVtaCheckin)) { + return false; + } + PtoVtaCheckin other = (PtoVtaCheckin) object; + if ((this.ptoVtaCheckinId == null && other.ptoVtaCheckinId != null) || (this.ptoVtaCheckinId != null && !this.ptoVtaCheckinId.equals(other.ptoVtaCheckinId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin[ ptoVtaCheckinId=" + ptoVtaCheckinId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java index 935f1efae..2a24aebe6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java @@ -1,326 +1,326 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author RJ - */ -@AuditarClasse(nome = "PtoVtaSeguro", tela = "auditarClasse.PtoVtaSeguro") -@Entity -@SequenceGenerator(name = "PTOVTA_SEGURO_SEQ", sequenceName = "PTOVTA_SEGURO_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_SEGURO") -public class PtoVtaSeguro implements Serializable, Auditavel{ - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_SEGURO_SEQ") - @Column(name = "PTOVTASEGURO_ID") - private Integer ptoVtaSeguroId; - - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - - - @Basic(optional = false) - @Column(name = "INDVENDSEGOPCIONAL") - private Boolean indVendeSegOpcional; - - @Basic(optional = false) - @Column(name = "INDVENDSEGTABELA") - private Boolean indVendeSegTabela; - - @Basic(optional = false) - @Column(name = "INDESTANSEGOPCIONAL") - private Boolean indEstanSegOpcional; - - @Basic(optional = false) - @Column(name = "INDESTANSEGTABELA") - private Boolean indEstanSegTabela; - - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @OneToOne - private PuntoVenta puntoventaId; - - @Basic(optional = false) - @Column(name = "INDESTANTASAEMBARQUE") - private Boolean indEstanTasaEmbarque; - - @Basic(optional = false) - @Column(name = "INDPERMISOTASAEMBARQUE") - private Boolean indPermisoTasaEmbarque; - - @Basic(optional = false) - @Column(name = "INDPERMISOTASAEMBARQUEVTAMAN") - private Boolean indPermisoTasaEmbarqueVtaManual; - - @Basic(optional = false) - @Column(name = "INDPERMISOTASAEMBARQVTAAGEN") - private Boolean indPermisoTasaEmbarqVtaAgen; - - @Basic(optional = false) - @Column(name = "INDVENDESEGUROOPCEMBARCADA") - private Boolean indVendeSeguroOpcEmbarcada; - - @Basic(optional = false) - @Column(name = "INDVENDESEGUROTABELAEMBARCADA") - private Boolean indVendeSeguroTabelaEmbarcada; - - @Basic(optional = false) - @Column(name = "INDTAXAEMBARQUEEMBARCADA") - private Boolean indTaxaEmbarqueEmbarcada; - - @Basic(optional = false) - @Column(name = "INDVENDASISTVIAJE") - private Boolean indVendeAsistenciaDeViaje; - - @Basic(optional = false) - @Column(name = "INDESTANASISTVIAJE") - private Boolean indEstanAsistenciaDeViaje; - - @Transient - @NaoAuditar - private PtoVtaSeguro ptoVtaSeguroClone; - - - public PtoVtaSeguro() { - } - - public PtoVtaSeguro(Integer ptoVtaSeguroId) { - this.ptoVtaSeguroId = ptoVtaSeguroId; - } - - public Integer getPtoVtaSeguroId() { - return ptoVtaSeguroId; - } - - public void setPtoVtaSeguroId(Integer ptoVtaSeguroId) { - this.ptoVtaSeguroId = ptoVtaSeguroId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getIndVendeSegOpcional() { - return indVendeSegOpcional; - } - - public void setIndVendeSegOpcional(Boolean indVendeSegOpcional) { - this.indVendeSegOpcional = indVendeSegOpcional; - } - - public Boolean getIndVendeSegTabela() { - return indVendeSegTabela; - } - - public void setIndVendeSegTabela(Boolean indVendeSegTabela) { - this.indVendeSegTabela = indVendeSegTabela; - } - - public Boolean getIndEstanSegOpcional() { - return indEstanSegOpcional; - } - - public void setIndEstanSegOpcional(Boolean indEstanSegOpcional) { - this.indEstanSegOpcional = indEstanSegOpcional; - } - - public Boolean getIndEstanSegTabela() { - return indEstanSegTabela; - } - - public void setIndEstanSegTabela(Boolean indEstanSegTabela) { - this.indEstanSegTabela = indEstanSegTabela; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptoVtaSeguroId != null ? ptoVtaSeguroId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof PtoVtaSeguro)) { - return false; - } - PtoVtaSeguro other = (PtoVtaSeguro) object; - if ((this.ptoVtaSeguroId == null && other.ptoVtaSeguroId != null) || (this.ptoVtaSeguroId != null && !this.ptoVtaSeguroId.equals(other.ptoVtaSeguroId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro[ ptoVtaSeguroId=" + ptoVtaSeguroId + " ]"; - } - - public Boolean getIndEstanTasaEmbarque() { - return indEstanTasaEmbarque; - } - - public void setIndEstanTasaEmbarque(Boolean indEstanTasaEmbarque) { - this.indEstanTasaEmbarque = indEstanTasaEmbarque; - } - - public Boolean getIndPermisoTasaEmbarque() { - return indPermisoTasaEmbarque; - } - - public void setIndPermisoTasaEmbarque(Boolean indPermisoTasaEmbarque) { - this.indPermisoTasaEmbarque = indPermisoTasaEmbarque; - } - - public Boolean getIndPermisoTasaEmbarqueVtaManual() { - return indPermisoTasaEmbarqueVtaManual; - } - - public void setIndPermisoTasaEmbarqueVtaManual(Boolean indPermisoTasaEmbarqueVtaManual) { - this.indPermisoTasaEmbarqueVtaManual = indPermisoTasaEmbarqueVtaManual; - } - - public Boolean getIndPermisoTasaEmbarqueVtaAgencia() { - return indPermisoTasaEmbarqVtaAgen; - } - - public void setIndPermisoTasaEmbarqueVtaAgencia(Boolean indPermisoTasaEmbarqVtaAgen) { - this.indPermisoTasaEmbarqVtaAgen = indPermisoTasaEmbarqVtaAgen; - } - - public Boolean getIndVendeSeguroOpcEmbarcada() { - return indVendeSeguroOpcEmbarcada; - } - - public void setIndVendeSeguroOpcEmbarcada(Boolean indVendeSeguroOpcEmbarcada) { - this.indVendeSeguroOpcEmbarcada = indVendeSeguroOpcEmbarcada; - } - - public Boolean getIndVendeSeguroTabelaEmbarcada() { - return indVendeSeguroTabelaEmbarcada; - } - - public void setIndVendeSeguroTabelaEmbarcada(Boolean indVendeSeguroTabelaEmbarcada) { - this.indVendeSeguroTabelaEmbarcada = indVendeSeguroTabelaEmbarcada; - } - - public Boolean getIndTaxaEmbarqueEmbarcada() { - return indTaxaEmbarqueEmbarcada; - } - - public void setIndTaxaEmbarqueEmbarcada(Boolean indTaxaEmbarqueEmbarcada) { - this.indTaxaEmbarqueEmbarcada = indTaxaEmbarqueEmbarcada; - } - - public Boolean getIndVendeAsistenciaDeViaje() { - return indVendeAsistenciaDeViaje; - } - - public void setIndVendeAsistenciaDeViaje(Boolean indVendeAsistenciaDeViaje) { - this.indVendeAsistenciaDeViaje = indVendeAsistenciaDeViaje; - } - - public Boolean getIndEstanAsistenciaDeViaje() { - return indEstanAsistenciaDeViaje; - } - - public void setIndEstanAsistenciaDeViaje(Boolean indEstanAsistenciaDeViaje) { - this.indEstanAsistenciaDeViaje = indEstanAsistenciaDeViaje; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - ptoVtaSeguroClone = new PtoVtaSeguro(); - ptoVtaSeguroClone = (PtoVtaSeguro) this.clone(); - Hibernate.initialize(ptoVtaSeguroClone.getPuntoventaId()); - - } - - @Override - public PtoVtaSeguro getCloneObject() throws CloneNotSupportedException { - return ptoVtaSeguroClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtoVtaSeguroId()); - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author RJ + */ +@AuditarClasse(nome = "PtoVtaSeguro", tela = "auditarClasse.PtoVtaSeguro") +@Entity +@SequenceGenerator(name = "PTOVTA_SEGURO_SEQ", sequenceName = "PTOVTA_SEGURO_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_SEGURO") +public class PtoVtaSeguro implements Serializable, Auditavel{ + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_SEGURO_SEQ") + @Column(name = "PTOVTASEGURO_ID") + private Integer ptoVtaSeguroId; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + + + @Basic(optional = false) + @Column(name = "INDVENDSEGOPCIONAL") + private Boolean indVendeSegOpcional; + + @Basic(optional = false) + @Column(name = "INDVENDSEGTABELA") + private Boolean indVendeSegTabela; + + @Basic(optional = false) + @Column(name = "INDESTANSEGOPCIONAL") + private Boolean indEstanSegOpcional; + + @Basic(optional = false) + @Column(name = "INDESTANSEGTABELA") + private Boolean indEstanSegTabela; + + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @OneToOne + private PuntoVenta puntoventaId; + + @Basic(optional = false) + @Column(name = "INDESTANTASAEMBARQUE") + private Boolean indEstanTasaEmbarque; + + @Basic(optional = false) + @Column(name = "INDPERMISOTASAEMBARQUE") + private Boolean indPermisoTasaEmbarque; + + @Basic(optional = false) + @Column(name = "INDPERMISOTASAEMBARQUEVTAMAN") + private Boolean indPermisoTasaEmbarqueVtaManual; + + @Basic(optional = false) + @Column(name = "INDPERMISOTASAEMBARQVTAAGEN") + private Boolean indPermisoTasaEmbarqVtaAgen; + + @Basic(optional = false) + @Column(name = "INDVENDESEGUROOPCEMBARCADA") + private Boolean indVendeSeguroOpcEmbarcada; + + @Basic(optional = false) + @Column(name = "INDVENDESEGUROTABELAEMBARCADA") + private Boolean indVendeSeguroTabelaEmbarcada; + + @Basic(optional = false) + @Column(name = "INDTAXAEMBARQUEEMBARCADA") + private Boolean indTaxaEmbarqueEmbarcada; + + @Basic(optional = false) + @Column(name = "INDVENDASISTVIAJE") + private Boolean indVendeAsistenciaDeViaje; + + @Basic(optional = false) + @Column(name = "INDESTANASISTVIAJE") + private Boolean indEstanAsistenciaDeViaje; + + @Transient + @NaoAuditar + private PtoVtaSeguro ptoVtaSeguroClone; + + + public PtoVtaSeguro() { + } + + public PtoVtaSeguro(Integer ptoVtaSeguroId) { + this.ptoVtaSeguroId = ptoVtaSeguroId; + } + + public Integer getPtoVtaSeguroId() { + return ptoVtaSeguroId; + } + + public void setPtoVtaSeguroId(Integer ptoVtaSeguroId) { + this.ptoVtaSeguroId = ptoVtaSeguroId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getIndVendeSegOpcional() { + return indVendeSegOpcional; + } + + public void setIndVendeSegOpcional(Boolean indVendeSegOpcional) { + this.indVendeSegOpcional = indVendeSegOpcional; + } + + public Boolean getIndVendeSegTabela() { + return indVendeSegTabela; + } + + public void setIndVendeSegTabela(Boolean indVendeSegTabela) { + this.indVendeSegTabela = indVendeSegTabela; + } + + public Boolean getIndEstanSegOpcional() { + return indEstanSegOpcional; + } + + public void setIndEstanSegOpcional(Boolean indEstanSegOpcional) { + this.indEstanSegOpcional = indEstanSegOpcional; + } + + public Boolean getIndEstanSegTabela() { + return indEstanSegTabela; + } + + public void setIndEstanSegTabela(Boolean indEstanSegTabela) { + this.indEstanSegTabela = indEstanSegTabela; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptoVtaSeguroId != null ? ptoVtaSeguroId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof PtoVtaSeguro)) { + return false; + } + PtoVtaSeguro other = (PtoVtaSeguro) object; + if ((this.ptoVtaSeguroId == null && other.ptoVtaSeguroId != null) || (this.ptoVtaSeguroId != null && !this.ptoVtaSeguroId.equals(other.ptoVtaSeguroId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro[ ptoVtaSeguroId=" + ptoVtaSeguroId + " ]"; + } + + public Boolean getIndEstanTasaEmbarque() { + return indEstanTasaEmbarque; + } + + public void setIndEstanTasaEmbarque(Boolean indEstanTasaEmbarque) { + this.indEstanTasaEmbarque = indEstanTasaEmbarque; + } + + public Boolean getIndPermisoTasaEmbarque() { + return indPermisoTasaEmbarque; + } + + public void setIndPermisoTasaEmbarque(Boolean indPermisoTasaEmbarque) { + this.indPermisoTasaEmbarque = indPermisoTasaEmbarque; + } + + public Boolean getIndPermisoTasaEmbarqueVtaManual() { + return indPermisoTasaEmbarqueVtaManual; + } + + public void setIndPermisoTasaEmbarqueVtaManual(Boolean indPermisoTasaEmbarqueVtaManual) { + this.indPermisoTasaEmbarqueVtaManual = indPermisoTasaEmbarqueVtaManual; + } + + public Boolean getIndPermisoTasaEmbarqueVtaAgencia() { + return indPermisoTasaEmbarqVtaAgen; + } + + public void setIndPermisoTasaEmbarqueVtaAgencia(Boolean indPermisoTasaEmbarqVtaAgen) { + this.indPermisoTasaEmbarqVtaAgen = indPermisoTasaEmbarqVtaAgen; + } + + public Boolean getIndVendeSeguroOpcEmbarcada() { + return indVendeSeguroOpcEmbarcada; + } + + public void setIndVendeSeguroOpcEmbarcada(Boolean indVendeSeguroOpcEmbarcada) { + this.indVendeSeguroOpcEmbarcada = indVendeSeguroOpcEmbarcada; + } + + public Boolean getIndVendeSeguroTabelaEmbarcada() { + return indVendeSeguroTabelaEmbarcada; + } + + public void setIndVendeSeguroTabelaEmbarcada(Boolean indVendeSeguroTabelaEmbarcada) { + this.indVendeSeguroTabelaEmbarcada = indVendeSeguroTabelaEmbarcada; + } + + public Boolean getIndTaxaEmbarqueEmbarcada() { + return indTaxaEmbarqueEmbarcada; + } + + public void setIndTaxaEmbarqueEmbarcada(Boolean indTaxaEmbarqueEmbarcada) { + this.indTaxaEmbarqueEmbarcada = indTaxaEmbarqueEmbarcada; + } + + public Boolean getIndVendeAsistenciaDeViaje() { + return indVendeAsistenciaDeViaje; + } + + public void setIndVendeAsistenciaDeViaje(Boolean indVendeAsistenciaDeViaje) { + this.indVendeAsistenciaDeViaje = indVendeAsistenciaDeViaje; + } + + public Boolean getIndEstanAsistenciaDeViaje() { + return indEstanAsistenciaDeViaje; + } + + public void setIndEstanAsistenciaDeViaje(Boolean indEstanAsistenciaDeViaje) { + this.indEstanAsistenciaDeViaje = indEstanAsistenciaDeViaje; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + ptoVtaSeguroClone = new PtoVtaSeguro(); + ptoVtaSeguroClone = (PtoVtaSeguro) this.clone(); + Hibernate.initialize(ptoVtaSeguroClone.getPuntoventaId()); + + } + + @Override + public PtoVtaSeguro getCloneObject() throws CloneNotSupportedException { + return ptoVtaSeguroClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtoVtaSeguroId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaUsuarioBancario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaUsuarioBancario.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PtoVtaUsuarioBancario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtoVtaUsuarioBancario.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaAgencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgencia.java index b76258f42..13c6ae9b7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAgencia.java @@ -1,298 +1,298 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author Rafael - */ -@Entity -@SequenceGenerator(name = "PTOVTA_AGENCIA_SEQ", sequenceName = "PTOVTA_AGENCIA_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_AGENCIA") - -public class PtovtaAgencia implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_AGENCIA_SEQ") - @Column(name = "PTOVTAAGENCIA_ID") - private Integer ptovtaAgenciaId; - - @Column(name = "NUMAGENCIA") - private String numagencia; - - @Column(name = "NUMCONTA") - private String numconta; - - @Column(name = "DIGITO") - private String digito; - - @Column(name = "PESSOA") - private String pessoa; - - @Column(name = "TIPO") - private String tipo; - - @Column(name = "BILHETES") - private String bilhetes; - - @Column(name = "CARGA") - private String carga; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @JoinColumn(name = "INSTIFINANCEIRA_ID", referencedColumnName = "INSTIFINANCEIRA_ID") - @ManyToOne - private InstiFinanceira instiFinanceiraId; - - @OneToMany(cascade = CascadeType.ALL, mappedBy = "agenciaId") - private List puntoVentaList; - - public PtovtaAgencia() { - } - - public PtovtaAgencia(Integer ptovtaAgenciaId) { - this.ptovtaAgenciaId = ptovtaAgenciaId; - } - - - - public enum enumTipoConta { - // Declaração dos enum - CONTACORRENTE ("CONTA CORRENTE C/C", "CC"), - - POUPANCA ("POUPANCA", "P"); - - - - // Definição das constantes - public final String valor; - public final String descricao; - - - public String valor() { - return this.valor; - } - public String descricao() { - return this.descricao; - } - private enumTipoConta( String descricao, String valor) { - this.descricao = descricao; - this.valor = valor; - } - - - } - - public enum enumTipoPessoa { - // Declaração dos enum - PESSOAFISICA ("PESSOA FÍSICA", "F"), - - PESSOAJURIDICA ("PESSOA JURÍDICA", "J"); - - - - // Definição das constantes - public final String valor; - public final String descricao; - - - public String valor() { - return this.valor; - } - public String descricao() { - return this.descricao; - } - private enumTipoPessoa( String descricao, String valor) { - this.descricao = descricao; - this.valor = valor; - } - - - } - - public PtovtaAgencia(Integer ptovtaAgenciaId, String numagencia, String digito, String numconta, String pessoa, String tipo, String bilhetes, String carga, Boolean activo, Date fecmodif, int usuarioId) { - this.ptovtaAgenciaId = ptovtaAgenciaId; - this.numagencia = numagencia; - this.numconta = numconta; - this.digito = digito; - this.pessoa = pessoa; - this.tipo = tipo; - this.bilhetes = bilhetes; - this.carga = carga; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - - public Integer getPtovtaAgenciaId() { - return ptovtaAgenciaId; - } - - public void setPtovtaAgenciaId(Integer ptovtaAgenciaId) { - this.ptovtaAgenciaId = ptovtaAgenciaId; - } - - public String getNumagencia() { - return numagencia; - } - - public void setNumagencia(String numagencia) { - this.numagencia = numagencia; - } - - public String getNumconta() { - return numconta; - } - - public void setNumconta(String numconta) { - this.numconta = numconta; - } - - public String getDigito() { - return digito; - } - - public void setDigito(String digito) { - this.digito = digito; - } - - public String getPessoa() { - return pessoa; - } - - public void setPessoa(String pessoa) { - this.pessoa = pessoa; - } - - public String getTipo() { - return tipo; - } - - public void setTipo(String tipo) { - this.tipo = tipo; - } - - public String getBilhetes() { - return bilhetes; - } - - public void setBilhetes(String bilhetes) { - this.bilhetes = bilhetes; - } - - public String getCarga() { - return carga; - } - - public void setCarga(String carga) { - this.carga = carga; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - - - public InstiFinanceira getInstiFinanceiraId() { - return instiFinanceiraId; - } - - public void setInstiFinanceiraId(InstiFinanceira instiFinanceiraId) { - this.instiFinanceiraId = instiFinanceiraId; - } - - public List getPuntoVentaList() { - return puntoVentaList; - } - - public void setPuntoVentaList(List puntoVentaList) { - this.puntoVentaList = puntoVentaList; - } - - -// public static List getPessoaList() { -// return pessoaList; -// } -// -// public static List getTipoContaList() { -// return tpContaList; -// } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaAgenciaId != null ? ptovtaAgenciaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaAgencia)) { - return false; - } - PtovtaAgencia other = (PtovtaAgencia) object; - if ((this.ptovtaAgenciaId == null && other.ptovtaAgenciaId != null) || (this.ptovtaAgenciaId != null && !this.ptovtaAgenciaId.equals(other.ptovtaAgenciaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaAgencia[ ptovtaAgenciaId=" + ptovtaAgenciaId + " ]"; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author Rafael + */ +@Entity +@SequenceGenerator(name = "PTOVTA_AGENCIA_SEQ", sequenceName = "PTOVTA_AGENCIA_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_AGENCIA") + +public class PtovtaAgencia implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_AGENCIA_SEQ") + @Column(name = "PTOVTAAGENCIA_ID") + private Integer ptovtaAgenciaId; + + @Column(name = "NUMAGENCIA") + private String numagencia; + + @Column(name = "NUMCONTA") + private String numconta; + + @Column(name = "DIGITO") + private String digito; + + @Column(name = "PESSOA") + private String pessoa; + + @Column(name = "TIPO") + private String tipo; + + @Column(name = "BILHETES") + private String bilhetes; + + @Column(name = "CARGA") + private String carga; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @JoinColumn(name = "INSTIFINANCEIRA_ID", referencedColumnName = "INSTIFINANCEIRA_ID") + @ManyToOne + private InstiFinanceira instiFinanceiraId; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "agenciaId") + private List puntoVentaList; + + public PtovtaAgencia() { + } + + public PtovtaAgencia(Integer ptovtaAgenciaId) { + this.ptovtaAgenciaId = ptovtaAgenciaId; + } + + + + public enum enumTipoConta { + // Declaração dos enum + CONTACORRENTE ("CONTA CORRENTE C/C", "CC"), + + POUPANCA ("POUPANCA", "P"); + + + + // Definição das constantes + public final String valor; + public final String descricao; + + + public String valor() { + return this.valor; + } + public String descricao() { + return this.descricao; + } + private enumTipoConta( String descricao, String valor) { + this.descricao = descricao; + this.valor = valor; + } + + + } + + public enum enumTipoPessoa { + // Declaração dos enum + PESSOAFISICA ("PESSOA FÍSICA", "F"), + + PESSOAJURIDICA ("PESSOA JURÍDICA", "J"); + + + + // Definição das constantes + public final String valor; + public final String descricao; + + + public String valor() { + return this.valor; + } + public String descricao() { + return this.descricao; + } + private enumTipoPessoa( String descricao, String valor) { + this.descricao = descricao; + this.valor = valor; + } + + + } + + public PtovtaAgencia(Integer ptovtaAgenciaId, String numagencia, String digito, String numconta, String pessoa, String tipo, String bilhetes, String carga, Boolean activo, Date fecmodif, int usuarioId) { + this.ptovtaAgenciaId = ptovtaAgenciaId; + this.numagencia = numagencia; + this.numconta = numconta; + this.digito = digito; + this.pessoa = pessoa; + this.tipo = tipo; + this.bilhetes = bilhetes; + this.carga = carga; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + + public Integer getPtovtaAgenciaId() { + return ptovtaAgenciaId; + } + + public void setPtovtaAgenciaId(Integer ptovtaAgenciaId) { + this.ptovtaAgenciaId = ptovtaAgenciaId; + } + + public String getNumagencia() { + return numagencia; + } + + public void setNumagencia(String numagencia) { + this.numagencia = numagencia; + } + + public String getNumconta() { + return numconta; + } + + public void setNumconta(String numconta) { + this.numconta = numconta; + } + + public String getDigito() { + return digito; + } + + public void setDigito(String digito) { + this.digito = digito; + } + + public String getPessoa() { + return pessoa; + } + + public void setPessoa(String pessoa) { + this.pessoa = pessoa; + } + + public String getTipo() { + return tipo; + } + + public void setTipo(String tipo) { + this.tipo = tipo; + } + + public String getBilhetes() { + return bilhetes; + } + + public void setBilhetes(String bilhetes) { + this.bilhetes = bilhetes; + } + + public String getCarga() { + return carga; + } + + public void setCarga(String carga) { + this.carga = carga; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + + + public InstiFinanceira getInstiFinanceiraId() { + return instiFinanceiraId; + } + + public void setInstiFinanceiraId(InstiFinanceira instiFinanceiraId) { + this.instiFinanceiraId = instiFinanceiraId; + } + + public List getPuntoVentaList() { + return puntoVentaList; + } + + public void setPuntoVentaList(List puntoVentaList) { + this.puntoVentaList = puntoVentaList; + } + + +// public static List getPessoaList() { +// return pessoaList; +// } +// +// public static List getTipoContaList() { +// return tpContaList; +// } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaAgenciaId != null ? ptovtaAgenciaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaAgencia)) { + return false; + } + PtovtaAgencia other = (PtovtaAgencia) object; + if ((this.ptovtaAgenciaId == null && other.ptovtaAgenciaId != null) || (this.ptovtaAgenciaId != null && !this.ptovtaAgenciaId.equals(other.ptovtaAgenciaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaAgencia[ ptovtaAgenciaId=" + ptovtaAgenciaId + " ]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java index 537ce6c05..af375b633 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java @@ -1,202 +1,202 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Rafael - */ -@AuditarClasse(nome = "PtovtaAntecipacomissao", tela = "auditarClasse.PtovtaAntecipacomissao") -@Entity -@SequenceGenerator(name = "PTOVTA_ANTECIPACOMISSAO_SEQ", sequenceName = "PTOVTA_ANTECIPACOMISSAO_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_ANTECIPACOMISSAO") - -public class PtovtaAntecipacomissao implements Serializable, Auditavel{ - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ANTECIPACOMISSAO_SEQ") - @Column(name = " PTOVTAANTECIPACOMISSAO_ID") - private Integer ptovtaAntecipaComissaoId; - - @Column(name = "DATA") - @Temporal(TemporalType.TIMESTAMP) - private Date data; - - @Column(name = "RETEM") - private BigDecimal retem; - @Basic(optional = false) - @Column(name = "PERCENTUAL") - private BigDecimal percentual; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - @Transient - @NaoAuditar - private PtovtaAntecipacomissao ptovtaAntecipacomissaoClone; - - public PtovtaAntecipacomissao() { - } - - public PtovtaAntecipacomissao(Integer ptovtaAntecipaComissaoId) { - this.ptovtaAntecipaComissaoId = ptovtaAntecipaComissaoId; - } - - public PtovtaAntecipacomissao(Integer ptovtaAntecipaComissaoId, Date data, BigDecimal retem, BigDecimal percentual, Boolean activo, Date fecmodif, int usuarioId) { - this.ptovtaAntecipaComissaoId = ptovtaAntecipaComissaoId; - this.data = data; - this.retem = retem; - this.percentual = percentual; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - - public Integer getPtovtaAntecipaComissaoId() { - return ptovtaAntecipaComissaoId; - } - - public void setPtovtaAntecipaComissaoId(Integer ptovtaAntecipaComissaoId) { - this.ptovtaAntecipaComissaoId = ptovtaAntecipaComissaoId; - } - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - - public BigDecimal getRetem() { - return retem; - } - - public void setRetem(BigDecimal retem) { - this.retem = retem; - } - - public BigDecimal getPercentual() { - return percentual; - } - - public void setPercentual(BigDecimal percentual) { - this.percentual = percentual; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaAntecipaComissaoId != null ? ptovtaAntecipaComissaoId.hashCode() : 0); - return hash; - } - - @Override - public void clonar() throws CloneNotSupportedException { - - ptovtaAntecipacomissaoClone = new PtovtaAntecipacomissao(); - ptovtaAntecipacomissaoClone = (PtovtaAntecipacomissao) this.clone(); - Hibernate.initialize(ptovtaAntecipacomissaoClone.getPuntoventaId()); - } - - @Override - public PtovtaAntecipacomissao getCloneObject() throws CloneNotSupportedException { - return ptovtaAntecipacomissaoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaAntecipaComissaoId()); - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaAntecipacomissao)) { - return false; - } - PtovtaAntecipacomissao other = (PtovtaAntecipacomissao) object; - if ((this.ptovtaAntecipaComissaoId == null && other.ptovtaAntecipaComissaoId != null) || (this.ptovtaAntecipaComissaoId != null && !this.ptovtaAntecipaComissaoId.equals(other.ptovtaAntecipaComissaoId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao[ ptovtaAntecipaComissaoId=" + ptovtaAntecipaComissaoId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Rafael + */ +@AuditarClasse(nome = "PtovtaAntecipacomissao", tela = "auditarClasse.PtovtaAntecipacomissao") +@Entity +@SequenceGenerator(name = "PTOVTA_ANTECIPACOMISSAO_SEQ", sequenceName = "PTOVTA_ANTECIPACOMISSAO_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_ANTECIPACOMISSAO") + +public class PtovtaAntecipacomissao implements Serializable, Auditavel{ + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ANTECIPACOMISSAO_SEQ") + @Column(name = " PTOVTAANTECIPACOMISSAO_ID") + private Integer ptovtaAntecipaComissaoId; + + @Column(name = "DATA") + @Temporal(TemporalType.TIMESTAMP) + private Date data; + + @Column(name = "RETEM") + private BigDecimal retem; + @Basic(optional = false) + @Column(name = "PERCENTUAL") + private BigDecimal percentual; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + @Transient + @NaoAuditar + private PtovtaAntecipacomissao ptovtaAntecipacomissaoClone; + + public PtovtaAntecipacomissao() { + } + + public PtovtaAntecipacomissao(Integer ptovtaAntecipaComissaoId) { + this.ptovtaAntecipaComissaoId = ptovtaAntecipaComissaoId; + } + + public PtovtaAntecipacomissao(Integer ptovtaAntecipaComissaoId, Date data, BigDecimal retem, BigDecimal percentual, Boolean activo, Date fecmodif, int usuarioId) { + this.ptovtaAntecipaComissaoId = ptovtaAntecipaComissaoId; + this.data = data; + this.retem = retem; + this.percentual = percentual; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + + public Integer getPtovtaAntecipaComissaoId() { + return ptovtaAntecipaComissaoId; + } + + public void setPtovtaAntecipaComissaoId(Integer ptovtaAntecipaComissaoId) { + this.ptovtaAntecipaComissaoId = ptovtaAntecipaComissaoId; + } + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + + public BigDecimal getRetem() { + return retem; + } + + public void setRetem(BigDecimal retem) { + this.retem = retem; + } + + public BigDecimal getPercentual() { + return percentual; + } + + public void setPercentual(BigDecimal percentual) { + this.percentual = percentual; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaAntecipaComissaoId != null ? ptovtaAntecipaComissaoId.hashCode() : 0); + return hash; + } + + @Override + public void clonar() throws CloneNotSupportedException { + + ptovtaAntecipacomissaoClone = new PtovtaAntecipacomissao(); + ptovtaAntecipacomissaoClone = (PtovtaAntecipacomissao) this.clone(); + Hibernate.initialize(ptovtaAntecipacomissaoClone.getPuntoventaId()); + } + + @Override + public PtovtaAntecipacomissao getCloneObject() throws CloneNotSupportedException { + return ptovtaAntecipacomissaoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaAntecipaComissaoId()); + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaAntecipacomissao)) { + return false; + } + PtovtaAntecipacomissao other = (PtovtaAntecipacomissao) object; + if ((this.ptovtaAntecipaComissaoId == null && other.ptovtaAntecipaComissaoId != null) || (this.ptovtaAntecipaComissaoId != null && !this.ptovtaAntecipaComissaoId.equals(other.ptovtaAntecipaComissaoId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao[ ptovtaAntecipaComissaoId=" + ptovtaAntecipaComissaoId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntifraude.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntifraude.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaAntifraude.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntifraude.java index 7494180d9..5237c300e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntifraude.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntifraude.java @@ -1,194 +1,194 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import com.rjconsultores.ventaboletos.enums.TipoAntifraude; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * @author Wilian - */ -@AuditarClasse(nome = "PtovtaAntifraude", tela = "auditarClasse.PtovtaAntifraude") -@Entity -@SequenceGenerator(name = "PTOVTA_ANTIFRAUDE_SEQ", sequenceName = "PTOVTA_ANTIFRAUDE_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_ANTIFRAUDE") -public class PtovtaAntifraude implements Serializable , Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ANTIFRAUDE_SEQ") - @Column(name = "PTOVTAANTIFRAUDE_ID") - private Integer ptovtaAntifraudeId; - - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoventa; - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Enumerated(EnumType.STRING) - @Column(name = "tipo") - private TipoAntifraude tipo; - - @Column(name = "CHAVE") - private String chave; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @Transient - @NaoAuditar - private PtovtaAntifraude ptovtaAntifraudeClone; - - public PtovtaAntifraude() { - super(); - this.activo = true; - this.fecmodif = new Date(); - } - - public PtovtaAntifraude(Integer ptovtaAntifraudeId) { - this.ptovtaAntifraudeId = ptovtaAntifraudeId; - } - - public Integer getPtovtaAntifraudeId() { - return ptovtaAntifraudeId; - } - - public void setPtovtaAntifraudeId(Integer ptovtaAntifraudeId) { - this.ptovtaAntifraudeId = ptovtaAntifraudeId; - } - - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public TipoAntifraude getTipo() { - return tipo; - } - - public void setTipo(TipoAntifraude tipo) { - this.tipo = tipo; - } - - public String getChave() { - return chave; - } - - public void setChave(String chave) { - this.chave = chave; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ptovtaAntifraudeId == null) ? 0 : ptovtaAntifraudeId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof PtovtaAntifraude)) - return false; - PtovtaAntifraude other = (PtovtaAntifraude) obj; - if (ptovtaAntifraudeId == null) { - if (other.ptovtaAntifraudeId != null) - return false; - } else if (!ptovtaAntifraudeId.equals(other.ptovtaAntifraudeId)) - return false; - return true; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaAntifraudeClone = new PtovtaAntifraude(); - ptovtaAntifraudeClone = (PtovtaAntifraude) this.clone(); - Hibernate.initialize(ptovtaAntifraudeClone.getPuntoventa()); - - } - - @Override - public PtovtaAntifraude getCloneObject() throws CloneNotSupportedException { - return ptovtaAntifraudeClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaAntifraudeId()); - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import com.rjconsultores.ventaboletos.enums.TipoAntifraude; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * @author Wilian + */ +@AuditarClasse(nome = "PtovtaAntifraude", tela = "auditarClasse.PtovtaAntifraude") +@Entity +@SequenceGenerator(name = "PTOVTA_ANTIFRAUDE_SEQ", sequenceName = "PTOVTA_ANTIFRAUDE_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_ANTIFRAUDE") +public class PtovtaAntifraude implements Serializable , Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ANTIFRAUDE_SEQ") + @Column(name = "PTOVTAANTIFRAUDE_ID") + private Integer ptovtaAntifraudeId; + + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoventa; + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Enumerated(EnumType.STRING) + @Column(name = "tipo") + private TipoAntifraude tipo; + + @Column(name = "CHAVE") + private String chave; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @Transient + @NaoAuditar + private PtovtaAntifraude ptovtaAntifraudeClone; + + public PtovtaAntifraude() { + super(); + this.activo = true; + this.fecmodif = new Date(); + } + + public PtovtaAntifraude(Integer ptovtaAntifraudeId) { + this.ptovtaAntifraudeId = ptovtaAntifraudeId; + } + + public Integer getPtovtaAntifraudeId() { + return ptovtaAntifraudeId; + } + + public void setPtovtaAntifraudeId(Integer ptovtaAntifraudeId) { + this.ptovtaAntifraudeId = ptovtaAntifraudeId; + } + + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public TipoAntifraude getTipo() { + return tipo; + } + + public void setTipo(TipoAntifraude tipo) { + this.tipo = tipo; + } + + public String getChave() { + return chave; + } + + public void setChave(String chave) { + this.chave = chave; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ptovtaAntifraudeId == null) ? 0 : ptovtaAntifraudeId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof PtovtaAntifraude)) + return false; + PtovtaAntifraude other = (PtovtaAntifraude) obj; + if (ptovtaAntifraudeId == null) { + if (other.ptovtaAntifraudeId != null) + return false; + } else if (!ptovtaAntifraudeId.equals(other.ptovtaAntifraudeId)) + return false; + return true; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaAntifraudeClone = new PtovtaAntifraude(); + ptovtaAntifraudeClone = (PtovtaAntifraude) this.clone(); + Hibernate.initialize(ptovtaAntifraudeClone.getPuntoventa()); + + } + + @Override + public PtovtaAntifraude getCloneObject() throws CloneNotSupportedException { + return ptovtaAntifraudeClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaAntifraudeId()); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaCatInd.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaCatInd.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaCatInd.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaCatInd.java index 832a59fe2..11d5c4f7c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaCatInd.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaCatInd.java @@ -1,230 +1,230 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "PtovtaCatInd", tela = "auditarClasse.PtovtaCatInd") -@Entity -@SequenceGenerator(name = "PTOVTA_CAT_IND_SEQ", sequenceName = "PTOVTA_CAT_IND_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_CAT_IND") -public class PtovtaCatInd implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_CAT_IND_SEQ") - @Column(name = "PTOVTACATEGORIA_ID") - private Integer ptovtaCategoriaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") - @ManyToOne - private Categoria categoria; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - @JoinColumn(name = "USUARIOBLOQUEADO_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuarioBloqueado; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @Column(name = "INDTOTALBUS") - private Boolean indTotalBus; - @Column(name = "INDEMBARCADA") - private Boolean indEmbarcada; - - @Transient - @NaoAuditar - private PtovtaCatInd ptovtaCatIndConcedente; - - public Integer getPtovtaCategoriaId() { - return ptovtaCategoriaId; - } - - public void setPtovtaCategoriaId(Integer ptovtaCategoriaId) { - this.ptovtaCategoriaId = ptovtaCategoriaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Categoria getCategoria() { - return categoria; - } - - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - - - public Usuario getUsuarioBloqueado() { - return usuarioBloqueado; - } - - public void setUsuarioBloqueado(Usuario usuarioBloqueado) { - this.usuarioBloqueado = usuarioBloqueado; - } - - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getIndTotalBus() { - return indTotalBus; - } - - public void setIndTotalBus(Boolean indTotalBus) { - this.indTotalBus = indTotalBus; - } - - public Boolean getIndEmbarcada() { - return indEmbarcada; - } - - public void setIndEmbarcada(Boolean indEmbarcada) { - this.indEmbarcada = indEmbarcada; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaCatIndConcedente = new PtovtaCatInd(); - ptovtaCatIndConcedente = (PtovtaCatInd) this.clone(); - Hibernate.initialize(ptovtaCatIndConcedente.getPuntoVenta()); - - } - @Override - public PtovtaCatInd getCloneObject() throws CloneNotSupportedException { - return ptovtaCatIndConcedente; - } - - @Override - public String getTextoInclusaoExclusao() { - String totalbus = Boolean.TRUE.equals(getIndTotalBus()) ? "Totalbus : Sim" : "Totalbus : Não"; - String embarcada = Boolean.TRUE.equals(getIndEmbarcada()) ? "Embarcada : Sim" : "Embarcada : Não"; - return String.format("ID [%s]", getCategoria().getDesccategoria()+ "-"+totalbus+ "-"+embarcada); - } - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((categoria == null) ? 0 : categoria.hashCode()); - result = prime * result + ((fecmodif == null) ? 0 : fecmodif.hashCode()); - result = prime * result + ((ptovtaCategoriaId == null) ? 0 : ptovtaCategoriaId.hashCode()); - result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); - result = prime * result + ((usuarioId == null) ? 0 : usuarioId.hashCode()); - result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PtovtaCatInd other = (PtovtaCatInd) obj; - if (activo == null) { - if (other.activo != null) - return false; - } else if (!activo.equals(other.activo)) - return false; - if (categoria == null) { - if (other.categoria != null) - return false; - } else if (!categoria.equals(other.categoria)) - return false; - if (fecmodif == null) { - if (other.fecmodif != null) - return false; - } else if (!fecmodif.equals(other.fecmodif)) - return false; - if (ptovtaCategoriaId == null) { - if (other.ptovtaCategoriaId != null) - return false; - } else if (!ptovtaCategoriaId.equals(other.ptovtaCategoriaId)) - return false; - if (puntoVenta == null) { - if (other.puntoVenta != null) - return false; - } else if (!puntoVenta.equals(other.puntoVenta)) - return false; - if (usuarioId == null) { - if (other.usuarioId != null) - return false; - } else if (!usuarioId.equals(other.usuarioId)) - return false; - if (empresa == null) { - if (other.empresa != null) - return false; - } else if (!empresa.equals(other.empresa)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "PtovtaCatInd", tela = "auditarClasse.PtovtaCatInd") +@Entity +@SequenceGenerator(name = "PTOVTA_CAT_IND_SEQ", sequenceName = "PTOVTA_CAT_IND_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_CAT_IND") +public class PtovtaCatInd implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_CAT_IND_SEQ") + @Column(name = "PTOVTACATEGORIA_ID") + private Integer ptovtaCategoriaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") + @ManyToOne + private Categoria categoria; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + @JoinColumn(name = "USUARIOBLOQUEADO_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuarioBloqueado; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @Column(name = "INDTOTALBUS") + private Boolean indTotalBus; + @Column(name = "INDEMBARCADA") + private Boolean indEmbarcada; + + @Transient + @NaoAuditar + private PtovtaCatInd ptovtaCatIndConcedente; + + public Integer getPtovtaCategoriaId() { + return ptovtaCategoriaId; + } + + public void setPtovtaCategoriaId(Integer ptovtaCategoriaId) { + this.ptovtaCategoriaId = ptovtaCategoriaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + + + public Usuario getUsuarioBloqueado() { + return usuarioBloqueado; + } + + public void setUsuarioBloqueado(Usuario usuarioBloqueado) { + this.usuarioBloqueado = usuarioBloqueado; + } + + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getIndTotalBus() { + return indTotalBus; + } + + public void setIndTotalBus(Boolean indTotalBus) { + this.indTotalBus = indTotalBus; + } + + public Boolean getIndEmbarcada() { + return indEmbarcada; + } + + public void setIndEmbarcada(Boolean indEmbarcada) { + this.indEmbarcada = indEmbarcada; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaCatIndConcedente = new PtovtaCatInd(); + ptovtaCatIndConcedente = (PtovtaCatInd) this.clone(); + Hibernate.initialize(ptovtaCatIndConcedente.getPuntoVenta()); + + } + @Override + public PtovtaCatInd getCloneObject() throws CloneNotSupportedException { + return ptovtaCatIndConcedente; + } + + @Override + public String getTextoInclusaoExclusao() { + String totalbus = Boolean.TRUE.equals(getIndTotalBus()) ? "Totalbus : Sim" : "Totalbus : Não"; + String embarcada = Boolean.TRUE.equals(getIndEmbarcada()) ? "Embarcada : Sim" : "Embarcada : Não"; + return String.format("ID [%s]", getCategoria().getDesccategoria()+ "-"+totalbus+ "-"+embarcada); + } + + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((categoria == null) ? 0 : categoria.hashCode()); + result = prime * result + ((fecmodif == null) ? 0 : fecmodif.hashCode()); + result = prime * result + ((ptovtaCategoriaId == null) ? 0 : ptovtaCategoriaId.hashCode()); + result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); + result = prime * result + ((usuarioId == null) ? 0 : usuarioId.hashCode()); + result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PtovtaCatInd other = (PtovtaCatInd) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (categoria == null) { + if (other.categoria != null) + return false; + } else if (!categoria.equals(other.categoria)) + return false; + if (fecmodif == null) { + if (other.fecmodif != null) + return false; + } else if (!fecmodif.equals(other.fecmodif)) + return false; + if (ptovtaCategoriaId == null) { + if (other.ptovtaCategoriaId != null) + return false; + } else if (!ptovtaCategoriaId.equals(other.ptovtaCategoriaId)) + return false; + if (puntoVenta == null) { + if (other.puntoVenta != null) + return false; + } else if (!puntoVenta.equals(other.puntoVenta)) + return false; + if (usuarioId == null) { + if (other.usuarioId != null) + return false; + } else if (!usuarioId.equals(other.usuarioId)) + return false; + if (empresa == null) { + if (other.empresa != null) + return false; + } else if (!empresa.equals(other.empresa)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaComissao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaComissao.java index e2ca18efe..600fd0180 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaComissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaComissao.java @@ -1,661 +1,661 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.apache.commons.lang.BooleanUtils; - -import com.rjconsultores.ventaboletos.enums.ModeloComissaoImpressaoPosterior; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Rafael - */ -@AuditarClasse(nome = "PtovtaComissao", tela = "auditarClasse.PtovtaComissao") -@Entity -@SequenceGenerator(name = "PTOVTA_COMISSAO_SEQ", sequenceName = "PTOVTA_COMISSAO_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_COMISSAO") -public class PtovtaComissao implements Serializable, Auditavel { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_COMISSAO_SEQ") - @Column(name = "PTOVTACOMISSAO_ID") - private Integer ptovtaComissaoId; - - @Column(name = "ISSRETIDO") - private BigDecimal issretido; - - @Column(name = "ROYALTIES") - private BigDecimal royalties; - - @Column(name = "ENVIARRECIBO") - private Boolean enviarRecibo; - - @Column(name = "RECEITA") - private String receita; - - @OneToOne - @JoinColumn(name = "PTOVTADESCOMISSAO_ID") - private PuntoVenta descComissaoId; - - @Column(name = "PASSAGEMALTA") - private BigDecimal passagemAlta; - - @Column(name = "PASSAGEMBAIXA") - private BigDecimal passagemBaixa; - - @Column(name = "SEGUROALTA") - private BigDecimal seguroAlta; - - @Column(name = "SEGUROBAIXA") - private BigDecimal seguroBaixa; - - @Column(name = "OUTROSBAIXA") - private BigDecimal outrosBaixa; - - @Column(name = " OUTROSALTA") - private BigDecimal outrosAlta; - - @Column(name = "EXCESSOALTA") - private BigDecimal excessoAlta; - - @Column(name = "EXCESSOBAIXA") - private BigDecimal excessoBaixa; - - @Column(name = "TARIFARECEITA") - private Boolean tarifaReceita; - - @Column(name = " SEGURORECEITA") - private Boolean seguroReceita; - - @Column(name = "TAXARECEITA") - private Boolean taxaReceita; - - @Column(name = "PEDAGIORECEITA") - private Boolean pedagioReceita; - - @Column(name = " TARIFADEV") - private Boolean tarifaDev; - - @Column(name = " SEGURO_DEV") - private Boolean seguroDev; - - @Column(name = "TAXADEV") - private Boolean taxaDev; - - @Column(name = "PEDAGIODEV") - private Boolean pedagioDev; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @Column(name = "INDIMPRESSAOGAPPORC") - private Boolean indimpressaogapporc; - - @Column(name = "VALOR_IMPRESSAO_GAP") - private BigDecimal valorImpressaoGap; - - @Column(name = "VALOR_IMPRESSAO_GAP_ALTA") - private BigDecimal valorImpressaoGapAlta; - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresaId; - - @Column(name = "INDRETERCOMISSAO") - private Boolean indretercomissao; - - @Column(name = "INDBILHETESDEVCANORIGEM") - private Boolean indbilhetesdevcanorigem; - - @Column(name = "INDPAGACOMISSAOBILHETEOS") - private Boolean indPagaComissaoBilheteOS; - - @Column(name = "COMISSAOIMPPOSTERIOR") - @Enumerated(EnumType.STRING) - private ModeloComissaoImpressaoPosterior modeloComissaoImpressaoPosterior; - - @Column(name = "VALOR_IMP_GAP_COMP") - private BigDecimal valorImpGapComp; - - @Column(name = "VALOR_IMP_GAP_ALTA_COMP") - private BigDecimal valorImpGapCompAlta; - - @Column(name = "VALOR_VENDA_GAP_COMP") - private BigDecimal valorVendaGapComp; - - @Column(name = "VALOR_VENDA_GAP_ALTA_COMP") - private BigDecimal valorVendaGapCompAlta; - - @Column(name = "SEGUROOBRIGATORIOALTA") - private BigDecimal seguroobrigatorioAlta; - - @Column(name = "SEGUROOBRIGATORIOBAIXA") - private BigDecimal seguroobrigatorioBaixa; - - @Column(name = "RECARGACELULARALTA") - private BigDecimal recargaCelularAlta; - - @Column(name = "RECARGACELULARBAIXA") - private BigDecimal recargaCelularBaixa; - - @Transient - @NaoAuditar - private PtovtaComissao ptovtaComissaoClone; - - public PtovtaComissao() { - super(); - this.tarifaDev = Boolean.TRUE; - this.tarifaReceita = Boolean.TRUE; - } - - public enum Receita { - // Declaração dos enum - RECEITABRUTA("RECEITA BRUTA", "RB"), - - RECEITALIQUIDA("RECEITA LÍQUIDA ", "RL"); - - // Definição das constantes - public final String valor; - public final String descricao; - - public String valor() { - return this.valor; - } - - public String descricao() { - return this.descricao; - } - - private Receita(String descricao, String valor) { - this.descricao = descricao; - this.valor = valor; - } - - public static Receita getByValor(String valor) { - if (valor == null) { - return Receita.RECEITABRUTA; - } else { - if (valor.equals("RB")) - return Receita.RECEITABRUTA; - if (valor.equals("RL")) - return Receita.RECEITALIQUIDA; - } - - return null; - - } - - } - - public PtovtaComissao(Integer ptovtaComissaoId) { - this.ptovtaComissaoId = ptovtaComissaoId; - } - - public PtovtaComissao(Integer ptovtaComissaoId, BigDecimal issretido, BigDecimal royalties, Boolean enviarrecibo, String receita, BigDecimal passagemAlta, BigDecimal passagemBaixa, BigDecimal seguroAlta, BigDecimal seguroBaixa, BigDecimal outrosBaixa, BigDecimal outrosAlta, BigDecimal excessoAlta, BigDecimal excessoBaixa, Boolean tarifaReceita, Boolean seguroReceita, Boolean taxaReceita, Boolean pedagioReceita, Boolean tarifaDev, Boolean seguroDev, Boolean taxaDev, Boolean pegagioDev, Boolean activo, Date fecmodif, int usuarioId, Boolean indimpressaogapporc, BigDecimal valorImpressaoGap, - BigDecimal seguroobrigatorioBaixa, BigDecimal seguroobrigatorioAlta) { - super(); - this.ptovtaComissaoId = ptovtaComissaoId; - this.issretido = issretido; - this.royalties = royalties; - this.enviarRecibo = enviarrecibo; - this.receita = receita; - this.passagemAlta = passagemAlta; - this.passagemBaixa = passagemBaixa; - this.seguroAlta = seguroAlta; - this.seguroBaixa = seguroBaixa; - this.outrosBaixa = outrosBaixa; - this.outrosAlta = outrosAlta; - this.excessoAlta = excessoAlta; - this.excessoBaixa = excessoBaixa; - this.tarifaReceita = tarifaReceita; - this.seguroReceita = seguroReceita; - this.taxaReceita = taxaReceita; - this.pedagioReceita = pedagioReceita; - this.tarifaDev = tarifaDev; - this.seguroDev = seguroDev; - this.taxaDev = taxaDev; - this.pedagioDev = pegagioDev; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - this.indimpressaogapporc = indimpressaogapporc; - this.valorImpressaoGap = valorImpressaoGap; - this.seguroobrigatorioBaixa = seguroobrigatorioBaixa; - this.seguroobrigatorioAlta = seguroobrigatorioAlta; - } - - public Integer getPtovtaComissaoId() { - return ptovtaComissaoId; - } - - public void setPtovtaComissaoId(Integer ptovtaComissaoId) { - this.ptovtaComissaoId = ptovtaComissaoId; - } - - public PuntoVenta getDescComissaoId() { - return descComissaoId; - } - - public void setDescComissaoId(PuntoVenta descComissaoId) { - this.descComissaoId = descComissaoId; - } - - public BigDecimal getIssretido() { - return issretido; - } - - public void setIssretido(BigDecimal issretido) { - this.issretido = issretido; - } - - public BigDecimal getRoyalties() { - return royalties; - } - - public void setRoyalties(BigDecimal royalties) { - this.royalties = royalties; - } - - public Boolean getEnviarrecibo() { - return enviarRecibo; - } - - public void setEnviarrecibo(Boolean enviarRecibo) { - this.enviarRecibo = enviarRecibo; - } - - public String getReceita() { - return receita; - } - - public void setReceita(String receita) { - this.receita = receita; - } - - public BigDecimal getPassagemAlta() { - return passagemAlta; - } - - public void setPassagemAlta(BigDecimal passagemAlta) { - this.passagemAlta = passagemAlta; - } - - public BigDecimal getPassagemBaixa() { - return passagemBaixa; - } - - public void setPassagemBaixa(BigDecimal passagemBaixa) { - this.passagemBaixa = passagemBaixa; - } - - public BigDecimal getSeguroAlta() { - return seguroAlta; - } - - public void setSeguroAlta(BigDecimal seguroAlta) { - this.seguroAlta = seguroAlta; - } - - public BigDecimal getSeguroBaixa() { - return seguroBaixa; - } - - public void setSeguroBaixa(BigDecimal seguroBaixa) { - this.seguroBaixa = seguroBaixa; - } - - public BigDecimal getOutrosBaixa() { - return outrosBaixa; - } - - public void setOutrosBaixa(BigDecimal outrosBaixa) { - this.outrosBaixa = outrosBaixa; - } - - public BigDecimal getOutrosAlta() { - return outrosAlta; - } - - public void setOutrosAlta(BigDecimal outrosAlta) { - this.outrosAlta = outrosAlta; - } - - public BigDecimal getExcessoAlta() { - return excessoAlta; - } - - public void setExcessoAlta(BigDecimal excessoAlta) { - this.excessoAlta = excessoAlta; - } - - public BigDecimal getExcessoBaixa() { - return excessoBaixa; - } - - public void setExcessoBaixa(BigDecimal excessoBaixa) { - this.excessoBaixa = excessoBaixa; - } - - public Boolean getTarifaReceita() { - return tarifaReceita; - } - - public void setTarifaReceita(Boolean tarifaReceita) { - this.tarifaReceita = tarifaReceita; - } - - public Boolean getSeguroReceita() { - return seguroReceita != null ? seguroReceita : false; - } - - public void setSeguroReceita(Boolean seguroReceita) { - this.seguroReceita = seguroReceita; - } - - public Boolean getTaxaReceita() { - return taxaReceita; - } - - public void setTaxaReceita(Boolean taxaReceita) { - this.taxaReceita = taxaReceita; - } - - public Boolean getPedagioReceita() { - return pedagioReceita; - } - - public void setPedagioReceita(Boolean pedagioReceita) { - this.pedagioReceita = pedagioReceita; - } - - public Boolean getTarifaDev() { - return tarifaDev; - } - - public void setTarifaDev(Boolean tarifaDev) { - this.tarifaDev = tarifaDev; - } - - public Boolean getSeguroDev() { - return seguroDev != null ? seguroDev : false; - } - - public void setSeguroDev(Boolean seguroDev) { - this.seguroDev = seguroDev; - } - - public Boolean getTaxaDev() { - return taxaDev; - } - - public void setTaxaDev(Boolean taxaDev) { - this.taxaDev = taxaDev; - } - - public Boolean getPedagioDev() { - return pedagioDev; - } - - public void setPedagioDev(Boolean pegagioDev) { - this.pedagioDev = pegagioDev; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - // - - /** - * @return the empresaId - */ - public Empresa getEmpresaId() { - return empresaId; - } - - /** - * @param empresaId - * the empresaId to set - */ - public void setEmpresaId(Empresa empresaId) { - this.empresaId = empresaId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaComissaoId != null ? ptovtaComissaoId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaComissao)) { - return false; - } - PtovtaComissao other = (PtovtaComissao) object; - if ((this.ptovtaComissaoId == null && other.ptovtaComissaoId != null) || (this.ptovtaComissaoId != null && !this.ptovtaComissaoId.equals(other.ptovtaComissaoId))) { - return false; - } - return true; - } - - public Boolean getIndimpressaogapporc() { - return indimpressaogapporc; - } - - public void setIndimpressaogapporc(Boolean indimpressaogapporc) { - this.indimpressaogapporc = indimpressaogapporc; - } - - public BigDecimal getValorImpressaoGap() { - return valorImpressaoGap; - } - - public void setValorImpressaoGap(BigDecimal valorImpressaoGap) { - this.valorImpressaoGap = valorImpressaoGap; - } - - public Boolean getIndretercomissao() { - return indretercomissao; - } - - public void setIndretercomissao(Boolean indretercomissao) { - this.indretercomissao = indretercomissao; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaComissao[ ptovtaComissaoId=" + ptovtaComissaoId + " ]"; - } - - public Boolean getIndbilhetesdevcanorigem() { - return indbilhetesdevcanorigem; - } - - public void setIndbilhetesdevcanorigem(Boolean indbilhetesdevcanorigem) { - this.indbilhetesdevcanorigem = indbilhetesdevcanorigem; - } - - public BigDecimal getValorImpressaoGapAlta() { - return valorImpressaoGapAlta; - } - - public void setValorImpressaoGapAlta(BigDecimal valorImpressaoGapAlta) { - this.valorImpressaoGapAlta = valorImpressaoGapAlta; - } - - public Boolean getIndPagaComissaoBilheteOS() { - return indPagaComissaoBilheteOS; - } - - public void setIndPagaComissaoBilheteOS(Boolean indPagaComissaoBilheteOS) { - this.indPagaComissaoBilheteOS = indPagaComissaoBilheteOS; - } - - public ModeloComissaoImpressaoPosterior getModeloComissaoImpressaoPosterior() { - return modeloComissaoImpressaoPosterior; - } - - public void setModeloComissaoImpressaoPosterior(ModeloComissaoImpressaoPosterior modeloComissaoImpressaoPosterior) { - this.modeloComissaoImpressaoPosterior = modeloComissaoImpressaoPosterior; - } - - public BigDecimal getValorImpGapComp() { - return valorImpGapComp; - } - - public void setValorImpGapComp(BigDecimal valorImpGapComp) { - this.valorImpGapComp = valorImpGapComp; - } - - public BigDecimal getValorImpGapCompAlta() { - return valorImpGapCompAlta; - } - - public void setValorImpGapCompAlta(BigDecimal valorImpGapCompAlta) { - this.valorImpGapCompAlta = valorImpGapCompAlta; - } - - public BigDecimal getValorVendaGapComp() { - return valorVendaGapComp; - } - - public void setValorVendaGapComp(BigDecimal valorVendaGapComp) { - this.valorVendaGapComp = valorVendaGapComp; - } - - public BigDecimal getValorVendaGapCompAlta() { - return valorVendaGapCompAlta; - } - - public void setValorVendaGapCompAlta(BigDecimal valorVendaGapCompAlta) { - this.valorVendaGapCompAlta = valorVendaGapCompAlta; - } - - public BigDecimal getSeguroobrigatorioAlta() { - return seguroobrigatorioAlta; - } - - public void setSeguroobrigatorioAlta(BigDecimal seguroobrigatorioAlta) { - this.seguroobrigatorioAlta = seguroobrigatorioAlta; - } - - public BigDecimal getSeguroobrigatorioBaixa() { - return seguroobrigatorioBaixa; - } - - public void setSeguroobrigatorioBaixa(BigDecimal seguroobrigatorioBaixa) { - this.seguroobrigatorioBaixa = seguroobrigatorioBaixa; - } - - public BigDecimal getRecargaCelularAlta() { - return recargaCelularAlta; - } - - public void setRecargaCelularAlta(BigDecimal recargaCelularAlta) { - this.recargaCelularAlta = recargaCelularAlta; - } - - public BigDecimal getRecargaCelularBaixa() { - return recargaCelularBaixa; - } - - public void setRecargaCelularBaixa(BigDecimal recargaCelularBaixa) { - this.recargaCelularBaixa = recargaCelularBaixa; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaComissaoClone = new PtovtaComissao(); - ptovtaComissaoClone = (PtovtaComissao) this.clone(); - - if (this.getPuntoventaId() != null) { - if (BooleanUtils.isTrue(getPuntoventaId().getActivo())) { - getPuntoventaId().clonar(); - } - ptovtaComissaoClone.setPuntoventaId(getPuntoventaId()); - } - - } - - @Override - public PtovtaComissao getCloneObject() throws CloneNotSupportedException { - return ptovtaComissaoClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaComissaoId()); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.apache.commons.lang.BooleanUtils; + +import com.rjconsultores.ventaboletos.enums.ModeloComissaoImpressaoPosterior; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Rafael + */ +@AuditarClasse(nome = "PtovtaComissao", tela = "auditarClasse.PtovtaComissao") +@Entity +@SequenceGenerator(name = "PTOVTA_COMISSAO_SEQ", sequenceName = "PTOVTA_COMISSAO_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_COMISSAO") +public class PtovtaComissao implements Serializable, Auditavel { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_COMISSAO_SEQ") + @Column(name = "PTOVTACOMISSAO_ID") + private Integer ptovtaComissaoId; + + @Column(name = "ISSRETIDO") + private BigDecimal issretido; + + @Column(name = "ROYALTIES") + private BigDecimal royalties; + + @Column(name = "ENVIARRECIBO") + private Boolean enviarRecibo; + + @Column(name = "RECEITA") + private String receita; + + @OneToOne + @JoinColumn(name = "PTOVTADESCOMISSAO_ID") + private PuntoVenta descComissaoId; + + @Column(name = "PASSAGEMALTA") + private BigDecimal passagemAlta; + + @Column(name = "PASSAGEMBAIXA") + private BigDecimal passagemBaixa; + + @Column(name = "SEGUROALTA") + private BigDecimal seguroAlta; + + @Column(name = "SEGUROBAIXA") + private BigDecimal seguroBaixa; + + @Column(name = "OUTROSBAIXA") + private BigDecimal outrosBaixa; + + @Column(name = " OUTROSALTA") + private BigDecimal outrosAlta; + + @Column(name = "EXCESSOALTA") + private BigDecimal excessoAlta; + + @Column(name = "EXCESSOBAIXA") + private BigDecimal excessoBaixa; + + @Column(name = "TARIFARECEITA") + private Boolean tarifaReceita; + + @Column(name = " SEGURORECEITA") + private Boolean seguroReceita; + + @Column(name = "TAXARECEITA") + private Boolean taxaReceita; + + @Column(name = "PEDAGIORECEITA") + private Boolean pedagioReceita; + + @Column(name = " TARIFADEV") + private Boolean tarifaDev; + + @Column(name = " SEGURO_DEV") + private Boolean seguroDev; + + @Column(name = "TAXADEV") + private Boolean taxaDev; + + @Column(name = "PEDAGIODEV") + private Boolean pedagioDev; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @Column(name = "INDIMPRESSAOGAPPORC") + private Boolean indimpressaogapporc; + + @Column(name = "VALOR_IMPRESSAO_GAP") + private BigDecimal valorImpressaoGap; + + @Column(name = "VALOR_IMPRESSAO_GAP_ALTA") + private BigDecimal valorImpressaoGapAlta; + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresaId; + + @Column(name = "INDRETERCOMISSAO") + private Boolean indretercomissao; + + @Column(name = "INDBILHETESDEVCANORIGEM") + private Boolean indbilhetesdevcanorigem; + + @Column(name = "INDPAGACOMISSAOBILHETEOS") + private Boolean indPagaComissaoBilheteOS; + + @Column(name = "COMISSAOIMPPOSTERIOR") + @Enumerated(EnumType.STRING) + private ModeloComissaoImpressaoPosterior modeloComissaoImpressaoPosterior; + + @Column(name = "VALOR_IMP_GAP_COMP") + private BigDecimal valorImpGapComp; + + @Column(name = "VALOR_IMP_GAP_ALTA_COMP") + private BigDecimal valorImpGapCompAlta; + + @Column(name = "VALOR_VENDA_GAP_COMP") + private BigDecimal valorVendaGapComp; + + @Column(name = "VALOR_VENDA_GAP_ALTA_COMP") + private BigDecimal valorVendaGapCompAlta; + + @Column(name = "SEGUROOBRIGATORIOALTA") + private BigDecimal seguroobrigatorioAlta; + + @Column(name = "SEGUROOBRIGATORIOBAIXA") + private BigDecimal seguroobrigatorioBaixa; + + @Column(name = "RECARGACELULARALTA") + private BigDecimal recargaCelularAlta; + + @Column(name = "RECARGACELULARBAIXA") + private BigDecimal recargaCelularBaixa; + + @Transient + @NaoAuditar + private PtovtaComissao ptovtaComissaoClone; + + public PtovtaComissao() { + super(); + this.tarifaDev = Boolean.TRUE; + this.tarifaReceita = Boolean.TRUE; + } + + public enum Receita { + // Declaração dos enum + RECEITABRUTA("RECEITA BRUTA", "RB"), + + RECEITALIQUIDA("RECEITA LÍQUIDA ", "RL"); + + // Definição das constantes + public final String valor; + public final String descricao; + + public String valor() { + return this.valor; + } + + public String descricao() { + return this.descricao; + } + + private Receita(String descricao, String valor) { + this.descricao = descricao; + this.valor = valor; + } + + public static Receita getByValor(String valor) { + if (valor == null) { + return Receita.RECEITABRUTA; + } else { + if (valor.equals("RB")) + return Receita.RECEITABRUTA; + if (valor.equals("RL")) + return Receita.RECEITALIQUIDA; + } + + return null; + + } + + } + + public PtovtaComissao(Integer ptovtaComissaoId) { + this.ptovtaComissaoId = ptovtaComissaoId; + } + + public PtovtaComissao(Integer ptovtaComissaoId, BigDecimal issretido, BigDecimal royalties, Boolean enviarrecibo, String receita, BigDecimal passagemAlta, BigDecimal passagemBaixa, BigDecimal seguroAlta, BigDecimal seguroBaixa, BigDecimal outrosBaixa, BigDecimal outrosAlta, BigDecimal excessoAlta, BigDecimal excessoBaixa, Boolean tarifaReceita, Boolean seguroReceita, Boolean taxaReceita, Boolean pedagioReceita, Boolean tarifaDev, Boolean seguroDev, Boolean taxaDev, Boolean pegagioDev, Boolean activo, Date fecmodif, int usuarioId, Boolean indimpressaogapporc, BigDecimal valorImpressaoGap, + BigDecimal seguroobrigatorioBaixa, BigDecimal seguroobrigatorioAlta) { + super(); + this.ptovtaComissaoId = ptovtaComissaoId; + this.issretido = issretido; + this.royalties = royalties; + this.enviarRecibo = enviarrecibo; + this.receita = receita; + this.passagemAlta = passagemAlta; + this.passagemBaixa = passagemBaixa; + this.seguroAlta = seguroAlta; + this.seguroBaixa = seguroBaixa; + this.outrosBaixa = outrosBaixa; + this.outrosAlta = outrosAlta; + this.excessoAlta = excessoAlta; + this.excessoBaixa = excessoBaixa; + this.tarifaReceita = tarifaReceita; + this.seguroReceita = seguroReceita; + this.taxaReceita = taxaReceita; + this.pedagioReceita = pedagioReceita; + this.tarifaDev = tarifaDev; + this.seguroDev = seguroDev; + this.taxaDev = taxaDev; + this.pedagioDev = pegagioDev; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + this.indimpressaogapporc = indimpressaogapporc; + this.valorImpressaoGap = valorImpressaoGap; + this.seguroobrigatorioBaixa = seguroobrigatorioBaixa; + this.seguroobrigatorioAlta = seguroobrigatorioAlta; + } + + public Integer getPtovtaComissaoId() { + return ptovtaComissaoId; + } + + public void setPtovtaComissaoId(Integer ptovtaComissaoId) { + this.ptovtaComissaoId = ptovtaComissaoId; + } + + public PuntoVenta getDescComissaoId() { + return descComissaoId; + } + + public void setDescComissaoId(PuntoVenta descComissaoId) { + this.descComissaoId = descComissaoId; + } + + public BigDecimal getIssretido() { + return issretido; + } + + public void setIssretido(BigDecimal issretido) { + this.issretido = issretido; + } + + public BigDecimal getRoyalties() { + return royalties; + } + + public void setRoyalties(BigDecimal royalties) { + this.royalties = royalties; + } + + public Boolean getEnviarrecibo() { + return enviarRecibo; + } + + public void setEnviarrecibo(Boolean enviarRecibo) { + this.enviarRecibo = enviarRecibo; + } + + public String getReceita() { + return receita; + } + + public void setReceita(String receita) { + this.receita = receita; + } + + public BigDecimal getPassagemAlta() { + return passagemAlta; + } + + public void setPassagemAlta(BigDecimal passagemAlta) { + this.passagemAlta = passagemAlta; + } + + public BigDecimal getPassagemBaixa() { + return passagemBaixa; + } + + public void setPassagemBaixa(BigDecimal passagemBaixa) { + this.passagemBaixa = passagemBaixa; + } + + public BigDecimal getSeguroAlta() { + return seguroAlta; + } + + public void setSeguroAlta(BigDecimal seguroAlta) { + this.seguroAlta = seguroAlta; + } + + public BigDecimal getSeguroBaixa() { + return seguroBaixa; + } + + public void setSeguroBaixa(BigDecimal seguroBaixa) { + this.seguroBaixa = seguroBaixa; + } + + public BigDecimal getOutrosBaixa() { + return outrosBaixa; + } + + public void setOutrosBaixa(BigDecimal outrosBaixa) { + this.outrosBaixa = outrosBaixa; + } + + public BigDecimal getOutrosAlta() { + return outrosAlta; + } + + public void setOutrosAlta(BigDecimal outrosAlta) { + this.outrosAlta = outrosAlta; + } + + public BigDecimal getExcessoAlta() { + return excessoAlta; + } + + public void setExcessoAlta(BigDecimal excessoAlta) { + this.excessoAlta = excessoAlta; + } + + public BigDecimal getExcessoBaixa() { + return excessoBaixa; + } + + public void setExcessoBaixa(BigDecimal excessoBaixa) { + this.excessoBaixa = excessoBaixa; + } + + public Boolean getTarifaReceita() { + return tarifaReceita; + } + + public void setTarifaReceita(Boolean tarifaReceita) { + this.tarifaReceita = tarifaReceita; + } + + public Boolean getSeguroReceita() { + return seguroReceita != null ? seguroReceita : false; + } + + public void setSeguroReceita(Boolean seguroReceita) { + this.seguroReceita = seguroReceita; + } + + public Boolean getTaxaReceita() { + return taxaReceita; + } + + public void setTaxaReceita(Boolean taxaReceita) { + this.taxaReceita = taxaReceita; + } + + public Boolean getPedagioReceita() { + return pedagioReceita; + } + + public void setPedagioReceita(Boolean pedagioReceita) { + this.pedagioReceita = pedagioReceita; + } + + public Boolean getTarifaDev() { + return tarifaDev; + } + + public void setTarifaDev(Boolean tarifaDev) { + this.tarifaDev = tarifaDev; + } + + public Boolean getSeguroDev() { + return seguroDev != null ? seguroDev : false; + } + + public void setSeguroDev(Boolean seguroDev) { + this.seguroDev = seguroDev; + } + + public Boolean getTaxaDev() { + return taxaDev; + } + + public void setTaxaDev(Boolean taxaDev) { + this.taxaDev = taxaDev; + } + + public Boolean getPedagioDev() { + return pedagioDev; + } + + public void setPedagioDev(Boolean pegagioDev) { + this.pedagioDev = pegagioDev; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + // + + /** + * @return the empresaId + */ + public Empresa getEmpresaId() { + return empresaId; + } + + /** + * @param empresaId + * the empresaId to set + */ + public void setEmpresaId(Empresa empresaId) { + this.empresaId = empresaId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaComissaoId != null ? ptovtaComissaoId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaComissao)) { + return false; + } + PtovtaComissao other = (PtovtaComissao) object; + if ((this.ptovtaComissaoId == null && other.ptovtaComissaoId != null) || (this.ptovtaComissaoId != null && !this.ptovtaComissaoId.equals(other.ptovtaComissaoId))) { + return false; + } + return true; + } + + public Boolean getIndimpressaogapporc() { + return indimpressaogapporc; + } + + public void setIndimpressaogapporc(Boolean indimpressaogapporc) { + this.indimpressaogapporc = indimpressaogapporc; + } + + public BigDecimal getValorImpressaoGap() { + return valorImpressaoGap; + } + + public void setValorImpressaoGap(BigDecimal valorImpressaoGap) { + this.valorImpressaoGap = valorImpressaoGap; + } + + public Boolean getIndretercomissao() { + return indretercomissao; + } + + public void setIndretercomissao(Boolean indretercomissao) { + this.indretercomissao = indretercomissao; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaComissao[ ptovtaComissaoId=" + ptovtaComissaoId + " ]"; + } + + public Boolean getIndbilhetesdevcanorigem() { + return indbilhetesdevcanorigem; + } + + public void setIndbilhetesdevcanorigem(Boolean indbilhetesdevcanorigem) { + this.indbilhetesdevcanorigem = indbilhetesdevcanorigem; + } + + public BigDecimal getValorImpressaoGapAlta() { + return valorImpressaoGapAlta; + } + + public void setValorImpressaoGapAlta(BigDecimal valorImpressaoGapAlta) { + this.valorImpressaoGapAlta = valorImpressaoGapAlta; + } + + public Boolean getIndPagaComissaoBilheteOS() { + return indPagaComissaoBilheteOS; + } + + public void setIndPagaComissaoBilheteOS(Boolean indPagaComissaoBilheteOS) { + this.indPagaComissaoBilheteOS = indPagaComissaoBilheteOS; + } + + public ModeloComissaoImpressaoPosterior getModeloComissaoImpressaoPosterior() { + return modeloComissaoImpressaoPosterior; + } + + public void setModeloComissaoImpressaoPosterior(ModeloComissaoImpressaoPosterior modeloComissaoImpressaoPosterior) { + this.modeloComissaoImpressaoPosterior = modeloComissaoImpressaoPosterior; + } + + public BigDecimal getValorImpGapComp() { + return valorImpGapComp; + } + + public void setValorImpGapComp(BigDecimal valorImpGapComp) { + this.valorImpGapComp = valorImpGapComp; + } + + public BigDecimal getValorImpGapCompAlta() { + return valorImpGapCompAlta; + } + + public void setValorImpGapCompAlta(BigDecimal valorImpGapCompAlta) { + this.valorImpGapCompAlta = valorImpGapCompAlta; + } + + public BigDecimal getValorVendaGapComp() { + return valorVendaGapComp; + } + + public void setValorVendaGapComp(BigDecimal valorVendaGapComp) { + this.valorVendaGapComp = valorVendaGapComp; + } + + public BigDecimal getValorVendaGapCompAlta() { + return valorVendaGapCompAlta; + } + + public void setValorVendaGapCompAlta(BigDecimal valorVendaGapCompAlta) { + this.valorVendaGapCompAlta = valorVendaGapCompAlta; + } + + public BigDecimal getSeguroobrigatorioAlta() { + return seguroobrigatorioAlta; + } + + public void setSeguroobrigatorioAlta(BigDecimal seguroobrigatorioAlta) { + this.seguroobrigatorioAlta = seguroobrigatorioAlta; + } + + public BigDecimal getSeguroobrigatorioBaixa() { + return seguroobrigatorioBaixa; + } + + public void setSeguroobrigatorioBaixa(BigDecimal seguroobrigatorioBaixa) { + this.seguroobrigatorioBaixa = seguroobrigatorioBaixa; + } + + public BigDecimal getRecargaCelularAlta() { + return recargaCelularAlta; + } + + public void setRecargaCelularAlta(BigDecimal recargaCelularAlta) { + this.recargaCelularAlta = recargaCelularAlta; + } + + public BigDecimal getRecargaCelularBaixa() { + return recargaCelularBaixa; + } + + public void setRecargaCelularBaixa(BigDecimal recargaCelularBaixa) { + this.recargaCelularBaixa = recargaCelularBaixa; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaComissaoClone = new PtovtaComissao(); + ptovtaComissaoClone = (PtovtaComissao) this.clone(); + + if (this.getPuntoventaId() != null) { + if (BooleanUtils.isTrue(getPuntoventaId().getActivo())) { + getPuntoventaId().clonar(); + } + ptovtaComissaoClone.setPuntoventaId(getPuntoventaId()); + } + + } + + @Override + public PtovtaComissao getCloneObject() throws CloneNotSupportedException { + return ptovtaComissaoClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaComissaoId()); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaContaMD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaContaMD.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaContaMD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaContaMD.java index 98bc57cd8..e87eb6642 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaContaMD.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaContaMD.java @@ -1,126 +1,126 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "PTOVTACONTA_SEQ", sequenceName = "PTOVTACONTA_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_CONTA") -public class PtovtaContaMD { - - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTACONTA_SEQ") - @Column(name = "PTOVTACONTA_ID") - private Integer ptovtaContaId; - - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresaId; - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - @JoinColumn(name = "CONTA_ID", referencedColumnName = "CONTA_ID") - @ManyToOne - private ContaMD contaId; - - @Column(name = "PERCENTUAL") - private BigDecimal percentual; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "ACTIVO") - private Boolean activo; - - public Integer getPtovtaContaId() { - return ptovtaContaId; - } - - public void setPtovtaContaId(Integer ptovtaContaId) { - this.ptovtaContaId = ptovtaContaId; - } - - public Empresa getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Empresa empresaId) { - this.empresaId = empresaId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public ContaMD getContaId() { - return contaId; - } - - public void setContaId(ContaMD contaId) { - this.contaId = contaId; - } - - public BigDecimal getPercentual() { - return percentual; - } - - public void setPercentual(BigDecimal percentual) { - this.percentual = percentual; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Override - public String toString() { - return "PtovtaConta [ptovtaContaId=" + ptovtaContaId + ", empresaId=" + empresaId + ", puntoventaId=" + puntoventaId + ", contaId=" + contaId + ", percentual=" + percentual + ", usuarioId=" + usuarioId + ", fecmodif=" + fecmodif + ", activo=" + activo + "]"; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "PTOVTACONTA_SEQ", sequenceName = "PTOVTACONTA_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_CONTA") +public class PtovtaContaMD { + + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTACONTA_SEQ") + @Column(name = "PTOVTACONTA_ID") + private Integer ptovtaContaId; + + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresaId; + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + @JoinColumn(name = "CONTA_ID", referencedColumnName = "CONTA_ID") + @ManyToOne + private ContaMD contaId; + + @Column(name = "PERCENTUAL") + private BigDecimal percentual; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "ACTIVO") + private Boolean activo; + + public Integer getPtovtaContaId() { + return ptovtaContaId; + } + + public void setPtovtaContaId(Integer ptovtaContaId) { + this.ptovtaContaId = ptovtaContaId; + } + + public Empresa getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Empresa empresaId) { + this.empresaId = empresaId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public ContaMD getContaId() { + return contaId; + } + + public void setContaId(ContaMD contaId) { + this.contaId = contaId; + } + + public BigDecimal getPercentual() { + return percentual; + } + + public void setPercentual(BigDecimal percentual) { + this.percentual = percentual; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Override + public String toString() { + return "PtovtaConta [ptovtaContaId=" + ptovtaContaId + ", empresaId=" + empresaId + ", puntoventaId=" + puntoventaId + ", contaId=" + contaId + ", percentual=" + percentual + ", usuarioId=" + usuarioId + ", fecmodif=" + fecmodif + ", activo=" + activo + "]"; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaDiversos.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaDiversos.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaDiversos.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaDiversos.java index f47d4e0c3..58b4da607 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaDiversos.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaDiversos.java @@ -1,324 +1,324 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author Rafael - */ -@Entity -@SequenceGenerator(name = "PTOVTA_DIVERSOS_SEQ", sequenceName = "PTOVTA_DIVERSOS_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_DIVERSOS") -public class PtovtaDiversos implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_DIVERSOS_SEQ") - @Column(name = "PTOVTADIVERSOS_ID ") - private Integer ptovtaDiversosId; - - @Column(name = "RESPONALUGUEL") - private String responAluguel; - - @Column(name = "RESPONTELEFONE") - private String responTelefone; - - @Column(name = "RESPONENERGIA") - private String responEnergia; - - @Column(name = "POSICAO") - private String posicao; - - @Column(name = "INFORMATIZADA") - private Boolean informatizada; - - @Column(name = "BILHETEINFO") - private Boolean bilheteInfo; - - @Column(name = "VENDAINTERNET") - private Boolean vendaInternet; - - @Column(name = "DIGITACAOSEQ") - private Boolean digitacaoSeq; - - @Column(name = "TELEENTREGA") - private Boolean teleEntrega; - - @Column(name = "TRABALHABILHETE") - private Boolean trabalhaBilhete; - - @Column(name = "TRABOFPSPROPRIA") - private Boolean ofpsPropria; - - @Column(name = "TRABOFPSTERCEIROS") - private Boolean ofpsTerceiros; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - public PtovtaDiversos() { - } - - public enum gerarEnum { - // Declaração dos enum - - - POSICAOFORAEIXO ("FORA DO EIXO DA LINHA", "FEL"), - POSICAONOEIXO ("NO EIXO DA LINHA", "EL"); - - - - // Definição das constantes - public final String valor; - public final String descricao; - - - public String valor() { - return this.valor; - } - public String descricao() { - return this.descricao; - } - private gerarEnum( String descricao, String valor) { - this.descricao = descricao; - this.valor = valor; - } - - - } - -// private static List posicaoList = new ArrayList(); -// -// static{ -// posicaoList.add("FORA DO EIXO DA LINHA"); -// posicaoList.add("NO EIXO DA LINHA"); -// -// } -// - - public PtovtaDiversos(Integer ptovtaDiversosId, String responAluguel, String responTelefone, String responEnergia, String posicao, Boolean informatizada, Boolean bilheteInfo, Boolean vendaInternet, Boolean digitacaoSeq, Boolean teleEntrega, Boolean trabalhaBilhete, Boolean ofpsPropria, Boolean ofpsTerceiros, Boolean activo, Date fecmodif, int usuarioId) { - super(); - this.ptovtaDiversosId = ptovtaDiversosId; - this.responAluguel = responAluguel; - this.responTelefone = responTelefone; - this.responEnergia = responEnergia; - this.posicao = posicao; - this.informatizada = informatizada; - this.bilheteInfo = bilheteInfo; - this.vendaInternet = vendaInternet; - this.digitacaoSeq = digitacaoSeq; - this.teleEntrega = teleEntrega; - this.trabalhaBilhete = trabalhaBilhete; - this.ofpsPropria = ofpsPropria; - this.ofpsTerceiros = ofpsTerceiros; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - public Integer getPtovtaDiversosId() { - return ptovtaDiversosId; - } - - public void setPtovtaDiversosId(Integer ptovtaDiversosId) { - this.ptovtaDiversosId = ptovtaDiversosId; - } - - public String getResponAluguel() { - return responAluguel; - } - - public void setResponAluguel(String responAluguel) { - this.responAluguel = responAluguel; - } - - public String getResponTelefone() { - return responTelefone; - } - - public void setResponTelefone(String responTelefone) { - this.responTelefone = responTelefone; - } - - public String getResponEnergia() { - return responEnergia; - } - - public void setResponEnergia(String responEnergia) { - this.responEnergia = responEnergia; - } - - public String getPosicao() { - return posicao; - } - - public void setPosicao(String posicao) { - this.posicao = posicao; - } - - - public Boolean getInformatizada() { - return informatizada; - } - - public void setInformatizada(Boolean informatizada) { - this.informatizada = informatizada; - } - - public Boolean getBilheteInfo() { - return bilheteInfo; - } - - public void setBilheteInfo(Boolean bilheteInfo) { - this.bilheteInfo = bilheteInfo; - } - - public Boolean getVendaInternet() { - return vendaInternet; - } - - public void setVendaInternet(Boolean vendaInternet) { - this.vendaInternet = vendaInternet; - } - - public Boolean getDigitacaoSeq() { - return digitacaoSeq; - } - - public void setDigitacaoSeq(Boolean digitacaoSeq) { - this.digitacaoSeq = digitacaoSeq; - } - - public Boolean getTeleEntrega() { - return teleEntrega; - } - - public void setTeleEntrega(Boolean teleEntrega) { - this.teleEntrega = teleEntrega; - } - - public Boolean getTrabalhaBilhete() { - return trabalhaBilhete; - } - - public void setTrabalhaBilhete(Boolean trabalhaBilhete) { - this.trabalhaBilhete = trabalhaBilhete; - } - - public Boolean getOfpsPropria() { - return ofpsPropria; - } - - public void setOfpsPropria(Boolean ofpsPropria) { - this.ofpsPropria = ofpsPropria; - } - - public Boolean getOfpsTerceiros() { - return ofpsTerceiros; - } - - public void setOfpsTerceiros(Boolean ofpsTerceiros) { - this.ofpsTerceiros = ofpsTerceiros; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - - - - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaDiversosId != null ? ptovtaDiversosId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaDiversos)) { - return false; - } - PtovtaDiversos other = (PtovtaDiversos) object; - if ((this.ptovtaDiversosId == null && other.ptovtaDiversosId != null) || (this.ptovtaDiversosId != null && !this.ptovtaDiversosId.equals(other.ptovtaDiversosId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaDiversos[ ptovtaDiversosId=" + ptovtaDiversosId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author Rafael + */ +@Entity +@SequenceGenerator(name = "PTOVTA_DIVERSOS_SEQ", sequenceName = "PTOVTA_DIVERSOS_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_DIVERSOS") +public class PtovtaDiversos implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_DIVERSOS_SEQ") + @Column(name = "PTOVTADIVERSOS_ID ") + private Integer ptovtaDiversosId; + + @Column(name = "RESPONALUGUEL") + private String responAluguel; + + @Column(name = "RESPONTELEFONE") + private String responTelefone; + + @Column(name = "RESPONENERGIA") + private String responEnergia; + + @Column(name = "POSICAO") + private String posicao; + + @Column(name = "INFORMATIZADA") + private Boolean informatizada; + + @Column(name = "BILHETEINFO") + private Boolean bilheteInfo; + + @Column(name = "VENDAINTERNET") + private Boolean vendaInternet; + + @Column(name = "DIGITACAOSEQ") + private Boolean digitacaoSeq; + + @Column(name = "TELEENTREGA") + private Boolean teleEntrega; + + @Column(name = "TRABALHABILHETE") + private Boolean trabalhaBilhete; + + @Column(name = "TRABOFPSPROPRIA") + private Boolean ofpsPropria; + + @Column(name = "TRABOFPSTERCEIROS") + private Boolean ofpsTerceiros; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + public PtovtaDiversos() { + } + + public enum gerarEnum { + // Declaração dos enum + + + POSICAOFORAEIXO ("FORA DO EIXO DA LINHA", "FEL"), + POSICAONOEIXO ("NO EIXO DA LINHA", "EL"); + + + + // Definição das constantes + public final String valor; + public final String descricao; + + + public String valor() { + return this.valor; + } + public String descricao() { + return this.descricao; + } + private gerarEnum( String descricao, String valor) { + this.descricao = descricao; + this.valor = valor; + } + + + } + +// private static List posicaoList = new ArrayList(); +// +// static{ +// posicaoList.add("FORA DO EIXO DA LINHA"); +// posicaoList.add("NO EIXO DA LINHA"); +// +// } +// + + public PtovtaDiversos(Integer ptovtaDiversosId, String responAluguel, String responTelefone, String responEnergia, String posicao, Boolean informatizada, Boolean bilheteInfo, Boolean vendaInternet, Boolean digitacaoSeq, Boolean teleEntrega, Boolean trabalhaBilhete, Boolean ofpsPropria, Boolean ofpsTerceiros, Boolean activo, Date fecmodif, int usuarioId) { + super(); + this.ptovtaDiversosId = ptovtaDiversosId; + this.responAluguel = responAluguel; + this.responTelefone = responTelefone; + this.responEnergia = responEnergia; + this.posicao = posicao; + this.informatizada = informatizada; + this.bilheteInfo = bilheteInfo; + this.vendaInternet = vendaInternet; + this.digitacaoSeq = digitacaoSeq; + this.teleEntrega = teleEntrega; + this.trabalhaBilhete = trabalhaBilhete; + this.ofpsPropria = ofpsPropria; + this.ofpsTerceiros = ofpsTerceiros; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + public Integer getPtovtaDiversosId() { + return ptovtaDiversosId; + } + + public void setPtovtaDiversosId(Integer ptovtaDiversosId) { + this.ptovtaDiversosId = ptovtaDiversosId; + } + + public String getResponAluguel() { + return responAluguel; + } + + public void setResponAluguel(String responAluguel) { + this.responAluguel = responAluguel; + } + + public String getResponTelefone() { + return responTelefone; + } + + public void setResponTelefone(String responTelefone) { + this.responTelefone = responTelefone; + } + + public String getResponEnergia() { + return responEnergia; + } + + public void setResponEnergia(String responEnergia) { + this.responEnergia = responEnergia; + } + + public String getPosicao() { + return posicao; + } + + public void setPosicao(String posicao) { + this.posicao = posicao; + } + + + public Boolean getInformatizada() { + return informatizada; + } + + public void setInformatizada(Boolean informatizada) { + this.informatizada = informatizada; + } + + public Boolean getBilheteInfo() { + return bilheteInfo; + } + + public void setBilheteInfo(Boolean bilheteInfo) { + this.bilheteInfo = bilheteInfo; + } + + public Boolean getVendaInternet() { + return vendaInternet; + } + + public void setVendaInternet(Boolean vendaInternet) { + this.vendaInternet = vendaInternet; + } + + public Boolean getDigitacaoSeq() { + return digitacaoSeq; + } + + public void setDigitacaoSeq(Boolean digitacaoSeq) { + this.digitacaoSeq = digitacaoSeq; + } + + public Boolean getTeleEntrega() { + return teleEntrega; + } + + public void setTeleEntrega(Boolean teleEntrega) { + this.teleEntrega = teleEntrega; + } + + public Boolean getTrabalhaBilhete() { + return trabalhaBilhete; + } + + public void setTrabalhaBilhete(Boolean trabalhaBilhete) { + this.trabalhaBilhete = trabalhaBilhete; + } + + public Boolean getOfpsPropria() { + return ofpsPropria; + } + + public void setOfpsPropria(Boolean ofpsPropria) { + this.ofpsPropria = ofpsPropria; + } + + public Boolean getOfpsTerceiros() { + return ofpsTerceiros; + } + + public void setOfpsTerceiros(Boolean ofpsTerceiros) { + this.ofpsTerceiros = ofpsTerceiros; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + + + + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaDiversosId != null ? ptovtaDiversosId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaDiversos)) { + return false; + } + PtovtaDiversos other = (PtovtaDiversos) object; + if ((this.ptovtaDiversosId == null && other.ptovtaDiversosId != null) || (this.ptovtaDiversosId != null && !this.ptovtaDiversosId.equals(other.ptovtaDiversosId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaDiversos[ ptovtaDiversosId=" + ptovtaDiversosId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaBloqueada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaBloqueada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaBloqueada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaBloqueada.java index 440178a89..aa8dd022c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaBloqueada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaBloqueada.java @@ -1,138 +1,138 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@AuditarClasse(nome = "PtovtaEmpresaBloqueada", tela = "auditarClasse.PtovtaEmpresaBloqueada") -@Entity -@SequenceGenerator(name = "PTOVTA_EMP_BLOQUEADA_SEQ", sequenceName = "PTOVTA_EMP_BLOQUEADA_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_EMP_BLOQUEADA") -public class PtovtaEmpresaBloqueada implements Serializable, Auditavel { - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_EMP_BLOQUEADA_SEQ") - @Column(name = "PTOVTAEMPBLOQUEADA_ID") - private Integer ptovtaempbloqueadaId; - - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Transient - @NaoAuditar - private PtovtaEmpresaBloqueada ptovtaEmpresaBloqueadaClone; - - public Integer getPtovtaempbloqueadaId() { - return ptovtaempbloqueadaId; - } - - public void setPtovtaempbloqueadaId(Integer ptovtaempbloqueadaId) { - this.ptovtaempbloqueadaId = ptovtaempbloqueadaId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public boolean equals(Object o){ - if (!(o instanceof PtovtaEmpresaBloqueada)) { - return false; - } - PtovtaEmpresaBloqueada other = (PtovtaEmpresaBloqueada) o; - if ((this.ptovtaempbloqueadaId == null && other.ptovtaempbloqueadaId != null) || (this.ptovtaempbloqueadaId != null && !this.ptovtaempbloqueadaId.equals(other.ptovtaempbloqueadaId))) { - return false; - } - return true; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaEmpresaBloqueadaClone = new PtovtaEmpresaBloqueada(); - ptovtaEmpresaBloqueadaClone = (PtovtaEmpresaBloqueada) this.clone(); - Hibernate.initialize(ptovtaEmpresaBloqueadaClone.getPuntoventaId()); - - } - - @Override - public PtovtaEmpresaBloqueada getCloneObject() throws CloneNotSupportedException { - return ptovtaEmpresaBloqueadaClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaempbloqueadaId()); - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@AuditarClasse(nome = "PtovtaEmpresaBloqueada", tela = "auditarClasse.PtovtaEmpresaBloqueada") +@Entity +@SequenceGenerator(name = "PTOVTA_EMP_BLOQUEADA_SEQ", sequenceName = "PTOVTA_EMP_BLOQUEADA_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_EMP_BLOQUEADA") +public class PtovtaEmpresaBloqueada implements Serializable, Auditavel { + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_EMP_BLOQUEADA_SEQ") + @Column(name = "PTOVTAEMPBLOQUEADA_ID") + private Integer ptovtaempbloqueadaId; + + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Transient + @NaoAuditar + private PtovtaEmpresaBloqueada ptovtaEmpresaBloqueadaClone; + + public Integer getPtovtaempbloqueadaId() { + return ptovtaempbloqueadaId; + } + + public void setPtovtaempbloqueadaId(Integer ptovtaempbloqueadaId) { + this.ptovtaempbloqueadaId = ptovtaempbloqueadaId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public boolean equals(Object o){ + if (!(o instanceof PtovtaEmpresaBloqueada)) { + return false; + } + PtovtaEmpresaBloqueada other = (PtovtaEmpresaBloqueada) o; + if ((this.ptovtaempbloqueadaId == null && other.ptovtaempbloqueadaId != null) || (this.ptovtaempbloqueadaId != null && !this.ptovtaempbloqueadaId.equals(other.ptovtaempbloqueadaId))) { + return false; + } + return true; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaEmpresaBloqueadaClone = new PtovtaEmpresaBloqueada(); + ptovtaEmpresaBloqueadaClone = (PtovtaEmpresaBloqueada) this.clone(); + Hibernate.initialize(ptovtaEmpresaBloqueadaClone.getPuntoventaId()); + + } + + @Override + public PtovtaEmpresaBloqueada getCloneObject() throws CloneNotSupportedException { + return ptovtaEmpresaBloqueadaClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaempbloqueadaId()); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java index 2bac037e2..d413f1446 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java @@ -1,243 +1,243 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Rafael - */ -@AuditarClasse(nome = "PtoVtaUsuarioBancario", tela = "auditarClasse.PtovtaEstoque") -@Entity -@SequenceGenerator(name = "PTOVTA_ESTOQUE_SEQ ", sequenceName = "PTOVTA_ESTOQUE_SEQ ", allocationSize = 1) -@Table(name = "PTOVTA_ESTOQUE") - -public class PtovtaEstoque implements Serializable, Auditavel{ - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ESTOQUE_SEQ ") - @Column(name = "PTOVTAESTOQUE_ID") - private Integer ptovtaEstoqueId; - - @Column(name = "ESPECIE") - private String especie; - - @Column(name = "FORMCONT") - private Integer formCont; - - @Column(name = "QUANTIDADE") - private int quantidade; - - @Column(name = "LOTEFORM") - private Integer loteform; - - @Basic(optional = false) - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - @Transient - @NaoAuditar - private PtovtaEstoque ptovtaEstoqueClone; - - public PtovtaEstoque() { - } - - public PtovtaEstoque(Integer ptovtaEstoqueId) { - this.ptovtaEstoqueId = ptovtaEstoqueId; - } - - - - - public enum gerarEnum { - // Declaração dos enum - SIM ("SIM", "1"), - - NAO ("NAO", "0"); - - - - // Definição das constantes - public final String valor; - public final String descricao; - - - public String valor() { - return this.valor; - } - public String descricao() { - return this.descricao; - } - private gerarEnum( String descricao, String valor) { - this.descricao = descricao; - this.valor = valor; - } - - - } - - public PtovtaEstoque(Integer ptovtaEstoqueId, String especie, Integer formCont, int quantidade, Integer loteform, Boolean activo, Date fecmodif, int usuarioId) { - this.ptovtaEstoqueId = ptovtaEstoqueId; - this.especie = especie; - this.formCont = formCont; - this.quantidade = quantidade; - this.loteform = loteform; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - - public Integer getPtovtaEstoqueId() { - return ptovtaEstoqueId; - } - - public void setPtovtaEstoqueId(Integer ptovtaEstoqueId) { - this.ptovtaEstoqueId = ptovtaEstoqueId; - } - - public String getEspecie() { - return especie; - } - - public void setEspecie(String especie) { - this.especie = especie; - } - - public Integer getFormCont() { - return formCont; - } - - public void setFormCont(Integer formCont) { - this.formCont = formCont; - } - - public int getQuantidade() { - return quantidade; - } - - public void setQuantidade(int quantidade) { - this.quantidade = quantidade; - } - - public Integer getLoteform() { - return loteform; - } - - public void setLoteform(Integer loteform) { - this.loteform = loteform; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaEstoqueId != null ? ptovtaEstoqueId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaEstoque)) { - return false; - } - PtovtaEstoque other = (PtovtaEstoque) object; - if ((this.ptovtaEstoqueId == null && other.ptovtaEstoqueId != null) || (this.ptovtaEstoqueId != null && !this.ptovtaEstoqueId.equals(other.ptovtaEstoqueId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaEstoque[ ptovtaEstoqueId=" + ptovtaEstoqueId + " ]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaEstoqueClone = new PtovtaEstoque(); - ptovtaEstoqueClone = (PtovtaEstoque) this.clone(); - Hibernate.initialize(ptovtaEstoqueClone.getPuntoventaId()); - - } - - @Override - public PtovtaEstoque getCloneObject() throws CloneNotSupportedException { - return ptovtaEstoqueClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaEstoqueId()); - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Rafael + */ +@AuditarClasse(nome = "PtoVtaUsuarioBancario", tela = "auditarClasse.PtovtaEstoque") +@Entity +@SequenceGenerator(name = "PTOVTA_ESTOQUE_SEQ ", sequenceName = "PTOVTA_ESTOQUE_SEQ ", allocationSize = 1) +@Table(name = "PTOVTA_ESTOQUE") + +public class PtovtaEstoque implements Serializable, Auditavel{ + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ESTOQUE_SEQ ") + @Column(name = "PTOVTAESTOQUE_ID") + private Integer ptovtaEstoqueId; + + @Column(name = "ESPECIE") + private String especie; + + @Column(name = "FORMCONT") + private Integer formCont; + + @Column(name = "QUANTIDADE") + private int quantidade; + + @Column(name = "LOTEFORM") + private Integer loteform; + + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + @Transient + @NaoAuditar + private PtovtaEstoque ptovtaEstoqueClone; + + public PtovtaEstoque() { + } + + public PtovtaEstoque(Integer ptovtaEstoqueId) { + this.ptovtaEstoqueId = ptovtaEstoqueId; + } + + + + + public enum gerarEnum { + // Declaração dos enum + SIM ("SIM", "1"), + + NAO ("NAO", "0"); + + + + // Definição das constantes + public final String valor; + public final String descricao; + + + public String valor() { + return this.valor; + } + public String descricao() { + return this.descricao; + } + private gerarEnum( String descricao, String valor) { + this.descricao = descricao; + this.valor = valor; + } + + + } + + public PtovtaEstoque(Integer ptovtaEstoqueId, String especie, Integer formCont, int quantidade, Integer loteform, Boolean activo, Date fecmodif, int usuarioId) { + this.ptovtaEstoqueId = ptovtaEstoqueId; + this.especie = especie; + this.formCont = formCont; + this.quantidade = quantidade; + this.loteform = loteform; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + + public Integer getPtovtaEstoqueId() { + return ptovtaEstoqueId; + } + + public void setPtovtaEstoqueId(Integer ptovtaEstoqueId) { + this.ptovtaEstoqueId = ptovtaEstoqueId; + } + + public String getEspecie() { + return especie; + } + + public void setEspecie(String especie) { + this.especie = especie; + } + + public Integer getFormCont() { + return formCont; + } + + public void setFormCont(Integer formCont) { + this.formCont = formCont; + } + + public int getQuantidade() { + return quantidade; + } + + public void setQuantidade(int quantidade) { + this.quantidade = quantidade; + } + + public Integer getLoteform() { + return loteform; + } + + public void setLoteform(Integer loteform) { + this.loteform = loteform; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaEstoqueId != null ? ptovtaEstoqueId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaEstoque)) { + return false; + } + PtovtaEstoque other = (PtovtaEstoque) object; + if ((this.ptovtaEstoqueId == null && other.ptovtaEstoqueId != null) || (this.ptovtaEstoqueId != null && !this.ptovtaEstoqueId.equals(other.ptovtaEstoqueId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaEstoque[ ptovtaEstoqueId=" + ptovtaEstoqueId + " ]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaEstoqueClone = new PtovtaEstoque(); + ptovtaEstoqueClone = (PtovtaEstoque) this.clone(); + Hibernate.initialize(ptovtaEstoqueClone.getPuntoventaId()); + + } + + @Override + public PtovtaEstoque getCloneObject() throws CloneNotSupportedException { + return ptovtaEstoqueClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaEstoqueId()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaExcecaoMultaCanc.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaExcecaoMultaCanc.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaExcecaoMultaCanc.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaExcecaoMultaCanc.java index 6c83cf452..0f4562b14 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaExcecaoMultaCanc.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaExcecaoMultaCanc.java @@ -1,184 +1,184 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * @author Valdevir - */ -@AuditarClasse(nome = "PtovtaExcecaoMultaCanc", tela = "auditarClasse.PtovtaExcecaoMultaCanc") -@Entity -@SequenceGenerator(name = "PTOVTA_EXCECAO_MULTA_CANC_SEQ", sequenceName = "PTOVTA_EXCECAO_MULTA_CANC_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_EXCECAO_MULTA_CANC") -public class PtovtaExcecaoMultaCanc implements Serializable , Auditavel { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_EXCECAO_MULTA_CANC_SEQ") - @Column(name = "PTOVTAEXCECAOMULTACANC_ID") - private Integer ptovtaExcecaoMultaCancId; - - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoventa; - - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @ManyToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @Transient - @NaoAuditar - private PtovtaExcecaoMultaCanc ptovtaExcecaoMultaCancClone; - - public PtovtaExcecaoMultaCanc() { - super(); - this.activo = true; - this.fecmodif = new Date(); - } - - public Integer getPtovtaExcecaoMultaCancId() { - return ptovtaExcecaoMultaCancId; - } - - public void setPtovtaExcecaoMultaCancId(Integer ptovtaExcecaoMultaCancId) { - this.ptovtaExcecaoMultaCancId = ptovtaExcecaoMultaCancId; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public PtovtaExcecaoMultaCanc getPtovtaExcecaoMultaCancClone() { - return ptovtaExcecaoMultaCancClone; - } - - public void setPtovtaExcecaoMultaCancClone(PtovtaExcecaoMultaCanc ptovtaExcecaoMultaCancClone) { - this.ptovtaExcecaoMultaCancClone = ptovtaExcecaoMultaCancClone; - } - - public PuntoVenta getPuntoventa() { - return puntoventa; - } - - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ptovtaExcecaoMultaCancId == null) ? 0 : ptovtaExcecaoMultaCancId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof PtovtaExcecaoMultaCanc)) - return false; - PtovtaExcecaoMultaCanc other = (PtovtaExcecaoMultaCanc) obj; - if (ptovtaExcecaoMultaCancId == null) { - if (other.ptovtaExcecaoMultaCancId != null) - return false; - } else if (!ptovtaExcecaoMultaCancId.equals(other.ptovtaExcecaoMultaCancId)) - return false; - return true; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaExcecaoMultaCancClone = new PtovtaExcecaoMultaCanc(); - ptovtaExcecaoMultaCancClone = (PtovtaExcecaoMultaCanc) this.clone(); - Hibernate.initialize(ptovtaExcecaoMultaCancClone.getPuntoventa()); - - } - - @Override - public PtovtaExcecaoMultaCanc getCloneObject() throws CloneNotSupportedException { - return ptovtaExcecaoMultaCancClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaExcecaoMultaCancId()); - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * @author Valdevir + */ +@AuditarClasse(nome = "PtovtaExcecaoMultaCanc", tela = "auditarClasse.PtovtaExcecaoMultaCanc") +@Entity +@SequenceGenerator(name = "PTOVTA_EXCECAO_MULTA_CANC_SEQ", sequenceName = "PTOVTA_EXCECAO_MULTA_CANC_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_EXCECAO_MULTA_CANC") +public class PtovtaExcecaoMultaCanc implements Serializable , Auditavel { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_EXCECAO_MULTA_CANC_SEQ") + @Column(name = "PTOVTAEXCECAOMULTACANC_ID") + private Integer ptovtaExcecaoMultaCancId; + + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoventa; + + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @ManyToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @Transient + @NaoAuditar + private PtovtaExcecaoMultaCanc ptovtaExcecaoMultaCancClone; + + public PtovtaExcecaoMultaCanc() { + super(); + this.activo = true; + this.fecmodif = new Date(); + } + + public Integer getPtovtaExcecaoMultaCancId() { + return ptovtaExcecaoMultaCancId; + } + + public void setPtovtaExcecaoMultaCancId(Integer ptovtaExcecaoMultaCancId) { + this.ptovtaExcecaoMultaCancId = ptovtaExcecaoMultaCancId; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public PtovtaExcecaoMultaCanc getPtovtaExcecaoMultaCancClone() { + return ptovtaExcecaoMultaCancClone; + } + + public void setPtovtaExcecaoMultaCancClone(PtovtaExcecaoMultaCanc ptovtaExcecaoMultaCancClone) { + this.ptovtaExcecaoMultaCancClone = ptovtaExcecaoMultaCancClone; + } + + public PuntoVenta getPuntoventa() { + return puntoventa; + } + + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ptovtaExcecaoMultaCancId == null) ? 0 : ptovtaExcecaoMultaCancId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof PtovtaExcecaoMultaCanc)) + return false; + PtovtaExcecaoMultaCanc other = (PtovtaExcecaoMultaCanc) obj; + if (ptovtaExcecaoMultaCancId == null) { + if (other.ptovtaExcecaoMultaCancId != null) + return false; + } else if (!ptovtaExcecaoMultaCancId.equals(other.ptovtaExcecaoMultaCancId)) + return false; + return true; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaExcecaoMultaCancClone = new PtovtaExcecaoMultaCanc(); + ptovtaExcecaoMultaCancClone = (PtovtaExcecaoMultaCanc) this.clone(); + Hibernate.initialize(ptovtaExcecaoMultaCancClone.getPuntoventa()); + + } + + @Override + public PtovtaExcecaoMultaCanc getCloneObject() throws CloneNotSupportedException { + return ptovtaExcecaoMultaCancClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaExcecaoMultaCancId()); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java index 7b31ca993..8acf4964b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java @@ -1,263 +1,263 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.hibernate.Hibernate; - -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Rafael - */ -@AuditarClasse(nome = "PtovtaHorario", tela = "auditarClasse.PtovtaHorario") -@Entity -@SequenceGenerator(name = "PTOVTA_HORARIO_SEQ", sequenceName = "PTOVTA_HORARIO_SEQ", allocationSize = 1) -@Table(name = "PTOVTA_HORARIO") - -public class PtovtaHorario implements Serializable, Auditavel { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_HORARIO_SEQ") - @Column(name = "PTOVTAHORARIO_ID") - private Integer ptovtaHorarioId; - - @Column(name = "INICIO") - @Temporal(TemporalType.TIMESTAMP) - private Date inicio; - - @Column(name = "FIM") - @Temporal(TemporalType.TIMESTAMP) - private Date fim; - - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - @NaoAuditar - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; - - @Transient - @NaoAuditar - private PtovtaHorario ptovtaHorarioClone; - - @Column(name = "INDLUNES") - private Boolean indlunes; - @Column(name = "INDMARTES") - private Boolean indmartes; - @Column(name = "INDMIERCOLES") - private Boolean indmiercoles; - @Column(name = "INDJUEVES") - private Boolean indjueves; - @Column(name = "INDVIERNES") - private Boolean indviernes; - @Column(name = "INDSABADO") - private Boolean indsabado; - @Column(name = "INDDOMINGO") - private Boolean inddomingo; - - public PtovtaHorario() { - } - - public PtovtaHorario(Integer ptovtaHorarioId) { - this.ptovtaHorarioId = ptovtaHorarioId; - } - - public PtovtaHorario(Integer ptovtaHorarioId, Date inicio, Date fim, Boolean activo, Date fecmodif, int usuarioId) { - this.ptovtaHorarioId = ptovtaHorarioId; - this.inicio = inicio; - this.fim = fim; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - - public Integer getPtovtaHorarioId() { - return ptovtaHorarioId; - } - - public void setPtovtaHorarioId(Integer ptovtaHorarioId) { - this.ptovtaHorarioId = ptovtaHorarioId; - } - - public Date getInicio() { - return inicio; - } - - public void setInicio(Date inicio) { - this.inicio = inicio; - } - - public Date getFim() { - return fim; - } - - public void setFim(Date fim) { - this.fim = fim; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Boolean getIndlunes() { - return indlunes; - } - - public void setIndlunes(Boolean indlunes) { - this.indlunes = indlunes; - } - - public Boolean getIndmartes() { - return indmartes; - } - - public void setIndmartes(Boolean indmartes) { - this.indmartes = indmartes; - } - - public Boolean getIndmiercoles() { - return indmiercoles; - } - - public void setIndmiercoles(Boolean indmiercoles) { - this.indmiercoles = indmiercoles; - } - - public Boolean getIndjueves() { - return indjueves; - } - - public void setIndjueves(Boolean indjueves) { - this.indjueves = indjueves; - } - - public Boolean getIndviernes() { - return indviernes; - } - - public void setIndviernes(Boolean indviernes) { - this.indviernes = indviernes; - } - - public Boolean getIndsabado() { - return indsabado; - } - - public void setIndsabado(Boolean indsabado) { - this.indsabado = indsabado; - } - - public Boolean getInddomingo() { - return inddomingo; - } - - public void setInddomingo(Boolean inddomingo) { - this.inddomingo = inddomingo; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaHorarioClone = new PtovtaHorario(); - ptovtaHorarioClone = (PtovtaHorario) this.clone(); - Hibernate.initialize(ptovtaHorarioClone.getPuntoventaId()); - - } - - @Override - public PtovtaHorario getCloneObject() throws CloneNotSupportedException { - return ptovtaHorarioClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaHorarioId()); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaHorarioId != null ? ptovtaHorarioId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaHorario)) { - return false; - } - PtovtaHorario other = (PtovtaHorario) object; - if ((this.ptovtaHorarioId == null && other.ptovtaHorarioId != null) || (this.ptovtaHorarioId != null && !this.ptovtaHorarioId.equals(other.ptovtaHorarioId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaHorario[ ptovtaHorarioId=" + ptovtaHorarioId + " ]"; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.Hibernate; + +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Rafael + */ +@AuditarClasse(nome = "PtovtaHorario", tela = "auditarClasse.PtovtaHorario") +@Entity +@SequenceGenerator(name = "PTOVTA_HORARIO_SEQ", sequenceName = "PTOVTA_HORARIO_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_HORARIO") + +public class PtovtaHorario implements Serializable, Auditavel { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_HORARIO_SEQ") + @Column(name = "PTOVTAHORARIO_ID") + private Integer ptovtaHorarioId; + + @Column(name = "INICIO") + @Temporal(TemporalType.TIMESTAMP) + private Date inicio; + + @Column(name = "FIM") + @Temporal(TemporalType.TIMESTAMP) + private Date fim; + + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + @NaoAuditar + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoventaId; + + @Transient + @NaoAuditar + private PtovtaHorario ptovtaHorarioClone; + + @Column(name = "INDLUNES") + private Boolean indlunes; + @Column(name = "INDMARTES") + private Boolean indmartes; + @Column(name = "INDMIERCOLES") + private Boolean indmiercoles; + @Column(name = "INDJUEVES") + private Boolean indjueves; + @Column(name = "INDVIERNES") + private Boolean indviernes; + @Column(name = "INDSABADO") + private Boolean indsabado; + @Column(name = "INDDOMINGO") + private Boolean inddomingo; + + public PtovtaHorario() { + } + + public PtovtaHorario(Integer ptovtaHorarioId) { + this.ptovtaHorarioId = ptovtaHorarioId; + } + + public PtovtaHorario(Integer ptovtaHorarioId, Date inicio, Date fim, Boolean activo, Date fecmodif, int usuarioId) { + this.ptovtaHorarioId = ptovtaHorarioId; + this.inicio = inicio; + this.fim = fim; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + + public Integer getPtovtaHorarioId() { + return ptovtaHorarioId; + } + + public void setPtovtaHorarioId(Integer ptovtaHorarioId) { + this.ptovtaHorarioId = ptovtaHorarioId; + } + + public Date getInicio() { + return inicio; + } + + public void setInicio(Date inicio) { + this.inicio = inicio; + } + + public Date getFim() { + return fim; + } + + public void setFim(Date fim) { + this.fim = fim; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(PuntoVenta puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Boolean getIndlunes() { + return indlunes; + } + + public void setIndlunes(Boolean indlunes) { + this.indlunes = indlunes; + } + + public Boolean getIndmartes() { + return indmartes; + } + + public void setIndmartes(Boolean indmartes) { + this.indmartes = indmartes; + } + + public Boolean getIndmiercoles() { + return indmiercoles; + } + + public void setIndmiercoles(Boolean indmiercoles) { + this.indmiercoles = indmiercoles; + } + + public Boolean getIndjueves() { + return indjueves; + } + + public void setIndjueves(Boolean indjueves) { + this.indjueves = indjueves; + } + + public Boolean getIndviernes() { + return indviernes; + } + + public void setIndviernes(Boolean indviernes) { + this.indviernes = indviernes; + } + + public Boolean getIndsabado() { + return indsabado; + } + + public void setIndsabado(Boolean indsabado) { + this.indsabado = indsabado; + } + + public Boolean getInddomingo() { + return inddomingo; + } + + public void setInddomingo(Boolean inddomingo) { + this.inddomingo = inddomingo; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaHorarioClone = new PtovtaHorario(); + ptovtaHorarioClone = (PtovtaHorario) this.clone(); + Hibernate.initialize(ptovtaHorarioClone.getPuntoventaId()); + + } + + @Override + public PtovtaHorario getCloneObject() throws CloneNotSupportedException { + return ptovtaHorarioClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaHorarioId()); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaHorarioId != null ? ptovtaHorarioId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaHorario)) { + return false; + } + PtovtaHorario other = (PtovtaHorario) object; + if ((this.ptovtaHorarioId == null && other.ptovtaHorarioId != null) || (this.ptovtaHorarioId != null && !this.ptovtaHorarioId.equals(other.ptovtaHorarioId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaHorario[ ptovtaHorarioId=" + ptovtaHorarioId + " ]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTipoEstoque.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaTipoEstoque.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaTipoEstoque.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaTipoEstoque.java index 36ba3d3f3..57af533bc 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTipoEstoque.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaTipoEstoque.java @@ -1,121 +1,121 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * PtovtaTipoEstoque generated by hbm2java - */ -@Entity -@Table(name = "PTOVTA_TIPO_ESTOQUE") -public class PtovtaTipoEstoque implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final int TIPO_CONTABILIDAD = 1; - public static final int TIPO_SUMINISTRO = 2; - public static final int TIPO_NORMAL = 3; - - private Integer ptovtatipoestId; - private String desctipoest; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - - public PtovtaTipoEstoque() { - } - - public PtovtaTipoEstoque(Integer ptovtatipoestId) { - this.ptovtatipoestId = ptovtatipoestId; - } - - public PtovtaTipoEstoque(Integer ptovtatipoestId, String desctipoest, Boolean activo, Date fecmodif, Integer usuarioId) { - this.ptovtatipoestId = ptovtatipoestId; - this.desctipoest = desctipoest; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return desctipoest; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtatipoestId != null ? ptovtatipoestId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaTipoEstoque)) - return false; - - PtovtaTipoEstoque other = (PtovtaTipoEstoque) object; - if ((this.ptovtatipoestId == null && other.ptovtatipoestId != null) || (this.ptovtatipoestId != null && !this.ptovtatipoestId.equals(other.ptovtatipoestId))) { - return false; - } - return true; - } - - @Id - @Column(name = "PTOVTATIPOEST_ID", unique = true, nullable = false, precision = 4, scale = 0) - public Integer getPtovtatipoestId() { - return this.ptovtatipoestId; - } - - public void setPtovtatipoestId(Integer ptovtatipoestId) { - this.ptovtatipoestId = ptovtatipoestId; - } - - @Column(name = "DESCTIPOEST", length = 20) - public String getDesctipoest() { - return this.desctipoest; - } - - public void setDesctipoest(String desctipoest) { - this.desctipoest = desctipoest; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * PtovtaTipoEstoque generated by hbm2java + */ +@Entity +@Table(name = "PTOVTA_TIPO_ESTOQUE") +public class PtovtaTipoEstoque implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final int TIPO_CONTABILIDAD = 1; + public static final int TIPO_SUMINISTRO = 2; + public static final int TIPO_NORMAL = 3; + + private Integer ptovtatipoestId; + private String desctipoest; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + + public PtovtaTipoEstoque() { + } + + public PtovtaTipoEstoque(Integer ptovtatipoestId) { + this.ptovtatipoestId = ptovtatipoestId; + } + + public PtovtaTipoEstoque(Integer ptovtatipoestId, String desctipoest, Boolean activo, Date fecmodif, Integer usuarioId) { + this.ptovtatipoestId = ptovtatipoestId; + this.desctipoest = desctipoest; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return desctipoest; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtatipoestId != null ? ptovtatipoestId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaTipoEstoque)) + return false; + + PtovtaTipoEstoque other = (PtovtaTipoEstoque) object; + if ((this.ptovtatipoestId == null && other.ptovtatipoestId != null) || (this.ptovtatipoestId != null && !this.ptovtatipoestId.equals(other.ptovtatipoestId))) { + return false; + } + return true; + } + + @Id + @Column(name = "PTOVTATIPOEST_ID", unique = true, nullable = false, precision = 4, scale = 0) + public Integer getPtovtatipoestId() { + return this.ptovtatipoestId; + } + + public void setPtovtatipoestId(Integer ptovtatipoestId) { + this.ptovtatipoestId = ptovtatipoestId; + } + + @Column(name = "DESCTIPOEST", length = 20) + public String getDesctipoest() { + return this.desctipoest; + } + + public void setDesctipoest(String desctipoest) { + this.desctipoest = desctipoest; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java index d330c13c5..14a777946 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java @@ -1,241 +1,241 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.apache.commons.lang.BooleanUtils; - -import br.com.rjconsultores.auditador.annotations.AuditarAtributo; -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarLista; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -/** - * - * @author Rafael - */ -@AuditarClasse(nome = "PtovtaTitular", tela = "auditarClasse.PtovtaTitular") -@Entity -@Table(name = "PTOVTA_TITULAR") -@SequenceGenerator(name = "PTOVTA_TITULAR_SEQ ", sequenceName = "PTOVTA_TITULAR_SEQ ", allocationSize = 1) -public class PtovtaTitular implements Serializable, Auditavel { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_TITULAR_SEQ ") - @Column(name = "PTOVTATITULAR_ID") - private Integer ptovtaTitularId; - - @AuditarAtributo(nome = "NOME TITULAR/FOTO") - @Column(name = "NOME") - private String nome; - - @Column(name = "CPF") - private String cpf; - - @Column(name = "RG") - private String rg; - - @Column(name = "ORGAOEMISSOR") - private String orgaoemissor; - @Lob - @Column(name = "IMAGEM") - private byte[] imagem; - - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private int usuarioId; - - - @OneToMany(cascade = CascadeType.ALL, mappedBy = "titularId") - private List puntoVentaList; - - @Transient - @NaoAuditar - private PtovtaTitular ptovtaTitularClone; - - public PtovtaTitular() { - } - - public PtovtaTitular(Integer ptovtaTitularId) { - this.ptovtaTitularId = ptovtaTitularId; - } - - public PtovtaTitular(Integer ptovtaTitularId, String nome, String cpf, String rg, String orgaoemissor, Boolean activo, Date fecmodif, int usuarioId) { - this.ptovtaTitularId = ptovtaTitularId; - this.nome = nome; - this.cpf = cpf; - this.rg = rg; - this.orgaoemissor = orgaoemissor; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - - - public Integer getPtovtaTitularId() { - return ptovtaTitularId; - } - - public void setPtovtaTitularId(Integer ptovtaTitularId) { - this.ptovtaTitularId = ptovtaTitularId; - } - - public String getNome() { - return nome; - } - - public void setNome(String nome) { - this.nome = nome; - } - - public String getCpf() { - return cpf; - } - - public void setCpf(String cpf) { - this.cpf = cpf; - } - - public String getRg() { - return rg; - } - - public void setRg(String rg) { - this.rg = rg; - } - - public String getOrgaoemissor() { - return orgaoemissor; - } - - public void setOrgaoemissor(String orgaoemissor) { - this.orgaoemissor = orgaoemissor; - } - - public byte[] getImagem() { - return imagem; - } - - public void setImagem(byte[] imagem) { - this.imagem = imagem; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public int getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(int usuarioId) { - this.usuarioId = usuarioId; - } - - - public List getPuntoVentaList() { - return puntoVentaList; - } - - public void setPuntoVentaList(List puntoVentaList) { - this.puntoVentaList = puntoVentaList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (ptovtaTitularId != null ? ptovtaTitularId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof PtovtaTitular)) { - return false; - } - PtovtaTitular other = (PtovtaTitular) object; - if ((this.ptovtaTitularId == null && other.ptovtaTitularId != null) || (this.ptovtaTitularId != null && !this.ptovtaTitularId.equals(other.ptovtaTitularId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaTitular[ ptovtaTitularId=" + ptovtaTitularId + " ]"; - } - - @Override - public void clonar() throws CloneNotSupportedException { - ptovtaTitularClone = new PtovtaTitular(); - ptovtaTitularClone = (PtovtaTitular) this.clone(); - - if(this.getPuntoVentaList() != null) { - List lsClones = new ArrayList(); - for (PuntoVenta puntoVenta : this.getPuntoVentaList()) { - if(BooleanUtils.isTrue(puntoVenta.getActivo())) { - puntoVenta.clonar(); - lsClones.add(puntoVenta.getCloneObject()); - } - } - ptovtaTitularClone.setPuntoVentaList(lsClones); - } - - } - - @Override - public PtovtaTitular getCloneObject() throws CloneNotSupportedException { - return ptovtaTitularClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getPtovtaTitularId()); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.apache.commons.lang.BooleanUtils; + +import br.com.rjconsultores.auditador.annotations.AuditarAtributo; +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarLista; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +/** + * + * @author Rafael + */ +@AuditarClasse(nome = "PtovtaTitular", tela = "auditarClasse.PtovtaTitular") +@Entity +@Table(name = "PTOVTA_TITULAR") +@SequenceGenerator(name = "PTOVTA_TITULAR_SEQ ", sequenceName = "PTOVTA_TITULAR_SEQ ", allocationSize = 1) +public class PtovtaTitular implements Serializable, Auditavel { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_TITULAR_SEQ ") + @Column(name = "PTOVTATITULAR_ID") + private Integer ptovtaTitularId; + + @AuditarAtributo(nome = "NOME TITULAR/FOTO") + @Column(name = "NOME") + private String nome; + + @Column(name = "CPF") + private String cpf; + + @Column(name = "RG") + private String rg; + + @Column(name = "ORGAOEMISSOR") + private String orgaoemissor; + @Lob + @Column(name = "IMAGEM") + private byte[] imagem; + + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private int usuarioId; + + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "titularId") + private List puntoVentaList; + + @Transient + @NaoAuditar + private PtovtaTitular ptovtaTitularClone; + + public PtovtaTitular() { + } + + public PtovtaTitular(Integer ptovtaTitularId) { + this.ptovtaTitularId = ptovtaTitularId; + } + + public PtovtaTitular(Integer ptovtaTitularId, String nome, String cpf, String rg, String orgaoemissor, Boolean activo, Date fecmodif, int usuarioId) { + this.ptovtaTitularId = ptovtaTitularId; + this.nome = nome; + this.cpf = cpf; + this.rg = rg; + this.orgaoemissor = orgaoemissor; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + + + public Integer getPtovtaTitularId() { + return ptovtaTitularId; + } + + public void setPtovtaTitularId(Integer ptovtaTitularId) { + this.ptovtaTitularId = ptovtaTitularId; + } + + public String getNome() { + return nome; + } + + public void setNome(String nome) { + this.nome = nome; + } + + public String getCpf() { + return cpf; + } + + public void setCpf(String cpf) { + this.cpf = cpf; + } + + public String getRg() { + return rg; + } + + public void setRg(String rg) { + this.rg = rg; + } + + public String getOrgaoemissor() { + return orgaoemissor; + } + + public void setOrgaoemissor(String orgaoemissor) { + this.orgaoemissor = orgaoemissor; + } + + public byte[] getImagem() { + return imagem; + } + + public void setImagem(byte[] imagem) { + this.imagem = imagem; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public int getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(int usuarioId) { + this.usuarioId = usuarioId; + } + + + public List getPuntoVentaList() { + return puntoVentaList; + } + + public void setPuntoVentaList(List puntoVentaList) { + this.puntoVentaList = puntoVentaList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (ptovtaTitularId != null ? ptovtaTitularId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof PtovtaTitular)) { + return false; + } + PtovtaTitular other = (PtovtaTitular) object; + if ((this.ptovtaTitularId == null && other.ptovtaTitularId != null) || (this.ptovtaTitularId != null && !this.ptovtaTitularId.equals(other.ptovtaTitularId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaTitular[ ptovtaTitularId=" + ptovtaTitularId + " ]"; + } + + @Override + public void clonar() throws CloneNotSupportedException { + ptovtaTitularClone = new PtovtaTitular(); + ptovtaTitularClone = (PtovtaTitular) this.clone(); + + if(this.getPuntoVentaList() != null) { + List lsClones = new ArrayList(); + for (PuntoVenta puntoVenta : this.getPuntoVentaList()) { + if(BooleanUtils.isTrue(puntoVenta.getActivo())) { + puntoVenta.clonar(); + lsClones.add(puntoVenta.getCloneObject()); + } + } + ptovtaTitularClone.setPuntoVentaList(lsClones); + } + + } + + @Override + public PtovtaTitular getCloneObject() throws CloneNotSupportedException { + return ptovtaTitularClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getPtovtaTitularId()); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVentaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PuntoVentaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/PuntoVentaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PuntoVentaVO.java index 3f42649c7..7246f4079 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVentaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/PuntoVentaVO.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.entidad; - -public class PuntoVentaVO { - - private Integer puntoventaId; - public String nombpuntoventa; - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - - @Override - public String toString(){ - return nombpuntoventa; - } -} +package com.rjconsultores.ventaboletos.entidad; + +public class PuntoVentaVO { + + private Integer puntoventaId; + public String nombpuntoventa; + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + + @Override + public String toString(){ + return nombpuntoventa; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/RecuperarSenha.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RecuperarSenha.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RecuperarSenha.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RecuperarSenha.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Redondeo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Redondeo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Redondeo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Redondeo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RedondeoMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RedondeoMarca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RedondeoMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RedondeoMarca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RedondeoOrgaoConcedente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RedondeoOrgaoConcedente.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RedondeoOrgaoConcedente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RedondeoOrgaoConcedente.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java index de674a4f9..8e2ec491e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java @@ -1,120 +1,120 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "REGION_METROPOLITANA_SEQ", sequenceName = "REGION_METROPOLITANA_SEQ", allocationSize = 1) -@Table(name = "REGION_METROPOLITANA") -public class RegionMetropolitana implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "REGION_METROPOLITANA_SEQ") - @Column(name = "REGIONMETROPOLITANA_ID") - private Long regionMetropolitanaId; - @Column(name = "DESCREGION") - private String descRegion; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToMany(mappedBy = "regionMetropolitana" , fetch = FetchType.EAGER) - private List paradaList; - - public Long getRegionMetropolitanaId() { - return regionMetropolitanaId; - } - - public void setRegionMetropolitanaId(Long regionMetropolitanaId) { - this.regionMetropolitanaId = regionMetropolitanaId; - } - - public String getDescRegion() { - return descRegion; - } - - public void setDescRegion(String descRegion) { - this.descRegion = descRegion; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getParadaList() { - return paradaList; - } - - public void setParadaList(List paradaList) { - this.paradaList = paradaList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (regionMetropolitanaId != null ? regionMetropolitanaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof RegionMetropolitana)) { - return false; - } - RegionMetropolitana other = (RegionMetropolitana) object; - if ((regionMetropolitanaId == null && other.regionMetropolitanaId != null) || (this.regionMetropolitanaId != null && !this.regionMetropolitanaId.equals(other.regionMetropolitanaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - if (getDescRegion() != null || regionMetropolitanaId != null) { - return this.getDescRegion() + " - " + regionMetropolitanaId; - } - return " "; - } - - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "REGION_METROPOLITANA_SEQ", sequenceName = "REGION_METROPOLITANA_SEQ", allocationSize = 1) +@Table(name = "REGION_METROPOLITANA") +public class RegionMetropolitana implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "REGION_METROPOLITANA_SEQ") + @Column(name = "REGIONMETROPOLITANA_ID") + private Long regionMetropolitanaId; + @Column(name = "DESCREGION") + private String descRegion; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToMany(mappedBy = "regionMetropolitana" , fetch = FetchType.EAGER) + private List paradaList; + + public Long getRegionMetropolitanaId() { + return regionMetropolitanaId; + } + + public void setRegionMetropolitanaId(Long regionMetropolitanaId) { + this.regionMetropolitanaId = regionMetropolitanaId; + } + + public String getDescRegion() { + return descRegion; + } + + public void setDescRegion(String descRegion) { + this.descRegion = descRegion; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getParadaList() { + return paradaList; + } + + public void setParadaList(List paradaList) { + this.paradaList = paradaList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (regionMetropolitanaId != null ? regionMetropolitanaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof RegionMetropolitana)) { + return false; + } + RegionMetropolitana other = (RegionMetropolitana) object; + if ((regionMetropolitanaId == null && other.regionMetropolitanaId != null) || (this.regionMetropolitanaId != null && !this.regionMetropolitanaId.equals(other.regionMetropolitanaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + if (getDescRegion() != null || regionMetropolitanaId != null) { + return this.getDescRegion() + " - " + regionMetropolitanaId; + } + return " "; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/RequisicionBoleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RequisicionBoleto.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/RequisicionBoleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RequisicionBoleto.java index 99b4e07ac..b7f7ad8f4 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/RequisicionBoleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RequisicionBoleto.java @@ -1,175 +1,175 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "REQUISICION_BOLETO_SEQ", sequenceName = "REQUISICION_BOLETO_SEQ", allocationSize = 1) -@Table(name = "REQUISICION_BOLETO") -public class RequisicionBoleto implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "REQUISICION_BOLETO_SEQ") - @Column(name = "REQUISICIONBOLETO_ID") - private Integer requisicionboletoId; - @Column(name = "CANTFAJILLA") - private Long cantfajilla; - @Column(name = "STATUSENVIO") - private Boolean statusenvio; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoVenta; - @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") - @ManyToOne - private Estacion estacion; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "CLASIFICACION_ID", referencedColumnName = "CLASIFICACION_ID") - @ManyToOne - private Clasificacion clasificacion; - @JoinColumn(name = "ARTICULO_ID", referencedColumnName = "ARTICULO_ID") - @ManyToOne - private Articulo articulo; - - public Integer getRequisicionboletoId() { - return requisicionboletoId; - } - - public void setRequisicionboletoId(Integer requisicionboletoId) { - this.requisicionboletoId = requisicionboletoId; - } - - public Long getCantfajilla() { - return cantfajilla; - } - - public void setCantfajilla(Long cantfajilla) { - this.cantfajilla = cantfajilla; - } - - public Boolean getStatusenvio() { - return statusenvio; - } - - public void setStatusenvio(Boolean statusenvio) { - this.statusenvio = statusenvio; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public PuntoVenta getPuntoVenta() { - return puntoVenta; - } - - public void setPuntoVenta(PuntoVenta puntoVenta) { - this.puntoVenta = puntoVenta; - } - - public Estacion getEstacion() { - return estacion; - } - - public void setEstacion(Estacion estacion) { - this.estacion = estacion; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Clasificacion getClasificacion() { - return clasificacion; - } - - public void setClasificacion(Clasificacion clasificacion) { - this.clasificacion = clasificacion; - } - - public Articulo getArticulo() { - return articulo; - } - - public void setArticulo(Articulo articulo) { - this.articulo = articulo; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((requisicionboletoId == null) ? 0 : requisicionboletoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - RequisicionBoleto other = (RequisicionBoleto) obj; - if (requisicionboletoId == null) { - if (other.requisicionboletoId != null) - return false; - } else if (!requisicionboletoId.equals(other.requisicionboletoId)) - return false; - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.RequisicionBoleto [requisicionboletoId=" + requisicionboletoId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "REQUISICION_BOLETO_SEQ", sequenceName = "REQUISICION_BOLETO_SEQ", allocationSize = 1) +@Table(name = "REQUISICION_BOLETO") +public class RequisicionBoleto implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "REQUISICION_BOLETO_SEQ") + @Column(name = "REQUISICIONBOLETO_ID") + private Integer requisicionboletoId; + @Column(name = "CANTFAJILLA") + private Long cantfajilla; + @Column(name = "STATUSENVIO") + private Boolean statusenvio; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") + @ManyToOne + private PuntoVenta puntoVenta; + @JoinColumn(name = "ESTACION_ID", referencedColumnName = "ESTACION_ID") + @ManyToOne + private Estacion estacion; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "CLASIFICACION_ID", referencedColumnName = "CLASIFICACION_ID") + @ManyToOne + private Clasificacion clasificacion; + @JoinColumn(name = "ARTICULO_ID", referencedColumnName = "ARTICULO_ID") + @ManyToOne + private Articulo articulo; + + public Integer getRequisicionboletoId() { + return requisicionboletoId; + } + + public void setRequisicionboletoId(Integer requisicionboletoId) { + this.requisicionboletoId = requisicionboletoId; + } + + public Long getCantfajilla() { + return cantfajilla; + } + + public void setCantfajilla(Long cantfajilla) { + this.cantfajilla = cantfajilla; + } + + public Boolean getStatusenvio() { + return statusenvio; + } + + public void setStatusenvio(Boolean statusenvio) { + this.statusenvio = statusenvio; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public PuntoVenta getPuntoVenta() { + return puntoVenta; + } + + public void setPuntoVenta(PuntoVenta puntoVenta) { + this.puntoVenta = puntoVenta; + } + + public Estacion getEstacion() { + return estacion; + } + + public void setEstacion(Estacion estacion) { + this.estacion = estacion; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Clasificacion getClasificacion() { + return clasificacion; + } + + public void setClasificacion(Clasificacion clasificacion) { + this.clasificacion = clasificacion; + } + + public Articulo getArticulo() { + return articulo; + } + + public void setArticulo(Articulo articulo) { + this.articulo = articulo; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((requisicionboletoId == null) ? 0 : requisicionboletoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + RequisicionBoleto other = (RequisicionBoleto) obj; + if (requisicionboletoId == null) { + if (other.requisicionboletoId != null) + return false; + } else if (!requisicionboletoId.equals(other.requisicionboletoId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.RequisicionBoleto [requisicionboletoId=" + requisicionboletoId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservaEspecialCliente.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservaEspecialCliente.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/ReservaEspecialCliente.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservaEspecialCliente.java index d97ee263e..479437219 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ReservaEspecialCliente.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservaEspecialCliente.java @@ -1,270 +1,270 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Calendar; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "RESERVA_ESPECIAL_CLIENTE_SEQ", sequenceName = "RESERVA_ESPECIAL_CLIENTE_SEQ", allocationSize = 1) -@Table(name = "RESERVA_ESPECIAL_CLIENTE") -public class ReservaEspecialCliente { - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "RESERVA_ESPECIAL_CLIENTE_SEQ") - @Column(name = "RESERVAESPECIALCLIENTE_ID") - private Long reservaEspecialClienteId; - - //Cliente - @Basic(optional = false) - @Column(name = "CLIENTE_ID") - private Long clienteId; - - //Corrida - @Basic(optional = false) - @Column(name = "CORRIDA_ID") - private Long corridaId; - - //Origem trecho - @Basic(optional = false) - @JoinColumn(name = "ORIGEM_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada origem; - - //Destino trecho - @Basic(optional = false) - @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada destino; - - //Data Final Vigência - @Basic(optional = false) - @Column(name = "FECINICIO") - @Temporal(TemporalType.TIMESTAMP) - private Date fecinicio; - - //Data Final Vigência - @Basic(optional = false) - @Column(name = "FECFINAL") - @Temporal(TemporalType.TIMESTAMP) - private Date fecfinal; - - //Dias da Semana - @Column(name = "NUMASENTOCORRIDA") - private Short numAsentoCorrida; - @Column(name = "INDSEGUNDA") - private Boolean indSegunda; - @Column(name = "INDTERCA") - private Boolean indTerca; - @Column(name = "INDQUARTA") - private Boolean indQuarta; - @Column(name = "INDQUINTA") - private Boolean indQuinta; - @Column(name = "INDSEXTA") - private Boolean indSexta; - @Column(name = "INDSABADO") - private Boolean indSabado; - @Column(name = "INDDOMINGO") - private Boolean indDomingo; - - //FecModif - @Basic(optional = false) - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - //Activo - @Column(name = "ACTIVO") - private Boolean activo; - - //Usuario - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "TEMPOCONFIRMACAO") - @Temporal(TemporalType.TIMESTAMP) - private Date tempoConfirmacao; - - public Date getTempoConfirmacao() { - return tempoConfirmacao; - } - - public void setTempoConfirmacao(Date tempoConfirmacao) { - this.tempoConfirmacao = tempoConfirmacao; - } - - public Long getReservaEspecialClienteId() { - return reservaEspecialClienteId; - } - - public void setReservaEspecialClienteId(Long reservaEspecialClienteId) { - this.reservaEspecialClienteId = reservaEspecialClienteId; - } - - public Long getClienteId() { - return clienteId; - } - - public void setClienteId(Long clienteId) { - this.clienteId = clienteId; - } - - public Long getCorridaId() { - return corridaId; - } - - public void setCorridaId(Long corridaId) { - this.corridaId = corridaId; - } - - public Parada getOrigem() { - return origem; - } - - public void setOrigem(Parada origem) { - this.origem = origem; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Date getFecinicio() { - return fecinicio; - } - - public void setFecinicio(Date fecinicio) { - this.fecinicio = fecinicio; - } - - public Date getFecfinal() { - return fecfinal; - } - - public void setFecfinal(Date fecfinal) { - this.fecfinal = fecfinal; - } - - public Short getNumAsentoCorrida() { - return numAsentoCorrida; - } - - public void setNumAsentoCorrida(Short numAsentoCorrida) { - this.numAsentoCorrida = numAsentoCorrida; - } - - public Boolean getIndSegunda() { - return indSegunda; - } - - public void setIndSegunda(Boolean indSegunda) { - this.indSegunda = indSegunda; - } - - public Boolean getIndTerca() { - return indTerca; - } - - public void setIndTerca(Boolean indTerca) { - this.indTerca = indTerca; - } - - public Boolean getIndQuarta() { - return indQuarta; - } - - public void setIndQuarta(Boolean indQuarta) { - this.indQuarta = indQuarta; - } - - public Boolean getIndQuinta() { - return indQuinta; - } - - public void setIndQuinta(Boolean indQuinta) { - this.indQuinta = indQuinta; - } - - - public Boolean getIndSexta() { - return indSexta !=null ? indSexta : Boolean.FALSE ; - } - - public void setIndSexta(Boolean indSexta) { - this.indSexta = indSexta; - } - - public Boolean getIndDomingo() { - return indDomingo; - } - - public void setIndDomingo(Boolean indDomingo) { - this.indDomingo = indDomingo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndSabado() { - return indSabado; - } - - public void setIndSabado(Boolean indSabado) { - this.indSabado = indSabado; - } - - public void setTempoConfirmacao(Integer hora, Integer minuto) { - Calendar c = Calendar.getInstance(); - c.set(Calendar.YEAR, 1970); - c.set(Calendar.DAY_OF_MONTH, 1); - c.set(Calendar.MONTH, 0); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE, 0); - c.set(Calendar.MILLISECOND, 0); - c.set(Calendar.SECOND, 0); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE, 0); - c.add(Calendar.HOUR_OF_DAY, hora); - c.add(Calendar.MINUTE, minuto); - - setTempoConfirmacao(c.getTime()); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Calendar; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "RESERVA_ESPECIAL_CLIENTE_SEQ", sequenceName = "RESERVA_ESPECIAL_CLIENTE_SEQ", allocationSize = 1) +@Table(name = "RESERVA_ESPECIAL_CLIENTE") +public class ReservaEspecialCliente { + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "RESERVA_ESPECIAL_CLIENTE_SEQ") + @Column(name = "RESERVAESPECIALCLIENTE_ID") + private Long reservaEspecialClienteId; + + //Cliente + @Basic(optional = false) + @Column(name = "CLIENTE_ID") + private Long clienteId; + + //Corrida + @Basic(optional = false) + @Column(name = "CORRIDA_ID") + private Long corridaId; + + //Origem trecho + @Basic(optional = false) + @JoinColumn(name = "ORIGEM_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada origem; + + //Destino trecho + @Basic(optional = false) + @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada destino; + + //Data Final Vigência + @Basic(optional = false) + @Column(name = "FECINICIO") + @Temporal(TemporalType.TIMESTAMP) + private Date fecinicio; + + //Data Final Vigência + @Basic(optional = false) + @Column(name = "FECFINAL") + @Temporal(TemporalType.TIMESTAMP) + private Date fecfinal; + + //Dias da Semana + @Column(name = "NUMASENTOCORRIDA") + private Short numAsentoCorrida; + @Column(name = "INDSEGUNDA") + private Boolean indSegunda; + @Column(name = "INDTERCA") + private Boolean indTerca; + @Column(name = "INDQUARTA") + private Boolean indQuarta; + @Column(name = "INDQUINTA") + private Boolean indQuinta; + @Column(name = "INDSEXTA") + private Boolean indSexta; + @Column(name = "INDSABADO") + private Boolean indSabado; + @Column(name = "INDDOMINGO") + private Boolean indDomingo; + + //FecModif + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + //Activo + @Column(name = "ACTIVO") + private Boolean activo; + + //Usuario + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "TEMPOCONFIRMACAO") + @Temporal(TemporalType.TIMESTAMP) + private Date tempoConfirmacao; + + public Date getTempoConfirmacao() { + return tempoConfirmacao; + } + + public void setTempoConfirmacao(Date tempoConfirmacao) { + this.tempoConfirmacao = tempoConfirmacao; + } + + public Long getReservaEspecialClienteId() { + return reservaEspecialClienteId; + } + + public void setReservaEspecialClienteId(Long reservaEspecialClienteId) { + this.reservaEspecialClienteId = reservaEspecialClienteId; + } + + public Long getClienteId() { + return clienteId; + } + + public void setClienteId(Long clienteId) { + this.clienteId = clienteId; + } + + public Long getCorridaId() { + return corridaId; + } + + public void setCorridaId(Long corridaId) { + this.corridaId = corridaId; + } + + public Parada getOrigem() { + return origem; + } + + public void setOrigem(Parada origem) { + this.origem = origem; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Date getFecinicio() { + return fecinicio; + } + + public void setFecinicio(Date fecinicio) { + this.fecinicio = fecinicio; + } + + public Date getFecfinal() { + return fecfinal; + } + + public void setFecfinal(Date fecfinal) { + this.fecfinal = fecfinal; + } + + public Short getNumAsentoCorrida() { + return numAsentoCorrida; + } + + public void setNumAsentoCorrida(Short numAsentoCorrida) { + this.numAsentoCorrida = numAsentoCorrida; + } + + public Boolean getIndSegunda() { + return indSegunda; + } + + public void setIndSegunda(Boolean indSegunda) { + this.indSegunda = indSegunda; + } + + public Boolean getIndTerca() { + return indTerca; + } + + public void setIndTerca(Boolean indTerca) { + this.indTerca = indTerca; + } + + public Boolean getIndQuarta() { + return indQuarta; + } + + public void setIndQuarta(Boolean indQuarta) { + this.indQuarta = indQuarta; + } + + public Boolean getIndQuinta() { + return indQuinta; + } + + public void setIndQuinta(Boolean indQuinta) { + this.indQuinta = indQuinta; + } + + + public Boolean getIndSexta() { + return indSexta !=null ? indSexta : Boolean.FALSE ; + } + + public void setIndSexta(Boolean indSexta) { + this.indSexta = indSexta; + } + + public Boolean getIndDomingo() { + return indDomingo; + } + + public void setIndDomingo(Boolean indDomingo) { + this.indDomingo = indDomingo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndSabado() { + return indSabado; + } + + public void setIndSabado(Boolean indSabado) { + this.indSabado = indSabado; + } + + public void setTempoConfirmacao(Integer hora, Integer minuto) { + Calendar c = Calendar.getInstance(); + c.set(Calendar.YEAR, 1970); + c.set(Calendar.DAY_OF_MONTH, 1); + c.set(Calendar.MONTH, 0); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.MILLISECOND, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.add(Calendar.HOUR_OF_DAY, hora); + c.add(Calendar.MINUTE, minuto); + + setTempoConfirmacao(c.getTime()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionCategoria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ReservacionCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionCategoria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionClase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionClase.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ReservacionClase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionClase.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionMarca.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ReservacionMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionMarca.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionMercado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionMercado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ReservacionMercado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionMercado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionPuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/ReservacionPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/ReservacionPuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RestriccionPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RestriccionPago.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RestriccionPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RestriccionPago.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RevenueConfig.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RevenueConfig.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RevenueConfig.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RevenueConfig.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RhPagoConductor.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RhPagoConductor.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RhPagoConductor.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RhPagoConductor.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RolOperativo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RolOperativo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RolOperativo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RolOperativo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Ruta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Ruta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Ruta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Ruta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RutaCaseta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaCaseta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/RutaCaseta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaCaseta.java index 39a1f1096..0ab9f571e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/RutaCaseta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaCaseta.java @@ -1,85 +1,85 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "RUTA_CASETA_SEQ", sequenceName = "RUTA_CASETA_SEQ", allocationSize = 1) -@Table(name = "RUTA_CASETA") -public class RutaCaseta implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "RUTA_CASETA_SEQ") - @Column(name = "RUTACASETA_ID") - private Integer rutaCasetaId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - - @JoinColumn(name = "RUTASECUENCIA_ID", referencedColumnName = "RUTASECUENCIA_ID") - @ManyToOne - private RutaSecuencia rutaSecuencia; - @JoinColumn(name = "CASETAPEAJE_ID", referencedColumnName = "CASETAPEAJE_ID") - @ManyToOne - private CasetaPeaje casetaPeaje; - public Integer getRutaCasetaId() { - return rutaCasetaId; - } - public void setRutaCasetaId(Integer rutaCasetaId) { - this.rutaCasetaId = rutaCasetaId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public RutaSecuencia getRutaSecuencia() { - return rutaSecuencia; - } - public void setRutaSecuencia(RutaSecuencia rutaSecuencia) { - this.rutaSecuencia = rutaSecuencia; - } - public CasetaPeaje getCasetaPeaje() { - return casetaPeaje; - } - public void setCasetaPeaje(CasetaPeaje casetaPeaje) { - this.casetaPeaje = casetaPeaje; - } - - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "RUTA_CASETA_SEQ", sequenceName = "RUTA_CASETA_SEQ", allocationSize = 1) +@Table(name = "RUTA_CASETA") +public class RutaCaseta implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "RUTA_CASETA_SEQ") + @Column(name = "RUTACASETA_ID") + private Integer rutaCasetaId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + + @JoinColumn(name = "RUTASECUENCIA_ID", referencedColumnName = "RUTASECUENCIA_ID") + @ManyToOne + private RutaSecuencia rutaSecuencia; + @JoinColumn(name = "CASETAPEAJE_ID", referencedColumnName = "CASETAPEAJE_ID") + @ManyToOne + private CasetaPeaje casetaPeaje; + public Integer getRutaCasetaId() { + return rutaCasetaId; + } + public void setRutaCasetaId(Integer rutaCasetaId) { + this.rutaCasetaId = rutaCasetaId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public RutaSecuencia getRutaSecuencia() { + return rutaSecuencia; + } + public void setRutaSecuencia(RutaSecuencia rutaSecuencia) { + this.rutaSecuencia = rutaSecuencia; + } + public CasetaPeaje getCasetaPeaje() { + return casetaPeaje; + } + public void setCasetaPeaje(CasetaPeaje casetaPeaje) { + this.casetaPeaje = casetaPeaje; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/RutaCombinacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaCombinacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RutaCombinacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaCombinacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RutaEmbarqueDesembarque.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaEmbarqueDesembarque.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/RutaEmbarqueDesembarque.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaEmbarqueDesembarque.java index d79ef0487..e4c79125c 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/RutaEmbarqueDesembarque.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaEmbarqueDesembarque.java @@ -1,155 +1,155 @@ -package com.rjconsultores.ventaboletos.entidad; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "RUTA_EMBRQ_DESEMBRQ_SEQ", sequenceName = "RUTA_EMBRQ_DESEMBRQ_SEQ", allocationSize = 1) -@Table(name = "RUTA_EMBRQ_DESEMBRQ") -public class RutaEmbarqueDesembarque implements java.io.Serializable { - - private static final long serialVersionUID = -8321526713959603226L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "RUTA_EMBRQ_DESEMBRQ_SEQ") - @Column(name = "RUTAEMBRQDESEMBRQ_ID", unique = true, nullable = false, precision = 7, scale = 0) - private Integer rutaEmbarqueDesembarqueId; - - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "PARADA_ID", nullable = false) - private Parada parada; - - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "RUTA_ID", nullable = false) - private Ruta ruta; - - @Column(name = "ACTIVO", precision = 1, scale = 0) - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF", length = 7) - private Date fecmodif; - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - private Integer usuarioId; - - @Column(name = "EMBARQUE", precision = 1, scale = 0) - private Boolean embarque; - - @Column(name = "DESEMBARQUE", precision = 1, scale = 0) - private Boolean desembarque; - - @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "PARADA_EMB_DES_ID") - private Parada localDesembarqueEmbarque; - - public RutaEmbarqueDesembarque() { - } - - public RutaEmbarqueDesembarque(Integer rutaEmbarqueDesembarqueId, Parada parada, Ruta ruta) { - this.rutaEmbarqueDesembarqueId = rutaEmbarqueDesembarqueId; - this.parada = parada; - this.ruta = ruta; - } - - public RutaEmbarqueDesembarque(Integer rutaEmbarqueDesembarqueId, Parada parada, Ruta ruta, Boolean activo, Date fecmodif, - Integer usuarioId) { - this.rutaEmbarqueDesembarqueId = rutaEmbarqueDesembarqueId; - this.parada = parada; - this.ruta = ruta; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getRutaEmbarqueDesembarqueId() { - return this.rutaEmbarqueDesembarqueId; - } - - public void setRutaEmbarqueDesembarqueId(Integer rutaEmbarqueDesembarqueId) { - this.rutaEmbarqueDesembarqueId = rutaEmbarqueDesembarqueId; - } - - public Parada getParada() { - return this.parada; - } - - public void setParada(Parada parada) { - this.parada = parada; - } - - public Ruta getRuta() { - return this.ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getEmbarque() { - return embarque; - } - - public void setEmbarque(Boolean embarque) { - this.embarque = embarque; - } - - public Boolean getDesembarque() { - return desembarque; - } - - public void setDesembarque(Boolean desembarque) { - this.desembarque = desembarque; - } - - @Override - public String toString() { - return parada != null ? parada.getDescparada() : ""; - } - - public Parada getLocalDesembarqueEmbarque() { - return localDesembarqueEmbarque; - } - - public void setLocalDesembarqueEmbarque(Parada localDesembarqueEmbarque) { - this.localDesembarqueEmbarque = localDesembarqueEmbarque; - } - -} +package com.rjconsultores.ventaboletos.entidad; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "RUTA_EMBRQ_DESEMBRQ_SEQ", sequenceName = "RUTA_EMBRQ_DESEMBRQ_SEQ", allocationSize = 1) +@Table(name = "RUTA_EMBRQ_DESEMBRQ") +public class RutaEmbarqueDesembarque implements java.io.Serializable { + + private static final long serialVersionUID = -8321526713959603226L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "RUTA_EMBRQ_DESEMBRQ_SEQ") + @Column(name = "RUTAEMBRQDESEMBRQ_ID", unique = true, nullable = false, precision = 7, scale = 0) + private Integer rutaEmbarqueDesembarqueId; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "PARADA_ID", nullable = false) + private Parada parada; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "RUTA_ID", nullable = false) + private Ruta ruta; + + @Column(name = "ACTIVO", precision = 1, scale = 0) + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF", length = 7) + private Date fecmodif; + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + private Integer usuarioId; + + @Column(name = "EMBARQUE", precision = 1, scale = 0) + private Boolean embarque; + + @Column(name = "DESEMBARQUE", precision = 1, scale = 0) + private Boolean desembarque; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "PARADA_EMB_DES_ID") + private Parada localDesembarqueEmbarque; + + public RutaEmbarqueDesembarque() { + } + + public RutaEmbarqueDesembarque(Integer rutaEmbarqueDesembarqueId, Parada parada, Ruta ruta) { + this.rutaEmbarqueDesembarqueId = rutaEmbarqueDesembarqueId; + this.parada = parada; + this.ruta = ruta; + } + + public RutaEmbarqueDesembarque(Integer rutaEmbarqueDesembarqueId, Parada parada, Ruta ruta, Boolean activo, Date fecmodif, + Integer usuarioId) { + this.rutaEmbarqueDesembarqueId = rutaEmbarqueDesembarqueId; + this.parada = parada; + this.ruta = ruta; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getRutaEmbarqueDesembarqueId() { + return this.rutaEmbarqueDesembarqueId; + } + + public void setRutaEmbarqueDesembarqueId(Integer rutaEmbarqueDesembarqueId) { + this.rutaEmbarqueDesembarqueId = rutaEmbarqueDesembarqueId; + } + + public Parada getParada() { + return this.parada; + } + + public void setParada(Parada parada) { + this.parada = parada; + } + + public Ruta getRuta() { + return this.ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getEmbarque() { + return embarque; + } + + public void setEmbarque(Boolean embarque) { + this.embarque = embarque; + } + + public Boolean getDesembarque() { + return desembarque; + } + + public void setDesembarque(Boolean desembarque) { + this.desembarque = desembarque; + } + + @Override + public String toString() { + return parada != null ? parada.getDescparada() : ""; + } + + public Parada getLocalDesembarqueEmbarque() { + return localDesembarqueEmbarque; + } + + public void setLocalDesembarqueEmbarque(Parada localDesembarqueEmbarque) { + this.localDesembarqueEmbarque = localDesembarqueEmbarque; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/RutaEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaEmpresa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RutaEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaEmpresa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/RutaIcmsExcepcion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaIcmsExcepcion.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/RutaIcmsExcepcion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaIcmsExcepcion.java index ea3aeeca0..47412c1e9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/RutaIcmsExcepcion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaIcmsExcepcion.java @@ -1,179 +1,179 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.apache.commons.lang.BooleanUtils; - -@Entity -@SequenceGenerator(name = "RUTA_ICMS_EXCEPCION_SEQ", sequenceName = "RUTA_ICMS_EXCEPCION_SEQ", allocationSize = 1) -@Table(name = "RUTA_ICMS_EXCEPCION") -public class RutaIcmsExcepcion implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "RUTA_ICMS_EXCEPCION_SEQ") - @Column(name = "RUTAICMSEXCEPCION_ID") - private Integer rutaIcmsExcepcionId; - - @Column(name = "INDTRIBTARIFA") - private Boolean indTribTarifa; - - @Column(name = "INDTRIBTAXAEMBARQUE") - private Boolean indTribTaxaEmbarque; - - @Column(name = "INDTRIBPEDAGIO") - private Boolean indTribPedagio; - - @ManyToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - - @ManyToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origen; - - @ManyToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "indCST41") - private Boolean indCST41; - - public Integer getRutaIcmsExcepcionId() { - return rutaIcmsExcepcionId; - } - - public void setRutaIcmsExcepcionId(Integer rutaIcmsExcepcionId) { - this.rutaIcmsExcepcionId = rutaIcmsExcepcionId; - } - - public Boolean getIndTribTarifa() { - return BooleanUtils.toBooleanObject(indTribTarifa); - } - - public void setIndTribTarifa(Boolean indTribTarifa) { - this.indTribTarifa = indTribTarifa; - } - - public Boolean getIndTribTaxaEmbarque() { - return BooleanUtils.toBooleanObject(indTribTaxaEmbarque); - } - - public void setIndTribTaxaEmbarque(Boolean indTribTaxaEmbarque) { - this.indTribTaxaEmbarque = indTribTaxaEmbarque; - } - - public Boolean getIndTribPedagio() { - return BooleanUtils.toBooleanObject(indTribPedagio); - } - - public void setIndTribPedagio(Boolean indTribPedagio) { - this.indTribPedagio = indTribPedagio; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getIndCST41() { - return indCST41; - } - - public void setIndCST41(Boolean indCST41) { - this.indCST41 = indCST41; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getRutaIcmsExcepcionId() == null) ? 0 : getRutaIcmsExcepcionId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof RutaIcmsExcepcion)) - return false; - RutaIcmsExcepcion other = (RutaIcmsExcepcion) obj; - if (getRutaIcmsExcepcionId() == null) { - if (other.getRutaIcmsExcepcionId() != null) - return false; - } else if (!getRutaIcmsExcepcionId().equals(other.getRutaIcmsExcepcionId())) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.apache.commons.lang.BooleanUtils; + +@Entity +@SequenceGenerator(name = "RUTA_ICMS_EXCEPCION_SEQ", sequenceName = "RUTA_ICMS_EXCEPCION_SEQ", allocationSize = 1) +@Table(name = "RUTA_ICMS_EXCEPCION") +public class RutaIcmsExcepcion implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "RUTA_ICMS_EXCEPCION_SEQ") + @Column(name = "RUTAICMSEXCEPCION_ID") + private Integer rutaIcmsExcepcionId; + + @Column(name = "INDTRIBTARIFA") + private Boolean indTribTarifa; + + @Column(name = "INDTRIBTAXAEMBARQUE") + private Boolean indTribTaxaEmbarque; + + @Column(name = "INDTRIBPEDAGIO") + private Boolean indTribPedagio; + + @ManyToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + + @ManyToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origen; + + @ManyToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "indCST41") + private Boolean indCST41; + + public Integer getRutaIcmsExcepcionId() { + return rutaIcmsExcepcionId; + } + + public void setRutaIcmsExcepcionId(Integer rutaIcmsExcepcionId) { + this.rutaIcmsExcepcionId = rutaIcmsExcepcionId; + } + + public Boolean getIndTribTarifa() { + return BooleanUtils.toBooleanObject(indTribTarifa); + } + + public void setIndTribTarifa(Boolean indTribTarifa) { + this.indTribTarifa = indTribTarifa; + } + + public Boolean getIndTribTaxaEmbarque() { + return BooleanUtils.toBooleanObject(indTribTaxaEmbarque); + } + + public void setIndTribTaxaEmbarque(Boolean indTribTaxaEmbarque) { + this.indTribTaxaEmbarque = indTribTaxaEmbarque; + } + + public Boolean getIndTribPedagio() { + return BooleanUtils.toBooleanObject(indTribPedagio); + } + + public void setIndTribPedagio(Boolean indTribPedagio) { + this.indTribPedagio = indTribPedagio; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getIndCST41() { + return indCST41; + } + + public void setIndCST41(Boolean indCST41) { + this.indCST41 = indCST41; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getRutaIcmsExcepcionId() == null) ? 0 : getRutaIcmsExcepcionId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof RutaIcmsExcepcion)) + return false; + RutaIcmsExcepcion other = (RutaIcmsExcepcion) obj; + if (getRutaIcmsExcepcionId() == null) { + if (other.getRutaIcmsExcepcionId() != null) + return false; + } else if (!getRutaIcmsExcepcionId().equals(other.getRutaIcmsExcepcionId())) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/RutaSecuencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaSecuencia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/RutaSecuencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/RutaSecuencia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Secretaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/SecretariaEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SecretariaEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/SecretariaEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SecretariaEmpresa.java index 2b5e82de5..4901937e5 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/SecretariaEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SecretariaEmpresa.java @@ -1,108 +1,108 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "SECRETARIA_EMPRESA_SEQ", sequenceName = "SECRETARIA_EMPRESA_SEQ", allocationSize = 1) -@Table(name = "SECRETARIA_EMPRESA") -public class SecretariaEmpresa { - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "SECRETARIA_EMPRESA_SEQ") - @Column(name = "SECRETARIAEMPRESA_ID") - private Integer secretariaempresaId; - @ManyToOne - @JoinColumn(name = "SECRETARIA_ID") - private Secretaria secretaria; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ACTIVO") - private Boolean activo; - - public SecretariaEmpresa(){ - this.activo = true; - } - - public Integer getSecretariaempresaId() { - return secretariaempresaId; - } - public void setSecretariaempresaId(Integer secretariaempresaId) { - this.secretariaempresaId = secretariaempresaId; - } - public Secretaria getSecretaria() { - return secretaria; - } - public void setSecretaria(Secretaria secretaria) { - this.secretaria = secretaria; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (secretariaempresaId != null ? secretariaempresaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof SecretariaEmpresa)) { - return false; - } - SecretariaEmpresa other = (SecretariaEmpresa) object; - if ((this.secretariaempresaId == null && other.secretariaempresaId != null) || (this.secretariaempresaId != null && !this.secretariaempresaId.equals(other.secretariaempresaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa[secretariaempresaId=" + secretariaempresaId + "]"; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "SECRETARIA_EMPRESA_SEQ", sequenceName = "SECRETARIA_EMPRESA_SEQ", allocationSize = 1) +@Table(name = "SECRETARIA_EMPRESA") +public class SecretariaEmpresa { + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SECRETARIA_EMPRESA_SEQ") + @Column(name = "SECRETARIAEMPRESA_ID") + private Integer secretariaempresaId; + @ManyToOne + @JoinColumn(name = "SECRETARIA_ID") + private Secretaria secretaria; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ACTIVO") + private Boolean activo; + + public SecretariaEmpresa(){ + this.activo = true; + } + + public Integer getSecretariaempresaId() { + return secretariaempresaId; + } + public void setSecretariaempresaId(Integer secretariaempresaId) { + this.secretariaempresaId = secretariaempresaId; + } + public Secretaria getSecretaria() { + return secretaria; + } + public void setSecretaria(Secretaria secretaria) { + this.secretaria = secretaria; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (secretariaempresaId != null ? secretariaempresaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof SecretariaEmpresa)) { + return false; + } + SecretariaEmpresa other = (SecretariaEmpresa) object; + if ((this.secretariaempresaId == null && other.secretariaempresaId != null) || (this.secretariaempresaId != null && !this.secretariaempresaId.equals(other.secretariaempresaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa[secretariaempresaId=" + secretariaempresaId + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/SegVKM.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SegVKM.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/SegVKM.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SegVKM.java index 0abdf4bf3..fb18e8091 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/SegVKM.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SegVKM.java @@ -1,150 +1,150 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author RJ - */ -@Entity -@SequenceGenerator(name = "SEGVKM_SEQ", sequenceName = "SEGVKM_SEQ", allocationSize = 1) -@Table(name = "SEGVKM") -public class SegVKM implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGVKM_SEQ") - @Column(name = "SEGVKM_ID") - private Integer segVKMId; - @Column(name = "KM") - private BigDecimal km; - @Column(name = "VALOR") - private BigDecimal valor; - @Column(name = "SERIE") - private String serie; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoConcedente; - - public SegVKM() { - } - - public SegVKM(Integer segVKMId) { - this.segVKMId = segVKMId; - } - - public Integer getSegVKMId() { - return segVKMId; - } - - public void setSegVKMId(Integer segVKMId) { - this.segVKMId = segVKMId; - } - - public BigDecimal getKm() { - return km; - } - - public void setKm(BigDecimal km) { - this.km = km; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (segVKMId != null ? segVKMId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof SegVKM)) { - return false; - } - SegVKM other = (SegVKM) object; - if ((this.segVKMId == null && other.segVKMId != null) || (this.segVKMId != null && !this.segVKMId.equals(other.segVKMId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.SegVKM[ segVKMId=" + segVKMId + " ]"; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author RJ + */ +@Entity +@SequenceGenerator(name = "SEGVKM_SEQ", sequenceName = "SEGVKM_SEQ", allocationSize = 1) +@Table(name = "SEGVKM") +public class SegVKM implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGVKM_SEQ") + @Column(name = "SEGVKM_ID") + private Integer segVKMId; + @Column(name = "KM") + private BigDecimal km; + @Column(name = "VALOR") + private BigDecimal valor; + @Column(name = "SERIE") + private String serie; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoConcedente; + + public SegVKM() { + } + + public SegVKM(Integer segVKMId) { + this.segVKMId = segVKMId; + } + + public Integer getSegVKMId() { + return segVKMId; + } + + public void setSegVKMId(Integer segVKMId) { + this.segVKMId = segVKMId; + } + + public BigDecimal getKm() { + return km; + } + + public void setKm(BigDecimal km) { + this.km = km; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (segVKMId != null ? segVKMId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof SegVKM)) { + return false; + } + SegVKM other = (SegVKM) object; + if ((this.segVKMId == null && other.segVKMId != null) || (this.segVKMId != null && !this.segVKMId.equals(other.segVKMId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.SegVKM[ segVKMId=" + segVKMId + " ]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/SeguradoraEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguradoraEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/SeguradoraEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguradoraEmpresa.java index b0b23bc84..4974d6ade 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/SeguradoraEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguradoraEmpresa.java @@ -1,80 +1,80 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "SEGURADORA_EMPRESA_SEQ", sequenceName = "SEGURADORA_EMPRESA_SEQ", allocationSize = 1) -@Table(name = "SEGURADORA_EMPRESA") -public class SeguradoraEmpresa implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGURADORA_EMPRESA_SEQ") - @Column(name = "SEGURADORAEMPRESA_ID ") - private Integer seguradoraEmpresaId; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @Column(name = "SERIESEGURADORA") - private String serie; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Integer getSeguradoraEmpresaId() { - return seguradoraEmpresaId; - } - public void setSeguradoraEmpresaId(Integer seguradoraEmpresaId) { - this.seguradoraEmpresaId = seguradoraEmpresaId; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getSerie() { - return serie; - } - public void setSerie(String serie) { - this.serie = serie; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "SEGURADORA_EMPRESA_SEQ", sequenceName = "SEGURADORA_EMPRESA_SEQ", allocationSize = 1) +@Table(name = "SEGURADORA_EMPRESA") +public class SeguradoraEmpresa implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGURADORA_EMPRESA_SEQ") + @Column(name = "SEGURADORAEMPRESA_ID ") + private Integer seguradoraEmpresaId; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @Column(name = "SERIESEGURADORA") + private String serie; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Integer getSeguradoraEmpresaId() { + return seguradoraEmpresaId; + } + public void setSeguradoraEmpresaId(Integer seguradoraEmpresaId) { + this.seguradoraEmpresaId = seguradoraEmpresaId; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getSerie() { + return serie; + } + public void setSerie(String serie) { + this.serie = serie; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/SeguroKm.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguroKm.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/SeguroKm.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguroKm.java index 3972aeed0..8130794d7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/SeguroKm.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguroKm.java @@ -1,151 +1,151 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "SEGURO_KM_SEQ", sequenceName = "SEGURO_KM_SEQ", allocationSize = 1) -@Table(name = "SEGURO_KM") -public class SeguroKm implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGURO_KM_SEQ") - @Column(name = "SEGUROKM_ID") - private Integer segurokmId; - @Column(name = "KMATE") - private Integer kmate; - @Column(name = "VALORTAXA") - private BigDecimal valortaxa; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoconcedente; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "TIPO_SEGURO") - private String tipoSeguro; - - public SeguroKm() { - } - - public String getTipoSeguro() { - return tipoSeguro; - } - - public void setTipoSeguro(String tipoSeguro) { - this.tipoSeguro = tipoSeguro; - } - - public SeguroKm(Integer segurokmId) { - this.segurokmId = segurokmId; - } - - public Integer getSegurokmId() { - return segurokmId; - } - - public void setSegurokmId(Integer segurokmId) { - this.segurokmId = segurokmId; - } - - public Integer getKmate() { - return kmate; - } - - public void setKmate(Integer kmate) { - this.kmate = kmate; - } - - public BigDecimal getValortaxa() { - return valortaxa; - } - - public void setValortaxa(BigDecimal valortaxa) { - this.valortaxa = valortaxa; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (segurokmId != null ? segurokmId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof SeguroKm)) { - return false; - } - SeguroKm other = (SeguroKm) object; - if ((this.segurokmId == null && other.segurokmId != null) || (this.segurokmId != null && !this.segurokmId.equals(other.segurokmId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.SeguroKm[ segurokmId=" + segurokmId + " ]"; - } - - public OrgaoConcedente getOrgaoconcedente() { - return orgaoconcedente; - } - - public void setOrgaoconcedente(OrgaoConcedente orgaoconcedente) { - this.orgaoconcedente = orgaoconcedente; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "SEGURO_KM_SEQ", sequenceName = "SEGURO_KM_SEQ", allocationSize = 1) +@Table(name = "SEGURO_KM") +public class SeguroKm implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGURO_KM_SEQ") + @Column(name = "SEGUROKM_ID") + private Integer segurokmId; + @Column(name = "KMATE") + private Integer kmate; + @Column(name = "VALORTAXA") + private BigDecimal valortaxa; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoconcedente; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "TIPO_SEGURO") + private String tipoSeguro; + + public SeguroKm() { + } + + public String getTipoSeguro() { + return tipoSeguro; + } + + public void setTipoSeguro(String tipoSeguro) { + this.tipoSeguro = tipoSeguro; + } + + public SeguroKm(Integer segurokmId) { + this.segurokmId = segurokmId; + } + + public Integer getSegurokmId() { + return segurokmId; + } + + public void setSegurokmId(Integer segurokmId) { + this.segurokmId = segurokmId; + } + + public Integer getKmate() { + return kmate; + } + + public void setKmate(Integer kmate) { + this.kmate = kmate; + } + + public BigDecimal getValortaxa() { + return valortaxa; + } + + public void setValortaxa(BigDecimal valortaxa) { + this.valortaxa = valortaxa; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (segurokmId != null ? segurokmId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof SeguroKm)) { + return false; + } + SeguroKm other = (SeguroKm) object; + if ((this.segurokmId == null && other.segurokmId != null) || (this.segurokmId != null && !this.segurokmId.equals(other.segurokmId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.SeguroKm[ segurokmId=" + segurokmId + " ]"; + } + + public OrgaoConcedente getOrgaoconcedente() { + return orgaoconcedente; + } + + public void setOrgaoconcedente(OrgaoConcedente orgaoconcedente) { + this.orgaoconcedente = orgaoconcedente; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java index 1387c5859..0ab67174a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SeguroTarifa.java @@ -1,141 +1,141 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "SEGURO_TARIFA_SEQ", sequenceName = "SEGURO_TARIFA_SEQ", allocationSize = 1) -@Table(name = "SEGURO_TARIFA") -public class SeguroTarifa implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGURO_TARIFA_SEQ") - @Column(name = "SEGUROTARIFA_ID") - private Integer segurotarifaId; - @Column(name = "VALORTAXA") - private BigDecimal valortarifa; - @Column(name = "VALORTARIFAATE") - private BigDecimal valortarifaate; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoconcedente; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public SeguroTarifa() { - } - - public SeguroTarifa(Integer segurotarifaId) { - this.segurotarifaId = segurotarifaId; - } - - public Integer getSegurotarifaId() { - return segurotarifaId; - } - - public void setSegurotarifaId(Integer segurotarifaId) { - this.segurotarifaId = segurotarifaId; - } - - public BigDecimal getValortarifa() { - return valortarifa; - } - - public void setValortarifa(BigDecimal valortarifa) { - this.valortarifa = valortarifa; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (segurotarifaId != null ? segurotarifaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof SeguroTarifa)) { - return false; - } - SeguroTarifa other = (SeguroTarifa) object; - if ((this.segurotarifaId == null && other.segurotarifaId != null) || (this.segurotarifaId != null && !this.segurotarifaId.equals(other.segurotarifaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.SeguroTarifa[ segurotarifaId=" + segurotarifaId + " ]"; - } - - public BigDecimal getValortarifaate() { - return valortarifaate; - } - - public void setValortarifaate(BigDecimal valortarifaate) { - this.valortarifaate = valortarifaate; - } - - public OrgaoConcedente getOrgaoconcedente() { - return orgaoconcedente; - } - - public void setOrgaoconcedente(OrgaoConcedente orgaoconcedente) { - this.orgaoconcedente = orgaoconcedente; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "SEGURO_TARIFA_SEQ", sequenceName = "SEGURO_TARIFA_SEQ", allocationSize = 1) +@Table(name = "SEGURO_TARIFA") +public class SeguroTarifa implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEGURO_TARIFA_SEQ") + @Column(name = "SEGUROTARIFA_ID") + private Integer segurotarifaId; + @Column(name = "VALORTAXA") + private BigDecimal valortarifa; + @Column(name = "VALORTARIFAATE") + private BigDecimal valortarifaate; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoconcedente; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public SeguroTarifa() { + } + + public SeguroTarifa(Integer segurotarifaId) { + this.segurotarifaId = segurotarifaId; + } + + public Integer getSegurotarifaId() { + return segurotarifaId; + } + + public void setSegurotarifaId(Integer segurotarifaId) { + this.segurotarifaId = segurotarifaId; + } + + public BigDecimal getValortarifa() { + return valortarifa; + } + + public void setValortarifa(BigDecimal valortarifa) { + this.valortarifa = valortarifa; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (segurotarifaId != null ? segurotarifaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof SeguroTarifa)) { + return false; + } + SeguroTarifa other = (SeguroTarifa) object; + if ((this.segurotarifaId == null && other.segurotarifaId != null) || (this.segurotarifaId != null && !this.segurotarifaId.equals(other.segurotarifaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.SeguroTarifa[ segurotarifaId=" + segurotarifaId + " ]"; + } + + public BigDecimal getValortarifaate() { + return valortarifaate; + } + + public void setValortarifaate(BigDecimal valortarifaate) { + this.valortarifaate = valortarifaate; + } + + public OrgaoConcedente getOrgaoconcedente() { + return orgaoconcedente; + } + + public void setOrgaoconcedente(OrgaoConcedente orgaoconcedente) { + this.orgaoconcedente = orgaoconcedente; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Sistema.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Sistema.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Sistema.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Sistema.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/SolicitudExpreso.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SolicitudExpreso.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/SolicitudExpreso.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/SolicitudExpreso.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/StatusSolicitudExpreso.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/StatusSolicitudExpreso.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/StatusSolicitudExpreso.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/StatusSolicitudExpreso.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Tarifa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Tarifa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Tarifa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Tarifa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaCategoria.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaCategoria.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaConvenioTransport.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaConvenioTransport.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaConvenioTransport.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaConvenioTransport.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaDemanda.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaDemanda.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaDemanda.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaDemanda.java index 51da63206..ca3ad2df9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaDemanda.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaDemanda.java @@ -1,311 +1,311 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author Wallace - */ -@Entity -@SequenceGenerator(name = "TARIFA_DEMANDA_SEQ", sequenceName = "TARIFA_DEMANDA_SEQ", allocationSize = 1) -@Table(name = "TARIFA_DEMANDA") -public class TarifaDemanda implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_SEQ") - @Column(name = "TARIFADEMANDA_ID") - private Integer tarifaDemandaId; - @Column(name = "PRECIO") - private BigDecimal precio; - @Column(name = "IMPORTETAXAEMBARQUE") - private BigDecimal importetaxaembarque; - @Column(name = "IMPORTEPEDAGIO") - private BigDecimal importepedagio; - @Column(name = "IMPORTEOUTROS") - private BigDecimal importeoutros; - @Column(name = "IMPORTESEGURO") - private BigDecimal importeseguro; - @Column(name = "IMPORTETPP") - private BigDecimal importeTPP; - @Column(name = "PRECIOORIGINAL") - private BigDecimal preciooriginal; - @Column(name = "STATUSTARIFA") - private String statustarifa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToOne - @JoinColumn(name = "TRAMO_ID") - private Tramo tramo; - @OneToOne - @JoinColumn(name = "MARCA_ID") - private Marca marca; - @OneToOne - @JoinColumn(name = "CLASESERVICIO_ID") - private ClaseServicio claseServicio; - @OneToOne - @JoinColumn(name = "VIGENCIATARIFA_ID") - private VigenciaTarifa vigenciaTarifa; - @Column(name = "PRECIOREDABIERTO") - private BigDecimal precioredabierto; - @Column(name = "CATEGORIAS") - private String categorias; - @Column(name = "PUNTOVENTAS") - private String puntoVentas; - @OneToOne - @JoinColumn(name = "ORIGEN_ID") - private Parada origen; - @OneToOne - @JoinColumn(name = "DESTINO_ID") - private Parada destino; - @OneToOne - @JoinColumn(name = "RUTA_ID") - private Ruta ruta; - @OneToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID") - private OrgaoConcedente orgaoConcedente; - - public TarifaDemanda() { - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public BigDecimal getImporteTPP() { - return importeTPP; - } - - public void setImporteTPP(BigDecimal importeTPP) { - this.importeTPP = importeTPP; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - public TarifaDemanda(Integer tarifaDemandaId) { - this.tarifaDemandaId = tarifaDemandaId; - } - - public Integer getTarifaDemandaId() { - return tarifaDemandaId; - } - - public void setTarifaId(Integer tarifaDemandaId) { - this.tarifaDemandaId = tarifaDemandaId; - } - - public BigDecimal getPrecio() { - return precio; - } - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - public BigDecimal getPreciooriginal() { - return preciooriginal; - } - - public void setPreciooriginal(BigDecimal preciooriginal) { - this.preciooriginal = preciooriginal; - } - - public String getStatustarifa() { - return statustarifa; - } - - public void setStatustarifa(String statustarifa) { - this.statustarifa = statustarifa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - - public Marca getMarca() { - return marca; - } - - public void setMarca(Marca marca) { - this.marca = marca; - } - - public Tramo getTramo() { - return tramo; - } - - public void setTramo(Tramo tramo) { - this.tramo = tramo; - } - - public VigenciaTarifa getVigenciaTarifa() { - return vigenciaTarifa; - } - - public void setVigenciaTarifa(VigenciaTarifa vigenciaTarifa) { - this.vigenciaTarifa = vigenciaTarifa; - } - - public BigDecimal getPrecioredabierto() { - return precioredabierto; - } - - public void setPrecioredabierto(BigDecimal precioredabierto) { - this.precioredabierto = precioredabierto; - } - - public String getCategorias() { - return categorias; - } - - public void setCategorias(String categorias) { - this.categorias = categorias; - } - - public String getPuntoVentas() { - return puntoVentas; - } - - public void setPuntoVentas(String puntoVentas) { - this.puntoVentas = puntoVentas; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (tarifaDemandaId != null ? tarifaDemandaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Tarifa)) { - return false; - } - TarifaDemanda other = (TarifaDemanda) object; - if ((this.tarifaDemandaId == null && other.tarifaDemandaId != null) || (this.tarifaDemandaId != null && !this.tarifaDemandaId.equals(other.tarifaDemandaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.Tarifa[tarifaId=" + tarifaDemandaId + "]"; - } - - public BigDecimal getImportetaxaembarque() { - return importetaxaembarque; - } - - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - - public BigDecimal getImportepedagio() { - return importepedagio; - } - - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - - public BigDecimal getImporteoutros() { - return importeoutros; - } - - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - - public BigDecimal getImporteseguro() { - return importeseguro; - } - - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author Wallace + */ +@Entity +@SequenceGenerator(name = "TARIFA_DEMANDA_SEQ", sequenceName = "TARIFA_DEMANDA_SEQ", allocationSize = 1) +@Table(name = "TARIFA_DEMANDA") +public class TarifaDemanda implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_SEQ") + @Column(name = "TARIFADEMANDA_ID") + private Integer tarifaDemandaId; + @Column(name = "PRECIO") + private BigDecimal precio; + @Column(name = "IMPORTETAXAEMBARQUE") + private BigDecimal importetaxaembarque; + @Column(name = "IMPORTEPEDAGIO") + private BigDecimal importepedagio; + @Column(name = "IMPORTEOUTROS") + private BigDecimal importeoutros; + @Column(name = "IMPORTESEGURO") + private BigDecimal importeseguro; + @Column(name = "IMPORTETPP") + private BigDecimal importeTPP; + @Column(name = "PRECIOORIGINAL") + private BigDecimal preciooriginal; + @Column(name = "STATUSTARIFA") + private String statustarifa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToOne + @JoinColumn(name = "TRAMO_ID") + private Tramo tramo; + @OneToOne + @JoinColumn(name = "MARCA_ID") + private Marca marca; + @OneToOne + @JoinColumn(name = "CLASESERVICIO_ID") + private ClaseServicio claseServicio; + @OneToOne + @JoinColumn(name = "VIGENCIATARIFA_ID") + private VigenciaTarifa vigenciaTarifa; + @Column(name = "PRECIOREDABIERTO") + private BigDecimal precioredabierto; + @Column(name = "CATEGORIAS") + private String categorias; + @Column(name = "PUNTOVENTAS") + private String puntoVentas; + @OneToOne + @JoinColumn(name = "ORIGEN_ID") + private Parada origen; + @OneToOne + @JoinColumn(name = "DESTINO_ID") + private Parada destino; + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + + public TarifaDemanda() { + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public BigDecimal getImporteTPP() { + return importeTPP; + } + + public void setImporteTPP(BigDecimal importeTPP) { + this.importeTPP = importeTPP; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + public TarifaDemanda(Integer tarifaDemandaId) { + this.tarifaDemandaId = tarifaDemandaId; + } + + public Integer getTarifaDemandaId() { + return tarifaDemandaId; + } + + public void setTarifaId(Integer tarifaDemandaId) { + this.tarifaDemandaId = tarifaDemandaId; + } + + public BigDecimal getPrecio() { + return precio; + } + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + public BigDecimal getPreciooriginal() { + return preciooriginal; + } + + public void setPreciooriginal(BigDecimal preciooriginal) { + this.preciooriginal = preciooriginal; + } + + public String getStatustarifa() { + return statustarifa; + } + + public void setStatustarifa(String statustarifa) { + this.statustarifa = statustarifa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + + public Marca getMarca() { + return marca; + } + + public void setMarca(Marca marca) { + this.marca = marca; + } + + public Tramo getTramo() { + return tramo; + } + + public void setTramo(Tramo tramo) { + this.tramo = tramo; + } + + public VigenciaTarifa getVigenciaTarifa() { + return vigenciaTarifa; + } + + public void setVigenciaTarifa(VigenciaTarifa vigenciaTarifa) { + this.vigenciaTarifa = vigenciaTarifa; + } + + public BigDecimal getPrecioredabierto() { + return precioredabierto; + } + + public void setPrecioredabierto(BigDecimal precioredabierto) { + this.precioredabierto = precioredabierto; + } + + public String getCategorias() { + return categorias; + } + + public void setCategorias(String categorias) { + this.categorias = categorias; + } + + public String getPuntoVentas() { + return puntoVentas; + } + + public void setPuntoVentas(String puntoVentas) { + this.puntoVentas = puntoVentas; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (tarifaDemandaId != null ? tarifaDemandaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Tarifa)) { + return false; + } + TarifaDemanda other = (TarifaDemanda) object; + if ((this.tarifaDemandaId == null && other.tarifaDemandaId != null) || (this.tarifaDemandaId != null && !this.tarifaDemandaId.equals(other.tarifaDemandaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.Tarifa[tarifaId=" + tarifaDemandaId + "]"; + } + + public BigDecimal getImportetaxaembarque() { + return importetaxaembarque; + } + + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + + public BigDecimal getImportepedagio() { + return importepedagio; + } + + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + + public BigDecimal getImporteoutros() { + return importeoutros; + } + + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + + public BigDecimal getImporteseguro() { + return importeseguro; + } + + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcada.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcada.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcadaHist.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcadaHist.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcadaHist.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaEmbarcadaHist.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaGrupoContrato.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaGrupoContrato.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaGrupoContrato.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaGrupoContrato.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaHist.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaHist.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaHist.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaHist.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaKm.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaKm.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaKm.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaKm.java index 3ae5b3232..31d7e5294 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaKm.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaKm.java @@ -1,157 +1,157 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** -* -* @author daniel.zauli -*/ -@Entity -@SequenceGenerator(name = "TARIFA_KM_SEQ", sequenceName = "TARIFA_KM_SEQ", allocationSize = 1) -@Table(name = "TARIFA_KM") -public class TarifaKm implements Serializable, Comparable{ - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_KM_SEQ") - @Column(name = "TARIFAKM_ID") - private Integer tarifakmId; - - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoconcedenteId; - - @Column(name = "KMATE") - private BigDecimal kmate; - - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "VALORTAXA") // tarifa - private BigDecimal valortaxa; - - @JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID") - @ManyToOne - private ClaseServicio claseServicio; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public TarifaKm(){} - - @Override - public int hashCode() { - int hash = 0; - hash += (tarifakmId != null ? tarifakmId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TarifaKm)) { - return false; - } - TarifaKm other = (TarifaKm) object; - if ((this.tarifakmId == null && other.tarifakmId != null) || (this.tarifakmId != null && !this.tarifakmId.equals(other.tarifakmId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TarifaKm[ tarifakmId=" + tarifakmId + " ]"; - } - - public Integer getTarifakmId() { - return tarifakmId; - } - - public void setTarifakmId(Integer tarifakmId) { - this.tarifakmId = tarifakmId; - } - - public OrgaoConcedente getOrgaoconcedenteId() { - return orgaoconcedenteId; - } - - public void setOrgaoconcedenteId(OrgaoConcedente orgaoconcedenteId) { - this.orgaoconcedenteId = orgaoconcedenteId; - } - - public BigDecimal getKmate() { - return kmate; - } - - public void setKmate(BigDecimal kmate) { - this.kmate = kmate; - } - - public BigDecimal getValortaxa() { - return valortaxa; - } - - public void setValortaxa(BigDecimal valortaxa) { - this.valortaxa = valortaxa; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int compareTo(TarifaKm tkm) { - return this.getKmate().intValue() - tkm.getKmate().intValue(); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** +* +* @author daniel.zauli +*/ +@Entity +@SequenceGenerator(name = "TARIFA_KM_SEQ", sequenceName = "TARIFA_KM_SEQ", allocationSize = 1) +@Table(name = "TARIFA_KM") +public class TarifaKm implements Serializable, Comparable{ + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_KM_SEQ") + @Column(name = "TARIFAKM_ID") + private Integer tarifakmId; + + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoconcedenteId; + + @Column(name = "KMATE") + private BigDecimal kmate; + + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation + @Column(name = "VALORTAXA") // tarifa + private BigDecimal valortaxa; + + @JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID") + @ManyToOne + private ClaseServicio claseServicio; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public TarifaKm(){} + + @Override + public int hashCode() { + int hash = 0; + hash += (tarifakmId != null ? tarifakmId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TarifaKm)) { + return false; + } + TarifaKm other = (TarifaKm) object; + if ((this.tarifakmId == null && other.tarifakmId != null) || (this.tarifakmId != null && !this.tarifakmId.equals(other.tarifakmId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.TarifaKm[ tarifakmId=" + tarifakmId + " ]"; + } + + public Integer getTarifakmId() { + return tarifakmId; + } + + public void setTarifakmId(Integer tarifakmId) { + this.tarifakmId = tarifakmId; + } + + public OrgaoConcedente getOrgaoconcedenteId() { + return orgaoconcedenteId; + } + + public void setOrgaoconcedenteId(OrgaoConcedente orgaoconcedenteId) { + this.orgaoconcedenteId = orgaoconcedenteId; + } + + public BigDecimal getKmate() { + return kmate; + } + + public void setKmate(BigDecimal kmate) { + this.kmate = kmate; + } + + public BigDecimal getValortaxa() { + return valortaxa; + } + + public void setValortaxa(BigDecimal valortaxa) { + this.valortaxa = valortaxa; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int compareTo(TarifaKm tkm) { + return this.getKmate().intValue() - tkm.getKmate().intValue(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaMinimaCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaMinimaCategoria.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaMinimaCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaMinimaCategoria.java index fae34a104..1eb0a10f3 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaMinimaCategoria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaMinimaCategoria.java @@ -1,120 +1,120 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "TARIFA_MINIMA_CATEGORIA_SEQ", sequenceName = "TARIFA_MINIMA_CATEGORIA_SEQ", allocationSize = 1) -@Table(name = "TARIFA_MINIMA_CATEGORIA") -public class TarifaMinimaCategoria implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "TARIFAMINIMACATEGORIA_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_MINIMA_CATEGORIA_SEQ") - private Long tarifaminimacategoriaId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "CATEGORIA_ID") - private Categoria categoria; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "TARIFAMINIMA_ID") - private TarifaMinima tarifaMinima; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public Long getTarifaminimacategoriaId() { - return tarifaminimacategoriaId; - } - - public void setTarifaminimacategoriaId(Long tarifaminimacategoriaId) { - this.tarifaminimacategoriaId = tarifaminimacategoriaId; - } - - public Categoria getCategoria() { - return categoria; - } - - public void setCategoria(Categoria categoria) { - this.categoria = categoria; - } - - public TarifaMinima getTarifaMinima() { - return tarifaMinima; - } - - public void setTarifaMinima(TarifaMinima tarifaMinima) { - this.tarifaMinima = tarifaMinima; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((tarifaminimacategoriaId == null) ? 0 : tarifaminimacategoriaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - TarifaMinimaCategoria other = (TarifaMinimaCategoria) obj; - if (categoria == null) { - if (other.categoria != null) - return false; - } else if (!categoria.equals(other.categoria)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "TARIFA_MINIMA_CATEGORIA_SEQ", sequenceName = "TARIFA_MINIMA_CATEGORIA_SEQ", allocationSize = 1) +@Table(name = "TARIFA_MINIMA_CATEGORIA") +public class TarifaMinimaCategoria implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "TARIFAMINIMACATEGORIA_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_MINIMA_CATEGORIA_SEQ") + private Long tarifaminimacategoriaId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "CATEGORIA_ID") + private Categoria categoria; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "TARIFAMINIMA_ID") + private TarifaMinima tarifaMinima; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public Long getTarifaminimacategoriaId() { + return tarifaminimacategoriaId; + } + + public void setTarifaminimacategoriaId(Long tarifaminimacategoriaId) { + this.tarifaminimacategoriaId = tarifaminimacategoriaId; + } + + public Categoria getCategoria() { + return categoria; + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + public TarifaMinima getTarifaMinima() { + return tarifaMinima; + } + + public void setTarifaMinima(TarifaMinima tarifaMinima) { + this.tarifaMinima = tarifaMinima; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((tarifaminimacategoriaId == null) ? 0 : tarifaminimacategoriaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + TarifaMinimaCategoria other = (TarifaMinimaCategoria) obj; + if (categoria == null) { + if (other.categoria != null) + return false; + } else if (!categoria.equals(other.categoria)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java index 778b48aca..f4d94bad6 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java @@ -1,384 +1,384 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import br.com.rjconsultores.auditador.annotations.AuditarAtributo; -import br.com.rjconsultores.auditador.annotations.AuditarClasse; -import br.com.rjconsultores.auditador.annotations.AuditarID; -import br.com.rjconsultores.auditador.annotations.NaoAuditar; -import br.com.rjconsultores.auditador.interfaces.Auditavel; - -@Entity -@SequenceGenerator(name = "TARIFA_OFICIAL_SEQ", sequenceName = "TARIFA_OFICIAL_SEQ", allocationSize = 1) -@Table(name = "TARIFA_OFICIAL") -@AuditarClasse(nome = "TARIFA", tela = "auditarClasse.TarifaOficial") -public class TarifaOficial implements Serializable, Auditavel { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_OFICIAL_SEQ") - @Column(name = "TARIFAOFICIAL_ID") - @AuditarID - private Integer tarifaOficialId; - - @Column(name = "PRECIO") - @AuditarAtributo(nome = "Tarifa") - private BigDecimal precio; - - @Column(name = "PRECIOORIGINAL") - @AuditarAtributo(nome = "Tarifa Original") - private BigDecimal preciooriginal; - - @Column(name = "IMPORTETAXAEMBARQUE") - @AuditarAtributo(nome = "Taxa de Embarque") - private BigDecimal importetaxaembarque; - - @Column(name = "IMPORTEPEDAGIO") - @AuditarAtributo(nome = "Pedagio") - private BigDecimal importepedagio; - - @Column(name = "IMPORTEOUTROS") - @AuditarAtributo(nome = "Outros") - private BigDecimal importeoutros; - - @Column(name = "IMPORTESEGURO") - @AuditarAtributo(nome = "Seguro") - private BigDecimal importeseguro; - - @Column(name = "IMPORTETPP") - @AuditarAtributo(nome = "Tarifa TPP") - private BigDecimal importetpp; - - @Column(name = "STATUSTARIFA") - @AuditarAtributo(nome = "Status Tarifa") - private String statustarifa; - - @Column(name = "ACTIVO") - @NaoAuditar - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - @NaoAuditar - private Date fecmodif; - - @Column(name = "USUARIO_ID") - @NaoAuditar - private Integer usuarioId; - - @OneToOne - @JoinColumn(name = "TRAMO_ID") - @NaoAuditar - private Tramo tramo; - - @OneToOne - @JoinColumn(name = "MARCA_ID") - @NaoAuditar - private Marca marca; - - @OneToOne - @JoinColumn(name = "CLASESERVICIO_ID") - @NaoAuditar - private ClaseServicio claseServicio; - - @OneToOne - @JoinColumn(name = "MONEDA_ID") - @NaoAuditar - private Moneda moneda; - - @OneToOne - @JoinColumn(name = "VIGENCIATARIFA_ID") - @NaoAuditar - private VigenciaTarifa vigenciaTarifa; - - @Column(name = "PRECIOREDABIERTO") - @AuditarAtributo(nome = "Tarifa volta em aberto") - private BigDecimal precioredabierto; - - @OneToOne - @JoinColumn(name = "ORIGEN_ID") - @NaoAuditar - private Parada origen; - - @OneToOne - @JoinColumn(name = "DESTINO_ID") - @NaoAuditar - private Parada destino; - - @OneToOne - @JoinColumn(name = "RUTA_ID") - @NaoAuditar - private Ruta ruta; - - @OneToOne - @JoinColumn(name = "ORGAOCONCEDENTE_ID") - @NaoAuditar - private OrgaoConcedente orgaoConcedente; - - @Transient - @NaoAuditar - private TarifaOficial tarifaOficialClone; - - @Transient - private Integer empresaId; - - @Column(name = "COMPOSICAO_DO_PEAJE") - @NaoAuditar - private String composicaoDoPeaje; - - public TarifaOficial() { - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public BigDecimal getImportetpp() { - return importetpp; - } - - public void setImportetpp(BigDecimal importetpp) { - this.importetpp = importetpp; - } - - public Integer getTarifaOficialId() { - return tarifaOficialId; - } - - public void setTarifaOficialId(Integer tarifaOficialId) { - this.tarifaOficialId = tarifaOficialId; - } - - public BigDecimal getPrecio() { - return precio; - } - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - public BigDecimal getPreciooriginal() { - return preciooriginal; - } - - public void setPreciooriginal(BigDecimal preciooriginal) { - this.preciooriginal = preciooriginal; - } - - public String getStatustarifa() { - return statustarifa; - } - - public void setStatustarifa(String statustarifa) { - this.statustarifa = statustarifa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - - public Marca getMarca() { - return marca; - } - - public void setMarca(Marca marca) { - this.marca = marca; - } - - public Moneda getMoneda() { - return moneda; - } - - public void setMoneda(Moneda moneda) { - this.moneda = moneda; - } - - public Tramo getTramo() { - return tramo; - } - - public void setTramo(Tramo tramo) { - this.tramo = tramo; - } - - public VigenciaTarifa getVigenciaTarifa() { - return vigenciaTarifa; - } - - public void setVigenciaTarifa(VigenciaTarifa vigenciaTarifa) { - this.vigenciaTarifa = vigenciaTarifa; - } - - public BigDecimal getPrecioredabierto() { - return precioredabierto; - } - - public void setPrecioredabierto(BigDecimal precioredabierto) { - this.precioredabierto = precioredabierto; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - - - public String getComposicaoDoPeaje() { - return composicaoDoPeaje; - } - - public void setComposicaoDoPeaje(String composicaoDoPeaje) { - this.composicaoDoPeaje = composicaoDoPeaje; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (tarifaOficialId != null ? tarifaOficialId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof TarifaOficial)) { - return false; - } - TarifaOficial other = (TarifaOficial) object; - if ((this.tarifaOficialId == null && other.tarifaOficialId != null) || (this.tarifaOficialId != null && !this.tarifaOficialId.equals(other.tarifaOficialId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TarifaOficial[tarifaOficialId=" + tarifaOficialId + "]"; - } - - public BigDecimal getImportetaxaembarque() { - return importetaxaembarque; - } - - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - - public BigDecimal getImportepedagio() { - return importepedagio; - } - - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - - public BigDecimal getImporteoutros() { - return importeoutros; - } - - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - - public BigDecimal getImporteseguro() { - return importeseguro; - } - - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } - - @Override - public void clonar() throws CloneNotSupportedException { - tarifaOficialClone = new TarifaOficial(); - tarifaOficialClone = (TarifaOficial) this.clone(); - tarifaOficialClone.setEmpresaId(this.getMarca() != null && this.getMarca().getEmpresa() != null ? this.getMarca().getEmpresa().getEmpresaId() : null); - } - - @Override - public TarifaOficial getCloneObject() throws CloneNotSupportedException { - return tarifaOficialClone; - } - - @Override - public String getTextoInclusaoExclusao() { - return String.format("ID [%s]", getTarifaOficialId()); - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import br.com.rjconsultores.auditador.annotations.AuditarAtributo; +import br.com.rjconsultores.auditador.annotations.AuditarClasse; +import br.com.rjconsultores.auditador.annotations.AuditarID; +import br.com.rjconsultores.auditador.annotations.NaoAuditar; +import br.com.rjconsultores.auditador.interfaces.Auditavel; + +@Entity +@SequenceGenerator(name = "TARIFA_OFICIAL_SEQ", sequenceName = "TARIFA_OFICIAL_SEQ", allocationSize = 1) +@Table(name = "TARIFA_OFICIAL") +@AuditarClasse(nome = "TARIFA", tela = "auditarClasse.TarifaOficial") +public class TarifaOficial implements Serializable, Auditavel { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARIFA_OFICIAL_SEQ") + @Column(name = "TARIFAOFICIAL_ID") + @AuditarID + private Integer tarifaOficialId; + + @Column(name = "PRECIO") + @AuditarAtributo(nome = "Tarifa") + private BigDecimal precio; + + @Column(name = "PRECIOORIGINAL") + @AuditarAtributo(nome = "Tarifa Original") + private BigDecimal preciooriginal; + + @Column(name = "IMPORTETAXAEMBARQUE") + @AuditarAtributo(nome = "Taxa de Embarque") + private BigDecimal importetaxaembarque; + + @Column(name = "IMPORTEPEDAGIO") + @AuditarAtributo(nome = "Pedagio") + private BigDecimal importepedagio; + + @Column(name = "IMPORTEOUTROS") + @AuditarAtributo(nome = "Outros") + private BigDecimal importeoutros; + + @Column(name = "IMPORTESEGURO") + @AuditarAtributo(nome = "Seguro") + private BigDecimal importeseguro; + + @Column(name = "IMPORTETPP") + @AuditarAtributo(nome = "Tarifa TPP") + private BigDecimal importetpp; + + @Column(name = "STATUSTARIFA") + @AuditarAtributo(nome = "Status Tarifa") + private String statustarifa; + + @Column(name = "ACTIVO") + @NaoAuditar + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + @NaoAuditar + private Date fecmodif; + + @Column(name = "USUARIO_ID") + @NaoAuditar + private Integer usuarioId; + + @OneToOne + @JoinColumn(name = "TRAMO_ID") + @NaoAuditar + private Tramo tramo; + + @OneToOne + @JoinColumn(name = "MARCA_ID") + @NaoAuditar + private Marca marca; + + @OneToOne + @JoinColumn(name = "CLASESERVICIO_ID") + @NaoAuditar + private ClaseServicio claseServicio; + + @OneToOne + @JoinColumn(name = "MONEDA_ID") + @NaoAuditar + private Moneda moneda; + + @OneToOne + @JoinColumn(name = "VIGENCIATARIFA_ID") + @NaoAuditar + private VigenciaTarifa vigenciaTarifa; + + @Column(name = "PRECIOREDABIERTO") + @AuditarAtributo(nome = "Tarifa volta em aberto") + private BigDecimal precioredabierto; + + @OneToOne + @JoinColumn(name = "ORIGEN_ID") + @NaoAuditar + private Parada origen; + + @OneToOne + @JoinColumn(name = "DESTINO_ID") + @NaoAuditar + private Parada destino; + + @OneToOne + @JoinColumn(name = "RUTA_ID") + @NaoAuditar + private Ruta ruta; + + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + @NaoAuditar + private OrgaoConcedente orgaoConcedente; + + @Transient + @NaoAuditar + private TarifaOficial tarifaOficialClone; + + @Transient + private Integer empresaId; + + @Column(name = "COMPOSICAO_DO_PEAJE") + @NaoAuditar + private String composicaoDoPeaje; + + public TarifaOficial() { + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public BigDecimal getImportetpp() { + return importetpp; + } + + public void setImportetpp(BigDecimal importetpp) { + this.importetpp = importetpp; + } + + public Integer getTarifaOficialId() { + return tarifaOficialId; + } + + public void setTarifaOficialId(Integer tarifaOficialId) { + this.tarifaOficialId = tarifaOficialId; + } + + public BigDecimal getPrecio() { + return precio; + } + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + public BigDecimal getPreciooriginal() { + return preciooriginal; + } + + public void setPreciooriginal(BigDecimal preciooriginal) { + this.preciooriginal = preciooriginal; + } + + public String getStatustarifa() { + return statustarifa; + } + + public void setStatustarifa(String statustarifa) { + this.statustarifa = statustarifa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + + public Marca getMarca() { + return marca; + } + + public void setMarca(Marca marca) { + this.marca = marca; + } + + public Moneda getMoneda() { + return moneda; + } + + public void setMoneda(Moneda moneda) { + this.moneda = moneda; + } + + public Tramo getTramo() { + return tramo; + } + + public void setTramo(Tramo tramo) { + this.tramo = tramo; + } + + public VigenciaTarifa getVigenciaTarifa() { + return vigenciaTarifa; + } + + public void setVigenciaTarifa(VigenciaTarifa vigenciaTarifa) { + this.vigenciaTarifa = vigenciaTarifa; + } + + public BigDecimal getPrecioredabierto() { + return precioredabierto; + } + + public void setPrecioredabierto(BigDecimal precioredabierto) { + this.precioredabierto = precioredabierto; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + + + public String getComposicaoDoPeaje() { + return composicaoDoPeaje; + } + + public void setComposicaoDoPeaje(String composicaoDoPeaje) { + this.composicaoDoPeaje = composicaoDoPeaje; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (tarifaOficialId != null ? tarifaOficialId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof TarifaOficial)) { + return false; + } + TarifaOficial other = (TarifaOficial) object; + if ((this.tarifaOficialId == null && other.tarifaOficialId != null) || (this.tarifaOficialId != null && !this.tarifaOficialId.equals(other.tarifaOficialId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.TarifaOficial[tarifaOficialId=" + tarifaOficialId + "]"; + } + + public BigDecimal getImportetaxaembarque() { + return importetaxaembarque; + } + + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + + public BigDecimal getImportepedagio() { + return importepedagio; + } + + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + + public BigDecimal getImporteoutros() { + return importeoutros; + } + + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + + public BigDecimal getImporteseguro() { + return importeseguro; + } + + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } + + @Override + public void clonar() throws CloneNotSupportedException { + tarifaOficialClone = new TarifaOficial(); + tarifaOficialClone = (TarifaOficial) this.clone(); + tarifaOficialClone.setEmpresaId(this.getMarca() != null && this.getMarca().getEmpresa() != null ? this.getMarca().getEmpresa().getEmpresaId() : null); + } + + @Override + public TarifaOficial getCloneObject() throws CloneNotSupportedException { + return tarifaOficialClone; + } + + @Override + public String getTextoInclusaoExclusao() { + return String.format("ID [%s]", getTarifaOficialId()); + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaTipoptovta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaTipoptovta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaTipoptovta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaTipoptovta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaVendaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaVendaPacote.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TarifaVendaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaVendaPacote.java index eeccc1903..9c7044d7b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaVendaPacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarifaVendaPacote.java @@ -1,145 +1,145 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@SequenceGenerator(name = "TARIFA_VENDA_PACOTE_SEQ", sequenceName = "TARIFA_VENDA_PACOTE_SEQ", allocationSize = 1) -@Table(name = "TARIFA_VENDA_PACOTE") -public class TarifaVendaPacote implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "TARIFAVENDAPACOTE_ID") - private Long tarifavendapacoteId; - - @Column(name = "VALOR") - private BigDecimal valor; - - @ManyToOne - @JoinColumn(name = "VENDAPACOTE_ID") - private VendaPacote vendaPacote; - - @ManyToOne - @JoinColumn(name = "PACOTETARIFA_ID") - private PacoteTarifa pacoteTarifa; - - @Column(name = "NOMEPASSAGEIRO") - private String nomepassageiro; - - @Column(name = "DOCUMENTO") - private String documento; - - @Column(name = "TIPODOC") - private String tipodoc; - - @Column(name = "IDIOMA") - private String idioma; - - @Column(name = "DESCEMAIL") - private String descemail; - - @Column(name = "DESCTELEFONE") - private String desctelefone; - - @Column(name = "NOMCONVENIO") - private String nomconvenio; - - public Long getTarifavendapacoteId() { - return tarifavendapacoteId; - } - - public void setTarifavendapacoteId(Long tarifavendapacoteId) { - this.tarifavendapacoteId = tarifavendapacoteId; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public VendaPacote getVendaPacote() { - return vendaPacote; - } - - public void setVendaPacote(VendaPacote vendaPacote) { - this.vendaPacote = vendaPacote; - } - - public PacoteTarifa getPacoteTarifa() { - return pacoteTarifa; - } - - public void setPacoteTarifa(PacoteTarifa pacoteTarifa) { - this.pacoteTarifa = pacoteTarifa; - } - - public String getNomepassageiro() { - return nomepassageiro; - } - - public void setNomepassageiro(String nomepassageiro) { - this.nomepassageiro = nomepassageiro; - } - - public String getDocumento() { - return documento; - } - - public void setDocumento(String documento) { - this.documento = documento; - } - - public String getTipodoc() { - return tipodoc; - } - - public void setTipodoc(String tipodoc) { - this.tipodoc = tipodoc; - } - - public String getIdioma() { - return idioma; - } - - public void setIdioma(String idioma) { - this.idioma = idioma; - } - - public String getDescemail() { - return descemail; - } - - public void setDescemail(String descemail) { - this.descemail = descemail; - } - - public String getDesctelefone() { - return desctelefone; - } - - public void setDesctelefone(String desctelefone) { - this.desctelefone = desctelefone; - } - - public String getNomconvenio() { - return nomconvenio; - } - - public void setNomconvenio(String nomconvenio) { - this.nomconvenio = nomconvenio; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@SequenceGenerator(name = "TARIFA_VENDA_PACOTE_SEQ", sequenceName = "TARIFA_VENDA_PACOTE_SEQ", allocationSize = 1) +@Table(name = "TARIFA_VENDA_PACOTE") +public class TarifaVendaPacote implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "TARIFAVENDAPACOTE_ID") + private Long tarifavendapacoteId; + + @Column(name = "VALOR") + private BigDecimal valor; + + @ManyToOne + @JoinColumn(name = "VENDAPACOTE_ID") + private VendaPacote vendaPacote; + + @ManyToOne + @JoinColumn(name = "PACOTETARIFA_ID") + private PacoteTarifa pacoteTarifa; + + @Column(name = "NOMEPASSAGEIRO") + private String nomepassageiro; + + @Column(name = "DOCUMENTO") + private String documento; + + @Column(name = "TIPODOC") + private String tipodoc; + + @Column(name = "IDIOMA") + private String idioma; + + @Column(name = "DESCEMAIL") + private String descemail; + + @Column(name = "DESCTELEFONE") + private String desctelefone; + + @Column(name = "NOMCONVENIO") + private String nomconvenio; + + public Long getTarifavendapacoteId() { + return tarifavendapacoteId; + } + + public void setTarifavendapacoteId(Long tarifavendapacoteId) { + this.tarifavendapacoteId = tarifavendapacoteId; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public VendaPacote getVendaPacote() { + return vendaPacote; + } + + public void setVendaPacote(VendaPacote vendaPacote) { + this.vendaPacote = vendaPacote; + } + + public PacoteTarifa getPacoteTarifa() { + return pacoteTarifa; + } + + public void setPacoteTarifa(PacoteTarifa pacoteTarifa) { + this.pacoteTarifa = pacoteTarifa; + } + + public String getNomepassageiro() { + return nomepassageiro; + } + + public void setNomepassageiro(String nomepassageiro) { + this.nomepassageiro = nomepassageiro; + } + + public String getDocumento() { + return documento; + } + + public void setDocumento(String documento) { + this.documento = documento; + } + + public String getTipodoc() { + return tipodoc; + } + + public void setTipodoc(String tipodoc) { + this.tipodoc = tipodoc; + } + + public String getIdioma() { + return idioma; + } + + public void setIdioma(String idioma) { + this.idioma = idioma; + } + + public String getDescemail() { + return descemail; + } + + public void setDescemail(String descemail) { + this.descemail = descemail; + } + + public String getDesctelefone() { + return desctelefone; + } + + public void setDesctelefone(String desctelefone) { + this.desctelefone = desctelefone; + } + + public String getNomconvenio() { + return nomconvenio; + } + + public void setNomconvenio(String nomconvenio) { + this.nomconvenio = nomconvenio; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java index eefcc9ced..908169393 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java @@ -1,167 +1,167 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "TARJETA_CREDITO_SEQ", sequenceName = "TARJETA_CREDITO_SEQ", allocationSize = 1) -@Table(name = "TARJETA_CREDITO") -public class TarjetaCredito implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARJETA_CREDITO_SEQ") - @Column(name = "TARJETACREDITO_ID") - private Integer tarjetaCreditoId; - @Column(name = "DESCTARJETACREDITO") - private String descTarjetaCredito; - @Column(name = "CANTMAXSINTASA") - private Integer cantMaxSinTasa; - @Column(name = "CANMAXCONTASA") - private Integer canMaxConTasa; - @Column(name = "TASA") - private BigDecimal tasa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @Column(name = "TARIFAMINIMA") - private BigDecimal tarifaMinima; - @Column(name = "INDAPLICAVENDA") - private Boolean indAplicaVenda; - - public Integer getTarjetaCreditoId() { - return tarjetaCreditoId; - } - - public void setTarjetaCreditoId(Integer tarjetaCreditoId) { - this.tarjetaCreditoId = tarjetaCreditoId; - } - - public String getDescTarjetaCredito() { - return descTarjetaCredito; - } - - public void setDescTarjetaCredito(String descTarjetaCredito) { - this.descTarjetaCredito = descTarjetaCredito; - } - - public Integer getCantMaxSinTasa() { - return cantMaxSinTasa; - } - - public void setCantMaxSinTasa(Integer cantMaxSinTasa) { - this.cantMaxSinTasa = cantMaxSinTasa; - } - - public Integer getCanMaxConTasa() { - return canMaxConTasa; - } - - public void setCanMaxConTasa(Integer canMaxConTasa) { - this.canMaxConTasa = canMaxConTasa; - } - - public BigDecimal getTasa() { - return tasa; - } - - public void setTasa(BigDecimal tasa) { - this.tasa = tasa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public BigDecimal getTarifaMinima() { - return tarifaMinima; - } - - public void setTarifaMinima(BigDecimal tarifaMinima) { - this.tarifaMinima = tarifaMinima; - } - - public Boolean getIndAplicaVenda() { - return indAplicaVenda; - } - - public void setIndAplicaVenda(Boolean indAplicaVenda) { - this.indAplicaVenda = indAplicaVenda; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((tarjetaCreditoId == null) ? 0 : tarjetaCreditoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TarjetaCredito other = (TarjetaCredito) obj; - if (tarjetaCreditoId == null) { - if (other.tarjetaCreditoId != null) - return false; - } else if (!tarjetaCreditoId.equals(other.tarjetaCreditoId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "TARJETA_CREDITO_SEQ", sequenceName = "TARJETA_CREDITO_SEQ", allocationSize = 1) +@Table(name = "TARJETA_CREDITO") +public class TarjetaCredito implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TARJETA_CREDITO_SEQ") + @Column(name = "TARJETACREDITO_ID") + private Integer tarjetaCreditoId; + @Column(name = "DESCTARJETACREDITO") + private String descTarjetaCredito; + @Column(name = "CANTMAXSINTASA") + private Integer cantMaxSinTasa; + @Column(name = "CANMAXCONTASA") + private Integer canMaxConTasa; + @Column(name = "TASA") + private BigDecimal tasa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "TARIFAMINIMA") + private BigDecimal tarifaMinima; + @Column(name = "INDAPLICAVENDA") + private Boolean indAplicaVenda; + + public Integer getTarjetaCreditoId() { + return tarjetaCreditoId; + } + + public void setTarjetaCreditoId(Integer tarjetaCreditoId) { + this.tarjetaCreditoId = tarjetaCreditoId; + } + + public String getDescTarjetaCredito() { + return descTarjetaCredito; + } + + public void setDescTarjetaCredito(String descTarjetaCredito) { + this.descTarjetaCredito = descTarjetaCredito; + } + + public Integer getCantMaxSinTasa() { + return cantMaxSinTasa; + } + + public void setCantMaxSinTasa(Integer cantMaxSinTasa) { + this.cantMaxSinTasa = cantMaxSinTasa; + } + + public Integer getCanMaxConTasa() { + return canMaxConTasa; + } + + public void setCanMaxConTasa(Integer canMaxConTasa) { + this.canMaxConTasa = canMaxConTasa; + } + + public BigDecimal getTasa() { + return tasa; + } + + public void setTasa(BigDecimal tasa) { + this.tasa = tasa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public BigDecimal getTarifaMinima() { + return tarifaMinima; + } + + public void setTarifaMinima(BigDecimal tarifaMinima) { + this.tarifaMinima = tarifaMinima; + } + + public Boolean getIndAplicaVenda() { + return indAplicaVenda; + } + + public void setIndAplicaVenda(Boolean indAplicaVenda) { + this.indAplicaVenda = indAplicaVenda; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((tarjetaCreditoId == null) ? 0 : tarjetaCreditoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TarjetaCredito other = (TarjetaCredito) obj; + if (tarjetaCreditoId == null) { + if (other.tarjetaCreditoId != null) + return false; + } else if (!tarjetaCreditoId.equals(other.tarjetaCreditoId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidad.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidad.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidad.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidad.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidadCuenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidadCuenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidadCuenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaFidelidadCuenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacionPK.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacionPK.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacionPK.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaRecaudacionPK.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaViaje.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaViaje.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TarjetaViaje.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaViaje.java index 7c7c99c98..431d4b257 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarjetaViaje.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TarjetaViaje.java @@ -1,324 +1,324 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author cassio - */ -@Entity -@Table(name = "TARJETA_VIAJE") -@NamedQueries({ - @NamedQuery(name = "TarjetaViaje.findAll", query = "SELECT t FROM TarjetaViaje t")}) -public class TarjetaViaje implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO) - @Column(name = "TARJETAVIAJE_ID", nullable = false) - private Integer tarjetaviajeId; - @Column(name = "NUMSECUENCIA") - private Integer numsecuencia; - @Column(name = "INDREBOTE") - private Integer indRebote; - @Column(name = "INDSTATUSTARJETA", length = 20) - private String indstatustarjeta; - @Column(name = "FOLIOTARJETAVIAJE", length = 10) - private String foliotarjetaviaje; - @Column(name = "FECENVIONOMINA") - @Temporal(TemporalType.TIMESTAMP) - private Date fecenvionomina; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @JoinColumn(name = "MARCA_ID", referencedColumnName = "MARCA_ID") - @ManyToOne - private Marca marca; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @JoinColumn(name = "CONDUCTOR1_ID", referencedColumnName = "CONDUCTOR_ID") - @ManyToOne - private Conductor conductor; - @JoinColumn(name = "CONDUCTOR2_ID", referencedColumnName = "CONDUCTOR_ID") - @ManyToOne - private Conductor conductor1; - @JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID") - @ManyToOne - private ClaseServicio claseServicio; - @JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID") - @ManyToOne - private Autobus autobus; - private transient boolean eCorridaDuplicada; - @Column(name = "CANTKMREAL") - private BigDecimal kmReal; - @Column(name = "CANTKMPAGOCONDUCTOR") - private BigDecimal kmPagoConductor; - @Column(name = "TARJETAVIAJEREF_ID") - private BigDecimal tarjetaViajeRef; - @Column(name = "DESCPARADAORIGEN") - private String origen; - @Column(name = "DESCPARADADESTINO") - private String destino; - @Column(name = "FECCORRIDA") - @Temporal(TemporalType.TIMESTAMP) - private Date fecInicial; - @Column(name = "FECHORSALIDA") - @Temporal(TemporalType.TIMESTAMP) - private Date fecHorSalida; - @Column(name = "NUMCORRIDA") - private Integer numCorrida; - - public Integer getNumAutobusAux() { - return Integer.parseInt(this.autobus.getNumautobus()); - } - - public Integer getNumCorrida() { - return numCorrida; - } - - public void setNumCorrida(Integer numCorrida) { - this.numCorrida = numCorrida; - } - - public Integer getIndRebote() { - return indRebote; - } - - public void setIndRebote(Integer indRebote) { - this.indRebote = indRebote; - } - - public String getOrigen() { - return origen; - } - - public void setOrigen(String origen) { - this.origen = origen; - } - - public String getDestino() { - return destino; - } - - public void setDestino(String destino) { - this.destino = destino; - } - - public Date getFecInicial() { - return fecInicial; - } - - public void setFecInicial(Date fecInicial) { - this.fecInicial = fecInicial; - } - - public BigDecimal getTarjetaViajeRef() { - return tarjetaViajeRef; - } - - public void setTarjetaViajeRef(BigDecimal tarjetaViajeRef) { - this.tarjetaViajeRef = tarjetaViajeRef; - } - - public BigDecimal getKmReal() { - return kmReal; - } - - public void setKmReal(BigDecimal kmReal) { - this.kmReal = kmReal; - } - - public BigDecimal getKmPagoConductor() { - return kmPagoConductor; - } - - public void setKmPagoConductor(BigDecimal kmPagoConductor) { - this.kmPagoConductor = kmPagoConductor; - } - - public boolean geteCorridaDuplicada() { - return eCorridaDuplicada; - } - - public void seteCorridaDuplicada(boolean eCorridaDuplicada) { - this.eCorridaDuplicada = eCorridaDuplicada; - } - - public TarjetaViaje() { - } - - public TarjetaViaje(Integer tarjetaviajeId) { - this.tarjetaviajeId = tarjetaviajeId; - } - - public Integer getTarjetaviajeId() { - return tarjetaviajeId; - } - - public void setTarjetaviajeId(Integer tarjetaviajeId) { - this.tarjetaviajeId = tarjetaviajeId; - } - - public Integer getNumsecuencia() { - return numsecuencia; - } - - public void setNumsecuencia(Integer numsecuencia) { - this.numsecuencia = numsecuencia; - } - - public String getIndstatustarjeta() { - return indstatustarjeta; - } - - public void setIndstatustarjeta(String indstatustarjeta) { - this.indstatustarjeta = indstatustarjeta; - } - - public String getFoliotarjetaviaje() { - return foliotarjetaviaje; - } - - public void setFoliotarjetaviaje(String foliotarjetaviaje) { - this.foliotarjetaviaje = foliotarjetaviaje; - } - - public Date getFecenvionomina() { - return fecenvionomina; - } - - public void setFecenvionomina(Date fecenvionomina) { - this.fecenvionomina = fecenvionomina; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Marca getMarca() { - return marca; - } - - public void setMarca(Marca marca) { - this.marca = marca; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Conductor getConductor() { - return conductor; - } - - public void setConductor(Conductor conductor) { - this.conductor = conductor; - } - - public Conductor getConductor1() { - return conductor1; - } - - public void setConductor1(Conductor conductor1) { - this.conductor1 = conductor1; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - - public Autobus getAutobus() { - return autobus; - } - - public void setAutobus(Autobus autobus) { - this.autobus = autobus; - } - - public Date getFecHorSalida() { - return fecHorSalida; - } - - public void setFecHorSalida(Date fecHorSalida) { - this.fecHorSalida = fecHorSalida; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (tarjetaviajeId != null ? tarjetaviajeId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TarjetaViaje)) { - return false; - } - TarjetaViaje other = (TarjetaViaje) object; - if ((this.tarjetaviajeId == null && other.tarjetaviajeId != null) || (this.tarjetaviajeId != null && !this.tarjetaviajeId.equals(other.tarjetaviajeId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "entidadeteste.TarjetaViaje[tarjetaviajeId=" + tarjetaviajeId + "]"; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author cassio + */ +@Entity +@Table(name = "TARJETA_VIAJE") +@NamedQueries({ + @NamedQuery(name = "TarjetaViaje.findAll", query = "SELECT t FROM TarjetaViaje t")}) +public class TarjetaViaje implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "TARJETAVIAJE_ID", nullable = false) + private Integer tarjetaviajeId; + @Column(name = "NUMSECUENCIA") + private Integer numsecuencia; + @Column(name = "INDREBOTE") + private Integer indRebote; + @Column(name = "INDSTATUSTARJETA", length = 20) + private String indstatustarjeta; + @Column(name = "FOLIOTARJETAVIAJE", length = 10) + private String foliotarjetaviaje; + @Column(name = "FECENVIONOMINA") + @Temporal(TemporalType.TIMESTAMP) + private Date fecenvionomina; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "MARCA_ID", referencedColumnName = "MARCA_ID") + @ManyToOne + private Marca marca; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @JoinColumn(name = "CONDUCTOR1_ID", referencedColumnName = "CONDUCTOR_ID") + @ManyToOne + private Conductor conductor; + @JoinColumn(name = "CONDUCTOR2_ID", referencedColumnName = "CONDUCTOR_ID") + @ManyToOne + private Conductor conductor1; + @JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID") + @ManyToOne + private ClaseServicio claseServicio; + @JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID") + @ManyToOne + private Autobus autobus; + private transient boolean eCorridaDuplicada; + @Column(name = "CANTKMREAL") + private BigDecimal kmReal; + @Column(name = "CANTKMPAGOCONDUCTOR") + private BigDecimal kmPagoConductor; + @Column(name = "TARJETAVIAJEREF_ID") + private BigDecimal tarjetaViajeRef; + @Column(name = "DESCPARADAORIGEN") + private String origen; + @Column(name = "DESCPARADADESTINO") + private String destino; + @Column(name = "FECCORRIDA") + @Temporal(TemporalType.TIMESTAMP) + private Date fecInicial; + @Column(name = "FECHORSALIDA") + @Temporal(TemporalType.TIMESTAMP) + private Date fecHorSalida; + @Column(name = "NUMCORRIDA") + private Integer numCorrida; + + public Integer getNumAutobusAux() { + return Integer.parseInt(this.autobus.getNumautobus()); + } + + public Integer getNumCorrida() { + return numCorrida; + } + + public void setNumCorrida(Integer numCorrida) { + this.numCorrida = numCorrida; + } + + public Integer getIndRebote() { + return indRebote; + } + + public void setIndRebote(Integer indRebote) { + this.indRebote = indRebote; + } + + public String getOrigen() { + return origen; + } + + public void setOrigen(String origen) { + this.origen = origen; + } + + public String getDestino() { + return destino; + } + + public void setDestino(String destino) { + this.destino = destino; + } + + public Date getFecInicial() { + return fecInicial; + } + + public void setFecInicial(Date fecInicial) { + this.fecInicial = fecInicial; + } + + public BigDecimal getTarjetaViajeRef() { + return tarjetaViajeRef; + } + + public void setTarjetaViajeRef(BigDecimal tarjetaViajeRef) { + this.tarjetaViajeRef = tarjetaViajeRef; + } + + public BigDecimal getKmReal() { + return kmReal; + } + + public void setKmReal(BigDecimal kmReal) { + this.kmReal = kmReal; + } + + public BigDecimal getKmPagoConductor() { + return kmPagoConductor; + } + + public void setKmPagoConductor(BigDecimal kmPagoConductor) { + this.kmPagoConductor = kmPagoConductor; + } + + public boolean geteCorridaDuplicada() { + return eCorridaDuplicada; + } + + public void seteCorridaDuplicada(boolean eCorridaDuplicada) { + this.eCorridaDuplicada = eCorridaDuplicada; + } + + public TarjetaViaje() { + } + + public TarjetaViaje(Integer tarjetaviajeId) { + this.tarjetaviajeId = tarjetaviajeId; + } + + public Integer getTarjetaviajeId() { + return tarjetaviajeId; + } + + public void setTarjetaviajeId(Integer tarjetaviajeId) { + this.tarjetaviajeId = tarjetaviajeId; + } + + public Integer getNumsecuencia() { + return numsecuencia; + } + + public void setNumsecuencia(Integer numsecuencia) { + this.numsecuencia = numsecuencia; + } + + public String getIndstatustarjeta() { + return indstatustarjeta; + } + + public void setIndstatustarjeta(String indstatustarjeta) { + this.indstatustarjeta = indstatustarjeta; + } + + public String getFoliotarjetaviaje() { + return foliotarjetaviaje; + } + + public void setFoliotarjetaviaje(String foliotarjetaviaje) { + this.foliotarjetaviaje = foliotarjetaviaje; + } + + public Date getFecenvionomina() { + return fecenvionomina; + } + + public void setFecenvionomina(Date fecenvionomina) { + this.fecenvionomina = fecenvionomina; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Marca getMarca() { + return marca; + } + + public void setMarca(Marca marca) { + this.marca = marca; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Conductor getConductor() { + return conductor; + } + + public void setConductor(Conductor conductor) { + this.conductor = conductor; + } + + public Conductor getConductor1() { + return conductor1; + } + + public void setConductor1(Conductor conductor1) { + this.conductor1 = conductor1; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + + public Autobus getAutobus() { + return autobus; + } + + public void setAutobus(Autobus autobus) { + this.autobus = autobus; + } + + public Date getFecHorSalida() { + return fecHorSalida; + } + + public void setFecHorSalida(Date fecHorSalida) { + this.fecHorSalida = fecHorSalida; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (tarjetaviajeId != null ? tarjetaviajeId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TarjetaViaje)) { + return false; + } + TarjetaViaje other = (TarjetaViaje) object; + if ((this.tarjetaviajeId == null && other.tarjetaviajeId != null) || (this.tarjetaviajeId != null && !this.tarjetaviajeId.equals(other.tarjetaviajeId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "entidadeteste.TarjetaViaje[tarjetaviajeId=" + tarjetaviajeId + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevante.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevante.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevante.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevante.java index aeff09b50..153e5d179 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevante.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevante.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "TAXA_EMB_LEVANTE_SEQ", sequenceName = "TAXA_EMB_LEVANTE_SEQ", allocationSize = 1) -@Table(name = "TAXA_EMB_LEVANTE") -public class TaxaEmbLevante implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMB_LEVANTE_SEQ") - @Column(name = "TAXAEMBLEVANTE_ID") - private Integer taxaEmbLevanteId; - @JoinColumn(name = "TAXAEMBLEVANTECTRL_ID", referencedColumnName = "TAXAEMBLEVANTECTRL_ID") - @ManyToOne - private TaxaEmbLevanteCtrl taxaEmbLevanteCtrl; - @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada parada; - @Column(name = "IMPORTE") - private BigDecimal importe; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public TaxaEmbLevante() { - } - - public TaxaEmbLevante(Integer taxaEmbLevanteId) { - this.taxaEmbLevanteId = taxaEmbLevanteId; - } - - public TaxaEmbLevante(Integer taxaEmbLevanteId, BigDecimal importe, Boolean activo, Date fecmodif, Integer usuarioId) { - this.taxaEmbLevanteId = taxaEmbLevanteId; - this.importe = importe; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getTaxaEmbLevanteId() { - return taxaEmbLevanteId; - } - - public void setTaxaEmbLevanteId(Integer taxaEmbLevanteId) { - this.taxaEmbLevanteId = taxaEmbLevanteId; - } - - public TaxaEmbLevanteCtrl getTaxaEmbLevanteCtrl() { - return taxaEmbLevanteCtrl; - } - - public void setTaxaEmbLevanteCtrl(TaxaEmbLevanteCtrl taxaEmbLevanteCtrl) { - this.taxaEmbLevanteCtrl = taxaEmbLevanteCtrl; - } - - public Parada getParada() { - return parada; - } - - public void setParada(Parada parada) { - this.parada = parada; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (taxaEmbLevanteId != null ? taxaEmbLevanteId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof TaxaEmbLevante)) { - return false; - } - TaxaEmbLevante other = (TaxaEmbLevante) object; - if ((this.taxaEmbLevanteId == null && other.taxaEmbLevanteId != null) || (this.taxaEmbLevanteId != null && !this.taxaEmbLevanteId.equals(other.taxaEmbLevanteId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TaxaEmbLevante[taxaEmbLevanteId=" + taxaEmbLevanteId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "TAXA_EMB_LEVANTE_SEQ", sequenceName = "TAXA_EMB_LEVANTE_SEQ", allocationSize = 1) +@Table(name = "TAXA_EMB_LEVANTE") +public class TaxaEmbLevante implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMB_LEVANTE_SEQ") + @Column(name = "TAXAEMBLEVANTE_ID") + private Integer taxaEmbLevanteId; + @JoinColumn(name = "TAXAEMBLEVANTECTRL_ID", referencedColumnName = "TAXAEMBLEVANTECTRL_ID") + @ManyToOne + private TaxaEmbLevanteCtrl taxaEmbLevanteCtrl; + @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada parada; + @Column(name = "IMPORTE") + private BigDecimal importe; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public TaxaEmbLevante() { + } + + public TaxaEmbLevante(Integer taxaEmbLevanteId) { + this.taxaEmbLevanteId = taxaEmbLevanteId; + } + + public TaxaEmbLevante(Integer taxaEmbLevanteId, BigDecimal importe, Boolean activo, Date fecmodif, Integer usuarioId) { + this.taxaEmbLevanteId = taxaEmbLevanteId; + this.importe = importe; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getTaxaEmbLevanteId() { + return taxaEmbLevanteId; + } + + public void setTaxaEmbLevanteId(Integer taxaEmbLevanteId) { + this.taxaEmbLevanteId = taxaEmbLevanteId; + } + + public TaxaEmbLevanteCtrl getTaxaEmbLevanteCtrl() { + return taxaEmbLevanteCtrl; + } + + public void setTaxaEmbLevanteCtrl(TaxaEmbLevanteCtrl taxaEmbLevanteCtrl) { + this.taxaEmbLevanteCtrl = taxaEmbLevanteCtrl; + } + + public Parada getParada() { + return parada; + } + + public void setParada(Parada parada) { + this.parada = parada; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (taxaEmbLevanteId != null ? taxaEmbLevanteId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof TaxaEmbLevante)) { + return false; + } + TaxaEmbLevante other = (TaxaEmbLevante) object; + if ((this.taxaEmbLevanteId == null && other.taxaEmbLevanteId != null) || (this.taxaEmbLevanteId != null && !this.taxaEmbLevanteId.equals(other.taxaEmbLevanteId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.TaxaEmbLevante[taxaEmbLevanteId=" + taxaEmbLevanteId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevanteCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevanteCtrl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevanteCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevanteCtrl.java index e7d095f6a..0cd599649 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevanteCtrl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbLevanteCtrl.java @@ -1,157 +1,157 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "TAXA_EMB_LEVANTE_CTRL_SEQ", sequenceName = "TAXA_EMB_LEVANTE_CTRL_SEQ", allocationSize = 1) -@Table(name = "TAXA_EMB_LEVANTE_CTRL") -public class TaxaEmbLevanteCtrl implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMB_LEVANTE_CTRL_SEQ") - @Column(name = "TAXAEMBLEVANTECTRL_ID") - private Integer taxaEmbLevanteCtrlId; - @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") - @ManyToOne - private Ruta ruta; - @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada origem; - @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada destino; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @OneToMany(mappedBy = "taxaEmbLevanteCtrl", cascade = CascadeType.ALL) - private List taxaEmbLevanteList; - - public TaxaEmbLevanteCtrl() { - } - - public TaxaEmbLevanteCtrl(Integer taxaEmbLevanteCtrlId) { - this.taxaEmbLevanteCtrlId = taxaEmbLevanteCtrlId; - } - - public Integer getTaxaEmbLevanteCtrlId() { - return taxaEmbLevanteCtrlId; - } - - public void setTaxaEmbLevanteCtrlId(Integer taxaEmbLevanteCtrlId) { - this.taxaEmbLevanteCtrlId = taxaEmbLevanteCtrlId; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Parada getOrigem() { - return origem; - } - - public void setOrigem(Parada origem) { - this.origem = origem; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getTaxaEmbLevanteList() { - if (this.taxaEmbLevanteList == null) - this.taxaEmbLevanteList = new ArrayList(); - - List list = new ArrayList(); - for (TaxaEmbLevante taxaEmbLevante : this.taxaEmbLevanteList) { - if (taxaEmbLevante.getActivo().equals(true)) { - list.add(taxaEmbLevante); - } - } - return list; - } - - public void setTaxaEmbLevanteList(List taxaEmbLevanteList) { - this.taxaEmbLevanteList = taxaEmbLevanteList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (taxaEmbLevanteCtrlId != null ? taxaEmbLevanteCtrlId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof TaxaEmbLevanteCtrl)) { - return false; - } - TaxaEmbLevanteCtrl other = (TaxaEmbLevanteCtrl) object; - if ((this.taxaEmbLevanteCtrlId == null && other.taxaEmbLevanteCtrlId != null) || (this.taxaEmbLevanteCtrlId != null && !this.taxaEmbLevanteCtrlId.equals(other.taxaEmbLevanteCtrlId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl[taxaEmbLevanteCtrlId=" + taxaEmbLevanteCtrlId + "]"; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "TAXA_EMB_LEVANTE_CTRL_SEQ", sequenceName = "TAXA_EMB_LEVANTE_CTRL_SEQ", allocationSize = 1) +@Table(name = "TAXA_EMB_LEVANTE_CTRL") +public class TaxaEmbLevanteCtrl implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMB_LEVANTE_CTRL_SEQ") + @Column(name = "TAXAEMBLEVANTECTRL_ID") + private Integer taxaEmbLevanteCtrlId; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @JoinColumn(name = "ORIGEN_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada origem; + @JoinColumn(name = "DESTINO_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada destino; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @OneToMany(mappedBy = "taxaEmbLevanteCtrl", cascade = CascadeType.ALL) + private List taxaEmbLevanteList; + + public TaxaEmbLevanteCtrl() { + } + + public TaxaEmbLevanteCtrl(Integer taxaEmbLevanteCtrlId) { + this.taxaEmbLevanteCtrlId = taxaEmbLevanteCtrlId; + } + + public Integer getTaxaEmbLevanteCtrlId() { + return taxaEmbLevanteCtrlId; + } + + public void setTaxaEmbLevanteCtrlId(Integer taxaEmbLevanteCtrlId) { + this.taxaEmbLevanteCtrlId = taxaEmbLevanteCtrlId; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Parada getOrigem() { + return origem; + } + + public void setOrigem(Parada origem) { + this.origem = origem; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getTaxaEmbLevanteList() { + if (this.taxaEmbLevanteList == null) + this.taxaEmbLevanteList = new ArrayList(); + + List list = new ArrayList(); + for (TaxaEmbLevante taxaEmbLevante : this.taxaEmbLevanteList) { + if (taxaEmbLevante.getActivo().equals(true)) { + list.add(taxaEmbLevante); + } + } + return list; + } + + public void setTaxaEmbLevanteList(List taxaEmbLevanteList) { + this.taxaEmbLevanteList = taxaEmbLevanteList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (taxaEmbLevanteCtrlId != null ? taxaEmbLevanteCtrlId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof TaxaEmbLevanteCtrl)) { + return false; + } + TaxaEmbLevanteCtrl other = (TaxaEmbLevanteCtrl) object; + if ((this.taxaEmbLevanteCtrlId == null && other.taxaEmbLevanteCtrlId != null) || (this.taxaEmbLevanteCtrlId != null && !this.taxaEmbLevanteCtrlId.equals(other.taxaEmbLevanteCtrlId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl[taxaEmbLevanteCtrlId=" + taxaEmbLevanteCtrlId + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueKm.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueKm.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueKm.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueKm.java index 41f2681a5..f28f74703 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueKm.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueKm.java @@ -1,141 +1,141 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "TAXA_EMBARQUE_KM_SEQ", sequenceName = "TAXA_EMBARQUE_KM_SEQ", allocationSize = 1) -@Table(name = "TAXA_EMBARQUE_KM") -public class TaxaEmbarqueKm implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMBARQUE_KM_SEQ") - @Column(name = "TAXAEMBARQUEKM_ID") - private Integer taxaembarquekmId; - @Column(name = "KMATE") - private Integer kmate; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "VALORTAXA") - private BigDecimal valortaxa; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoconcedenteId; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public TaxaEmbarqueKm() { - } - - public TaxaEmbarqueKm(Integer taxaembarquekmId) { - this.taxaembarquekmId = taxaembarquekmId; - } - - public Integer getTaxaembarquekmId() { - return taxaembarquekmId; - } - - public void setTaxaembarquekmId(Integer taxaembarquekmId) { - this.taxaembarquekmId = taxaembarquekmId; - } - - public Integer getKmate() { - return kmate; - } - - public void setKmate(Integer kmate) { - this.kmate = kmate; - } - - public BigDecimal getValortaxa() { - return valortaxa; - } - - public void setValortaxa(BigDecimal valortaxa) { - this.valortaxa = valortaxa; - } - - public OrgaoConcedente getOrgaoconcedenteId() { - return orgaoconcedenteId; - } - - public void setOrgaoconcedenteId(OrgaoConcedente orgaoconcedenteId) { - this.orgaoconcedenteId = orgaoconcedenteId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (taxaembarquekmId != null ? taxaembarquekmId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TaxaEmbarqueKm)) { - return false; - } - TaxaEmbarqueKm other = (TaxaEmbarqueKm) object; - if ((this.taxaembarquekmId == null && other.taxaembarquekmId != null) || (this.taxaembarquekmId != null && !this.taxaembarquekmId.equals(other.taxaembarquekmId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TaxaEmbarqueKm[ taxaembarquekmId=" + taxaembarquekmId + " ]"; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "TAXA_EMBARQUE_KM_SEQ", sequenceName = "TAXA_EMBARQUE_KM_SEQ", allocationSize = 1) +@Table(name = "TAXA_EMBARQUE_KM") +public class TaxaEmbarqueKm implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMBARQUE_KM_SEQ") + @Column(name = "TAXAEMBARQUEKM_ID") + private Integer taxaembarquekmId; + @Column(name = "KMATE") + private Integer kmate; + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation + @Column(name = "VALORTAXA") + private BigDecimal valortaxa; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoconcedenteId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public TaxaEmbarqueKm() { + } + + public TaxaEmbarqueKm(Integer taxaembarquekmId) { + this.taxaembarquekmId = taxaembarquekmId; + } + + public Integer getTaxaembarquekmId() { + return taxaembarquekmId; + } + + public void setTaxaembarquekmId(Integer taxaembarquekmId) { + this.taxaembarquekmId = taxaembarquekmId; + } + + public Integer getKmate() { + return kmate; + } + + public void setKmate(Integer kmate) { + this.kmate = kmate; + } + + public BigDecimal getValortaxa() { + return valortaxa; + } + + public void setValortaxa(BigDecimal valortaxa) { + this.valortaxa = valortaxa; + } + + public OrgaoConcedente getOrgaoconcedenteId() { + return orgaoconcedenteId; + } + + public void setOrgaoconcedenteId(OrgaoConcedente orgaoconcedenteId) { + this.orgaoconcedenteId = orgaoconcedenteId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (taxaembarquekmId != null ? taxaembarquekmId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TaxaEmbarqueKm)) { + return false; + } + TaxaEmbarqueKm other = (TaxaEmbarqueKm) object; + if ((this.taxaembarquekmId == null && other.taxaembarquekmId != null) || (this.taxaembarquekmId != null && !this.taxaembarquekmId.equals(other.taxaembarquekmId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.TaxaEmbarqueKm[ taxaembarquekmId=" + taxaembarquekmId + " ]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueParada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueParada.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueParada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueParada.java index 1b7ac30c6..c29152d49 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueParada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TaxaEmbarqueParada.java @@ -1,180 +1,180 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * - * @author gleimar - */ -@Entity -@SequenceGenerator(name = "TAXA_EMBARQUE_PARADA_SEQ", sequenceName = "TAXA_EMBARQUE_PARADA_SEQ", allocationSize = 1) -@Table(name = "TAXA_EMBARQUE_PARADA") -public class TaxaEmbarqueParada implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMBARQUE_PARADA_SEQ") - @Column(name = "TAXAEMBARQUEPARADA_ID") - private Integer taxaembarqueparadaId; - @Basic(optional = false) - @Column(name = "INDTIPO") - private char indtipo; - @Column(name = "KMATE") - private Integer kmate; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "VALORTAXA") - private BigDecimal valortaxa; - @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") - @ManyToOne - private Parada paradaId; - @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") - @ManyToOne - private OrgaoConcedente orgaoconcedenteId; - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public TaxaEmbarqueParada() { - } - - public TaxaEmbarqueParada(Integer taxaembarqueparadaId) { - this.taxaembarqueparadaId = taxaembarqueparadaId; - } - - public TaxaEmbarqueParada(Integer taxaembarqueparadaId, char indtipo) { - this.taxaembarqueparadaId = taxaembarqueparadaId; - this.indtipo = indtipo; - } - - public Integer getTaxaembarqueparadaId() { - return taxaembarqueparadaId; - } - - public void setTaxaembarqueparadaId(Integer taxaembarqueparadaId) { - this.taxaembarqueparadaId = taxaembarqueparadaId; - } - - public char getIndtipo() { - return indtipo; - } - - public void setIndtipo(char indtipo) { - this.indtipo = indtipo; - } - - public Integer getKmate() { - return kmate; - } - - public void setKmate(Integer kmate) { - this.kmate = kmate; - } - - public BigDecimal getValortaxa() { - return valortaxa; - } - - public void setValortaxa(BigDecimal valortaxa) { - this.valortaxa = valortaxa; - } - - public Parada getParadaId() { - return paradaId; - } - - public void setParadaId(Parada paradaId) { - this.paradaId = paradaId; - } - - public OrgaoConcedente getOrgaoconcedenteId() { - return orgaoconcedenteId; - } - - public void setOrgaoconcedenteId(OrgaoConcedente orgaoconcedenteId) { - this.orgaoconcedenteId = orgaoconcedenteId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (taxaembarqueparadaId != null ? taxaembarqueparadaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TaxaEmbarqueParada)) { - return false; - } - TaxaEmbarqueParada other = (TaxaEmbarqueParada) object; - if ((this.taxaembarqueparadaId == null && other.taxaembarqueparadaId != null) || (this.taxaembarqueparadaId != null && !this.taxaembarqueparadaId.equals(other.taxaembarqueparadaId))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TaxaEmbarqueParada[ taxaembarqueparadaId=" + taxaembarqueparadaId + " ]"; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author gleimar + */ +@Entity +@SequenceGenerator(name = "TAXA_EMBARQUE_PARADA_SEQ", sequenceName = "TAXA_EMBARQUE_PARADA_SEQ", allocationSize = 1) +@Table(name = "TAXA_EMBARQUE_PARADA") +public class TaxaEmbarqueParada implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TAXA_EMBARQUE_PARADA_SEQ") + @Column(name = "TAXAEMBARQUEPARADA_ID") + private Integer taxaembarqueparadaId; + @Basic(optional = false) + @Column(name = "INDTIPO") + private char indtipo; + @Column(name = "KMATE") + private Integer kmate; + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation + @Column(name = "VALORTAXA") + private BigDecimal valortaxa; + @JoinColumn(name = "PARADA_ID", referencedColumnName = "PARADA_ID") + @ManyToOne + private Parada paradaId; + @JoinColumn(name = "ORGAOCONCEDENTE_ID", referencedColumnName = "ORGAOCONCEDENTE_ID") + @ManyToOne + private OrgaoConcedente orgaoconcedenteId; + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public TaxaEmbarqueParada() { + } + + public TaxaEmbarqueParada(Integer taxaembarqueparadaId) { + this.taxaembarqueparadaId = taxaembarqueparadaId; + } + + public TaxaEmbarqueParada(Integer taxaembarqueparadaId, char indtipo) { + this.taxaembarqueparadaId = taxaembarqueparadaId; + this.indtipo = indtipo; + } + + public Integer getTaxaembarqueparadaId() { + return taxaembarqueparadaId; + } + + public void setTaxaembarqueparadaId(Integer taxaembarqueparadaId) { + this.taxaembarqueparadaId = taxaembarqueparadaId; + } + + public char getIndtipo() { + return indtipo; + } + + public void setIndtipo(char indtipo) { + this.indtipo = indtipo; + } + + public Integer getKmate() { + return kmate; + } + + public void setKmate(Integer kmate) { + this.kmate = kmate; + } + + public BigDecimal getValortaxa() { + return valortaxa; + } + + public void setValortaxa(BigDecimal valortaxa) { + this.valortaxa = valortaxa; + } + + public Parada getParadaId() { + return paradaId; + } + + public void setParadaId(Parada paradaId) { + this.paradaId = paradaId; + } + + public OrgaoConcedente getOrgaoconcedenteId() { + return orgaoconcedenteId; + } + + public void setOrgaoconcedenteId(OrgaoConcedente orgaoconcedenteId) { + this.orgaoconcedenteId = orgaoconcedenteId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (taxaembarqueparadaId != null ? taxaembarqueparadaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TaxaEmbarqueParada)) { + return false; + } + TaxaEmbarqueParada other = (TaxaEmbarqueParada) object; + if ((this.taxaembarqueparadaId == null && other.taxaembarqueparadaId != null) || (this.taxaembarqueparadaId != null && !this.taxaembarqueparadaId.equals(other.taxaembarqueparadaId))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.TaxaEmbarqueParada[ taxaembarqueparadaId=" + taxaembarqueparadaId + " ]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoCambioCiudad.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCambioCiudad.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoCambioCiudad.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCambioCiudad.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoCambioCtrl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCambioCtrl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoCambioCtrl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCambioCtrl.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoConvenio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoConvenio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoConvenio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoConvenio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoCorte.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCorte.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoCorte.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCorte.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoCortesia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCortesia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoCortesia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCortesia.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoCortesiaDescuento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCortesiaDescuento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoCortesiaDescuento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoCortesiaDescuento.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoDocAutobus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoDocAutobus.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TipoDocAutobus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoDocAutobus.java index abaac449a..dd88de6d2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoDocAutobus.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoDocAutobus.java @@ -1,72 +1,72 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@SequenceGenerator(name = "TIPO_DOC_AUTOBUS_SEQ", sequenceName = "TIPO_DOC_AUTOBUS_SEQ", allocationSize = 1) -@Table(name = "TIPO_DOC_AUTOBUS") -public class TipoDocAutobus { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @Column(name = "TIPODOCAUTOBUS_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_DOC_AUTOBUS_SEQ") - private Integer tipoDocAutobusId; - @Column(name = "DESCDOC") - private String descDoc; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - public Integer getTipoDocAutobusId() { - return tipoDocAutobusId; - } - public void setTipoDocAutobusId(Integer tipoDocAutobusId) { - this.tipoDocAutobusId = tipoDocAutobusId; - } - public String getDescDoc() { - return descDoc; - } - public void setDescDoc(String descDoc) { - this.descDoc = descDoc; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString(){ - return this.descDoc; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "TIPO_DOC_AUTOBUS_SEQ", sequenceName = "TIPO_DOC_AUTOBUS_SEQ", allocationSize = 1) +@Table(name = "TIPO_DOC_AUTOBUS") +public class TipoDocAutobus { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @Column(name = "TIPODOCAUTOBUS_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_DOC_AUTOBUS_SEQ") + private Integer tipoDocAutobusId; + @Column(name = "DESCDOC") + private String descDoc; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + public Integer getTipoDocAutobusId() { + return tipoDocAutobusId; + } + public void setTipoDocAutobusId(Integer tipoDocAutobusId) { + this.tipoDocAutobusId = tipoDocAutobusId; + } + public String getDescDoc() { + return descDoc; + } + public void setDescDoc(String descDoc) { + this.descDoc = descDoc; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString(){ + return this.descDoc; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoDomicilio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoDomicilio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoDomicilio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoDomicilio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoEmpleado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEmpleado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoEmpleado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEmpleado.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraEmpresa.java index caef649f0..a5706917f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraEmpresa.java @@ -1,104 +1,104 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "TIPO_EVENTO_EXTRA_EMPRESA") -@SequenceGenerator(name = "TIPO_EVENTO_EXTRA_EMPRESA_SEQ", sequenceName = "TIPO_EVENTO_EXTRA_EMPRESA_SEQ", allocationSize = 1) -public class TipoEventoExtraEmpresa { - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_EVENTO_EXTRA_EMPRESA_SEQ") - @Column(name = "TIPOEVENTOEXTRAEMPRESA_ID") - private Integer tipoeventoextraempresaId; - @ManyToOne - @JoinColumn(name = "TIPOEVENTOEXTRA_ID") - private TipoEventoExtra tipoeventoextra; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "ACTIVO") - private Boolean activo; - - public Integer getTipoeventoextraempresaId() { - return tipoeventoextraempresaId; - } - public void setTipoeventoextraempresaId(Integer tipoeventoextraempresaId) { - this.tipoeventoextraempresaId = tipoeventoextraempresaId; - } - public TipoEventoExtra getTipoeventoextra() { - return tipoeventoextra; - } - public void setTipoeventoextra(TipoEventoExtra tipoeventoextra) { - this.tipoeventoextra = tipoeventoextra; - } - public Empresa getEmpresa() { - return empresa; - } - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - @Override - public String toString() { - return empresa.getNombempresa(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (tipoeventoextraempresaId != null ? tipoeventoextraempresaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TipoEventoExtraEmpresa)) { - return false; - } - TipoEventoExtraEmpresa other = (TipoEventoExtraEmpresa) object; - if ((this.tipoeventoextraempresaId == null && other.tipoeventoextraempresaId != null) || (this.tipoeventoextraempresaId != null && !this.tipoeventoextraempresaId.equals(other.tipoeventoextraempresaId))) { - return false; - } - return true; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "TIPO_EVENTO_EXTRA_EMPRESA") +@SequenceGenerator(name = "TIPO_EVENTO_EXTRA_EMPRESA_SEQ", sequenceName = "TIPO_EVENTO_EXTRA_EMPRESA_SEQ", allocationSize = 1) +public class TipoEventoExtraEmpresa { + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_EVENTO_EXTRA_EMPRESA_SEQ") + @Column(name = "TIPOEVENTOEXTRAEMPRESA_ID") + private Integer tipoeventoextraempresaId; + @ManyToOne + @JoinColumn(name = "TIPOEVENTOEXTRA_ID") + private TipoEventoExtra tipoeventoextra; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "ACTIVO") + private Boolean activo; + + public Integer getTipoeventoextraempresaId() { + return tipoeventoextraempresaId; + } + public void setTipoeventoextraempresaId(Integer tipoeventoextraempresaId) { + this.tipoeventoextraempresaId = tipoeventoextraempresaId; + } + public TipoEventoExtra getTipoeventoextra() { + return tipoeventoextra; + } + public void setTipoeventoextra(TipoEventoExtra tipoeventoextra) { + this.tipoeventoextra = tipoeventoextra; + } + public Empresa getEmpresa() { + return empresa; + } + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + @Override + public String toString() { + return empresa.getNombempresa(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (tipoeventoextraempresaId != null ? tipoeventoextraempresaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TipoEventoExtraEmpresa)) { + return false; + } + TipoEventoExtraEmpresa other = (TipoEventoExtraEmpresa) object; + if ((this.tipoeventoextraempresaId == null && other.tipoeventoextraempresaId != null) || (this.tipoeventoextraempresaId != null && !this.tipoeventoextraempresaId.equals(other.tipoeventoextraempresaId))) { + return false; + } + return true; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraFormaPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraFormaPago.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraFormaPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraFormaPago.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraPtoVta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraPtoVta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraPtoVta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraPtoVta.java index 3d1188a49..ddf7500cb 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraPtoVta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtraPtoVta.java @@ -1,102 +1,102 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "TIPO_EVENTO_EXTRA_PTOVTA") -@SequenceGenerator(name = "TIPOEVENTOEXTRAPTOVTA_SEQ", sequenceName = "TIPOEVENTOEXTRAPTOVTA_SEQ", allocationSize = 1) -public class TipoEventoExtraPtoVta { - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPOEVENTOEXTRAPTOVTA_SEQ") - @Column(name = "TIPOEVENTOEXTRAPTOVTA_ID") - private Integer tipoeventoextraptovtaId; - @ManyToOne - @JoinColumn(name = "TIPOEVENTOEXTRA_ID") - private TipoEventoExtra tipoeventoextra; - @ManyToOne - @JoinColumn(name = "PUNTOVENTA_ID") - private PuntoVenta puntoventa; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "ACTIVO") - private Boolean activo; - - public Integer getTipoeventoextraptovtaId() { - return tipoeventoextraptovtaId; - } - public void setTipoeventoextraptovtaId(Integer tipoeventoextraptovtaId) { - this.tipoeventoextraptovtaId = tipoeventoextraptovtaId; - } - public TipoEventoExtra getTipoeventoextra() { - return tipoeventoextra; - } - public void setTipoeventoextra(TipoEventoExtra tipoeventoextra) { - this.tipoeventoextra = tipoeventoextra; - } - public PuntoVenta getPuntoventa() { - return puntoventa; - } - public void setPuntoventa(PuntoVenta puntoventa) { - this.puntoventa = puntoventa; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Override - public String toString(){ - return this.puntoventa.getNombpuntoventa(); - } - - @Override - public int hashCode() { - int hash = 0; - hash += (tipoeventoextraptovtaId != null ? tipoeventoextraptovtaId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TipoEventoExtraPtoVta)) { - return false; - } - TipoEventoExtraPtoVta other = (TipoEventoExtraPtoVta) object; - if ((this.tipoeventoextraptovtaId == null && other.tipoeventoextraptovtaId != null) || (this.tipoeventoextraptovtaId != null && !this.tipoeventoextraptovtaId.equals(other.tipoeventoextraptovtaId))) { - return false; - } - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "TIPO_EVENTO_EXTRA_PTOVTA") +@SequenceGenerator(name = "TIPOEVENTOEXTRAPTOVTA_SEQ", sequenceName = "TIPOEVENTOEXTRAPTOVTA_SEQ", allocationSize = 1) +public class TipoEventoExtraPtoVta { + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPOEVENTOEXTRAPTOVTA_SEQ") + @Column(name = "TIPOEVENTOEXTRAPTOVTA_ID") + private Integer tipoeventoextraptovtaId; + @ManyToOne + @JoinColumn(name = "TIPOEVENTOEXTRA_ID") + private TipoEventoExtra tipoeventoextra; + @ManyToOne + @JoinColumn(name = "PUNTOVENTA_ID") + private PuntoVenta puntoventa; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "ACTIVO") + private Boolean activo; + + public Integer getTipoeventoextraptovtaId() { + return tipoeventoextraptovtaId; + } + public void setTipoeventoextraptovtaId(Integer tipoeventoextraptovtaId) { + this.tipoeventoextraptovtaId = tipoeventoextraptovtaId; + } + public TipoEventoExtra getTipoeventoextra() { + return tipoeventoextra; + } + public void setTipoeventoextra(TipoEventoExtra tipoeventoextra) { + this.tipoeventoextra = tipoeventoextra; + } + public PuntoVenta getPuntoventa() { + return puntoventa; + } + public void setPuntoventa(PuntoVenta puntoventa) { + this.puntoventa = puntoventa; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Override + public String toString(){ + return this.puntoventa.getNombpuntoventa(); + } + + @Override + public int hashCode() { + int hash = 0; + hash += (tipoeventoextraptovtaId != null ? tipoeventoextraptovtaId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TipoEventoExtraPtoVta)) { + return false; + } + TipoEventoExtraPtoVta other = (TipoEventoExtraPtoVta) object; + if ((this.tipoeventoextraptovtaId == null && other.tipoeventoextraptovtaId != null) || (this.tipoeventoextraptovtaId != null && !this.tipoeventoextraptovtaId.equals(other.tipoeventoextraptovtaId))) { + return false; + } + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoIdentificacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoIdentificacion.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TipoIdentificacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoIdentificacion.java index c6e3694c2..efdf823aa 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoIdentificacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoIdentificacion.java @@ -1,119 +1,119 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; - -@Entity -@Table(name = "TIPO_IDENTIFICACION") -@SequenceGenerator(name = "TIPO_IDENTIFICACION_SEQ", sequenceName = "TIPO_IDENTIFICACION_SEQ", allocationSize = 1) -public class TipoIdentificacion implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "TIPOIDENTIFICACION_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_IDENTIFICACION_SEQ") - private Integer tipoIdentificacionId; - - @Column(name = "DESCTIPO") - private String desctipo; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "INDEXIBECONFIRMACAOTOTALBUS") - private Boolean indExibeConfirmacaoTotalbus; - - public Integer getTipoIdentificacionId() { - return tipoIdentificacionId; - } - - public void setTipoIdentificacionId(Integer tipoIdentificacionId) { - this.tipoIdentificacionId = tipoIdentificacionId; - } - - public String getDesctipo() { - return desctipo; - } - - public void setDesctipo(String desctipo) { - this.desctipo = desctipo; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return getDesctipo(); - } - - public Boolean getIndExibeConfirmacaoTotalbus() { - return indExibeConfirmacaoTotalbus; - } - - public void setIndExibeConfirmacaoTotalbus(Boolean indExibeConfirmacaoTotalbus) { - this.indExibeConfirmacaoTotalbus = indExibeConfirmacaoTotalbus; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((tipoIdentificacionId == null) ? 0 : tipoIdentificacionId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TipoIdentificacion other = (TipoIdentificacion) obj; - if (tipoIdentificacionId == null) { - if (other.tipoIdentificacionId != null) - return false; - } else if (!tipoIdentificacionId.equals(other.tipoIdentificacionId)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@Table(name = "TIPO_IDENTIFICACION") +@SequenceGenerator(name = "TIPO_IDENTIFICACION_SEQ", sequenceName = "TIPO_IDENTIFICACION_SEQ", allocationSize = 1) +public class TipoIdentificacion implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "TIPOIDENTIFICACION_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_IDENTIFICACION_SEQ") + private Integer tipoIdentificacionId; + + @Column(name = "DESCTIPO") + private String desctipo; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @Column(name = "INDEXIBECONFIRMACAOTOTALBUS") + private Boolean indExibeConfirmacaoTotalbus; + + public Integer getTipoIdentificacionId() { + return tipoIdentificacionId; + } + + public void setTipoIdentificacionId(Integer tipoIdentificacionId) { + this.tipoIdentificacionId = tipoIdentificacionId; + } + + public String getDesctipo() { + return desctipo; + } + + public void setDesctipo(String desctipo) { + this.desctipo = desctipo; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return getDesctipo(); + } + + public Boolean getIndExibeConfirmacaoTotalbus() { + return indExibeConfirmacaoTotalbus; + } + + public void setIndExibeConfirmacaoTotalbus(Boolean indExibeConfirmacaoTotalbus) { + this.indExibeConfirmacaoTotalbus = indExibeConfirmacaoTotalbus; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((tipoIdentificacionId == null) ? 0 : tipoIdentificacionId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TipoIdentificacion other = (TipoIdentificacion) obj; + if (tipoIdentificacionId == null) { + if (other.tipoIdentificacionId != null) + return false; + } else if (!tipoIdentificacionId.equals(other.tipoIdentificacionId)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoInformativoComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoInformativoComissao.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoInformativoComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoInformativoComissao.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoMovimentacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoMovimentacion.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TipoMovimentacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoMovimentacion.java index a6e95a1aa..ee6844985 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoMovimentacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoMovimentacion.java @@ -1,130 +1,130 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; -import java.util.HashSet; -import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * TipoMovimentacion generated by hbm2java - */ -@Entity -@Table(name = "TIPO_MOVIMENTACION") -public class TipoMovimentacion implements java.io.Serializable { - - public static final int TIPO_ADQUISICION = 1; - public static final int TIPO_ENVIO = 2; - public static final int TIPO_VOLVER = 3; - public static final int TIPO_TRANSFERENCIA = 4; - public static final int TIPO_PERDIDO = 5; - public static final int TIPO_AJUSTE = 6; - public static final int TIPO_MIGRACAO = 99; - - private Integer tipomovimentacionId; - private String desctipomovimentacion; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - - public TipoMovimentacion() { - } - - public TipoMovimentacion(Integer tipomovimentacionId) { - this.tipomovimentacionId = tipomovimentacionId; - } - - public TipoMovimentacion(Integer tipomovimentacionId, String desctipomovimentacion) { - this.tipomovimentacionId = tipomovimentacionId; - this.desctipomovimentacion = desctipomovimentacion; - } - - public TipoMovimentacion(Integer tipomovimentacionId, String desctipomovimentacion, Boolean activo, Date fecmodif, Integer usuarioId) { - this.tipomovimentacionId = tipomovimentacionId; - this.desctipomovimentacion = desctipomovimentacion; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - @Override - public String toString() { - return desctipomovimentacion; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (tipomovimentacionId != null ? tipomovimentacionId.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TipoMovimentacion)) - return false; - - TipoMovimentacion other = (TipoMovimentacion) object; - if ((this.tipomovimentacionId == null && other.tipomovimentacionId != null) || (this.tipomovimentacionId != null && !this.tipomovimentacionId.equals(other.tipomovimentacionId))) { - return false; - } - return true; - } - - - @Id - @Column(name = "TIPOMOVIMENTACION_ID", unique = true, nullable = false, precision = 4, scale = 0) - public Integer getTipomovimentacionId() { - return this.tipomovimentacionId; - } - - public void setTipomovimentacionId(Integer tipomovimentacionId) { - this.tipomovimentacionId = tipomovimentacionId; - } - - @Column(name = "DESCTIPOMOVIMENTACION", length = 20) - public String getDesctipomovimentacion() { - return this.desctipomovimentacion; - } - - public void setDesctipomovimentacion(String desctipomovimentacion) { - this.desctipomovimentacion = desctipomovimentacion; - } - - @Column(name = "ACTIVO", precision = 1, scale = 0) - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF", length = 7) - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Column(name = "USUARIO_ID", precision = 7, scale = 0) - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 26/10/2013 14:51:58 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * TipoMovimentacion generated by hbm2java + */ +@Entity +@Table(name = "TIPO_MOVIMENTACION") +public class TipoMovimentacion implements java.io.Serializable { + + public static final int TIPO_ADQUISICION = 1; + public static final int TIPO_ENVIO = 2; + public static final int TIPO_VOLVER = 3; + public static final int TIPO_TRANSFERENCIA = 4; + public static final int TIPO_PERDIDO = 5; + public static final int TIPO_AJUSTE = 6; + public static final int TIPO_MIGRACAO = 99; + + private Integer tipomovimentacionId; + private String desctipomovimentacion; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + + public TipoMovimentacion() { + } + + public TipoMovimentacion(Integer tipomovimentacionId) { + this.tipomovimentacionId = tipomovimentacionId; + } + + public TipoMovimentacion(Integer tipomovimentacionId, String desctipomovimentacion) { + this.tipomovimentacionId = tipomovimentacionId; + this.desctipomovimentacion = desctipomovimentacion; + } + + public TipoMovimentacion(Integer tipomovimentacionId, String desctipomovimentacion, Boolean activo, Date fecmodif, Integer usuarioId) { + this.tipomovimentacionId = tipomovimentacionId; + this.desctipomovimentacion = desctipomovimentacion; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + @Override + public String toString() { + return desctipomovimentacion; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (tipomovimentacionId != null ? tipomovimentacionId.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TipoMovimentacion)) + return false; + + TipoMovimentacion other = (TipoMovimentacion) object; + if ((this.tipomovimentacionId == null && other.tipomovimentacionId != null) || (this.tipomovimentacionId != null && !this.tipomovimentacionId.equals(other.tipomovimentacionId))) { + return false; + } + return true; + } + + + @Id + @Column(name = "TIPOMOVIMENTACION_ID", unique = true, nullable = false, precision = 4, scale = 0) + public Integer getTipomovimentacionId() { + return this.tipomovimentacionId; + } + + public void setTipomovimentacionId(Integer tipomovimentacionId) { + this.tipomovimentacionId = tipomovimentacionId; + } + + @Column(name = "DESCTIPOMOVIMENTACION", length = 20) + public String getDesctipomovimentacion() { + return this.desctipomovimentacion; + } + + public void setDesctipomovimentacion(String desctipomovimentacion) { + this.desctipomovimentacion = desctipomovimentacion; + } + + @Column(name = "ACTIVO", precision = 1, scale = 0) + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF", length = 7) + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Column(name = "USUARIO_ID", precision = 7, scale = 0) + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoMovimiento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoMovimiento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoMovimiento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoMovimiento.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoOcupacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoOcupacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoOcupacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoOcupacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoOperacionCC.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoOperacionCC.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TipoOperacionCC.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoOperacionCC.java index 9925970d6..64bd29f86 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoOperacionCC.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoOperacionCC.java @@ -1,131 +1,131 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "TIPO_OPERACION_CC") -public class TipoOperacionCC implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "TIPOOPERACIONCC_ID") - private Integer tipoOperacionCCId; - - @Column(name = "DESCTIPO") - private String descTipo; - - @Column(name = "CVETIPO") - private String cveTipo; - - @Column(name = "INDCREDITO") - private Boolean indCredito; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Temporal(TemporalType.DATE) - @Column(name = "FECMODIF") - private Date fecmodif; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public TipoOperacionCC() { - super(); - } - - public TipoOperacionCC(Integer tipoOperacionCCId) { - this(); - this.tipoOperacionCCId = tipoOperacionCCId; - } - - public Integer getTipoOperacionCCId() { - return tipoOperacionCCId; - } - - public void setTipoOperacionCCId(Integer tipoOperacionCCId) { - this.tipoOperacionCCId = tipoOperacionCCId; - } - - public String getDescTipo() { - return descTipo; - } - - public void setDescTipo(String descTipo) { - this.descTipo = descTipo; - } - - public String getCveTipo() { - return cveTipo; - } - - public void setCveTipo(String cveTipo) { - this.cveTipo = cveTipo; - } - - public Boolean getIndCredito() { - return indCredito; - } - - public void setIndCredito(Boolean indCredito) { - this.indCredito = indCredito; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((tipoOperacionCCId == null) ? 0 : tipoOperacionCCId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TipoOperacionCC other = (TipoOperacionCC) obj; - if (tipoOperacionCCId == null) { - if (other.tipoOperacionCCId != null) - return false; - } else if (!tipoOperacionCCId.equals(other.tipoOperacionCCId)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "TIPO_OPERACION_CC") +public class TipoOperacionCC implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "TIPOOPERACIONCC_ID") + private Integer tipoOperacionCCId; + + @Column(name = "DESCTIPO") + private String descTipo; + + @Column(name = "CVETIPO") + private String cveTipo; + + @Column(name = "INDCREDITO") + private Boolean indCredito; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Temporal(TemporalType.DATE) + @Column(name = "FECMODIF") + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public TipoOperacionCC() { + super(); + } + + public TipoOperacionCC(Integer tipoOperacionCCId) { + this(); + this.tipoOperacionCCId = tipoOperacionCCId; + } + + public Integer getTipoOperacionCCId() { + return tipoOperacionCCId; + } + + public void setTipoOperacionCCId(Integer tipoOperacionCCId) { + this.tipoOperacionCCId = tipoOperacionCCId; + } + + public String getDescTipo() { + return descTipo; + } + + public void setDescTipo(String descTipo) { + this.descTipo = descTipo; + } + + public String getCveTipo() { + return cveTipo; + } + + public void setCveTipo(String cveTipo) { + this.cveTipo = cveTipo; + } + + public Boolean getIndCredito() { + return indCredito; + } + + public void setIndCredito(Boolean indCredito) { + this.indCredito = indCredito; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((tipoOperacionCCId == null) ? 0 : tipoOperacionCCId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TipoOperacionCC other = (TipoOperacionCC) obj; + if (tipoOperacionCCId == null) { + if (other.tipoOperacionCCId != null) + return false; + } else if (!tipoOperacionCCId.equals(other.tipoOperacionCCId)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoParada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoParada.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoParada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoParada.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoPuntoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoPuntoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoTarifaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoTarifaPacote.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/TipoTarifaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoTarifaPacote.java index e225a7f8f..2a4359d7e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoTarifaPacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoTarifaPacote.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -@Entity -@Table(name = "TIPO_TARIFA_PACOTE") -@SequenceGenerator(name = "TIPO_TARIFA_PACOTE_SEQ", sequenceName = "TIPO_TARIFA_PACOTE_SEQ", allocationSize = 1) -public class TipoTarifaPacote implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_TARIFA_PACOTE_SEQ") - @Column(name = "TIPOTARIFAPACOTE_ID") - private Integer tipotarifapacoteId; - @Column(name = "DESCTIPOTARIFA") - private String desctipotarifa; - @Column(name = "ACTIVO") - private Boolean activo; - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - @ManyToMany - @JoinTable(name = "PACOTE_TARIFA", joinColumns = { @JoinColumn(name = "TIPOTARIFAPACOTE_ID") }, - inverseJoinColumns = { @JoinColumn(name = "PACOTE_ID") }) - private List pacoteList; - - public TipoTarifaPacote() { - super(); - } - - public TipoTarifaPacote(Integer tipotarifapacoteId, String desctipotarifa) { - this(); - this.tipotarifapacoteId = tipotarifapacoteId; - this.desctipotarifa = desctipotarifa; - } - - public TipoTarifaPacote(Integer tipotarifapacoteId, String desctipotarifa, Boolean activo, Date fecmodif, Integer usuarioId) { - this(); - this.tipotarifapacoteId = tipotarifapacoteId; - this.desctipotarifa = desctipotarifa; - this.activo = activo; - this.fecmodif = fecmodif; - this.usuarioId = usuarioId; - } - - public Integer getTipotarifapacoteId() { - return tipotarifapacoteId; - } - - public void setTipotarifapacoteId(Integer tipotarifapacoteId) { - this.tipotarifapacoteId = tipotarifapacoteId; - } - - public String getDesctipotarifa() { - return desctipotarifa; - } - - public void setDesctipotarifa(String desctipotarifa) { - this.desctipotarifa = desctipotarifa; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public List getPacoteList() { - return pacoteList; - } - - public void setPacoteList(List pacoteList) { - this.pacoteList = pacoteList; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((tipotarifapacoteId == null) ? 0 : tipotarifapacoteId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TipoTarifaPacote other = (TipoTarifaPacote) obj; - if (tipotarifapacoteId == null) { - if (other.tipotarifapacoteId != null) - return false; - } else if (!tipotarifapacoteId.equals(other.tipotarifapacoteId)) - return false; - return true; - } - - @Override - public String toString() { - return getDesctipotarifa(); - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@Table(name = "TIPO_TARIFA_PACOTE") +@SequenceGenerator(name = "TIPO_TARIFA_PACOTE_SEQ", sequenceName = "TIPO_TARIFA_PACOTE_SEQ", allocationSize = 1) +public class TipoTarifaPacote implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TIPO_TARIFA_PACOTE_SEQ") + @Column(name = "TIPOTARIFAPACOTE_ID") + private Integer tipotarifapacoteId; + @Column(name = "DESCTIPOTARIFA") + private String desctipotarifa; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @ManyToMany + @JoinTable(name = "PACOTE_TARIFA", joinColumns = { @JoinColumn(name = "TIPOTARIFAPACOTE_ID") }, + inverseJoinColumns = { @JoinColumn(name = "PACOTE_ID") }) + private List pacoteList; + + public TipoTarifaPacote() { + super(); + } + + public TipoTarifaPacote(Integer tipotarifapacoteId, String desctipotarifa) { + this(); + this.tipotarifapacoteId = tipotarifapacoteId; + this.desctipotarifa = desctipotarifa; + } + + public TipoTarifaPacote(Integer tipotarifapacoteId, String desctipotarifa, Boolean activo, Date fecmodif, Integer usuarioId) { + this(); + this.tipotarifapacoteId = tipotarifapacoteId; + this.desctipotarifa = desctipotarifa; + this.activo = activo; + this.fecmodif = fecmodif; + this.usuarioId = usuarioId; + } + + public Integer getTipotarifapacoteId() { + return tipotarifapacoteId; + } + + public void setTipotarifapacoteId(Integer tipotarifapacoteId) { + this.tipotarifapacoteId = tipotarifapacoteId; + } + + public String getDesctipotarifa() { + return desctipotarifa; + } + + public void setDesctipotarifa(String desctipotarifa) { + this.desctipotarifa = desctipotarifa; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public List getPacoteList() { + return pacoteList; + } + + public void setPacoteList(List pacoteList) { + this.pacoteList = pacoteList; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((tipotarifapacoteId == null) ? 0 : tipotarifapacoteId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TipoTarifaPacote other = (TipoTarifaPacote) obj; + if (tipotarifapacoteId == null) { + if (other.tipotarifapacoteId != null) + return false; + } else if (!tipotarifapacoteId.equals(other.tipotarifapacoteId)) + return false; + return true; + } + + @Override + public String toString() { + return getDesctipotarifa(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Tramo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Tramo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Tramo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Tramo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TramoKm.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoKm.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/TramoKm.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoKm.java index 61efc4de0..d23f3a7bd 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TramoKm.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoKm.java @@ -1,112 +1,112 @@ -package com.rjconsultores.ventaboletos.entidad; - -// Generated 10/01/2012 11:38:41 by Hibernate Tools 3.4.0.CR1 - -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -/** - * TramoKm generated by hbm2java - */ -@Entity -@SequenceGenerator(name = "TRAMO_KM_SEQ", sequenceName = "TRAMO_KM_SEQ", allocationSize = 1) -@Table(name = "TRAMO_KM") -public class TramoKm implements java.io.Serializable { - - private static final long serialVersionUID = 1L; - @Id - @Column(name = "TRAMOKM_ID") - @GeneratedValue(strategy = GenerationType.AUTO, generator = "TRAMO_KM_SEQ") - @Basic(optional = false) - private int tramokmId; - @ManyToOne - @JoinColumn(name = "EMPRESA_ID") - private Empresa empresa; - @ManyToOne - @JoinColumn(name = "TRAMO_ID") - private Tramo tramo; - @Column(name = "CANTKMPAGOCONDUCTOR") - private Integer cantkmpagoconductor; - @Column(name = "ACTIVO") - private Boolean activo; - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - public TramoKm() { - } - - public TramoKm(int tramokmId) { - this.tramokmId = tramokmId; - } - - public int getTramokmId() { - return this.tramokmId; - } - - public void setTramokmId(int tramokmId) { - this.tramokmId = tramokmId; - } - - public Integer getCantkmpagoconductor() { - return this.cantkmpagoconductor; - } - - public void setCantkmpagoconductor(Integer cantkmpagoconductor) { - this.cantkmpagoconductor = cantkmpagoconductor; - } - - public Boolean getActivo() { - return this.activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return this.fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return this.usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Empresa getEmpresa() { - return empresa; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Tramo getTramo() { - return tramo; - } - - public void setTramo(Tramo tramo) { - this.tramo = tramo; - } -} +package com.rjconsultores.ventaboletos.entidad; + +// Generated 10/01/2012 11:38:41 by Hibernate Tools 3.4.0.CR1 + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * TramoKm generated by hbm2java + */ +@Entity +@SequenceGenerator(name = "TRAMO_KM_SEQ", sequenceName = "TRAMO_KM_SEQ", allocationSize = 1) +@Table(name = "TRAMO_KM") +public class TramoKm implements java.io.Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Column(name = "TRAMOKM_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "TRAMO_KM_SEQ") + @Basic(optional = false) + private int tramokmId; + @ManyToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @ManyToOne + @JoinColumn(name = "TRAMO_ID") + private Tramo tramo; + @Column(name = "CANTKMPAGOCONDUCTOR") + private Integer cantkmpagoconductor; + @Column(name = "ACTIVO") + private Boolean activo; + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public TramoKm() { + } + + public TramoKm(int tramokmId) { + this.tramokmId = tramokmId; + } + + public int getTramokmId() { + return this.tramokmId; + } + + public void setTramokmId(int tramokmId) { + this.tramokmId = tramokmId; + } + + public Integer getCantkmpagoconductor() { + return this.cantkmpagoconductor; + } + + public void setCantkmpagoconductor(Integer cantkmpagoconductor) { + this.cantkmpagoconductor = cantkmpagoconductor; + } + + public Boolean getActivo() { + return this.activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return this.fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return this.usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Tramo getTramo() { + return tramo; + } + + public void setTramo(Tramo tramo) { + this.tramo = tramo; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/TramoKmServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoKmServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TramoKmServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoKmServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TramoServicio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoServicio.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TramoServicio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoServicio.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TramoTiempo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoTiempo.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TramoTiempo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TramoTiempo.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Transportadora.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Transportadora.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Transportadora.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Transportadora.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/TrayectosExpresos.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TrayectosExpresos.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/TrayectosExpresos.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/TrayectosExpresos.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Turno.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Turno.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Turno.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Turno.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Usuario.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Usuario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Usuario.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/UsuarioBancario.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioBancario.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/UsuarioBancario.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioBancario.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/UsuarioEmpresa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioEmpresa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/entidad/UsuarioEmpresa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioEmpresa.java index beb9fa6cd..3d679f374 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/UsuarioEmpresa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioEmpresa.java @@ -1,190 +1,190 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - - -@Entity -@SequenceGenerator(name = "USUARIO_EMPRESA_SEQ", sequenceName = "USUARIO_EMPRESA_SEQ", allocationSize = 1) -@Table(name = "USUARIO_EMPRESA") -public class UsuarioEmpresa implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO, generator = "USUARIO_EMPRESA_SEQ") - @Basic(optional = false) - @Column(name = " USUARIOEMPRESA_ID") - private Integer usuarioEmpresaId; - - @Column(name = "ACTIVO") - private Boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecmodif; - - @Column(name = "USUARIOMODIF_ID") - private Integer usuariomodifId; - - @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") - @ManyToOne - private Usuario usuarioLog; - - @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") - @ManyToOne - private Empresa empresa; - - @Column(name = "INDVALIDAPREIMPRESO") - private Boolean indValidaPreimpreso; - - public UsuarioEmpresa() { - } - - public UsuarioEmpresa(Integer usuarioEmpresaId) { - this.usuarioEmpresaId = usuarioEmpresaId; - } - - - - public Integer getUsuarioEmpresaId() { - return usuarioEmpresaId; - } - - public void setUsuarioEmpresaId(Integer usuarioEmpresaId) { - this.usuarioEmpresaId = usuarioEmpresaId; - } - - - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuariomodifId() { - return usuariomodifId; - } - - public void setUsuariomodifId(Integer usuariomodifId) { - this.usuariomodifId = usuariomodifId; - } - - - - public Empresa getEmpresa() { - return empresa; - } - - - public Usuario getUsuarioLog() { - return usuarioLog; - } - - public void setUsuarioLog(Usuario usuario) { - this.usuarioLog = usuario; - } - - public void setEmpresa(Empresa empresa) { - this.empresa = empresa; - } - - public Boolean getIndValidaPreimpreso() { - return indValidaPreimpreso; - } - - public void setIndValidaPreimpreso(Boolean indValidaPreimpreso) { - this.indValidaPreimpreso = indValidaPreimpreso; - } - - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activo == null) ? 0 : activo.hashCode()); - result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); - result = prime * result + ((fecmodif == null) ? 0 : fecmodif.hashCode()); - result = prime * result + ((indValidaPreimpreso == null) ? 0 : indValidaPreimpreso.hashCode()); - result = prime * result + ((usuarioEmpresaId == null) ? 0 : usuarioEmpresaId.hashCode()); - result = prime * result + ((usuarioLog == null) ? 0 : usuarioLog.hashCode()); - result = prime * result + ((usuariomodifId == null) ? 0 : usuariomodifId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - UsuarioEmpresa other = (UsuarioEmpresa) obj; - if (activo == null) { - if (other.activo != null) - return false; - } else if (!activo.equals(other.activo)) - return false; - if (empresa == null) { - if (other.empresa != null) - return false; - } else if (!empresa.equals(other.empresa)) - return false; - if (fecmodif == null) { - if (other.fecmodif != null) - return false; - } else if (!fecmodif.equals(other.fecmodif)) - return false; - if (indValidaPreimpreso == null) { - if (other.indValidaPreimpreso != null) - return false; - } else if (!indValidaPreimpreso.equals(other.indValidaPreimpreso)) - return false; - if (usuarioEmpresaId == null) { - if (other.usuarioEmpresaId != null) - return false; - } else if (!usuarioEmpresaId.equals(other.usuarioEmpresaId)) - return false; - if (usuarioLog == null) { - if (other.usuarioLog != null) - return false; - } else if (!usuarioLog.equals(other.usuarioLog)) - return false; - if (usuariomodifId == null) { - if (other.usuariomodifId != null) - return false; - } else if (!usuariomodifId.equals(other.usuariomodifId)) - return false; - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa[usuarioEmpresaId=" + usuarioEmpresaId + "]"; - } -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + + +@Entity +@SequenceGenerator(name = "USUARIO_EMPRESA_SEQ", sequenceName = "USUARIO_EMPRESA_SEQ", allocationSize = 1) +@Table(name = "USUARIO_EMPRESA") +public class UsuarioEmpresa implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.AUTO, generator = "USUARIO_EMPRESA_SEQ") + @Basic(optional = false) + @Column(name = " USUARIOEMPRESA_ID") + private Integer usuarioEmpresaId; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIOMODIF_ID") + private Integer usuariomodifId; + + @JoinColumn(name = "USUARIO_ID", referencedColumnName = "USUARIO_ID") + @ManyToOne + private Usuario usuarioLog; + + @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") + @ManyToOne + private Empresa empresa; + + @Column(name = "INDVALIDAPREIMPRESO") + private Boolean indValidaPreimpreso; + + public UsuarioEmpresa() { + } + + public UsuarioEmpresa(Integer usuarioEmpresaId) { + this.usuarioEmpresaId = usuarioEmpresaId; + } + + + + public Integer getUsuarioEmpresaId() { + return usuarioEmpresaId; + } + + public void setUsuarioEmpresaId(Integer usuarioEmpresaId) { + this.usuarioEmpresaId = usuarioEmpresaId; + } + + + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuariomodifId() { + return usuariomodifId; + } + + public void setUsuariomodifId(Integer usuariomodifId) { + this.usuariomodifId = usuariomodifId; + } + + + + public Empresa getEmpresa() { + return empresa; + } + + + public Usuario getUsuarioLog() { + return usuarioLog; + } + + public void setUsuarioLog(Usuario usuario) { + this.usuarioLog = usuario; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getIndValidaPreimpreso() { + return indValidaPreimpreso; + } + + public void setIndValidaPreimpreso(Boolean indValidaPreimpreso) { + this.indValidaPreimpreso = indValidaPreimpreso; + } + + + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((empresa == null) ? 0 : empresa.hashCode()); + result = prime * result + ((fecmodif == null) ? 0 : fecmodif.hashCode()); + result = prime * result + ((indValidaPreimpreso == null) ? 0 : indValidaPreimpreso.hashCode()); + result = prime * result + ((usuarioEmpresaId == null) ? 0 : usuarioEmpresaId.hashCode()); + result = prime * result + ((usuarioLog == null) ? 0 : usuarioLog.hashCode()); + result = prime * result + ((usuariomodifId == null) ? 0 : usuariomodifId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + UsuarioEmpresa other = (UsuarioEmpresa) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (empresa == null) { + if (other.empresa != null) + return false; + } else if (!empresa.equals(other.empresa)) + return false; + if (fecmodif == null) { + if (other.fecmodif != null) + return false; + } else if (!fecmodif.equals(other.fecmodif)) + return false; + if (indValidaPreimpreso == null) { + if (other.indValidaPreimpreso != null) + return false; + } else if (!indValidaPreimpreso.equals(other.indValidaPreimpreso)) + return false; + if (usuarioEmpresaId == null) { + if (other.usuarioEmpresaId != null) + return false; + } else if (!usuarioEmpresaId.equals(other.usuarioEmpresaId)) + return false; + if (usuarioLog == null) { + if (other.usuarioLog != null) + return false; + } else if (!usuarioLog.equals(other.usuarioLog)) + return false; + if (usuariomodifId == null) { + if (other.usuariomodifId != null) + return false; + } else if (!usuariomodifId.equals(other.usuariomodifId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa[usuarioEmpresaId=" + usuarioEmpresaId + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/UsuarioPerfil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioPerfil.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/UsuarioPerfil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioPerfil.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/UsuarioSesion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioSesion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/UsuarioSesion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioSesion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/UsuarioUbicacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioUbicacion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/UsuarioUbicacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/UsuarioUbicacion.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java index 37dd8b1c9..1481ab906 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java @@ -1,254 +1,254 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import org.hibernate.annotations.Where; - -import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; - -@Entity -@Table(name = "VENDA_PACOTE") -@SequenceGenerator(name = "VENDA_PACOTE_SEQ", sequenceName = "VENDA_PACOTE_SEQ", allocationSize = 1) -public class VendaPacote implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @Basic(optional = false) - @GeneratedValue(strategy = GenerationType.AUTO, generator = "VENDA_PACOTE_SEQ") - @Column(name = "VENDAPACOTE_ID") - private Long vendapacoteId; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "DATAVENDA") - private Date datavenda; - - @Temporal(TemporalType.DATE) - @Column(name = "DATAPACOTE") - private Date datapacote; - - @Column(name = "NUMOPERACION") - private String numoperacion; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "PACOTE_ID") - private Pacote pacote; - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "vendaPacote") - @Where(clause = "activo=1") - private List enderecoApanhes; - - @Column(name = "INDCANCELADO") - private Boolean indcancelado; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "DATACANCELAMENTO") - private Date datacancelamento; - - @Column(name = "USUARIO_CANCELAMENTO_ID") - private Integer usuarioCancelamentoId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "USUARIO_ID") - private Usuario usuario; - - @Column(name = "SUBTOTAL") - private BigDecimal subtotal; - - @Column(name = "DESCONTO") - private BigDecimal desconto; - - @Column(name = "TOTAL") - private BigDecimal total; - - @ManyToOne - @JoinColumn(name = "CLIENTEPACOTE_ID") - private ClientePacote clientePacote; - - @Column(name = "MOTIVOCANCELVENDAPACOTE_ID") - private Integer motivoCancelVendaPacoteId; - - @Column(name = "SITUACAO") - private SituacaoVendaPacote situacao; - - @Column(name = "DATA_CONFIRMACAO_RESERVA") - private Date dataConfirmacaoReserva; - - @Column(name = "USUARIO_CONFIRMACAO_RESERVA_ID") - private Long usuarioConfirmacaoReserva; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "FECMODIF") - private Date fecmodif; - - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - public Date getDatavenda() { - return datavenda; - } - - public void setDatavenda(Date datavenda) { - this.datavenda = datavenda; - } - - public Date getDatapacote() { - return datapacote; - } - - public void setDatapacote(Date datapacote) { - this.datapacote = datapacote; - } - - public Pacote getPacote() { - return pacote; - } - - public void setPacote(Pacote pacote) { - this.pacote = pacote; - } - - public Boolean getIndcancelado() { - return indcancelado; - } - - public void setIndcancelado(Boolean indcancelado) { - this.indcancelado = indcancelado; - } - - public Date getDatacancelamento() { - return datacancelamento; - } - - public void setDatacancelamento(Date datacancelamento) { - this.datacancelamento = datacancelamento; - } - - public Integer getUsuarioCancelamentoId() { - return usuarioCancelamentoId; - } - - public void setUsuarioCancelamentoId(Integer usuarioCancelamentoId) { - this.usuarioCancelamentoId = usuarioCancelamentoId; - } - - public BigDecimal getSubtotal() { - return subtotal; - } - - public void setSubtotal(BigDecimal subtotal) { - this.subtotal = subtotal; - } - - public BigDecimal getDesconto() { - return desconto; - } - - public void setDesconto(BigDecimal desconto) { - this.desconto = desconto; - } - - public BigDecimal getTotal() { - return total; - } - - public void setTotal(BigDecimal total) { - this.total = total; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public List getEnderecoApanhes() { - return enderecoApanhes; - } - - public void setEnderecoApanhes(List enderecoApanhes) { - this.enderecoApanhes = enderecoApanhes; - } - - public Usuario getUsuario() { - return usuario; - } - - public void setUsuario(Usuario usuario) { - this.usuario = usuario; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public ClientePacote getClientePacote() { - return clientePacote; - } - - public void setClientePacote(ClientePacote clientePacote) { - this.clientePacote = clientePacote; - } - - public Integer getMotivoCancelVendaPacoteId() { - return motivoCancelVendaPacoteId; - } - - public void setMotivoCancelVendaPacoteId(Integer motivoCancelVendaPacoteId) { - this.motivoCancelVendaPacoteId = motivoCancelVendaPacoteId; - } - - public SituacaoVendaPacote getSituacao() { - return situacao; - } - - public void setSituacao(SituacaoVendaPacote situacao) { - this.situacao = situacao; - } - - public Date getDataConfirmacaoReserva() { - return dataConfirmacaoReserva; - } - - public void setDataConfirmacaoReserva(Date dataConfirmacaoReserva) { - this.dataConfirmacaoReserva = dataConfirmacaoReserva; - } - - public Long getUsuarioConfirmacaoReserva() { - return usuarioConfirmacaoReserva; - } - - public void setUsuarioConfirmacaoReserva(Long usuarioConfirmacaoReserva) { - this.usuarioConfirmacaoReserva = usuarioConfirmacaoReserva; - } - -} +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.Where; + +import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; + +@Entity +@Table(name = "VENDA_PACOTE") +@SequenceGenerator(name = "VENDA_PACOTE_SEQ", sequenceName = "VENDA_PACOTE_SEQ", allocationSize = 1) +public class VendaPacote implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "VENDA_PACOTE_SEQ") + @Column(name = "VENDAPACOTE_ID") + private Long vendapacoteId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "DATAVENDA") + private Date datavenda; + + @Temporal(TemporalType.DATE) + @Column(name = "DATAPACOTE") + private Date datapacote; + + @Column(name = "NUMOPERACION") + private String numoperacion; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "PACOTE_ID") + private Pacote pacote; + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "vendaPacote") + @Where(clause = "activo=1") + private List enderecoApanhes; + + @Column(name = "INDCANCELADO") + private Boolean indcancelado; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "DATACANCELAMENTO") + private Date datacancelamento; + + @Column(name = "USUARIO_CANCELAMENTO_ID") + private Integer usuarioCancelamentoId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "USUARIO_ID") + private Usuario usuario; + + @Column(name = "SUBTOTAL") + private BigDecimal subtotal; + + @Column(name = "DESCONTO") + private BigDecimal desconto; + + @Column(name = "TOTAL") + private BigDecimal total; + + @ManyToOne + @JoinColumn(name = "CLIENTEPACOTE_ID") + private ClientePacote clientePacote; + + @Column(name = "MOTIVOCANCELVENDAPACOTE_ID") + private Integer motivoCancelVendaPacoteId; + + @Column(name = "SITUACAO") + private SituacaoVendaPacote situacao; + + @Column(name = "DATA_CONFIRMACAO_RESERVA") + private Date dataConfirmacaoReserva; + + @Column(name = "USUARIO_CONFIRMACAO_RESERVA_ID") + private Long usuarioConfirmacaoReserva; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name = "FECMODIF") + private Date fecmodif; + + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + public Date getDatavenda() { + return datavenda; + } + + public void setDatavenda(Date datavenda) { + this.datavenda = datavenda; + } + + public Date getDatapacote() { + return datapacote; + } + + public void setDatapacote(Date datapacote) { + this.datapacote = datapacote; + } + + public Pacote getPacote() { + return pacote; + } + + public void setPacote(Pacote pacote) { + this.pacote = pacote; + } + + public Boolean getIndcancelado() { + return indcancelado; + } + + public void setIndcancelado(Boolean indcancelado) { + this.indcancelado = indcancelado; + } + + public Date getDatacancelamento() { + return datacancelamento; + } + + public void setDatacancelamento(Date datacancelamento) { + this.datacancelamento = datacancelamento; + } + + public Integer getUsuarioCancelamentoId() { + return usuarioCancelamentoId; + } + + public void setUsuarioCancelamentoId(Integer usuarioCancelamentoId) { + this.usuarioCancelamentoId = usuarioCancelamentoId; + } + + public BigDecimal getSubtotal() { + return subtotal; + } + + public void setSubtotal(BigDecimal subtotal) { + this.subtotal = subtotal; + } + + public BigDecimal getDesconto() { + return desconto; + } + + public void setDesconto(BigDecimal desconto) { + this.desconto = desconto; + } + + public BigDecimal getTotal() { + return total; + } + + public void setTotal(BigDecimal total) { + this.total = total; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public List getEnderecoApanhes() { + return enderecoApanhes; + } + + public void setEnderecoApanhes(List enderecoApanhes) { + this.enderecoApanhes = enderecoApanhes; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public ClientePacote getClientePacote() { + return clientePacote; + } + + public void setClientePacote(ClientePacote clientePacote) { + this.clientePacote = clientePacote; + } + + public Integer getMotivoCancelVendaPacoteId() { + return motivoCancelVendaPacoteId; + } + + public void setMotivoCancelVendaPacoteId(Integer motivoCancelVendaPacoteId) { + this.motivoCancelVendaPacoteId = motivoCancelVendaPacoteId; + } + + public SituacaoVendaPacote getSituacao() { + return situacao; + } + + public void setSituacao(SituacaoVendaPacote situacao) { + this.situacao = situacao; + } + + public Date getDataConfirmacaoReserva() { + return dataConfirmacaoReserva; + } + + public void setDataConfirmacaoReserva(Date dataConfirmacaoReserva) { + this.dataConfirmacaoReserva = dataConfirmacaoReserva; + } + + public Long getUsuarioConfirmacaoReserva() { + return usuarioConfirmacaoReserva; + } + + public void setUsuarioConfirmacaoReserva(Long usuarioConfirmacaoReserva) { + this.usuarioConfirmacaoReserva = usuarioConfirmacaoReserva; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/Via.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Via.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Via.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Via.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/VigenciaTarifa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/VigenciaTarifa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/VigenciaTarifa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/VigenciaTarifa.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Voucher.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Voucher.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Voucher.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Voucher.java diff --git a/src/com/rjconsultores/ventaboletos/entidad/Zona.java b/ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Zona.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/entidad/Zona.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/entidad/Zona.java diff --git a/src/com/rjconsultores/ventaboletos/enums/CacheApiEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/CacheApiEnum.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/CacheApiEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/CacheApiEnum.java diff --git a/src/com/rjconsultores/ventaboletos/enums/CtrlFechamentoCaixaStatus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/CtrlFechamentoCaixaStatus.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/CtrlFechamentoCaixaStatus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/CtrlFechamentoCaixaStatus.java index f711776b7..ebbbd0e73 100644 --- a/src/com/rjconsultores/ventaboletos/enums/CtrlFechamentoCaixaStatus.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/CtrlFechamentoCaixaStatus.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum CtrlFechamentoCaixaStatus { - - LIBERADO_RETENCAO_COMISSAO, - RETENCAO_COMISSAO_EM_ANDAMENTO, - RETENCAO_COMISSAO_CONCLUIDA; - -} +package com.rjconsultores.ventaboletos.enums; + +public enum CtrlFechamentoCaixaStatus { + + LIBERADO_RETENCAO_COMISSAO, + RETENCAO_COMISSAO_EM_ANDAMENTO, + RETENCAO_COMISSAO_CONCLUIDA; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/CustomTipo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/CustomTipo.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/CustomTipo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/CustomTipo.java index b604c36b2..0e54d2438 100644 --- a/src/com/rjconsultores/ventaboletos/enums/CustomTipo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/CustomTipo.java @@ -1,36 +1,36 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum CustomTipo { - - TIPO_CLIENTE(1, "Cliente"), - TIPO_SKIN(2, "Skin"), - TIPO_MENU(3, "Menu"), - TIPO_SERVIDOR(4, "Servidor"); - - private Integer valor; - private String descricao; - - private CustomTipo(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public Integer getValor() { - return valor; - } - - @Override - public String toString() { - return this.descricao; - } - - public static CustomTipo getCustomTipo(Integer tValor) { - for (CustomTipo valor : CustomTipo.values()) { - if (valor.getValor().equals(tValor)) { - return valor; - } - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum CustomTipo { + + TIPO_CLIENTE(1, "Cliente"), + TIPO_SKIN(2, "Skin"), + TIPO_MENU(3, "Menu"), + TIPO_SERVIDOR(4, "Servidor"); + + private Integer valor; + private String descricao; + + private CustomTipo(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public Integer getValor() { + return valor; + } + + @Override + public String toString() { + return this.descricao; + } + + public static CustomTipo getCustomTipo(Integer tValor) { + for (CustomTipo valor : CustomTipo.values()) { + if (valor.getValor().equals(tValor)) { + return valor; + } + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/DataGeracaoLegalizacaoEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/DataGeracaoLegalizacaoEnum.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/DataGeracaoLegalizacaoEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/DataGeracaoLegalizacaoEnum.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EAmbienteContingencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EAmbienteContingencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/EAmbienteContingencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EAmbienteContingencia.java index 116ee7b44..225bb28f2 100644 --- a/src/com/rjconsultores/ventaboletos/enums/EAmbienteContingencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EAmbienteContingencia.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum EAmbienteContingencia { - - PRODUCAO(1, "Produção"), - HOMOLOGACAO(2, "Homologação"); - - private Integer id; - private String descricao; - - private EAmbienteContingencia(Integer id, String descricao) { - this.id = id; - this.descricao = descricao; - } - - public Integer getId() { - return id; - } - - public String getDescricao() { - return descricao; - } - - public static EAmbienteContingencia getAmbienteContingencia(Integer id) { - for (EAmbienteContingencia ambiente : EAmbienteContingencia.values()) { - if (ambiente.getId().equals(id)) { - return ambiente; - } - } - throw new IllegalArgumentException("Ambiente contigência não definido"); - } -} +package com.rjconsultores.ventaboletos.enums; + +public enum EAmbienteContingencia { + + PRODUCAO(1, "Produção"), + HOMOLOGACAO(2, "Homologação"); + + private Integer id; + private String descricao; + + private EAmbienteContingencia(Integer id, String descricao) { + this.id = id; + this.descricao = descricao; + } + + public Integer getId() { + return id; + } + + public String getDescricao() { + return descricao; + } + + public static EAmbienteContingencia getAmbienteContingencia(Integer id) { + for (EAmbienteContingencia ambiente : EAmbienteContingencia.values()) { + if (ambiente.getId().equals(id)) { + return ambiente; + } + } + throw new IllegalArgumentException("Ambiente contigência não definido"); + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/EStatusContingencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EStatusContingencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/EStatusContingencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EStatusContingencia.java index 85e48d27f..8ed51fff8 100644 --- a/src/com/rjconsultores/ventaboletos/enums/EStatusContingencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EStatusContingencia.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum EStatusContingencia { - - NORMAL(1, "Normal"), - CONTINGENCIA(2, "Contingência"); - - private Integer id; - private String descricao; - - private EStatusContingencia(Integer id, String descricao) { - this.id = id; - this.descricao = descricao; - } - - public Integer getId() { - return id; - } - - public String getDescricao() { - return descricao; - } - - public static EStatusContingencia getStatusContingencia(Integer id) { - for (EStatusContingencia status : EStatusContingencia.values()) { - if (status.getId().equals(id)) { - return status; - } - } - throw new IllegalArgumentException("Status contigência não definido"); - } -} +package com.rjconsultores.ventaboletos.enums; + +public enum EStatusContingencia { + + NORMAL(1, "Normal"), + CONTINGENCIA(2, "Contingência"); + + private Integer id; + private String descricao; + + private EStatusContingencia(Integer id, String descricao) { + this.id = id; + this.descricao = descricao; + } + + public Integer getId() { + return id; + } + + public String getDescricao() { + return descricao; + } + + public static EStatusContingencia getStatusContingencia(Integer id) { + for (EStatusContingencia status : EStatusContingencia.values()) { + if (status.getId().equals(id)) { + return status; + } + } + throw new IllegalArgumentException("Status contigência não definido"); + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumDesconto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumDesconto.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumDesconto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumDesconto.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumLinguagemImpresion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumLinguagemImpresion.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumLinguagemImpresion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumLinguagemImpresion.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumStatus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumStatus.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumStatus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumStatus.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumTipoCertificado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoCertificado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumTipoCertificado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoCertificado.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumTipoIntegracao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoIntegracao.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumTipoIntegracao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoIntegracao.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumTipoVenda.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoVenda.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/EnumTipoVenda.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoVenda.java index aded71922..7b4fab641 100644 --- a/src/com/rjconsultores/ventaboletos/enums/EnumTipoVenda.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumTipoVenda.java @@ -1,93 +1,93 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum EnumTipoVenda { - - /** - * Venda Normal => 1 - */ - TPV_NORMAL(1, true), - TPV_ALTA_FREQUENCIA(2, true), - TPV_MANUAL(3, false), - TPV_HAND_HELD(4, true), - TPV_CENTRAL_TELEFONICA(5, false), - TPV_CARGO_A_OUTROS(6, false), - TPV_RESERVA(7, true), - TPV_TRANSFERENCIAS_TROCA(8, true), - /** - * Venda em Aberto => 9 - */ - TPV_ABERTO(9, true), - TPV_CON_BUSPASS(10, true), - TPV_DOMICILIO(11, true), - TPV_POR_INTERNET(12, true), - TPV_INTERMEDIO_SIN_HOR_SIN_AS(13, true), - TPV_INTERMEDIO_CON_HOR_SIN_AS(14, true), - TPV_RESERVA_NORMAL(15, true), - TPV_RESERVA_POR_INTERNET(16, true), - TPV_BOLETO_REMOTO(18, false), - TPV_AGENCIA_WEB(19, true), - TPV_RESERVACION_LISTA_ESPERA(23, true), - TPV_TRANSF_TURISSSTE(26, true), - TPV_TRANSFERENCIA_CUPON(27, true), - TPV_VENTA_FAMSA(28, true), - TPV_TRANSFERENCIA_FAMSA(29, true), - TPV_EMPRESA_AMERICANA(31, true), - TPV_VENDA_BOLETO_ABERTO_MANUAL(39, false), - TPV_CHECKIN_VIAGEM(41, true), - TPV_BOLETO_ABERTO_PREPAGADO(49, false), - TPV_CANCELAMENTO(51, true), - TPV_CANCELAMENTO_CARGO_OTROS(52, true), - TPV_CANCELAMENTO_CIT(53, true), - TPV_RESERVACION_PAQUETE_VIAJE(57, true), - TPV_TRANSFERENCIA_CIT(54, true), - TPV_TRANSFERENCIA_A_RESERVA(55, true), - TPV_VENTA_PAQUETE_VIAJE(56, true), - TPV_CANCELAMENTO_PAQUETE(58, true), - TPV_CANCELAMENTO_TURISSSTE(59, true), - TPV_CANCELAMENTO_FAMSA(60, true), - TPV_TRANSFERENCIA_TARJETA(61, true), - TPV_TRANSFERENCIA_ORDEN_SERV(62, true), - TPV_TRANSFERENCIA_PASE_VAC_TRASLADO(63, true), - TPV_TRANSFERENCIA_CUPON_COTEMAR(64, true), - TPV_TRANSFERENCIA_CUPON_AM(65, true), - TPV_TRANSFERENCIA_CUPON_RASPA_GANA(66, true), - TPV_TRANSFERENCIA_SI_VALE(67, true), - TPV_TIEMPO_AIRE(69, true), // Venta Tiempo aire - TPV_TRANSFERENCIA_OXXO(70, true), - TPV_TRANSFERENCIA_CUPON_MONEDERO(71, true), - TPV_VENTA_RESERVACION_OXXO(72, true), - TPV_VENTA_EXTRAVIADO(73, true), - TPV_CAMBIO_VIAJE(81, true),// é a transferência de passagens - /** - * Confirmação de Venda em Aberto => 82 - */ - TPV_CONFIRMA_ABIERTO(82, true), - TPV_VENDA_PACOTE(83, true), - TPV_RESERVA_EMBARCADA(98, true), - TPV_VENTA_EMBARCADA(99, true); - - private Integer id; - private boolean isValidarFolio; - - private EnumTipoVenda(Integer id, boolean isValidarFolio) { - this.id = id; - this.isValidarFolio = isValidarFolio; - } - - public Integer getId() { - return id; - } - - public boolean isValidarFolio() { - return isValidarFolio; - } - - public static EnumTipoVenda getTipoVenda(Integer id) { - for (EnumTipoVenda tipoVenda : EnumTipoVenda.values()) { - if (tipoVenda.id.equals(id)) { - return tipoVenda; - } - } - throw new IllegalArgumentException("Tipo de venda não encontrada."); - } -} +package com.rjconsultores.ventaboletos.enums; + +public enum EnumTipoVenda { + + /** + * Venda Normal => 1 + */ + TPV_NORMAL(1, true), + TPV_ALTA_FREQUENCIA(2, true), + TPV_MANUAL(3, false), + TPV_HAND_HELD(4, true), + TPV_CENTRAL_TELEFONICA(5, false), + TPV_CARGO_A_OUTROS(6, false), + TPV_RESERVA(7, true), + TPV_TRANSFERENCIAS_TROCA(8, true), + /** + * Venda em Aberto => 9 + */ + TPV_ABERTO(9, true), + TPV_CON_BUSPASS(10, true), + TPV_DOMICILIO(11, true), + TPV_POR_INTERNET(12, true), + TPV_INTERMEDIO_SIN_HOR_SIN_AS(13, true), + TPV_INTERMEDIO_CON_HOR_SIN_AS(14, true), + TPV_RESERVA_NORMAL(15, true), + TPV_RESERVA_POR_INTERNET(16, true), + TPV_BOLETO_REMOTO(18, false), + TPV_AGENCIA_WEB(19, true), + TPV_RESERVACION_LISTA_ESPERA(23, true), + TPV_TRANSF_TURISSSTE(26, true), + TPV_TRANSFERENCIA_CUPON(27, true), + TPV_VENTA_FAMSA(28, true), + TPV_TRANSFERENCIA_FAMSA(29, true), + TPV_EMPRESA_AMERICANA(31, true), + TPV_VENDA_BOLETO_ABERTO_MANUAL(39, false), + TPV_CHECKIN_VIAGEM(41, true), + TPV_BOLETO_ABERTO_PREPAGADO(49, false), + TPV_CANCELAMENTO(51, true), + TPV_CANCELAMENTO_CARGO_OTROS(52, true), + TPV_CANCELAMENTO_CIT(53, true), + TPV_RESERVACION_PAQUETE_VIAJE(57, true), + TPV_TRANSFERENCIA_CIT(54, true), + TPV_TRANSFERENCIA_A_RESERVA(55, true), + TPV_VENTA_PAQUETE_VIAJE(56, true), + TPV_CANCELAMENTO_PAQUETE(58, true), + TPV_CANCELAMENTO_TURISSSTE(59, true), + TPV_CANCELAMENTO_FAMSA(60, true), + TPV_TRANSFERENCIA_TARJETA(61, true), + TPV_TRANSFERENCIA_ORDEN_SERV(62, true), + TPV_TRANSFERENCIA_PASE_VAC_TRASLADO(63, true), + TPV_TRANSFERENCIA_CUPON_COTEMAR(64, true), + TPV_TRANSFERENCIA_CUPON_AM(65, true), + TPV_TRANSFERENCIA_CUPON_RASPA_GANA(66, true), + TPV_TRANSFERENCIA_SI_VALE(67, true), + TPV_TIEMPO_AIRE(69, true), // Venta Tiempo aire + TPV_TRANSFERENCIA_OXXO(70, true), + TPV_TRANSFERENCIA_CUPON_MONEDERO(71, true), + TPV_VENTA_RESERVACION_OXXO(72, true), + TPV_VENTA_EXTRAVIADO(73, true), + TPV_CAMBIO_VIAJE(81, true),// é a transferência de passagens + /** + * Confirmação de Venda em Aberto => 82 + */ + TPV_CONFIRMA_ABIERTO(82, true), + TPV_VENDA_PACOTE(83, true), + TPV_RESERVA_EMBARCADA(98, true), + TPV_VENTA_EMBARCADA(99, true); + + private Integer id; + private boolean isValidarFolio; + + private EnumTipoVenda(Integer id, boolean isValidarFolio) { + this.id = id; + this.isValidarFolio = isValidarFolio; + } + + public Integer getId() { + return id; + } + + public boolean isValidarFolio() { + return isValidarFolio; + } + + public static EnumTipoVenda getTipoVenda(Integer id) { + for (EnumTipoVenda tipoVenda : EnumTipoVenda.values()) { + if (tipoVenda.id.equals(id)) { + return tipoVenda; + } + } + throw new IllegalArgumentException("Tipo de venda não encontrada."); + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumViaComprovantePassagem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumViaComprovantePassagem.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EnumViaComprovantePassagem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EnumViaComprovantePassagem.java diff --git a/src/com/rjconsultores/ventaboletos/enums/EstadoBilheteConsultarEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/EstadoBilheteConsultarEnum.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/EstadoBilheteConsultarEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/EstadoBilheteConsultarEnum.java diff --git a/src/com/rjconsultores/ventaboletos/enums/FolioSistemaEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/FolioSistemaEnum.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/FolioSistemaEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/FolioSistemaEnum.java diff --git a/src/com/rjconsultores/ventaboletos/enums/FuncionSistemaEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/FuncionSistemaEnum.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/FuncionSistemaEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/FuncionSistemaEnum.java index f2b9bd13b..2d20319b9 100644 --- a/src/com/rjconsultores/ventaboletos/enums/FuncionSistemaEnum.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/FuncionSistemaEnum.java @@ -1,36 +1,36 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum FuncionSistemaEnum { - - FUNCION_COBRANCA_ADICIONAL("COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.COBRANCAADICIONAL"), - PAINEL_VENDA_EMBARCADA("COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.MENU.PAINELVENDAEMBARCADA"); - - - private String valor; - - - - public String getValor() { - return valor; - } - - - public void setValor(String valor) { - this.valor = valor; - } - - private FuncionSistemaEnum(String valor) { - this.valor = valor; - } - - - public static FuncionSistemaEnum getFuncionSistema(String funcionSistema) { - for (FuncionSistemaEnum funcionSistemaEnum : FuncionSistemaEnum.values()) { - if (funcionSistemaEnum.getValor().equals(funcionSistema)) { - return funcionSistemaEnum; - } - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum FuncionSistemaEnum { + + FUNCION_COBRANCA_ADICIONAL("COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.COBRANCAADICIONAL"), + PAINEL_VENDA_EMBARCADA("COM.RJCONSULTORES.ADMINISTRACION.GUI.SEGURIDAD.MENU.PAINELVENDAEMBARCADA"); + + + private String valor; + + + + public String getValor() { + return valor; + } + + + public void setValor(String valor) { + this.valor = valor; + } + + private FuncionSistemaEnum(String valor) { + this.valor = valor; + } + + + public static FuncionSistemaEnum getFuncionSistema(String funcionSistema) { + for (FuncionSistemaEnum funcionSistemaEnum : FuncionSistemaEnum.values()) { + if (funcionSistemaEnum.getValor().equals(funcionSistema)) { + return funcionSistemaEnum; + } + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java index 1f3f1bfea..d30336b61 100644 --- a/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/HorarioLiberacaoVendaPassagem.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum HorarioLiberacaoVendaPassagem { - - HORARIO_LIBERACAO_VENDA_ORIGEM, - HORARIO_LIBERACAO_VENDA_TRECHO; - -} +package com.rjconsultores.ventaboletos.enums; + +public enum HorarioLiberacaoVendaPassagem { + + HORARIO_LIBERACAO_VENDA_ORIGEM, + HORARIO_LIBERACAO_VENDA_TRECHO; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/IndRestricaoFormaPago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/IndRestricaoFormaPago.java similarity index 91% rename from src/com/rjconsultores/ventaboletos/enums/IndRestricaoFormaPago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/IndRestricaoFormaPago.java index b7a7806cf..dec246631 100644 --- a/src/com/rjconsultores/ventaboletos/enums/IndRestricaoFormaPago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/IndRestricaoFormaPago.java @@ -1,33 +1,33 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.enums; - -/** - * @author Thiago - * - */ -public enum IndRestricaoFormaPago { - - NORMAL("NO"), - TARIFA_E_TAXAS("TT"), - SOMENTE_TARIFA("ST"); - - String sigla; - - IndRestricaoFormaPago(String sigla) { - this.sigla = sigla; - } - - public String getSigla() { - return sigla; - } - - @Override - public String toString() { - return sigla; - } - - -} - +/** + * + */ +package com.rjconsultores.ventaboletos.enums; + +/** + * @author Thiago + * + */ +public enum IndRestricaoFormaPago { + + NORMAL("NO"), + TARIFA_E_TAXAS("TT"), + SOMENTE_TARIFA("ST"); + + String sigla; + + IndRestricaoFormaPago(String sigla) { + this.sigla = sigla; + } + + public String getSigla() { + return sigla; + } + + @Override + public String toString() { + return sigla; + } + + +} + diff --git a/src/com/rjconsultores/ventaboletos/enums/IndStatusBoleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/IndStatusBoleto.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/IndStatusBoleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/IndStatusBoleto.java index 2d1ee36b9..e2b74bf1c 100644 --- a/src/com/rjconsultores/ventaboletos/enums/IndStatusBoleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/IndStatusBoleto.java @@ -1,74 +1,74 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum IndStatusBoleto { - - V("VENDIDO", "V"), - C("CANCELADO", "C"), - T("TRANSFERIDO", "T"), - E("ENTREGUE", "E"), - S("RESERVADO", "S"), - X("EXTRAVIADO", "X"), - R("REIMPRESSO", "R"), - M("MARCADO", "M"); - - private String value; - private String shortValue; - - private IndStatusBoleto(String value, String shortValue) { - this.value = value; - this.shortValue = shortValue; - } - - public String getValue() { - return value; - } - - public String getShortValue() { - return shortValue; - } - - public static IndStatusBoleto getIndStatusBoleto(String shortValue) { - if(V.getShortValue().equals(shortValue)) { - return V; - } else if(C.getShortValue().equals(shortValue)) { - return C; - } else if(T.getShortValue().equals(shortValue)) { - return T; - } else if(E.getShortValue().equals(shortValue)) { - return E; - } else if(S.getShortValue().equals(shortValue)) { - return S; - } else if(X.getShortValue().equals(shortValue)) { - return X; - } else if(R.getShortValue().equals(shortValue)) { - return R; - } else if(M.getShortValue().equals(shortValue)) { - return M; - } - - return null; - } - - public static String getDescricao(String shortValue) { - if(V.getShortValue().equals(shortValue)) { - return V.value; - } else if(C.getShortValue().equals(shortValue)) { - return C.value; - } else if(T.getShortValue().equals(shortValue)) { - return T.value; - } else if(E.getShortValue().equals(shortValue)) { - return E.value; - } else if(S.getShortValue().equals(shortValue)) { - return S.value; - } else if(X.getShortValue().equals(shortValue)) { - return X.value; - } else if(R.getShortValue().equals(shortValue)) { - return R.value; - } else if(M.getShortValue().equals(shortValue)) { - return M.value; - } - - return null; - } - +package com.rjconsultores.ventaboletos.enums; + +public enum IndStatusBoleto { + + V("VENDIDO", "V"), + C("CANCELADO", "C"), + T("TRANSFERIDO", "T"), + E("ENTREGUE", "E"), + S("RESERVADO", "S"), + X("EXTRAVIADO", "X"), + R("REIMPRESSO", "R"), + M("MARCADO", "M"); + + private String value; + private String shortValue; + + private IndStatusBoleto(String value, String shortValue) { + this.value = value; + this.shortValue = shortValue; + } + + public String getValue() { + return value; + } + + public String getShortValue() { + return shortValue; + } + + public static IndStatusBoleto getIndStatusBoleto(String shortValue) { + if(V.getShortValue().equals(shortValue)) { + return V; + } else if(C.getShortValue().equals(shortValue)) { + return C; + } else if(T.getShortValue().equals(shortValue)) { + return T; + } else if(E.getShortValue().equals(shortValue)) { + return E; + } else if(S.getShortValue().equals(shortValue)) { + return S; + } else if(X.getShortValue().equals(shortValue)) { + return X; + } else if(R.getShortValue().equals(shortValue)) { + return R; + } else if(M.getShortValue().equals(shortValue)) { + return M; + } + + return null; + } + + public static String getDescricao(String shortValue) { + if(V.getShortValue().equals(shortValue)) { + return V.value; + } else if(C.getShortValue().equals(shortValue)) { + return C.value; + } else if(T.getShortValue().equals(shortValue)) { + return T.value; + } else if(E.getShortValue().equals(shortValue)) { + return E.value; + } else if(S.getShortValue().equals(shortValue)) { + return S.value; + } else if(X.getShortValue().equals(shortValue)) { + return X.value; + } else if(R.getShortValue().equals(shortValue)) { + return R.value; + } else if(M.getShortValue().equals(shortValue)) { + return M.value; + } + + return null; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java index 97b68a6d1..25737a0fc 100644 --- a/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/LocalEnderecoApanhe.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum LocalEnderecoApanhe { - - APANHE_EM_CASA(0,"Apanhe em Casa"), - HOTEL(1,"Hotel"), - NENHUM(2,"Nenhum"), - REGIAO_METROPOLITANA(3,"Região Metropolitana"); - - private Integer valor; - private String descricao; - - private LocalEnderecoApanhe(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public Integer getValor() { - return this.valor; - } - - @Override - public String toString() { - return this.descricao; - } - - public static LocalEnderecoApanhe getLocalEnderecoApanhe(Integer valor) { - if(APANHE_EM_CASA.getValor().equals(valor)) { - return APANHE_EM_CASA; - } else if(HOTEL.getValor().equals(valor)) { - return HOTEL; - } else if(NENHUM.getValor().equals(valor)) { - return NENHUM; - } else if(REGIAO_METROPOLITANA.getValor().equals(valor)) { - return REGIAO_METROPOLITANA; - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum LocalEnderecoApanhe { + + APANHE_EM_CASA(0,"Apanhe em Casa"), + HOTEL(1,"Hotel"), + NENHUM(2,"Nenhum"), + REGIAO_METROPOLITANA(3,"Região Metropolitana"); + + private Integer valor; + private String descricao; + + private LocalEnderecoApanhe(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public Integer getValor() { + return this.valor; + } + + @Override + public String toString() { + return this.descricao; + } + + public static LocalEnderecoApanhe getLocalEnderecoApanhe(Integer valor) { + if(APANHE_EM_CASA.getValor().equals(valor)) { + return APANHE_EM_CASA; + } else if(HOTEL.getValor().equals(valor)) { + return HOTEL; + } else if(NENHUM.getValor().equals(valor)) { + return NENHUM; + } else if(REGIAO_METROPOLITANA.getValor().equals(valor)) { + return REGIAO_METROPOLITANA; + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/MDOrigem.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/MDOrigem.java similarity index 93% rename from src/com/rjconsultores/ventaboletos/enums/MDOrigem.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/MDOrigem.java index e1dd73c98..af7abe193 100644 --- a/src/com/rjconsultores/ventaboletos/enums/MDOrigem.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/MDOrigem.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum MDOrigem { - - INTERNO("IN"), - EVENTO_EXTRA("EE"), - FORMA_PAGAMENTO("FP"); - - private String value; - - private MDOrigem(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum MDOrigem { + + INTERNO("IN"), + EVENTO_EXTRA("EE"), + FORMA_PAGAMENTO("FP"); + + private String value; + + private MDOrigem(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/MimeType.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/MimeType.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/MimeType.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/MimeType.java index 0c99dfec8..667b01061 100644 --- a/src/com/rjconsultores/ventaboletos/enums/MimeType.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/MimeType.java @@ -1,22 +1,22 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum MimeType { - - PDF("application/pdf"), - XLS("application/vnd.ms-excel"), - DOC("application/msword"), - TXT("text/plain"), - ZIP("application/zip, application/x-compressed-zip"); - - private String descricao; - - private MimeType(String descricao) { - this.descricao = descricao; - } - - @Override - public String toString() { - return this.descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum MimeType { + + PDF("application/pdf"), + XLS("application/vnd.ms-excel"), + DOC("application/msword"), + TXT("text/plain"), + ZIP("application/zip, application/x-compressed-zip"); + + private String descricao; + + private MimeType(String descricao) { + this.descricao = descricao; + } + + @Override + public String toString() { + return this.descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/ModeloComissaoImpressaoPosterior.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/ModeloComissaoImpressaoPosterior.java similarity index 93% rename from src/com/rjconsultores/ventaboletos/enums/ModeloComissaoImpressaoPosterior.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/ModeloComissaoImpressaoPosterior.java index c0f70140b..e2423ff7a 100644 --- a/src/com/rjconsultores/ventaboletos/enums/ModeloComissaoImpressaoPosterior.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/ModeloComissaoImpressaoPosterior.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum ModeloComissaoImpressaoPosterior { - - PADRAO, - COMPARTILHADA; - -} +package com.rjconsultores.ventaboletos.enums; + +public enum ModeloComissaoImpressaoPosterior { + + PADRAO, + COMPARTILHADA; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/PricingOperacaoWS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/PricingOperacaoWS.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/PricingOperacaoWS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/PricingOperacaoWS.java index 6a85ab29e..eebcae99d 100644 --- a/src/com/rjconsultores/ventaboletos/enums/PricingOperacaoWS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/PricingOperacaoWS.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum PricingOperacaoWS { - - INCLUIR, ALTERAR, EXCLUIR, INATIVAR; - -} +package com.rjconsultores.ventaboletos.enums; + +public enum PricingOperacaoWS { + + INCLUIR, ALTERAR, EXCLUIR, INATIVAR; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/RelatorioMovimentacaoBilheteStatusEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/RelatorioMovimentacaoBilheteStatusEnum.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/enums/RelatorioMovimentacaoBilheteStatusEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/RelatorioMovimentacaoBilheteStatusEnum.java index 58925982b..495ab237d 100644 --- a/src/com/rjconsultores/ventaboletos/enums/RelatorioMovimentacaoBilheteStatusEnum.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/RelatorioMovimentacaoBilheteStatusEnum.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.enums; - -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -public enum RelatorioMovimentacaoBilheteStatusEnum { - - VENDIDO("Vendido", "VENDIDO"), CANCELADO("Cancelado", "CANCELADO"), DEVOLVIDO("Devolvido", "DEVOLVIDO"), CANCELADO_EMERGENCIAL("Cancelado emergencial", "CANCEC. EMERG"), TROCA("Troca", "TROCA", "TROCA PASSAGEM"), TRANSFERENCIA("Transferência", "TRANSFERIDO", "TRANSFERÊNCIA"), REATIVACAO("Reativação", "CHECKIN REATIVADO", "REATIVADO"), TROCA_TITULARIDADE("Troca de Titularidade", "TITULARIDADE TROCADA", "TROCA TITULARIDADE"), TROCA_POLTRONA("Troca de Poltrona", "POLTRONA ALTERADA", "TROCA POLTRONA"), NO_SHOW("No-Show", "NO-SHOW"), CHECK_IN("Check-in", "CHECK-IN"), ENTREGA("Entrega", "ENTREGUE"), RESERVA("Reserva", "RESERVA", "CONFIRMA RESERVA", "LIBERA RESERVA"); - - private String descricaoTela; - private String statusRelatorio; - private List statusRelatorioAnterior; - - private RelatorioMovimentacaoBilheteStatusEnum(String descricaoTela, String statusRelatorio) { - this.descricaoTela = descricaoTela; - this.statusRelatorio = statusRelatorio; - } - - private RelatorioMovimentacaoBilheteStatusEnum(String descricaoTela, String statusRelatorio, String... statusRelatorioAnterior) { - this.descricaoTela = descricaoTela; - this.statusRelatorio = statusRelatorio; - if (statusRelatorioAnterior != null) { - this.statusRelatorioAnterior = Arrays.asList(statusRelatorioAnterior); - } - } - - public String getDescricaoTela() { - return descricaoTela; - } - - public String getStatusRelatorio() { - return statusRelatorio; - } - - public List getStatusRelatorioAnterior() { - return statusRelatorioAnterior; - } - - @Override - public String toString() { - return this.descricaoTela; - } - - public static List getListaOrdenada() { - List listaOrdenada = Arrays.asList(values()); - Collections.sort(listaOrdenada, new Comparator() { - @Override - public int compare(RelatorioMovimentacaoBilheteStatusEnum o1, RelatorioMovimentacaoBilheteStatusEnum o2) { - return o1.getDescricaoTela().compareToIgnoreCase(o2.getDescricaoTela()); - } - }); - - return listaOrdenada; - } +package com.rjconsultores.ventaboletos.enums; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public enum RelatorioMovimentacaoBilheteStatusEnum { + + VENDIDO("Vendido", "VENDIDO"), CANCELADO("Cancelado", "CANCELADO"), DEVOLVIDO("Devolvido", "DEVOLVIDO"), CANCELADO_EMERGENCIAL("Cancelado emergencial", "CANCEC. EMERG"), TROCA("Troca", "TROCA", "TROCA PASSAGEM"), TRANSFERENCIA("Transferência", "TRANSFERIDO", "TRANSFERÊNCIA"), REATIVACAO("Reativação", "CHECKIN REATIVADO", "REATIVADO"), TROCA_TITULARIDADE("Troca de Titularidade", "TITULARIDADE TROCADA", "TROCA TITULARIDADE"), TROCA_POLTRONA("Troca de Poltrona", "POLTRONA ALTERADA", "TROCA POLTRONA"), NO_SHOW("No-Show", "NO-SHOW"), CHECK_IN("Check-in", "CHECK-IN"), ENTREGA("Entrega", "ENTREGUE"), RESERVA("Reserva", "RESERVA", "CONFIRMA RESERVA", "LIBERA RESERVA"); + + private String descricaoTela; + private String statusRelatorio; + private List statusRelatorioAnterior; + + private RelatorioMovimentacaoBilheteStatusEnum(String descricaoTela, String statusRelatorio) { + this.descricaoTela = descricaoTela; + this.statusRelatorio = statusRelatorio; + } + + private RelatorioMovimentacaoBilheteStatusEnum(String descricaoTela, String statusRelatorio, String... statusRelatorioAnterior) { + this.descricaoTela = descricaoTela; + this.statusRelatorio = statusRelatorio; + if (statusRelatorioAnterior != null) { + this.statusRelatorioAnterior = Arrays.asList(statusRelatorioAnterior); + } + } + + public String getDescricaoTela() { + return descricaoTela; + } + + public String getStatusRelatorio() { + return statusRelatorio; + } + + public List getStatusRelatorioAnterior() { + return statusRelatorioAnterior; + } + + @Override + public String toString() { + return this.descricaoTela; + } + + public static List getListaOrdenada() { + List listaOrdenada = Arrays.asList(values()); + Collections.sort(listaOrdenada, new Comparator() { + @Override + public int compare(RelatorioMovimentacaoBilheteStatusEnum o1, RelatorioMovimentacaoBilheteStatusEnum o2) { + return o1.getDescricaoTela().compareToIgnoreCase(o2.getDescricaoTela()); + } + }); + + return listaOrdenada; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/enums/RelatorioVendaCartaoCashMonitorModeloEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/RelatorioVendaCartaoCashMonitorModeloEnum.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/RelatorioVendaCartaoCashMonitorModeloEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/RelatorioVendaCartaoCashMonitorModeloEnum.java index a2bd515be..c8511cfea 100644 --- a/src/com/rjconsultores/ventaboletos/enums/RelatorioVendaCartaoCashMonitorModeloEnum.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/RelatorioVendaCartaoCashMonitorModeloEnum.java @@ -1,21 +1,21 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum RelatorioVendaCartaoCashMonitorModeloEnum { - - COM_VALORES_TOTAIS_VENDAS("Com valores totais das vendas"), ABERTO_POR_PARCELAS("Aberto por parcelas"); - - private String descricao; - - private RelatorioVendaCartaoCashMonitorModeloEnum(String descricao) { - this.descricao = descricao; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return getDescricao(); - } +package com.rjconsultores.ventaboletos.enums; + +public enum RelatorioVendaCartaoCashMonitorModeloEnum { + + COM_VALORES_TOTAIS_VENDAS("Com valores totais das vendas"), ABERTO_POR_PARCELAS("Aberto por parcelas"); + + private String descricao; + + private RelatorioVendaCartaoCashMonitorModeloEnum(String descricao) { + this.descricao = descricao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/enums/SistemaEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SistemaEnum.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/SistemaEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/SistemaEnum.java index d6b87b99e..b0e9796ee 100644 --- a/src/com/rjconsultores/ventaboletos/enums/SistemaEnum.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SistemaEnum.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum SistemaEnum { - - VENDA_CLIENTE(1, "Venda Cliente"), - VENDA_SERVIDOR(2, "Venda Servidor"), - ADM(3, "Administração"); - - private Integer valor; - private String descricao; - - private SistemaEnum(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public Integer getValor() { - return this.valor; - } - - @Override - public String toString() { - return this.descricao; - } - - public static SistemaEnum getSistema(Integer tValor) { - for (SistemaEnum valor : SistemaEnum.values()) { - if (valor.getValor().equals(tValor)) { - return valor; - } - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum SistemaEnum { + + VENDA_CLIENTE(1, "Venda Cliente"), + VENDA_SERVIDOR(2, "Venda Servidor"), + ADM(3, "Administração"); + + private Integer valor; + private String descricao; + + private SistemaEnum(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public Integer getValor() { + return this.valor; + } + + @Override + public String toString() { + return this.descricao; + } + + public static SistemaEnum getSistema(Integer tValor) { + for (SistemaEnum valor : SistemaEnum.values()) { + if (valor.getValor().equals(tValor)) { + return valor; + } + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/SituacaoBoleto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoBoleto.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/SituacaoBoleto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoBoleto.java index 7950f42cf..68755dfee 100644 --- a/src/com/rjconsultores/ventaboletos/enums/SituacaoBoleto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoBoleto.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum SituacaoBoleto { - - TODAS(-1, "Todas"), ANULADO(31, "Anulado"), DEVOLVIDO(32, "Devolvido"), REMARCADO(23, "Remarcado"), TROCADO(10, "Trocado"), VENDIDO(1, "Vendido"); - - private String situacao; - private Integer codigo; - - private SituacaoBoleto(Integer codigo, String situacao) { - this.situacao = situacao; - this.codigo = codigo; - } - - public String getSituacao() { - return this.situacao; - } - - public Integer getCodigo() { - return codigo; - } - - @Override - public String toString() { - return this.situacao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum SituacaoBoleto { + + TODAS(-1, "Todas"), ANULADO(31, "Anulado"), DEVOLVIDO(32, "Devolvido"), REMARCADO(23, "Remarcado"), TROCADO(10, "Trocado"), VENDIDO(1, "Vendido"); + + private String situacao; + private Integer codigo; + + private SituacaoBoleto(Integer codigo, String situacao) { + this.situacao = situacao; + this.codigo = codigo; + } + + public String getSituacao() { + return this.situacao; + } + + public Integer getCodigo() { + return codigo; + } + + @Override + public String toString() { + return this.situacao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/SituacaoNotaCreditoVendaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoNotaCreditoVendaPacote.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/SituacaoNotaCreditoVendaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoNotaCreditoVendaPacote.java index 99464c9d7..6fee54be2 100644 --- a/src/com/rjconsultores/ventaboletos/enums/SituacaoNotaCreditoVendaPacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoNotaCreditoVendaPacote.java @@ -1,25 +1,25 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum SituacaoNotaCreditoVendaPacote { - - DISPONIVEL(0,"Disponível"), - UTILIZADA(1,"Utilizada"); - - private Integer value; - private String descricao; - - private SituacaoNotaCreditoVendaPacote(Integer value, String descricao) { - this.value = value; - this.descricao = descricao; - } - - public Integer getValue() { - return this.value; - } - - @Override - public String toString() { - return this.descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum SituacaoNotaCreditoVendaPacote { + + DISPONIVEL(0,"Disponível"), + UTILIZADA(1,"Utilizada"); + + private Integer value; + private String descricao; + + private SituacaoNotaCreditoVendaPacote(Integer value, String descricao) { + this.value = value; + this.descricao = descricao; + } + + public Integer getValue() { + return this.value; + } + + @Override + public String toString() { + return this.descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/SituacaoVendaPacote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoVendaPacote.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/SituacaoVendaPacote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoVendaPacote.java index 6a66b9066..653e09c72 100644 --- a/src/com/rjconsultores/ventaboletos/enums/SituacaoVendaPacote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoVendaPacote.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum SituacaoVendaPacote { - - PAGO(0,"Pago"), - RESERVA(1,"Reserva"), - CANCELADO(2,"Cancelado"); - - private Integer value; - private String descricao; - - private SituacaoVendaPacote(Integer value, String descricao) { - this.value = value; - this.descricao = descricao; - } - - @Override - public String toString() { - return this.descricao; - } - - public static SituacaoVendaPacote getSituacaoVendaPacote(Integer value) { - switch (value) { - case 0: - return PAGO; - case 1: - return RESERVA; - case 2: - return CANCELADO; - default: - return null; - } - } - - public Integer getShortValue() { - return value; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum SituacaoVendaPacote { + + PAGO(0,"Pago"), + RESERVA(1,"Reserva"), + CANCELADO(2,"Cancelado"); + + private Integer value; + private String descricao; + + private SituacaoVendaPacote(Integer value, String descricao) { + this.value = value; + this.descricao = descricao; + } + + @Override + public String toString() { + return this.descricao; + } + + public static SituacaoVendaPacote getSituacaoVendaPacote(Integer value) { + switch (value) { + case 0: + return PAGO; + case 1: + return RESERVA; + case 2: + return CANCELADO; + default: + return null; + } + } + + public Integer getShortValue() { + return value; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/SituacaoVoucher.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoVoucher.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/SituacaoVoucher.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/SituacaoVoucher.java diff --git a/src/com/rjconsultores/ventaboletos/enums/StatusAutorizacaoRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusAutorizacaoRuta.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/StatusAutorizacaoRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusAutorizacaoRuta.java index 1ee892033..d980432d4 100644 --- a/src/com/rjconsultores/ventaboletos/enums/StatusAutorizacaoRuta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusAutorizacaoRuta.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum StatusAutorizacaoRuta { - EM_ANALISE(0, "EM ANALISE"), - LIBERADO(1, "LIBERADO"), - BLOQUEADO(2, "BLOQUEADO"); - - private Integer status; - private String descricao; - - private StatusAutorizacaoRuta(Integer status, String descricao) { - this.descricao = descricao; - this.status = status; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public static String buscarStatus(Integer id) { - for (StatusAutorizacaoRuta status : StatusAutorizacaoRuta.values()) { - if (status.getStatus() == id) { - return status.getDescricao(); - } - } - return null; - } - - public static StatusAutorizacaoRuta buscarPorStatus(Integer id) { - for (StatusAutorizacaoRuta status : StatusAutorizacaoRuta.values()) { - if (status.getStatus() == id) { - return status; - } - } - return null; - } - - @Override - public String toString() { - return descricao; - } -} +package com.rjconsultores.ventaboletos.enums; + +public enum StatusAutorizacaoRuta { + EM_ANALISE(0, "EM ANALISE"), + LIBERADO(1, "LIBERADO"), + BLOQUEADO(2, "BLOQUEADO"); + + private Integer status; + private String descricao; + + private StatusAutorizacaoRuta(Integer status, String descricao) { + this.descricao = descricao; + this.status = status; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public static String buscarStatus(Integer id) { + for (StatusAutorizacaoRuta status : StatusAutorizacaoRuta.values()) { + if (status.getStatus() == id) { + return status.getDescricao(); + } + } + return null; + } + + public static StatusAutorizacaoRuta buscarPorStatus(Integer id) { + for (StatusAutorizacaoRuta status : StatusAutorizacaoRuta.values()) { + if (status.getStatus() == id) { + return status; + } + } + return null; + } + + @Override + public String toString() { + return descricao; + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/StatusFlexBus.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusFlexBus.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/StatusFlexBus.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusFlexBus.java index 06e79cbed..d3bb2af74 100644 --- a/src/com/rjconsultores/ventaboletos/enums/StatusFlexBus.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusFlexBus.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.enums; - -/** - * @author Valdir Cordeiro - * - */ -public enum StatusFlexBus { - - EM_RESERVA(0, "EM RESERVA"), - CONFIRMADO_AUTOMATICAMENTE(1, "CONFIRMADO AUTOMATICAMENTE"), - CONFIRMADO_MANUALMENTE(2, "CONFIRMADO MANUALMENTE"), - CANCELADO_AUTOMATICAMENTE( 3, "CANCELADO AUTOMATICAMENTE"), - CANCELADO_MANUALMENTE(4, "CANCELADO MANUALMENTE"); - - private Integer status; - private String descricao; - - private StatusFlexBus(Integer status, String descricao) { - this.descricao = descricao; - this.status = status; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public static String buscarStatus(Integer id) { - for (StatusFlexBus status : StatusFlexBus.values()) { - if (status.getStatus() == id) { - return status.getDescricao(); - } - } - return null; - } - - public static StatusFlexBus buscarPorStatus(Integer id) { - for (StatusFlexBus status : StatusFlexBus.values()) { - if (status.getStatus() == id) { - return status; - } - } - return null; - } - - @Override - public String toString() { - return descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +/** + * @author Valdir Cordeiro + * + */ +public enum StatusFlexBus { + + EM_RESERVA(0, "EM RESERVA"), + CONFIRMADO_AUTOMATICAMENTE(1, "CONFIRMADO AUTOMATICAMENTE"), + CONFIRMADO_MANUALMENTE(2, "CONFIRMADO MANUALMENTE"), + CANCELADO_AUTOMATICAMENTE( 3, "CANCELADO AUTOMATICAMENTE"), + CANCELADO_MANUALMENTE(4, "CANCELADO MANUALMENTE"); + + private Integer status; + private String descricao; + + private StatusFlexBus(Integer status, String descricao) { + this.descricao = descricao; + this.status = status; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public static String buscarStatus(Integer id) { + for (StatusFlexBus status : StatusFlexBus.values()) { + if (status.getStatus() == id) { + return status.getDescricao(); + } + } + return null; + } + + public static StatusFlexBus buscarPorStatus(Integer id) { + for (StatusFlexBus status : StatusFlexBus.values()) { + if (status.getStatus() == id) { + return status; + } + } + return null; + } + + @Override + public String toString() { + return descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/StatusIntegracaoSap.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusIntegracaoSap.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/StatusIntegracaoSap.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusIntegracaoSap.java index 65c35647b..e45dbc58d 100644 --- a/src/com/rjconsultores/ventaboletos/enums/StatusIntegracaoSap.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusIntegracaoSap.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.enums; - -import java.util.Arrays; -import java.util.List; - -public enum StatusIntegracaoSap { - INTEGRADO("Integrado"), - NAO_ENVIADO("Nao Enviado"), - PENDENTE("Pendente"), - RECUSADO("Recusado SAP"); - - private String descricao; - - private StatusIntegracaoSap(String descricao) { - this.descricao = descricao; - } - - @Override - public String toString() { - return descricao; - } - - public static List list() { - return Arrays.asList(values()); - } - - public static StatusIntegracaoSap getStatusIntegracaoSap(Integer tValor) { - for (StatusIntegracaoSap valor : StatusIntegracaoSap.values()) { - if (tValor.equals(valor.ordinal())) { - return valor; - } - } - return null; - } -} +package com.rjconsultores.ventaboletos.enums; + +import java.util.Arrays; +import java.util.List; + +public enum StatusIntegracaoSap { + INTEGRADO("Integrado"), + NAO_ENVIADO("Nao Enviado"), + PENDENTE("Pendente"), + RECUSADO("Recusado SAP"); + + private String descricao; + + private StatusIntegracaoSap(String descricao) { + this.descricao = descricao; + } + + @Override + public String toString() { + return descricao; + } + + public static List list() { + return Arrays.asList(values()); + } + + public static StatusIntegracaoSap getStatusIntegracaoSap(Integer tValor) { + for (StatusIntegracaoSap valor : StatusIntegracaoSap.values()) { + if (tValor.equals(valor.ordinal())) { + return valor; + } + } + return null; + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/StatusRecargaEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusRecargaEnum.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/StatusRecargaEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/StatusRecargaEnum.java diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoAntifraude.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoAntifraude.java similarity index 92% rename from src/com/rjconsultores/ventaboletos/enums/TipoAntifraude.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoAntifraude.java index 70d0dc6a4..10593096c 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoAntifraude.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoAntifraude.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoAntifraude { - - KONDUTO; - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoAntifraude { + + KONDUTO; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoBloqueioDispositivoEmbarcadaEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoBloqueioDispositivoEmbarcadaEnum.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/TipoBloqueioDispositivoEmbarcadaEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoBloqueioDispositivoEmbarcadaEnum.java index 2c5c7c9d7..ec7ebec05 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoBloqueioDispositivoEmbarcadaEnum.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoBloqueioDispositivoEmbarcadaEnum.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoBloqueioDispositivoEmbarcadaEnum { - - DISPOSITIVO_BLOQUEADO(1, "BLOQUEADO"), DISPOSITIVO_MANUTENCAO(2, "MANUTENÇÃO"), DISPOSITIVO_BAIXADO(3, "BAIXADO"); - - private Integer valor; - private String descricao; - - private TipoBloqueioDispositivoEmbarcadaEnum(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public Integer getValor() { - return valor; - } - - public void setValor(Integer valor) { - this.valor = valor; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public static TipoBloqueioDispositivoEmbarcadaEnum getTipoDispositivoEmbarcada(Integer valor) { - if (valor != null) { - for (TipoBloqueioDispositivoEmbarcadaEnum tde : TipoBloqueioDispositivoEmbarcadaEnum.values()) { - if (tde.getValor().equals(valor)) { - return tde; - } - } - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoBloqueioDispositivoEmbarcadaEnum { + + DISPOSITIVO_BLOQUEADO(1, "BLOQUEADO"), DISPOSITIVO_MANUTENCAO(2, "MANUTENÇÃO"), DISPOSITIVO_BAIXADO(3, "BAIXADO"); + + private Integer valor; + private String descricao; + + private TipoBloqueioDispositivoEmbarcadaEnum(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public Integer getValor() { + return valor; + } + + public void setValor(Integer valor) { + this.valor = valor; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public static TipoBloqueioDispositivoEmbarcadaEnum getTipoDispositivoEmbarcada(Integer valor) { + if (valor != null) { + for (TipoBloqueioDispositivoEmbarcadaEnum tde : TipoBloqueioDispositivoEmbarcadaEnum.values()) { + if (tde.getValor().equals(valor)) { + return tde; + } + } + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoCarteiraDigital.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoCarteiraDigital.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/TipoCarteiraDigital.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoCarteiraDigital.java index 7bf1e27c7..752dfa383 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoCarteiraDigital.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoCarteiraDigital.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.enums; - -import org.zkoss.util.resource.Labels; - -public enum TipoCarteiraDigital { - - TROCO_SIMPLES(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalTrocoSimples.label")), - TEF(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalTef.label")), - TPI(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalTpi.label")), - CIELO_LINK(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalCielo.label")), - IZIPAY(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalIziPay.label")); - - private String descricao; - - private TipoCarteiraDigital(String descricao) { - this.descricao = descricao; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return getDescricao(); - } - -} +package com.rjconsultores.ventaboletos.enums; + +import org.zkoss.util.resource.Labels; + +public enum TipoCarteiraDigital { + + TROCO_SIMPLES(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalTrocoSimples.label")), + TEF(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalTef.label")), + TPI(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalTpi.label")), + CIELO_LINK(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalCielo.label")), + IZIPAY(Labels.getLabel("editarFormaPagoController.lblCateiraDigitalIziPay.label")); + + private String descricao; + + private TipoCarteiraDigital(String descricao) { + this.descricao = descricao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoClasseServicoBPe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoClasseServicoBPe.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/enums/TipoClasseServicoBPe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoClasseServicoBPe.java index 0a29f8a69..0f9e27a83 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoClasseServicoBPe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoClasseServicoBPe.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.enums; - -import java.util.Arrays; -import java.util.List; - -import org.zkoss.util.resource.Labels; - -public enum TipoClasseServicoBPe { - - CONVENCIONAL_COM_SANITARIO(1, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.1")), - CONVENCIONAL_SEMM_SANITARIO(2, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.2")), - SEMILEITO(3, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.3")), - LEITO_COM_AR_CONDICIONADO(4, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.4")), - LEITO_SEM_AR_CONDICIONADO(5, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.5")), - EXECUTIVO(6, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.6")), - SEMIURBANO(7, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.7")), - LONGITUDINAL(8, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.8")), - TRAVESSIA(9, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.9")), - CAMA(10, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.10")), - MICRO_ONIBUS(11, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.11")); - - private Integer codigo; - private String descricao; - - private TipoClasseServicoBPe(Integer codigo, String descricao) { - this.codigo = codigo; - this.descricao = descricao; - } - - public Integer getCodigo() { - return codigo; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return getDescricao(); - } - - public static List getList() { - return Arrays.asList(TipoClasseServicoBPe.values()); - } - - public static TipoClasseServicoBPe getTipo(Integer codigo) { - for (TipoClasseServicoBPe tipoClasseServicoBPe : TipoClasseServicoBPe.values()) { - if(tipoClasseServicoBPe.getCodigo().equals(codigo)) { - return tipoClasseServicoBPe; - } - } - return TipoClasseServicoBPe.CONVENCIONAL_COM_SANITARIO; - } - -} +package com.rjconsultores.ventaboletos.enums; + +import java.util.Arrays; +import java.util.List; + +import org.zkoss.util.resource.Labels; + +public enum TipoClasseServicoBPe { + + CONVENCIONAL_COM_SANITARIO(1, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.1")), + CONVENCIONAL_SEMM_SANITARIO(2, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.2")), + SEMILEITO(3, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.3")), + LEITO_COM_AR_CONDICIONADO(4, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.4")), + LEITO_SEM_AR_CONDICIONADO(5, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.5")), + EXECUTIVO(6, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.6")), + SEMIURBANO(7, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.7")), + LONGITUDINAL(8, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.8")), + TRAVESSIA(9, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.9")), + CAMA(10, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.10")), + MICRO_ONIBUS(11, Labels.getLabel("editarClaseServicioController.tipoServicoBPe.11")); + + private Integer codigo; + private String descricao; + + private TipoClasseServicoBPe(Integer codigo, String descricao) { + this.codigo = codigo; + this.descricao = descricao; + } + + public Integer getCodigo() { + return codigo; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } + + public static List getList() { + return Arrays.asList(TipoClasseServicoBPe.values()); + } + + public static TipoClasseServicoBPe getTipo(Integer codigo) { + for (TipoClasseServicoBPe tipoClasseServicoBPe : TipoClasseServicoBPe.values()) { + if(tipoClasseServicoBPe.getCodigo().equals(codigo)) { + return tipoClasseServicoBPe; + } + } + return TipoClasseServicoBPe.CONVENCIONAL_COM_SANITARIO; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoCstGratuidade.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoCstGratuidade.java similarity index 92% rename from src/com/rjconsultores/ventaboletos/enums/TipoCstGratuidade.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoCstGratuidade.java index e1c77493b..b531ac447 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoCstGratuidade.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoCstGratuidade.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoCstGratuidade { - - CST00, - CST40, - CST41; - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoCstGratuidade { + + CST00, + CST40, + CST41; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoDescontoBPe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoDescontoBPe.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/TipoDescontoBPe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoDescontoBPe.java index 5b6b2c5dc..d54380ba7 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoDescontoBPe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoDescontoBPe.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoDescontoBPe { - - TARIFA_PROMOCIONAL("01","Tarifa promocional"), - IDOSO("02", "Idoso"), - CRIANCA("03", "Criança"), - DEFICIENTE("04", "Deficiente"), - ESTUDANTE("05", "Estudante"), - ANIMAL_DOMESTICO("06", "Animal Doméstico"), - ACORDO_COLETIVO("07", "Acordo Coletivo"), - PROFISSIONAL_EM_DESLOCAMENTO("08", "Profissional em Deslocamento"), - PROFISSIONAL_DA_EMPRESA("09", "Profissional da Empresa"), - JOVEM("10", "Jovem"), - OUTROS("99", "Outros"); - - private String valor; - private String descricao; - - private TipoDescontoBPe(String valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public String getValor() { - return valor; - } - public String getDescricao() { - return descricao; - } - - public static TipoDescontoBPe geTipoDesconto(String valor) { - - for (TipoDescontoBPe desconto : TipoDescontoBPe.values()) { - if (desconto.getValor().equals(valor)) { - return desconto; - } - } - - return OUTROS; - } - - @Override - public String toString() { - return this.descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoDescontoBPe { + + TARIFA_PROMOCIONAL("01","Tarifa promocional"), + IDOSO("02", "Idoso"), + CRIANCA("03", "Criança"), + DEFICIENTE("04", "Deficiente"), + ESTUDANTE("05", "Estudante"), + ANIMAL_DOMESTICO("06", "Animal Doméstico"), + ACORDO_COLETIVO("07", "Acordo Coletivo"), + PROFISSIONAL_EM_DESLOCAMENTO("08", "Profissional em Deslocamento"), + PROFISSIONAL_DA_EMPRESA("09", "Profissional da Empresa"), + JOVEM("10", "Jovem"), + OUTROS("99", "Outros"); + + private String valor; + private String descricao; + + private TipoDescontoBPe(String valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public String getValor() { + return valor; + } + public String getDescricao() { + return descricao; + } + + public static TipoDescontoBPe geTipoDesconto(String valor) { + + for (TipoDescontoBPe desconto : TipoDescontoBPe.values()) { + if (desconto.getValor().equals(valor)) { + return desconto; + } + } + + return OUTROS; + } + + @Override + public String toString() { + return this.descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoDescontoMonitrip.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoDescontoMonitrip.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/TipoDescontoMonitrip.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoDescontoMonitrip.java index 8947fd21c..228a173c7 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoDescontoMonitrip.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoDescontoMonitrip.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoDescontoMonitrip { - - NORMAL(1,"Tarifa Normal - sem desconto"), - TARIFA_PROMOCIONAL(2, "Tarifa Promocional"), - IDOSO_100(5, "Bilhete de Viagem do Idoso 100%"), - IDOSO_50(6, "Bilhete de Viagem do Idoso 50%"), - AUT_VIAGEM_LIVRE(7, "Autorização de Viagem - Passe Livre"), - AUDITORES_AGENTES(8, "Passe Livre Auditores e Agentes do Trabalho"), - GRATUIDADE_CRIANCA(9, "Gratuidade de Criança"), - JOVEM_BAIXA_RENDA_100(10, "Gratuidade Jovem de Baixa Renda 100%"), - JOVEM_BAIXA_RENDA_50(11, "Gratuidade Jovem de Baixa Renda 50%"), - AUT_VIAGEM_ACOMP(12, "Autorização de Viagem - Passe Livre Acompanhante"); - - private Integer valor; - private String descricao; - - private TipoDescontoMonitrip(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public Integer getValor() { - return valor; - } - public String getDescricao() { - return descricao; - } - - public static TipoDescontoMonitrip geTipoDescontoMonitrip(Integer valor) { - if(NORMAL.getValor().equals(valor)) { - return NORMAL; - } else if(TARIFA_PROMOCIONAL.getValor().equals(valor)) { - return TARIFA_PROMOCIONAL; - } else if(IDOSO_100.getValor().equals(valor)) { - return IDOSO_100; - } else if(IDOSO_50.getValor().equals(valor)) { - return IDOSO_50; - } else if(AUT_VIAGEM_LIVRE.getValor().equals(valor)) { - return AUT_VIAGEM_LIVRE; - } else if(AUDITORES_AGENTES.getValor().equals(valor)) { - return AUDITORES_AGENTES; - } else if(GRATUIDADE_CRIANCA.getValor().equals(valor)) { - return GRATUIDADE_CRIANCA; - } else if(JOVEM_BAIXA_RENDA_100.getValor().equals(valor)) { - return JOVEM_BAIXA_RENDA_100; - } else if(JOVEM_BAIXA_RENDA_50.getValor().equals(valor)) { - return JOVEM_BAIXA_RENDA_50; - } else if(AUT_VIAGEM_ACOMP.getValor().equals(valor)) { - return AUT_VIAGEM_ACOMP; - } - - return NORMAL; - } - - @Override - public String toString() { - return this.descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoDescontoMonitrip { + + NORMAL(1,"Tarifa Normal - sem desconto"), + TARIFA_PROMOCIONAL(2, "Tarifa Promocional"), + IDOSO_100(5, "Bilhete de Viagem do Idoso 100%"), + IDOSO_50(6, "Bilhete de Viagem do Idoso 50%"), + AUT_VIAGEM_LIVRE(7, "Autorização de Viagem - Passe Livre"), + AUDITORES_AGENTES(8, "Passe Livre Auditores e Agentes do Trabalho"), + GRATUIDADE_CRIANCA(9, "Gratuidade de Criança"), + JOVEM_BAIXA_RENDA_100(10, "Gratuidade Jovem de Baixa Renda 100%"), + JOVEM_BAIXA_RENDA_50(11, "Gratuidade Jovem de Baixa Renda 50%"), + AUT_VIAGEM_ACOMP(12, "Autorização de Viagem - Passe Livre Acompanhante"); + + private Integer valor; + private String descricao; + + private TipoDescontoMonitrip(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public Integer getValor() { + return valor; + } + public String getDescricao() { + return descricao; + } + + public static TipoDescontoMonitrip geTipoDescontoMonitrip(Integer valor) { + if(NORMAL.getValor().equals(valor)) { + return NORMAL; + } else if(TARIFA_PROMOCIONAL.getValor().equals(valor)) { + return TARIFA_PROMOCIONAL; + } else if(IDOSO_100.getValor().equals(valor)) { + return IDOSO_100; + } else if(IDOSO_50.getValor().equals(valor)) { + return IDOSO_50; + } else if(AUT_VIAGEM_LIVRE.getValor().equals(valor)) { + return AUT_VIAGEM_LIVRE; + } else if(AUDITORES_AGENTES.getValor().equals(valor)) { + return AUDITORES_AGENTES; + } else if(GRATUIDADE_CRIANCA.getValor().equals(valor)) { + return GRATUIDADE_CRIANCA; + } else if(JOVEM_BAIXA_RENDA_100.getValor().equals(valor)) { + return JOVEM_BAIXA_RENDA_100; + } else if(JOVEM_BAIXA_RENDA_50.getValor().equals(valor)) { + return JOVEM_BAIXA_RENDA_50; + } else if(AUT_VIAGEM_ACOMP.getValor().equals(valor)) { + return AUT_VIAGEM_ACOMP; + } + + return NORMAL; + } + + @Override + public String toString() { + return this.descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoEmail.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoEmail.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/TipoEmail.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoEmail.java index 9ebd2c728..7b1fa280d 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoEmail.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoEmail.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoEmail { - - CALL_CENTER(1, "Call Center"), - ECOMMERCE(2, "E-Commerce"), - ; - - private Integer id; - private String descricao; - - private TipoEmail(Integer id, String descricao) { - this.descricao = descricao; - this.id = id; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public static TipoEmail buscarPorId(Integer id) { - for (TipoEmail ids : TipoEmail.values()) { - if (ids.getId() == id) { - return ids; - } - } - return null; - } - - @Override - public String toString() { - return descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoEmail { + + CALL_CENTER(1, "Call Center"), + ECOMMERCE(2, "E-Commerce"), + ; + + private Integer id; + private String descricao; + + private TipoEmail(Integer id, String descricao) { + this.descricao = descricao; + this.id = id; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public static TipoEmail buscarPorId(Integer id) { + for (TipoEmail ids : TipoEmail.values()) { + if (ids.getId() == id) { + return ids; + } + } + return null; + } + + @Override + public String toString() { + return descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoEnvioRest.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoEnvioRest.java similarity index 92% rename from src/com/rjconsultores/ventaboletos/enums/TipoEnvioRest.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoEnvioRest.java index 86ac66c4e..da73eb711 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoEnvioRest.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoEnvioRest.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoEnvioRest { - GET, - POST, - PUT, - DELETE, - ; -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoEnvioRest { + GET, + POST, + PUT, + DELETE, + ; +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java index bd3e6e419..835a7901d 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.enums; - -import org.zkoss.util.resource.Labels; - -public enum TipoFormapago { - - DINHEIRO(0,Labels.getLabel("editarFormaPagoController.lblDinheiro.label")), - DEBITO(1,Labels.getLabel("editarFormaPagoController.lblDebito.label")), - CREDITO(2,Labels.getLabel("editarFormaPagoController.lblCredito.label")), - NOTA_CREDITO(3,Labels.getLabel("editarFormaPagoController.lblNotaCredito.label")), - TROCA_PASSAGEM(4,Labels.getLabel("editarFormaPagoController.lblTrocaPassagem.label")), - IMPRESSAO_PASSAGEM(5,Labels.getLabel("editarFormaPagoController.lblImpressaoPassagem.label")), - ORDEM_SERVICO(6,Labels.getLabel("editarFormaPagoController.lblOrdemServico.label")), - BOLETO_ABERTO(7,Labels.getLabel("editarFormaPagoController.lblBoletoAberto.label")), - PACOTE(8,Labels.getLabel("editarFormaPagoController.lblPacote.label")), - RESERVA(9,Labels.getLabel("editarFormaPagoController.lblReserva.label")), - CHEQUE(10,Labels.getLabel("editarFormaPagoController.lblCheque.label")), - DEPOSITO(11,Labels.getLabel("editarFormaPagoController.lblDeposito.label")), - CARTEIRA_DIGITAL(12,Labels.getLabel("editarFormaPagoController.lblCarteiraDigital.label")), - SMART_CARD(13,Labels.getLabel("editarFormaPagoController.lblSmartCard.label")), - LOGPAY(14,Labels.getLabel("editarFormaPagoController.lblLogpay.label")), - TPI(15, Labels.getLabel("editarFormaPagoController.lblTPI.label")), - MOBIPIX(16,Labels.getLabel("editarFormaPagoController.lblMobiPix.label")), - ADYEN(17,Labels.getLabel("editarFormaPagoController.lblAdyen.label")), - MERCADO_PAGO(18,Labels.getLabel("editarFormaPagoController.lblMercadoPago.label")), - EMBARQUE_JA(19,Labels.getLabel("editarFormaPagoController.lblEmbarqueJa.label")), - NEQUI(20,Labels.getLabel("editarFormaPagoController.lblNequi.label")), - BONO(21,Labels.getLabel("editarFormaPagoController.lblBono.label")) - ; - - private Integer valor; - private String descricao; - - private TipoFormapago(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return getDescricao(); - } - - public Integer getValor() { - return valor; - } - - public static TipoFormapago getTipoFormapagoByValor(Integer valor) { - - for (TipoFormapago tipoFormapago : TipoFormapago.values()) { - if (tipoFormapago.getValor().equals(valor)) { - return tipoFormapago; - } - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +import org.zkoss.util.resource.Labels; + +public enum TipoFormapago { + + DINHEIRO(0,Labels.getLabel("editarFormaPagoController.lblDinheiro.label")), + DEBITO(1,Labels.getLabel("editarFormaPagoController.lblDebito.label")), + CREDITO(2,Labels.getLabel("editarFormaPagoController.lblCredito.label")), + NOTA_CREDITO(3,Labels.getLabel("editarFormaPagoController.lblNotaCredito.label")), + TROCA_PASSAGEM(4,Labels.getLabel("editarFormaPagoController.lblTrocaPassagem.label")), + IMPRESSAO_PASSAGEM(5,Labels.getLabel("editarFormaPagoController.lblImpressaoPassagem.label")), + ORDEM_SERVICO(6,Labels.getLabel("editarFormaPagoController.lblOrdemServico.label")), + BOLETO_ABERTO(7,Labels.getLabel("editarFormaPagoController.lblBoletoAberto.label")), + PACOTE(8,Labels.getLabel("editarFormaPagoController.lblPacote.label")), + RESERVA(9,Labels.getLabel("editarFormaPagoController.lblReserva.label")), + CHEQUE(10,Labels.getLabel("editarFormaPagoController.lblCheque.label")), + DEPOSITO(11,Labels.getLabel("editarFormaPagoController.lblDeposito.label")), + CARTEIRA_DIGITAL(12,Labels.getLabel("editarFormaPagoController.lblCarteiraDigital.label")), + SMART_CARD(13,Labels.getLabel("editarFormaPagoController.lblSmartCard.label")), + LOGPAY(14,Labels.getLabel("editarFormaPagoController.lblLogpay.label")), + TPI(15, Labels.getLabel("editarFormaPagoController.lblTPI.label")), + MOBIPIX(16,Labels.getLabel("editarFormaPagoController.lblMobiPix.label")), + ADYEN(17,Labels.getLabel("editarFormaPagoController.lblAdyen.label")), + MERCADO_PAGO(18,Labels.getLabel("editarFormaPagoController.lblMercadoPago.label")), + EMBARQUE_JA(19,Labels.getLabel("editarFormaPagoController.lblEmbarqueJa.label")), + NEQUI(20,Labels.getLabel("editarFormaPagoController.lblNequi.label")), + BONO(21,Labels.getLabel("editarFormaPagoController.lblBono.label")) + ; + + private Integer valor; + private String descricao; + + private TipoFormapago(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } + + public Integer getValor() { + return valor; + } + + public static TipoFormapago getTipoFormapagoByValor(Integer valor) { + + for (TipoFormapago tipoFormapago : TipoFormapago.values()) { + if (tipoFormapago.getValor().equals(valor)) { + return tipoFormapago; + } + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoIdentificacionDoc.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoIdentificacionDoc.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/TipoIdentificacionDoc.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoIdentificacionDoc.java index dc639e54d..7900b82f8 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoIdentificacionDoc.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoIdentificacionDoc.java @@ -1,348 +1,348 @@ -package com.rjconsultores.ventaboletos.enums; - -import org.apache.commons.lang.StringUtils; -import org.brazilutils.br.cpfcnpj.Cnpj; -import org.brazilutils.br.cpfcnpj.Cpf; -import org.brazilutils.validation.ValidationException; - -/** - **Criar Enumns com quantidade máxima de 10 caracteres, pois existe uma restrição com a Globus (Praxio) - ***/ - -public enum TipoIdentificacionDoc { - RG(1), - CPF(2), - CI(12), - PASPT(13), - RUT(14), - DOCX(22), - CNPJ(15), - CN(23), - RNE(24), - DOC_IDOSO(25), - DNI(26), - RE_PM(27), - D_FISICO(28), - J_CARENTE(29), - GRATUIDADE(30), - NIS(31), - PASSELIVRE(32), - ID_JOVEM(33), - TODOS(0); - - private Integer id; - - private TipoIdentificacionDoc(Integer id) { - this.id = id; - } - - public Integer getId() { - return this.id; - } - - public static TipoIdentificacionDoc getById(Byte id) { - if (id == null) { - return null; - } - TipoIdentificacionDoc tmp = null; - switch (id.intValue()) { - case 1: - tmp = TipoIdentificacionDoc.RG; - break; - case 2: - tmp = TipoIdentificacionDoc.CPF; - break; - case 12: - tmp = TipoIdentificacionDoc.CI; - break; - case 13: - tmp = TipoIdentificacionDoc.PASPT; - break; - case 14: - tmp = TipoIdentificacionDoc.RUT; - break; - case 22: - tmp = TipoIdentificacionDoc.DOCX; - break; - case 15: - tmp = TipoIdentificacionDoc.CNPJ; - break; - case 23: - tmp = TipoIdentificacionDoc.CN; - break; - case 24: - tmp = TipoIdentificacionDoc.RNE; - break; - case 25: - tmp = TipoIdentificacionDoc.DOC_IDOSO; - break; - case 26: - tmp = TipoIdentificacionDoc.DNI; - break; - case 27: - tmp = TipoIdentificacionDoc.RE_PM; - break; - case 28: - tmp = TipoIdentificacionDoc.D_FISICO; - break; - case 29: - tmp = TipoIdentificacionDoc.J_CARENTE; - break; - case 31: - tmp = TipoIdentificacionDoc.NIS; - break; - case 32: - tmp = TipoIdentificacionDoc.PASSELIVRE; - break; - case 33: - tmp = TipoIdentificacionDoc.ID_JOVEM; - break; - - default: - break; - } - return tmp; - } - - public static TipoIdentificacionDoc[] getTodos() { - return new TipoIdentificacionDoc[]{TipoIdentificacionDoc.RG, - TipoIdentificacionDoc.CPF, - TipoIdentificacionDoc.CI, - TipoIdentificacionDoc.PASPT, - TipoIdentificacionDoc.RUT, - TipoIdentificacionDoc.DOCX, - TipoIdentificacionDoc.CNPJ, - TipoIdentificacionDoc.CN, - TipoIdentificacionDoc.RNE, - TipoIdentificacionDoc.DOC_IDOSO, - TipoIdentificacionDoc.DNI, - TipoIdentificacionDoc.RE_PM, - TipoIdentificacionDoc.D_FISICO, - TipoIdentificacionDoc.J_CARENTE, - TipoIdentificacionDoc.GRATUIDADE, - TipoIdentificacionDoc.NIS, - TipoIdentificacionDoc.PASSELIVRE, - TipoIdentificacionDoc.ID_JOVEM - }; - } - - - - public static String getDescricao(Byte id) { - if (id == null) { - return null; - } - String descricao = ""; - - switch (id) { - case 1: case 10: - descricao= "RG"; - break; - case 2: case 11: - descricao= "CPF"; - break; - case 12: - descricao= "CI"; - break; - case 13: - descricao= "PASPT"; - break; - case 14: - descricao= "RUT"; - break; - case 22: - descricao= "DOCX"; - break; - case 15: - descricao= "CNPJ"; - break; - case 23: - descricao= "CN"; - break; - case 24: - descricao= "RNE"; - break; - case 25: - descricao= "DOC_IDOSO"; - break; - case 26: - descricao= "DNI"; - break; - case 27: - descricao= "RE_PM"; - break; - case 28: - descricao= "D_FISICO"; - break; - case 29: - descricao= "J_CARENTE"; - break; - case 30: - descricao= "GRATUIDADE"; - break; - case 31: - descricao= "NIS"; - break; - case 32: - descricao= "PASSELIVRE"; - break; - case 33: - descricao= "ID_JOVEM"; - break; - default: - descricao= ""; - break; - } - return descricao.length()> 10 ? descricao.substring(0,10) : descricao; - } - - public static TipoIdentificacionDoc[] getTipoDocExcluindoCPF() { - return new TipoIdentificacionDoc[]{TipoIdentificacionDoc.RG, - TipoIdentificacionDoc.CI, - TipoIdentificacionDoc.PASPT, - TipoIdentificacionDoc.RUT, - TipoIdentificacionDoc.DOCX, - TipoIdentificacionDoc.CNPJ, - TipoIdentificacionDoc.CN, - TipoIdentificacionDoc.RNE, - TipoIdentificacionDoc.DOC_IDOSO, - TipoIdentificacionDoc.DNI, - TipoIdentificacionDoc.RE_PM, - TipoIdentificacionDoc.NIS, - TipoIdentificacionDoc.PASSELIVRE, - TipoIdentificacionDoc.ID_JOVEM, - TipoIdentificacionDoc.D_FISICO, - TipoIdentificacionDoc.J_CARENTE - }; - } - - public static TipoIdentificacionDoc getTipo(String descTipoDoc) { - if(descTipoDoc != null) { - if(descTipoDoc.equals("RG")) { - return TipoIdentificacionDoc.RG; - } else if(descTipoDoc.equals("CPF")) { - return TipoIdentificacionDoc.CPF; - } else if(descTipoDoc.equals("CI")) { - return TipoIdentificacionDoc.RG; - } else if(descTipoDoc.equals("PASPT")) { - return TipoIdentificacionDoc.PASPT; - } else if(descTipoDoc.equals("RUT")) { - return TipoIdentificacionDoc.RUT; - } else if(descTipoDoc.equals("DOCX")) { - return TipoIdentificacionDoc.DOCX; - } else if(descTipoDoc.equals("CNPJ")) { - return TipoIdentificacionDoc.CNPJ; - } else if(descTipoDoc.equals("CN")) { - return TipoIdentificacionDoc.CN; - } else if(descTipoDoc.equals("RNE")) { - return TipoIdentificacionDoc.RNE; - } else if(descTipoDoc.equals("DOC_IDOSO")) { - return TipoIdentificacionDoc.DOC_IDOSO; - } else if(descTipoDoc.equals("DNI")) { - return TipoIdentificacionDoc.DNI; - }else if(descTipoDoc.equals("RE_PM")) { - return TipoIdentificacionDoc.RE_PM; - }else if(descTipoDoc.equals("NIS")) { - return TipoIdentificacionDoc.NIS; - } - // mantendo a retrocompatibilidade - else if(descTipoDoc.equals("PASSE_LIVRE") || descTipoDoc.equals("PASSELIVRE")) { - return TipoIdentificacionDoc.PASSELIVRE; - }else if(descTipoDoc.equals("ID_JOVEM")) { - return TipoIdentificacionDoc.ID_JOVEM; - }else if(descTipoDoc.equals("D_FISICO")) { - return TipoIdentificacionDoc.D_FISICO; - }else if(descTipoDoc.equals("J_CARENTE")) { - return TipoIdentificacionDoc.J_CARENTE; - }else { - return null; - } - } - - return null; - } - - public static boolean isExisteTipoIdentificacionDoc(String descTipoDoc) { - return getTipo(descTipoDoc) != null; - } - - public static boolean isRGBPeValido(String value) { - return value == null ? false : value.trim().matches("\\d.*\\d.*|[a-zA-Z]+\\d.*\\d.*"); - } - - public static boolean isCPFValido(String doc) { - try { - String tmp = StringUtils.isBlank(doc) ? "" : doc; - Cpf cpf = new Cpf(tmp.trim()); - - return cpf.isValid(); - } catch (ValidationException e1) { - return false; - } - } - - public static boolean isCNPJValido(String doc) { - try { - String tmp = StringUtils.isBlank(doc) ? "" : doc; - Cnpj cnpj = new Cnpj(tmp.trim()); - - return cnpj.isValid(); - } catch (ValidationException e1) { - return false; - } - } - - public static boolean isRUTValido(String rut) { - boolean validacion = false; - try { - rut = rut.toUpperCase(); - rut = rut.replace(".", ""); - rut = rut.replace("-", ""); - int rutAux = Integer.parseInt(rut.substring(0, rut.length() - 1)); - - char dv = rut.charAt(rut.length() - 1); - - int m = 0, s = 1; - for (; rutAux != 0; rutAux /= 10) { - s = (s + rutAux % 10 * (9 - m++ % 6)) % 11; - } - if (dv == (char) (s != 0 ? s + 47 : 75)) { - validacion = true; - } - - } catch (Exception e) { - } - return validacion; - } - - public static boolean isPASPTValido(String numDoc) { - String paspt = numDoc.replaceAll("[^\\d]", ""); - - //O passaporte não aceita menos de 4 numeros ou somente letras - if (!StringUtils.isBlank(paspt) && paspt.length() < 4) { - return false; - } else if (StringUtils.isBlank(paspt) && !StringUtils.isBlank(numDoc)) { - return false; - } - - return true; - } - - public static TipoIdentificacionDoc[] buscarComboSegundoTipoDocumentoRemovendoDocumentoSelecionadoTipoIdentificacionDoc(TipoIdentificacionDoc tipoIdentificacionDoc) { - - if (tipoIdentificacionDoc == null) { - return null; - } - - TipoIdentificacionDoc[] tipoIdentificacionDocs = new TipoIdentificacionDoc[TipoIdentificacionDoc.values().length-1]; - int j = 0; - for (int i = 0 ; i < TipoIdentificacionDoc.values().length ; i ++) { - if(tipoIdentificacionDoc.getId().equals(TipoIdentificacionDoc.values()[i].getId())) { - continue; - } - tipoIdentificacionDocs[j] = TipoIdentificacionDoc.values()[i]; - j++; - } - return tipoIdentificacionDocs; - } -} +package com.rjconsultores.ventaboletos.enums; + +import org.apache.commons.lang.StringUtils; +import org.brazilutils.br.cpfcnpj.Cnpj; +import org.brazilutils.br.cpfcnpj.Cpf; +import org.brazilutils.validation.ValidationException; + +/** + **Criar Enumns com quantidade máxima de 10 caracteres, pois existe uma restrição com a Globus (Praxio) + ***/ + +public enum TipoIdentificacionDoc { + RG(1), + CPF(2), + CI(12), + PASPT(13), + RUT(14), + DOCX(22), + CNPJ(15), + CN(23), + RNE(24), + DOC_IDOSO(25), + DNI(26), + RE_PM(27), + D_FISICO(28), + J_CARENTE(29), + GRATUIDADE(30), + NIS(31), + PASSELIVRE(32), + ID_JOVEM(33), + TODOS(0); + + private Integer id; + + private TipoIdentificacionDoc(Integer id) { + this.id = id; + } + + public Integer getId() { + return this.id; + } + + public static TipoIdentificacionDoc getById(Byte id) { + if (id == null) { + return null; + } + TipoIdentificacionDoc tmp = null; + switch (id.intValue()) { + case 1: + tmp = TipoIdentificacionDoc.RG; + break; + case 2: + tmp = TipoIdentificacionDoc.CPF; + break; + case 12: + tmp = TipoIdentificacionDoc.CI; + break; + case 13: + tmp = TipoIdentificacionDoc.PASPT; + break; + case 14: + tmp = TipoIdentificacionDoc.RUT; + break; + case 22: + tmp = TipoIdentificacionDoc.DOCX; + break; + case 15: + tmp = TipoIdentificacionDoc.CNPJ; + break; + case 23: + tmp = TipoIdentificacionDoc.CN; + break; + case 24: + tmp = TipoIdentificacionDoc.RNE; + break; + case 25: + tmp = TipoIdentificacionDoc.DOC_IDOSO; + break; + case 26: + tmp = TipoIdentificacionDoc.DNI; + break; + case 27: + tmp = TipoIdentificacionDoc.RE_PM; + break; + case 28: + tmp = TipoIdentificacionDoc.D_FISICO; + break; + case 29: + tmp = TipoIdentificacionDoc.J_CARENTE; + break; + case 31: + tmp = TipoIdentificacionDoc.NIS; + break; + case 32: + tmp = TipoIdentificacionDoc.PASSELIVRE; + break; + case 33: + tmp = TipoIdentificacionDoc.ID_JOVEM; + break; + + default: + break; + } + return tmp; + } + + public static TipoIdentificacionDoc[] getTodos() { + return new TipoIdentificacionDoc[]{TipoIdentificacionDoc.RG, + TipoIdentificacionDoc.CPF, + TipoIdentificacionDoc.CI, + TipoIdentificacionDoc.PASPT, + TipoIdentificacionDoc.RUT, + TipoIdentificacionDoc.DOCX, + TipoIdentificacionDoc.CNPJ, + TipoIdentificacionDoc.CN, + TipoIdentificacionDoc.RNE, + TipoIdentificacionDoc.DOC_IDOSO, + TipoIdentificacionDoc.DNI, + TipoIdentificacionDoc.RE_PM, + TipoIdentificacionDoc.D_FISICO, + TipoIdentificacionDoc.J_CARENTE, + TipoIdentificacionDoc.GRATUIDADE, + TipoIdentificacionDoc.NIS, + TipoIdentificacionDoc.PASSELIVRE, + TipoIdentificacionDoc.ID_JOVEM + }; + } + + + + public static String getDescricao(Byte id) { + if (id == null) { + return null; + } + String descricao = ""; + + switch (id) { + case 1: case 10: + descricao= "RG"; + break; + case 2: case 11: + descricao= "CPF"; + break; + case 12: + descricao= "CI"; + break; + case 13: + descricao= "PASPT"; + break; + case 14: + descricao= "RUT"; + break; + case 22: + descricao= "DOCX"; + break; + case 15: + descricao= "CNPJ"; + break; + case 23: + descricao= "CN"; + break; + case 24: + descricao= "RNE"; + break; + case 25: + descricao= "DOC_IDOSO"; + break; + case 26: + descricao= "DNI"; + break; + case 27: + descricao= "RE_PM"; + break; + case 28: + descricao= "D_FISICO"; + break; + case 29: + descricao= "J_CARENTE"; + break; + case 30: + descricao= "GRATUIDADE"; + break; + case 31: + descricao= "NIS"; + break; + case 32: + descricao= "PASSELIVRE"; + break; + case 33: + descricao= "ID_JOVEM"; + break; + default: + descricao= ""; + break; + } + return descricao.length()> 10 ? descricao.substring(0,10) : descricao; + } + + public static TipoIdentificacionDoc[] getTipoDocExcluindoCPF() { + return new TipoIdentificacionDoc[]{TipoIdentificacionDoc.RG, + TipoIdentificacionDoc.CI, + TipoIdentificacionDoc.PASPT, + TipoIdentificacionDoc.RUT, + TipoIdentificacionDoc.DOCX, + TipoIdentificacionDoc.CNPJ, + TipoIdentificacionDoc.CN, + TipoIdentificacionDoc.RNE, + TipoIdentificacionDoc.DOC_IDOSO, + TipoIdentificacionDoc.DNI, + TipoIdentificacionDoc.RE_PM, + TipoIdentificacionDoc.NIS, + TipoIdentificacionDoc.PASSELIVRE, + TipoIdentificacionDoc.ID_JOVEM, + TipoIdentificacionDoc.D_FISICO, + TipoIdentificacionDoc.J_CARENTE + }; + } + + public static TipoIdentificacionDoc getTipo(String descTipoDoc) { + if(descTipoDoc != null) { + if(descTipoDoc.equals("RG")) { + return TipoIdentificacionDoc.RG; + } else if(descTipoDoc.equals("CPF")) { + return TipoIdentificacionDoc.CPF; + } else if(descTipoDoc.equals("CI")) { + return TipoIdentificacionDoc.RG; + } else if(descTipoDoc.equals("PASPT")) { + return TipoIdentificacionDoc.PASPT; + } else if(descTipoDoc.equals("RUT")) { + return TipoIdentificacionDoc.RUT; + } else if(descTipoDoc.equals("DOCX")) { + return TipoIdentificacionDoc.DOCX; + } else if(descTipoDoc.equals("CNPJ")) { + return TipoIdentificacionDoc.CNPJ; + } else if(descTipoDoc.equals("CN")) { + return TipoIdentificacionDoc.CN; + } else if(descTipoDoc.equals("RNE")) { + return TipoIdentificacionDoc.RNE; + } else if(descTipoDoc.equals("DOC_IDOSO")) { + return TipoIdentificacionDoc.DOC_IDOSO; + } else if(descTipoDoc.equals("DNI")) { + return TipoIdentificacionDoc.DNI; + }else if(descTipoDoc.equals("RE_PM")) { + return TipoIdentificacionDoc.RE_PM; + }else if(descTipoDoc.equals("NIS")) { + return TipoIdentificacionDoc.NIS; + } + // mantendo a retrocompatibilidade + else if(descTipoDoc.equals("PASSE_LIVRE") || descTipoDoc.equals("PASSELIVRE")) { + return TipoIdentificacionDoc.PASSELIVRE; + }else if(descTipoDoc.equals("ID_JOVEM")) { + return TipoIdentificacionDoc.ID_JOVEM; + }else if(descTipoDoc.equals("D_FISICO")) { + return TipoIdentificacionDoc.D_FISICO; + }else if(descTipoDoc.equals("J_CARENTE")) { + return TipoIdentificacionDoc.J_CARENTE; + }else { + return null; + } + } + + return null; + } + + public static boolean isExisteTipoIdentificacionDoc(String descTipoDoc) { + return getTipo(descTipoDoc) != null; + } + + public static boolean isRGBPeValido(String value) { + return value == null ? false : value.trim().matches("\\d.*\\d.*|[a-zA-Z]+\\d.*\\d.*"); + } + + public static boolean isCPFValido(String doc) { + try { + String tmp = StringUtils.isBlank(doc) ? "" : doc; + Cpf cpf = new Cpf(tmp.trim()); + + return cpf.isValid(); + } catch (ValidationException e1) { + return false; + } + } + + public static boolean isCNPJValido(String doc) { + try { + String tmp = StringUtils.isBlank(doc) ? "" : doc; + Cnpj cnpj = new Cnpj(tmp.trim()); + + return cnpj.isValid(); + } catch (ValidationException e1) { + return false; + } + } + + public static boolean isRUTValido(String rut) { + boolean validacion = false; + try { + rut = rut.toUpperCase(); + rut = rut.replace(".", ""); + rut = rut.replace("-", ""); + int rutAux = Integer.parseInt(rut.substring(0, rut.length() - 1)); + + char dv = rut.charAt(rut.length() - 1); + + int m = 0, s = 1; + for (; rutAux != 0; rutAux /= 10) { + s = (s + rutAux % 10 * (9 - m++ % 6)) % 11; + } + if (dv == (char) (s != 0 ? s + 47 : 75)) { + validacion = true; + } + + } catch (Exception e) { + } + return validacion; + } + + public static boolean isPASPTValido(String numDoc) { + String paspt = numDoc.replaceAll("[^\\d]", ""); + + //O passaporte não aceita menos de 4 numeros ou somente letras + if (!StringUtils.isBlank(paspt) && paspt.length() < 4) { + return false; + } else if (StringUtils.isBlank(paspt) && !StringUtils.isBlank(numDoc)) { + return false; + } + + return true; + } + + public static TipoIdentificacionDoc[] buscarComboSegundoTipoDocumentoRemovendoDocumentoSelecionadoTipoIdentificacionDoc(TipoIdentificacionDoc tipoIdentificacionDoc) { + + if (tipoIdentificacionDoc == null) { + return null; + } + + TipoIdentificacionDoc[] tipoIdentificacionDocs = new TipoIdentificacionDoc[TipoIdentificacionDoc.values().length-1]; + int j = 0; + for (int i = 0 ; i < TipoIdentificacionDoc.values().length ; i ++) { + if(tipoIdentificacionDoc.getId().equals(TipoIdentificacionDoc.values()[i].getId())) { + continue; + } + tipoIdentificacionDocs[j] = TipoIdentificacionDoc.values()[i]; + j++; + } + return tipoIdentificacionDocs; + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java index c9de660ec..4a153ef1e 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoImpressora.java @@ -1,64 +1,64 @@ -package com.rjconsultores.ventaboletos.enums; - -import org.zkoss.util.resource.Labels; - -public enum TipoImpressora { - - MATRICIAL(0, Labels.getLabel("editarEstacionController.tipoImpressora.matricial"), false), - BEMATECH_FISCAL(1, Labels.getLabel("editarEstacionController.tipoImpressora.bematechFiscal"), true), - BEMATECH_FISCAL_BLINDADA(2, Labels.getLabel("editarEstacionController.tipoImpressora.bematechFiscalBlindada"), true), - CENTRAL_EMISSAO(3, Labels.getLabel("editarEstacionController.tipoImpressora.centralEmissao"), true), - DARUMA(4, Labels.getLabel("editarEstacionController.tipoImpressora.darumaFiscal"), true), - DARUMA_BLINDADA(5, Labels.getLabel("editarEstacionController.tipoImpressora.darumaFiscalBlindada"), true), - STOCK_CENTRAL(6, Labels.getLabel("editarEstacionController.tipoImpressora.stockCentral"), true), - BPE(7, Labels.getLabel("editarEstacionController.tipoImpressora.bpe"), true); - - private final int codigo; - private final String nome; - private final boolean isImpressoraFiscal; - - private TipoImpressora(int codigo, String nome, boolean isImpressoraFiscal) { - this.codigo = codigo; - this.nome = nome; - this.isImpressoraFiscal = isImpressoraFiscal; - } - - public Integer getCodigo() { - return codigo; - } - - public String getNome() { - return nome; - } - - public Boolean isImpressoraFiscal() { - return isImpressoraFiscal; - } - - public static TipoImpressora getTipoImpressora(final int value) { - for (TipoImpressora tipo : TipoImpressora.values()) { - if (tipo.getCodigo() == value) { - return tipo; - } - } - return null; - } - - public static TipoImpressora getTipoImpressoraPorNome(final String nome) { - for (TipoImpressora tipo : TipoImpressora.values()) { - if (tipo.getNome().equals(nome)) { - return tipo; - } - } - return null; - } - - public static TipoImpressora getTipoImpressoraFiscal(final int value) { - TipoImpressora tipo = getTipoImpressora(value); - if (tipo != null && tipo.isImpressoraFiscal()) { - return tipo; - } - - return null; - } -} +package com.rjconsultores.ventaboletos.enums; + +import org.zkoss.util.resource.Labels; + +public enum TipoImpressora { + + MATRICIAL(0, Labels.getLabel("editarEstacionController.tipoImpressora.matricial"), false), + BEMATECH_FISCAL(1, Labels.getLabel("editarEstacionController.tipoImpressora.bematechFiscal"), true), + BEMATECH_FISCAL_BLINDADA(2, Labels.getLabel("editarEstacionController.tipoImpressora.bematechFiscalBlindada"), true), + CENTRAL_EMISSAO(3, Labels.getLabel("editarEstacionController.tipoImpressora.centralEmissao"), true), + DARUMA(4, Labels.getLabel("editarEstacionController.tipoImpressora.darumaFiscal"), true), + DARUMA_BLINDADA(5, Labels.getLabel("editarEstacionController.tipoImpressora.darumaFiscalBlindada"), true), + STOCK_CENTRAL(6, Labels.getLabel("editarEstacionController.tipoImpressora.stockCentral"), true), + BPE(7, Labels.getLabel("editarEstacionController.tipoImpressora.bpe"), true); + + private final int codigo; + private final String nome; + private final boolean isImpressoraFiscal; + + private TipoImpressora(int codigo, String nome, boolean isImpressoraFiscal) { + this.codigo = codigo; + this.nome = nome; + this.isImpressoraFiscal = isImpressoraFiscal; + } + + public Integer getCodigo() { + return codigo; + } + + public String getNome() { + return nome; + } + + public Boolean isImpressoraFiscal() { + return isImpressoraFiscal; + } + + public static TipoImpressora getTipoImpressora(final int value) { + for (TipoImpressora tipo : TipoImpressora.values()) { + if (tipo.getCodigo() == value) { + return tipo; + } + } + return null; + } + + public static TipoImpressora getTipoImpressoraPorNome(final String nome) { + for (TipoImpressora tipo : TipoImpressora.values()) { + if (tipo.getNome().equals(nome)) { + return tipo; + } + } + return null; + } + + public static TipoImpressora getTipoImpressoraFiscal(final int value) { + TipoImpressora tipo = getTipoImpressora(value); + if (tipo != null && tipo.isImpressoraFiscal()) { + return tipo; + } + + return null; + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoImpressoraRelatorio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoImpressoraRelatorio.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/TipoImpressoraRelatorio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoImpressoraRelatorio.java index b94112ce0..5964e24d5 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoImpressoraRelatorio.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoImpressoraRelatorio.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoImpressoraRelatorio { - - A4(1, "Tipo Impressora A4"), - TERMICA(2, "Tipo Impressora Térmica"); - - private Integer id; - private String descricao; - - private TipoImpressoraRelatorio(Integer id, String descricao) { - this.id = id; - this.descricao = descricao; - } - - public Integer getId() { - return id; - } - - public String getDescricao() { - return descricao; - } - - public static TipoImpressoraRelatorio getTipoImpressoraRelatorio(Integer id) { - for (TipoImpressoraRelatorio tpImpressora : TipoImpressoraRelatorio.values()) { - if (tpImpressora.getId().equals(id)) { - return tpImpressora; - } - } - throw new IllegalArgumentException("Tipo de impressora relatório não encontrado."); - } -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoImpressoraRelatorio { + + A4(1, "Tipo Impressora A4"), + TERMICA(2, "Tipo Impressora Térmica"); + + private Integer id; + private String descricao; + + private TipoImpressoraRelatorio(Integer id, String descricao) { + this.id = id; + this.descricao = descricao; + } + + public Integer getId() { + return id; + } + + public String getDescricao() { + return descricao; + } + + public static TipoImpressoraRelatorio getTipoImpressoraRelatorio(Integer id) { + for (TipoImpressoraRelatorio tpImpressora : TipoImpressoraRelatorio.values()) { + if (tpImpressora.getId().equals(id)) { + return tpImpressora; + } + } + throw new IllegalArgumentException("Tipo de impressora relatório não encontrado."); + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoIntegracaoTEF.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoIntegracaoTEF.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/TipoIntegracaoTEF.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoIntegracaoTEF.java index ea4f79e79..923edd136 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoIntegracaoTEF.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoIntegracaoTEF.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.enums; - -import java.util.Arrays; -import java.util.List; - -public enum TipoIntegracaoTEF { - - SITEF("Sitef"), - PAYGO("PayGo"), - GRANITO("Granito"), - ADYEN("Adyen"), - CREDIBANCO("CrediBanco"), - ; - - private String descricao; - - private TipoIntegracaoTEF(String descricao) { - this.descricao = descricao; - } - - @Override - public String toString() { - return descricao; - } - - public static List list() { - return Arrays.asList(values()); - } - -} +package com.rjconsultores.ventaboletos.enums; + +import java.util.Arrays; +import java.util.List; + +public enum TipoIntegracaoTEF { + + SITEF("Sitef"), + PAYGO("PayGo"), + GRANITO("Granito"), + ADYEN("Adyen"), + CREDIBANCO("CrediBanco"), + ; + + private String descricao; + + private TipoIntegracaoTEF(String descricao) { + this.descricao = descricao; + } + + @Override + public String toString() { + return descricao; + } + + public static List list() { + return Arrays.asList(values()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoOperacaoECommerce.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoOperacaoECommerce.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/TipoOperacaoECommerce.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoOperacaoECommerce.java index c44fb08fa..1d0795675 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoOperacaoECommerce.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoOperacaoECommerce.java @@ -1,49 +1,49 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoOperacaoECommerce { - - CADASTRO_CLIENTE(1, "Cadastro Cliente"), - ESQUECER_SENHA(2, "Esquecer Senha"), - COMPRA_PASSAGEM(3, "Compra de passagem"), - COMPRA_CANCELAMENTO(4, "Cancelamento de compra"), - ; - - private Integer id; - private String descricao; - - private TipoOperacaoECommerce(Integer id, String descricao) { - this.descricao = descricao; - this.id = id; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public static TipoOperacaoECommerce buscarPorId(Integer id) { - for (TipoOperacaoECommerce ids : TipoOperacaoECommerce.values()) { - if (ids.getId() == id) { - return ids; - } - } - return null; - } - - @Override - public String toString() { - return descricao; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoOperacaoECommerce { + + CADASTRO_CLIENTE(1, "Cadastro Cliente"), + ESQUECER_SENHA(2, "Esquecer Senha"), + COMPRA_PASSAGEM(3, "Compra de passagem"), + COMPRA_CANCELAMENTO(4, "Cancelamento de compra"), + ; + + private Integer id; + private String descricao; + + private TipoOperacaoECommerce(Integer id, String descricao) { + this.descricao = descricao; + this.id = id; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public static TipoOperacaoECommerce buscarPorId(Integer id) { + for (TipoOperacaoECommerce ids : TipoOperacaoECommerce.values()) { + if (ids.getId() == id) { + return ids; + } + } + return null; + } + + @Override + public String toString() { + return descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoPassagemCores.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoPassagemCores.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/TipoPassagemCores.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoPassagemCores.java index 5fd60855d..f64e8e31b 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoPassagemCores.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoPassagemCores.java @@ -1,46 +1,46 @@ -package com.rjconsultores.ventaboletos.enums; - -import java.util.Arrays; -import java.util.List; - -public enum TipoPassagemCores { - - VERDE("VERDE","/gui/img/tipo_passagem/verde.png"), - VERDE_MUSGO("VERDE_MUSGO","/gui/img/tipo_passagem/verde_musgo.png"), - LARANJA("LARANJA","/gui/img/tipo_passagem/laranja.png"), - BEGE("BEGE","/gui/img/tipo_passagem/bege.png"), - LILAS("LILAS","/gui/img/tipo_passagem/lilas.png"), - MARROM("MARROM","/gui/img/tipo_passagem/marrom.png"), - ROSA("ROSA","/gui/img/tipo_passagem/rosa.png"), - ROSA_CHOQUE("ROSA_CHOQUE","/gui/img/tipo_passagem/rosa_c.png"), - ROXO("ROXO","/gui/img/tipo_passagem/roxo.png"), - AZUL("AZUL","/gui/img/tipo_passagem/azul.png"), - AZUL_MARINHO("AZUL_MARINHO","/gui/img/tipo_passagem/azul_mar.png"), - AZUL_PISCINA("AZUL_PISCINA","/gui/img/tipo_passagem/azul_p.png"); - - private String descricao; - private String url; - - private TipoPassagemCores(String descricao, String url) { - this.descricao = descricao; - this.url = url; - } - - public static List getLista() { - return Arrays.asList(TipoPassagemCores.values()); - } - - @Override - public String toString() { - return descricao; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - -} +package com.rjconsultores.ventaboletos.enums; + +import java.util.Arrays; +import java.util.List; + +public enum TipoPassagemCores { + + VERDE("VERDE","/gui/img/tipo_passagem/verde.png"), + VERDE_MUSGO("VERDE_MUSGO","/gui/img/tipo_passagem/verde_musgo.png"), + LARANJA("LARANJA","/gui/img/tipo_passagem/laranja.png"), + BEGE("BEGE","/gui/img/tipo_passagem/bege.png"), + LILAS("LILAS","/gui/img/tipo_passagem/lilas.png"), + MARROM("MARROM","/gui/img/tipo_passagem/marrom.png"), + ROSA("ROSA","/gui/img/tipo_passagem/rosa.png"), + ROSA_CHOQUE("ROSA_CHOQUE","/gui/img/tipo_passagem/rosa_c.png"), + ROXO("ROXO","/gui/img/tipo_passagem/roxo.png"), + AZUL("AZUL","/gui/img/tipo_passagem/azul.png"), + AZUL_MARINHO("AZUL_MARINHO","/gui/img/tipo_passagem/azul_mar.png"), + AZUL_PISCINA("AZUL_PISCINA","/gui/img/tipo_passagem/azul_p.png"); + + private String descricao; + private String url; + + private TipoPassagemCores(String descricao, String url) { + this.descricao = descricao; + this.url = url; + } + + public static List getLista() { + return Arrays.asList(TipoPassagemCores.values()); + } + + @Override + public String toString() { + return descricao; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoPessoa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoPessoa.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/TipoPessoa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoPessoa.java index 86774ebfe..42e9d5868 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoPessoa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoPessoa.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TipoPessoa { - - FISICA(0,"Pessoa Física"), - JURIDICA(1, "Pessoa Jurídica"); - - private Integer valor; - private String descricao; - - private TipoPessoa(Integer valor, String descricao) { - this.valor = valor; - this.descricao = descricao; - } - - public Integer getValor() { - return this.valor; - } - - @Override - public String toString() { - return this.descricao; - } - - public static TipoPessoa getTipoPessoa(Integer tipoPessoa) { - if(FISICA.getValor().equals(tipoPessoa)) { - return FISICA; - } else if(JURIDICA.getValor().equals(tipoPessoa)) { - return JURIDICA; - } - return null; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TipoPessoa { + + FISICA(0,"Pessoa Física"), + JURIDICA(1, "Pessoa Jurídica"); + + private Integer valor; + private String descricao; + + private TipoPessoa(Integer valor, String descricao) { + this.valor = valor; + this.descricao = descricao; + } + + public Integer getValor() { + return this.valor; + } + + @Override + public String toString() { + return this.descricao; + } + + public static TipoPessoa getTipoPessoa(Integer tipoPessoa) { + if(FISICA.getValor().equals(tipoPessoa)) { + return FISICA; + } else if(JURIDICA.getValor().equals(tipoPessoa)) { + return JURIDICA; + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoSocio.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoSocio.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/enums/TipoSocio.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoSocio.java index 70305a82b..ec82692ff 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TipoSocio.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TipoSocio.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.enums; - -import org.zkoss.util.resource.Labels; - -public enum TipoSocio { - - SOCIO_ADMINISTRADOR(Labels.getLabel("editarPuntoVentaController.lbTipoSocioAdministrador.value")), - SOCIO_PROPRIETARIO(Labels.getLabel("editarPuntoVentaController.lbTipoSocioProprietario.value")), - PROPRIETARIO(Labels.getLabel("editarPuntoVentaController.lbTipoProprietario.value")); - - private String descricao; - - private TipoSocio(String descricao) { - this.descricao = descricao; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return getDescricao(); - } - -} +package com.rjconsultores.ventaboletos.enums; + +import org.zkoss.util.resource.Labels; + +public enum TipoSocio { + + SOCIO_ADMINISTRADOR(Labels.getLabel("editarPuntoVentaController.lbTipoSocioAdministrador.value")), + SOCIO_PROPRIETARIO(Labels.getLabel("editarPuntoVentaController.lbTipoSocioProprietario.value")), + PROPRIETARIO(Labels.getLabel("editarPuntoVentaController.lbTipoProprietario.value")); + + private String descricao; + + private TipoSocio(String descricao) { + this.descricao = descricao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TypeContentEmail.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TypeContentEmail.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/TypeContentEmail.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TypeContentEmail.java index b02c2eadc..53ba2c4ed 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TypeContentEmail.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TypeContentEmail.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TypeContentEmail { - - TEXT_HTML("text/html"); - public String valor; - - TypeContentEmail(String valorConst){ - valor = valorConst; - } -} +package com.rjconsultores.ventaboletos.enums; + +public enum TypeContentEmail { + + TEXT_HTML("text/html"); + public String valor; + + TypeContentEmail(String valorConst){ + valor = valorConst; + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java index f71b29284..17d9a3fc6 100644 --- a/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java @@ -1,21 +1,21 @@ -package com.rjconsultores.ventaboletos.enums; - -public enum TypeEventListener { - - ON_CHANGE("onChange"), - ON_CLICK("onClick"), - ON_DOUBLE_CLICK("onDoubleClick"), - ON_CHECK("onCheck"), - ON_CTRL_KEY("onCtrlKey"); - - private String event; - - private TypeEventListener(String event) { - this.event = event; - } - - public String getEvent() { - return event; - } - -} +package com.rjconsultores.ventaboletos.enums; + +public enum TypeEventListener { + + ON_CHANGE("onChange"), + ON_CLICK("onClick"), + ON_DOUBLE_CLICK("onDoubleClick"), + ON_CHECK("onCheck"), + ON_CTRL_KEY("onCtrlKey"); + + private String event; + + private TypeEventListener(String event) { + this.event = event; + } + + public String getEvent() { + return event; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/auditoria/EnumAuditAction.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/auditoria/EnumAuditAction.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/auditoria/EnumAuditAction.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/auditoria/EnumAuditAction.java index 6fa31b2fb..8785b8f68 100644 --- a/src/com/rjconsultores/ventaboletos/enums/auditoria/EnumAuditAction.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/auditoria/EnumAuditAction.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.enums.auditoria; - -public enum EnumAuditAction { - TODOS(-1, "Todos"), CRIACAO(1,"Criação de Registro"), ALTERACAO(2, "alteração de registro"), EXCLUSAO(3, "Exclusão de Registro"); - - private String descricao; - private Integer id; - - private EnumAuditAction(Integer id, String descricao) { - this.descricao = descricao; - this.id = id; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public static String findAction(Integer id) { - for (EnumAuditAction action : EnumAuditAction.values()) { - if (action.getId() == id) { - return action.getDescricao(); - } - } - - return null; - } - - @Override - public String toString() { - return descricao; - } -} +package com.rjconsultores.ventaboletos.enums.auditoria; + +public enum EnumAuditAction { + TODOS(-1, "Todos"), CRIACAO(1,"Criação de Registro"), ALTERACAO(2, "alteração de registro"), EXCLUSAO(3, "Exclusão de Registro"); + + private String descricao; + private Integer id; + + private EnumAuditAction(Integer id, String descricao) { + this.descricao = descricao; + this.id = id; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public static String findAction(Integer id) { + for (EnumAuditAction action : EnumAuditAction.values()) { + if (action.getId() == id) { + return action.getDescricao(); + } + } + + return null; + } + + @Override + public String toString() { + return descricao; + } +} diff --git a/src/com/rjconsultores/ventaboletos/enums/comissao/BoletoStatusComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/BoletoStatusComissao.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/enums/comissao/BoletoStatusComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/BoletoStatusComissao.java index 1d8244773..45a039e3f 100644 --- a/src/com/rjconsultores/ventaboletos/enums/comissao/BoletoStatusComissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/BoletoStatusComissao.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.enums.comissao; - -public enum BoletoStatusComissao { - - BOLETOS_VENDIDOS, - BOLETO_CANCELADO, - BOLETO_DEVOLVIDO, - BOLETO_DEVOLVIDO_TROCADO, - BOLETO_DEVOLVIDO_TRANSFERIDO, - BOLETO_DEVOLVIDO_OCD, - BOLETO_MANUAL, - GAP_VENDIDOS, - GAP_CANCELADO, - GAP_DEVOLVIDO; - -} +package com.rjconsultores.ventaboletos.enums.comissao; + +public enum BoletoStatusComissao { + + BOLETOS_VENDIDOS, + BOLETO_CANCELADO, + BOLETO_DEVOLVIDO, + BOLETO_DEVOLVIDO_TROCADO, + BOLETO_DEVOLVIDO_TRANSFERIDO, + BOLETO_DEVOLVIDO_OCD, + BOLETO_MANUAL, + GAP_VENDIDOS, + GAP_CANCELADO, + GAP_DEVOLVIDO; + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/comissao/CoresConferencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/CoresConferencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/comissao/CoresConferencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/CoresConferencia.java index 79724aa6b..8f316d604 100644 --- a/src/com/rjconsultores/ventaboletos/enums/comissao/CoresConferencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/CoresConferencia.java @@ -1,22 +1,22 @@ -package com.rjconsultores.ventaboletos.enums.comissao; - -public enum CoresConferencia { - - AMARELO("/gui/img/comissao/amarelo.png"), - AZUL("/gui/img/comissao/azul.png"), - PRETO("/gui/img/comissao/preto.png"), - BRANCO("/gui/img/comissao/branco.png"), - LARANJA("/gui/img/comissao/laranja.png"), - VERMELHO("/gui/img/comissao/vermelho.png"); - - private String url; - - private CoresConferencia(String url) { - this.url = url; - } - - public String getUrl() { - return url; - } - -} +package com.rjconsultores.ventaboletos.enums.comissao; + +public enum CoresConferencia { + + AMARELO("/gui/img/comissao/amarelo.png"), + AZUL("/gui/img/comissao/azul.png"), + PRETO("/gui/img/comissao/preto.png"), + BRANCO("/gui/img/comissao/branco.png"), + LARANJA("/gui/img/comissao/laranja.png"), + VERMELHO("/gui/img/comissao/vermelho.png"); + + private String url; + + private CoresConferencia(String url) { + this.url = url; + } + + public String getUrl() { + return url; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/comissao/StatusLogConferencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/StatusLogConferencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/comissao/StatusLogConferencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/StatusLogConferencia.java index 447ea7cac..d30faecde 100644 --- a/src/com/rjconsultores/ventaboletos/enums/comissao/StatusLogConferencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/StatusLogConferencia.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.enums.comissao; - -public enum StatusLogConferencia { - - CONFERIDO(0,"CONFERIDO"), - PENDENCIA(1,"PENDÊNCIA"); - - private String descricao; - private Integer value; - - private StatusLogConferencia(Integer value, String descricao) { - this.value = value; - this.descricao = descricao; - } - - @Override - public String toString() { - return this.descricao; - } - - public static StatusLogConferencia getStatusLogConferencia(Integer value) { - if(value == CONFERIDO.value) { - return CONFERIDO; - } else if(value == PENDENCIA.value) { - return PENDENCIA; - } - return null; - } - - public Integer getValue() { - return value; - } - -} +package com.rjconsultores.ventaboletos.enums.comissao; + +public enum StatusLogConferencia { + + CONFERIDO(0,"CONFERIDO"), + PENDENCIA(1,"PENDÊNCIA"); + + private String descricao; + private Integer value; + + private StatusLogConferencia(Integer value, String descricao) { + this.value = value; + this.descricao = descricao; + } + + @Override + public String toString() { + return this.descricao; + } + + public static StatusLogConferencia getStatusLogConferencia(Integer value) { + if(value == CONFERIDO.value) { + return CONFERIDO; + } else if(value == PENDENCIA.value) { + return PENDENCIA; + } + return null; + } + + public Integer getValue() { + return value; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/enums/comissao/TipoLogConferencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/TipoLogConferencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/enums/comissao/TipoLogConferencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/TipoLogConferencia.java index 02903e762..bda0c21e5 100644 --- a/src/com/rjconsultores/ventaboletos/enums/comissao/TipoLogConferencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/enums/comissao/TipoLogConferencia.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.enums.comissao; - -public enum TipoLogConferencia { - - BOLETO(0, "Bilhete"), - EVENTO_FINANCEIRO(1, "Evento Financeiro"), - OCD(2, "OCD"), - AVULSO(3, "Avulso"); - - private String descricao; - private Integer value; - - private TipoLogConferencia(Integer value, String descricao) { - this.value = value; - this.descricao = descricao; - } - - @Override - public String toString() { - return this.descricao; - } - - public static TipoLogConferencia getTipoLogConferencia(Integer value) { - if(value == BOLETO.value) { - return BOLETO; - } else if(value == EVENTO_FINANCEIRO.value) { - return EVENTO_FINANCEIRO; - } else if(value == OCD.value) { - return OCD; - } else if(value == AVULSO.value) { - return AVULSO; - } - return null; - } - - public Integer getValue() { - return value; - } - -} +package com.rjconsultores.ventaboletos.enums.comissao; + +public enum TipoLogConferencia { + + BOLETO(0, "Bilhete"), + EVENTO_FINANCEIRO(1, "Evento Financeiro"), + OCD(2, "OCD"), + AVULSO(3, "Avulso"); + + private String descricao; + private Integer value; + + private TipoLogConferencia(Integer value, String descricao) { + this.value = value; + this.descricao = descricao; + } + + @Override + public String toString() { + return this.descricao; + } + + public static TipoLogConferencia getTipoLogConferencia(Integer value) { + if(value == BOLETO.value) { + return BOLETO; + } else if(value == EVENTO_FINANCEIRO.value) { + return EVENTO_FINANCEIRO; + } else if(value == OCD.value) { + return OCD; + } else if(value == AVULSO.value) { + return AVULSO; + } + return null; + } + + public Integer getValue() { + return value; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/exception/BusinessException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/BusinessException.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/exception/BusinessException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/BusinessException.java index c429a98ad..be00f1b06 100644 --- a/src/com/rjconsultores/ventaboletos/exception/BusinessException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/BusinessException.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.exception; - -import java.text.MessageFormat; - -import org.zkoss.util.resource.Labels; - -public class BusinessException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - /** - * - * @param message - * - La clave del archivo de traduccion - */ - public BusinessException(String message) { - super(Labels.getLabel(message) == null ? message :Labels.getLabel(message)); - } - - /** - * - * @param message- La clave del archivo de traduccion - * @param oMsg - Los parametros de la mensage - */ - public BusinessException(String message,Object oMsg) { - super(new MessageFormat(Labels.getLabel(message)).format(oMsg)); - } -} +package com.rjconsultores.ventaboletos.exception; + +import java.text.MessageFormat; + +import org.zkoss.util.resource.Labels; + +public class BusinessException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + /** + * + * @param message + * - La clave del archivo de traduccion + */ + public BusinessException(String message) { + super(Labels.getLabel(message) == null ? message :Labels.getLabel(message)); + } + + /** + * + * @param message- La clave del archivo de traduccion + * @param oMsg - Los parametros de la mensage + */ + public BusinessException(String message,Object oMsg) { + super(new MessageFormat(Labels.getLabel(message)).format(oMsg)); + } +} diff --git a/src/com/rjconsultores/ventaboletos/exception/BusinessRuntimeException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/BusinessRuntimeException.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/exception/BusinessRuntimeException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/BusinessRuntimeException.java diff --git a/src/com/rjconsultores/ventaboletos/exception/ComissaoException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ComissaoException.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/exception/ComissaoException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/ComissaoException.java index ae335c391..62844f9e6 100644 --- a/src/com/rjconsultores/ventaboletos/exception/ComissaoException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ComissaoException.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.exception; - -import java.text.MessageFormat; - -import org.zkoss.util.resource.Labels; - -public class ComissaoException extends Exception { - - private static final long serialVersionUID = 1L; - - /** - * - * @param message - * - La clave del archivo de traduccion - */ - public ComissaoException(String message) { - super(Labels.getLabel(message)); - } - - /** - * - * @param message- - * La clave del archivo de traduccion - * @param oMsg - * - Los parametros de la mensage - */ - public ComissaoException(String message, Object oMsg) { - super(new MessageFormat(Labels.getLabel(message)).format(oMsg)); - } - - public ComissaoException(String message, Object oMsg, Object... parametros) { - super(new MessageFormat(Labels.getLabel(message, parametros)).format(oMsg)); - } - -} +package com.rjconsultores.ventaboletos.exception; + +import java.text.MessageFormat; + +import org.zkoss.util.resource.Labels; + +public class ComissaoException extends Exception { + + private static final long serialVersionUID = 1L; + + /** + * + * @param message + * - La clave del archivo de traduccion + */ + public ComissaoException(String message) { + super(Labels.getLabel(message)); + } + + /** + * + * @param message- + * La clave del archivo de traduccion + * @param oMsg + * - Los parametros de la mensage + */ + public ComissaoException(String message, Object oMsg) { + super(new MessageFormat(Labels.getLabel(message)).format(oMsg)); + } + + public ComissaoException(String message, Object oMsg, Object... parametros) { + super(new MessageFormat(Labels.getLabel(message, parametros)).format(oMsg)); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/exception/ConstanteEstacaoEmbarcadaException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ConstanteEstacaoEmbarcadaException.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/exception/ConstanteEstacaoEmbarcadaException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/ConstanteEstacaoEmbarcadaException.java index f066f71bc..bf616d679 100644 --- a/src/com/rjconsultores/ventaboletos/exception/ConstanteEstacaoEmbarcadaException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ConstanteEstacaoEmbarcadaException.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.exception; - -import java.text.MessageFormat; - -public class ConstanteEstacaoEmbarcadaException extends Exception { - - private static final long serialVersionUID = 3425209018899617380L; - - public ConstanteEstacaoEmbarcadaException(String message) { - super(message); - } - - public ConstanteEstacaoEmbarcadaException(String message, Object oMsg) { - super(new MessageFormat(message).format(oMsg)); - } - -} - +package com.rjconsultores.ventaboletos.exception; + +import java.text.MessageFormat; + +public class ConstanteEstacaoEmbarcadaException extends Exception { + + private static final long serialVersionUID = 3425209018899617380L; + + public ConstanteEstacaoEmbarcadaException(String message) { + super(message); + } + + public ConstanteEstacaoEmbarcadaException(String message, Object oMsg) { + super(new MessageFormat(message).format(oMsg)); + } + +} + diff --git a/src/com/rjconsultores/ventaboletos/exception/DispositivoEmbarcadaJaCadastradoException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/DispositivoEmbarcadaJaCadastradoException.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/exception/DispositivoEmbarcadaJaCadastradoException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/DispositivoEmbarcadaJaCadastradoException.java index 7c1cc8b05..3f0615690 100644 --- a/src/com/rjconsultores/ventaboletos/exception/DispositivoEmbarcadaJaCadastradoException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/DispositivoEmbarcadaJaCadastradoException.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.exception; - -import java.text.MessageFormat; - -public class DispositivoEmbarcadaJaCadastradoException extends Exception { - - private static final long serialVersionUID = 1L; - - public DispositivoEmbarcadaJaCadastradoException(String message) { - super(message); - } - - public DispositivoEmbarcadaJaCadastradoException(String message, Object oMsg) { - super(new MessageFormat(message).format(oMsg)); - } - -} - +package com.rjconsultores.ventaboletos.exception; + +import java.text.MessageFormat; + +public class DispositivoEmbarcadaJaCadastradoException extends Exception { + + private static final long serialVersionUID = 1L; + + public DispositivoEmbarcadaJaCadastradoException(String message) { + super(message); + } + + public DispositivoEmbarcadaJaCadastradoException(String message, Object oMsg) { + super(new MessageFormat(message).format(oMsg)); + } + +} + diff --git a/src/com/rjconsultores/ventaboletos/exception/IntegracionException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/IntegracionException.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/exception/IntegracionException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/IntegracionException.java index 39a820de1..0c3eb555e 100644 --- a/src/com/rjconsultores/ventaboletos/exception/IntegracionException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/IntegracionException.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.exception; - -import java.text.MessageFormat; - -public class IntegracionException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * - * @param message - * - La clave del archivo de traduccion - */ - public IntegracionException(String message) { - super(message); - } - - /** - * - * @param message - * - La clave del archivo de traduccion - * @param oMsg - * - Los parametros de la mensage - */ - public IntegracionException(String message, Object oMsg) { - super(new MessageFormat(message).format(oMsg)); - } - -} +package com.rjconsultores.ventaboletos.exception; + +import java.text.MessageFormat; + +public class IntegracionException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * + * @param message + * - La clave del archivo de traduccion + */ + public IntegracionException(String message) { + super(message); + } + + /** + * + * @param message + * - La clave del archivo de traduccion + * @param oMsg + * - Los parametros de la mensage + */ + public IntegracionException(String message, Object oMsg) { + super(new MessageFormat(message).format(oMsg)); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/exception/SerieEmbarcadaNaoDisponivelException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/SerieEmbarcadaNaoDisponivelException.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/exception/SerieEmbarcadaNaoDisponivelException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/SerieEmbarcadaNaoDisponivelException.java index cad19a09b..930fe7f65 100644 --- a/src/com/rjconsultores/ventaboletos/exception/SerieEmbarcadaNaoDisponivelException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/SerieEmbarcadaNaoDisponivelException.java @@ -1,5 +1,5 @@ -package com.rjconsultores.ventaboletos.exception; - -public class SerieEmbarcadaNaoDisponivelException extends Exception { - private static final long serialVersionUID = 2798469198513688315L; -} +package com.rjconsultores.ventaboletos.exception; + +public class SerieEmbarcadaNaoDisponivelException extends Exception { + private static final long serialVersionUID = 2798469198513688315L; +} diff --git a/src/com/rjconsultores/ventaboletos/exception/ValidacaoRemessaException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ValidacaoRemessaException.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/exception/ValidacaoRemessaException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/ValidacaoRemessaException.java diff --git a/src/com/rjconsultores/ventaboletos/exception/ValidacionCampoException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ValidacionCampoException.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/exception/ValidacionCampoException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/ValidacionCampoException.java index 5b0aa73c7..86ed38e55 100644 --- a/src/com/rjconsultores/ventaboletos/exception/ValidacionCampoException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/ValidacionCampoException.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.exception; - -import java.text.MessageFormat; - -import org.zkoss.util.resource.Labels; - -public class ValidacionCampoException extends Exception { - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * - * @param message - * - La clave del archivo de traduccion - */ - public ValidacionCampoException(String message) { - super(Labels.getLabel(message)); - } - - /** - * - * @param message - * - La clave del archivo de traduccion - * @param oMsg - * - Los parametros de la mensage - */ - public ValidacionCampoException(String message, Object oMsg) { - super(new MessageFormat(Labels.getLabel(message)).format(oMsg)); - } -} +package com.rjconsultores.ventaboletos.exception; + +import java.text.MessageFormat; + +import org.zkoss.util.resource.Labels; + +public class ValidacionCampoException extends Exception { + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * + * @param message + * - La clave del archivo de traduccion + */ + public ValidacionCampoException(String message) { + super(Labels.getLabel(message)); + } + + /** + * + * @param message + * - La clave del archivo de traduccion + * @param oMsg + * - Los parametros de la mensage + */ + public ValidacionCampoException(String message, Object oMsg) { + super(new MessageFormat(Labels.getLabel(message)).format(oMsg)); + } +} diff --git a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoException.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoException.java index 9f0b9d4b5..533a2caba 100644 --- a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoException.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.exception; - -public class VendaEmbarcadaBoletoException extends BusinessException { - - private static final long serialVersionUID = 1L; - - public VendaEmbarcadaBoletoException(String message) { - super(message); - } - - public VendaEmbarcadaBoletoException(String message, Boolean label) { - super(message, label); - } - - public VendaEmbarcadaBoletoException(String message, Object oMsg) { - super(message, oMsg); - } - -} +package com.rjconsultores.ventaboletos.exception; + +public class VendaEmbarcadaBoletoException extends BusinessException { + + private static final long serialVersionUID = 1L; + + public VendaEmbarcadaBoletoException(String message) { + super(message); + } + + public VendaEmbarcadaBoletoException(String message, Boolean label) { + super(message, label); + } + + public VendaEmbarcadaBoletoException(String message, Object oMsg) { + super(message, oMsg); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoFormapagoException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoFormapagoException.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoFormapagoException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoFormapagoException.java index 9cb4e1c6b..eef261e35 100644 --- a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoFormapagoException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaBoletoFormapagoException.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.exception; - -public class VendaEmbarcadaBoletoFormapagoException extends BusinessException { - - private static final long serialVersionUID = 1L; - - public VendaEmbarcadaBoletoFormapagoException(String message) { - super(message); - } - - public VendaEmbarcadaBoletoFormapagoException(String message, Boolean label) { - super(message, label); - } - - public VendaEmbarcadaBoletoFormapagoException(String message, Object oMsg) { - super(message, oMsg); - } - -} +package com.rjconsultores.ventaboletos.exception; + +public class VendaEmbarcadaBoletoFormapagoException extends BusinessException { + + private static final long serialVersionUID = 1L; + + public VendaEmbarcadaBoletoFormapagoException(String message) { + super(message); + } + + public VendaEmbarcadaBoletoFormapagoException(String message, Boolean label) { + super(message, label); + } + + public VendaEmbarcadaBoletoFormapagoException(String message, Object oMsg) { + super(message, oMsg); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaException.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaException.java index a8aac1755..ad39a9d53 100644 --- a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaException.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.exception; - -public class VendaEmbarcadaCajaException extends BusinessException { - - private static final long serialVersionUID = 1L; - - public VendaEmbarcadaCajaException(String message) { - super(message); - } - - public VendaEmbarcadaCajaException(String message, Boolean label) { - super(message, label); - } - - public VendaEmbarcadaCajaException(String message, Object oMsg) { - super(message, oMsg); - } - -} +package com.rjconsultores.ventaboletos.exception; + +public class VendaEmbarcadaCajaException extends BusinessException { + + private static final long serialVersionUID = 1L; + + public VendaEmbarcadaCajaException(String message) { + super(message); + } + + public VendaEmbarcadaCajaException(String message, Boolean label) { + super(message, label); + } + + public VendaEmbarcadaCajaException(String message, Object oMsg) { + super(message, oMsg); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaFormapagoException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaFormapagoException.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaFormapagoException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaFormapagoException.java index 292d74544..9a140bbed 100644 --- a/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaFormapagoException.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/exception/VendaEmbarcadaCajaFormapagoException.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.exception; - -public class VendaEmbarcadaCajaFormapagoException extends BusinessException { - - private static final long serialVersionUID = 1L; - - public VendaEmbarcadaCajaFormapagoException(String message) { - super(message); - } - - public VendaEmbarcadaCajaFormapagoException(String message, Boolean label) { - super(message, label); - } - - public VendaEmbarcadaCajaFormapagoException(String message, Object oMsg) { - super(message, oMsg); - } - -} +package com.rjconsultores.ventaboletos.exception; + +public class VendaEmbarcadaCajaFormapagoException extends BusinessException { + + private static final long serialVersionUID = 1L; + + public VendaEmbarcadaCajaFormapagoException(String message) { + super(message); + } + + public VendaEmbarcadaCajaFormapagoException(String message, Boolean label) { + super(message, label); + } + + public VendaEmbarcadaCajaFormapagoException(String message, Object oMsg) { + super(message, oMsg); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/passageirofrequente/vo/ClienteExcelVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/passageirofrequente/vo/ClienteExcelVo.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/passageirofrequente/vo/ClienteExcelVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/passageirofrequente/vo/ClienteExcelVo.java index 9f4c0372b..a0362a2f7 100644 --- a/src/com/rjconsultores/ventaboletos/passageirofrequente/vo/ClienteExcelVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/passageirofrequente/vo/ClienteExcelVo.java @@ -1,168 +1,168 @@ -package com.rjconsultores.ventaboletos.passageirofrequente.vo; - -public class ClienteExcelVo { - private String cpf; - private String rg; - private String nome; - private String email; - private String telefone; - private String celular; - private String fax; - private String nascimento; - private String sexo; - private String endereco; - private String bairro; - private String cidade; - private String estado; - private String numfidelidade; - private String tipodoc; - private String numerodoc; - private String nacionalidade; - private String paisresidencia; - private String ocupacao; - private String estadocivil; - private String cep; - private String observacao; - private String desconto; - - - public String getCpf() { - return cpf; - } - public void setCpf(String cpf) { - this.cpf = cpf; - } - public String getRg() { - return rg; - } - public void setRg(String rg) { - this.rg = rg; - } - public String getNome() { - return nome; - } - public void setNome(String nome) { - this.nome = nome; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public String getTelefone() { - return telefone; - } - public void setTelefone(String telefone) { - this.telefone = telefone; - } - public String getCelular() { - return celular; - } - public void setCelular(String celular) { - this.celular = celular; - } - public String getFax() { - return fax; - } - public void setFax(String fax) { - this.fax = fax; - } - public String getSexo() { - return sexo; - } - public void setSexo(String sexo) { - this.sexo = sexo; - } - public String getEndereco() { - return endereco; - } - public void setEndereco(String endereco) { - this.endereco = endereco; - } - public String getCidade() { - return cidade; - } - public void setCidade(String cidade) { - this.cidade = cidade; - } - public String getEstado() { - return estado; - } - public void setEstado(String estado) { - this.estado = estado; - } - public String getNascimento() { - return nascimento; - } - public void setNascimento(String nascimento) { - this.nascimento = nascimento; - } - public String getBairro() { - return bairro; - } - public void setBairro(String bairro) { - this.bairro = bairro; - } - public String getNumfidelidade() { - return numfidelidade; - } - public void setNumfidelidade(String numfidelidade) { - this.numfidelidade = numfidelidade; - } - public String getTipodoc() { - return tipodoc; - } - public void setTipodoc(String tipodoc) { - this.tipodoc = tipodoc; - } - public String getNumerodoc() { - return numerodoc; - } - public void setNumerodoc(String numerodoc) { - this.numerodoc = numerodoc; - } - public String getNacionalidade() { - return nacionalidade; - } - public void setNacionalidade(String nacionalidade) { - this.nacionalidade = nacionalidade; - } - public String getPaisresidencia() { - return paisresidencia; - } - public void setPaisresidencia(String paisresidencia) { - this.paisresidencia = paisresidencia; - } - public String getOcupacao() { - return ocupacao; - } - public void setOcupacao(String ocupacao) { - this.ocupacao = ocupacao; - } - public String getEstadocivil() { - return estadocivil; - } - public void setEstadocivil(String estadocivil) { - this.estadocivil = estadocivil; - } - public String getCep() { - return cep; - } - public void setCep(String cep) { - this.cep = cep; - } - public String getObservacao() { - return observacao; - } - public void setObservacao(String observacao) { - this.observacao = observacao; - } - public String getDesconto() { - return desconto; - } - public void setDesconto(String desconto) { - this.desconto = desconto; - } - -} +package com.rjconsultores.ventaboletos.passageirofrequente.vo; + +public class ClienteExcelVo { + private String cpf; + private String rg; + private String nome; + private String email; + private String telefone; + private String celular; + private String fax; + private String nascimento; + private String sexo; + private String endereco; + private String bairro; + private String cidade; + private String estado; + private String numfidelidade; + private String tipodoc; + private String numerodoc; + private String nacionalidade; + private String paisresidencia; + private String ocupacao; + private String estadocivil; + private String cep; + private String observacao; + private String desconto; + + + public String getCpf() { + return cpf; + } + public void setCpf(String cpf) { + this.cpf = cpf; + } + public String getRg() { + return rg; + } + public void setRg(String rg) { + this.rg = rg; + } + public String getNome() { + return nome; + } + public void setNome(String nome) { + this.nome = nome; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getTelefone() { + return telefone; + } + public void setTelefone(String telefone) { + this.telefone = telefone; + } + public String getCelular() { + return celular; + } + public void setCelular(String celular) { + this.celular = celular; + } + public String getFax() { + return fax; + } + public void setFax(String fax) { + this.fax = fax; + } + public String getSexo() { + return sexo; + } + public void setSexo(String sexo) { + this.sexo = sexo; + } + public String getEndereco() { + return endereco; + } + public void setEndereco(String endereco) { + this.endereco = endereco; + } + public String getCidade() { + return cidade; + } + public void setCidade(String cidade) { + this.cidade = cidade; + } + public String getEstado() { + return estado; + } + public void setEstado(String estado) { + this.estado = estado; + } + public String getNascimento() { + return nascimento; + } + public void setNascimento(String nascimento) { + this.nascimento = nascimento; + } + public String getBairro() { + return bairro; + } + public void setBairro(String bairro) { + this.bairro = bairro; + } + public String getNumfidelidade() { + return numfidelidade; + } + public void setNumfidelidade(String numfidelidade) { + this.numfidelidade = numfidelidade; + } + public String getTipodoc() { + return tipodoc; + } + public void setTipodoc(String tipodoc) { + this.tipodoc = tipodoc; + } + public String getNumerodoc() { + return numerodoc; + } + public void setNumerodoc(String numerodoc) { + this.numerodoc = numerodoc; + } + public String getNacionalidade() { + return nacionalidade; + } + public void setNacionalidade(String nacionalidade) { + this.nacionalidade = nacionalidade; + } + public String getPaisresidencia() { + return paisresidencia; + } + public void setPaisresidencia(String paisresidencia) { + this.paisresidencia = paisresidencia; + } + public String getOcupacao() { + return ocupacao; + } + public void setOcupacao(String ocupacao) { + this.ocupacao = ocupacao; + } + public String getEstadocivil() { + return estadocivil; + } + public void setEstadocivil(String estadocivil) { + this.estadocivil = estadocivil; + } + public String getCep() { + return cep; + } + public void setCep(String cep) { + this.cep = cep; + } + public String getObservacao() { + return observacao; + } + public void setObservacao(String observacao) { + this.observacao = observacao; + } + public String getDesconto() { + return desconto; + } + public void setDesconto(String desconto) { + this.desconto = desconto; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/relatorios/MovimentoLinha.java b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/MovimentoLinha.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/relatorios/MovimentoLinha.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/MovimentoLinha.java index 1fad500e7..f373a61e8 100644 --- a/src/com/rjconsultores/ventaboletos/relatorios/MovimentoLinha.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/MovimentoLinha.java @@ -1,82 +1,82 @@ -package com.rjconsultores.ventaboletos.relatorios; - -public class MovimentoLinha { - private String antt; - private String prefixo; - private Integer mes; - private Integer ano; - private Integer viagensIda; - private Integer viagensVolta; - private Integer lugaresIda; - private Integer lugaresVolta; - - public String getAntt() { - return antt; - } - - public void setAntt(String antt) { - this.antt = antt; - } - - public String getPrefixo() { - return prefixo; - } - - public void setPrefixo(String prefixo) { - this.prefixo = prefixo; - } - - public Integer getMes() { - return mes; - } - - public void setMes(Integer mes) { - this.mes = mes; - } - - public Integer getAno() { - return ano; - } - - public void setAno(Integer ano) { - this.ano = ano; - } - - public Integer getViagensIda() { - return viagensIda; - } - - public void setViagensIda(Integer viagensIda) { - this.viagensIda = viagensIda; - } - - public Integer getViagensVolta() { - return viagensVolta; - } - - public void setViagensVolta(Integer viagensVolta) { - this.viagensVolta = viagensVolta; - } - - public Integer getLugaresIda() { - return lugaresIda; - } - - public void setLugaresIda(Integer lugaresIda) { - this.lugaresIda = lugaresIda; - } - - public Integer getLugaresVolta() { - return lugaresVolta; - } - - public void setLugaresVolta(Integer lugaresVolta) { - this.lugaresVolta = lugaresVolta; - } - - @Override - public String toString() { - return antt + ";" + prefixo + ";" + mes + ";" + ano + ";" + viagensIda + ";" + viagensVolta + ";" + lugaresIda + ";" + lugaresVolta; - } - -} +package com.rjconsultores.ventaboletos.relatorios; + +public class MovimentoLinha { + private String antt; + private String prefixo; + private Integer mes; + private Integer ano; + private Integer viagensIda; + private Integer viagensVolta; + private Integer lugaresIda; + private Integer lugaresVolta; + + public String getAntt() { + return antt; + } + + public void setAntt(String antt) { + this.antt = antt; + } + + public String getPrefixo() { + return prefixo; + } + + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } + + public Integer getMes() { + return mes; + } + + public void setMes(Integer mes) { + this.mes = mes; + } + + public Integer getAno() { + return ano; + } + + public void setAno(Integer ano) { + this.ano = ano; + } + + public Integer getViagensIda() { + return viagensIda; + } + + public void setViagensIda(Integer viagensIda) { + this.viagensIda = viagensIda; + } + + public Integer getViagensVolta() { + return viagensVolta; + } + + public void setViagensVolta(Integer viagensVolta) { + this.viagensVolta = viagensVolta; + } + + public Integer getLugaresIda() { + return lugaresIda; + } + + public void setLugaresIda(Integer lugaresIda) { + this.lugaresIda = lugaresIda; + } + + public Integer getLugaresVolta() { + return lugaresVolta; + } + + public void setLugaresVolta(Integer lugaresVolta) { + this.lugaresVolta = lugaresVolta; + } + + @Override + public String toString() { + return antt + ";" + prefixo + ";" + mes + ";" + ano + ";" + viagensIda + ";" + viagensVolta + ";" + lugaresIda + ";" + lugaresVolta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/relatorios/MovimentoSecoes.java b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/MovimentoSecoes.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/relatorios/MovimentoSecoes.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/MovimentoSecoes.java index f8707e86f..bf66b76b8 100644 --- a/src/com/rjconsultores/ventaboletos/relatorios/MovimentoSecoes.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/MovimentoSecoes.java @@ -1,214 +1,214 @@ -package com.rjconsultores.ventaboletos.relatorios; - -public class MovimentoSecoes { - - private String antt; - private String prefixo; - private Integer mes; - private Integer ano; - private String localOrigem; - private String localDestino; - private Integer passageirosIda; - private Integer passageirosVolta; - private Integer gratuidadePasseLivreIda; - private Integer gratuidadePasseLivreVolta; - private Integer gratuidadeIdosoIda; - private Integer gratuidadeIdosoVolta; - private Integer descontoIdosoIda; - private Integer descontoIdosoVolta; - private Integer gratuidadeJovenIda; - private Integer gratuidadeJovenVolta; - private Integer descontoJovenIda; - private Integer descontoJovenVolta; - private Integer gratuidadeEstudanteIda; - private Integer gratuidadeEstudanteVolta; - private Integer gratuidadeProfessorIda; - private Integer gratuidadeProfessorVolta; - - - public Integer getGratuidadeJovenIda() { - return gratuidadeJovenIda; - } - - public void setGratuidadeJovenIda(Integer gratuidadeJovenIda) { - this.gratuidadeJovenIda = gratuidadeJovenIda; - } - - public Integer getGratuidadeJovenVolta() { - return gratuidadeJovenVolta; - } - - public void setGratuidadeJovenVolta(Integer gratuidadeJovenVolta) { - this.gratuidadeJovenVolta = gratuidadeJovenVolta; - } - - public Integer getDescontoJovenIda() { - return descontoJovenIda; - } - - public void setDescontoJovenIda(Integer descontoJovenIda) { - this.descontoJovenIda = descontoJovenIda; - } - - public Integer getDescontoJovenVolta() { - return descontoJovenVolta; - } - - public void setDescontoJovenVolta(Integer descontoJovenVolta) { - this.descontoJovenVolta = descontoJovenVolta; - } - - public String getAntt() { - return antt; - } - - public void setAntt(String antt) { - this.antt = antt; - } - - public String getPrefixo() { - return prefixo; - } - - public void setPrefixo(String prefixo) { - this.prefixo = prefixo; - } - - public Integer getMes() { - return mes; - } - - public void setMes(Integer mes) { - this.mes = mes; - } - - public Integer getAno() { - return ano; - } - - public void setAno(Integer ano) { - this.ano = ano; - } - - public String getLocalOrigem() { - return localOrigem; - } - - public void setLocalOrigem(String localOrigem) { - this.localOrigem = localOrigem; - } - - public String getLocalDestino() { - return localDestino; - } - - public void setLocalDestino(String localDestino) { - this.localDestino = localDestino; - } - - public Integer getPassageirosIda() { - return passageirosIda; - } - - public void setPassageirosIda(Integer passageirosIda) { - this.passageirosIda = passageirosIda; - } - - public Integer getPassageirosVolta() { - return passageirosVolta; - } - - public void setPassageirosVolta(Integer passageirosVolta) { - this.passageirosVolta = passageirosVolta; - } - - public Integer getGratuidadePasseLivreIda() { - return gratuidadePasseLivreIda; - } - - public void setGratuidadePasseLivreIda(Integer gratuidadePasseLivreIda) { - this.gratuidadePasseLivreIda = gratuidadePasseLivreIda; - } - - public Integer getGratuidadePasseLivreVolta() { - return gratuidadePasseLivreVolta; - } - - public void setGratuidadePasseLivreVolta(Integer gratuidadePasseLivreVolta) { - this.gratuidadePasseLivreVolta = gratuidadePasseLivreVolta; - } - - public Integer getGratuidadeIdosoIda() { - return gratuidadeIdosoIda; - } - - public void setGratuidadeIdosoIda(Integer gratuidadeIdosoIda) { - this.gratuidadeIdosoIda = gratuidadeIdosoIda; - } - - public Integer getGratuidadeIdosoVolta() { - return gratuidadeIdosoVolta; - } - - public void setGratuidadeIdosoVolta(Integer gratuidadeIdosoVolta) { - this.gratuidadeIdosoVolta = gratuidadeIdosoVolta; - } - - public Integer getDescontoIdosoIda() { - return descontoIdosoIda; - } - - public void setDescontoIdosoIda(Integer descontoIdosoIda) { - this.descontoIdosoIda = descontoIdosoIda; - } - - public Integer getDescontoIdosoVolta() { - return descontoIdosoVolta; - } - - public void setDescontoIdosoVolta(Integer descontoIdosoVolta) { - this.descontoIdosoVolta = descontoIdosoVolta; - } - - public Integer getGratuidadeEstudanteIda() { - return gratuidadeEstudanteIda; - } - - public void setGratuidadeEstudanteIda(Integer gratuidadeEstudanteIda) { - this.gratuidadeEstudanteIda = gratuidadeEstudanteIda; - } - - public Integer getGratuidadeEstudanteVolta() { - return gratuidadeEstudanteVolta; - } - - public void setGratuidadeEstudanteVolta(Integer gratuidadeEstudanteVolta) { - this.gratuidadeEstudanteVolta = gratuidadeEstudanteVolta; - } - - public Integer getGratuidadeProfessorIda() { - return gratuidadeProfessorIda; - } - - public void setGratuidadeProfessorIda(Integer gratuidadeProfessorIda) { - this.gratuidadeProfessorIda = gratuidadeProfessorIda; - } - - public Integer getGratuidadeProfessorVolta() { - return gratuidadeProfessorVolta; - } - - public void setGratuidadeProfessorVolta(Integer gratuidadeProfessorVolta) { - this.gratuidadeProfessorVolta = gratuidadeProfessorVolta; - } - - @Override - public String toString() { - return antt + ";" + prefixo + ";" + localOrigem + ";" + localDestino + ";" + mes + ";" + ano + ";" + passageirosIda + ";" + passageirosVolta + ";" + gratuidadePasseLivreIda + ";" + gratuidadePasseLivreVolta + ";" + gratuidadeIdosoIda + ";" + gratuidadeIdosoVolta + ";" + descontoIdosoIda + ";" + descontoIdosoVolta + ";" + gratuidadeJovenIda + ";" + gratuidadeJovenVolta + ";" + descontoJovenIda + ";" + descontoJovenVolta + - gratuidadeEstudanteIda + ";" + gratuidadeEstudanteVolta + ";" + gratuidadeProfessorIda + ";" + gratuidadeProfessorVolta; - } - - public String toStringSisdap() { - return antt + ";" + prefixo + ";" + localOrigem + ";" + localDestino + ";" + mes + ";" + ano + ";" + passageirosIda + ";" + passageirosVolta + ";" + gratuidadePasseLivreIda + ";" + gratuidadePasseLivreVolta + ";" + gratuidadeIdosoIda + ";" + gratuidadeIdosoVolta + ";" + descontoIdosoIda + ";" + descontoIdosoVolta + ";" + gratuidadeJovenIda + ";" + gratuidadeJovenVolta + ";" + descontoJovenIda + ";" + descontoJovenVolta ; - } -} +package com.rjconsultores.ventaboletos.relatorios; + +public class MovimentoSecoes { + + private String antt; + private String prefixo; + private Integer mes; + private Integer ano; + private String localOrigem; + private String localDestino; + private Integer passageirosIda; + private Integer passageirosVolta; + private Integer gratuidadePasseLivreIda; + private Integer gratuidadePasseLivreVolta; + private Integer gratuidadeIdosoIda; + private Integer gratuidadeIdosoVolta; + private Integer descontoIdosoIda; + private Integer descontoIdosoVolta; + private Integer gratuidadeJovenIda; + private Integer gratuidadeJovenVolta; + private Integer descontoJovenIda; + private Integer descontoJovenVolta; + private Integer gratuidadeEstudanteIda; + private Integer gratuidadeEstudanteVolta; + private Integer gratuidadeProfessorIda; + private Integer gratuidadeProfessorVolta; + + + public Integer getGratuidadeJovenIda() { + return gratuidadeJovenIda; + } + + public void setGratuidadeJovenIda(Integer gratuidadeJovenIda) { + this.gratuidadeJovenIda = gratuidadeJovenIda; + } + + public Integer getGratuidadeJovenVolta() { + return gratuidadeJovenVolta; + } + + public void setGratuidadeJovenVolta(Integer gratuidadeJovenVolta) { + this.gratuidadeJovenVolta = gratuidadeJovenVolta; + } + + public Integer getDescontoJovenIda() { + return descontoJovenIda; + } + + public void setDescontoJovenIda(Integer descontoJovenIda) { + this.descontoJovenIda = descontoJovenIda; + } + + public Integer getDescontoJovenVolta() { + return descontoJovenVolta; + } + + public void setDescontoJovenVolta(Integer descontoJovenVolta) { + this.descontoJovenVolta = descontoJovenVolta; + } + + public String getAntt() { + return antt; + } + + public void setAntt(String antt) { + this.antt = antt; + } + + public String getPrefixo() { + return prefixo; + } + + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } + + public Integer getMes() { + return mes; + } + + public void setMes(Integer mes) { + this.mes = mes; + } + + public Integer getAno() { + return ano; + } + + public void setAno(Integer ano) { + this.ano = ano; + } + + public String getLocalOrigem() { + return localOrigem; + } + + public void setLocalOrigem(String localOrigem) { + this.localOrigem = localOrigem; + } + + public String getLocalDestino() { + return localDestino; + } + + public void setLocalDestino(String localDestino) { + this.localDestino = localDestino; + } + + public Integer getPassageirosIda() { + return passageirosIda; + } + + public void setPassageirosIda(Integer passageirosIda) { + this.passageirosIda = passageirosIda; + } + + public Integer getPassageirosVolta() { + return passageirosVolta; + } + + public void setPassageirosVolta(Integer passageirosVolta) { + this.passageirosVolta = passageirosVolta; + } + + public Integer getGratuidadePasseLivreIda() { + return gratuidadePasseLivreIda; + } + + public void setGratuidadePasseLivreIda(Integer gratuidadePasseLivreIda) { + this.gratuidadePasseLivreIda = gratuidadePasseLivreIda; + } + + public Integer getGratuidadePasseLivreVolta() { + return gratuidadePasseLivreVolta; + } + + public void setGratuidadePasseLivreVolta(Integer gratuidadePasseLivreVolta) { + this.gratuidadePasseLivreVolta = gratuidadePasseLivreVolta; + } + + public Integer getGratuidadeIdosoIda() { + return gratuidadeIdosoIda; + } + + public void setGratuidadeIdosoIda(Integer gratuidadeIdosoIda) { + this.gratuidadeIdosoIda = gratuidadeIdosoIda; + } + + public Integer getGratuidadeIdosoVolta() { + return gratuidadeIdosoVolta; + } + + public void setGratuidadeIdosoVolta(Integer gratuidadeIdosoVolta) { + this.gratuidadeIdosoVolta = gratuidadeIdosoVolta; + } + + public Integer getDescontoIdosoIda() { + return descontoIdosoIda; + } + + public void setDescontoIdosoIda(Integer descontoIdosoIda) { + this.descontoIdosoIda = descontoIdosoIda; + } + + public Integer getDescontoIdosoVolta() { + return descontoIdosoVolta; + } + + public void setDescontoIdosoVolta(Integer descontoIdosoVolta) { + this.descontoIdosoVolta = descontoIdosoVolta; + } + + public Integer getGratuidadeEstudanteIda() { + return gratuidadeEstudanteIda; + } + + public void setGratuidadeEstudanteIda(Integer gratuidadeEstudanteIda) { + this.gratuidadeEstudanteIda = gratuidadeEstudanteIda; + } + + public Integer getGratuidadeEstudanteVolta() { + return gratuidadeEstudanteVolta; + } + + public void setGratuidadeEstudanteVolta(Integer gratuidadeEstudanteVolta) { + this.gratuidadeEstudanteVolta = gratuidadeEstudanteVolta; + } + + public Integer getGratuidadeProfessorIda() { + return gratuidadeProfessorIda; + } + + public void setGratuidadeProfessorIda(Integer gratuidadeProfessorIda) { + this.gratuidadeProfessorIda = gratuidadeProfessorIda; + } + + public Integer getGratuidadeProfessorVolta() { + return gratuidadeProfessorVolta; + } + + public void setGratuidadeProfessorVolta(Integer gratuidadeProfessorVolta) { + this.gratuidadeProfessorVolta = gratuidadeProfessorVolta; + } + + @Override + public String toString() { + return antt + ";" + prefixo + ";" + localOrigem + ";" + localDestino + ";" + mes + ";" + ano + ";" + passageirosIda + ";" + passageirosVolta + ";" + gratuidadePasseLivreIda + ";" + gratuidadePasseLivreVolta + ";" + gratuidadeIdosoIda + ";" + gratuidadeIdosoVolta + ";" + descontoIdosoIda + ";" + descontoIdosoVolta + ";" + gratuidadeJovenIda + ";" + gratuidadeJovenVolta + ";" + descontoJovenIda + ";" + descontoJovenVolta + + gratuidadeEstudanteIda + ";" + gratuidadeEstudanteVolta + ";" + gratuidadeProfessorIda + ";" + gratuidadeProfessorVolta; + } + + public String toStringSisdap() { + return antt + ";" + prefixo + ";" + localOrigem + ";" + localDestino + ";" + mes + ";" + ano + ";" + passageirosIda + ";" + passageirosVolta + ";" + gratuidadePasseLivreIda + ";" + gratuidadePasseLivreVolta + ";" + gratuidadeIdosoIda + ";" + gratuidadeIdosoVolta + ";" + descontoIdosoIda + ";" + descontoIdosoVolta + ";" + gratuidadeJovenIda + ";" + gratuidadeJovenVolta + ";" + descontoJovenIda + ";" + descontoJovenVolta ; + } +} diff --git a/src/com/rjconsultores/ventaboletos/relatorios/PrefixoAntt.java b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/PrefixoAntt.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/relatorios/PrefixoAntt.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/PrefixoAntt.java index 969f9e907..dea4cfd6a 100644 --- a/src/com/rjconsultores/ventaboletos/relatorios/PrefixoAntt.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/PrefixoAntt.java @@ -1,84 +1,84 @@ -package com.rjconsultores.ventaboletos.relatorios; - -public class PrefixoAntt { - private String antt; - private String prefixo; - private String localOrigem; - private String localDestino; - - public String getAntt() { - return antt; - } - - public void setAntt(String antt) { - this.antt = antt; - } - - public String getPrefixo() { - return prefixo; - } - - public void setPrefixo(String prefixo) { - this.prefixo = prefixo; - } - - public String getLocalOrigem() { - return localOrigem; - } - - public void setLocalOrigem(String localOrigem) { - this.localOrigem = localOrigem; - } - - public String getLocalDestino() { - return localDestino; - } - - public void setLocalDestino(String localDestino) { - this.localDestino = localDestino; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((antt == null) ? 0 : antt.hashCode()); - result = prime * result + ((localDestino == null) ? 0 : localDestino.hashCode()); - result = prime * result + ((localOrigem == null) ? 0 : localOrigem.hashCode()); - result = prime * result + ((prefixo == null) ? 0 : prefixo.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PrefixoAntt other = (PrefixoAntt) obj; - if (antt == null) { - if (other.antt != null) - return false; - } else if (!antt.equals(other.antt)) - return false; - if (localDestino == null) { - if (other.localDestino != null) - return false; - } else if (!localDestino.equals(other.localDestino)) - return false; - if (localOrigem == null) { - if (other.localOrigem != null) - return false; - } else if (!localOrigem.equals(other.localOrigem)) - return false; - if (prefixo == null) { - if (other.prefixo != null) - return false; - } else if (!prefixo.equals(other.prefixo)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.relatorios; + +public class PrefixoAntt { + private String antt; + private String prefixo; + private String localOrigem; + private String localDestino; + + public String getAntt() { + return antt; + } + + public void setAntt(String antt) { + this.antt = antt; + } + + public String getPrefixo() { + return prefixo; + } + + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } + + public String getLocalOrigem() { + return localOrigem; + } + + public void setLocalOrigem(String localOrigem) { + this.localOrigem = localOrigem; + } + + public String getLocalDestino() { + return localDestino; + } + + public void setLocalDestino(String localDestino) { + this.localDestino = localDestino; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((antt == null) ? 0 : antt.hashCode()); + result = prime * result + ((localDestino == null) ? 0 : localDestino.hashCode()); + result = prime * result + ((localOrigem == null) ? 0 : localOrigem.hashCode()); + result = prime * result + ((prefixo == null) ? 0 : prefixo.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PrefixoAntt other = (PrefixoAntt) obj; + if (antt == null) { + if (other.antt != null) + return false; + } else if (!antt.equals(other.antt)) + return false; + if (localDestino == null) { + if (other.localDestino != null) + return false; + } else if (!localDestino.equals(other.localDestino)) + return false; + if (localOrigem == null) { + if (other.localOrigem != null) + return false; + } else if (!localOrigem.equals(other.localOrigem)) + return false; + if (prefixo == null) { + if (other.prefixo != null) + return false; + } else if (!prefixo.equals(other.prefixo)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java index c680ea8f7..fdb96ae0f 100644 --- a/src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/relatorios/receitaDespesa/RelatorioFinanceiroReceitasDespesasBean.java @@ -1,234 +1,234 @@ -package com.rjconsultores.ventaboletos.relatorios.receitaDespesa; - -import java.math.BigDecimal; -import java.util.Date; - -public class RelatorioFinanceiroReceitasDespesasBean { - - public static Integer TIPO_CREDITO = 1; - public static Integer TIPO_DEBITO = 0; - - private Date fecHorVta; - private Integer puntoVentaId; - private Integer indtipo; - private String nombPuntoVenta; - private String tipoEventoExtraId; - private String numPuntoVenta; - private String formaPagamento; - private String numSeriePreImpresa; - private String numFolioPreImpreso; - private String numDocumento; - private String descTipoEvento; - private BigDecimal precio; - private BigDecimal receita; - private BigDecimal despesa; - private String formaPagamento1; - private String formaPagamento2; - private String formaPagamento3; - private BigDecimal ValorFormaPagamento1; - private BigDecimal ValorFormaPagamento2; - private BigDecimal ValorFormaPagamento3; - private String cveTipoEvento; - private String boletoId; - private String descricao; - - public Date getFecHorVta() { - return fecHorVta; - } - - public void setFecHorVta(Date fecHorVta) { - this.fecHorVta = fecHorVta; - } - - public Integer getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - - public String getNombPuntoVenta() { - return nombPuntoVenta; - } - - public void setNombPuntoVenta(String nombPuntoVenta) { - this.nombPuntoVenta = nombPuntoVenta; - } - - public String getTipoEventoExtraId() { - return tipoEventoExtraId; - } - - public void setTipoEventoExtraId(String tipoEventoExtraId) { - this.tipoEventoExtraId = tipoEventoExtraId; - } - - public String getDescTipoEvento() { - return descTipoEvento; - } - - public void setDescTipoEvento(String descTipoEvento) { - this.descTipoEvento = descTipoEvento; - } - - public BigDecimal getPrecio() { - return precio; - } - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - public BigDecimal getReceita() { - return receita != null ? receita : BigDecimal.ZERO; - } - - public void setReceita(BigDecimal receita) { - this.receita = receita; - } - - public BigDecimal getDespesa() { - return despesa != null ? despesa : BigDecimal.ZERO; - } - - public void setDespesa(BigDecimal despesa) { - this.despesa = despesa; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - - public BigDecimal getSaldo() { - return getReceita().add(getDespesa()); - } - - public Integer getIndtipo() { - return indtipo; - } - - public void setIndtipo(Integer indtipo) { - this.indtipo = indtipo; - } - - public String getDescTipo() { - if(getIndtipo() != null) { - if(getIndtipo().equals(TIPO_CREDITO)) { - return "Receita"; - } else if(getIndtipo().equals(TIPO_DEBITO)) { - return "Despesa"; - } - } - return null; - } - - public String getNumSeriePreImpresa() { - return numSeriePreImpresa; - } - - public void setNumSeriePreImpresa(String numSeriePreImpresa) { - this.numSeriePreImpresa = numSeriePreImpresa; - } - - public String getNumFolioPreImpreso() { - return numFolioPreImpreso; - } - - public void setNumFolioPreImpreso(String numFolioPreImpreso) { - this.numFolioPreImpreso = numFolioPreImpreso; - } - - public String getNumDocumento() { - return numDocumento; - } - - public void setNumDocumento(String numDocumento) { - this.numDocumento = numDocumento; - } - - public String getFormaPagamento() { - return formaPagamento; - } - - public void setFormaPagamento(String formaPagamento) { - this.formaPagamento = formaPagamento; - } - - public String getFormaPagamento1() { - return formaPagamento1; - } - - public void setFormaPagamento1(String formaPagamento1) { - this.formaPagamento1 = formaPagamento1; - } - - public String getFormaPagamento2() { - return formaPagamento2; - } - - public void setFormaPagamento2(String formaPagamento2) { - this.formaPagamento2 = formaPagamento2; - } - - public String getFormaPagamento3() { - return formaPagamento3; - } - - public void setFormaPagamento3(String formaPagamento3) { - this.formaPagamento3 = formaPagamento3; - } - - public BigDecimal getValorFormaPagamento1() { - return ValorFormaPagamento1 != null ? ValorFormaPagamento1 : BigDecimal.ZERO; - } - - public void setValorFormaPagamento1(BigDecimal valorFormaPagamento1) { - ValorFormaPagamento1 = valorFormaPagamento1; - } - - public BigDecimal getValorFormaPagamento2() { - return ValorFormaPagamento2 != null ? ValorFormaPagamento2 : BigDecimal.ZERO; - } - - public void setValorFormaPagamento2(BigDecimal valorFormaPagamento2) { - ValorFormaPagamento2 = valorFormaPagamento2; - } - - public BigDecimal getValorFormaPagamento3() { - return ValorFormaPagamento3 != null ? ValorFormaPagamento3 : BigDecimal.ZERO; - } - - public void setValorFormaPagamento3(BigDecimal valorFormaPagamento3) { - ValorFormaPagamento3 = valorFormaPagamento3; - } - - public String getCveTipoEvento() { - return cveTipoEvento; - } - - public void setCveTipoEvento(String cveTipoEvento) { - this.cveTipoEvento = cveTipoEvento; - } - - public String getBoletoId() { - return boletoId; - } - - public void setBoletoId(String boletoId) { - this.boletoId = boletoId; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - -} +package com.rjconsultores.ventaboletos.relatorios.receitaDespesa; + +import java.math.BigDecimal; +import java.util.Date; + +public class RelatorioFinanceiroReceitasDespesasBean { + + public static Integer TIPO_CREDITO = 1; + public static Integer TIPO_DEBITO = 0; + + private Date fecHorVta; + private Integer puntoVentaId; + private Integer indtipo; + private String nombPuntoVenta; + private String tipoEventoExtraId; + private String numPuntoVenta; + private String formaPagamento; + private String numSeriePreImpresa; + private String numFolioPreImpreso; + private String numDocumento; + private String descTipoEvento; + private BigDecimal precio; + private BigDecimal receita; + private BigDecimal despesa; + private String formaPagamento1; + private String formaPagamento2; + private String formaPagamento3; + private BigDecimal ValorFormaPagamento1; + private BigDecimal ValorFormaPagamento2; + private BigDecimal ValorFormaPagamento3; + private String cveTipoEvento; + private String boletoId; + private String descricao; + + public Date getFecHorVta() { + return fecHorVta; + } + + public void setFecHorVta(Date fecHorVta) { + this.fecHorVta = fecHorVta; + } + + public Integer getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + + public String getNombPuntoVenta() { + return nombPuntoVenta; + } + + public void setNombPuntoVenta(String nombPuntoVenta) { + this.nombPuntoVenta = nombPuntoVenta; + } + + public String getTipoEventoExtraId() { + return tipoEventoExtraId; + } + + public void setTipoEventoExtraId(String tipoEventoExtraId) { + this.tipoEventoExtraId = tipoEventoExtraId; + } + + public String getDescTipoEvento() { + return descTipoEvento; + } + + public void setDescTipoEvento(String descTipoEvento) { + this.descTipoEvento = descTipoEvento; + } + + public BigDecimal getPrecio() { + return precio; + } + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + public BigDecimal getReceita() { + return receita != null ? receita : BigDecimal.ZERO; + } + + public void setReceita(BigDecimal receita) { + this.receita = receita; + } + + public BigDecimal getDespesa() { + return despesa != null ? despesa : BigDecimal.ZERO; + } + + public void setDespesa(BigDecimal despesa) { + this.despesa = despesa; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + + public BigDecimal getSaldo() { + return getReceita().add(getDespesa()); + } + + public Integer getIndtipo() { + return indtipo; + } + + public void setIndtipo(Integer indtipo) { + this.indtipo = indtipo; + } + + public String getDescTipo() { + if(getIndtipo() != null) { + if(getIndtipo().equals(TIPO_CREDITO)) { + return "Receita"; + } else if(getIndtipo().equals(TIPO_DEBITO)) { + return "Despesa"; + } + } + return null; + } + + public String getNumSeriePreImpresa() { + return numSeriePreImpresa; + } + + public void setNumSeriePreImpresa(String numSeriePreImpresa) { + this.numSeriePreImpresa = numSeriePreImpresa; + } + + public String getNumFolioPreImpreso() { + return numFolioPreImpreso; + } + + public void setNumFolioPreImpreso(String numFolioPreImpreso) { + this.numFolioPreImpreso = numFolioPreImpreso; + } + + public String getNumDocumento() { + return numDocumento; + } + + public void setNumDocumento(String numDocumento) { + this.numDocumento = numDocumento; + } + + public String getFormaPagamento() { + return formaPagamento; + } + + public void setFormaPagamento(String formaPagamento) { + this.formaPagamento = formaPagamento; + } + + public String getFormaPagamento1() { + return formaPagamento1; + } + + public void setFormaPagamento1(String formaPagamento1) { + this.formaPagamento1 = formaPagamento1; + } + + public String getFormaPagamento2() { + return formaPagamento2; + } + + public void setFormaPagamento2(String formaPagamento2) { + this.formaPagamento2 = formaPagamento2; + } + + public String getFormaPagamento3() { + return formaPagamento3; + } + + public void setFormaPagamento3(String formaPagamento3) { + this.formaPagamento3 = formaPagamento3; + } + + public BigDecimal getValorFormaPagamento1() { + return ValorFormaPagamento1 != null ? ValorFormaPagamento1 : BigDecimal.ZERO; + } + + public void setValorFormaPagamento1(BigDecimal valorFormaPagamento1) { + ValorFormaPagamento1 = valorFormaPagamento1; + } + + public BigDecimal getValorFormaPagamento2() { + return ValorFormaPagamento2 != null ? ValorFormaPagamento2 : BigDecimal.ZERO; + } + + public void setValorFormaPagamento2(BigDecimal valorFormaPagamento2) { + ValorFormaPagamento2 = valorFormaPagamento2; + } + + public BigDecimal getValorFormaPagamento3() { + return ValorFormaPagamento3 != null ? ValorFormaPagamento3 : BigDecimal.ZERO; + } + + public void setValorFormaPagamento3(BigDecimal valorFormaPagamento3) { + ValorFormaPagamento3 = valorFormaPagamento3; + } + + public String getCveTipoEvento() { + return cveTipoEvento; + } + + public void setCveTipoEvento(String cveTipoEvento) { + this.cveTipoEvento = cveTipoEvento; + } + + public String getBoletoId() { + return boletoId; + } + + public void setBoletoId(String boletoId) { + this.boletoId = boletoId; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java index 3f4c58e41..b21e4e809 100644 --- a/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java @@ -1,138 +1,138 @@ -package com.rjconsultores.ventaboletos.rest; - -import java.io.IOException; - -import org.apache.commons.codec.binary.Base64; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.util.EntityUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; -import org.zkoss.zkplus.spring.SpringUtil; - -import com.rjconsultores.ventaboletos.service.ConstanteService; -/** - * @author vjcor - * - */ -public class ContingenciaClienteRest { - - - public enum ETipoEnvio { - GET, POST; - } - - private static final String CONSTANTE_BPE_URL = "BPE_URL"; - private static final String CREDENCIAIS = "rjconsultores:RJ#C0nsul10res@2019"; - private static final String PATH_CONSULTA_STATUS = "/BPeRS/rest/adm/contingencia/tipoEmissaoEmpresa"; - private static final String PATH_DEFINIR_STATUS = "/BPeRS/rest/adm/contingencia/definirTipoEmissaoEmpresa"; - - private static final Logger log = LogManager.getLogger(ContingenciaClienteRest.class); - - private static ContingenciaClienteRest instance; - - private ContingenciaClienteRest() { - } - - public static synchronized ContingenciaClienteRest getInstance() { - if(instance == null) { - instance = new ContingenciaClienteRest(); - } - return instance; - } - - public Integer consultar(String bpeURL, String uf, String ambiente, String cnpj) { - try { - return verificarStatus(getURI(bpeURL, PATH_CONSULTA_STATUS, uf, ambiente, cnpj), ETipoEnvio.GET); - } catch (IOException e) { - log.error(e); - } catch (JSONException e) { - log.error(e); - } catch (IllegalStateException e) { - log.error(e); - } - return null; - } - - public Integer definir(String bpeURL,String uf, String ambiente, String cnpj, Integer idStatus) { - try { - return verificarStatus(getURI(bpeURL, PATH_DEFINIR_STATUS, uf, ambiente, cnpj, idStatus), ETipoEnvio.POST); - } catch (IOException e) { - log.error(e); - } catch (JSONException e) { - log.error(e); - } catch (IllegalStateException e) { - log.error("Erro no envio/retorno da requisicao para BPERS", e); - } - return null; - } - - private String buscarConstanteURL() { - return getConstanteService().buscarPorNomeConstante(CONSTANTE_BPE_URL).getValorconstante(); - } - - private ConstanteService getConstanteService() { - return (ConstanteService) SpringUtil.getBean("constanteService"); - } - - private Integer verificarStatus(String uri, ETipoEnvio tipoEnvio) throws IOException, JSONException, IllegalStateException { - HttpClient client = new DefaultHttpClient(); - HttpUriRequest request = getRequest(uri, tipoEnvio); - HttpResponse response = client.execute(request); - - if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK - && response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) { - throw new IllegalStateException("Ocorreu um erro na requisição." + response.getStatusLine() !=null ? response.getStatusLine().getReasonPhrase() : ""); - } - - return getRetornoJSON(response); - } - - private Integer getRetornoJSON(HttpResponse response) throws IOException, JSONException { - HttpEntity entity = response.getEntity(); - - if (entity != null) { - String rest = EntityUtils.toString(entity); - JSONObject result = new JSONObject(rest); - return Integer.valueOf(result.get("tpEmis").toString()); - } - return null; - } - - private HttpUriRequest getRequest(String uri, ETipoEnvio tipoEnvio) { - HttpUriRequest request = ETipoEnvio.GET.equals(tipoEnvio) ? new HttpGet(uri) : new HttpPost(uri); - request.addHeader("Authorization", getAuthorization()); - return request; - } - - private String getAuthorization() { - return "Basic " + new String(Base64.encodeBase64(CREDENCIAIS.getBytes())); - } - - private String getURI(String bpeURL, String path, String uf, String ambiente, String cnpj) { - StringBuilder uri = new StringBuilder(); - uri.append(bpeURL); - uri.append(path); - uri.append("?uf=").append(uf); - uri.append("&ambiente=").append(ambiente); - uri.append("&cnpj=").append(cnpj); - - return uri.toString(); - } - - private String getURI(String bpeURL, String path, String uf, String ambiente, String cnpj, Integer idStatus) { - StringBuilder uri = new StringBuilder(); - uri.append(getURI(bpeURL, path, uf, ambiente, cnpj)); - uri.append("&tpEmis=").append(idStatus); - - return uri.toString(); - } -} +package com.rjconsultores.ventaboletos.rest; + +import java.io.IOException; + +import org.apache.commons.codec.binary.Base64; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.util.EntityUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; +import org.zkoss.zkplus.spring.SpringUtil; + +import com.rjconsultores.ventaboletos.service.ConstanteService; +/** + * @author vjcor + * + */ +public class ContingenciaClienteRest { + + + public enum ETipoEnvio { + GET, POST; + } + + private static final String CONSTANTE_BPE_URL = "BPE_URL"; + private static final String CREDENCIAIS = "rjconsultores:RJ#C0nsul10res@2019"; + private static final String PATH_CONSULTA_STATUS = "/BPeRS/rest/adm/contingencia/tipoEmissaoEmpresa"; + private static final String PATH_DEFINIR_STATUS = "/BPeRS/rest/adm/contingencia/definirTipoEmissaoEmpresa"; + + private static final Logger log = LogManager.getLogger(ContingenciaClienteRest.class); + + private static ContingenciaClienteRest instance; + + private ContingenciaClienteRest() { + } + + public static synchronized ContingenciaClienteRest getInstance() { + if(instance == null) { + instance = new ContingenciaClienteRest(); + } + return instance; + } + + public Integer consultar(String bpeURL, String uf, String ambiente, String cnpj) { + try { + return verificarStatus(getURI(bpeURL, PATH_CONSULTA_STATUS, uf, ambiente, cnpj), ETipoEnvio.GET); + } catch (IOException e) { + log.error(e); + } catch (JSONException e) { + log.error(e); + } catch (IllegalStateException e) { + log.error(e); + } + return null; + } + + public Integer definir(String bpeURL,String uf, String ambiente, String cnpj, Integer idStatus) { + try { + return verificarStatus(getURI(bpeURL, PATH_DEFINIR_STATUS, uf, ambiente, cnpj, idStatus), ETipoEnvio.POST); + } catch (IOException e) { + log.error(e); + } catch (JSONException e) { + log.error(e); + } catch (IllegalStateException e) { + log.error("Erro no envio/retorno da requisicao para BPERS", e); + } + return null; + } + + private String buscarConstanteURL() { + return getConstanteService().buscarPorNomeConstante(CONSTANTE_BPE_URL).getValorconstante(); + } + + private ConstanteService getConstanteService() { + return (ConstanteService) SpringUtil.getBean("constanteService"); + } + + private Integer verificarStatus(String uri, ETipoEnvio tipoEnvio) throws IOException, JSONException, IllegalStateException { + HttpClient client = new DefaultHttpClient(); + HttpUriRequest request = getRequest(uri, tipoEnvio); + HttpResponse response = client.execute(request); + + if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK + && response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) { + throw new IllegalStateException("Ocorreu um erro na requisição." + response.getStatusLine() !=null ? response.getStatusLine().getReasonPhrase() : ""); + } + + return getRetornoJSON(response); + } + + private Integer getRetornoJSON(HttpResponse response) throws IOException, JSONException { + HttpEntity entity = response.getEntity(); + + if (entity != null) { + String rest = EntityUtils.toString(entity); + JSONObject result = new JSONObject(rest); + return Integer.valueOf(result.get("tpEmis").toString()); + } + return null; + } + + private HttpUriRequest getRequest(String uri, ETipoEnvio tipoEnvio) { + HttpUriRequest request = ETipoEnvio.GET.equals(tipoEnvio) ? new HttpGet(uri) : new HttpPost(uri); + request.addHeader("Authorization", getAuthorization()); + return request; + } + + private String getAuthorization() { + return "Basic " + new String(Base64.encodeBase64(CREDENCIAIS.getBytes())); + } + + private String getURI(String bpeURL, String path, String uf, String ambiente, String cnpj) { + StringBuilder uri = new StringBuilder(); + uri.append(bpeURL); + uri.append(path); + uri.append("?uf=").append(uf); + uri.append("&ambiente=").append(ambiente); + uri.append("&cnpj=").append(cnpj); + + return uri.toString(); + } + + private String getURI(String bpeURL, String path, String uf, String ambiente, String cnpj, Integer idStatus) { + StringBuilder uri = new StringBuilder(); + uri.append(getURI(bpeURL, path, uf, ambiente, cnpj)); + uri.append("&tpEmis=").append(idStatus); + + return uri.toString(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java index 0c665e884..d0ab38364 100644 --- a/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java @@ -1,131 +1,131 @@ -package com.rjconsultores.ventaboletos.rest; - -import org.apache.commons.codec.binary.Base64; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.codehaus.jettison.json.JSONObject; - -import com.rjconsultores.ventaboletos.enums.TipoEnvioRest; -import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; - -public class IntegracaoSapRest { - - private static final Logger log = LogManager.getLogger(IntegracaoSapRest.class); - - private static IntegracaoSapRest instance; - - public static synchronized IntegracaoSapRest getInstance() { - if(instance == null) { - instance = new IntegracaoSapRest(); - } - return instance; - } - - public JSONObject enviarIntegracaoSap( FechamentoCntCorrenteVO fechamento, String url, String credenciais ) { - try { - HttpClient client = HttpClientBuilder.create().build(); - HttpUriRequest request = getRequest( url, TipoEnvioRest.POST, credenciais, fechamtoToJson(fechamento)); - HttpResponse response = client.execute(request); - - if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK - && response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) { - throw new Exception("Ocorreu um erro na requisição." + response.getStatusLine() !=null ? response.getStatusLine().getReasonPhrase() : ""); - } - - return getRetornoJSON(response); - } catch (RuntimeException e) { - throw new RuntimeException("Erro na conversão do JSON na integração SAP", e); - } catch (Exception e) { - log.error("Erro no envio/retorno da requisicao para integração SAP", e); - e.printStackTrace(); - } - return null; - } - - private JSONObject getRetornoJSON(HttpResponse response){ - String rest = ""; - try { - HttpEntity entity = response.getEntity(); - - if (entity != null) { - rest = EntityUtils.toString(entity); - JSONObject result = new JSONObject(rest); - JSONObject boleto = result.getJSONObject("MT_Boleto_RES"); - return boleto.getJSONArray("ReturnERP").getJSONObject(0); - } - return null; - }catch(Exception e) { - log.error("Erro no JSON integração SAP: "+rest); - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - private String fechamtoToJson( FechamentoCntCorrenteVO fcc){ - - StringBuilder json = new StringBuilder(); - json.append("{"); - json.append(" \"ID_LEGADO\": \"010\","); - json.append(" \"AGENCIA\": {"); - json.append(" \"KUNNR\": \"").append( formatarValorPorTamanhoZeroEsquerda(fcc.getNumPuntoVenta(), 10)).append("\","); - json.append(" \"TSTCD1\": \"").append( fcc.getCnpjPuntoVenta()).append("\""); - json.append(" },"); - json.append(" \"BOLETO\": [{"); - json.append(" \"ZBUKRS\": \"").append(fcc.getEmpresaId()).append("\","); - json.append(" \"ZZFCAIXA\": \"").append(fcc.getFechamentocntcorrenteId()).append("\","); - json.append(" \"FILIAL\": {"); - json.append(" \"UF\": \"").append(fcc.getUfEmpresa()).append("\","); - json.append(" },"); - json.append(" \"GJAHR\": \"").append(fcc.getAnofechamento()).append("\","); - json.append(" \"MONAT\": \"").append(fcc.getMesfechamento()).append("\","); - json.append(" \"BLDAT\": \"").append(fcc.getFecfechamento()).append("\","); - json.append(" \"BUDAT\": \"").append(fcc.getFeclancamento()).append("\","); - json.append(" \"XBLNR\": \"").append(fcc.getNumPuntoVenta()).append("\","); - json.append(" \"WRBTR\": \"").append( fcc.getTotal().toString().replace(",", ".") ).append("\","); - json.append(" }]"); - json.append("}"); - - return json.toString(); - } - - private HttpUriRequest getRequest(String uri, TipoEnvioRest tipoEnvio, String credenciais, String json) throws Exception { - HttpPost request = new HttpPost(uri); - StringEntity entity = new StringEntity(json); - - request.addHeader("Authorization", getAuthorization(credenciais)); - request.setHeader("Accept", "application/json"); - request.setHeader("Content-type", "application/json"); - request.setEntity(entity); -// request.addHeader(new BasicScheme().authenticate(creds, httpPost, null)); - return request; - } - - private String getAuthorization( String credenciais ) { - return "Basic " + new String(Base64.encodeBase64(credenciais.getBytes())); - } - - public static String formatarValorPorTamanhoZeroEsquerda(String value, int tamanho) { - - value = value == null ? "" : value; - - if(value.length() > tamanho){ - value = value.substring(0, tamanho); - } - - while(value.length() < tamanho){ - value = "0" + value; - } - - return value; - } - -} +package com.rjconsultores.ventaboletos.rest; + +import org.apache.commons.codec.binary.Base64; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.codehaus.jettison.json.JSONObject; + +import com.rjconsultores.ventaboletos.enums.TipoEnvioRest; +import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; + +public class IntegracaoSapRest { + + private static final Logger log = LogManager.getLogger(IntegracaoSapRest.class); + + private static IntegracaoSapRest instance; + + public static synchronized IntegracaoSapRest getInstance() { + if(instance == null) { + instance = new IntegracaoSapRest(); + } + return instance; + } + + public JSONObject enviarIntegracaoSap( FechamentoCntCorrenteVO fechamento, String url, String credenciais ) { + try { + HttpClient client = HttpClientBuilder.create().build(); + HttpUriRequest request = getRequest( url, TipoEnvioRest.POST, credenciais, fechamtoToJson(fechamento)); + HttpResponse response = client.execute(request); + + if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK + && response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) { + throw new Exception("Ocorreu um erro na requisição." + response.getStatusLine() !=null ? response.getStatusLine().getReasonPhrase() : ""); + } + + return getRetornoJSON(response); + } catch (RuntimeException e) { + throw new RuntimeException("Erro na conversão do JSON na integração SAP", e); + } catch (Exception e) { + log.error("Erro no envio/retorno da requisicao para integração SAP", e); + e.printStackTrace(); + } + return null; + } + + private JSONObject getRetornoJSON(HttpResponse response){ + String rest = ""; + try { + HttpEntity entity = response.getEntity(); + + if (entity != null) { + rest = EntityUtils.toString(entity); + JSONObject result = new JSONObject(rest); + JSONObject boleto = result.getJSONObject("MT_Boleto_RES"); + return boleto.getJSONArray("ReturnERP").getJSONObject(0); + } + return null; + }catch(Exception e) { + log.error("Erro no JSON integração SAP: "+rest); + e.printStackTrace(); + throw new RuntimeException(e); + } + } + + private String fechamtoToJson( FechamentoCntCorrenteVO fcc){ + + StringBuilder json = new StringBuilder(); + json.append("{"); + json.append(" \"ID_LEGADO\": \"010\","); + json.append(" \"AGENCIA\": {"); + json.append(" \"KUNNR\": \"").append( formatarValorPorTamanhoZeroEsquerda(fcc.getNumPuntoVenta(), 10)).append("\","); + json.append(" \"TSTCD1\": \"").append( fcc.getCnpjPuntoVenta()).append("\""); + json.append(" },"); + json.append(" \"BOLETO\": [{"); + json.append(" \"ZBUKRS\": \"").append(fcc.getEmpresaId()).append("\","); + json.append(" \"ZZFCAIXA\": \"").append(fcc.getFechamentocntcorrenteId()).append("\","); + json.append(" \"FILIAL\": {"); + json.append(" \"UF\": \"").append(fcc.getUfEmpresa()).append("\","); + json.append(" },"); + json.append(" \"GJAHR\": \"").append(fcc.getAnofechamento()).append("\","); + json.append(" \"MONAT\": \"").append(fcc.getMesfechamento()).append("\","); + json.append(" \"BLDAT\": \"").append(fcc.getFecfechamento()).append("\","); + json.append(" \"BUDAT\": \"").append(fcc.getFeclancamento()).append("\","); + json.append(" \"XBLNR\": \"").append(fcc.getNumPuntoVenta()).append("\","); + json.append(" \"WRBTR\": \"").append( fcc.getTotal().toString().replace(",", ".") ).append("\","); + json.append(" }]"); + json.append("}"); + + return json.toString(); + } + + private HttpUriRequest getRequest(String uri, TipoEnvioRest tipoEnvio, String credenciais, String json) throws Exception { + HttpPost request = new HttpPost(uri); + StringEntity entity = new StringEntity(json); + + request.addHeader("Authorization", getAuthorization(credenciais)); + request.setHeader("Accept", "application/json"); + request.setHeader("Content-type", "application/json"); + request.setEntity(entity); +// request.addHeader(new BasicScheme().authenticate(creds, httpPost, null)); + return request; + } + + private String getAuthorization( String credenciais ) { + return "Basic " + new String(Base64.encodeBase64(credenciais.getBytes())); + } + + public static String formatarValorPorTamanhoZeroEsquerda(String value, int tamanho) { + + value = value == null ? "" : value; + + if(value.length() > tamanho){ + value = value.substring(0, tamanho); + } + + while(value.length() < tamanho){ + value = "0" + value; + } + + return value; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/rest/LabelaryService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/LabelaryService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/rest/LabelaryService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/rest/LabelaryService.java diff --git a/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java diff --git a/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java diff --git a/src/com/rjconsultores/ventaboletos/rest/generic/RetornoGenericRest.java b/ModelWeb/src/com/rjconsultores/ventaboletos/rest/generic/RetornoGenericRest.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/rest/generic/RetornoGenericRest.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/rest/generic/RetornoGenericRest.java diff --git a/src/com/rjconsultores/ventaboletos/service/AbastoBoletoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoBoletoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AbastoBoletoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoBoletoService.java index 74bda2e31..a9642bea7 100644 --- a/src/com/rjconsultores/ventaboletos/service/AbastoBoletoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoBoletoService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface AbastoBoletoService extends GenericService { - - public AbastoBoleto movimentaAbasto(AbastoBoleto abastoBoleto, PuntoVenta destino) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface AbastoBoletoService extends GenericService { + + public AbastoBoleto movimentaAbasto(AbastoBoleto abastoBoleto, PuntoVenta destino) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/AbastoCentralService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoCentralService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/AbastoCentralService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoCentralService.java index 1135f51bf..f4a3ea013 100644 --- a/src/com/rjconsultores/ventaboletos/service/AbastoCentralService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoCentralService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.Aidf; - - -public interface AbastoCentralService extends GenericService { - - public List buscaBilhetesPorAidf(Aidf aidf); - public void borrarLosQueTienenAIDF(Aidf aidf); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.Aidf; + + +public interface AbastoCentralService extends GenericService { + + public List buscaBilhetesPorAidf(Aidf aidf); + public void borrarLosQueTienenAIDF(Aidf aidf); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AbastoHistoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoHistoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AbastoHistoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoHistoService.java index 979d3263f..5772ebeae 100644 --- a/src/com/rjconsultores/ventaboletos/service/AbastoHistoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AbastoHistoService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.AbastoHisto; -import com.rjconsultores.ventaboletos.entidad.Aidf; - -public interface AbastoHistoService extends GenericService { - public void borrarLosQueTienenAIDF(Aidf aidf); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.AbastoHisto; +import com.rjconsultores.ventaboletos.entidad.Aidf; + +public interface AbastoHistoService extends GenericService { + public void borrarLosQueTienenAIDF(Aidf aidf); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AgruparParadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AgruparParadaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/AgruparParadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AgruparParadaService.java index 2549737d3..96b8b287d 100644 --- a/src/com/rjconsultores/ventaboletos/service/AgruparParadaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AgruparParadaService.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface AgruparParadaService { - - public AgrupamentoParada obtenerID(Integer id); - - public List obtenerTodos(); - - public AgrupamentoParada suscribirActualizar(AgrupamentoParada entidad) throws BusinessException; - - public void borrar(AgrupamentoParada entidad); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface AgruparParadaService { + + public AgrupamentoParada obtenerID(Integer id); + + public List obtenerTodos(); + + public AgrupamentoParada suscribirActualizar(AgrupamentoParada entidad) throws BusinessException; + + public void borrar(AgrupamentoParada entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/AidfService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AidfService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AidfService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AidfService.java index fdafc9f75..df3fdd59c 100644 --- a/src/com/rjconsultores/ventaboletos/service/AidfService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AidfService.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.service; - -import java.sql.Connection; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.AidfEspecie; -import com.rjconsultores.ventaboletos.entidad.AidfTipo; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; - -public interface AidfService { - - public List obtenerTodos(); - - public Aidf obtenerID(Long id); - - public Aidf suscribir(Aidf entidad); - - public Aidf actualizacion(Aidf entidad); - - public void borrar(Aidf entidad); - - public List obtenerTodosAdifEspecie(); - - public List obtenerTodosAdifTipo(); - - public List buscaAidfsPorEmpresas(List empresas); - - public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda); - - public Long validarDocFiscalSerieFormInicialFinal(Aidf entidad, Connection conn); - - public Long validarSerieFormInicialFinal(Aidf entidad, Connection conn); - - public Boolean validarDocFiscalPorEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado); - - public Boolean validarTipoVenda(String tipoVenda, String serie, Integer idTipo); - - public Boolean validarVendaManual(Integer idTipo, String serie); - - public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId, Boolean isRMD); - - public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId); - - public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio); - - public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal,Estado estado, PuntoVenta puntoVenta); - - public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn, - Integer empresaId); -} +package com.rjconsultores.ventaboletos.service; + +import java.sql.Connection; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.AidfEspecie; +import com.rjconsultores.ventaboletos.entidad.AidfTipo; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; + +public interface AidfService { + + public List obtenerTodos(); + + public Aidf obtenerID(Long id); + + public Aidf suscribir(Aidf entidad); + + public Aidf actualizacion(Aidf entidad); + + public void borrar(Aidf entidad); + + public List obtenerTodosAdifEspecie(); + + public List obtenerTodosAdifTipo(); + + public List buscaAidfsPorEmpresas(List empresas); + + public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda); + + public Long validarDocFiscalSerieFormInicialFinal(Aidf entidad, Connection conn); + + public Long validarSerieFormInicialFinal(Aidf entidad, Connection conn); + + public Boolean validarDocFiscalPorEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado); + + public Boolean validarTipoVenda(String tipoVenda, String serie, Integer idTipo); + + public Boolean validarVendaManual(Integer idTipo, String serie); + + public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId, Boolean isRMD); + + public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId); + + public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio); + + public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal,Estado estado, PuntoVenta puntoVenta); + + public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn, + Integer empresaId); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AjusteEventoExtraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AjusteEventoExtraService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/AjusteEventoExtraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AjusteEventoExtraService.java index 44c132a1f..1b1a83edb 100644 --- a/src/com/rjconsultores/ventaboletos/service/AjusteEventoExtraService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AjusteEventoExtraService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; - -public interface AjusteEventoExtraService extends - GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; + +public interface AjusteEventoExtraService extends + GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/AlertaCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AlertaCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AlertaCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AlertaCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AliasClasseService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AliasClasseService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AliasClasseService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AliasClasseService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AliasServicoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AliasServicoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AliasServicoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AliasServicoService.java index 28595bde4..cbbdf4f87 100644 --- a/src/com/rjconsultores/ventaboletos/service/AliasServicoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AliasServicoService.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AliasServico; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface AliasServicoService{ - - public List obtenerTodos(); - - public AliasServico obtenerID(Integer id); - - public AliasServico suscribirActualizar(AliasServico entidad) throws BusinessException; - - public void borrar(AliasServico entidad); - - public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo); - - public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida); - - List buscarPorRuta(Integer rutaId); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AliasServico; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface AliasServicoService{ + + public List obtenerTodos(); + + public AliasServico obtenerID(Integer id); + + public AliasServico suscribirActualizar(AliasServico entidad) throws BusinessException; + + public void borrar(AliasServico entidad); + + public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo); + + public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida); + + List buscarPorRuta(Integer rutaId); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AliquotaEstadoDestinoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AliquotaEstadoDestinoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/AliquotaEstadoDestinoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AliquotaEstadoDestinoService.java index b32b908e8..c2b7e5eeb 100644 --- a/src/com/rjconsultores/ventaboletos/service/AliquotaEstadoDestinoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AliquotaEstadoDestinoService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; -import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; - -public interface AliquotaEstadoDestinoService { - - public AliquotaEstadoDestino suscribir(AliquotaEstadoDestino entidad); - - public List getChildrens(EmpresaImposto parent); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; +import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; + +public interface AliquotaEstadoDestinoService { + + public AliquotaEstadoDestino suscribir(AliquotaEstadoDestino entidad); + + public List getChildrens(EmpresaImposto parent); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ArquivoRemessaCNAB.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ArquivoRemessaCNAB.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ArquivoRemessaCNAB.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ArquivoRemessaCNAB.java index 55cea86a2..dc4798d53 100644 --- a/src/com/rjconsultores/ventaboletos/service/ArquivoRemessaCNAB.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ArquivoRemessaCNAB.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.ArquivoRemessa; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; - -public interface ArquivoRemessaCNAB extends GenericService { - - public ArquivoRemessa remessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); - - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); - - public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception; - - public List getEmpresas(); - - public boolean temPermissao(); - - public boolean boletosOk(List boletos); - - public boolean boletosAEnviar(List boletos); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.ArquivoRemessa; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; + +public interface ArquivoRemessaCNAB extends GenericService { + + public ArquivoRemessa remessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); + + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); + + public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception; + + public List getEmpresas(); + + public boolean temPermissao(); + + public boolean boletosOk(List boletos); + + public boolean boletosAEnviar(List boletos); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ArticuloService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ArticuloService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ArticuloService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ArticuloService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AsientoExclusivoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AsientoExclusivoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AsientoExclusivoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AsientoExclusivoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AsistenciaDeViajeEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AsistenciaDeViajeEmpresaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AsistenciaDeViajeEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AsistenciaDeViajeEmpresaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AuditLogService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditLogService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/AuditLogService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditLogService.java index de5336425..e6d902b2f 100644 --- a/src/com/rjconsultores/ventaboletos/service/AuditLogService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditLogService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AuditLog; -import com.rjconsultores.ventaboletos.entidad.AuditModule; - -public interface AuditLogService extends GenericService{ - public List carregarLog(AuditModule modulo); - - public List filtrarLog(AuditLog log); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AuditLog; +import com.rjconsultores.ventaboletos.entidad.AuditModule; + +public interface AuditLogService extends GenericService{ + public List carregarLog(AuditModule modulo); + + public List filtrarLog(AuditLog log); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AuditModuleService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditModuleService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/AuditModuleService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditModuleService.java index f38c24731..30e339192 100644 --- a/src/com/rjconsultores/ventaboletos/service/AuditModuleService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditModuleService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.AuditModule; - -public interface AuditModuleService extends GenericService { - - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.AuditModule; + +public interface AuditModuleService extends GenericService { + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/AuditServiceService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditServiceService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AuditServiceService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditServiceService.java index 5abfaa462..f72ea850e 100644 --- a/src/com/rjconsultores/ventaboletos/service/AuditServiceService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AuditServiceService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.AuditService; - -public interface AuditServiceService extends GenericService { - public AuditService carregarService(AuditService auditService); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.AuditService; + +public interface AuditServiceService extends GenericService { + public AuditService carregarService(AuditService auditService); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AutobusDocService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutobusDocService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AutobusDocService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AutobusDocService.java index f7e38687e..c621263a6 100644 --- a/src/com/rjconsultores/ventaboletos/service/AutobusDocService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutobusDocService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Autobus; -import com.rjconsultores.ventaboletos.entidad.AutobusDoc; - -public interface AutobusDocService extends GenericService { - public List obtenerPorAutobus(Autobus autobus); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Autobus; +import com.rjconsultores.ventaboletos.entidad.AutobusDoc; + +public interface AutobusDocService extends GenericService { + public List obtenerPorAutobus(Autobus autobus); +} diff --git a/src/com/rjconsultores/ventaboletos/service/AutobusService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutobusService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AutobusService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AutobusService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AutorizaFolioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizaFolioService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/AutorizaFolioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizaFolioService.java index ac879b831..296971feb 100644 --- a/src/com/rjconsultores/ventaboletos/service/AutorizaFolioService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizaFolioService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.EstacionImpresora; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; - -public interface AutorizaFolioService { - - public Boolean noChequeFolioPreimpresos(Aidf aidf, Estacion origem, Estacion destino, String numfolioinicial, String numfoliofinal, String numseriepreimpresa, Empresa empresaUsuario, TipoMovimentacion tipoMovimentacion); - - public String noChequeFolioPreimpresos(EstacionImpresora estacionImpresora, boolean isImpressoraFiscal); - - public void devolverFoliosAutomaticosImpressoraFiscal(EstacionImpresora ei); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.EstacionImpresora; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; + +public interface AutorizaFolioService { + + public Boolean noChequeFolioPreimpresos(Aidf aidf, Estacion origem, Estacion destino, String numfolioinicial, String numfoliofinal, String numseriepreimpresa, Empresa empresaUsuario, TipoMovimentacion tipoMovimentacion); + + public String noChequeFolioPreimpresos(EstacionImpresora estacionImpresora, boolean isImpressoraFiscal); + + public void devolverFoliosAutomaticosImpressoraFiscal(EstacionImpresora ei); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/AutorizacionPerfilService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizacionPerfilService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AutorizacionPerfilService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizacionPerfilService.java diff --git a/src/com/rjconsultores/ventaboletos/service/AutorizacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/AutorizacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/AutorizacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/BancoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/BancoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/BancoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/BancoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/BoletoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/BoletoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/BoletoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/BoletoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/BpeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/BpeService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/BpeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/BpeService.java index 1d1f0c2d4..277177f5d 100644 --- a/src/com/rjconsultores/ventaboletos/service/BpeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/BpeService.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; - -public interface BpeService { - - public List buscarBpeRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros, boolean consultaOtimizada); - - public String buscarArquivoExportacaoBPE(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo, boolean consultaOtimizada); - - public String buscarXmlBPE(String chBpe); - - public List buscarBPeRejeitadosContingencia(Integer empresaId, String numBpe, String chbpe, Date dtVendaInicio, Date dtVendaFim, List estados, List codigosRejeicoes); - - public void definirBPeRejeitadoSefazReenvio(List bpesReenvio) throws BusinessException; - - public List buscarBPeVendaEEventosAutorizados(Integer empresaId, Date dtVendaInicio, Date dtVendaFim, Integer estadoId); - - public byte[] extrairXmlsBPe(List bpes); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; + +public interface BpeService { + + public List buscarBpeRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros, boolean consultaOtimizada); + + public String buscarArquivoExportacaoBPE(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo, boolean consultaOtimizada); + + public String buscarXmlBPE(String chBpe); + + public List buscarBPeRejeitadosContingencia(Integer empresaId, String numBpe, String chbpe, Date dtVendaInicio, Date dtVendaFim, List estados, List codigosRejeicoes); + + public void definirBPeRejeitadoSefazReenvio(List bpesReenvio) throws BusinessException; + + public List buscarBPeVendaEEventosAutorizados(Integer empresaId, Date dtVendaInicio, Date dtVendaFim, Integer estadoId); + + public byte[] extrairXmlsBPe(List bpes); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CalcularPeajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CalcularPeajeService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CalcularPeajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CalcularPeajeService.java index 5a83ade55..e5ee0ced9 100644 --- a/src/com/rjconsultores/ventaboletos/service/CalcularPeajeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CalcularPeajeService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Ruta; - -public interface CalcularPeajeService { - public List buscarCasetasPeajeWithinTramo(Ruta ruta,Integer[] listCasetaPeaje); - public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc); - public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception; -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Ruta; + +public interface CalcularPeajeService { + public List buscarCasetasPeajeWithinTramo(Ruta ruta,Integer[] listCasetaPeaje); + public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc); + public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception; +} diff --git a/src/com/rjconsultores/ventaboletos/service/CalculoComissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CalculoComissaoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CalculoComissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CalculoComissaoService.java index 3dc3d0d74..55791cb9c 100644 --- a/src/com/rjconsultores/ventaboletos/service/CalculoComissaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CalculoComissaoService.java @@ -1,125 +1,125 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.ComissaoException; -import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.RegistroCalculo; - -public interface CalculoComissaoService { - - public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException; - - public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException; - - public void cancelarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo) throws ComissaoException, BusinessException; - - /** - * Relatorio Analitico da comissao - * @param empresaId - * @param competencia - Informe o competencia se o calculo da comissão for por mês - * @param dataInicial - Informe a data inicial se o calculo da comissao for por periodo - * @param dataFinal - Informe a data final se o calculo da comissao for por periodo - * @param usuarioId - * @param isRetencaoDiaria - * @param isRefazerCalculo - * @return - * @throws ComissaoException - * @throws BusinessException - */ - public List relatorioCalculoComissao(Integer empresaId, Date competencia, Date dataInicial, Date dataFinal, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException; - - public void registrarCalculoComissao(Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException; - - public void cancelarCalculoComissao(Integer empresaId, Date periodo) throws ComissaoException, BusinessException; - - public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, String competencia) throws ComissaoException; - - public boolean enviarEmailReciboComissao(HistoricoComissao historicoComissao, byte[] recibo); - - public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date dataInicial, Date dataFinal, Integer usuarioId) throws ComissaoException, BusinessException; - - public void retencaoAutomaticaComissao(Date dataRetencao); - - public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException; - - /** - * Relatorio de comissão por data inicial e data final - * @param puntoVentaId - * @param empresaId - * @param usuarioId - * @param isRetencaoDiaria - * @param isRefazerCalculo - * @param dataInicial - * @param dataFinal - * @return - * @throws ComissaoException - * @throws BusinessException - */ - public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException; - - /** - * Registra a comissão por periodo - * @param puntoVenta - * @param empresa - * @param ignorarComissaoGerada - * @param usuarioId - * @param isRetencaoDiaria - * @param isRefazerCalculo - * @param dataInicial - * @param dataFinal - * @throws ComissaoException - */ - public void registrarCalculoComissaoPeriodo(PuntoVenta puntoVenta, Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException; - - /** - * Registra a comissão por periodo para todos os pontos de venda - * @param puntoVenta - * @param empresa - * @param ignorarComissaoGerada - * @param usuarioId - * @param isRetencaoDiaria - * @param isRefazerCalculo - * @param dataInicial - * @param dataFinal - * @throws ComissaoException - */ - public void registrarCalculoComissaoPeriodo(Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException; - - /** - * Cancela o calculo de comissao por periodo - * @param puntoVentaId - * @param empresaId - * @param dataInicial - * @param dataFinal - * @throws ComissaoException - * @throws BusinessException - */ - public void cancelarCalculoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException; - - /** - * Cancela o calculo de comissao por periodo para todas as agencas - * @param empresaId - * @param dataInicial - * @param dataFinal - * @throws ComissaoException - * @throws BusinessException - */ - public void cancelarCalculoComissaoPeriodo(Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException; - - /** - * Recupera o historico de comissão por periodo - * @param puntoVentaId - * @param empresaId - * @param dataInicial - * @param dataFinal - * @return - * @throws ComissaoException - */ - public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException; - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.ComissaoException; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.RegistroCalculo; + +public interface CalculoComissaoService { + + public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException; + + public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException; + + public void cancelarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo) throws ComissaoException, BusinessException; + + /** + * Relatorio Analitico da comissao + * @param empresaId + * @param competencia - Informe o competencia se o calculo da comissão for por mês + * @param dataInicial - Informe a data inicial se o calculo da comissao for por periodo + * @param dataFinal - Informe a data final se o calculo da comissao for por periodo + * @param usuarioId + * @param isRetencaoDiaria + * @param isRefazerCalculo + * @return + * @throws ComissaoException + * @throws BusinessException + */ + public List relatorioCalculoComissao(Integer empresaId, Date competencia, Date dataInicial, Date dataFinal, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException; + + public void registrarCalculoComissao(Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException; + + public void cancelarCalculoComissao(Integer empresaId, Date periodo) throws ComissaoException, BusinessException; + + public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, String competencia) throws ComissaoException; + + public boolean enviarEmailReciboComissao(HistoricoComissao historicoComissao, byte[] recibo); + + public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date dataInicial, Date dataFinal, Integer usuarioId) throws ComissaoException, BusinessException; + + public void retencaoAutomaticaComissao(Date dataRetencao); + + public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException; + + /** + * Relatorio de comissão por data inicial e data final + * @param puntoVentaId + * @param empresaId + * @param usuarioId + * @param isRetencaoDiaria + * @param isRefazerCalculo + * @param dataInicial + * @param dataFinal + * @return + * @throws ComissaoException + * @throws BusinessException + */ + public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException; + + /** + * Registra a comissão por periodo + * @param puntoVenta + * @param empresa + * @param ignorarComissaoGerada + * @param usuarioId + * @param isRetencaoDiaria + * @param isRefazerCalculo + * @param dataInicial + * @param dataFinal + * @throws ComissaoException + */ + public void registrarCalculoComissaoPeriodo(PuntoVenta puntoVenta, Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException; + + /** + * Registra a comissão por periodo para todos os pontos de venda + * @param puntoVenta + * @param empresa + * @param ignorarComissaoGerada + * @param usuarioId + * @param isRetencaoDiaria + * @param isRefazerCalculo + * @param dataInicial + * @param dataFinal + * @throws ComissaoException + */ + public void registrarCalculoComissaoPeriodo(Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException; + + /** + * Cancela o calculo de comissao por periodo + * @param puntoVentaId + * @param empresaId + * @param dataInicial + * @param dataFinal + * @throws ComissaoException + * @throws BusinessException + */ + public void cancelarCalculoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException; + + /** + * Cancela o calculo de comissao por periodo para todas as agencas + * @param empresaId + * @param dataInicial + * @param dataFinal + * @throws ComissaoException + * @throws BusinessException + */ + public void cancelarCalculoComissaoPeriodo(Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException; + + /** + * Recupera o historico de comissão por periodo + * @param puntoVentaId + * @param empresaId + * @param dataInicial + * @param dataFinal + * @return + * @throws ComissaoException + */ + public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CancelacionCargoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CancelacionCargoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CancelacionCargoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CancelacionCargoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CancelacionCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CancelacionCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CancelacionCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CancelacionCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CasetaPeajeExcepcionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CasetaPeajeExcepcionService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CasetaPeajeExcepcionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CasetaPeajeExcepcionService.java index 9586d22f4..05055cf6f 100644 --- a/src/com/rjconsultores/ventaboletos/service/CasetaPeajeExcepcionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CasetaPeajeExcepcionService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; - -public interface CasetaPeajeExcepcionService extends GenericService { - public List buscarPorCasetaPeaje(CasetaPeaje caseta); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; + +public interface CasetaPeajeExcepcionService extends GenericService { + public List buscarPorCasetaPeaje(CasetaPeaje caseta); +} diff --git a/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java index 37b2bf111..4e49ec410 100644 --- a/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; - -public interface CasetaPeajeService extends GenericService { - public List buscar(String descricaoPracaPedagio); - public Boolean validarDescricaoCasetaPeaje(CasetaPeaje casetaPeaje); - public List buscarTodosOrdenadoPorDescricao(); - public void deletarVigencias(List cpes); - public CasetaPeaje suscribirOrActualizacion(CasetaPeaje casetaPeaje); +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; + +public interface CasetaPeajeService extends GenericService { + public List buscar(String descricaoPracaPedagio); + public Boolean validarDescricaoCasetaPeaje(CasetaPeaje casetaPeaje); + public List buscarTodosOrdenadoPorDescricao(); + public void deletarVigencias(List cpes); + public CasetaPeaje suscribirOrActualizacion(CasetaPeaje casetaPeaje); } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaBloqueioImpPosteriorService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaBloqueioImpPosteriorService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CategoriaBloqueioImpPosteriorService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaBloqueioImpPosteriorService.java index 5598d53b1..ae9c2480f 100644 --- a/src/com/rjconsultores/ventaboletos/service/CategoriaBloqueioImpPosteriorService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaBloqueioImpPosteriorService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; - -public interface CategoriaBloqueioImpPosteriorService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; + +public interface CategoriaBloqueioImpPosteriorService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaClaseService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaClaseService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaClaseService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaClaseService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaCorridaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaCorridaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaCorridaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaCorridaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaDescuentoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaDescuentoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaDescuentoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaDescuentoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaFormAutorizacaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaFormAutorizacaoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaFormAutorizacaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaFormAutorizacaoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaMarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaMarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaMarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaMarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaMercadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaMercadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaMercadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaMercadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaOrgaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaOrgaoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CategoriaOrgaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaOrgaoService.java index 821196fba..588747365 100644 --- a/src/com/rjconsultores/ventaboletos/service/CategoriaOrgaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaOrgaoService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; -import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; - -public interface CategoriaOrgaoService extends GenericService { - - public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl); - - public void actualizacionAuditagem(List lsCategoriaOrgao); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; +import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; + +public interface CategoriaOrgaoService extends GenericService { + + public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl); + + public void actualizacionAuditagem(List lsCategoriaOrgao); +} diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaPeriodoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaPeriodoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaPeriodoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaPeriodoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaRutaExcecaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaRutaExcecaoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaRutaExcecaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaRutaExcecaoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaRutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaRutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CategoriaTipoPtoVtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaTipoPtoVtaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CategoriaTipoPtoVtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CategoriaTipoPtoVtaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CiudadService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CiudadService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CiudadService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CiudadService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ClaseservicioEquivalenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClaseservicioEquivalenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ClaseservicioEquivalenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClaseservicioEquivalenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ClienteCorporativoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteCorporativoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ClienteCorporativoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteCorporativoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ClienteCursoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteCursoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ClienteCursoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteCursoService.java index f6f33420d..437724051 100644 --- a/src/com/rjconsultores/ventaboletos/service/ClienteCursoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteCursoService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteCurso; -import com.rjconsultores.ventaboletos.entidad.Curso; - -public interface ClienteCursoService extends GenericService { - - public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteCurso; +import com.rjconsultores.ventaboletos.entidad.Curso; + +public interface ClienteCursoService extends GenericService { + + public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ClienteDescuentoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteDescuentoService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/ClienteDescuentoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteDescuentoService.java index f85c2bcc4..24fab2fd0 100644 --- a/src/com/rjconsultores/ventaboletos/service/ClienteDescuentoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteDescuentoService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; - -public interface ClienteDescuentoService extends GenericService{ - - - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; + +public interface ClienteDescuentoService extends GenericService{ + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ClienteDireccionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteDireccionService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/ClienteDireccionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteDireccionService.java index 3c9daf920..e59bae342 100644 --- a/src/com/rjconsultores/ventaboletos/service/ClienteDireccionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteDireccionService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; - - - - -public interface ClienteDireccionService extends GenericService { - - public List buscar(Integer clienteId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; + + + + +public interface ClienteDireccionService extends GenericService { + + public List buscar(Integer clienteId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ClienteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ClienteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteService.java index 9954eeaa2..029a0649c 100644 --- a/src/com/rjconsultores/ventaboletos/service/ClienteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ClienteService.java @@ -1,21 +1,21 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.Empresa; - -public interface ClienteService extends GenericService { - - public List buscar(String nombCliente); - - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa); - - public List buscarPorDocumento(String documento); - - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade); -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.Empresa; + +public interface ClienteService extends GenericService { + + public List buscar(String nombCliente); + + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa); + + public List buscarPorDocumento(String documento); + + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade); +} diff --git a/src/com/rjconsultores/ventaboletos/service/CobrancaAdcPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CobrancaAdcPuntoVentaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CobrancaAdcPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CobrancaAdcPuntoVentaService.java index 21abaa96b..af24ff019 100644 --- a/src/com/rjconsultores/ventaboletos/service/CobrancaAdcPuntoVentaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CobrancaAdcPuntoVentaService.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface CobrancaAdcPuntoVentaService extends GenericService { - - List buscarTodasAsCobrancas(PuntoVenta puntoVenta); - - List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface CobrancaAdcPuntoVentaService extends GenericService { + + List buscarTodasAsCobrancas(PuntoVenta puntoVenta); + + List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CodigoBarraTrechoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CodigoBarraTrechoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CodigoBarraTrechoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CodigoBarraTrechoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CoeficienteTarifaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CoeficienteTarifaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/CoeficienteTarifaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CoeficienteTarifaService.java index 8a69a2a78..ec560ab24 100644 --- a/src/com/rjconsultores/ventaboletos/service/CoeficienteTarifaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CoeficienteTarifaService.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; - -public interface CoeficienteTarifaService { - - public List obtenerTodos(); - - public CoeficienteTarifa obtenerID(Integer id); - - public CoeficienteTarifa suscribir(CoeficienteTarifa entidad); - - public CoeficienteTarifa actualizacion(CoeficienteTarifa entidad); - - public void borrar(CoeficienteTarifa entidad) throws RegistroConDependenciaException; - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; + +public interface CoeficienteTarifaService { + + public List obtenerTodos(); + + public CoeficienteTarifa obtenerID(Integer id); + + public CoeficienteTarifa suscribir(CoeficienteTarifa entidad); + + public CoeficienteTarifa actualizacion(CoeficienteTarifa entidad); + + public void borrar(CoeficienteTarifa entidad) throws RegistroConDependenciaException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ColoniaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ColoniaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ColoniaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ColoniaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ComisionistaExternoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ComisionistaExternoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ComisionistaExternoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ComisionistaExternoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ComissaoReceitaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ComissaoReceitaService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/ComissaoReceitaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ComissaoReceitaService.java index fe8628dd1..26585872d 100644 --- a/src/com/rjconsultores/ventaboletos/service/ComissaoReceitaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ComissaoReceitaService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface ComissaoReceitaService extends GenericService { - - public void reterComissaoReceitaDiaria(Integer empresaId, Integer puntoVentaId, Integer usuarioId, List receitas) throws BusinessException; - - public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal); - - public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface ComissaoReceitaService extends GenericService { + + public void reterComissaoReceitaDiaria(Integer empresaId, Integer puntoVentaId, Integer usuarioId, List receitas) throws BusinessException; + + public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal); + + public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ComissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ComissaoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ComissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ComissaoService.java index 51077751b..3603f3bbe 100644 --- a/src/com/rjconsultores/ventaboletos/service/ComissaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ComissaoService.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Comissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; - -public interface ComissaoService extends GenericService { - - public List buscaHistoricoComissao(Integer puntoVentaId, Integer empresaId, Date periodoInicio, Date periodoFim); - - public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Comissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; + +public interface ComissaoService extends GenericService { + + public List buscaHistoricoComissao(Integer puntoVentaId, Integer empresaId, Date periodoInicio, Date periodoFim); + + public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CompaniaBancariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CompaniaBancariaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CompaniaBancariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CompaniaBancariaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConductorService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConductorService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConductorService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConductorService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionConfService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionConfService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionConfService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionConfService.java index e6944ebea..ab695cd35 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionConfService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionConfService.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Collection; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionConf; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; - -public interface ConexionConfService extends GenericService { - - public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo); - - public List buscarPorConexionCtrl(ConexionCtrl entidad); - - public void suscribirTodos(Collection conexionesConf); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Collection; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionConf; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; + +public interface ConexionConfService extends GenericService { + + public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo); + + public List buscarPorConexionCtrl(ConexionCtrl entidad); + + public void suscribirTodos(Collection conexionesConf); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionCtrlService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionCtrlService.java index 93477f45f..173431056 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionCtrlService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionCtrlService.java @@ -1,23 +1,23 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.PricingConexao; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -public interface ConexionCtrlService extends GenericService { - - public List buscarConexionesCtrl(Integer origenId, Integer destinoId); - - public void suscribirTodos(List conexionCtrlList); - - public List buscarTodasConexionesCtrlPricing(); - - public List carregarConexoesCadastradas(Long conexionctrlId); - - public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId); - - public void limparPesquisaPricingConexao(Integer pricingId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.PricingConexao; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +public interface ConexionCtrlService extends GenericService { + + public List buscarConexionesCtrl(Integer origenId, Integer destinoId); + + public void suscribirTodos(List conexionCtrlList); + + public List buscarTodasConexionesCtrlPricing(); + + public List carregarConexoesCadastradas(Long conexionctrlId); + + public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId); + + public void limparPesquisaPricingConexao(Integer pricingId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionDescuentoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionDescuentoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConexionDescuentoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionDescuentoService.java index 54e033813..7e3c9aeab 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionDescuentoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionDescuentoService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; - -public interface ConexionDescuentoService { - public List buscarPorConexion(Conexion conexion); - - public ConexionDescuento suscribir(ConexionDescuento conexionDescuento); - - public void borrar(ConexionDescuento conexionDescuento); - - public void suscribirTodos(List conexionesDescuentos); - - public List buscarPorConexionInativos(Conexion conexion); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; + +public interface ConexionDescuentoService { + public List buscarPorConexion(Conexion conexion); + + public ConexionDescuento suscribir(ConexionDescuento conexionDescuento); + + public void borrar(ConexionDescuento conexionDescuento); + + public void suscribirTodos(List conexionesDescuentos); + + public List buscarPorConexionInativos(Conexion conexion); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionRutaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConexionExcepcionRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionRutaService.java index 74a88202c..659accb32 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionRutaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionRutaService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; - -public interface ConexionExcepcionRutaService extends GenericService { - - public List obtenerConexionExcepcionsActivo(Long conexionctrlId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; + +public interface ConexionExcepcionRutaService extends GenericService { + + public List obtenerConexionExcepcionsActivo(Long conexionctrlId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConexionExcepcionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionService.java index cc2445353..ed04020fc 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionExcepcionService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; - -public interface ConexionExcepcionService extends GenericService { - - public List obtenerConexionExcepcionsActivo(Long conexionctrlId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; + +public interface ConexionExcepcionService extends GenericService { + + public List obtenerConexionExcepcionsActivo(Long conexionctrlId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaCombinacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaCombinacionService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaCombinacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaCombinacionService.java index 28eb6bd3c..2d228b624 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionRutaCombinacionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaCombinacionService.java @@ -1,23 +1,23 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -public interface ConexionRutaCombinacionService { - - public void gerarCombinacionEntre2Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List rutasEixoA2, List rutasEixoB2, List localidadesGeradas, List conexoesCtrl, Boolean isConexaoPorAgrupamento); - - public void gerarCombinacionEntre3Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List listParadasC, List rutasEixoA2, List rutasEixoB2, List rutasEixoC, List localidadesGeradas, List conexoesCtrl); - - public List extrairConexionRutaCtrl(List localidadesGeradas); - - public List getParadasByAgrupamentoId(Parada parada); - - - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +public interface ConexionRutaCombinacionService { + + public void gerarCombinacionEntre2Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List rutasEixoA2, List rutasEixoB2, List localidadesGeradas, List conexoesCtrl, Boolean isConexaoPorAgrupamento); + + public void gerarCombinacionEntre3Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List listParadasC, List rutasEixoA2, List rutasEixoB2, List rutasEixoC, List localidadesGeradas, List conexoesCtrl); + + public List extrairConexionRutaCtrl(List localidadesGeradas); + + public List getParadasByAgrupamentoId(Parada parada); + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaConfService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaConfService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaConfService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaConfService.java index 774d14777..7f4943420 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionRutaConfService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaConfService.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -public interface ConexionRutaConfService { - - public ConexionRutaConf suscribir(ConexionRutaConf conexion); - - public ConexionRutaConf actualizacion(ConexionRutaConf conexion); - - public void borrar(ConexionRutaConf conexion); - - public void borrar(List lsConexion); - - public void suscribirTodos(List conexiones); - - public List obtenerTodosActivo(); - - public ConexionRutaConf getByIdActivo(Integer conexionRutaConfId); - - public List buscarPorDescricao(String descricao); - - public ConexionRutaConf obtenerID(Integer id); - - public ConexionRutaConf salvarConfiguracao(ConexionRutaConf conexion, List canalVentas, List puntoVentas, - List conexoesCtrl, List rutas, List localidadesCombinadas, - boolean isConexionGerada); - - public void excluirConfiguracao(ConexionRutaConf conexion, boolean excluirConexionRutaConf, boolean isConexionGerada); - - public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId); - - public List> buscarRutasPorConexionConf(Integer conexionRutaConfId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +public interface ConexionRutaConfService { + + public ConexionRutaConf suscribir(ConexionRutaConf conexion); + + public ConexionRutaConf actualizacion(ConexionRutaConf conexion); + + public void borrar(ConexionRutaConf conexion); + + public void borrar(List lsConexion); + + public void suscribirTodos(List conexiones); + + public List obtenerTodosActivo(); + + public ConexionRutaConf getByIdActivo(Integer conexionRutaConfId); + + public List buscarPorDescricao(String descricao); + + public ConexionRutaConf obtenerID(Integer id); + + public ConexionRutaConf salvarConfiguracao(ConexionRutaConf conexion, List canalVentas, List puntoVentas, + List conexoesCtrl, List rutas, List localidadesCombinadas, + boolean isConexionGerada); + + public void excluirConfiguracao(ConexionRutaConf conexion, boolean excluirConexionRutaConf, boolean isConexionGerada); + + public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId); + + public List> buscarRutasPorConexionConf(Integer conexionRutaConfId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaCtrlService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaCtrlService.java index 1c6325621..3629991d8 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionRutaCtrlService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaCtrlService.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; - -public interface ConexionRutaCtrlService { - - public ConexionRutaCtrl suscribir(ConexionRutaCtrl conexion); - - public ConexionRutaCtrl actualizacion(ConexionRutaCtrl conexion); - - public void borrar(ConexionRutaCtrl conexion); - - public List buscarPorConexionCtrl(Long conexcionCtrlId); - - public void borrar(List lsConexion); - - public void suscribirTodos(List conexiones); - - public List buscarConexionesValidas(); - - public List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId); - - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; + +public interface ConexionRutaCtrlService { + + public ConexionRutaCtrl suscribir(ConexionRutaCtrl conexion); + + public ConexionRutaCtrl actualizacion(ConexionRutaCtrl conexion); + + public void borrar(ConexionRutaCtrl conexion); + + public List buscarPorConexionCtrl(Long conexcionCtrlId); + + public void borrar(List lsConexion); + + public void suscribirTodos(List conexiones); + + public List buscarConexionesValidas(); + + public List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId); + + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionPtoVtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionPtoVtaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionPtoVtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionPtoVtaService.java index c227c75a2..ca8a34bf1 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionPtoVtaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionPtoVtaService.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; - -public interface ConexionRutaExcepcionPtoVtaService { - - public void gerarConexiones(); - - public ConexionRutaExcepcionPtoVta suscribir(ConexionRutaExcepcionPtoVta conexion); - - public ConexionRutaExcepcionPtoVta actualizacion(ConexionRutaExcepcionPtoVta conexion); - - public void borrar(ConexionRutaExcepcionPtoVta conexion); - - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); - - public void borrar(List lsConexion); - - public void suscribirTodos(List conexiones); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; + +public interface ConexionRutaExcepcionPtoVtaService { + + public void gerarConexiones(); + + public ConexionRutaExcepcionPtoVta suscribir(ConexionRutaExcepcionPtoVta conexion); + + public ConexionRutaExcepcionPtoVta actualizacion(ConexionRutaExcepcionPtoVta conexion); + + public void borrar(ConexionRutaExcepcionPtoVta conexion); + + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); + + public void borrar(List lsConexion); + + public void suscribirTodos(List conexiones); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionTipoPtoVtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionTipoPtoVtaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionTipoPtoVtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionTipoPtoVtaService.java index f16a073a2..0a6cf0ef9 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionTipoPtoVtaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaExcepcionTipoPtoVtaService.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; - -public interface ConexionRutaExcepcionTipoPtoVtaService { - - public void gerarConexiones(); - - public ConexionRutaExcepcionTipoPtoVta suscribir(ConexionRutaExcepcionTipoPtoVta conexion); - - public ConexionRutaExcepcionTipoPtoVta actualizacion(ConexionRutaExcepcionTipoPtoVta conexion); - - public void borrar(ConexionRutaExcepcionTipoPtoVta conexion); - - public List buscarPorConexionCtrl(Long conexcionCtrlId); - - public void borrar(List lsConexion); - - public void suscribirTodos(List conexiones); - - - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; + +public interface ConexionRutaExcepcionTipoPtoVtaService { + + public void gerarConexiones(); + + public ConexionRutaExcepcionTipoPtoVta suscribir(ConexionRutaExcepcionTipoPtoVta conexion); + + public ConexionRutaExcepcionTipoPtoVta actualizacion(ConexionRutaExcepcionTipoPtoVta conexion); + + public void borrar(ConexionRutaExcepcionTipoPtoVta conexion); + + public List buscarPorConexionCtrl(Long conexcionCtrlId); + + public void borrar(List lsConexion); + + public void suscribirTodos(List conexiones); + + + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaLocalidadeRemovidaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaLocalidadeRemovidaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaLocalidadeRemovidaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaLocalidadeRemovidaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionRutaTramoCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaTramoCtrlService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConexionRutaTramoCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaTramoCtrlService.java index 2e01c371d..2c87366b9 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionRutaTramoCtrlService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionRutaTramoCtrlService.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; -import com.rjconsultores.ventaboletos.entidad.Parada; - -public interface ConexionRutaTramoCtrlService { - - public ConexionRutaTramoCtrl suscribir(ConexionRutaTramoCtrl conexion); - - public ConexionRutaTramoCtrl actualizacion(ConexionRutaTramoCtrl conexion); - - public void borrar(ConexionRutaTramoCtrl conexion); - - public List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId); - - public void borrar(List lsConexion); - - public void suscribirTodos(List conexiones); - - public ConexionRutaTramoCtrl buscarPorId(Long conexionRutaTramoId); - - public boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId, Integer integer); - - public List buscarLocalidadesEixoA(Integer conexionRutaConfId); - - public List buscarLocalidadeEixoB(Integer conexionRutaConfId); - - public List buscarLocalidadesEixoC(Integer conexionRutaConfId); - - public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId); - - public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId); - - public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; +import com.rjconsultores.ventaboletos.entidad.Parada; + +public interface ConexionRutaTramoCtrlService { + + public ConexionRutaTramoCtrl suscribir(ConexionRutaTramoCtrl conexion); + + public ConexionRutaTramoCtrl actualizacion(ConexionRutaTramoCtrl conexion); + + public void borrar(ConexionRutaTramoCtrl conexion); + + public List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId); + + public void borrar(List lsConexion); + + public void suscribirTodos(List conexiones); + + public ConexionRutaTramoCtrl buscarPorId(Long conexionRutaTramoId); + + public boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId, Integer integer); + + public List buscarLocalidadesEixoA(Integer conexionRutaConfId); + + public List buscarLocalidadeEixoB(Integer conexionRutaConfId); + + public List buscarLocalidadesEixoC(Integer conexionRutaConfId); + + public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId); + + public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId); + + public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConexionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionService.java index 3c8d383a6..0da5dfad2 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConexionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConexionService.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; - -public interface ConexionService { - - /** - * Gera as conexões possíveis para os tramos do sistema - * - */ - public void gerarConexiones(); - - public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId); - - public Conexion suscribir(Conexion conexion); - - public Conexion actualizacion(Conexion conexion); - - public void borrar(Conexion conexion); - - public List buscarPorConexionCtrl(Long conexcionCtrlId); - - public List buscarConexionesValidas(); - - public void borrar(List lsConexion); - - public void suscribirTodos(List conexiones); - - public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; + +public interface ConexionService { + + /** + * Gera as conexões possíveis para os tramos do sistema + * + */ + public void gerarConexiones(); + + public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId); + + public Conexion suscribir(Conexion conexion); + + public Conexion actualizacion(Conexion conexion); + + public void borrar(Conexion conexion); + + public List buscarPorConexionCtrl(Long conexcionCtrlId); + + public List buscarConexionesValidas(); + + public void borrar(List lsConexion); + + public void suscribirTodos(List conexiones); + + public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfComprovantePassagemService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfComprovantePassagemService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConfComprovantePassagemService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfComprovantePassagemService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConfContratoPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfContratoPuntoVentaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConfContratoPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfContratoPuntoVentaService.java index 75375d011..cfc9aa19b 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfContratoPuntoVentaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfContratoPuntoVentaService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; -import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; - -public interface ConfContratoPuntoVentaService extends GenericService { - - ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaIsd); - - String formatarLayout(ConfLayoutContratoVO confLayoutContratoVO, String html); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; +import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; + +public interface ConfContratoPuntoVentaService extends GenericService { + + ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaIsd); + + String formatarLayout(ConfLayoutContratoVO confLayoutContratoVO, String html); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java index 162ebe313..87bfb484a 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Set; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface ConfRestricaoCanalVentaService{ - - public ConfRestricaoCanalVenta obtenerID(Long id); - - public void borrar(ConfRestricaoCanalVenta entidad); - - public ConfRestricaoCanalVenta suscribirActualizar(ConfRestricaoCanalVenta entidad) throws BusinessException; - - public void borrarList(Set confRestricaoCanalVentaSelecionadas); - - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Set; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface ConfRestricaoCanalVentaService{ + + public ConfRestricaoCanalVenta obtenerID(Long id); + + public void borrar(ConfRestricaoCanalVenta entidad); + + public ConfRestricaoCanalVenta suscribirActualizar(ConfRestricaoCanalVenta entidad) throws BusinessException; + + public void borrarList(Set confRestricaoCanalVentaSelecionadas); + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoExcecaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoExcecaoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoExcecaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoExcecaoService.java index 30bdab0cb..6e809b77b 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoExcecaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoExcecaoService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; - -public interface ConfRestricaoExcecaoService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; + +public interface ConfRestricaoExcecaoService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoOrgaoConcedenteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoOrgaoConcedenteService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoOrgaoConcedenteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoOrgaoConcedenteService.java index 85e664950..fcdb81851 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoOrgaoConcedenteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoOrgaoConcedenteService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; - -public interface ConfRestricaoOrgaoConcedenteService extends GenericService { - - public ConfRestricaoOrgaoConcedente obtenerOrgaoCOncedenteTodos(); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; + +public interface ConfRestricaoOrgaoConcedenteService extends GenericService { + + public ConfRestricaoOrgaoConcedente obtenerOrgaoCOncedenteTodos(); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoPtovtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoPtovtaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoPtovtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoPtovtaService.java index 1ec043b1c..a81947fce 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoPtovtaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoPtovtaService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; - -public interface ConfRestricaoPtovtaService extends GenericService { - - public ConfRestricaoPtovta obtenerPtovtaTodos(); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; + +public interface ConfRestricaoPtovtaService extends GenericService { + + public ConfRestricaoPtovta obtenerPtovtaTodos(); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoRutasService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoRutasService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoRutasService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoRutasService.java index bf3d9c2e7..88ee91a07 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoRutasService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoRutasService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; - -public interface ConfRestricaoRutasService extends GenericService { - - public ConfRestricaoRutas obtenerRutasTodos(); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; + +public interface ConfRestricaoRutasService extends GenericService { + + public ConfRestricaoRutas obtenerRutasTodos(); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoOCService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoOCService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoOCService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoOCService.java index c32d6a287..f79eb8f13 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoOCService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoOCService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; - -public interface ConfRestricaoTramoOCService extends GenericService { - - public ConfRestricaoTramoOC obtenerTramoOCTodos(); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; + +public interface ConfRestricaoTramoOCService extends GenericService { + + public ConfRestricaoTramoOC obtenerTramoOCTodos(); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoService.java index 733ed7482..138d48fa8 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoTramoService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; - -public interface ConfRestricaoTramoService extends GenericService { - - void actualizacionAuditagem(List lsConfRestricaoTramo); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; + +public interface ConfRestricaoTramoService extends GenericService { + + void actualizacionAuditagem(List lsConfRestricaoTramo); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoVendaWebService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoVendaWebService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ConfRestricaoVendaWebService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoVendaWebService.java index 63cd1054b..8f5e2dd93 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoVendaWebService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfRestricaoVendaWebService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; - -public interface ConfRestricaoVendaWebService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; + +public interface ConfRestricaoVendaWebService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfTotemService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfTotemService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/ConfTotemService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfTotemService.java index 2e0e74116..4c5bf8edb 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConfTotemService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfTotemService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ConfTotem; - -/** - * - * @author Wallace - */ -public interface ConfTotemService extends GenericService { - - public ConfTotem buscar(String chave); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ConfTotem; + +/** + * + * @author Wallace + */ +public interface ConfTotemService extends GenericService { + + public ConfTotem buscar(String chave); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConfTotemVentaRapidaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfTotemVentaRapidaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConfTotemVentaRapidaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfTotemVentaRapidaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java index 208fa46b9..65630fd04 100644 --- a/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java @@ -1,98 +1,98 @@ -package com.rjconsultores.ventaboletos.service; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.LogConferencia; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; -import com.rjconsultores.ventaboletos.enums.comissao.BoletoStatusComissao; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.ConferenciaComissaoVO; -import com.rjconsultores.ventaboletos.vo.comissao.DiaConferenciaComissaoVO; -import com.rjconsultores.ventaboletos.vo.comissao.EtiquetaMalote; -import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; -import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO; -import com.rjconsultores.ventaboletos.vo.comissao.OcdVO; -import com.rjconsultores.ventaboletos.vo.comissao.ResumoComissao; - -public interface ConferenciaComissaoService extends GenericService { - - public Conferencia suscribirOrActualizacion(Conferencia entidad); - - public List carregarConferenciaComissao(String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException; - - public List carregarConferenciaComissao(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException; - - public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException; - - public Conferencia cancelarChegadaMalote(Conferencia conferencia); - - public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException; - - public List carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException; - - public List carregarLogConferencia(Conferencia conferencia) throws BusinessException; - - public LogConferencia suscribirLogConferencia(LogConferencia logConferencia) throws BusinessException; - - public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException; - - public LogConferencia obtenerLogConferenciaID(Long logconferenciaId); - - public List carregarBilhetesComissao(List boletoComissaos, Conferencia conferencia, BoletoStatusComissao boletoStatusComissao, boolean carregarDadosFaltantes) throws BusinessException; - - public List carregarBilhetesComissao(List boletoComissaos, List conferencias, BoletoStatusComissao boletoStatusComissao, boolean carregarDadosFaltantes) throws BusinessException; - - public List carregarOcds(Conferencia conferencia) throws BusinessException; - - public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException; - - public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException; - - public boolean isBilhetesSemConferencia(List lsBoletoComissao) throws BusinessException; - - public boolean isEventosFinanceirosSemConferencia(List lsEventosFinanceiros) throws BusinessException; - - public boolean isOcdSemConferencia(List lsOcd) throws BusinessException; - - public BigDecimal totalizarBoletoComissao(List lsBoletoComissao, IndStatusBoleto... statusBilhete) throws BusinessException; - - public BigDecimal totalizarEventosFinanceiros(List lsEventosFinanceiros) throws BusinessException; - - public OcdVO totalizarOcd(List lsOcd) throws BusinessException; - - public ResumoComissao gerarResumo(Conferencia conferencia, List boletoComissaos, List lsEventosFinanceiros, BigDecimal totalBilhetesManual, BigDecimal totalBilhetesVendidos, BigDecimal totalBilhetesCancelados, - BigDecimal totalBilhetesDevolvidos, BigDecimal totalBilhetesGap, BigDecimal totalBilhetesGapCancelados, BigDecimal totalBilhetesGapDevolvidos, - BigDecimal totalCreditosEventoFinanceiros, BigDecimal totalDebitosEventoFinanceiros, OcdVO totalOcd, - BigDecimal totalBilhetesTrocados, BigDecimal totalBilhetesGapTrocados) throws BusinessException; - - public EtiquetaMalote decodificarEtiquetaMalote(String codigoBarras) throws BusinessException; - - public void confirmarChegadaMalote(EtiquetaMalote etiquetaMalote) throws BusinessException; - - public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados ) throws BusinessException; - - public Map totalizarBoletoComissaoDevolvidosTrocaOcd(List lsBoletoComissao) throws BusinessException; - - public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException; - - public List quantidadeECFPorPuntoVenta(Conferencia conferencia); - - public void enviarEmailIrregularidadeECF(String email, String msg, String assunto) throws Exception; - - public void generacionAutomaticaConferencia(); - - public boolean isConferidoVenta(BoletoComissao boletoComissao); - - public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException; - - public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException; - - public BigDecimal getComissaoPuntoVenta(Integer puntoventaId, Integer empresaId, Date dataInicial, Date dataFinal) throws BusinessException; -} +package com.rjconsultores.ventaboletos.service; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.LogConferencia; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; +import com.rjconsultores.ventaboletos.enums.comissao.BoletoStatusComissao; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.ConferenciaComissaoVO; +import com.rjconsultores.ventaboletos.vo.comissao.DiaConferenciaComissaoVO; +import com.rjconsultores.ventaboletos.vo.comissao.EtiquetaMalote; +import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; +import com.rjconsultores.ventaboletos.vo.comissao.LogConferenciaVO; +import com.rjconsultores.ventaboletos.vo.comissao.OcdVO; +import com.rjconsultores.ventaboletos.vo.comissao.ResumoComissao; + +public interface ConferenciaComissaoService extends GenericService { + + public Conferencia suscribirOrActualizacion(Conferencia entidad); + + public List carregarConferenciaComissao(String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException; + + public List carregarConferenciaComissao(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, boolean isDesconsideraPtVendaFechados) throws BusinessException; + + public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException; + + public Conferencia cancelarChegadaMalote(Conferencia conferencia); + + public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException; + + public List carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException; + + public List carregarLogConferencia(Conferencia conferencia) throws BusinessException; + + public LogConferencia suscribirLogConferencia(LogConferencia logConferencia) throws BusinessException; + + public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException; + + public LogConferencia obtenerLogConferenciaID(Long logconferenciaId); + + public List carregarBilhetesComissao(List boletoComissaos, Conferencia conferencia, BoletoStatusComissao boletoStatusComissao, boolean carregarDadosFaltantes) throws BusinessException; + + public List carregarBilhetesComissao(List boletoComissaos, List conferencias, BoletoStatusComissao boletoStatusComissao, boolean carregarDadosFaltantes) throws BusinessException; + + public List carregarOcds(Conferencia conferencia) throws BusinessException; + + public Conferencia reabrirMovimentoDiario(Conferencia conferencia) throws BusinessException; + + public Conferencia obtenerConferenciaDataMovimento(Date datamovimento, Integer puntoventaId, Integer empresaId) throws BusinessException; + + public boolean isBilhetesSemConferencia(List lsBoletoComissao) throws BusinessException; + + public boolean isEventosFinanceirosSemConferencia(List lsEventosFinanceiros) throws BusinessException; + + public boolean isOcdSemConferencia(List lsOcd) throws BusinessException; + + public BigDecimal totalizarBoletoComissao(List lsBoletoComissao, IndStatusBoleto... statusBilhete) throws BusinessException; + + public BigDecimal totalizarEventosFinanceiros(List lsEventosFinanceiros) throws BusinessException; + + public OcdVO totalizarOcd(List lsOcd) throws BusinessException; + + public ResumoComissao gerarResumo(Conferencia conferencia, List boletoComissaos, List lsEventosFinanceiros, BigDecimal totalBilhetesManual, BigDecimal totalBilhetesVendidos, BigDecimal totalBilhetesCancelados, + BigDecimal totalBilhetesDevolvidos, BigDecimal totalBilhetesGap, BigDecimal totalBilhetesGapCancelados, BigDecimal totalBilhetesGapDevolvidos, + BigDecimal totalCreditosEventoFinanceiros, BigDecimal totalDebitosEventoFinanceiros, OcdVO totalOcd, + BigDecimal totalBilhetesTrocados, BigDecimal totalBilhetesGapTrocados) throws BusinessException; + + public EtiquetaMalote decodificarEtiquetaMalote(String codigoBarras) throws BusinessException; + + public void confirmarChegadaMalote(EtiquetaMalote etiquetaMalote) throws BusinessException; + + public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados ) throws BusinessException; + + public Map totalizarBoletoComissaoDevolvidosTrocaOcd(List lsBoletoComissao) throws BusinessException; + + public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException; + + public List quantidadeECFPorPuntoVenta(Conferencia conferencia); + + public void enviarEmailIrregularidadeECF(String email, String msg, String assunto) throws Exception; + + public void generacionAutomaticaConferencia(); + + public boolean isConferidoVenta(BoletoComissao boletoComissao); + + public void borrarLogConferenciaTransacaoId(Long transacaoId) throws BusinessException; + + public boolean isConferenciaCompetenciaEncerrada(Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, boolean isDesconsideraPtVendaFechados) throws BusinessException; + + public BigDecimal getComissaoPuntoVenta(Integer puntoventaId, Integer empresaId, Date dataInicial, Date dataFinal) throws BusinessException; +} diff --git a/src/com/rjconsultores/ventaboletos/service/ConferenciaPendenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConferenciaPendenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConferenciaPendenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConferenciaPendenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConfigRestriccionPagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfigRestriccionPagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConfigRestriccionPagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfigRestriccionPagoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoParadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoParadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoParadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoParadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConfiguracionProductoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConstanteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConstanteService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConstanteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConstanteService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ContaMDService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ContaMDService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ContaMDService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ContaMDService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ContingenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ContingenciaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ContingenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ContingenciaService.java index 05d86f68a..476e4e833 100644 --- a/src/com/rjconsultores/ventaboletos/service/ContingenciaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ContingenciaService.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import javax.mail.AuthenticationFailedException; -import javax.mail.SendFailedException; - -import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface ContingenciaService { - - public List buscarHistorico(Integer empresaID, Integer estadoID); - - public LogHistoricoContingencia salvarHistoricoContingencia(LogHistoricoContingencia historicoCont) throws BusinessException, SendFailedException, AuthenticationFailedException; -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import javax.mail.AuthenticationFailedException; +import javax.mail.SendFailedException; + +import com.rjconsultores.ventaboletos.entidad.LogHistoricoContingencia; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface ContingenciaService { + + public List buscarHistorico(Integer empresaID, Integer estadoID); + + public LogHistoricoContingencia salvarHistoricoContingencia(LogHistoricoContingencia historicoCont) throws BusinessException, SendFailedException, AuthenticationFailedException; +} diff --git a/src/com/rjconsultores/ventaboletos/service/ContratoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ContratoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ContratoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ContratoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ControleSerieEmbarcadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ControleSerieEmbarcadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ControleSerieEmbarcadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ControleSerieEmbarcadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConvenioDetService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConvenioDetService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConvenioDetService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConvenioDetService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConvenioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConvenioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConvenioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConvenioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ConvenioTransportadoraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ConvenioTransportadoraService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ConvenioTransportadoraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ConvenioTransportadoraService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CorridaCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CorridaCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CorridaInfoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaInfoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CorridaInfoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaInfoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CorridaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CorridaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaService.java index 954320aca..41d2aa7e3 100644 --- a/src/com/rjconsultores/ventaboletos/service/CorridaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaService.java @@ -1,91 +1,91 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.Corrida.Id; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -/** - * - * @author rodrigo - */ -public interface CorridaService extends GenericService { - - /** - * Genera las corridas de acuerdo con el parametro de cant dias. - * - * - * @return - Si fue generado exitosamente o no - */ - public boolean generarCorridaAutomatica(); - - public List buscarPorAutobusCorridasFuturas(DiagramaAutobus diagramaAutobus); - - public List buscarPorRolOperativoCorridasFuturas(DiagramaAutobus diagramaAutobus); - - public List buscarPorFecCorrida(Date value); - - public List verificarCorridaId(Integer corridaId); - - public List buscarPorId(Integer idCorrida); - - public List buscarFiltro(Parada ori, Parada des, Date hora, ClaseServicio cs); - - /** - * Regresa la fecha final para el período de generacion automatica de corridas. - * - * - * @return - */ - public Date calcularDataFinalGeneracionCorrida(); - - public List buscarDistinct(Parada ori, Parada des, Date horaSalidaInicio, Date horaSalidaFin, ClaseServicio cs, Integer corridaId); - - /** - * Gera corrida a partir dos servicos selecionados e no intervalo de dias informados.
- * - * @param lsEsquemaCorrida - * @param dataDe - * @param dataAte - * @return A quantidade de corridas geradas - * @throws BusinessException - */ - public Long generarCorridasSelecionadas(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws BusinessException; - - public List buscarGroupCorrridaId(Integer corridaId, Date dateInicio, Date dateFin); - - public List buscarGroupCorrridaId(Integer corridaId, Integer origem, Integer destino, Integer ruta, Integer numRuta, Date dateInicio, Date dateFin); - - public Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial); - - Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial, Integer corridaId); - - Boolean editarCorridaPorOutraCorrida(Estado estado, Date dataInicial, Integer corridaId, Date dataPadrao); - - public List buscarCorridaRelAproveitamento(Parada origem, Parada destino, Date feccorrida, Integer corridaId); - - public Corrida buscaCorrridaFutura(Ruta ruta, Date fecInicio); - - public Boolean existeCorrida(Long id); - - public Integer buscarOcupacaoCorrida(Corrida corrida); - - public Boolean generarCorrida(Date dataGeracao, List lsEsquemaCorrida, boolean isGeracaoAutomaticaCorrida, List corridaTramoList, boolean isValidaActivo); - - public Corrida buscarPorId(Corrida.Id id); - - public Corrida buscarCorridaAtivaPorId(Id id); -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.Corrida.Id; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +/** + * + * @author rodrigo + */ +public interface CorridaService extends GenericService { + + /** + * Genera las corridas de acuerdo con el parametro de cant dias. + * + * + * @return - Si fue generado exitosamente o no + */ + public boolean generarCorridaAutomatica(); + + public List buscarPorAutobusCorridasFuturas(DiagramaAutobus diagramaAutobus); + + public List buscarPorRolOperativoCorridasFuturas(DiagramaAutobus diagramaAutobus); + + public List buscarPorFecCorrida(Date value); + + public List verificarCorridaId(Integer corridaId); + + public List buscarPorId(Integer idCorrida); + + public List buscarFiltro(Parada ori, Parada des, Date hora, ClaseServicio cs); + + /** + * Regresa la fecha final para el período de generacion automatica de corridas. + * + * + * @return + */ + public Date calcularDataFinalGeneracionCorrida(); + + public List buscarDistinct(Parada ori, Parada des, Date horaSalidaInicio, Date horaSalidaFin, ClaseServicio cs, Integer corridaId); + + /** + * Gera corrida a partir dos servicos selecionados e no intervalo de dias informados.
+ * + * @param lsEsquemaCorrida + * @param dataDe + * @param dataAte + * @return A quantidade de corridas geradas + * @throws BusinessException + */ + public Long generarCorridasSelecionadas(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws BusinessException; + + public List buscarGroupCorrridaId(Integer corridaId, Date dateInicio, Date dateFin); + + public List buscarGroupCorrridaId(Integer corridaId, Integer origem, Integer destino, Integer ruta, Integer numRuta, Date dateInicio, Date dateFin); + + public Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial); + + Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial, Integer corridaId); + + Boolean editarCorridaPorOutraCorrida(Estado estado, Date dataInicial, Integer corridaId, Date dataPadrao); + + public List buscarCorridaRelAproveitamento(Parada origem, Parada destino, Date feccorrida, Integer corridaId); + + public Corrida buscaCorrridaFutura(Ruta ruta, Date fecInicio); + + public Boolean existeCorrida(Long id); + + public Integer buscarOcupacaoCorrida(Corrida corrida); + + public Boolean generarCorrida(Date dataGeracao, List lsEsquemaCorrida, boolean isGeracaoAutomaticaCorrida, List corridaTramoList, boolean isValidaActivo); + + public Corrida buscarPorId(Corrida.Id id); + + public Corrida buscarCorridaAtivaPorId(Id id); +} diff --git a/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java index 4c3b8d69a..5ca4f657c 100644 --- a/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CorridaTramoService.java @@ -1,23 +1,23 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Autobus; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; -import com.rjconsultores.ventaboletos.entidad.Nodo; - -public interface CorridaTramoService extends GenericService { - - public List obtenerTramoTarjetaEmitida(); - - public List criaCorridaTramoList(Autobus autobus, Date dataGeracao, Date fechorSalidaOriginalH , - List lsEsquemaTramo, Nodo nodo, ClaseServicio claseServicio, String statusCorrida); - - public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsParadaEsquemaOrignal, Date horaSalidaOriginal); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Autobus; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; +import com.rjconsultores.ventaboletos.entidad.Nodo; + +public interface CorridaTramoService extends GenericService { + + public List obtenerTramoTarjetaEmitida(); + + public List criaCorridaTramoList(Autobus autobus, Date dataGeracao, Date fechorSalidaOriginalH , + List lsEsquemaTramo, Nodo nodo, ClaseServicio claseServicio, String statusCorrida); + + public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsParadaEsquemaOrignal, Date horaSalidaOriginal); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CortesiaBeneficiarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CortesiaBeneficiarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CortesiaBeneficiarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CortesiaBeneficiarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CortesiaDireccionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CortesiaDireccionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CortesiaDireccionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CortesiaDireccionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CortesiaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CortesiaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CortesiaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CortesiaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CotacaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CotacaoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CotacaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CotacaoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CtrlFechamentoCaixaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CtrlFechamentoCaixaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/CtrlFechamentoCaixaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CtrlFechamentoCaixaService.java index d3fe0bb59..7ab2dba7e 100644 --- a/src/com/rjconsultores/ventaboletos/service/CtrlFechamentoCaixaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CtrlFechamentoCaixaService.java @@ -1,25 +1,25 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; - -import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; -import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; - -public interface CtrlFechamentoCaixaService extends GenericService { - - /** - * Metodo que verifica se a rotina de retencao de comissao pode ser executada, - * baseado no fechamento automatico dos caixas - * @param feccorte - * @return - */ - public boolean autorizarExecutarRotinaRetencao(Date feccorte); - - /** - * Metodo que atualiza o controle de fechamento de caixa para retencao de comissao - * @param status - * @param dataRetencao - */ - public void atualizarCtrlFechamentoCaixaStatus(CtrlFechamentoCaixaStatus status, Date dataRetencao); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; + +import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; +import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; + +public interface CtrlFechamentoCaixaService extends GenericService { + + /** + * Metodo que verifica se a rotina de retencao de comissao pode ser executada, + * baseado no fechamento automatico dos caixas + * @param feccorte + * @return + */ + public boolean autorizarExecutarRotinaRetencao(Date feccorte); + + /** + * Metodo que atualiza o controle de fechamento de caixa para retencao de comissao + * @param status + * @param dataRetencao + */ + public void atualizarCtrlFechamentoCaixaStatus(CtrlFechamentoCaixaStatus status, Date dataRetencao); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CuponConvenioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CuponConvenioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CuponConvenioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CuponConvenioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CuponSecretariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CuponSecretariaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CuponSecretariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CuponSecretariaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/CursoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CursoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/CursoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CursoService.java index f5c237de4..be9d238e7 100644 --- a/src/com/rjconsultores/ventaboletos/service/CursoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CursoService.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Curso; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; - -public interface CursoService { - public List obtenerTodos(); - - public Curso obtenerID(Integer id); - - public Curso suscribir(Curso entidad); - - public Curso actualizacion(Curso entidad); - - public void borrar(Curso entidad) throws RegistroConDependenciaException; - - public List buscar(String nomcurso); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Curso; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; + +public interface CursoService { + public List obtenerTodos(); + + public Curso obtenerID(Integer id); + + public Curso suscribir(Curso entidad); + + public Curso actualizacion(Curso entidad); + + public void borrar(Curso entidad) throws RegistroConDependenciaException; + + public List buscar(String nomcurso); +} diff --git a/src/com/rjconsultores/ventaboletos/service/CustomService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/CustomService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/CustomService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/CustomService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DepositoBancarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DepositoBancarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/DepositoBancarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DepositoBancarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DescontoComissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DescontoComissaoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/DescontoComissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DescontoComissaoService.java index 71aebd497..ea4e4ba67 100644 --- a/src/com/rjconsultores/ventaboletos/service/DescontoComissaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DescontoComissaoService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.DescontoComissao; - -public interface DescontoComissaoService extends GenericService { - - public DescontoComissao suscribirOrActualizacion(DescontoComissao entidad); - - public List buscaDescontoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.DescontoComissao; + +public interface DescontoComissaoService extends GenericService { + + public DescontoComissao suscribirOrActualizacion(DescontoComissao entidad); + + public List buscaDescontoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/DetAbastoBoletoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DetAbastoBoletoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/DetAbastoBoletoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DetAbastoBoletoService.java index 948dbfcba..38a6fc135 100644 --- a/src/com/rjconsultores/ventaboletos/service/DetAbastoBoletoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DetAbastoBoletoService.java @@ -1,28 +1,28 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface DetAbastoBoletoService extends GenericService { - - public Long getSecuencia(); - - public void desabilitaDetAbastos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa); - - public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa); - - public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(Aidf Aidf); - - public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVentaId, String folioInicial, String folioFinal); - - public DetAbastoBoleto movimentaDetAbasto(DetAbastoBoleto detAbasto, AbastoBoleto abasto, String folioInicial, String folioFinal) throws BusinessException; - - public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface DetAbastoBoletoService extends GenericService { + + public Long getSecuencia(); + + public void desabilitaDetAbastos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa); + + public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa); + + public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(Aidf Aidf); + + public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVentaId, String folioInicial, String folioFinal); + + public DetAbastoBoleto movimentaDetAbasto(DetAbastoBoleto detAbasto, AbastoBoleto abasto, String folioInicial, String folioFinal) throws BusinessException; + + public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem); +} diff --git a/src/com/rjconsultores/ventaboletos/service/DetDiagramaAutobusService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DetDiagramaAutobusService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/DetDiagramaAutobusService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DetDiagramaAutobusService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DiagramaAutobusService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DiagramaAutobusService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/DiagramaAutobusService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DiagramaAutobusService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DisponibilidadService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DisponibilidadService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/DisponibilidadService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DisponibilidadService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaHistoricoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaHistoricoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaHistoricoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaHistoricoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DispositivoEmbarcadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/DivisionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DivisionService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/DivisionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/DivisionService.java index 2d9c9da8f..6af38143e 100644 --- a/src/com/rjconsultores/ventaboletos/service/DivisionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/DivisionService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Division; - -public interface DivisionService extends GenericService{ - - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Division; + +public interface DivisionService extends GenericService{ + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmbarcadaDispOperadorService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmbarcadaDispOperadorService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmbarcadaDispOperadorService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmbarcadaDispOperadorService.java index d2ae2dcf3..fcd2f3c78 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmbarcadaDispOperadorService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmbarcadaDispOperadorService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; - -public interface EmbarcadaDispOperadorService extends GenericService { - - public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId); - - public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId); - - public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList); - - public boolean inserirListEmbarcadaDispOperador(List embarcadaDisOperadorList); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; + +public interface EmbarcadaDispOperadorService extends GenericService { + + public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId); + + public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId); + + public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList); + + public boolean inserirListEmbarcadaDispOperador(List embarcadaDisOperadorList); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmbarqueCatracaRodoviariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmbarqueCatracaRodoviariaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/EmbarqueCatracaRodoviariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmbarqueCatracaRodoviariaService.java index 2b378d183..0b650bcc0 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmbarqueCatracaRodoviariaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmbarqueCatracaRodoviariaService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; - -public interface EmbarqueCatracaRodoviariaService { - List obtenerTodos(); - - EmbarqueCatracaRodoviaria suscribir(EmbarqueCatracaRodoviaria embarqueCatracaRodoviaria); - - public void borrar(EmbarqueCatracaRodoviaria entidad); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; + +public interface EmbarqueCatracaRodoviariaService { + List obtenerTodos(); + + EmbarqueCatracaRodoviaria suscribir(EmbarqueCatracaRodoviaria embarqueCatracaRodoviaria); + + public void borrar(EmbarqueCatracaRodoviaria entidad); +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpleadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpleadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpleadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpleadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaAdyenConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaAdyenConfigService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaAdyenConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaAdyenConfigService.java index 2f53bb70b..7c3300978 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaAdyenConfigService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaAdyenConfigService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; - -public interface EmpresaAdyenConfigService extends GenericService { - - public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; + +public interface EmpresaAdyenConfigService extends GenericService { + + public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa); +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaAsistenciaDeViajeConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaAsistenciaDeViajeConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaAsistenciaDeViajeConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaAsistenciaDeViajeConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaCertificadoConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaCertificadoConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaCertificadoConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaCertificadoConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaCieloLinkService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaCieloLinkService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaCieloLinkService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaCieloLinkService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaComprovantePassagemConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaComprovantePassagemConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaComprovantePassagemConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaComprovantePassagemConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaConfigLayoutService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaConfigLayoutService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaConfigLayoutService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaConfigLayoutService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaContaBancariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaContaBancariaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaContaBancariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaContaBancariaService.java index 88a8ed961..44bbfabc6 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaContaBancariaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaContaBancariaService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface EmpresaContaBancariaService { - - public EmpresaContaBancaria suscribirActualizacion(EmpresaContaBancaria entidad) throws BusinessException; -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface EmpresaContaBancariaService { + + public EmpresaContaBancaria suscribirActualizacion(EmpresaContaBancaria entidad) throws BusinessException; +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaCrediBancoConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaCrediBancoConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaCrediBancoConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaCrediBancoConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailConfigService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaEmailConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailConfigService.java index 9b5ac9358..1ad355076 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailConfigService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailConfigService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; - -public interface EmpresaEmailConfigService extends GenericService { - - public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; + +public interface EmpresaEmailConfigService extends GenericService { + + public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa); +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailEComerceService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailEComerceService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaEmailEComerceService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailEComerceService.java index 88e66d045..db06e92db 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailEComerceService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailEComerceService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; - -public interface EmpresaEmailEComerceService extends GenericService { - - public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; + +public interface EmpresaEmailEComerceService extends GenericService { + + public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailFlexBusService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailFlexBusService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaEmailFlexBusService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailFlexBusService.java index 3358b8cfe..499d09be0 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailFlexBusService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailFlexBusService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; - -public interface EmpresaEmailFlexBusService extends GenericService { - - public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; + +public interface EmpresaEmailFlexBusService extends GenericService { + + public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/EmpresaEmailService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailService.java index 7f10e9dbb..c3ac86507 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaEmailService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEmailService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; - -public interface EmpresaEmailService extends GenericService { - - public EmpresaEmail buscarPorEmpresa(Empresa empresa); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; + +public interface EmpresaEmailService extends GenericService { + + public EmpresaEmail buscarPorEmpresa(Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaEquivalenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEquivalenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaEquivalenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaEquivalenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaImpostoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaImpostoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaImpostoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaImpostoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaIziPayService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaIziPayService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaIziPayService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaIziPayService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaMercadoPagoConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaMercadoPagoConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaMercadoPagoConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaMercadoPagoConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaNequiConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaNequiConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaNequiConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaNequiConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaPMArtespConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaPMArtespConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaPMArtespConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaPMArtespConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaRecargaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaRecargaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaRecargaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaRecargaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaSaferConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaSaferConfigService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaSaferConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaSaferConfigService.java index 611a117b9..9d70b18da 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaSaferConfigService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaSaferConfigService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; - -public interface EmpresaSaferConfigService extends GenericService { - - public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; + +public interface EmpresaSaferConfigService extends GenericService { + + public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa); +} diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaSicfeConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaSicfeConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EmpresaSicfeConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaSicfeConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EmpresaTrocoSimplesService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaTrocoSimplesService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EmpresaTrocoSimplesService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaTrocoSimplesService.java index 2724db514..be4cae77b 100644 --- a/src/com/rjconsultores/ventaboletos/service/EmpresaTrocoSimplesService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EmpresaTrocoSimplesService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface EmpresaTrocoSimplesService { - - EmpresaTrocoSimples suscribirActualizar(EmpresaTrocoSimples empresaTroco) throws BusinessException; - - void apagar(EmpresaTrocoSimples empresaTroco) throws BusinessException; - - EmpresaTrocoSimples buscarEmpresaTrocoSimplesPorEmpresaId(Integer empresaID); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface EmpresaTrocoSimplesService { + + EmpresaTrocoSimples suscribirActualizar(EmpresaTrocoSimples empresaTroco) throws BusinessException; + + void apagar(EmpresaTrocoSimples empresaTroco) throws BusinessException; + + EmpresaTrocoSimples buscarEmpresaTrocoSimplesPorEmpresaId(Integer empresaID); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EnderecoApanheService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EnderecoApanheService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EnderecoApanheService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EnderecoApanheService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EscolaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EscolaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/EscolaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EscolaService.java index 5e4196333..2c2c979ac 100644 --- a/src/com/rjconsultores/ventaboletos/service/EscolaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EscolaService.java @@ -1,21 +1,21 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Ciudad; -import com.rjconsultores.ventaboletos.entidad.Escola; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; - -public interface EscolaService { - public List obtenerTodos(); - - public Escola obtenerID(Integer id); - - public Escola suscribir(Escola entidad); - - public Escola actualizacion(Escola entidad); - - public void borrar(Escola entidad) throws RegistroConDependenciaException; - - public List buscar(String nombescola, Ciudad ciudad); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Ciudad; +import com.rjconsultores.ventaboletos.entidad.Escola; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; + +public interface EscolaService { + public List obtenerTodos(); + + public Escola obtenerID(Integer id); + + public Escola suscribir(Escola entidad); + + public Escola actualizacion(Escola entidad); + + public void borrar(Escola entidad) throws RegistroConDependenciaException; + + public List buscar(String nombescola, Ciudad ciudad); +} diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaAgrupacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaAgrupacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EsquemaAgrupacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaAgrupacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaAsientoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaAsientoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EsquemaAsientoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaAsientoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaEmbarqueDesembarqueService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaEmbarqueDesembarqueService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EsquemaCorridaEmbarqueDesembarqueService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaEmbarqueDesembarqueService.java index 9bf899da3..ca6866bf8 100644 --- a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaEmbarqueDesembarqueService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaEmbarqueDesembarqueService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaEmbarqueDesembarque; - -public interface EsquemaCorridaEmbarqueDesembarqueService extends GenericService { - - List obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaEmbarqueDesembarque; + +public interface EsquemaCorridaEmbarqueDesembarqueService extends GenericService { + + List obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaInfoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaInfoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EsquemaCorridaInfoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaInfoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaOperacionalService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaOperacionalService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EsquemaOperacionalService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaOperacionalService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaTramoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaTramoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EsquemaTramoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EsquemaTramoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EstacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EstacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EstacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EstacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EstadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EstadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/EstadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EstadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/EventoExtraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EventoExtraService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/EventoExtraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/EventoExtraService.java index 7c94b8a47..b5846356d 100644 --- a/src/com/rjconsultores/ventaboletos/service/EventoExtraService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/EventoExtraService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; - -public interface EventoExtraService extends GenericService { - - public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; + +public interface EventoExtraService extends GenericService { + + public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ExcepcionPeajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ExcepcionPeajeService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ExcepcionPeajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ExcepcionPeajeService.java index b9b42d8a9..819631846 100644 --- a/src/com/rjconsultores/ventaboletos/service/ExcepcionPeajeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ExcepcionPeajeService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; - -public interface ExcepcionPeajeService extends GenericService { - - public List buscar(String descconvenio, String cveconvenio); - - public void deletarVigencias(List epv); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; + +public interface ExcepcionPeajeService extends GenericService { + + public List buscar(String descconvenio, String cveconvenio); + + public void deletarVigencias(List epv); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ExcepcionRedondoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ExcepcionRedondoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ExcepcionRedondoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ExcepcionRedondoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/FechamentoParamgeralService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FechamentoParamgeralService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/FechamentoParamgeralService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FechamentoParamgeralService.java index cd945e97d..4be18ef32 100644 --- a/src/com/rjconsultores/ventaboletos/service/FechamentoParamgeralService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FechamentoParamgeralService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; - -public interface FechamentoParamgeralService extends GenericService { - - public List buscaParametrosPorEmpresas(List empresasId); - public List buscaParametrosPorEmpresa(Integer empresasId); - public FechamentoParamgeral suscribirOrActualizacion(FechamentoParamgeral fechamentoParamgeral); - public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresasId, String boletoBancoCod); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; + +public interface FechamentoParamgeralService extends GenericService { + + public List buscaParametrosPorEmpresas(List empresasId); + public List buscaParametrosPorEmpresa(Integer empresasId); + public FechamentoParamgeral suscribirOrActualizacion(FechamentoParamgeral fechamentoParamgeral); + public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresasId, String boletoBancoCod); +} diff --git a/src/com/rjconsultores/ventaboletos/service/FechamentoParamptovtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FechamentoParamptovtaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/FechamentoParamptovtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FechamentoParamptovtaService.java index 6cdac8db0..c5fb2cda1 100644 --- a/src/com/rjconsultores/ventaboletos/service/FechamentoParamptovtaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FechamentoParamptovtaService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface FechamentoParamptovtaService extends GenericService { - - public List buscaParametrosPorEmpresas(List empresasId); - public List buscaParametrosPorEmpresa(Integer empresasId); - public FechamentoParamptovta suscribirOrActualizacion(FechamentoParamptovta FechamentoParamptovta); - public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa); - public FechamentoParamptovta buscaParametrosPorPuntoventaEmpresa(PuntoVenta puntoventa, Empresa empresa); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface FechamentoParamptovtaService extends GenericService { + + public List buscaParametrosPorEmpresas(List empresasId); + public List buscaParametrosPorEmpresa(Integer empresasId); + public FechamentoParamptovta suscribirOrActualizacion(FechamentoParamptovta FechamentoParamptovta); + public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa); + public FechamentoParamptovta buscaParametrosPorPuntoventaEmpresa(PuntoVenta puntoventa, Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/FeriadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FeriadoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/FeriadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FeriadoService.java index 316ce8669..dfe6a5db6 100644 --- a/src/com/rjconsultores/ventaboletos/service/FeriadoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FeriadoService.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.service; - -import java.sql.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Feriado; - -public interface FeriadoService extends GenericService { - - public List buscar(Date descferiado); - - public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado); -} +package com.rjconsultores.ventaboletos.service; + +import java.sql.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Feriado; + +public interface FeriadoService extends GenericService { + + public List buscar(Date descferiado); + + public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado); +} diff --git a/src/com/rjconsultores/ventaboletos/service/FiscalAliquotaEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalAliquotaEmpresaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/FiscalAliquotaEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalAliquotaEmpresaService.java index 41af81023..4c7f25139 100644 --- a/src/com/rjconsultores/ventaboletos/service/FiscalAliquotaEmpresaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalAliquotaEmpresaService.java @@ -1,18 +1,18 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.FiscalAliquotaEmpresa; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface FiscalAliquotaEmpresaService { - - public List obtenerTodos(); - - public FiscalAliquotaEmpresa obtenerID(Integer id); - - public FiscalAliquotaEmpresa suscribirActualizar(FiscalAliquotaEmpresa entidad) throws BusinessException; - - public void borrar(FiscalAliquotaEmpresa entidad); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.FiscalAliquotaEmpresa; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface FiscalAliquotaEmpresaService { + + public List obtenerTodos(); + + public FiscalAliquotaEmpresa obtenerID(Integer id); + + public FiscalAliquotaEmpresa suscribirActualizar(FiscalAliquotaEmpresa entidad) throws BusinessException; + + public void borrar(FiscalAliquotaEmpresa entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraEstadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraEstadoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/FiscalImpressoraEstadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraEstadoService.java index c599f23e9..b81b81134 100644 --- a/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraEstadoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraEstadoService.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; - -public interface FiscalImpressoraEstadoService{ - - public List obtenerTodos(); - public FiscalImpressoraEstado obtenerID(Integer id); - public FiscalImpressoraEstado suscribir(FiscalImpressoraEstado entidad); - public FiscalImpressoraEstado actualizacion(FiscalImpressoraEstado entidad); - public void borrar(FiscalImpressoraEstado entidad); - - public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) ; - - - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; + +public interface FiscalImpressoraEstadoService{ + + public List obtenerTodos(); + public FiscalImpressoraEstado obtenerID(Integer id); + public FiscalImpressoraEstado suscribir(FiscalImpressoraEstado entidad); + public FiscalImpressoraEstado actualizacion(FiscalImpressoraEstado entidad); + public void borrar(FiscalImpressoraEstado entidad); + + public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) ; + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/FiscalImpressoraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraService.java index c20776319..9d436c215 100644 --- a/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalImpressoraService.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface FiscalImpressoraService{ - - public List obtenerTodos(); - public FiscalImpressora obtenerID(Integer id); - public FiscalImpressora suscribir(FiscalImpressora entidad); - public FiscalImpressora actualizacion(FiscalImpressora entidad); - - - public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId); - public List obtenerTodosTotnaofiscalEmpresa(); - public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id); - public FiscalTotnaofiscalEmpresa suscribirActualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) throws BusinessException; - public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); - - - public List buscarFormaPagoEmpresa(Integer empresaEcfId); - public List obtenerTodosFormapagoEmpresa(); - public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id); - public FiscalFormapagoEmpresa suscribirActualizarFormapagoEmpresa(FiscalFormapagoEmpresa entidad) throws BusinessException; - public FiscalFormapagoEmpresa borrarFormapagoEmpresa(FiscalFormapagoEmpresa entidad); - - public List buscarItensRelgerencialEmpresa(Integer empresaEcfId); - public List obtenerTodosRelgerencialEmpresa(); - public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id); - public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); - public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); - public FiscalRelgerencialEmpresa suscribirActualizarRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) throws BusinessException; - - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface FiscalImpressoraService{ + + public List obtenerTodos(); + public FiscalImpressora obtenerID(Integer id); + public FiscalImpressora suscribir(FiscalImpressora entidad); + public FiscalImpressora actualizacion(FiscalImpressora entidad); + + + public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId); + public List obtenerTodosTotnaofiscalEmpresa(); + public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id); + public FiscalTotnaofiscalEmpresa suscribirActualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) throws BusinessException; + public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad); + + + public List buscarFormaPagoEmpresa(Integer empresaEcfId); + public List obtenerTodosFormapagoEmpresa(); + public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id); + public FiscalFormapagoEmpresa suscribirActualizarFormapagoEmpresa(FiscalFormapagoEmpresa entidad) throws BusinessException; + public FiscalFormapagoEmpresa borrarFormapagoEmpresa(FiscalFormapagoEmpresa entidad); + + public List buscarItensRelgerencialEmpresa(Integer empresaEcfId); + public List obtenerTodosRelgerencialEmpresa(); + public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id); + public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); + public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad); + public FiscalRelgerencialEmpresa suscribirActualizarRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) throws BusinessException; + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/FiscalService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/FiscalService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalService.java index 4dec7225f..fc65d7af6 100644 --- a/src/com/rjconsultores/ventaboletos/service/FiscalService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FiscalService.java @@ -1,59 +1,59 @@ -package com.rjconsultores.ventaboletos.service; - -import java.io.File; -import java.sql.SQLException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; - -public interface FiscalService { - - public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException; - - public HashMap importacionFiscalECFValidaReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); - - public File importacionFiscalECF(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); - - public File importacionFiscalReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado); - - public File importacionFiscalReducaoZPendencia(Date inicio, Date fim, Empresa empresa, Estado estado); - - public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); - - public File importacionNaoFiscal(Date inicio, Date fim, Empresa empresa, Estado estado); - - public File importacionFiscalECFCancelados(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); - - public File importacionFiscalECFXls(Empresa empresa, File arquivoTxt); - - public File importacionFiscalReducaoZXls(Empresa empresa, File arquivoTxt); - - public File importacionFiscalECFManualXls(Empresa empresa, File arquivoTxt); - - public File importacionNaoFiscalXls(Empresa empresa, File arquivoTxt); - - public File importacionFiscalECFCanceladosXls(Empresa empresa, File arquivoTxt); - - public File importacionFiscalECFPendencias(Date inicio, Date fim, Empresa empresa, Estado estado); - - public File buscarArquivoExportacaoECF(Date value, Date value2, Empresa empresa, Estado estado, String nomeArquivo); - - public File buscarArquivoExportacaoRMD(Date value, Date value2, Empresa empresa, Estado estado, String nomeArquivo); - - public List getRegistroImpressaoRMDTipoBPR(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio); - - public List getRegistroImpressaoRMDTipoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio); - - public void gravarRMDBoleto(List rmds, Aidf aidf, String folio, Empresa empresa, Estado estado, boolean isECF, boolean isBPR); - - public void cancelarRMDBoleto(Date inicio, Date fim, Empresa empresa, Estado estado, Aidf aidf, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR); - - public List buscarRelatorioRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros); -} +package com.rjconsultores.ventaboletos.service; + +import java.io.File; +import java.sql.SQLException; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; + +public interface FiscalService { + + public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException; + + public HashMap importacionFiscalECFValidaReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); + + public File importacionFiscalECF(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); + + public File importacionFiscalReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado); + + public File importacionFiscalReducaoZPendencia(Date inicio, Date fim, Empresa empresa, Estado estado); + + public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); + + public File importacionNaoFiscal(Date inicio, Date fim, Empresa empresa, Estado estado); + + public File importacionFiscalECFCancelados(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist); + + public File importacionFiscalECFXls(Empresa empresa, File arquivoTxt); + + public File importacionFiscalReducaoZXls(Empresa empresa, File arquivoTxt); + + public File importacionFiscalECFManualXls(Empresa empresa, File arquivoTxt); + + public File importacionNaoFiscalXls(Empresa empresa, File arquivoTxt); + + public File importacionFiscalECFCanceladosXls(Empresa empresa, File arquivoTxt); + + public File importacionFiscalECFPendencias(Date inicio, Date fim, Empresa empresa, Estado estado); + + public File buscarArquivoExportacaoECF(Date value, Date value2, Empresa empresa, Estado estado, String nomeArquivo); + + public File buscarArquivoExportacaoRMD(Date value, Date value2, Empresa empresa, Estado estado, String nomeArquivo); + + public List getRegistroImpressaoRMDTipoBPR(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio); + + public List getRegistroImpressaoRMDTipoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio); + + public void gravarRMDBoleto(List rmds, Aidf aidf, String folio, Empresa empresa, Estado estado, boolean isECF, boolean isBPR); + + public void cancelarRMDBoleto(Date inicio, Date fim, Empresa empresa, Estado estado, Aidf aidf, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR); + + public List buscarRelatorioRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros); +} diff --git a/src/com/rjconsultores/ventaboletos/service/FlywayUtilService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FlywayUtilService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/FlywayUtilService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FlywayUtilService.java index 55811a76b..c473d9635 100644 --- a/src/com/rjconsultores/ventaboletos/service/FlywayUtilService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FlywayUtilService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -public interface FlywayUtilService { - - public boolean existeErroExecucaoScript(); -} +package com.rjconsultores.ventaboletos.service; + +public interface FlywayUtilService { + + public boolean existeErroExecucaoScript(); +} diff --git a/src/com/rjconsultores/ventaboletos/service/FolioPreimpresoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FolioPreimpresoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/FolioPreimpresoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FolioPreimpresoService.java index a58a8449c..43752f1b0 100644 --- a/src/com/rjconsultores/ventaboletos/service/FolioPreimpresoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FolioPreimpresoService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; - -public interface FolioPreimpresoService extends GenericService { - - public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; + +public interface FolioPreimpresoService extends GenericService { + + public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/FormaPagamentoAgenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FormaPagamentoAgenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/FormaPagamentoAgenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FormaPagamentoAgenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/FormaPagoDetService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FormaPagoDetService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/FormaPagoDetService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FormaPagoDetService.java diff --git a/src/com/rjconsultores/ventaboletos/service/FormaPagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FormaPagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/FormaPagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FormaPagoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/FuncionSistemaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/FuncionSistemaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/FuncionSistemaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/FuncionSistemaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingAsientoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingAsientoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingAsientoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingAsientoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingCategoriaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingCategoriaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingClaseService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingClaseService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingClaseService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingClaseService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingClasseTarifariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingClasseTarifariaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingClasseTarifariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingClasseTarifariaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingCorridaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingCorridaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingCorridaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingCorridaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingDiaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingDiaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingDiaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingDiaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoAgenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoAgenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoAgenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoAgenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCanalVendasService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCanalVendasService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCanalVendasService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCanalVendasService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCategoriaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoCategoriaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoOcupacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoOcupacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoOcupacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoOcupacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingEspecificoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingFormapagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingFormapagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingFormapagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingFormapagoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingGestaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingGestaoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingGestaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingGestaoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingHistoricoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingHistoricoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingHistoricoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingHistoricoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingImporteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingImporteService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingImporteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingImporteService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingMarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingMarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingMarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingMarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingMercadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingMercadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingMercadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingMercadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingOcupaAntecipaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingOcupaAntecipaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingOcupaAntecipaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingOcupaAntecipaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingRevisaoValoresService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingRevisaoValoresService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingRevisaoValoresService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingRevisaoValoresService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingRutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingRutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingTipoPtoVtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingTipoPtoVtaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingTipoPtoVtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingTipoPtoVtaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingTipoServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingTipoServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingTipoServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingTipoServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GP_PricingVigenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingVigenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GP_PricingVigenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GP_PricingVigenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GenericService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GenericService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GenericService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GenericService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GenericServiceInforme.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GenericServiceInforme.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GenericServiceInforme.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GenericServiceInforme.java diff --git a/src/com/rjconsultores/ventaboletos/service/GrupoCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoCategoriaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/GrupoCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoCategoriaService.java index 73674693f..cab9afaeb 100644 --- a/src/com/rjconsultores/ventaboletos/service/GrupoCategoriaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoCategoriaService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; - -public interface GrupoCategoriaService extends GenericService { - - public List buscar(String descricao); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; + +public interface GrupoCategoriaService extends GenericService { + + public List buscar(String descricao); +} diff --git a/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GrupoCortesiasService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoCortesiasService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GrupoCortesiasService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoCortesiasService.java diff --git a/src/com/rjconsultores/ventaboletos/service/GrupoRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoRutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/GrupoRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/GrupoRutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/HeaderEsquemaCorridaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/HeaderEsquemaCorridaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/HeaderEsquemaCorridaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/HeaderEsquemaCorridaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/HistoricoFormaPagoPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/HistoricoFormaPagoPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/HistoricoFormaPagoPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/HistoricoFormaPagoPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/HotelService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/HotelService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/HotelService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/HotelService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ImagemService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImagemService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ImagemService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ImagemService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ImportacaoClientesService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesService.java index 4b659fe06..36ef4f502 100644 --- a/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesService.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service; - - -import java.io.Reader; -import java.util.List; - -import org.zkoss.util.media.Media; - -import com.rjconsultores.ventaboletos.entidad.Empresa; - -public interface ImportacaoClientesService { - public String[] lerArquivo(Reader reader, List empresas); - - public String[] lerArquivoExcel(Media media, List empresas); - - public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception; - - public String[] lerArquivoPolicialExcel(Media media, List empresas); - -} +package com.rjconsultores.ventaboletos.service; + + +import java.io.Reader; +import java.util.List; + +import org.zkoss.util.media.Media; + +import com.rjconsultores.ventaboletos.entidad.Empresa; + +public interface ImportacaoClientesService { + public String[] lerArquivo(Reader reader, List empresas); + + public String[] lerArquivoExcel(Media media, List empresas); + + public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception; + + public String[] lerArquivoPolicialExcel(Media media, List empresas); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesSrvpService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesSrvpService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ImportacaoClientesSrvpService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesSrvpService.java index 5ae033661..335006b68 100644 --- a/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesSrvpService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoClientesSrvpService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - - -import java.io.Reader; -import java.util.List; - -import org.zkoss.util.media.Media; - -import com.rjconsultores.ventaboletos.entidad.Empresa; - -public interface ImportacaoClientesSrvpService { - public String[] lerArquivo(Reader reader, List empresas); - - public String[] lerArquivoExcel(Media media, List empresas); - - public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception; -} +package com.rjconsultores.ventaboletos.service; + + +import java.io.Reader; +import java.util.List; + +import org.zkoss.util.media.Media; + +import com.rjconsultores.ventaboletos.entidad.Empresa; + +public interface ImportacaoClientesSrvpService { + public String[] lerArquivo(Reader reader, List empresas); + + public String[] lerArquivoExcel(Media media, List empresas); + + public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception; +} diff --git a/src/com/rjconsultores/ventaboletos/service/ImportacaoRetornoBancarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoRetornoBancarioService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ImportacaoRetornoBancarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoRetornoBancarioService.java index 7f22efb71..c259c6c0b 100644 --- a/src/com/rjconsultores/ventaboletos/service/ImportacaoRetornoBancarioService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImportacaoRetornoBancarioService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - - -import java.io.ByteArrayInputStream; -import java.sql.SQLException; - -import com.rjconsultores.ventaboletos.blocos.DetalheRetorno; -import com.rjconsultores.ventaboletos.entidad.Empresa; - -public interface ImportacaoRetornoBancarioService { - public String lerArquivo(ByteArrayInputStream bais, Empresa empresa); - - public boolean salvarRetornoBancario(DetalheRetorno detalhe, Integer empresaId, Integer usuarioId) throws SQLException; - - public boolean salvarRetornoBancario(DetalheRetorno detalhe, Integer usuarioId) throws SQLException; - +package com.rjconsultores.ventaboletos.service; + + +import java.io.ByteArrayInputStream; +import java.sql.SQLException; + +import com.rjconsultores.ventaboletos.blocos.DetalheRetorno; +import com.rjconsultores.ventaboletos.entidad.Empresa; + +public interface ImportacaoRetornoBancarioService { + public String lerArquivo(ByteArrayInputStream bais, Empresa empresa); + + public boolean salvarRetornoBancario(DetalheRetorno detalhe, Integer empresaId, Integer usuarioId) throws SQLException; + + public boolean salvarRetornoBancario(DetalheRetorno detalhe, Integer usuarioId) throws SQLException; + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/ImpresionLayoutConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ImpresionLayoutConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ImpresionLayoutConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ImpresionLayoutConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/InformeCategoriaVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/InformeCategoriaVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/InformeCategoriaVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/InformeCategoriaVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/InformePasajeroServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/InformePasajeroServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/InformePasajeroServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/InformePasajeroServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/InformeServicioDiarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/InformeServicioDiarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/InformeServicioDiarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/InformeServicioDiarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/InformeVentasPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/InformeVentasPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/InformeVentasPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/InformeVentasPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/InstiFinanceiraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/InstiFinanceiraService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/InstiFinanceiraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/InstiFinanceiraService.java index b41a9988c..624520bac 100644 --- a/src/com/rjconsultores/ventaboletos/service/InstiFinanceiraService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/InstiFinanceiraService.java @@ -1,16 +1,16 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; -import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; - -public interface InstiFinanceiraService { - - public List obtenerTodos(); - public List buscarContasBancariasPorIdEmpresa(Integer empresaId); -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; +import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; + +public interface InstiFinanceiraService { + + public List obtenerTodos(); + public List buscarContasBancariasPorIdEmpresa(Integer empresaId); +} diff --git a/src/com/rjconsultores/ventaboletos/service/IntegracaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/IntegracaoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/IntegracaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/IntegracaoService.java index 3ac754013..e4f733fb9 100644 --- a/src/com/rjconsultores/ventaboletos/service/IntegracaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/IntegracaoService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import java.io.File; -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Ruta; - -public interface IntegracaoService { - - public File importacaoQdmpDer(Date inicio, Date fim, Empresa empresa, List lslinhas); - -} +package com.rjconsultores.ventaboletos.service; + +import java.io.File; +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Ruta; + +public interface IntegracaoService { + + public File importacaoQdmpDer(Date inicio, Date fim, Empresa empresa, List lslinhas); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/IntegracaoTotvsService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/IntegracaoTotvsService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/IntegracaoTotvsService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/IntegracaoTotvsService.java index 91a70e8be..c6f2635b2 100644 --- a/src/com/rjconsultores/ventaboletos/service/IntegracaoTotvsService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/IntegracaoTotvsService.java @@ -1,25 +1,25 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface IntegracaoTotvsService { - public Integer atualizaStstausBilhetesIntegrar(Empresa empresa, Date dataIncial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException; - - public Integer atualizaStstausServicosIntegrar(Empresa empresa, Integer numServico) throws BusinessException; - - public Integer atualizaStstausCorridasIntegrar(Empresa empresa, Integer numCorrida, Date dataInicial, Date dataFinal) throws BusinessException; - - public List buscaPuntoVentaEmpresa(Empresa empresa) throws Exception; - - public Integer solicitaReIntegracaoBilhete(Empresa empresa, Date dataInicial, Date dataFinal, PuntoVenta puntoVenta, Usuario usuario) throws BusinessException; - - public void borrarByCorrida(Corrida corrida); - +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface IntegracaoTotvsService { + public Integer atualizaStstausBilhetesIntegrar(Empresa empresa, Date dataIncial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException; + + public Integer atualizaStstausServicosIntegrar(Empresa empresa, Integer numServico) throws BusinessException; + + public Integer atualizaStstausCorridasIntegrar(Empresa empresa, Integer numCorrida, Date dataInicial, Date dataFinal) throws BusinessException; + + public List buscaPuntoVentaEmpresa(Empresa empresa) throws Exception; + + public Integer solicitaReIntegracaoBilhete(Empresa empresa, Date dataInicial, Date dataFinal, PuntoVenta puntoVenta, Usuario usuario) throws BusinessException; + + public void borrarByCorrida(Corrida corrida); + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/ItemAdicionalService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ItemAdicionalService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ItemAdicionalService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ItemAdicionalService.java index 308ee14a4..0373d0369 100644 --- a/src/com/rjconsultores/ventaboletos/service/ItemAdicionalService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ItemAdicionalService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; - -public interface ItemAdicionalService extends GenericService { - - public List buscaItemAdicionalPacote(Pacote pacote); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; + +public interface ItemAdicionalService extends GenericService { + + public List buscaItemAdicionalPacote(Pacote pacote); +} diff --git a/src/com/rjconsultores/ventaboletos/service/ItemDescontoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ItemDescontoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ItemDescontoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ItemDescontoService.java index d2adb4997..586ce54c0 100644 --- a/src/com/rjconsultores/ventaboletos/service/ItemDescontoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ItemDescontoService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ItemDesconto; - -public interface ItemDescontoService extends GenericService { - - public List buscarPorNome(String nomitemdesconto); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ItemDesconto; + +public interface ItemDescontoService extends GenericService { + + public List buscarPorNome(String nomitemdesconto); +} diff --git a/src/com/rjconsultores/ventaboletos/service/LogAuditoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/LogAuditoriaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/LogAuditoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/LogAuditoriaService.java index 82fec3cb5..b217ede59 100644 --- a/src/com/rjconsultores/ventaboletos/service/LogAuditoriaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/LogAuditoriaService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.LogAuditoria; - -import br.com.rjconsultores.auditador.model.AuditadorObjects; - -public interface LogAuditoriaService extends GenericService { - - public void auditar(Object objetoOriginal, Object objetoNovo, Integer empresaId); - - public void auditarExclusao(Object objeto, Integer empresaId); - - public List listarTodasAsTelas(); - - public void suscribir(List lsObjects, Integer empresaId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.LogAuditoria; + +import br.com.rjconsultores.auditador.model.AuditadorObjects; + +public interface LogAuditoriaService extends GenericService { + + public void auditar(Object objetoOriginal, Object objetoNovo, Integer empresaId); + + public void auditarExclusao(Object objeto, Integer empresaId); + + public List listarTodasAsTelas(); + + public void suscribir(List lsObjects, Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/LogDespesasReceitasDivService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/LogDespesasReceitasDivService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/LogDespesasReceitasDivService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/LogDespesasReceitasDivService.java index 46019e6d3..e3b9655c9 100644 --- a/src/com/rjconsultores/ventaboletos/service/LogDespesasReceitasDivService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/LogDespesasReceitasDivService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; - -public interface LogDespesasReceitasDivService extends GenericService { - public List obterPorPeriodo(Date inicio, Date fim); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; + +public interface LogDespesasReceitasDivService extends GenericService { + public List obterPorPeriodo(Date inicio, Date fim); +} diff --git a/src/com/rjconsultores/ventaboletos/service/MarcaAutobusService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaAutobusService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/MarcaAutobusService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaAutobusService.java index 45de9ad5f..70705007c 100644 --- a/src/com/rjconsultores/ventaboletos/service/MarcaAutobusService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaAutobusService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; - -public interface MarcaAutobusService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; + +public interface MarcaAutobusService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/MarcaClaseServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaClaseServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MarcaClaseServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaClaseServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MensagemRecusaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MensagemRecusaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MensagemRecusaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MensagemRecusaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MensajeEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajeEmpresaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MensajeEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajeEmpresaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MensajePuntaVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajePuntaVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MensajePuntaVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajePuntaVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MensajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajeService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MensajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajeService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MensajeUsuarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajeUsuarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MensajeUsuarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MensajeUsuarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MercadoCompetidoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MercadoCompetidoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MercadoCompetidoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MercadoCompetidoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MerchantBancarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MerchantBancarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MerchantBancarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MerchantBancarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MigracaoControleEstoqueService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MigracaoControleEstoqueService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/MigracaoControleEstoqueService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MigracaoControleEstoqueService.java index f56264c9c..270dbed3b 100644 --- a/src/com/rjconsultores/ventaboletos/service/MigracaoControleEstoqueService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MigracaoControleEstoqueService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface MigracaoControleEstoqueService { - - public void migraDadosBoletosPuntoVenta(PuntoVenta puntoVenta); - - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface MigracaoControleEstoqueService { + + public void migraDadosBoletosPuntoVenta(PuntoVenta puntoVenta); + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/MonedaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MonedaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MonedaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MonedaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MonitoramentoCCFService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MonitoramentoCCFService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/MonitoramentoCCFService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MonitoramentoCCFService.java index 9bd032c26..9336f7f1e 100644 --- a/src/com/rjconsultores/ventaboletos/service/MonitoramentoCCFService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MonitoramentoCCFService.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.service; - -import java.sql.Connection; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; - -public interface MonitoramentoCCFService extends GenericService { - public List buscaQuebraCCF(final String numserie20, final Date data, final Integer ccfInicial); - public void gravarListaCCFQuebrados(Map impressoras, Date data); - public Map obterImpressorasComCCFInicial(Date data); - public void openConnection(); - public void closeConnection(); -} +package com.rjconsultores.ventaboletos.service; + +import java.sql.Connection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; + +public interface MonitoramentoCCFService extends GenericService { + public List buscaQuebraCCF(final String numserie20, final Date data, final Integer ccfInicial); + public void gravarListaCCFQuebrados(Map impressoras, Date data); + public Map obterImpressorasComCCFInicial(Date data); + public void openConnection(); + public void closeConnection(); +} diff --git a/src/com/rjconsultores/ventaboletos/service/MonitoramentoCRZService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MonitoramentoCRZService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/MonitoramentoCRZService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MonitoramentoCRZService.java index 78a450772..52d79749f 100644 --- a/src/com/rjconsultores/ventaboletos/service/MonitoramentoCRZService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MonitoramentoCRZService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; - -public interface MonitoramentoCRZService extends GenericService { - public List buscaQuebraCRZ(Date data); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; + +public interface MonitoramentoCRZService extends GenericService { + public List buscaQuebraCRZ(Date data); +} diff --git a/src/com/rjconsultores/ventaboletos/service/MotivoCancelVendaPacoteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoCancelVendaPacoteService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MotivoCancelVendaPacoteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoCancelVendaPacoteService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MotivoCancelacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoCancelacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MotivoCancelacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoCancelacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MotivoDevolucaoBilheteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoDevolucaoBilheteService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MotivoDevolucaoBilheteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoDevolucaoBilheteService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MotivoReimpresionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoReimpresionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MotivoReimpresionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoReimpresionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MotivoViajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoViajeService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MotivoViajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivoViajeService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MotivocancelacionEquivalenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivocancelacionEquivalenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MotivocancelacionEquivalenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MotivocancelacionEquivalenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/MovimentacionBilhetesService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MovimentacionBilhetesService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/MovimentacionBilhetesService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MovimentacionBilhetesService.java index f2f63607b..ea930c0ed 100644 --- a/src/com/rjconsultores/ventaboletos/service/MovimentacionBilhetesService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MovimentacionBilhetesService.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.AbastoHisto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; - -public interface MovimentacionBilhetesService { - - public List obtenerHistoricoMovimetacion(String numBilhete); - public List obtenerHistoricoMovimetacion(Aidf aidf); - public List obtenerHistoricoMovimetacion(Aidf aidf, Date fecInicial, Date fecFinal); - public List obtenerTiposMovimetacion(); - - - public void realizaAdquisicionBilhetes(Aidf aidf); - public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, TipoMovimentacion tipoMovimentacion); - public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, Long cantidad, TipoMovimentacion tipoMovimentacion); - public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion); - - public PuntoVenta buscarAgSuprimento(); - public PuntoVenta buscarAgContabilidade(); - - public List obtenerTiposMovimetacionPuntoVenta(); - public void realizaMovimentacionBilhetes(PuntoVenta puntoVentaBilhetes, Estacion origem, Estacion destino, String numSerie, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion); - - public List buscarSeriesBilhetesPorEstacion(Estacion estacion); - public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.AbastoHisto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; + +public interface MovimentacionBilhetesService { + + public List obtenerHistoricoMovimetacion(String numBilhete); + public List obtenerHistoricoMovimetacion(Aidf aidf); + public List obtenerHistoricoMovimetacion(Aidf aidf, Date fecInicial, Date fecFinal); + public List obtenerTiposMovimetacion(); + + + public void realizaAdquisicionBilhetes(Aidf aidf); + public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, TipoMovimentacion tipoMovimentacion); + public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, Long cantidad, TipoMovimentacion tipoMovimentacion); + public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion); + + public PuntoVenta buscarAgSuprimento(); + public PuntoVenta buscarAgContabilidade(); + + public List obtenerTiposMovimetacionPuntoVenta(); + public void realizaMovimentacionBilhetes(PuntoVenta puntoVentaBilhetes, Estacion origem, Estacion destino, String numSerie, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion); + + public List buscarSeriesBilhetesPorEstacion(Estacion estacion); + public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/MudancaMassivaContratoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/MudancaMassivaContratoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/MudancaMassivaContratoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/MudancaMassivaContratoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/NodoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/NodoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/NodoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/NodoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/NotaCreditoVendaPacoteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/NotaCreditoVendaPacoteService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/NotaCreditoVendaPacoteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/NotaCreditoVendaPacoteService.java index 46a50c998..e9b877647 100644 --- a/src/com/rjconsultores/ventaboletos/service/NotaCreditoVendaPacoteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/NotaCreditoVendaPacoteService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -public interface NotaCreditoVendaPacoteService { - - List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, - Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +public interface NotaCreditoVendaPacoteService { + + List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, + Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/OCDParamService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDParamService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/OCDParamService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDParamService.java index c17bbaa75..266bf8ae2 100644 --- a/src/com/rjconsultores/ventaboletos/service/OCDParamService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDParamService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OCDParam; - -public interface OCDParamService extends GenericService { - - public OCDParam suscribirActualizar(OCDParam entidad); - public OCDParam buscaOCDParamPorEmpresa(Empresa empresa); - public List buscaOCDParams(Empresa empresa); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OCDParam; + +public interface OCDParamService extends GenericService { + + public OCDParam suscribirActualizar(OCDParam entidad); + public OCDParam buscaOCDParamPorEmpresa(Empresa empresa); + public List buscaOCDParams(Empresa empresa); +} diff --git a/src/com/rjconsultores/ventaboletos/service/OCDPtoVtaParamService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDPtoVtaParamService.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/service/OCDPtoVtaParamService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDPtoVtaParamService.java index 7cefd6ec9..f2c7b3a19 100644 --- a/src/com/rjconsultores/ventaboletos/service/OCDPtoVtaParamService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDPtoVtaParamService.java @@ -1,22 +1,22 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; - -/** - * @author Thiago - * - */ -public interface OCDPtoVtaParamService extends GenericService { - - public List obtenerTodos(); - - public OCDPtoVtaParam obtenerID(Long id); - - public void borrar(OCDPtoVtaParam entidad); - -} +/** + * + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; + +/** + * @author Thiago + * + */ +public interface OCDPtoVtaParamService extends GenericService { + + public List obtenerTodos(); + + public OCDPtoVtaParam obtenerID(Long id); + + public void borrar(OCDPtoVtaParam entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/OCDService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/OCDService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDService.java index a861a3a16..b5a04a1db 100644 --- a/src/com/rjconsultores/ventaboletos/service/OCDService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OCDService.java @@ -1,14 +1,14 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OCD; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -public interface OCDService extends GenericService { - - List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, - Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OCD; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +public interface OCDService extends GenericService { + + List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, + Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/OperadorEmbarcadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OperadorEmbarcadaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/OperadorEmbarcadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OperadorEmbarcadaService.java index 4c706e7c5..ec69bd74f 100644 --- a/src/com/rjconsultores/ventaboletos/service/OperadorEmbarcadaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OperadorEmbarcadaService.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; - -public interface OperadorEmbarcadaService { - - public OperadorEmbarcada suscribirActualizar(OperadorEmbarcada operador, List linhas, List listaServicos) throws BusinessException; - - public void apagar(OperadorEmbarcada operador) throws BusinessException; - - public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario); - - public PuntoVentaVO getPuntoVentaVO(Integer operador); - - public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; + +public interface OperadorEmbarcadaService { + + public OperadorEmbarcada suscribirActualizar(OperadorEmbarcada operador, List linhas, List listaServicos) throws BusinessException; + + public void apagar(OperadorEmbarcada operador) throws BusinessException; + + public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario); + + public PuntoVentaVO getPuntoVentaVO(Integer operador); + + public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta); +} diff --git a/src/com/rjconsultores/ventaboletos/service/OrgaoCancelacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoCancelacionService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/OrgaoCancelacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoCancelacionService.java index f01eafd7d..fbffde167 100644 --- a/src/com/rjconsultores/ventaboletos/service/OrgaoCancelacionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoCancelacionService.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -public interface OrgaoCancelacionService { - - public List buscarPorOrgao(OrgaoConcedente orgaoConcedente); - - public List obtenerTodos(); - - public OrgaoCancelacion obtenerID(Integer id); - - public void borrar(OrgaoCancelacion entidad); - - public OrgaoCancelacion suscribirActualizacion(OrgaoCancelacion entidad); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +public interface OrgaoCancelacionService { + + public List buscarPorOrgao(OrgaoConcedente orgaoConcedente); + + public List obtenerTodos(); + + public OrgaoCancelacion obtenerID(Integer id); + + public void borrar(OrgaoCancelacion entidad); + + public OrgaoCancelacion suscribirActualizacion(OrgaoCancelacion entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/OrgaoComprovanteCustomizadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoComprovanteCustomizadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/OrgaoComprovanteCustomizadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoComprovanteCustomizadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/OrgaoConcedenteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoConcedenteService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/OrgaoConcedenteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoConcedenteService.java index fa3646686..89437f9b7 100644 --- a/src/com/rjconsultores/ventaboletos/service/OrgaoConcedenteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoConcedenteService.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -public interface OrgaoConcedenteService { - - public List buscar(String desc); - - - public List obtenerTodos(); - - public List obtenerTodosExceto(Integer... id); - - public OrgaoConcedente obtenerID(Integer id); - - public OrgaoConcedente actualizacion(OrgaoConcedente entidad); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +public interface OrgaoConcedenteService { + + public List buscar(String desc); + + + public List obtenerTodos(); + + public List obtenerTodosExceto(Integer... id); + + public OrgaoConcedente obtenerID(Integer id); + + public OrgaoConcedente actualizacion(OrgaoConcedente entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java index a108d575c..746493723 100644 --- a/src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java @@ -1,15 +1,15 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; - -public interface OrgaoEmpParamService { - - public List obterPorOrgao(Integer orgaoConcedenteId); - - public List obterPorEmpresa(Integer empresaId); - - public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; + +public interface OrgaoEmpParamService { + + public List obterPorOrgao(Integer orgaoConcedenteId); + + public List obterPorEmpresa(Integer empresaId); + + public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/OrgaoTramoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoTramoService.java similarity index 92% rename from src/com/rjconsultores/ventaboletos/service/OrgaoTramoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoTramoService.java index 7b85c3ffb..6fc963d54 100644 --- a/src/com/rjconsultores/ventaboletos/service/OrgaoTramoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/OrgaoTramoService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - - -public interface OrgaoTramoService{ - - -} +package com.rjconsultores.ventaboletos.service; + + +public interface OrgaoTramoService{ + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PacoteConvenioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteConvenioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PacoteConvenioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteConvenioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PacoteDescontoBilheteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteDescontoBilheteService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PacoteDescontoBilheteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteDescontoBilheteService.java index b441041fd..c62a75e94 100644 --- a/src/com/rjconsultores/ventaboletos/service/PacoteDescontoBilheteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteDescontoBilheteService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; - -public interface PacoteDescontoBilheteService extends GenericService { - - public List obtenerTodos(Integer pacoteId); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; + +public interface PacoteDescontoBilheteService extends GenericService { + + public List obtenerTodos(Integer pacoteId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PacoteItemService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteItemService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PacoteItemService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteItemService.java index c41240ef4..c3f0714fa 100644 --- a/src/com/rjconsultores/ventaboletos/service/PacoteItemService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteItemService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteItem; - -public interface PacoteItemService extends GenericService { - - public PacoteItem vincularItemPacote(PacoteItem pacoteItem, Pacote pacote, ItemAdicional item); - - public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item); - - public List buscaItensPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteItem; + +public interface PacoteItemService extends GenericService { + + public PacoteItem vincularItemPacote(PacoteItem pacoteItem, Pacote pacote, ItemAdicional item); + + public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item); + + public List buscaItensPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PacoteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PacoteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteService.java index 4f14d767d..13cedaa70 100644 --- a/src/com/rjconsultores/ventaboletos/service/PacoteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteService.java @@ -1,13 +1,13 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -public interface PacoteService extends GenericService { - - public Boolean verificaCadastroTarifa(Pacote pacote, TipoTarifaPacote tarifa); - - public Boolean verificaCadastroItemAdicional(Pacote pacote, ItemAdicional item); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +public interface PacoteService extends GenericService { + + public Boolean verificaCadastroTarifa(Pacote pacote, TipoTarifaPacote tarifa); + + public Boolean verificaCadastroItemAdicional(Pacote pacote, ItemAdicional item); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PacoteTarifaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteTarifaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PacoteTarifaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteTarifaService.java index 8073614ff..4ccfbd23c 100644 --- a/src/com/rjconsultores/ventaboletos/service/PacoteTarifaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PacoteTarifaService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - -import java.math.BigDecimal; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -public interface PacoteTarifaService extends GenericService { - - public PacoteTarifa vincularPacoteTarifa(PacoteTarifa pacoteTarifa, Pacote pacote, TipoTarifaPacote tipoTarifaPacote, BigDecimal tarifa, Boolean indvendaweb, Categoria categoria); - - public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote); - - public List buscaTarifasPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.service; + +import java.math.BigDecimal; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +public interface PacoteTarifaService extends GenericService { + + public PacoteTarifa vincularPacoteTarifa(PacoteTarifa pacoteTarifa, Pacote pacote, TipoTarifaPacote tipoTarifaPacote, BigDecimal tarifa, Boolean indvendaweb, Categoria categoria); + + public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote); + + public List buscaTarifasPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PaisService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PaisService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PaisService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PaisService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java index a7c0cb0d9..221f501de 100644 --- a/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaCodOrgaoConcedenteService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; - -public interface ParadaCodOrgaoConcedenteService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; + +public interface ParadaCodOrgaoConcedenteService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ParadaEquivalenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaEquivalenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParadaEquivalenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaEquivalenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParamAcumulaMasivoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamAcumulaMasivoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParamAcumulaMasivoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamAcumulaMasivoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParamAcumulaPuntoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamAcumulaPuntoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParamAcumulaPuntoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamAcumulaPuntoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParamArticuloService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamArticuloService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ParamArticuloService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamArticuloService.java index 9eb141bc3..3fcc501c1 100644 --- a/src/com/rjconsultores/ventaboletos/service/ParamArticuloService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamArticuloService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ParamArticulo; - -public interface ParamArticuloService extends - GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ParamArticulo; + +public interface ParamArticuloService extends + GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ParamCanjePuntoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamCanjePuntoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParamCanjePuntoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamCanjePuntoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParamCompraPuntoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamCompraPuntoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParamCompraPuntoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamCompraPuntoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParamConexionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamConexionService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ParamConexionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamConexionService.java index 113be908c..fa8e16285 100644 --- a/src/com/rjconsultores/ventaboletos/service/ParamConexionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamConexionService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.ParamConexion; - -public interface ParamConexionService { - - public ParamConexion actualizacion(ParamConexion paramConexion); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.ParamConexion; + +public interface ParamConexionService { + + public ParamConexion actualizacion(ParamConexion paramConexion); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ParamCostoTarjetaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamCostoTarjetaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParamCostoTarjetaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamCostoTarjetaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ParamRecoleccionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamRecoleccionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ParamRecoleccionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ParamRecoleccionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PeajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PeajeService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/PeajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PeajeService.java index 358eeed78..e2e398a0b 100644 --- a/src/com/rjconsultores/ventaboletos/service/PeajeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PeajeService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Peaje; - -public interface PeajeService { - - public Peaje buscarPeajePorId(Integer peajeId); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Peaje; + +public interface PeajeService { + + public Peaje buscarPeajePorId(Integer peajeId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PerfilFuncionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PerfilFuncionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PerfilFuncionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PerfilFuncionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PerfilService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PerfilService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PerfilService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PerfilService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PeriodoVacacionalService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PeriodoVacacionalService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PeriodoVacacionalService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PeriodoVacacionalService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PlazaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PlazaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PlazaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PlazaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PrecioFixoPedagioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PrecioFixoPedagioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PrecioFixoPedagioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PrecioFixoPedagioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PrecioVentajaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PrecioVentajaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PrecioVentajaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PrecioVentajaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PrecoApanheService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PrecoApanheService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PrecoApanheService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PrecoApanheService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingAsientoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingAsientoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingAsientoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingAsientoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCategoriaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCategoriaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingClaseService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingClaseService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingClaseService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingClaseService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingClasseTarifariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingClasseTarifariaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PricingClasseTarifariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingClasseTarifariaService.java index 8545cc52e..fac9b162f 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingClasseTarifariaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingClasseTarifariaService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; - -public interface PricingClasseTarifariaService extends GenericService { - - public Boolean validacionSigla(String sigla); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; + +public interface PricingClasseTarifariaService extends GenericService { + + public Boolean validacionSigla(String sigla); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingCorridaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCorridaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingCorridaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCorridaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCtrlService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PricingCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCtrlService.java index cedfb3112..09215455c 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingCtrlService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingCtrlService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingCtrl; - -public interface PricingCtrlService extends GenericService { - - public PricingCtrl obtenerPricingCtrl(); - - public PricingCtrl suscribirOrActualizacion(PricingCtrl entidad); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingCtrl; + +public interface PricingCtrlService extends GenericService { + + public PricingCtrl obtenerPricingCtrl(); + + public PricingCtrl suscribirOrActualizacion(PricingCtrl entidad); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingDiaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingDiaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingDiaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingDiaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoAgenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoAgenciaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PricingEspecificoAgenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoAgenciaService.java index 0953f1ec0..6e737bd14 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoAgenciaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoAgenciaService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; - -public interface PricingEspecificoAgenciaService extends GenericService { - - Boolean existeAgenciaPricing(PricingEspecificoAgencia entidad); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; + +public interface PricingEspecificoAgenciaService extends GenericService { + + Boolean existeAgenciaPricing(PricingEspecificoAgencia entidad); +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCanalVendasService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCanalVendasService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PricingEspecificoCanalVendasService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCanalVendasService.java index 0261b4a4b..246b58228 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCanalVendasService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCanalVendasService.java @@ -1,8 +1,8 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; - -public interface PricingEspecificoCanalVendasService extends GenericService { - - Boolean existeCanalVendasPricing(PricingEspecificoCanalVendas entidad); -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; + +public interface PricingEspecificoCanalVendasService extends GenericService { + + Boolean existeCanalVendasPricing(PricingEspecificoCanalVendas entidad); +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCategoriaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PricingEspecificoCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCategoriaService.java index ee139fc52..e4a464690 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCategoriaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoCategoriaService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; - -public interface PricingEspecificoCategoriaService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; + +public interface PricingEspecificoCategoriaService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoOcupacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoOcupacionService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PricingEspecificoOcupacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoOcupacionService.java index e645cfae6..0719cf6f1 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoOcupacionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoOcupacionService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; - -public interface PricingEspecificoOcupacionService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; + +public interface PricingEspecificoOcupacionService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingFormapagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingFormapagoService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PricingFormapagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingFormapagoService.java index 8bc03f5b8..8ae14d807 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingFormapagoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingFormapagoService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PricingFormapago; - -public interface PricingFormapagoService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PricingFormapago; + +public interface PricingFormapagoService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingImporteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingImporteService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingImporteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingImporteService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingMarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingMarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingMarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingMarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingMercadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingMercadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingMercadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingMercadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingOcupaAntecipaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingOcupaAntecipaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingOcupaAntecipaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingOcupaAntecipaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingRutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingRutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingTipoPtoVtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingTipoPtoVtaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingTipoPtoVtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingTipoPtoVtaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingTipoServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingTipoServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingTipoServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingTipoServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PricingVigenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingVigenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PricingVigenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PricingVigenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdClaseServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdClaseServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdClaseServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdClaseServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdFormaPagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdFormaPagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdFormaPagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdFormaPagoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdMarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdMarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdMarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdMarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdMercadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdMercadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdMercadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdMercadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdPrecioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdPrecioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdPrecioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdPrecioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdRutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdRutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdTipoptovtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdTipoptovtaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdTipoptovtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdTipoptovtaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProdVigenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdVigenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProdVigenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProdVigenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ProductoServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ProductoServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ProductoServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ProductoServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PtoVtaCheckinService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaCheckinService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PtoVtaCheckinService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaCheckinService.java index f911a8a86..cb98362a9 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtoVtaCheckinService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaCheckinService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; - -public interface PtoVtaCheckinService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; + +public interface PtoVtaCheckinService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtoVtaSeguroService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaSeguroService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PtoVtaSeguroService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaSeguroService.java index d5a70cd59..4e8ca10b1 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtoVtaSeguroService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaSeguroService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; - -public interface PtoVtaSeguroService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; + +public interface PtoVtaSeguroService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtoVtaUsuarioBancarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaUsuarioBancarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PtoVtaUsuarioBancarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtoVtaUsuarioBancarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaAgenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAgenciaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PtovtaAgenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAgenciaService.java index 8eb5234f2..377bf3e9a 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaAgenciaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAgenciaService.java @@ -1,16 +1,16 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; - - -public interface PtovtaAgenciaService extends GenericService { - - public List buscar(String numagencia); - public void borrarFisico(PtovtaAgencia pto); -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; + + +public interface PtovtaAgenciaService extends GenericService { + + public List buscar(String numagencia); + public void borrarFisico(PtovtaAgencia pto); +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaAntecipacomissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAntecipacomissaoService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/PtovtaAntecipacomissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAntecipacomissaoService.java index c51c3bb3a..0b4efdce6 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaAntecipacomissaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAntecipacomissaoService.java @@ -1,18 +1,18 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - - -import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; - - -public interface PtovtaAntecipacomissaoService extends GenericService { - - public List buscar(int id); - -} - +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + + +import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; + + +public interface PtovtaAntecipacomissaoService extends GenericService { + + public List buscar(int id); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaAntifraudeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAntifraudeService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PtovtaAntifraudeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAntifraudeService.java index c564a647a..0b2791177 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaAntifraudeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaAntifraudeService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; - -public interface PtovtaAntifraudeService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; + +public interface PtovtaAntifraudeService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaCatIndService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaCatIndService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PtovtaCatIndService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaCatIndService.java index 847c470a8..d551073ae 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaCatIndService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaCatIndService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; - -public interface PtovtaCatIndService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; + +public interface PtovtaCatIndService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaComissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaComissaoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PtovtaComissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaComissaoService.java index ff0fc8128..de60377b8 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaComissaoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaComissaoService.java @@ -1,20 +1,20 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public interface PtovtaComissaoService extends GenericService { - - public List buscar(int id); - - public List buscarByPuntaVenta(PuntoVenta puntaVenta); - - public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId); - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public interface PtovtaComissaoService extends GenericService { + + public List buscar(int id); + + public List buscarByPuntaVenta(PuntoVenta puntaVenta); + + public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaContaMDService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaContaMDService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/PtovtaContaMDService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaContaMDService.java index cc1758c66..8815c61e8 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaContaMDService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaContaMDService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; - -public interface PtovtaContaMDService extends GenericService { - - public boolean contemItem(PtovtaContaMD ptovtaContaMD); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; + +public interface PtovtaContaMDService extends GenericService { + + public boolean contemItem(PtovtaContaMD ptovtaContaMD); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaDiversosService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaDiversosService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/PtovtaDiversosService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaDiversosService.java index 980fd910c..4dc686add 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaDiversosService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaDiversosService.java @@ -1,20 +1,20 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; - - - - - -public interface PtovtaDiversosService extends GenericService { - - public List buscar(int id); - -} - +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; + + + + + +public interface PtovtaDiversosService extends GenericService { + + public List buscar(int id); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaBloqueadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaBloqueadaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaBloqueadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaBloqueadaService.java index 5dbc3d564..945006a3d 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaBloqueadaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaBloqueadaService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; - -public interface PtovtaEmpresaBloqueadaService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; + +public interface PtovtaEmpresaBloqueadaService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaEstoqueService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEstoqueService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/PtovtaEstoqueService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEstoqueService.java index cb0f3155d..0a616f9cd 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaEstoqueService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaEstoqueService.java @@ -1,20 +1,20 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; - - - - - -public interface PtovtaEstoqueService extends GenericService { - - public List buscar(int id); - -} - +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; + + + + + +public interface PtovtaEstoqueService extends GenericService { + + public List buscar(int id); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaExcecaoMultaCancService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaExcecaoMultaCancService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/PtovtaExcecaoMultaCancService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaExcecaoMultaCancService.java index 98fece466..636fc73a5 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaExcecaoMultaCancService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaExcecaoMultaCancService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; - -public interface PtovtaExcecaoMultaCancService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; + +public interface PtovtaExcecaoMultaCancService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaHorarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaHorarioService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/PtovtaHorarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaHorarioService.java index 14ad701a8..661de0d7c 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaHorarioService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaHorarioService.java @@ -1,20 +1,20 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; - - - - - -public interface PtovtaHorarioService extends GenericService { - - public List buscar(int id); - -} - +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; + + + + + +public interface PtovtaHorarioService extends GenericService { + + public List buscar(int id); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaTitularService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaTitularService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/PtovtaTitularService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaTitularService.java index 38f4fabfa..2d4e71a94 100644 --- a/src/com/rjconsultores/ventaboletos/service/PtovtaTitularService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PtovtaTitularService.java @@ -1,17 +1,17 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; - - -public interface PtovtaTitularService extends GenericService { - - public List buscar(int id); - -} - +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; + + +public interface PtovtaTitularService extends GenericService { + + public List buscar(int id); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/PuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/PuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/PuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/PuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ReceitaDespesaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReceitaDespesaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/ReceitaDespesaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReceitaDespesaService.java index 1a42d58d4..dce8f2969 100644 --- a/src/com/rjconsultores/ventaboletos/service/ReceitaDespesaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReceitaDespesaService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; - -public interface ReceitaDespesaService { - - public List getRelatorioDetalhado(Map parametros) throws BusinessException; - - public List getRelatorioSintetico(Map parametros) throws BusinessException; - - public List getRelatorioAgencia(Map parametros) throws BusinessException; - - public List getRelatorioEvento(Map parametros) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; + +public interface ReceitaDespesaService { + + public List getRelatorioDetalhado(Map parametros) throws BusinessException; + + public List getRelatorioSintetico(Map parametros) throws BusinessException; + + public List getRelatorioAgencia(Map parametros) throws BusinessException; + + public List getRelatorioEvento(Map parametros) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RedondeoMarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RedondeoMarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RedondeoMarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RedondeoMarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RedondeoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RedondeoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RedondeoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RedondeoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RegionMetropolitanaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RegionMetropolitanaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/RegionMetropolitanaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RegionMetropolitanaService.java index fc59c8e42..a73671c6c 100644 --- a/src/com/rjconsultores/ventaboletos/service/RegionMetropolitanaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RegionMetropolitanaService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; - -public interface RegionMetropolitanaService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; + +public interface RegionMetropolitanaService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/RelatorioAgepanService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RelatorioAgepanService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/RelatorioAgepanService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RelatorioAgepanService.java index 577230249..dd9d8ab56 100644 --- a/src/com/rjconsultores/ventaboletos/service/RelatorioAgepanService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RelatorioAgepanService.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.service; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; - -public interface RelatorioAgepanService { - - public List listar(Map parametros) throws BusinessException; - - public InputStream gerarArquivoGratuidadeAgepan(Map parametros) throws IOException, BusinessException; - -} +package com.rjconsultores.ventaboletos.service; + +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; + +public interface RelatorioAgepanService { + + public List listar(Map parametros) throws BusinessException; + + public InputStream gerarArquivoGratuidadeAgepan(Map parametros) throws IOException, BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/RequisicionBoletoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RequisicionBoletoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/RequisicionBoletoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RequisicionBoletoService.java index eeb2f63a2..8094f85ca 100644 --- a/src/com/rjconsultores/ventaboletos/service/RequisicionBoletoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RequisicionBoletoService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; - -public interface RequisicionBoletoService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; + +public interface RequisicionBoletoService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ReservaEspecialClienteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservaEspecialClienteService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/ReservaEspecialClienteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservaEspecialClienteService.java index 3b48cea74..cd578c1b8 100644 --- a/src/com/rjconsultores/ventaboletos/service/ReservaEspecialClienteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservaEspecialClienteService.java @@ -1,18 +1,18 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; - -public interface ReservaEspecialClienteService extends GenericService { - - public List bucarReservaEspecialByClienteId(Long clienteId) ; - - public List bucarReservaEspecialByCorridaId(Long corridaId) ; - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; + +public interface ReservaEspecialClienteService extends GenericService { + + public List bucarReservaEspecialByClienteId(Long clienteId) ; + + public List bucarReservaEspecialByCorridaId(Long corridaId) ; + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ReservacionCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionCategoriaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ReservacionCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionCategoriaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ReservacionClaseService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionClaseService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ReservacionClaseService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionClaseService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ReservacionCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ReservacionCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ReservacionMarcaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionMarcaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ReservacionMarcaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionMarcaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ReservacionMercadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionMercadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ReservacionMercadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionMercadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/ReservacionPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ReservacionPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ReservacionPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RestriccionPagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RestriccionPagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RestriccionPagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RestriccionPagoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RevenueConfigService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RevenueConfigService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RevenueConfigService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RevenueConfigService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RhPagoConductorService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RhPagoConductorService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RhPagoConductorService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RhPagoConductorService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RolOperativoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RolOperativoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RolOperativoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RolOperativoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RutaCasetaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaCasetaService.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/RutaCasetaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaCasetaService.java index aa30f09b8..214b689c6 100644 --- a/src/com/rjconsultores/ventaboletos/service/RutaCasetaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaCasetaService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - - -import com.rjconsultores.ventaboletos.entidad.RutaCaseta; -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public interface RutaCasetaService { - - public RutaCaseta suscribir(RutaCaseta entidad) throws BusinessException; - public void deletarRutaCasetasFromRutaSecuenciaId(Integer id)throws BusinessException; - -} - - - - - - - +package com.rjconsultores.ventaboletos.service; + + +import com.rjconsultores.ventaboletos.entidad.RutaCaseta; +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public interface RutaCasetaService { + + public RutaCaseta suscribir(RutaCaseta entidad) throws BusinessException; + public void deletarRutaCasetasFromRutaSecuenciaId(Integer id)throws BusinessException; + +} + + + + + + + diff --git a/src/com/rjconsultores/ventaboletos/service/RutaCombinacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaCombinacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RutaCombinacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaCombinacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RutaEmbarqueDesembarqueService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaEmbarqueDesembarqueService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/RutaEmbarqueDesembarqueService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaEmbarqueDesembarqueService.java index 28bad4595..38efc2b3f 100644 --- a/src/com/rjconsultores/ventaboletos/service/RutaEmbarqueDesembarqueService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaEmbarqueDesembarqueService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaEmbarqueDesembarque; - -public interface RutaEmbarqueDesembarqueService extends GenericService { - - List obtenerPorRuta(Ruta ruta); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaEmbarqueDesembarque; + +public interface RutaEmbarqueDesembarqueService extends GenericService { + + List obtenerPorRuta(Ruta ruta); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/RutaEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaEmpresaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RutaEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaEmpresaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RutaIcmsExcepcionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaIcmsExcepcionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RutaIcmsExcepcionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaIcmsExcepcionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RutaSecuenciaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaSecuenciaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RutaSecuenciaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaSecuenciaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/RutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/RutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/RutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/SapService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SapService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/SapService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SapService.java index 69c0674cf..f3c940887 100644 --- a/src/com/rjconsultores/ventaboletos/service/SapService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SapService.java @@ -1,21 +1,21 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; - -public interface SapService extends GenericService { - - public int remessa(List fechamentos, boolean processoManual) throws Exception ; - - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status); - - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status, PuntoVenta puntoVenta); - - public void integracaoSapAutomatica() throws Exception; - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; + +public interface SapService extends GenericService { + + public int remessa(List fechamentos, boolean processoManual) throws Exception ; + + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status); + + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status, PuntoVenta puntoVenta); + + public void integracaoSapAutomatica() throws Exception; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/SecretariaEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SecretariaEmpresaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/SecretariaEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SecretariaEmpresaService.java index 20c06c157..6aa30a103 100644 --- a/src/com/rjconsultores/ventaboletos/service/SecretariaEmpresaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SecretariaEmpresaService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Secretaria; -import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; - -public interface SecretariaEmpresaService extends GenericService { - - public List buscarPorSecretaria(Secretaria secretaria); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Secretaria; +import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; + +public interface SecretariaEmpresaService extends GenericService { + + public List buscarPorSecretaria(Secretaria secretaria); +} diff --git a/src/com/rjconsultores/ventaboletos/service/SecretariaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SecretariaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/SecretariaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SecretariaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/SegVKMService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SegVKMService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/SegVKMService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SegVKMService.java diff --git a/src/com/rjconsultores/ventaboletos/service/SeguradoraEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguradoraEmpresaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/SeguradoraEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguradoraEmpresaService.java index 21522ece5..123e47d46 100644 --- a/src/com/rjconsultores/ventaboletos/service/SeguradoraEmpresaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguradoraEmpresaService.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; - -public interface SeguradoraEmpresaService extends GenericService{ - public boolean existe(Empresa empresa, String serie); - +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; + +public interface SeguradoraEmpresaService extends GenericService{ + public boolean existe(Empresa empresa, String serie); + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/SeguroKmService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguroKmService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/SeguroKmService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguroKmService.java index efb922fa9..fa339fa61 100644 --- a/src/com/rjconsultores/ventaboletos/service/SeguroKmService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguroKmService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroKm; -import java.util.List; - - -public interface SeguroKmService extends GenericService{ - - public List buscarPorOrgao(OrgaoConcedente orgao); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroKm; +import java.util.List; + + +public interface SeguroKmService extends GenericService{ + + public List buscarPorOrgao(OrgaoConcedente orgao); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/SeguroTarifaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguroTarifaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/SeguroTarifaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguroTarifaService.java index eba6ecc50..b9f4ca203 100644 --- a/src/com/rjconsultores/ventaboletos/service/SeguroTarifaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SeguroTarifaService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; -import java.util.List; - - -public interface SeguroTarifaService extends GenericService{ - - public List buscarPorOrgao(OrgaoConcedente orgao); - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; +import java.util.List; + + +public interface SeguroTarifaService extends GenericService{ + + public List buscarPorOrgao(OrgaoConcedente orgao); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/SisdapService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SisdapService.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/SisdapService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SisdapService.java index ed51ceba4..62dfa6cd4 100644 --- a/src/com/rjconsultores/ventaboletos/service/SisdapService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SisdapService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -public interface SisdapService { - - public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId); - - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem); - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, List pesquisaGratuidadeProfessor, List pesquisaGratuidadeEstudante); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +public interface SisdapService { + + public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId); + + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem); + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, List pesquisaGratuidadeProfessor, List pesquisaGratuidadeEstudante); +} diff --git a/src/com/rjconsultores/ventaboletos/service/SistemaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SistemaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/SistemaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SistemaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/SolicitudExpresosService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/SolicitudExpresosService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/SolicitudExpresosService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/SolicitudExpresosService.java diff --git a/src/com/rjconsultores/ventaboletos/service/StatusSolicitudExpresosService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/StatusSolicitudExpresosService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/StatusSolicitudExpresosService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/StatusSolicitudExpresosService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaCategoriaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaCategoriaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaCategoriaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaCategoriaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaHistService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaHistService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaHistService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaHistService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaEmbarcadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaHistService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaHistService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaHistService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaHistService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaKmService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaKmService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TarifaKmService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaKmService.java index 15a9772c5..52bedf423 100644 --- a/src/com/rjconsultores/ventaboletos/service/TarifaKmService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaKmService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.TarifaKm; - -public interface TarifaKmService extends GenericService{ - - public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.TarifaKm; + +public interface TarifaKmService extends GenericService{ + + public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId); +} diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaMinimaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaMinimaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaMinimaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaMinimaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java index 25b26d0f8..be0e2dd11 100644 --- a/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java @@ -1,155 +1,155 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.dao.TarifaOficialDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TarifaOficial; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.exception.BusinessException; - - -public interface TarifaOficialService { - - /** - * Gera as tarifas de acordo o cálculo do coeficiente tarifário.
- * - * Fórmula: (KM * Coeficiente Tarifário) - * - * Se o parametro ruta não for informado, será gerado tarifas para todas as - * rutas.
- * - * Se o parametro orgaoConcedenteId não for informado, será gerado tarifas para todos os - * órgãos.
- * - * Obs.: Essa operação apenas gera tarifas que ainda não estão geradas
- * - * @param rutaId - * @param orgaoConcedenteId - * @return A quantidade de registros afetadas - */ - public Integer gerarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente, List idsEmpresas,Integer[] lsCasetaPeaje); - - - /** - * Atualiza as tarifas de acordo o cálculo do coeficiente tarifário.
- * - * Fórmula: (KM * Coeficiente Tarifário) - * - * Se o parametro ruta não for informado, será atualizado as tarifas para - * todas as rutas.
- * - * - * Se o parametro orgaoConcedenteId não for informado, será atualizado as tarifas para - * todos as órgãos.
- * - * @param rutaId - * @param orgaoConcedenteId - * @return - Quantidade de tarifas atualizadas - */ - public Integer atualizarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente); - - - /** - * Gera o calculo de preço utilizando calculo por coeficiente ou pela kilometragem da ARTESP - * - * - * @param rudaId - * @param orgaoConcedenteId - * @param empresaId - * @throws BusinessException - */ - public void gerarAtualizarTarifa(List lsRuta, OrgaoConcedente orgaoConcedenteId, List lsEmpresaSelected, Integer[] lsCasetaPeaje) throws BusinessException; - - /** - * Copia a tarifa oficial para a tabela de tarifa de acordo com a vigencia especificada.
- * - * Se a tarifa não existe, ela é inserida. Se existe, a tarifa e os componentes do preços são atualizados
- * - * @param vigenciaTarifa - */ - public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente); - - /** - * Atualiza a taxa de embarque da entidade TarifaOficial.
- * - * Para o cálculo, é usado a seguinte lógica:
- * - Atualiza de acordo a tabela TAXA_EMBARQUE_PARADA por kilometragem
- * - Atualiza de acordo a tabela TAXA_EMBARQUE por kilometragem
- * - Atualiza de acordo a tabela TAXA_EMBARQUE_PARADA por valor fixo
- * - * A sequencia acima indica a ordem de atualização da taxa de embarque.
- * - * A taxa de embarque mais restritiva fica por último (TAXA_EMBARQUE_PARADA por valor fixo) - * - * @param rutaId - Se informado, será atualizado apenas a taxa de embarque da ruta informada - * @param orgaoConcedenteId - Se informado, será atualizado apenas a taxa de embarque do órgão informado - * @param gerarTabelaZerada - Indica se uma tabela zerada será gerada. Isso para a possibilidade de gerar apenas a taxa de embarque sem preço - * @param empresaId - Empresa para ser filtrada - * @throws BusinessException - */ - public void atualizarTaxaEmbarque(List lsRuta, Integer orgaoConcedenteId,boolean gerarTabelaZerada, List lsEmpresaSelected, List lsParadaIds) throws BusinessException; - - /** - * Atualiza o seguro de acordo a kilometragem do trecho - * - * @param rutaId - Se informado, será filtrado pela ruta - * @param orgaoId -Se informado, será filtrado pelo orgão - */ - public void atualizarSeguroPorKm(Integer rutaId,Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; - - /** - * Atualiza o seguro de acordo o valor da tarifa - * - * @param rutaId - Se informado, será filtrado pela ruta - * @param orgaoId -Se informado, será filtrado pelo orgão - * - */ - public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId) throws BusinessException; - - - /** - * Executa tanto o {@link #atualizarSeguroPorKm(Integer, Integer)} quanto {@link #atualizarSeguroPorTarifa(Integer, Integer)} - * - * @param rutaId- Se informado, será filtrado pela ruta - * @param orgaoId-Se informado, será filtrado pelo orgão - * @throws BusinessException - */ - public void atualizarSeguro(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; - - /** - * See {@link TarifaOficialDAO#aplicarArredondamentoTarifa(Integer, Integer)} - * @param orgaoConcedenteId -Se informado, será filtrado pelo orgão - */ - public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Boolean taxaEmbarque); - - public void actualizacion(TarifaOficial tarifaOficial); - - public TarifaOficial obtenerID(Integer tarifaOficialId); - - public void borrar(TarifaOficial tarifaOficial); - - public void gerarAtualizarTabelaZerada(List lsRuta, Integer orgaoConcedenteId, List lsEmpresaSelected,List lsParadaId) throws BusinessException ; - - public void atualizarPedagio(); - - public void atualizarSeguroPorKmTPP(Integer rutaId, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; - - public void atualizarSeguroTPP(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; - - public long obtenerCount(List lsEmpresaSelected); - - public List obterTarifaOficialPorFiltro(Moneda moneda, Marca marca,List lsMarcas,Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende); - - public void atualizarPedagioPorListaDePracaDePagio(List lsCasetaPeaje,Integer empresaId); - -} - +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.dao.TarifaOficialDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TarifaOficial; +import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; +import com.rjconsultores.ventaboletos.exception.BusinessException; + + +public interface TarifaOficialService { + + /** + * Gera as tarifas de acordo o cálculo do coeficiente tarifário.
+ * + * Fórmula: (KM * Coeficiente Tarifário) + * + * Se o parametro ruta não for informado, será gerado tarifas para todas as + * rutas.
+ * + * Se o parametro orgaoConcedenteId não for informado, será gerado tarifas para todos os + * órgãos.
+ * + * Obs.: Essa operação apenas gera tarifas que ainda não estão geradas
+ * + * @param rutaId + * @param orgaoConcedenteId + * @return A quantidade de registros afetadas + */ + public Integer gerarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente, List idsEmpresas,Integer[] lsCasetaPeaje); + + + /** + * Atualiza as tarifas de acordo o cálculo do coeficiente tarifário.
+ * + * Fórmula: (KM * Coeficiente Tarifário) + * + * Se o parametro ruta não for informado, será atualizado as tarifas para + * todas as rutas.
+ * + * + * Se o parametro orgaoConcedenteId não for informado, será atualizado as tarifas para + * todos as órgãos.
+ * + * @param rutaId + * @param orgaoConcedenteId + * @return - Quantidade de tarifas atualizadas + */ + public Integer atualizarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente); + + + /** + * Gera o calculo de preço utilizando calculo por coeficiente ou pela kilometragem da ARTESP + * + * + * @param rudaId + * @param orgaoConcedenteId + * @param empresaId + * @throws BusinessException + */ + public void gerarAtualizarTarifa(List lsRuta, OrgaoConcedente orgaoConcedenteId, List lsEmpresaSelected, Integer[] lsCasetaPeaje) throws BusinessException; + + /** + * Copia a tarifa oficial para a tabela de tarifa de acordo com a vigencia especificada.
+ * + * Se a tarifa não existe, ela é inserida. Se existe, a tarifa e os componentes do preços são atualizados
+ * + * @param vigenciaTarifa + */ + public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente); + + /** + * Atualiza a taxa de embarque da entidade TarifaOficial.
+ * + * Para o cálculo, é usado a seguinte lógica:
+ * - Atualiza de acordo a tabela TAXA_EMBARQUE_PARADA por kilometragem
+ * - Atualiza de acordo a tabela TAXA_EMBARQUE por kilometragem
+ * - Atualiza de acordo a tabela TAXA_EMBARQUE_PARADA por valor fixo
+ * + * A sequencia acima indica a ordem de atualização da taxa de embarque.
+ * + * A taxa de embarque mais restritiva fica por último (TAXA_EMBARQUE_PARADA por valor fixo) + * + * @param rutaId - Se informado, será atualizado apenas a taxa de embarque da ruta informada + * @param orgaoConcedenteId - Se informado, será atualizado apenas a taxa de embarque do órgão informado + * @param gerarTabelaZerada - Indica se uma tabela zerada será gerada. Isso para a possibilidade de gerar apenas a taxa de embarque sem preço + * @param empresaId - Empresa para ser filtrada + * @throws BusinessException + */ + public void atualizarTaxaEmbarque(List lsRuta, Integer orgaoConcedenteId,boolean gerarTabelaZerada, List lsEmpresaSelected, List lsParadaIds) throws BusinessException; + + /** + * Atualiza o seguro de acordo a kilometragem do trecho + * + * @param rutaId - Se informado, será filtrado pela ruta + * @param orgaoId -Se informado, será filtrado pelo orgão + */ + public void atualizarSeguroPorKm(Integer rutaId,Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; + + /** + * Atualiza o seguro de acordo o valor da tarifa + * + * @param rutaId - Se informado, será filtrado pela ruta + * @param orgaoId -Se informado, será filtrado pelo orgão + * + */ + public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId) throws BusinessException; + + + /** + * Executa tanto o {@link #atualizarSeguroPorKm(Integer, Integer)} quanto {@link #atualizarSeguroPorTarifa(Integer, Integer)} + * + * @param rutaId- Se informado, será filtrado pela ruta + * @param orgaoId-Se informado, será filtrado pelo orgão + * @throws BusinessException + */ + public void atualizarSeguro(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; + + /** + * See {@link TarifaOficialDAO#aplicarArredondamentoTarifa(Integer, Integer)} + * @param orgaoConcedenteId -Se informado, será filtrado pelo orgão + */ + public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Boolean taxaEmbarque); + + public void actualizacion(TarifaOficial tarifaOficial); + + public TarifaOficial obtenerID(Integer tarifaOficialId); + + public void borrar(TarifaOficial tarifaOficial); + + public void gerarAtualizarTabelaZerada(List lsRuta, Integer orgaoConcedenteId, List lsEmpresaSelected,List lsParadaId) throws BusinessException ; + + public void atualizarPedagio(); + + public void atualizarSeguroPorKmTPP(Integer rutaId, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; + + public void atualizarSeguroTPP(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException; + + public long obtenerCount(List lsEmpresaSelected); + + public List obterTarifaOficialPorFiltro(Moneda moneda, Marca marca,List lsMarcas,Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende); + + public void atualizarPedagioPorListaDePracaDePagio(List lsCasetaPeaje,Integer empresaId); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaTipoptovtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaTipoptovtaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarifaTipoptovtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarifaTipoptovtaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarjetaCreditoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaCreditoService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/TarjetaCreditoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaCreditoService.java index fadd79633..fcd00e797 100644 --- a/src/com/rjconsultores/ventaboletos/service/TarjetaCreditoService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaCreditoService.java @@ -1,7 +1,7 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; - -public interface TarjetaCreditoService extends GenericService { - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; + +public interface TarjetaCreditoService extends GenericService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/TarjetaFidelidadService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaFidelidadService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarjetaFidelidadService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaFidelidadService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarjetaRecaudacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaRecaudacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TarjetaRecaudacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaRecaudacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TarjetaViajeService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaViajeService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TarjetaViajeService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaViajeService.java index 1e41f9c65..25d1e1065 100644 --- a/src/com/rjconsultores/ventaboletos/service/TarjetaViajeService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TarjetaViajeService.java @@ -1,22 +1,22 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.Date; -import java.util.List; - -import org.zkoss.zul.Comboitem; - -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; - -public interface TarjetaViajeService extends GenericService { - - public void grabarTarjetaViaje(List lsCorridaTramo); - - public void verificaCorridaDuplicada(List lsTarjetaViaje, boolean todasTarjetas); - - public List buscarTarjetaPorFiltros(Integer autoIni, Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa); - - public List generarArchivoNomina(Date fecIni, Date fecFin); - - public void actulizarTarjetasEnviadas(List lsTarjetas); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.Date; +import java.util.List; + +import org.zkoss.zul.Comboitem; + +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; + +public interface TarjetaViajeService extends GenericService { + + public void grabarTarjetaViaje(List lsCorridaTramo); + + public void verificaCorridaDuplicada(List lsTarjetaViaje, boolean todasTarjetas); + + public List buscarTarjetaPorFiltros(Integer autoIni, Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa); + + public List generarArchivoNomina(Date fecIni, Date fecFin); + + public void actulizarTarjetasEnviadas(List lsTarjetas); +} diff --git a/src/com/rjconsultores/ventaboletos/service/TaxaEmbLevanteCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbLevanteCtrlService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TaxaEmbLevanteCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbLevanteCtrlService.java index 451c6a179..fd1c70d9d 100644 --- a/src/com/rjconsultores/ventaboletos/service/TaxaEmbLevanteCtrlService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbLevanteCtrlService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; - -public interface TaxaEmbLevanteCtrlService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; + +public interface TaxaEmbLevanteCtrlService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueKmService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueKmService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueKmService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueKmService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueParadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueParadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueParadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TaxaEmbarqueParadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoCambioCiudadService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCambioCiudadService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoCambioCiudadService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCambioCiudadService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoCambioCtrlService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCambioCtrlService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoCambioCtrlService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCambioCtrlService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoConvenioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoConvenioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoConvenioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoConvenioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoCorteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCorteService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoCorteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCorteService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoCortesiaDescuentoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCortesiaDescuentoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoCortesiaDescuentoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCortesiaDescuentoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoCortesiaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCortesiaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoCortesiaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoCortesiaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoDocAutobusService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoDocAutobusService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TipoDocAutobusService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoDocAutobusService.java index ccd9a3819..f0f6acdc5 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoDocAutobusService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoDocAutobusService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; - -public interface TipoDocAutobusService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; + +public interface TipoDocAutobusService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/TipoDomicilioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoDomicilioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoDomicilioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoDomicilioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoEmpleadoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEmpleadoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoEmpleadoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEmpleadoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraEmpresaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TipoEventoExtraEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraEmpresaService.java index ee7a66209..c7242f7db 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraEmpresaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraEmpresaService.java @@ -1,11 +1,11 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; - -public interface TipoEventoExtraEmpresaService extends GenericService { - public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra); - public TipoEventoExtraEmpresa suscribir(TipoEventoExtraEmpresa entidad); -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; + +public interface TipoEventoExtraEmpresaService extends GenericService { + public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra); + public TipoEventoExtraEmpresa suscribir(TipoEventoExtraEmpresa entidad); +} diff --git a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraFormaPagoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraFormaPagoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoEventoExtraFormaPagoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraFormaPagoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraPtovtaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraPtovtaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TipoEventoExtraPtovtaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraPtovtaService.java index 48e43a0ab..8d84d5ccf 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraPtovtaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraPtovtaService.java @@ -1,6 +1,6 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; - -public interface TipoEventoExtraPtovtaService extends GenericService { -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; + +public interface TipoEventoExtraPtovtaService extends GenericService { +} diff --git a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/TipoEventoExtraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraService.java index 2fd7c479b..9822409c5 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoEventoExtraService.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.ValidacionCampoException; - -public interface TipoEventoExtraService { - - public List buscar(String descingreso); - - public List buscarLike(String descingreso); - - public List obtenerTodos(); - - public TipoEventoExtra obtenerID(Integer id); - - public TipoEventoExtra suscribir(TipoEventoExtra entidad) throws ValidacionCampoException; - - public TipoEventoExtra actualizacion(TipoEventoExtra entidad) throws ValidacionCampoException; - - public void borrar(TipoEventoExtra entidad) throws BusinessException; -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.ValidacionCampoException; + +public interface TipoEventoExtraService { + + public List buscar(String descingreso); + + public List buscarLike(String descingreso); + + public List obtenerTodos(); + + public TipoEventoExtra obtenerID(Integer id); + + public TipoEventoExtra suscribir(TipoEventoExtra entidad) throws ValidacionCampoException; + + public TipoEventoExtra actualizacion(TipoEventoExtra entidad) throws ValidacionCampoException; + + public void borrar(TipoEventoExtra entidad) throws BusinessException; +} diff --git a/src/com/rjconsultores/ventaboletos/service/TipoIdentificacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoIdentificacionService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/TipoIdentificacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoIdentificacionService.java index 3a863aad5..4b7b92531 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoIdentificacionService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoIdentificacionService.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; - -public interface TipoIdentificacionService extends GenericService { - - public List obtenerTodos(); - - public TipoIdentificacion suscribir(TipoIdentificacion tipoDocumento); - - public void borrar(TipoIdentificacion tipoDocumento); - - public TipoIdentificacion actualizacion(TipoIdentificacion tipoDocumento); - - public TipoIdentificacion buscarPorNome(String descTipoDoc); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; + +public interface TipoIdentificacionService extends GenericService { + + public List obtenerTodos(); + + public TipoIdentificacion suscribir(TipoIdentificacion tipoDocumento); + + public void borrar(TipoIdentificacion tipoDocumento); + + public TipoIdentificacion actualizacion(TipoIdentificacion tipoDocumento); + + public TipoIdentificacion buscarPorNome(String descTipoDoc); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/TipoInformativoComissaoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoInformativoComissaoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoInformativoComissaoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoInformativoComissaoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoMovimientoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoMovimientoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoMovimientoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoMovimientoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoOcupacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoOcupacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoOcupacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoOcupacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoParadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoParadaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoParadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoParadaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoPuntoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoPuntoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoPuntoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoPuntoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TipoTarifaPacoteService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoTarifaPacoteService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/TipoTarifaPacoteService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoTarifaPacoteService.java index fec103b14..da18dd2e2 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoTarifaPacoteService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoTarifaPacoteService.java @@ -1,12 +1,12 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; - -public interface TipoTarifaPacoteService extends GenericService { - - public List buscaTipoTarifaPacote(Pacote pacote); - -} +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; + +public interface TipoTarifaPacoteService extends GenericService { + + public List buscaTipoTarifaPacote(Pacote pacote); + +} diff --git a/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TipoVentaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TramoKmServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoKmServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TramoKmServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoKmServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TramoRutaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoRutaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TramoRutaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoRutaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TramoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TramoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TramoServicioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoServicioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TramoServicioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoServicioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TramoTiempoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoTiempoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TramoTiempoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TramoTiempoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TransportadoraService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TransportadoraService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TransportadoraService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TransportadoraService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TrayectosExpresosService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TrayectosExpresosService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TrayectosExpresosService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TrayectosExpresosService.java diff --git a/src/com/rjconsultores/ventaboletos/service/TurnoService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/TurnoService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/TurnoService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/TurnoService.java diff --git a/src/com/rjconsultores/ventaboletos/service/UsuarioBancarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioBancarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/UsuarioBancarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioBancarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/UsuarioEmpresaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioEmpresaService.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/UsuarioEmpresaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioEmpresaService.java index b8b979b62..e4ae341b1 100644 --- a/src/com/rjconsultores/ventaboletos/service/UsuarioEmpresaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioEmpresaService.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.service; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; - -public interface UsuarioEmpresaService extends GenericService { - - public List obtenerPorUsuario(Usuario usuario); - public List obtenerEmpresa(Usuario usuario) ; - public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario); - -} - +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; + +public interface UsuarioEmpresaService extends GenericService { + + public List obtenerPorUsuario(Usuario usuario); + public List obtenerEmpresa(Usuario usuario) ; + public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario); + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/UsuarioPerfilService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioPerfilService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/UsuarioPerfilService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioPerfilService.java diff --git a/src/com/rjconsultores/ventaboletos/service/UsuarioService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/UsuarioService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioService.java diff --git a/src/com/rjconsultores/ventaboletos/service/UsuarioSesionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioSesionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/UsuarioSesionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioSesionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/UsuarioUbicacionService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioUbicacionService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/UsuarioUbicacionService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/UsuarioUbicacionService.java diff --git a/src/com/rjconsultores/ventaboletos/service/VendaEmbarcadaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/VendaEmbarcadaService.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/VendaEmbarcadaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/VendaEmbarcadaService.java index cf76608ab..7a27b6fc7 100644 --- a/src/com/rjconsultores/ventaboletos/service/VendaEmbarcadaService.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/VendaEmbarcadaService.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service; - -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; - -public interface VendaEmbarcadaService { - - public int gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws BusinessException; - -} +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; + +public interface VendaEmbarcadaService { + + public int gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws BusinessException; + +} diff --git a/src/com/rjconsultores/ventaboletos/service/ViaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/ViaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/ViaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/ViaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/VigenciaTarifaService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/VigenciaTarifaService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/VigenciaTarifaService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/VigenciaTarifaService.java diff --git a/src/com/rjconsultores/ventaboletos/service/VoucherService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/VoucherService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/VoucherService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/VoucherService.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AbastoBoletoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoBoletoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/AbastoBoletoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoBoletoServiceImpl.java index a6a73f803..fb5530a36 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AbastoBoletoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoBoletoServiceImpl.java @@ -1,95 +1,95 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AbastoBoletoDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.AbastoBoletoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("abastoBoletoService") -public class AbastoBoletoServiceImpl implements AbastoBoletoService { - - @Autowired - private AbastoBoletoDAO abastoBoletoDAO; - - @Override - public List obtenerTodos() { - return abastoBoletoDAO.obtenerTodos(); - } - - @Override - public AbastoBoleto obtenerID(Integer id) { - return abastoBoletoDAO.obtenerID(id); - } - - @Transactional - public AbastoBoleto suscribir(AbastoBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return abastoBoletoDAO.suscribir(entidad); - } - - @Transactional - public AbastoBoleto actualizacion(AbastoBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return abastoBoletoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(AbastoBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - abastoBoletoDAO.actualizacion(entidad); - } - - @Transactional - @Override - public AbastoBoleto movimentaAbasto( - AbastoBoleto abastoBoleto, - PuntoVenta destino) throws BusinessException { - - if( abastoBoleto == null ) { - throw new BusinessException("abastoService.msg.semOrigem"); - } - - try { - AbastoBoleto novo = new AbastoBoleto(); - novo.setArticulo(abastoBoleto.getArticulo()); - novo.setCantfajilla(abastoBoleto.getCantfajilla()); - novo.setClasificacion(abastoBoleto.getClasificacion()); - novo.setEmpresa(abastoBoleto.getEmpresa()); - novo.setEstacion(abastoBoleto.getEstacion()); - novo.setFechorfirma(abastoBoleto.getFechorfirma()); - novo.setFechorreq(abastoBoleto.getFechorreq()); - novo.setNumrequisicion(abastoBoleto.getNumrequisicion()); - novo.setNumservidor(abastoBoleto.getNumservidor()); - novo.setPuntoventacentral(abastoBoleto.getPuntoventacentral()); - novo.setStatusEnvio(abastoBoleto.getStatusEnvio()); - novo.setStatusfirma(abastoBoleto.getStatusfirma()); - novo.setUsuariogeneracionId(abastoBoleto.getUsuariogeneracionId()); - novo.setUsuarioreqId(abastoBoleto.getUsuarioreqId()); - novo.setPuntoventa(destino); - novo.setFechorgeneracion(Calendar.getInstance().getTime()); - return novo; - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AbastoBoletoDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.AbastoBoletoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("abastoBoletoService") +public class AbastoBoletoServiceImpl implements AbastoBoletoService { + + @Autowired + private AbastoBoletoDAO abastoBoletoDAO; + + @Override + public List obtenerTodos() { + return abastoBoletoDAO.obtenerTodos(); + } + + @Override + public AbastoBoleto obtenerID(Integer id) { + return abastoBoletoDAO.obtenerID(id); + } + + @Transactional + public AbastoBoleto suscribir(AbastoBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return abastoBoletoDAO.suscribir(entidad); + } + + @Transactional + public AbastoBoleto actualizacion(AbastoBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return abastoBoletoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(AbastoBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + abastoBoletoDAO.actualizacion(entidad); + } + + @Transactional + @Override + public AbastoBoleto movimentaAbasto( + AbastoBoleto abastoBoleto, + PuntoVenta destino) throws BusinessException { + + if( abastoBoleto == null ) { + throw new BusinessException("abastoService.msg.semOrigem"); + } + + try { + AbastoBoleto novo = new AbastoBoleto(); + novo.setArticulo(abastoBoleto.getArticulo()); + novo.setCantfajilla(abastoBoleto.getCantfajilla()); + novo.setClasificacion(abastoBoleto.getClasificacion()); + novo.setEmpresa(abastoBoleto.getEmpresa()); + novo.setEstacion(abastoBoleto.getEstacion()); + novo.setFechorfirma(abastoBoleto.getFechorfirma()); + novo.setFechorreq(abastoBoleto.getFechorreq()); + novo.setNumrequisicion(abastoBoleto.getNumrequisicion()); + novo.setNumservidor(abastoBoleto.getNumservidor()); + novo.setPuntoventacentral(abastoBoleto.getPuntoventacentral()); + novo.setStatusEnvio(abastoBoleto.getStatusEnvio()); + novo.setStatusfirma(abastoBoleto.getStatusfirma()); + novo.setUsuariogeneracionId(abastoBoleto.getUsuariogeneracionId()); + novo.setUsuarioreqId(abastoBoleto.getUsuarioreqId()); + novo.setPuntoventa(destino); + novo.setFechorgeneracion(Calendar.getInstance().getTime()); + return novo; + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AbastoCentralServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoCentralServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/AbastoCentralServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoCentralServiceImpl.java index 7881fe1d6..107488f2c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AbastoCentralServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoCentralServiceImpl.java @@ -1,61 +1,61 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.service.AbastoCentralService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("abastoCentralService") -public class AbastoCentralServiceImpl implements AbastoCentralService { - - @Autowired - private AbastoCentralDAO abastoCentralDAO; - - public List obtenerTodos() { - return abastoCentralDAO.obtenerTodos(); - } - - public AbastoCentral obtenerID(Long id) { - return abastoCentralDAO.obtenerID(id); - } - - public AbastoCentral suscribir(AbastoCentral entidad) { - setUsuarioFecmodifActivo(entidad); - return abastoCentralDAO.suscribir(entidad); - } - - public AbastoCentral actualizacion(AbastoCentral entidad) { - setUsuarioFecmodifActivo(entidad); - return abastoCentralDAO.actualizacion(entidad); - } - - public void borrar(AbastoCentral entidad) { - setUsuarioFecmodifActivo(entidad); - entidad.setActivo(Boolean.FALSE); - abastoCentralDAO.borrar(entidad); - } - - private void setUsuarioFecmodifActivo(AbastoCentral entidad){ - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - } - - public List buscaBilhetesPorAidf(Aidf aidf) { - List bilhetes = abastoCentralDAO.buscaBilhetesPorAidf(aidf); - return bilhetes; - } - - @Override - public void borrarLosQueTienenAIDF(Aidf aidf) { - abastoCentralDAO.borrarLosQueTienenAIDF(aidf); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.service.AbastoCentralService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("abastoCentralService") +public class AbastoCentralServiceImpl implements AbastoCentralService { + + @Autowired + private AbastoCentralDAO abastoCentralDAO; + + public List obtenerTodos() { + return abastoCentralDAO.obtenerTodos(); + } + + public AbastoCentral obtenerID(Long id) { + return abastoCentralDAO.obtenerID(id); + } + + public AbastoCentral suscribir(AbastoCentral entidad) { + setUsuarioFecmodifActivo(entidad); + return abastoCentralDAO.suscribir(entidad); + } + + public AbastoCentral actualizacion(AbastoCentral entidad) { + setUsuarioFecmodifActivo(entidad); + return abastoCentralDAO.actualizacion(entidad); + } + + public void borrar(AbastoCentral entidad) { + setUsuarioFecmodifActivo(entidad); + entidad.setActivo(Boolean.FALSE); + abastoCentralDAO.borrar(entidad); + } + + private void setUsuarioFecmodifActivo(AbastoCentral entidad){ + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + } + + public List buscaBilhetesPorAidf(Aidf aidf) { + List bilhetes = abastoCentralDAO.buscaBilhetesPorAidf(aidf); + return bilhetes; + } + + @Override + public void borrarLosQueTienenAIDF(Aidf aidf) { + abastoCentralDAO.borrarLosQueTienenAIDF(aidf); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AbastoHistoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoHistoServiceImpl.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/impl/AbastoHistoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoHistoServiceImpl.java index 91c2a43c3..57e22e468 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AbastoHistoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AbastoHistoServiceImpl.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoHisto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.service.AbastoHistoService; - -@Service("abastoHistoService") -public class AbastoHistoServiceImpl implements AbastoHistoService { - - - @Autowired - private AbastoHistoDAO abastoHistoDAO; - - @Override - public List obtenerTodos() { - // TODO Auto-generated method stub - return null; - } - - @Override - public AbastoHisto obtenerID(Long id) { - // TODO Auto-generated method stub - return null; - } - - @Override - public AbastoHisto suscribir(AbastoHisto entidad) { - // TODO Auto-generated method stub - return null; - } - - @Override - public AbastoHisto actualizacion(AbastoHisto entidad) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void borrar(AbastoHisto entidad) { - // TODO Auto-generated method stub - - } - - @Override - public void borrarLosQueTienenAIDF(Aidf aidf) { - abastoHistoDAO.borrarLosQueTienenAIDF(aidf); - } - - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoHisto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.service.AbastoHistoService; + +@Service("abastoHistoService") +public class AbastoHistoServiceImpl implements AbastoHistoService { + + + @Autowired + private AbastoHistoDAO abastoHistoDAO; + + @Override + public List obtenerTodos() { + // TODO Auto-generated method stub + return null; + } + + @Override + public AbastoHisto obtenerID(Long id) { + // TODO Auto-generated method stub + return null; + } + + @Override + public AbastoHisto suscribir(AbastoHisto entidad) { + // TODO Auto-generated method stub + return null; + } + + @Override + public AbastoHisto actualizacion(AbastoHisto entidad) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void borrar(AbastoHisto entidad) { + // TODO Auto-generated method stub + + } + + @Override + public void borrarLosQueTienenAIDF(Aidf aidf) { + abastoHistoDAO.borrarLosQueTienenAIDF(aidf); + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AgruparParadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AgruparParadaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/AgruparParadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AgruparParadaServiceImpl.java index ad0b30d84..fc0472c80 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AgruparParadaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AgruparParadaServiceImpl.java @@ -1,95 +1,95 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AgruparParadaDAO; -import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.AgruparParadaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("agruparParadaService") -public class AgruparParadaServiceImpl implements AgruparParadaService { - @Autowired - private AgruparParadaDAO agruparParadaDAO; - - @Override - public AgrupamentoParada obtenerID(Integer id) { - // TODO Auto-generated method stub - return null; - } - - @Transactional - public AgrupamentoParada suscribir(AgrupamentoParada entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return agruparParadaDAO.suscribir(entidad); - } - - @Transactional - public AgrupamentoParada actualizacion(AgrupamentoParada entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return agruparParadaDAO.actualizacion(entidad); - } - - @Override - public List obtenerTodos() { - return agruparParadaDAO.obtenerTodos(); - } - - @Override - @Transactional(readOnly = false) - public AgrupamentoParada suscribirActualizar(AgrupamentoParada entidad) throws BusinessException { - - List lsAgrumaentoParadas = agruparParadaDAO.buscar(entidad.getDescAgrupamentoParada()); - - if (!lsAgrumaentoParadas.isEmpty()) { - if (entidad.getAgrupamentoParadaId() == null) { - throw new BusinessException("editarCatalogoDeParadaController.registroDESCAGRUPAMENTOPARADAexiste"); - } else { - if (!lsAgrumaentoParadas.contains(entidad)) { - throw new BusinessException("editarCatalogoDeParadaController.registroDESCAGRUPAMENTOPARADAexiste"); - } - } - } - - lsAgrumaentoParadas = agruparParadaDAO.buscarCVE(entidad.getCveAgrupamentoParada()); - - if (!lsAgrumaentoParadas.isEmpty()) { - if (entidad.getAgrupamentoParadaId() == null) { - throw new BusinessException("editarCatalogoDeParadaController.registroCVEAGRUPAMENTOPARADAexiste"); - } else { - if (!lsAgrumaentoParadas.contains(entidad)) { - throw new BusinessException("editarCatalogoDeParadaController.registroCVEAGRUPAMENTOPARADAexiste"); - } - } - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (entidad.getAgrupamentoParadaId() == null) { - return agruparParadaDAO.suscribir(entidad); - } - return agruparParadaDAO.actualizacion(entidad); - - } - - @Transactional - public void borrar(AgrupamentoParada entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - agruparParadaDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AgruparParadaDAO; +import com.rjconsultores.ventaboletos.entidad.AgrupamentoParada; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.AgruparParadaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("agruparParadaService") +public class AgruparParadaServiceImpl implements AgruparParadaService { + @Autowired + private AgruparParadaDAO agruparParadaDAO; + + @Override + public AgrupamentoParada obtenerID(Integer id) { + // TODO Auto-generated method stub + return null; + } + + @Transactional + public AgrupamentoParada suscribir(AgrupamentoParada entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return agruparParadaDAO.suscribir(entidad); + } + + @Transactional + public AgrupamentoParada actualizacion(AgrupamentoParada entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return agruparParadaDAO.actualizacion(entidad); + } + + @Override + public List obtenerTodos() { + return agruparParadaDAO.obtenerTodos(); + } + + @Override + @Transactional(readOnly = false) + public AgrupamentoParada suscribirActualizar(AgrupamentoParada entidad) throws BusinessException { + + List lsAgrumaentoParadas = agruparParadaDAO.buscar(entidad.getDescAgrupamentoParada()); + + if (!lsAgrumaentoParadas.isEmpty()) { + if (entidad.getAgrupamentoParadaId() == null) { + throw new BusinessException("editarCatalogoDeParadaController.registroDESCAGRUPAMENTOPARADAexiste"); + } else { + if (!lsAgrumaentoParadas.contains(entidad)) { + throw new BusinessException("editarCatalogoDeParadaController.registroDESCAGRUPAMENTOPARADAexiste"); + } + } + } + + lsAgrumaentoParadas = agruparParadaDAO.buscarCVE(entidad.getCveAgrupamentoParada()); + + if (!lsAgrumaentoParadas.isEmpty()) { + if (entidad.getAgrupamentoParadaId() == null) { + throw new BusinessException("editarCatalogoDeParadaController.registroCVEAGRUPAMENTOPARADAexiste"); + } else { + if (!lsAgrumaentoParadas.contains(entidad)) { + throw new BusinessException("editarCatalogoDeParadaController.registroCVEAGRUPAMENTOPARADAexiste"); + } + } + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (entidad.getAgrupamentoParadaId() == null) { + return agruparParadaDAO.suscribir(entidad); + } + return agruparParadaDAO.actualizacion(entidad); + + } + + @Transactional + public void borrar(AgrupamentoParada entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + agruparParadaDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java index 5a0cee754..ed7c3e74f 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java @@ -1,180 +1,180 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.sql.Connection; -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AidfDAO; -import com.rjconsultores.ventaboletos.dao.AidfEspecieDAO; -import com.rjconsultores.ventaboletos.dao.AidfTipoDAO; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.AidfEspecie; -import com.rjconsultores.ventaboletos.entidad.AidfTipo; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.AidfService; -import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; - -@Service("aidfService") -public class AidfServiceImpl implements AidfService { - - private static final Integer TIPO_FORMULARIO_CONTINUO = 1; - private static final Integer TIPO_VENDA_MANUAL = 2; - - @Autowired - private AidfDAO aidfDAO; - - @Autowired - private AidfEspecieDAO aidfEspecieDAO; - - @Autowired - private AidfTipoDAO aidfTipoDAO; - - @Autowired - private MovimentacionBilhetesService movimentacionBilhetesService; - - public List obtenerTodos() { - return aidfDAO.obtenerTodos(); - } - - @Transactional - public Aidf obtenerID(Long id) { - return aidfDAO.obtenerID(id); - } - - @Transactional - public Aidf suscribir(Aidf entidad) { - setUsuarioFecmodifActivo(entidad); - - Aidf aidf = aidfDAO.suscribir(entidad); - - /* - * Mantis #9124 Desativado devido a lentidão ao criar o AbastoCentrol e AbastoHisto. if (aidf != null) movimentacionBilhetesService.realizaAdquisicionBilhetes(aidf); - */ - - return aidf; - } - - @Transactional - public Aidf actualizacion(Aidf entidad) { - setUsuarioFecmodifActivo(entidad); - return aidfDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(Aidf entidad) { - setUsuarioFecmodifActivo(entidad); - entidad.setActivo(Boolean.FALSE); - aidfDAO.actualizacion(entidad); - } - - private void setUsuarioFecmodifActivo(Aidf entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - } - - public List obtenerTodosAdifEspecie() { - return aidfEspecieDAO.obtenerTodos(); - } - - public List obtenerTodosAdifTipo() { - return aidfTipoDAO.obtenerTodos(); - } - - public List buscaAidfsPorEmpresas(List empresas) { - return aidfDAO.buscaAidfsPorEmpresas(empresas); - } - - public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda){ - return aidfDAO.buscaAidfsPorEmpresaAgencia(empresa, pontoVenda); - } - - public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn,Integer empresaId) { - return aidfDAO.obtenerAidfFromSerieDocfiscal(serie, subSerie, docfiscal, conn,empresaId); - } - - public Long validarDocFiscalSerieFormInicialFinal(Aidf entidad, Connection conn) { - - List list = obtenerAidfFromSerieDocfiscal( - entidad.getSerie(), entidad.getSubserie(), entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", ""), conn,entidad.getEmpresa().getEmpresaId()); - - for (AidfVo aidf : list) { - // desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado. - if ((entidad.getAidfId() == null) || (aidf.getAidfId().compareTo(entidad.getAidfId()) != 0)) { - if (aidf.getDocfiscal().trim().equals(entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", "").trim())) { - if (aidf.getSerie().trim().equals(entidad.getSerie().trim())) { - if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(aidf.getFormfinal())) - || (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(aidf.getFormfinal()))) { - return aidf.getAidfId(); - } - } - } - } - } - return -1l; - } - - public Long validarSerieFormInicialFinal(Aidf entidad, Connection conn) { - - List list = obtenerAidfFromSerieDocfiscal(entidad.getSerie(), entidad.getSubserie(), null, conn,entidad.getEmpresa().getEmpresaId()); - - for (AidfVo aidf : list) { - // desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado. - if ((entidad.getAidfId() == null) || (aidf.getAidfId().compareTo(entidad.getAidfId()) != 0)) { - if (aidf.getSerie().trim().equals(entidad.getSerie().trim())) { - if (entidad.getSubserie() != null && aidf.getSubserie().equals(entidad.getSubserie())) { - if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(aidf.getFormfinal())) - || (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(aidf.getFormfinal()))) { - return aidf.getAidfId(); - } - } - } - } - } - return -1l; - } - - public Boolean validarDocFiscalPorEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado) { - return aidfDAO.existeAidfComCodFiscalEEstado(idAidf, especieId, docFiscal, estado); - } - - public Boolean validarTipoVenda(String tipoVenda, String serie, Integer idTipo) { - return !("M".equals(tipoVenda) - && ("UNIC".equals(serie) || TIPO_FORMULARIO_CONTINUO.equals(idTipo))); - } - - public Boolean validarVendaManual(Integer idTipo, String serie) { - return !(TIPO_VENDA_MANUAL.equals(idTipo) && "UNIC".equals(serie)); - } - - @Override - public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId, Boolean isRMD) { - return aidfDAO.buscaAidfEstadoEmpresa(empresaId, estadoId, isRMD); - } - - @Override - public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId) { - return aidfDAO.buscaUltimoAidfRMDUtilizado(idAidf, empresaId, estadoId); - } - - @Override - public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio) { - return aidfDAO.vaidaRMDUtilizado(idAidf, empresaId, estadoId, folio); - } - - @Override - public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal, Estado estado, PuntoVenta puntoVenta) { - return aidfDAO.validarDocFiscalPorEstadoAgencia(idAidf, especieId, docFiscal, formInicial, formFinal, estado, puntoVenta); - - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.sql.Connection; +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AidfDAO; +import com.rjconsultores.ventaboletos.dao.AidfEspecieDAO; +import com.rjconsultores.ventaboletos.dao.AidfTipoDAO; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.AidfEspecie; +import com.rjconsultores.ventaboletos.entidad.AidfTipo; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.AidfService; +import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; + +@Service("aidfService") +public class AidfServiceImpl implements AidfService { + + private static final Integer TIPO_FORMULARIO_CONTINUO = 1; + private static final Integer TIPO_VENDA_MANUAL = 2; + + @Autowired + private AidfDAO aidfDAO; + + @Autowired + private AidfEspecieDAO aidfEspecieDAO; + + @Autowired + private AidfTipoDAO aidfTipoDAO; + + @Autowired + private MovimentacionBilhetesService movimentacionBilhetesService; + + public List obtenerTodos() { + return aidfDAO.obtenerTodos(); + } + + @Transactional + public Aidf obtenerID(Long id) { + return aidfDAO.obtenerID(id); + } + + @Transactional + public Aidf suscribir(Aidf entidad) { + setUsuarioFecmodifActivo(entidad); + + Aidf aidf = aidfDAO.suscribir(entidad); + + /* + * Mantis #9124 Desativado devido a lentidão ao criar o AbastoCentrol e AbastoHisto. if (aidf != null) movimentacionBilhetesService.realizaAdquisicionBilhetes(aidf); + */ + + return aidf; + } + + @Transactional + public Aidf actualizacion(Aidf entidad) { + setUsuarioFecmodifActivo(entidad); + return aidfDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(Aidf entidad) { + setUsuarioFecmodifActivo(entidad); + entidad.setActivo(Boolean.FALSE); + aidfDAO.actualizacion(entidad); + } + + private void setUsuarioFecmodifActivo(Aidf entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + } + + public List obtenerTodosAdifEspecie() { + return aidfEspecieDAO.obtenerTodos(); + } + + public List obtenerTodosAdifTipo() { + return aidfTipoDAO.obtenerTodos(); + } + + public List buscaAidfsPorEmpresas(List empresas) { + return aidfDAO.buscaAidfsPorEmpresas(empresas); + } + + public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda){ + return aidfDAO.buscaAidfsPorEmpresaAgencia(empresa, pontoVenda); + } + + public List obtenerAidfFromSerieDocfiscal(String serie, String subSerie, String docfiscal, Connection conn,Integer empresaId) { + return aidfDAO.obtenerAidfFromSerieDocfiscal(serie, subSerie, docfiscal, conn,empresaId); + } + + public Long validarDocFiscalSerieFormInicialFinal(Aidf entidad, Connection conn) { + + List list = obtenerAidfFromSerieDocfiscal( + entidad.getSerie(), entidad.getSubserie(), entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", ""), conn,entidad.getEmpresa().getEmpresaId()); + + for (AidfVo aidf : list) { + // desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado. + if ((entidad.getAidfId() == null) || (aidf.getAidfId().compareTo(entidad.getAidfId()) != 0)) { + if (aidf.getDocfiscal().trim().equals(entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", "").trim())) { + if (aidf.getSerie().trim().equals(entidad.getSerie().trim())) { + if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(aidf.getFormfinal())) + || (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(aidf.getFormfinal()))) { + return aidf.getAidfId(); + } + } + } + } + } + return -1l; + } + + public Long validarSerieFormInicialFinal(Aidf entidad, Connection conn) { + + List list = obtenerAidfFromSerieDocfiscal(entidad.getSerie(), entidad.getSubserie(), null, conn,entidad.getEmpresa().getEmpresaId()); + + for (AidfVo aidf : list) { + // desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado. + if ((entidad.getAidfId() == null) || (aidf.getAidfId().compareTo(entidad.getAidfId()) != 0)) { + if (aidf.getSerie().trim().equals(entidad.getSerie().trim())) { + if (entidad.getSubserie() != null && aidf.getSubserie().equals(entidad.getSubserie())) { + if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(aidf.getFormfinal())) + || (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(aidf.getFormfinal()))) { + return aidf.getAidfId(); + } + } + } + } + } + return -1l; + } + + public Boolean validarDocFiscalPorEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado) { + return aidfDAO.existeAidfComCodFiscalEEstado(idAidf, especieId, docFiscal, estado); + } + + public Boolean validarTipoVenda(String tipoVenda, String serie, Integer idTipo) { + return !("M".equals(tipoVenda) + && ("UNIC".equals(serie) || TIPO_FORMULARIO_CONTINUO.equals(idTipo))); + } + + public Boolean validarVendaManual(Integer idTipo, String serie) { + return !(TIPO_VENDA_MANUAL.equals(idTipo) && "UNIC".equals(serie)); + } + + @Override + public List buscaAidfEstadoEmpresa(Integer empresaId, Integer estadoId, Boolean isRMD) { + return aidfDAO.buscaAidfEstadoEmpresa(empresaId, estadoId, isRMD); + } + + @Override + public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId) { + return aidfDAO.buscaUltimoAidfRMDUtilizado(idAidf, empresaId, estadoId); + } + + @Override + public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio) { + return aidfDAO.vaidaRMDUtilizado(idAidf, empresaId, estadoId, folio); + } + + @Override + public Boolean validarDocFiscalPorEstadoAgencia(Long idAidf, Integer especieId, String docFiscal, String formInicial, String formFinal, Estado estado, PuntoVenta puntoVenta) { + return aidfDAO.validarDocFiscalPorEstadoAgencia(idAidf, especieId, docFiscal, formInicial, formFinal, estado, puntoVenta); + + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AjusteEventoExtraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AjusteEventoExtraServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/AjusteEventoExtraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AjusteEventoExtraServiceImpl.java index 8159e3318..227adb2a6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AjusteEventoExtraServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AjusteEventoExtraServiceImpl.java @@ -1,63 +1,63 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.dao.AjusteEventoExtraDAO; -import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; -import com.rjconsultores.ventaboletos.service.AjusteEventoExtraService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Administrador - */ -@Service("ajusteEventoExtraService") -public class AjusteEventoExtraServiceImpl implements AjusteEventoExtraService { - - @Autowired - private AjusteEventoExtraDAO ajusteEventoExtraDAO; - - public List obtenerTodos() { - return ajusteEventoExtraDAO.obtenerTodos(); - } - - public AjusteEventoExtra obtenerID(Integer id) { - return ajusteEventoExtraDAO.obtenerID(id); - } - - @Transactional - public AjusteEventoExtra suscribir(AjusteEventoExtra entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ajusteEventoExtraDAO.suscribir(entidad); - } - - @Transactional - public AjusteEventoExtra actualizacion(AjusteEventoExtra entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ajusteEventoExtraDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(AjusteEventoExtra entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ajusteEventoExtraDAO.actualizacion(entidad); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.dao.AjusteEventoExtraDAO; +import com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra; +import com.rjconsultores.ventaboletos.service.AjusteEventoExtraService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Administrador + */ +@Service("ajusteEventoExtraService") +public class AjusteEventoExtraServiceImpl implements AjusteEventoExtraService { + + @Autowired + private AjusteEventoExtraDAO ajusteEventoExtraDAO; + + public List obtenerTodos() { + return ajusteEventoExtraDAO.obtenerTodos(); + } + + public AjusteEventoExtra obtenerID(Integer id) { + return ajusteEventoExtraDAO.obtenerID(id); + } + + @Transactional + public AjusteEventoExtra suscribir(AjusteEventoExtra entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ajusteEventoExtraDAO.suscribir(entidad); + } + + @Transactional + public AjusteEventoExtra actualizacion(AjusteEventoExtra entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ajusteEventoExtraDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(AjusteEventoExtra entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ajusteEventoExtraDAO.actualizacion(entidad); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AlertaCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AlertaCtrlServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AlertaCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AlertaCtrlServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AliasClasseServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliasClasseServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AliasClasseServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliasClasseServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AliasServicoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliasServicoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/AliasServicoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliasServicoServiceImpl.java index 46b03e98f..b47a3d450 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AliasServicoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliasServicoServiceImpl.java @@ -1,99 +1,99 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Collections; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AliasServicoDAO; -import com.rjconsultores.ventaboletos.entidad.AliasServico; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.AliasServicoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("aliasServicoService") -public class AliasServicoServiceImpl implements AliasServicoService { - - @Autowired - private AliasServicoDAO aliasServicoDAO; - - public List obtenerTodos() { - return aliasServicoDAO.obtenerTodos(); - } - - public AliasServico obtenerID(Integer id) { - return aliasServicoDAO.obtenerID(id); - } - - @Transactional - public AliasServico suscribirActualizar(AliasServico entidad) throws BusinessException { - - if ( (entidad.getOrigen() == null) || (entidad.getDestino() == null) || (entidad.getAliasDestino()== null) || (entidad.getAliasOrigen()== null) || (entidad.getRuta()== null)){ - throw new BusinessException("editarAliasServicoController.MSG.camposObrigatorios"); - } - - List lsBusca = Collections.emptyList(); - - if (entidad.getCorridaId() != null){ - lsBusca = aliasServicoDAO.buscar(entidad.getOrigen().getParadaId(), entidad.getDestino().getParadaId(), entidad.getRuta().getRutaId(), entidad.getCorridaId()); - }else{ - lsBusca = aliasServicoDAO.buscarAliasSemCorrida(entidad.getOrigen().getParadaId(), entidad.getDestino().getParadaId(), entidad.getRuta().getRutaId()); - } - - if (!lsBusca.isEmpty()){ - boolean existe = false; - - for(AliasServico as : lsBusca){ - if (as.equals(entidad)){ - existe = true; - } - } - - if (!existe){ - throw new BusinessException("editarAliasServicoController.MSG.registroYaExiste"); - } - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (entidad.getAliasServicoId() == null){ - return aliasServicoDAO.suscribir(entidad); - }else{ - return aliasServicoDAO.actualizacion(entidad); - } - } - - @Transactional - public void borrar(AliasServico entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - aliasServicoDAO.actualizacion(entidad); - } - - @Override - public List buscarPorRuta(Integer rutaId) { - return aliasServicoDAO.buscarPorRuta(rutaId); - } - - @Override - public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo) { - return aliasServicoDAO.buscarPorLinhaEmpresa(linhas, empresas, tiposClasses, orgaos, prefixo); - } - - @Override - public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida) { - return aliasServicoDAO.existe(origem, destino, linha, idCorrida); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Collections; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AliasServicoDAO; +import com.rjconsultores.ventaboletos.entidad.AliasServico; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.AliasServicoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("aliasServicoService") +public class AliasServicoServiceImpl implements AliasServicoService { + + @Autowired + private AliasServicoDAO aliasServicoDAO; + + public List obtenerTodos() { + return aliasServicoDAO.obtenerTodos(); + } + + public AliasServico obtenerID(Integer id) { + return aliasServicoDAO.obtenerID(id); + } + + @Transactional + public AliasServico suscribirActualizar(AliasServico entidad) throws BusinessException { + + if ( (entidad.getOrigen() == null) || (entidad.getDestino() == null) || (entidad.getAliasDestino()== null) || (entidad.getAliasOrigen()== null) || (entidad.getRuta()== null)){ + throw new BusinessException("editarAliasServicoController.MSG.camposObrigatorios"); + } + + List lsBusca = Collections.emptyList(); + + if (entidad.getCorridaId() != null){ + lsBusca = aliasServicoDAO.buscar(entidad.getOrigen().getParadaId(), entidad.getDestino().getParadaId(), entidad.getRuta().getRutaId(), entidad.getCorridaId()); + }else{ + lsBusca = aliasServicoDAO.buscarAliasSemCorrida(entidad.getOrigen().getParadaId(), entidad.getDestino().getParadaId(), entidad.getRuta().getRutaId()); + } + + if (!lsBusca.isEmpty()){ + boolean existe = false; + + for(AliasServico as : lsBusca){ + if (as.equals(entidad)){ + existe = true; + } + } + + if (!existe){ + throw new BusinessException("editarAliasServicoController.MSG.registroYaExiste"); + } + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (entidad.getAliasServicoId() == null){ + return aliasServicoDAO.suscribir(entidad); + }else{ + return aliasServicoDAO.actualizacion(entidad); + } + } + + @Transactional + public void borrar(AliasServico entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + aliasServicoDAO.actualizacion(entidad); + } + + @Override + public List buscarPorRuta(Integer rutaId) { + return aliasServicoDAO.buscarPorRuta(rutaId); + } + + @Override + public List buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo) { + return aliasServicoDAO.buscarPorLinhaEmpresa(linhas, empresas, tiposClasses, orgaos, prefixo); + } + + @Override + public AliasServico existe(Parada origem, Parada destino, Ruta linha, Integer idCorrida) { + return aliasServicoDAO.existe(origem, destino, linha, idCorrida); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AliquotaEstadoDestinoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliquotaEstadoDestinoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/AliquotaEstadoDestinoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliquotaEstadoDestinoServiceImpl.java index a247e692f..04dc93b58 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AliquotaEstadoDestinoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AliquotaEstadoDestinoServiceImpl.java @@ -1,37 +1,37 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AliquotaEstadoDestinoDAO; -import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; -import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; -import com.rjconsultores.ventaboletos.service.AliquotaEstadoDestinoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("aliquotaEstadoDestinoService") -public class AliquotaEstadoDestinoServiceImpl implements AliquotaEstadoDestinoService { - - @Autowired - private AliquotaEstadoDestinoDAO aliquotaEstadoDestinoDAO; - - @Transactional - public AliquotaEstadoDestino suscribir(AliquotaEstadoDestino entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - entidad = aliquotaEstadoDestinoDAO.suscribir(entidad); - - return entidad; - } - - public List getChildrens(EmpresaImposto parent){ - return aliquotaEstadoDestinoDAO.getChildrens(parent); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AliquotaEstadoDestinoDAO; +import com.rjconsultores.ventaboletos.entidad.AliquotaEstadoDestino; +import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; +import com.rjconsultores.ventaboletos.service.AliquotaEstadoDestinoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("aliquotaEstadoDestinoService") +public class AliquotaEstadoDestinoServiceImpl implements AliquotaEstadoDestinoService { + + @Autowired + private AliquotaEstadoDestinoDAO aliquotaEstadoDestinoDAO; + + @Transactional + public AliquotaEstadoDestino suscribir(AliquotaEstadoDestino entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + entidad = aliquotaEstadoDestinoDAO.suscribir(entidad); + + return entidad; + } + + public List getChildrens(EmpresaImposto parent){ + return aliquotaEstadoDestinoDAO.getChildrens(parent); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ArquivoRemessaCNABImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ArquivoRemessaCNABImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ArquivoRemessaCNABImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ArquivoRemessaCNABImpl.java index 7d5f2e162..d31078b95 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ArquivoRemessaCNABImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ArquivoRemessaCNABImpl.java @@ -1,151 +1,151 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.ArquivoRemessa; -import com.rjconsultores.ventaboletos.dao.ConstanteDAO; -import com.rjconsultores.ventaboletos.dao.RemessaCNABBancosDAO; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; -import com.rjconsultores.ventaboletos.enuns.BancoLayout; -import com.rjconsultores.ventaboletos.service.ArquivoRemessaCNAB; -import com.rjconsultores.ventaboletos.utils.NossoNumeroUtils; - -@Service("arquivoRemessaCNAB") -public class ArquivoRemessaCNABImpl implements ArquivoRemessaCNAB { - - @Autowired - private RemessaCNABBancosDAO remessaCNABBancosDAO; - - @Autowired - private ConstanteDAO constanteDAO; - - @Override - public List obtenerTodos() { - return remessaCNABBancosDAO.obtenerTodos(); - } - - @Override - public FechamentoBoleto obtenerID(Long id) { - return remessaCNABBancosDAO.obtenerID(id); - } - - @Override - @Transactional - public FechamentoBoleto suscribir(FechamentoBoleto entidad) { - return remessaCNABBancosDAO.suscribir(entidad); - } - - @Override - @Transactional - public FechamentoBoleto actualizacion(FechamentoBoleto entidad) { - return remessaCNABBancosDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(FechamentoBoleto entidad) { - remessaCNABBancosDAO.borrar(entidad); - - } - - @Override - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) { - return remessaCNABBancosDAO.obtenerTodosParaRemessa(empresa, dataDe, dataAte, reenviar); - } - - @Override - public ArquivoRemessa remessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) { - - BancoLayout banco = BancoLayout.getInstanceByCodBanco(remessaCNABBancosDAO.findBanco(empresa)); - - try{ - if(BancoLayout.BRADESCO_400_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaBradesco(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.SANTANDER_400_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaSantander(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.MERCANTIL_400_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaMercantil(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.ITAU_400_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaItau(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.BB_240_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaBancoBrasil(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.SICOOB_240_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaSicoob(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.SAFRA_400_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaSafra(empresa, dataDe, dataAte, reenviar); - }else if(BancoLayout.CAIXA_400_Envio.equals(banco)){ - return remessaCNABBancosDAO.remessaCaixa(empresa, dataDe, dataAte, reenviar); - } - - }catch(RuntimeException re){ - throw re; - }catch(Exception e){ - e.printStackTrace(); - } - - return null; - } - - @Override - public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception { - return remessaCNABBancosDAO.atualizaRemessa(empresa, arquivoRemessa); - } - - @Override - public List getEmpresas() { - return remessaCNABBancosDAO.getEmpresas(); - } - - @Override - public boolean temPermissao(){ - Constante cons = constanteDAO.buscarPorNomeConstante("USA_REMESSA_CNAB"); - return cons != null && cons.getActivo() && cons.getValorconstante() != null && cons.getValorconstante().equalsIgnoreCase("true"); - } - - @Override - public boolean boletosOk(List boletos) { - - BancoLayout banco = null; - - if(boletos != null && !boletos.isEmpty()) { - for (FechamentoBoleto fechamentoBoleto : boletos) { - - if(banco == null){ - banco = BancoLayout.getInstanceByCodBanco(remessaCNABBancosDAO.findBanco(fechamentoBoleto.getFechamentoCntcorrente().getEmpresa())); - } - - if(!NossoNumeroUtils.validaNossoNumero(fechamentoBoleto.getNossonumero(), banco)){ - return false; - } - } - } - - return true; - } - - @Override - public boolean boletosAEnviar(List boletos) { - - boolean toReturn = Boolean.FALSE; - - if(boletos != null && !boletos.isEmpty()) { - for (java.util.Iterator it = boletos.iterator(); it.hasNext();) { - - FechamentoBoleto fechamentoBoleto = it.next(); - - if(fechamentoBoleto.getRemessaId() == null){ - return Boolean.TRUE; - } - } - } - - return toReturn; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.ArquivoRemessa; +import com.rjconsultores.ventaboletos.dao.ConstanteDAO; +import com.rjconsultores.ventaboletos.dao.RemessaCNABBancosDAO; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoBoleto; +import com.rjconsultores.ventaboletos.enuns.BancoLayout; +import com.rjconsultores.ventaboletos.service.ArquivoRemessaCNAB; +import com.rjconsultores.ventaboletos.utils.NossoNumeroUtils; + +@Service("arquivoRemessaCNAB") +public class ArquivoRemessaCNABImpl implements ArquivoRemessaCNAB { + + @Autowired + private RemessaCNABBancosDAO remessaCNABBancosDAO; + + @Autowired + private ConstanteDAO constanteDAO; + + @Override + public List obtenerTodos() { + return remessaCNABBancosDAO.obtenerTodos(); + } + + @Override + public FechamentoBoleto obtenerID(Long id) { + return remessaCNABBancosDAO.obtenerID(id); + } + + @Override + @Transactional + public FechamentoBoleto suscribir(FechamentoBoleto entidad) { + return remessaCNABBancosDAO.suscribir(entidad); + } + + @Override + @Transactional + public FechamentoBoleto actualizacion(FechamentoBoleto entidad) { + return remessaCNABBancosDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(FechamentoBoleto entidad) { + remessaCNABBancosDAO.borrar(entidad); + + } + + @Override + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) { + return remessaCNABBancosDAO.obtenerTodosParaRemessa(empresa, dataDe, dataAte, reenviar); + } + + @Override + public ArquivoRemessa remessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar) { + + BancoLayout banco = BancoLayout.getInstanceByCodBanco(remessaCNABBancosDAO.findBanco(empresa)); + + try{ + if(BancoLayout.BRADESCO_400_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaBradesco(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.SANTANDER_400_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaSantander(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.MERCANTIL_400_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaMercantil(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.ITAU_400_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaItau(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.BB_240_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaBancoBrasil(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.SICOOB_240_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaSicoob(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.SAFRA_400_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaSafra(empresa, dataDe, dataAte, reenviar); + }else if(BancoLayout.CAIXA_400_Envio.equals(banco)){ + return remessaCNABBancosDAO.remessaCaixa(empresa, dataDe, dataAte, reenviar); + } + + }catch(RuntimeException re){ + throw re; + }catch(Exception e){ + e.printStackTrace(); + } + + return null; + } + + @Override + public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception { + return remessaCNABBancosDAO.atualizaRemessa(empresa, arquivoRemessa); + } + + @Override + public List getEmpresas() { + return remessaCNABBancosDAO.getEmpresas(); + } + + @Override + public boolean temPermissao(){ + Constante cons = constanteDAO.buscarPorNomeConstante("USA_REMESSA_CNAB"); + return cons != null && cons.getActivo() && cons.getValorconstante() != null && cons.getValorconstante().equalsIgnoreCase("true"); + } + + @Override + public boolean boletosOk(List boletos) { + + BancoLayout banco = null; + + if(boletos != null && !boletos.isEmpty()) { + for (FechamentoBoleto fechamentoBoleto : boletos) { + + if(banco == null){ + banco = BancoLayout.getInstanceByCodBanco(remessaCNABBancosDAO.findBanco(fechamentoBoleto.getFechamentoCntcorrente().getEmpresa())); + } + + if(!NossoNumeroUtils.validaNossoNumero(fechamentoBoleto.getNossonumero(), banco)){ + return false; + } + } + } + + return true; + } + + @Override + public boolean boletosAEnviar(List boletos) { + + boolean toReturn = Boolean.FALSE; + + if(boletos != null && !boletos.isEmpty()) { + for (java.util.Iterator it = boletos.iterator(); it.hasNext();) { + + FechamentoBoleto fechamentoBoleto = it.next(); + + if(fechamentoBoleto.getRemessaId() == null){ + return Boolean.TRUE; + } + } + } + + return toReturn; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ArticuloServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ArticuloServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ArticuloServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ArticuloServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AsientoExclusivoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AsientoExclusivoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AsientoExclusivoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AsientoExclusivoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AsistenciaDeViajeEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AsistenciaDeViajeEmpresaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AsistenciaDeViajeEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AsistenciaDeViajeEmpresaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AuditLogServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditLogServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/AuditLogServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditLogServiceImpl.java index 5f08d94e3..e1a2e207c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AuditLogServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditLogServiceImpl.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.AuditLogDAO; -import com.rjconsultores.ventaboletos.entidad.AuditLog; -import com.rjconsultores.ventaboletos.entidad.AuditModule; -import com.rjconsultores.ventaboletos.service.AuditLogService; - -@Service("auditLogService") -public class AuditLogServiceImpl implements AuditLogService { - - @Autowired - private AuditLogDAO auditLogDAO; - - @Override - public List obtenerTodos() { - return auditLogDAO.obtenerTodos(); - } - - @Override - public AuditLog obtenerID(Long id) { - return auditLogDAO.obtenerID(id); - } - - @Override - public AuditLog suscribir(AuditLog auditLog) { - return auditLogDAO.suscribir(auditLog); - } - - @Override - public AuditLog actualizacion(AuditLog auditLog) { - return auditLogDAO.actualizacion(auditLog); - } - - @Override - public void borrar(AuditLog auditLog) { - auditLogDAO.borrar(auditLog); - } - - @Override - public List carregarLog(AuditModule modulo) { - return auditLogDAO.carregarLog(modulo); - } - - @Override - public List filtrarLog(AuditLog auditLog) { - return auditLogDAO.filtrarLog(auditLog); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.AuditLogDAO; +import com.rjconsultores.ventaboletos.entidad.AuditLog; +import com.rjconsultores.ventaboletos.entidad.AuditModule; +import com.rjconsultores.ventaboletos.service.AuditLogService; + +@Service("auditLogService") +public class AuditLogServiceImpl implements AuditLogService { + + @Autowired + private AuditLogDAO auditLogDAO; + + @Override + public List obtenerTodos() { + return auditLogDAO.obtenerTodos(); + } + + @Override + public AuditLog obtenerID(Long id) { + return auditLogDAO.obtenerID(id); + } + + @Override + public AuditLog suscribir(AuditLog auditLog) { + return auditLogDAO.suscribir(auditLog); + } + + @Override + public AuditLog actualizacion(AuditLog auditLog) { + return auditLogDAO.actualizacion(auditLog); + } + + @Override + public void borrar(AuditLog auditLog) { + auditLogDAO.borrar(auditLog); + } + + @Override + public List carregarLog(AuditModule modulo) { + return auditLogDAO.carregarLog(modulo); + } + + @Override + public List filtrarLog(AuditLog auditLog) { + return auditLogDAO.filtrarLog(auditLog); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AuditModuleServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditModuleServiceImpl.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/service/impl/AuditModuleServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditModuleServiceImpl.java index f53474177..1fa9537b7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AuditModuleServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditModuleServiceImpl.java @@ -1,46 +1,46 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.AuditModuleDAO; -import com.rjconsultores.ventaboletos.entidad.AuditModule; -import com.rjconsultores.ventaboletos.service.AuditModuleService; - -@Service("auditModuleService") -public class AuditModuleServiceImpl implements AuditModuleService { - - @Autowired - private AuditModuleDAO auditModuleDAO; - - @Override - public List obtenerTodos() { - return auditModuleDAO.obtenerTodos(); - } - - @Override - public AuditModule obtenerID(Long id) { - // TODO Auto-generated method stub - return null; - } - - @Override - public AuditModule suscribir(AuditModule entidad) { - // TODO Auto-generated method stub - return null; - } - - @Override - public AuditModule actualizacion(AuditModule entidad) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void borrar(AuditModule entidad) { - // TODO Auto-generated method stub - - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.AuditModuleDAO; +import com.rjconsultores.ventaboletos.entidad.AuditModule; +import com.rjconsultores.ventaboletos.service.AuditModuleService; + +@Service("auditModuleService") +public class AuditModuleServiceImpl implements AuditModuleService { + + @Autowired + private AuditModuleDAO auditModuleDAO; + + @Override + public List obtenerTodos() { + return auditModuleDAO.obtenerTodos(); + } + + @Override + public AuditModule obtenerID(Long id) { + // TODO Auto-generated method stub + return null; + } + + @Override + public AuditModule suscribir(AuditModule entidad) { + // TODO Auto-generated method stub + return null; + } + + @Override + public AuditModule actualizacion(AuditModule entidad) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void borrar(AuditModule entidad) { + // TODO Auto-generated method stub + + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AuditServiceServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditServiceServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/AuditServiceServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditServiceServiceImpl.java index 0960b4204..46df8f029 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AuditServiceServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AuditServiceServiceImpl.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.AuditServiceDAO; -import com.rjconsultores.ventaboletos.entidad.AuditService; -import com.rjconsultores.ventaboletos.service.AuditServiceService; - -@Service("auditServiceService") -public class AuditServiceServiceImpl implements AuditServiceService { - - @Autowired - private AuditServiceDAO auditServiceDAO; - - @Override - public List obtenerTodos() { - return auditServiceDAO.obtenerTodos(); - } - - @Override - public AuditService obtenerID(Long id) { - return auditServiceDAO.obtenerID(id); - } - - @Override - public AuditService suscribir(AuditService entidad) { - return auditServiceDAO.suscribir(entidad); - } - - @Override - public AuditService actualizacion(AuditService entidad) { - return auditServiceDAO.actualizacion(entidad); - } - - @Override - public void borrar(AuditService entidad) { - auditServiceDAO.borrar(entidad); - } - - @Override - public AuditService carregarService(AuditService auditService) { - return auditServiceDAO.carregarService(auditService); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.AuditServiceDAO; +import com.rjconsultores.ventaboletos.entidad.AuditService; +import com.rjconsultores.ventaboletos.service.AuditServiceService; + +@Service("auditServiceService") +public class AuditServiceServiceImpl implements AuditServiceService { + + @Autowired + private AuditServiceDAO auditServiceDAO; + + @Override + public List obtenerTodos() { + return auditServiceDAO.obtenerTodos(); + } + + @Override + public AuditService obtenerID(Long id) { + return auditServiceDAO.obtenerID(id); + } + + @Override + public AuditService suscribir(AuditService entidad) { + return auditServiceDAO.suscribir(entidad); + } + + @Override + public AuditService actualizacion(AuditService entidad) { + return auditServiceDAO.actualizacion(entidad); + } + + @Override + public void borrar(AuditService entidad) { + auditServiceDAO.borrar(entidad); + } + + @Override + public AuditService carregarService(AuditService auditService) { + return auditServiceDAO.carregarService(auditService); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AutobusDocServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutobusDocServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/AutobusDocServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutobusDocServiceImpl.java index 91092089b..165089617 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AutobusDocServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutobusDocServiceImpl.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AutobusDocDAO; -import com.rjconsultores.ventaboletos.entidad.Autobus; -import com.rjconsultores.ventaboletos.entidad.AutobusDoc; -import com.rjconsultores.ventaboletos.service.AutobusDocService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("autobusDocService") -public class AutobusDocServiceImpl implements AutobusDocService { - - @Autowired - private AutobusDocDAO autobusDocDAO; - - public List obtenerTodos() { - return autobusDocDAO.obtenerTodos(); - } - - public AutobusDoc obtenerID(Integer id) { - return autobusDocDAO.obtenerID(id); - } - - public List obtenerPorAutobus(Autobus autobus){ - return autobusDocDAO.obtenerPorAutobus(autobus); - } - - @Transactional - public AutobusDoc suscribir(AutobusDoc entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return autobusDocDAO.suscribir(entidad); - } - - @Transactional - public AutobusDoc actualizacion(AutobusDoc entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return autobusDocDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(AutobusDoc entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - autobusDocDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AutobusDocDAO; +import com.rjconsultores.ventaboletos.entidad.Autobus; +import com.rjconsultores.ventaboletos.entidad.AutobusDoc; +import com.rjconsultores.ventaboletos.service.AutobusDocService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("autobusDocService") +public class AutobusDocServiceImpl implements AutobusDocService { + + @Autowired + private AutobusDocDAO autobusDocDAO; + + public List obtenerTodos() { + return autobusDocDAO.obtenerTodos(); + } + + public AutobusDoc obtenerID(Integer id) { + return autobusDocDAO.obtenerID(id); + } + + public List obtenerPorAutobus(Autobus autobus){ + return autobusDocDAO.obtenerPorAutobus(autobus); + } + + @Transactional + public AutobusDoc suscribir(AutobusDoc entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return autobusDocDAO.suscribir(entidad); + } + + @Transactional + public AutobusDoc actualizacion(AutobusDoc entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return autobusDocDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(AutobusDoc entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + autobusDocDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AutobusServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutobusServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AutobusServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutobusServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AutorizaFolioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutorizaFolioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AutorizaFolioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutorizaFolioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AutorizacionPerfilServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutorizacionPerfilServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AutorizacionPerfilServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutorizacionPerfilServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AutorizacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutorizacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/AutorizacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/AutorizacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/BancoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BancoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/BancoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BancoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/BoletoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BoletoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/BoletoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BoletoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java index 7453c5f2d..e6016be54 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java @@ -1,155 +1,155 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.InputStream; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.sql.DataSource; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.datasource.DataSourceUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.BpeDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.BpeService; -import com.rjconsultores.ventaboletos.utilerias.exportacao.ExportacaoBpe; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; - -@Service("bpeService") -public class BpeServiceImpl implements BpeService { - private static final Logger log = LogManager.getLogger(BpeServiceImpl.class); - - @Autowired - private BpeDAO bpeDAO; - - @Autowired - private ExportacaoBpe exportacaoBpe; - - @Autowired - private DataSource dataSourceRead; - - @Override - public List buscarBpeRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros, boolean consultaOtimizada) { - Connection connection = null; - try { - connection = getConnectionRead(); - return bpeDAO.buscarBpeRDI(connection, inicio, fim, empresa.getEmpresaId(), estados, isReceitaTerceiros, consultaOtimizada); - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public String buscarArquivoExportacaoBPE(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo, boolean consultaOtimizada) { - Connection connection = null; - - try { - connection = getConnectionRead(); - ExportacaoBPEVo registro = bpeDAO.buscarRegistroExportacaoBpe(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), consultaOtimizada, empresa.getCodContPrevidencia()); - - return exportacaoBpe.gerarArquivoBPE(inicio, fim, nomeArquivo, empresa.getNombempresa(), registro); - - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - - throw new RuntimeException(e); - } - } - } - - @Override - public String buscarXmlBPE(String chBpe) { - Connection connection = null; - try { - connection = getConnectionRead(); - return bpeDAO.buscarXmlBPE(connection, chBpe); - - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - - throw new RuntimeException(e); - } - } - } - - private Connection getConnectionRead() { - return DataSourceUtils.getConnection(dataSourceRead); - } - - @Override - @Transactional - public List buscarBPeRejeitadosContingencia(Integer empresaId, String numBpe, String chbpe, Date dtVendaInicio, Date dtVendaFim, List estados, List codigosRejeicoes) { - return bpeDAO.buscarBPeRejeitadosContingencia(empresaId, numBpe, chbpe, dtVendaInicio, dtVendaFim, estados, codigosRejeicoes); - } - - @Override - @Transactional - public void definirBPeRejeitadoSefazReenvio(List bpesReenvio) throws BusinessException { - for (BPeVO bpe : bpesReenvio) { - bpeDAO.definirBPeRejeitadoSefazReenvio(bpe.getBpeId(), bpe.getCodstat()); - } - } - - @Override - public List buscarBPeVendaEEventosAutorizados(Integer empresaId, Date dtVendaInicio, Date dtVendaFim, Integer estadoId) { - return bpeDAO.buscarBPeVendaEEventosAutorizados(empresaId, dtVendaInicio, dtVendaFim, estadoId); - } - - @Override - public byte[] extrairXmlsBPe(List bpes) { - if(bpes != null && !bpes.isEmpty()) { - Map arquivos = new HashMap(); - for (BPeVO bpe : bpes) { - Map arquivo = null; - if(StringUtils.isNotBlank(bpe.getTipoevento())) { - arquivo = BPeUtil.convertBPeXmlRegularEventoToArquivoXml(bpe); - arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); - arquivo = BPeUtil.convertBPeXmlRepostaEventoToArquivoXml(bpe); - arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); - } else { - arquivo = BPeUtil.convertBPeXmlRegularToArquivoXml(bpe); - arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); - arquivo = BPeUtil.convertBPeXmlRepostaToArquivoXml(bpe); - arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); - } - } - return BPeUtil.zipFiles(arquivos); - } - return null; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.InputStream; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.datasource.DataSourceUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.BpeDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.BpeService; +import com.rjconsultores.ventaboletos.utilerias.exportacao.ExportacaoBpe; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; + +@Service("bpeService") +public class BpeServiceImpl implements BpeService { + private static final Logger log = LogManager.getLogger(BpeServiceImpl.class); + + @Autowired + private BpeDAO bpeDAO; + + @Autowired + private ExportacaoBpe exportacaoBpe; + + @Autowired + private DataSource dataSourceRead; + + @Override + public List buscarBpeRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros, boolean consultaOtimizada) { + Connection connection = null; + try { + connection = getConnectionRead(); + return bpeDAO.buscarBpeRDI(connection, inicio, fim, empresa.getEmpresaId(), estados, isReceitaTerceiros, consultaOtimizada); + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public String buscarArquivoExportacaoBPE(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo, boolean consultaOtimizada) { + Connection connection = null; + + try { + connection = getConnectionRead(); + ExportacaoBPEVo registro = bpeDAO.buscarRegistroExportacaoBpe(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), consultaOtimizada, empresa.getCodContPrevidencia()); + + return exportacaoBpe.gerarArquivoBPE(inicio, fim, nomeArquivo, empresa.getNombempresa(), registro); + + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + + throw new RuntimeException(e); + } + } + } + + @Override + public String buscarXmlBPE(String chBpe) { + Connection connection = null; + try { + connection = getConnectionRead(); + return bpeDAO.buscarXmlBPE(connection, chBpe); + + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + + throw new RuntimeException(e); + } + } + } + + private Connection getConnectionRead() { + return DataSourceUtils.getConnection(dataSourceRead); + } + + @Override + @Transactional + public List buscarBPeRejeitadosContingencia(Integer empresaId, String numBpe, String chbpe, Date dtVendaInicio, Date dtVendaFim, List estados, List codigosRejeicoes) { + return bpeDAO.buscarBPeRejeitadosContingencia(empresaId, numBpe, chbpe, dtVendaInicio, dtVendaFim, estados, codigosRejeicoes); + } + + @Override + @Transactional + public void definirBPeRejeitadoSefazReenvio(List bpesReenvio) throws BusinessException { + for (BPeVO bpe : bpesReenvio) { + bpeDAO.definirBPeRejeitadoSefazReenvio(bpe.getBpeId(), bpe.getCodstat()); + } + } + + @Override + public List buscarBPeVendaEEventosAutorizados(Integer empresaId, Date dtVendaInicio, Date dtVendaFim, Integer estadoId) { + return bpeDAO.buscarBPeVendaEEventosAutorizados(empresaId, dtVendaInicio, dtVendaFim, estadoId); + } + + @Override + public byte[] extrairXmlsBPe(List bpes) { + if(bpes != null && !bpes.isEmpty()) { + Map arquivos = new HashMap(); + for (BPeVO bpe : bpes) { + Map arquivo = null; + if(StringUtils.isNotBlank(bpe.getTipoevento())) { + arquivo = BPeUtil.convertBPeXmlRegularEventoToArquivoXml(bpe); + arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); + arquivo = BPeUtil.convertBPeXmlRepostaEventoToArquivoXml(bpe); + arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); + } else { + arquivo = BPeUtil.convertBPeXmlRegularToArquivoXml(bpe); + arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); + arquivo = BPeUtil.convertBPeXmlRepostaToArquivoXml(bpe); + arquivos.put(arquivo.entrySet().iterator().next().getKey(), arquivo.entrySet().iterator().next().getValue()); + } + } + return BPeUtil.zipFiles(arquivos); + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalcularPeajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CalcularPeajeServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CalcularPeajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CalcularPeajeServiceImpl.java index 22631e658..82fd3f942 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CalcularPeajeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CalcularPeajeServiceImpl.java @@ -1,37 +1,37 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CalcularPeajeDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.CalcularPeajeService; - -@Service("calcularPeajeService") -public class CalcularPeajeServiceImpl implements CalcularPeajeService{ - - @Autowired - private CalcularPeajeDAO calcularPeajeDAO; - - @Override - public List buscarCasetasPeajeWithinTramo(Ruta ruta,Integer[] listCasetaPeaje){ - return calcularPeajeDAO.buscarCasetasPeajeWithinTramo(ruta,listCasetaPeaje); - } - - @Override - public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc){ - return calcularPeajeDAO.buscarRutaWithCasetaPeajeFromOrgao(oc); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception { - return calcularPeajeDAO.gerarSQLInserirPeajes(lsRuta, orgao, usaICMS,listCasetaPeaje); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CalcularPeajeDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.CalcularPeajeService; + +@Service("calcularPeajeService") +public class CalcularPeajeServiceImpl implements CalcularPeajeService{ + + @Autowired + private CalcularPeajeDAO calcularPeajeDAO; + + @Override + public List buscarCasetasPeajeWithinTramo(Ruta ruta,Integer[] listCasetaPeaje){ + return calcularPeajeDAO.buscarCasetasPeajeWithinTramo(ruta,listCasetaPeaje); + } + + @Override + public List buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc){ + return calcularPeajeDAO.buscarRutaWithCasetaPeajeFromOrgao(oc); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public int[] gerarSQLInserirPeajes(List lsRuta, OrgaoConcedente orgao, boolean usaICMS,Integer[] listCasetaPeaje) throws Exception { + return calcularPeajeDAO.gerarSQLInserirPeajes(lsRuta, orgao, usaICMS,listCasetaPeaje); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java index 9fadacb86..f68b9abe5 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java @@ -1,1687 +1,1687 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.ByteArrayOutputStream; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; -import com.rjconsultores.ventaboletos.dao.ComissaoDAO; -import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.Comissao; -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.DescontoComissao; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; -import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; -import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; -import com.rjconsultores.ventaboletos.entidad.PtovtaComissao.Receita; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; -import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; -import com.rjconsultores.ventaboletos.enums.MimeType; -import com.rjconsultores.ventaboletos.enums.ModeloComissaoImpressaoPosterior; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.ComissaoException; -import com.rjconsultores.ventaboletos.service.CalculoComissaoService; -import com.rjconsultores.ventaboletos.service.ComissaoReceitaService; -import com.rjconsultores.ventaboletos.service.ComissaoService; -import com.rjconsultores.ventaboletos.service.ConferenciaComissaoService; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.CtrlFechamentoCaixaService; -import com.rjconsultores.ventaboletos.service.DescontoComissaoService; -import com.rjconsultores.ventaboletos.service.EmpresaEmailConfigService; -import com.rjconsultores.ventaboletos.service.EmpresaImpostoService; -import com.rjconsultores.ventaboletos.service.EmpresaService; -import com.rjconsultores.ventaboletos.service.PtovtaComissaoService; -import com.rjconsultores.ventaboletos.service.PuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.SendMail; -import com.rjconsultores.ventaboletos.utilerias.SendMail.AuthType; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.ComissaoDesconto; -import com.rjconsultores.ventaboletos.vo.comissao.ComissaoDesconto.TipoDesconto; -import com.rjconsultores.ventaboletos.vo.comissao.ComissaoLogVO; -import com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita; -import com.rjconsultores.ventaboletos.vo.comissao.EmailConfigVO; -import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; -import com.rjconsultores.ventaboletos.vo.comissao.FormapagoVO; -import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; -import com.rjconsultores.ventaboletos.vo.comissao.RegistroCalculo; - -@Service("calculoComissaoService") -public class CalculoComissaoServiceImpl implements CalculoComissaoService { - - private static final Logger log = LogManager.getLogger(CalculoComissaoServiceImpl.class); - private static final BigDecimal CEM = BigDecimal.TEN.multiply(BigDecimal.TEN); - - @Autowired - private PtovtaComissaoService ptovtaComissaoService; - - @Autowired - private EmpresaImpostoService empresaImpostoService; - - @Autowired - private ComissaoService comissaoService; - - @Autowired - private ComissaoDAO comissaoDAO; - - @Autowired - private ConferenciaComissaoDAO conferenciaComissaoDAO; - - @Autowired - private ConferenciaComissaoService conferenciaComissaoService; - - @Autowired - private DescontoComissaoService descontoComissaoService; - - @Autowired - private ConstanteService constanteService; - - @Autowired - private ComissaoReceitaService comissaoReceitaService; - - @Autowired - private EmpresaService empresaService; - - @Autowired - private PuntoVentaService puntoVentaService; - - @Autowired - private CtrlFechamentoCaixaService ctrlFechamentoCaixaService; - - @Autowired - private EmpresaEmailConfigService empresaEmailConfigService; - - public boolean validaCompetencia(Date periodo) { - Calendar calendario = Calendar.getInstance(); - calendario.setTime(periodo); - - int mes = calendario.get(Calendar.MONTH) + 1; - int ano = calendario.get(Calendar.YEAR); - - Calendar now = Calendar.getInstance(); - int mesNow = now.get(Calendar.MONTH) + 1; - int anoNow = now.get(Calendar.YEAR); - - if (anoNow == ano) { - if (mesNow > mes) { - return true; - } - - } else if (anoNow > ano) { - return true; - } - - return false; - } - - public boolean validaPeriodo(Date dataInicial, Date dataFinal) { - Calendar cal = Calendar.getInstance(); - cal.setTime(dataInicial); - int monthInicial = cal.get(Calendar.MONTH); - int yearInicial = cal.get(Calendar.YEAR); - - cal.setTime(dataFinal); - int monthFinal = cal.get(Calendar.MONTH); - int yearFinal = cal.get(Calendar.YEAR); - - if(monthInicial != monthFinal || yearFinal != yearInicial){ - return false; - } - - return true; - } - - @Override - public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException { - - try { - - if (validaCompetencia(periodo)) { - - String competencia = DateUtil.getStringDate(periodo, "MM/yyyy"); - - if(isRetencaoDiaria || conferenciaComissaoService.isConferenciaCompetenciaEncerrada(competencia, empresa, puntoVenta, false)) { - Comissao comissaoCadastrada = comissaoDAO.buscaComissaoVigencia(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), competencia); - if (comissaoCadastrada == null) { - - RegistroCalculo rc = realizarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo, isRetencaoDiaria, usuarioId, isRefazerCalculo); - - gravarComissao(puntoVenta, empresa, rc, competencia, null, null); - } else if(!ignorarComissaoGerada){ - throw new ComissaoException("busquedaCalculoComissaoController.registro.exception", null, comissaoCadastrada.getPuntoVenta().getNombpuntoventa()); - } - } else { - throw new ComissaoException("busquedaCalculoComissaoController.conferenciaNaoEncerrada.exception", null, puntoVenta.getNombpuntoventa()); - } - } else { - throw new ComissaoException("busquedaCalculoComissaoController.competencia.exception"); - } - - } catch (ComissaoException e) { - log.error(e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ComissaoException(e.getMessage(), e); - } - } - - /** - * Grava a comissao gerada - * @param puntoVenta - * @param empresa - * @param registroCalculo - * @param competencia - * @throws ComissaoException - */ - private void gravarComissao(PuntoVenta puntoVenta, Empresa empresa, RegistroCalculo registroCalculo, String competencia, Date dataInicial, Date dataFinal) throws ComissaoException { - try { - Comissao comissao = new Comissao(); - - if(StringUtils.isNotBlank(competencia)) { - comissao.setCompetencia(competencia); - } else if(dataInicial != null && dataFinal != null){ - comissao.setDataInicial(dataInicial); - comissao.setDataFinal(dataFinal); - } - - comissao.setEmpresaId(empresa.getEmpresaId()); - comissao.setPuntoVenta(puntoVenta); - comissao.setBonificacaoMetas(registroCalculo.getComissaoBonificaoMetas()); - comissao.setComissaoBpr(registroCalculo.getComissaoBPR()); - comissao.setEntregasPassagem(registroCalculo.getComissaoEntregaPassagem()); - comissao.setReceitaExcessobagagem(registroCalculo.getComissaoExcessoBagagem()); - comissao.setReceitaSeguroopcional(registroCalculo.getComissaoSegOpcional()); - comissao.setReceitaSeguro(registroCalculo.getComissaoSeguro()); - comissao.setReceitaOutros(registroCalculo.getComissaoOutros()); - comissao.setRoyaties(registroCalculo.getRoyaties()); - comissao.setIssRetido(registroCalculo.getRetidoISS()); - - comissao.setIndPago(false); - comissao.setUsuarioPagamentoId(null); - comissao.setDataPagamento(null); - comissao.setDescontosEventuais(BigDecimal.ZERO); - comissao.setDescontosFixos(BigDecimal.ZERO); - - for (ComissaoDesconto cd : registroCalculo.getLsDescontos()) { - if (cd.getTipo().equals(TipoDesconto.EVENTUAL)) { - comissao.setDescontosEventuais(MoneyHelper.somar(comissao.getDescontosEventuais(), cd.getValorDesconto())); - } else if (cd.getTipo().equals(TipoDesconto.FIXO)) { - comissao.setDescontosFixos(MoneyHelper.somar(comissao.getDescontosFixos(), cd.getValorDesconto())); - } - } - - for (ComissaoReceita comissaoReceita : registroCalculo.getLsReceitas()) { - comissao.setReceitaBPR(MoneyHelper.somar(comissao.getReceitaBPR(), comissaoReceita.getReceitaBPR(), 2)); - comissao.setReceitaGAP(MoneyHelper.somar(comissao.getReceitaGAP(), comissaoReceita.getReceitaGAP(), 2)); - comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getDevolvidosRelatorio(), 2)); - comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getDevolvidosGAPRelatorio(), 2)); - comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getCancelados(), 2)); - comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getCanceladosGAP(), 2)); - comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getCanceladosGAP(), 2)); - comissao.setReceitaBrutaExcessoBagagem(MoneyHelper.somar(comissao.getReceitaBrutaExcessoBagagem(), comissaoReceita.getReceitaExcessoBagagem(), 2)); - comissao.setReceitaBrutaSeguroopcional(MoneyHelper.somar(comissao.getReceitaBrutaSeguroopcional(), comissaoReceita.getReceitaSeguroOpcional(), 2)); - comissao.setReceitaBrutaSeguro(MoneyHelper.somar(comissao.getReceitaBrutaSeguro(), comissaoReceita.getReceitaSeguro(), 2)); - } - - comissao = comissaoService.suscribir(comissao); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ComissaoException(e.getMessage(), e); - } - } - - @Override - public void cancelarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo) throws ComissaoException, BusinessException { - try { - String competencia = DateUtil.getStringDate(periodo, "MM/yyyy"); - Comissao comissao = comissaoDAO.buscaComissaoVigencia(puntoVentaId, empresaId, competencia); - if (comissao != null) { - comissaoService.borrar(comissao); - } else { - throw new ComissaoException("busquedaCalculoComissaoController.comissao.exception"); - } - } catch (ComissaoException e) { - log.error(e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { - return realizarCalculoComissao(puntoVentaId, empresaId, periodo, isRetencaoDiaria, usuarioId, isRefazerCalculo); - } - - private BigDecimal calculoComisssaoBPR(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal bpr, BigDecimal gap, boolean isBilheteGap, ComissaoLogVO comissaoLog) { - - // comissão BPR = Receita comissão * (% Com BPR) - BigDecimal recbpr = BigDecimal.ZERO; - BigDecimal receitaBPR = MoneyHelper.somar(bpr, gap, 2); - - BigDecimal percentualComissao = BigDecimal.ZERO; - if (isAltaTemporada) { - percentualComissao = ptovtaComissao.getPassagemAlta() != null ? ptovtaComissao.getPassagemAlta() : BigDecimal.ZERO; - } else { - percentualComissao = ptovtaComissao.getPassagemBaixa() != null ? ptovtaComissao.getPassagemBaixa() : BigDecimal.ZERO; - } - - log.info(String.format(":: Percentual comissão: %s ::", percentualComissao)); - - if(isBilheteGap && ModeloComissaoImpressaoPosterior.COMPARTILHADA.equals(ptovtaComissao.getModeloComissaoImpressaoPosterior())) { - if (isAltaTemporada) { - percentualComissao = ptovtaComissao.getValorVendaGapCompAlta() != null ? ptovtaComissao.getValorVendaGapCompAlta() : BigDecimal.ZERO; - } else { - percentualComissao = ptovtaComissao.getValorVendaGapComp() != null ? ptovtaComissao.getValorVendaGapComp() : BigDecimal.ZERO; - } - log.info(String.format(":: Comissao Compartilhada Configurada para Bilhetes Imp. Post. - Percentual comissão Alterado para: %s ::", percentualComissao)); - } - - comissaoLog.setPorcComissao(percentualComissao); - - recbpr = MoneyHelper.multiplicar(receitaBPR, MoneyHelper.dividir(percentualComissao,CEM,4), 4); - - return recbpr; - } - - private BigDecimal calculoEntregaPassagem(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal gapImpressa, BigDecimal internet, int contImpressa) { - - // EntregaPassagem (Internet/Venda impressão Posterior/Outros) - BigDecimal entregaPassagem = BigDecimal.ZERO; - BigDecimal receitaEntrega = MoneyHelper.somar(gapImpressa, internet, 2); - - log.info(String.format(":: Modelo Comissao Configurado Para Entrega Passagem: %s ::", ptovtaComissao.getModeloComissaoImpressaoPosterior())); - if(ModeloComissaoImpressaoPosterior.PADRAO.equals(ptovtaComissao.getModeloComissaoImpressaoPosterior())) { - if(isAltaTemporada) { - if(ptovtaComissao.getValorImpressaoGapAlta() != null) { - if (BooleanUtils.toBoolean(ptovtaComissao.getIndimpressaogapporc())) { - entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpressaoGapAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpressaoGapAlta(),CEM,4) : BigDecimal.ZERO, 4); - } else { - entregaPassagem = ptovtaComissao.getValorImpressaoGapAlta() != null ? MoneyHelper.multiplicar(ptovtaComissao.getValorImpressaoGapAlta(),new BigDecimal(contImpressa), 2) : BigDecimal.ZERO; - } - } - } else { - if(ptovtaComissao.getValorImpressaoGap() != null) { - if (BooleanUtils.toBoolean(ptovtaComissao.getIndimpressaogapporc())) { - entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpressaoGap() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpressaoGap(),CEM,4) : BigDecimal.ZERO, 4); - } else { - entregaPassagem = ptovtaComissao.getValorImpressaoGap() != null ? MoneyHelper.multiplicar(ptovtaComissao.getValorImpressaoGap(),new BigDecimal(contImpressa), 2) : BigDecimal.ZERO; - } - } - } - } else if(ModeloComissaoImpressaoPosterior.COMPARTILHADA.equals(ptovtaComissao.getModeloComissaoImpressaoPosterior())) { - if(isAltaTemporada) { - entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpGapCompAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpGapCompAlta(),CEM,4) : BigDecimal.ZERO, 4); - } else { - entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpGapComp() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpGapComp(),CEM,4) : BigDecimal.ZERO, 4); - } - } - - return entregaPassagem; - } - - private BigDecimal calculoExcessoBagagem(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal excBag, ComissaoLogVO comissaoLog) { - - // comissão Excesso = Receita Excesso Bagagem * (% Com. Exc. Bag) - BigDecimal excessoBagagem = BigDecimal.ZERO; - if (isAltaTemporada) { - comissaoLog.setPorcComissao(ptovtaComissao.getExcessoAlta()); - excessoBagagem = MoneyHelper.multiplicar(excBag, ptovtaComissao.getExcessoAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getExcessoAlta(), CEM, 4) : BigDecimal.ZERO, 4); - } else { - comissaoLog.setPorcComissao(ptovtaComissao.getExcessoBaixa()); - excessoBagagem = MoneyHelper.multiplicar(excBag, ptovtaComissao.getExcessoBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getExcessoBaixa(), CEM, 4) : BigDecimal.ZERO, 4); - } - - return excessoBagagem; - } - - private BigDecimal calculoSeguroObrigatorio(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal seguroObrigatorio) { - - // comissão Seg. Obrigatorio = Receita Seguro Obrigatorio * (% Com. Seg. Pol) - BigDecimal recSeguroObrigatorio = BigDecimal.ZERO; - if (isAltaTemporada) { - recSeguroObrigatorio = MoneyHelper.multiplicar(seguroObrigatorio, ptovtaComissao.getSeguroobrigatorioAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroobrigatorioAlta(), CEM, 4) : BigDecimal.ZERO, 4); - } else { - recSeguroObrigatorio = MoneyHelper.multiplicar(seguroObrigatorio, ptovtaComissao.getSeguroobrigatorioBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroobrigatorioBaixa(), CEM, 4) : BigDecimal.ZERO, 4); - } - return recSeguroObrigatorio; - } - - private BigDecimal calculoSeguroOpcional(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal segOpcional, ComissaoLogVO comissaoLog) { - - // comissão Seg. Opcional = Receita Seguro Opcional * (% Com. Seg. Pol) - BigDecimal recsegOpcional = BigDecimal.ZERO; - if (isAltaTemporada) { - comissaoLog.setPorcComissao(ptovtaComissao.getSeguroAlta()); - recsegOpcional = MoneyHelper.multiplicar(segOpcional, ptovtaComissao.getSeguroAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroAlta(), CEM, 4) : BigDecimal.ZERO, 4); - } else { - comissaoLog.setPorcComissao(ptovtaComissao.getSeguroBaixa()); - recsegOpcional = MoneyHelper.multiplicar(segOpcional, ptovtaComissao.getSeguroBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroBaixa(), CEM, 4) : BigDecimal.ZERO, 4); - } - return recsegOpcional; - } - - private BigDecimal calculoOutros(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal outros, ComissaoLogVO comissaoLog) { - - // comissão Seg. Opcional = Receita Seguro Opcional * (% Com. Seg. Pol) - BigDecimal recoutros = BigDecimal.ZERO; - if (isAltaTemporada) { - comissaoLog.setPorcComissao(ptovtaComissao.getOutrosAlta()); - recoutros = MoneyHelper.multiplicar(outros, ptovtaComissao.getOutrosAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getOutrosAlta(), CEM, 4) : BigDecimal.ZERO, 4); - } else { - comissaoLog.setPorcComissao(ptovtaComissao.getOutrosBaixa()); - recoutros = MoneyHelper.multiplicar(outros, ptovtaComissao.getOutrosBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getOutrosBaixa(), CEM, 4) : BigDecimal.ZERO, 4); - } - return recoutros; - } - - private Map calculoDescontos(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal, PtovtaComissao ptovtaComissao) { - - List lsDescontos = new ArrayList(); - BigDecimal valorDescontoTotal = BigDecimal.ZERO; - - List itensDescontos = descontoComissaoService.buscaDescontoComissaoPeriodo(puntoVentaId, empresaId, dataInicial, dataFinal); - - for (DescontoComissao dc : itensDescontos) { - - BigDecimal valorDesconto = dc.getPreco(); - valorDescontoTotal = MoneyHelper.somar(valorDescontoTotal, valorDesconto, 2); - - ComissaoDesconto desconto = new ComissaoDesconto(); - if (dc.getDatafinal() == null) { - desconto.setTipo(TipoDesconto.FIXO); - } else { - desconto.setTipo(TipoDesconto.EVENTUAL); - } - desconto.setNomeDesconto(dc.getItemDesconto().getNomitemdesconto()); - desconto.setValorDesconto(valorDesconto); - - lsDescontos.add(desconto); - } - - Map respDescontos = new HashMap(); - respDescontos.put("LISTA_DESCONTOS", lsDescontos); - respDescontos.put("VALOR_DESCONTOS", valorDescontoTotal); - - return respDescontos; - } - - @Override - public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { - - Conferencia conferencia = new Conferencia(); - conferencia.setPuntoVenta(new PuntoVenta(puntoVentaId)); - conferencia.setEmpresa(new Empresa(empresaId)); - - Calendar calendario = Calendar.getInstance(); - calendario.setTime(periodo); - int diaInicial = -1; - int diaFinal = -1; - int mes = calendario.get(Calendar.MONTH); - int ano = calendario.get(Calendar.YEAR); - - if(isRetencaoDiaria) { - conferencia.setDatamovimento(periodo); - diaInicial = calendario.get(Calendar.DAY_OF_MONTH); - diaFinal = calendario.get(Calendar.DAY_OF_MONTH); - } else { - conferencia.setCompetencia(DateUtil.getStringDate(periodo, "MM/yyyy")); - diaInicial = calendario.getActualMinimum(Calendar.DAY_OF_MONTH); - diaFinal = calendario.getActualMaximum(Calendar.DAY_OF_MONTH); - } - - Date dataInicial = getDate(diaInicial, mes, ano); - Date dataFinal = getDate(diaFinal, mes, ano); - - return realizarCalculoComissao(puntoVentaId, empresaId, usuarioId, isRefazerCalculo, conferencia, dataInicial, dataFinal, isRetencaoDiaria); - - } - - /** - * Realiza calculo da comissao - * @param puntoVentaId - * @param empresaId - * @param usuarioId - * @param isRefazerCalculo - * @param conferencia - * @param dataInicial - * @param dataFinal - * @param isRetencaoDiaria - * @return - * @throws BusinessException - * @throws ComissaoException - */ - private RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Integer usuarioId, Boolean isRefazerCalculo, Conferencia conferencia, Date dataInicial, Date dataFinal, boolean isRetencaoDiaria) throws BusinessException, ComissaoException { - try { - PtovtaComissao ptovtaComissao = ptovtaComissaoService.buscarPuntaVentaEmpresa(puntoVentaId, empresaId); - if (ptovtaComissao != null && (ptovtaComissao.getIndretercomissao() == null || !ptovtaComissao.getIndretercomissao())) { - //Abate no valor da comissão bpr as saídas de caixa - boolean consideraBilhetesDevolvidosEmOutraAgencia = (ptovtaComissao.getIndbilhetesdevcanorigem() == null)?false:ptovtaComissao.getIndbilhetesdevcanorigem(); - - List receitas = null; - if(isRefazerCalculo) { - comissaoReceitaService.limparComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); - List receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, true, consideraBilhetesDevolvidosEmOutraAgencia); - log.info("Total de bilhetes: " + receitasBoleto.size()); - List eventosFinanceirosVOs = conferenciaComissaoDAO.carregarEventosFinanceiros(conferencia); - log.info("Total de eventos extras: " + eventosFinanceirosVOs.size()); - receitas = calculaReceitaComissao(empresaId, ptovtaComissao, receitasBoleto, eventosFinanceirosVOs, dataInicial, dataFinal); - reterComissaoReceitaDiaria(empresaId, puntoVentaId, usuarioId, receitas); - } else { - receitas = recuperarComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); - } - - if(!isRetencaoDiaria) { - return calcularRegistroCalculo(ptovtaComissao, puntoVentaId, empresaId, dataInicial, dataFinal, receitas); - } - } else { - if(ptovtaComissao != null && ptovtaComissao.getIndretercomissao() != null && ptovtaComissao.getIndretercomissao()) { - throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissaoReterComissao.exception", null, ptovtaComissao.getDescComissaoId() != null ? ptovtaComissao.getPuntoventaId().getNombpuntoventa() : ""); - } else if(!isRefazerCalculo) { - throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissao.exception"); - } - } - - }catch(ComissaoException e ){ - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException("busquedaCalculoComissaoController.PtovtaComissao.exception"); - } - - return null; - } - - private List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { - return comissaoReceitaService.recuperarComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); - } - - /** - * Retem dados para calculo da comissao - * @param empresaId - * @param puntoVentaId - * @param usuarioId - * @param receitas - * @throws BusinessException - */ - private void reterComissaoReceitaDiaria(Integer empresaId, Integer puntoVentaId, Integer usuarioId, List receitas) throws BusinessException { - comissaoReceitaService.reterComissaoReceitaDiaria(empresaId, puntoVentaId, usuarioId, receitas); - } - - /** - * Carrega os dados de registro de calculo, conforme receitas - * @param ptovtaComissao - * @param puntoVentaId - * @param empresaId - * @param dataInicial - * @param dataFinal - * @param receitas - * @return - * @throws BusinessException - */ - @SuppressWarnings("unchecked") - private RegistroCalculo calcularRegistroCalculo(PtovtaComissao ptovtaComissao, Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal, List receitas) throws BusinessException { - try { - RegistroCalculo rc = new RegistroCalculo(); - rc.setNombpuntoventa(ptovtaComissao.getPuntoventaId().getNombpuntoventa()); - rc.setNumPuntoVenta(ptovtaComissao.getPuntoventaId().getNumPuntoVenta()); - - BigDecimal comissaoBPR = BigDecimal.ZERO; - BigDecimal comissaoExcessoBagagem = BigDecimal.ZERO; - BigDecimal comissaoSegOpcional = BigDecimal.ZERO; - BigDecimal comissaoSeguro = BigDecimal.ZERO; - BigDecimal comissaoEntregaPassagem = BigDecimal.ZERO; - BigDecimal comissaoOutros = BigDecimal.ZERO; - BigDecimal receitaTotal = BigDecimal.ZERO; - BigDecimal comissaoTotal = BigDecimal.ZERO; - - for (ComissaoReceita cr : receitas) { - receitaTotal = MoneyHelper.somar(receitaTotal, cr.getReceitaComissao()); - comissaoBPR = MoneyHelper.somar(comissaoBPR, cr.getComissaoBPRDiaria()); - comissaoEntregaPassagem = MoneyHelper.somar(comissaoEntregaPassagem, cr.getComissaoEntregaPassagemDiaria()); - comissaoExcessoBagagem = MoneyHelper.somar(comissaoExcessoBagagem, cr.getComissaoExcessoBagagemDiaria()); - comissaoSegOpcional = MoneyHelper.somar(comissaoSegOpcional, cr.getComissaoSegOpcionalDiaria()); - comissaoSeguro = MoneyHelper.somar(comissaoSeguro, cr.getComissaoSeguroObrigatorioDiaria()); - comissaoOutros = MoneyHelper.somar(comissaoOutros, cr.getComissaoOutrosDiaria()); - comissaoTotal = MoneyHelper.somar(comissaoTotal, cr.getTotalComissao()); - } - - rc.setLsReceitas(receitas); - - rc.setComissaoBPR(comissaoBPR); - rc.setComissaoExcessoBagagem(comissaoExcessoBagagem); - rc.setComissaoSegOpcional(comissaoSegOpcional); - rc.setComissaoSeguro(comissaoSeguro); - rc.setComissaoEntregaPassagem(comissaoEntregaPassagem); - rc.setComissaoOutros(comissaoOutros); - - // Descontos (Fixos e Eventuais) - Map respDescontos = calculoDescontos(puntoVentaId, empresaId, dataInicial, dataFinal, ptovtaComissao); - rc.setDescontos((BigDecimal) respDescontos.get("VALOR_DESCONTOS")); - rc.setLsDescontos((List) respDescontos.get("LISTA_DESCONTOS")); - - /** - * Bonificação Metas - Meta = Eh o valor estipulado de receita dentro do periodo que a agencia deve alcançar. - Bonificação = Eh uma porcentagem paga encima da comissao, por alcançar a meta. - */ - BigDecimal comissaoBonificaoMetas = BigDecimal.ZERO; - rc.setComissaoBonificaoMetas(comissaoBonificaoMetas); - - // Royaties - BigDecimal royaties = BigDecimal.ZERO; - if(ptovtaComissao.getRoyalties() != null) { - royaties = MoneyHelper.multiplicar(receitaTotal, MoneyHelper.dividir(ptovtaComissao.getRoyalties(), CEM)); - } - rc.setRoyaties(royaties); - - // ISS retido - BigDecimal issRetido = BigDecimal.ZERO; - if(ptovtaComissao.getIssretido() != null) { - issRetido = MoneyHelper.multiplicar(comissaoTotal, MoneyHelper.dividir(ptovtaComissao.getIssretido(), CEM)); - } - rc.setRetidoISS(issRetido); - - // comissão é pagar = comissão BPR + comissão Excesso Bagagem + comissão Seg. Opcional + Bonificação Metas + Internet(EntregaPassagem) - BigDecimal comissaoPagar = BigDecimal.ZERO; - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoBPR); - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoExcessoBagagem); - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoSeguro); - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoSegOpcional); - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoEntregaPassagem); - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoOutros); - comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoBonificaoMetas); - - // - Descontos (Fixos e Eventuais) - Royaties - ISS retido - comissaoPagar = MoneyHelper.subtrair(comissaoPagar,rc.getDescontos()); - comissaoPagar = MoneyHelper.subtrair(comissaoPagar,royaties); - comissaoPagar = MoneyHelper.subtrair(comissaoPagar,issRetido); - rc.setComissaoPagar(comissaoPagar); - - return rc; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - private boolean validaAltaTemporada(List impostos, Integer mes, Integer estadoId) { - if(impostos != null && mes != null && estadoId != null) { - - for (EmpresaImposto ei : impostos) { - if(ei.getEstado() != null) { - if (ei.getEstado().getEstadoId().equals(estadoId)) { - switch (mes) { - case Calendar.JANUARY: - return ei.getIndJaneiro() == null ? false : ei.getIndJaneiro(); - case Calendar.FEBRUARY: - return ei.getIndFevereiro() == null ? false : ei.getIndFevereiro(); - case Calendar.MARCH: - return ei.getIndMarco() == null ? false : ei.getIndMarco(); - case Calendar.APRIL: - return ei.getIndAbril() == null ? false : ei.getIndAbril(); - case Calendar.MAY: - return ei.getIndMaio() == null ? false : ei.getIndMaio(); - case Calendar.JUNE: - return ei.getIndJunho() == null ? false : ei.getIndJunho(); - case Calendar.JULY: - return ei.getIndJulho() == null ? false : ei.getIndJulho(); - case Calendar.AUGUST: - return ei.getIndAgosto() == null ? false : ei.getIndAgosto(); - case Calendar.SEPTEMBER: - return ei.getIndSetembro() == null ? false : ei.getIndSetembro(); - case Calendar.OCTOBER: - return ei.getIndOutubro() == null ? false : ei.getIndOutubro(); - case Calendar.NOVEMBER: - return ei.getIndNovembro() == null ? false : ei.getIndNovembro(); - case Calendar.DECEMBER: - return ei.getIndDezembro() == null ? false : ei.getIndDezembro(); - default: - break; - } - } - } - } - - } - - return false; - } - - private List calculaReceitaComissao(Integer empresaId, PtovtaComissao ptovtaComissao, List receitasBoleto, List eventosFinanceirosVOs, Date dataInicial, Date dataFinal) { - - Calendar cDataInicial = Calendar.getInstance(); - cDataInicial.setTime(dataInicial); - Integer diaInicial = cDataInicial.get(Calendar.DAY_OF_MONTH); - - Calendar cDataFinal = Calendar.getInstance(); - cDataFinal.setTime(dataInicial); - Integer diaFinal = cDataFinal.get(Calendar.DAY_OF_MONTH); - - Integer mes = cDataInicial.get(Calendar.MONTH); - Integer ano = cDataInicial.get(Calendar.YEAR); - - List impostos = empresaImpostoService.buscarEmpresaImposto(empresaId); - boolean isConsideraBilhetesDevolvidosEmOutraAgencia = ptovtaComissao.getIndbilhetesdevcanorigem() == null ? false : ptovtaComissao.getIndbilhetesdevcanorigem(); - boolean isPagaComissaoBilheteOrdemServico = ptovtaComissao.getIndPagaComissaoBilheteOS() != null ? ptovtaComissao.getIndPagaComissaoBilheteOS() : false; - boolean isDevolucaoComissaoTransferenciaGeraCaja = ptovtaComissao.getEmpresaId().getIndComTransfGeraCaja(); - boolean isSeguroObrigatorioReceitaBPR = ptovtaComissao.getSeguroReceita() || ptovtaComissao.getSeguroDev(); - - List receitas = new ArrayList(); - for (int dia = diaInicial; dia <= diaFinal; dia++) { - Calendar cDataRegistro = Calendar.getInstance(); - cDataRegistro.set(Calendar.DAY_OF_MONTH, dia); - cDataRegistro.set(Calendar.MONTH, mes); - cDataRegistro.set(Calendar.YEAR, ano); - - Date dataRegistro = DateUtil.normalizarToFecha(cDataRegistro.getTime()); - - List list = verificaCalculoComissaoProDia(receitasBoleto, dataRegistro); - - ComissaoReceita cr = new ComissaoReceita(); - cr.setData(dataRegistro); - - BigDecimal receitaComissao = BigDecimal.ZERO; - - BigDecimal receitaBPR = BigDecimal.ZERO; - BigDecimal receitaGAP = BigDecimal.ZERO; - BigDecimal internet = BigDecimal.ZERO; - BigDecimal receitaSeguroObrigatorio = BigDecimal.ZERO; - BigDecimal receitaExcessoBagagem = BigDecimal.ZERO; - BigDecimal receitaSeguroOpcional = BigDecimal.ZERO; - BigDecimal receitaSeguroOutros = BigDecimal.ZERO; - - BigDecimal cancelados = BigDecimal.ZERO; - BigDecimal canceladosOrigem = BigDecimal.ZERO; - BigDecimal devolvidos = BigDecimal.ZERO; - BigDecimal devolvidosOrigem = BigDecimal.ZERO; - BigDecimal canceladosGAP = BigDecimal.ZERO; - BigDecimal canceladosGAPOrigem = BigDecimal.ZERO; - BigDecimal devolvidosGAP = BigDecimal.ZERO; - BigDecimal devolvidosGAPOrigem = BigDecimal.ZERO; - - BigDecimal gapImpressa = BigDecimal.ZERO; - int contImpressa = 0; - - BigDecimal comissaoBPR = BigDecimal.ZERO; - BigDecimal comissaoExcessoBagagem = BigDecimal.ZERO; - BigDecimal comissaoSegOpcional = BigDecimal.ZERO; - BigDecimal comissaoEntregaPassagem = BigDecimal.ZERO; - BigDecimal comissaoOutros = BigDecimal.ZERO; - BigDecimal comissaoSeguroObrigatorio = BigDecimal.ZERO; - - // Receita Total -- bruta/liquida - abatimento do valor do icms - boolean isReceitaLiquida = false; - Receita receita = Receita.getByValor(ptovtaComissao.getReceita()); - if (receita.equals(Receita.RECEITALIQUIDA)) { - isReceitaLiquida = true; - } - - /* Calculando comissão para os boletos */ - for (BoletoComissao rcc : list) { - - /* - * Mantis #12391 - * Verifica se a agencia paga comissão para bilhete de ordem de servico, - * caso não faça pagamento, o bilhete é ignorado */ - if(!isPagaComissaoBilheteOrdemServico && isBilheteOrdemServico(rcc)) { - continue; - } - - boolean isAltaTemporada = validaAltaTemporada(impostos, mes, rcc.getEstadoId()); - - IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto()); - boolean isSaidaCaixa = rcc.getMotivoCancelacionId() != null; - boolean isEntregaPassagem = statusBoleto.equals(IndStatusBoleto.E) && (rcc.getMotivoCancelacionId() == null); - - /* - * Exclui os bilhetes que não foram entregues na agencia da comissão que está sendo calculada - */ - if(isEntregaPassagem && !ptovtaComissao.getPuntoventaId().getPuntoventaId().equals(rcc.getPuntoVentaId())) { - continue; - } - - if(rcc.isMotivocancelacionQuitacaoOcd() || rcc.isDiferencaTrocaGeracaoOcd()) { - continue; - } - - if(rcc.isMotivocancelacionTransferido() && (rcc.getIndreimpresion() || !isDevolucaoComissaoTransferenciaGeraCaja)) { - continue; - } - - ComissaoLogVO comissaoLog = new ComissaoLogVO(); - comissaoLog.setFeccorte(dataRegistro); - comissaoLog.setCajaId(rcc.getCajaId()); - comissaoLog.setEmpresaId(empresaId); - comissaoLog.setPuntoventaId(rcc.getPuntoVentaId()); - comissaoLog.setTurnoId(rcc.getTurnoId()); - comissaoLog.setUsuarioId(rcc.getUsuarioId()); - comissaoLog.setOrigem("ADM"); - - StringBuilder sTextoLog = new StringBuilder(); - sTextoLog.append("[CAJA_ID: ") - .append(rcc.getCajaId()) - .append("] ") - .append("[BILHETE: ") - .append(rcc.getNumFolioSistema()) - .append("] ") - .append("[INDSTATUSBOLETO: ") - .append(rcc.getIndstatusboleto()) - .append("] ") - .append("[MOTIVO_CANCELAMENTO: ") - .append(rcc.getMotivoCancelacionId() != null ? rcc.getMotivoCancelacionId() : "") - .append("] ") - .append("[TIPO_VENDA: ") - .append(rcc.getTipoVenta()) - .append("] "); - - BigDecimal receitaItem = BigDecimal.ZERO; - BigDecimal receitaDevItem = BigDecimal.ZERO; - BigDecimal receitaSeguroObrigatorioItem = BigDecimal.ZERO; - BigDecimal receitaSeguroObrigatorioDevItem = BigDecimal.ZERO; - - if (!isSaidaCaixa){ - // Totais - if (BooleanUtils.toBoolean(ptovtaComissao.getTarifaReceita())) { - receitaItem = MoneyHelper.somar(receitaItem, rcc.getValorpagado()); - } - - if (BooleanUtils.toBoolean(ptovtaComissao.getTaxaReceita())) { - receitaItem = MoneyHelper.somar(receitaItem, rcc.getEmbarque()); - } - - if (BooleanUtils.toBoolean(ptovtaComissao.getPedagioReceita())) { - receitaItem = MoneyHelper.somar(receitaItem, rcc.getPedagio()); - } - - if(isSeguroObrigatorioReceitaBPR) { - if (BooleanUtils.toBoolean(ptovtaComissao.getSeguroReceita())) { - receitaItem = MoneyHelper.somar(receitaItem, rcc.getSeguro()); - } - } else { - receitaSeguroObrigatorioItem = MoneyHelper.somar(receitaSeguroObrigatorioItem, rcc.getSeguro()); - } - - } - - if (isSaidaCaixa){ - // Totais de devolução / Cancelamento - if (BooleanUtils.toBoolean(ptovtaComissao.getTarifaDev())) { - receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getValorpagado()); - } - - if (BooleanUtils.toBoolean(ptovtaComissao.getTaxaDev())) { - receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getEmbarque()); - } - - if (BooleanUtils.toBoolean(ptovtaComissao.getPedagioDev())) { - receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getPedagio()); - } - - if(isSeguroObrigatorioReceitaBPR) { - if (BooleanUtils.toBoolean(ptovtaComissao.getSeguroDev())) { - receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getSeguro()); - } - } else { - receitaSeguroObrigatorioDevItem = MoneyHelper.somar(receitaSeguroObrigatorioDevItem, rcc.getSeguro()); - } - - } - - // Calculo de ICMS sobre o valor do bilhete - if (isReceitaLiquida) { - BigDecimal icms = MoneyHelper.multiplicar(receitaItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); - receitaItem = MoneyHelper.subtrair(receitaItem, icms); - - BigDecimal icmsDev = MoneyHelper.multiplicar(receitaDevItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); - receitaDevItem = MoneyHelper.subtrair(receitaDevItem,icmsDev); - - icms = MoneyHelper.multiplicar(receitaSeguroObrigatorioItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); - receitaSeguroObrigatorioItem = MoneyHelper.subtrair(receitaSeguroObrigatorioItem, icms); - - icmsDev = MoneyHelper.multiplicar(receitaSeguroObrigatorioDevItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); - receitaSeguroObrigatorioDevItem = MoneyHelper.subtrair(receitaSeguroObrigatorioDevItem,icmsDev); - - } - - BigDecimal bpr = BigDecimal.ZERO; - BigDecimal tmpComissaoSeguroObrigatorio = BigDecimal.ZERO; - // Boletos impressos no punto venta - if (isEntregaPassagem) { - contImpressa++; - gapImpressa = MoneyHelper.somar(gapImpressa, receitaItem, receitaSeguroObrigatorioItem); - - BigDecimal receitaTotalPassagem = MoneyHelper.somar(receitaItem, receitaSeguroObrigatorioItem); - - BigDecimal entregaPassagem = calculoEntregaPassagem(isAltaTemporada, ptovtaComissao, receitaTotalPassagem, BigDecimal.ZERO, 1); - comissaoEntregaPassagem = MoneyHelper.somar(comissaoEntregaPassagem, entregaPassagem, 4); - - sTextoLog.append("[RECEITA_IMPRESSAO_IMP_POS: ") - .append(receitaTotalPassagem) - .append("] ") - .append("[COMISSAO_IMPRESSAO_IMP_POS: ") - .append(comissaoEntregaPassagem) - .append("] "); - - } else { - - // Receita GAP - if (rcc.getTipoVenta().equals(Constantes.TPV_BOLETO_REMOTO.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_CALL_CENTER.intValue())) { - receitaGAP = MoneyHelper.somar(receitaGAP, receitaItem); - receitaGAP = MoneyHelper.somar(receitaGAP, receitaSeguroObrigatorioItem); - - bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, BigDecimal.ZERO, receitaItem, rcc.isBilheteGap(), comissaoLog); - - } - // Internet - else if (rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { - internet = MoneyHelper.somar(internet, receitaItem); - internet = MoneyHelper.somar(internet, receitaSeguroObrigatorioItem); - - bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, BigDecimal.ZERO, receitaItem, rcc.isBilheteGap(), comissaoLog); - - } - - // Receita BPR - else { - receitaBPR = MoneyHelper.somar(receitaBPR, receitaItem); - receitaSeguroObrigatorio = MoneyHelper.somar(receitaSeguroObrigatorio, receitaSeguroObrigatorioItem); - - bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaItem, BigDecimal.ZERO, rcc.isBilheteGap(), comissaoLog); - - } - - tmpComissaoSeguroObrigatorio = calculoSeguroObrigatorio(isAltaTemporada, ptovtaComissao, receitaSeguroObrigatorioItem); - comissaoSeguroObrigatorio = MoneyHelper.somar(comissaoSeguroObrigatorio, tmpComissaoSeguroObrigatorio, 4); - - comissaoBPR = MoneyHelper.somar(comissaoBPR, bpr, 4); - - if(!isSaidaCaixa) { - BigDecimal valorBase = MoneyHelper.somar(receitaItem, receitaSeguroObrigatorioItem); - BigDecimal valorComissao = MoneyHelper.somar(bpr, tmpComissaoSeguroObrigatorio); - - comissaoLog.setValorBase(valorBase); - comissaoLog.setValorComissao(valorComissao); - - sTextoLog.append("[RECEITA_ITEM: ") - .append(receitaItem) - .append("] ") - .append("[COMISSAO_BPR: ") - .append(bpr) - .append("] ") - .append("[COMISSAO_BPR_ATUAL: ") - .append(comissaoBPR) - .append("] ") - .append("[RECEITA_SEGURO_OBRIGATORIO: ") - .append(receitaSeguroObrigatorioItem) - .append("] ") - .append("[COMISSAO_SEGURO_OBRIGATORIO: ") - .append(tmpComissaoSeguroObrigatorio) - .append("] ") - .append("[COMISSAO_SEGURO_OBRIGATORIO_ATUAL: ") - .append(comissaoSeguroObrigatorio) - .append("] "); - } - } - - if (isSaidaCaixa) { - receitaSeguroObrigatorio = MoneyHelper.somar( receitaSeguroObrigatorio , receitaSeguroObrigatorioDevItem.negate(), 4 ); - // devolução Receita - if (isBilheteDevolucao(rcc, isDevolucaoComissaoTransferenciaGeraCaja)) { - - // devolução Receita GAP - if (rcc.getTipoVenta().equals(Constantes.TPV_BOLETO_REMOTO.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_CALL_CENTER.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { - - // Impresso Venta de otro punto venta - if (!rcc.getPtoVtaOrigem()) { - devolvidosGAPOrigem = MoneyHelper.somar(devolvidosGAPOrigem, receitaDevItem); - //devolvidosGAPOrigem = MoneyHelper.somar(devolvidosGAPOrigem, receitaSeguroObrigatorioDevItem); - } - - /* - * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, - * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde - * foi feita a operação esteja desmarcado - * Mantis #11015 - */ - if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { - devolvidosGAP = MoneyHelper.somar(devolvidosGAP, receitaDevItem); - //devolvidosGAP = MoneyHelper.somar(devolvidosGAP, receitaSeguroObrigatorioDevItem); - } - - } else { - // Impresso Venta de otro punto venta - if (!rcc.getPtoVtaOrigem()) { - devolvidosOrigem = MoneyHelper.somar(devolvidosOrigem, receitaDevItem); - //devolvidosOrigem = MoneyHelper.somar(devolvidosOrigem, receitaSeguroObrigatorioDevItem); - } - - /* - * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, - * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde - * foi feita a operação esteja desmarcado - * Mantis #11015 - */ - if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { - devolvidos = MoneyHelper.somar(devolvidos, receitaDevItem); - //devolvidos = MoneyHelper.somar(devolvidos, receitaSeguroObrigatorioDevItem); - } - } - - } - - // Cancelamento Receita - else { - // Cancelamento Receita GAP - if (rcc.getTipoVenta().equals(Constantes.TPV_BOLETO_REMOTO.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_CALL_CENTER.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { - if (!rcc.getPtoVtaOrigem()) { - canceladosGAPOrigem = MoneyHelper.somar(canceladosGAPOrigem, receitaDevItem); - //canceladosGAPOrigem = MoneyHelper.somar(canceladosGAPOrigem, receitaSeguroObrigatorioDevItem); - } - - /* - * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, - * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde - * foi feita a operação esteja desmarcado - * Mantis #11015 - */ - if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { - canceladosGAP = MoneyHelper.somar(canceladosGAP, receitaDevItem); - //canceladosGAP = MoneyHelper.somar(canceladosGAP, receitaSeguroObrigatorioDevItem); - } - } else { - if (!rcc.getPtoVtaOrigem()) { - canceladosOrigem = MoneyHelper.somar(canceladosOrigem, receitaDevItem); - //canceladosOrigem = MoneyHelper.somar(canceladosOrigem, receitaSeguroObrigatorioDevItem); - } - - /* - * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, - * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde - * foi feita a operação esteja desmarcado - * Mantis #11015 - */ - if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { - cancelados = MoneyHelper.somar(cancelados, receitaDevItem); - //cancelados = MoneyHelper.somar(cancelados, receitaSeguroObrigatorioDevItem); - } - } - } - - /* - * Calcula a comissão caso o bilhete seja do proprio ponto de venda, - * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde - * foi feita a operação esteja desmarcado - * Mantis #11015 - */ - if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { - bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaDevItem, BigDecimal.ZERO, rcc.isBilheteGap(), comissaoLog); - - tmpComissaoSeguroObrigatorio = calculoSeguroObrigatorio(isAltaTemporada, ptovtaComissao, receitaSeguroObrigatorioDevItem); - comissaoSeguroObrigatorio = MoneyHelper.somar(comissaoSeguroObrigatorio, tmpComissaoSeguroObrigatorio.negate(), 4); - - //bpr = MoneyHelper.somar(bpr, tmpComissaoSeguroObrigatorio, 4); - - comissaoBPR = MoneyHelper.somar(comissaoBPR, bpr.negate(), 4); - - BigDecimal valorBase = MoneyHelper.somar(receitaDevItem.negate(), receitaSeguroObrigatorioDevItem.negate()); - BigDecimal valorComissao = MoneyHelper.somar(bpr.negate(), tmpComissaoSeguroObrigatorio.negate()); - - comissaoLog.setValorBase(valorBase); - comissaoLog.setValorComissao(valorComissao); - - sTextoLog.append("[RECEITA_DEV_ITEM: ") - .append(receitaDevItem.negate()) - .append("] ") - .append("[COMISSAO_BPR_DEV: ") - .append(bpr.negate()) - .append("] ") - .append("[COMISSAO_BPR_ATUAL: ") - .append(comissaoBPR) - .append("] ") - .append("[RECEITA_SEGURO_OBRIGATORIO_DEV: ") - .append(receitaSeguroObrigatorioDevItem.negate()) - .append("] ") - .append("[COMISSAO_SEGURO_OBRIGATORIO_DEV: ") - .append(tmpComissaoSeguroObrigatorio.negate()) - .append("] ") - .append("[COMISSAO_SEGURO_OBRIGATORIO_ATUAL: ") - .append(comissaoSeguroObrigatorio) - .append("] "); - } - } - - comissaoLog.setTexto(sTextoLog.toString()); - cr.getLsComissaoLog().add(comissaoLog); - - /* - log.info("---------"); - log.info("CajaId=" + rcc.getCajaId() + ", numFolioSistema=" + rcc.getNumFolioSistema() + ", nombpasajero=" + rcc.getNombpasajero() + ", indstatusboleto=" + rcc.getIndstatusboleto() + ", motivocancelacionId=" + rcc.getMotivoCancelacionId() + ", PuntoventaId=" + rcc.getPuntoVentaId() + ", PtovtaventaId=" + rcc.getPtovtaventaId()); - log.info("Total Bilhete: " + rcc.getTotal()); - log.info("PtoVtaOrigem: " + rcc.getPtoVtaOrigem()); - log.info("Status: " + rcc.getIndstatusboleto()); - log.info("receitaItem: " + receitaItem); - log.info("receitaDevItem: " + receitaDevItem); - log.info("receitaSeguroObrigatorioItem: " + receitaSeguroObrigatorioItem); - log.info("receitaSeguroObrigatorioDevItem: " + receitaSeguroObrigatorioDevItem); - log.info("comissaoBPRItem: " + bpr); - log.info("receitaGAP: " + receitaGAP); - log.info("receitaBPR: " + receitaBPR); - log.info("ComissaoBPR: " + comissaoBPR); - log.info("comissaoSeguroObrigatorio: " + comissaoSeguroObrigatorio); - log.info("cancelados: " + cancelados); - log.info("canceladosOrigem: " + canceladosOrigem); - log.info("devolvidos: " + devolvidos); - log.info("devolvidosOrigem: " + devolvidosOrigem); - log.info("canceladosGAP: " + canceladosGAP); - log.info("canceladosGAPOrigem: " + canceladosGAPOrigem); - log.info("devolvidosGAP: " + devolvidosGAP); - log.info("devolvidosGAPOrigem: " + devolvidosGAPOrigem); - */ - } - - /* Calculando comissão para os eventos extras */ - List listEventosFinanceiros = verificaEventoFinanceiroProDia(eventosFinanceirosVOs, dataRegistro); - for (EventosFinanceirosVO eventosFinanceiros : listEventosFinanceiros) { - ComissaoLogVO comissaoLog = new ComissaoLogVO(); - comissaoLog.setFeccorte(dataRegistro); - comissaoLog.setCajadiversosId(eventosFinanceiros.getCajaDiversosId()); - comissaoLog.setEmpresaId(empresaId); - comissaoLog.setPuntoventaId(ptovtaComissao.getPuntoventaId().getPuntoventaId()); - comissaoLog.setTurnoId(eventosFinanceiros.getTurnoId()); - comissaoLog.setUsuarioId(eventosFinanceiros.getUsuarioId()); - comissaoLog.setOrigem("ADM"); - - boolean isAltaTemporada = validaAltaTemporada(impostos, mes, eventosFinanceiros.getEstadoId()); - - if(TipoEventoExtra.EXCESSO_BAGAGEM.toString().equals(eventosFinanceiros.getCvetipoevento())) { - receitaExcessoBagagem = MoneyHelper.somar(receitaExcessoBagagem, eventosFinanceiros.getImpingreso()); - BigDecimal excessoBagagem = calculoExcessoBagagem(isAltaTemporada, ptovtaComissao, eventosFinanceiros.getImpingreso(), comissaoLog); - comissaoExcessoBagagem = MoneyHelper.somar(comissaoExcessoBagagem, excessoBagagem, 4); - - adicionarTextoComissaoLog(comissaoLog, TipoEventoExtra.EXCESSO_BAGAGEM.toString(), receitaExcessoBagagem, excessoBagagem); - } else if(TipoEventoExtra.SEGURO_OPCIONAL.toString().equals(eventosFinanceiros.getCvetipoevento())) { - receitaSeguroOpcional = MoneyHelper.somar(receitaSeguroOpcional, eventosFinanceiros.getImpingreso()); - BigDecimal segOpcional = calculoSeguroOpcional(isAltaTemporada, ptovtaComissao, eventosFinanceiros.getImpingreso(), comissaoLog); - comissaoSegOpcional = MoneyHelper.somar(comissaoSegOpcional, segOpcional, 4); - - adicionarTextoComissaoLog(comissaoLog, TipoEventoExtra.SEGURO_OPCIONAL.toString(), receitaSeguroOpcional, segOpcional); - } else { - receitaSeguroOutros = MoneyHelper.somar(receitaSeguroOutros, eventosFinanceiros.getImpingreso()); - BigDecimal outros = calculoOutros(isAltaTemporada, ptovtaComissao, eventosFinanceiros.getImpingreso(), comissaoLog); - comissaoOutros = MoneyHelper.somar(comissaoOutros, outros, 4); - - adicionarTextoComissaoLog(comissaoLog, "OUTROS", receitaSeguroOutros, outros); - } - - cr.getLsComissaoLog().add(comissaoLog); - } - - cr.setCancelados(cancelados); - cr.setCanceladosGAP(canceladosGAP); - cr.setDevolvidos(devolvidos); - cr.setDevolvidosGAP(devolvidosGAP); - cr.setDevolucoesOrigem(devolvidosOrigem); - cr.setDevolucoesOrigemGAP(devolvidosGAPOrigem); - - cr.setReceitaBPR(receitaBPR); - cr.setReceitaSeguro(receitaSeguroObrigatorio); - cr.setReceitaExcessoBagagem(receitaExcessoBagagem); - cr.setReceitaGAP(receitaGAP); - cr.setReceitaSeguroOpcional(receitaSeguroOpcional); - cr.setReceitaSeguroOutros(receitaSeguroOutros); - cr.setInternet(internet); - - cr.setGapImpressa(gapImpressa); - cr.setContImpressa(contImpressa); - - // Receita comissão = Receita BPR + Receita GAP + Internet - Cancelados - Cancelados GAP - Devoluções - Devoluções GAP - receitaComissao = MoneyHelper.somar(receitaComissao,receitaBPR); - receitaComissao = MoneyHelper.somar(receitaComissao,receitaGAP); - receitaComissao = MoneyHelper.somar(receitaComissao,internet); - - receitaComissao = MoneyHelper.subtrair(receitaComissao,cancelados); - receitaComissao = MoneyHelper.subtrair(receitaComissao,devolvidos); - receitaComissao = MoneyHelper.subtrair(receitaComissao,devolvidosGAP); - receitaComissao = MoneyHelper.subtrair(receitaComissao,canceladosGAP); - - cr.setReceitaComissao(receitaComissao); - - cr.setComissaoBPRDiaria(comissaoBPR); - cr.setComissaoEntregaPassagemDiaria(comissaoEntregaPassagem); - cr.setComissaoExcessoBagagemDiaria(comissaoExcessoBagagem); - cr.setComissaoSegOpcionalDiaria(comissaoSegOpcional); - cr.setComissaoOutrosDiaria(comissaoOutros); - cr.setComissaoSeguroObrigatorioDiaria(comissaoSeguroObrigatorio); - - receitas.add(cr); - } - - return receitas; - - } - - private void adicionarTextoComissaoLog(ComissaoLogVO comissaoLog, String campo, BigDecimal receitaComissao, BigDecimal comissao) { - comissaoLog.setValorBase(receitaComissao); - comissaoLog.setValorComissao(comissao); - - StringBuilder sTexto = new StringBuilder(); - sTexto.append("[CAJADIVERSOS_ID: ") - .append(comissaoLog.getCajadiversosId()) - .append(": ") - .append("[RECEITA_") - .append(campo) - .append(": ") - .append(receitaComissao) - .append("] [COMISSAO_") - .append(campo) - .append(": ") - .append(comissao) - .append("]"); - - comissaoLog.setTexto(sTexto.toString()); - } - - private boolean isBilheteDevolucao(BoletoComissao rcc, boolean isDevolucaoComissaoTransferenciaGeraCaja) { - return rcc.isMotivocancelacionDevolvido() || - rcc.isMotivocancelacionGeracaoOcd() || - rcc.isMotivocancelacionTrocado() || - rcc.isMotivocancelacionQuitacaoOcd() || - (rcc.isMotivocancelacionTransferido() && !rcc.getIndreimpresion() && isDevolucaoComissaoTransferenciaGeraCaja); - } - - /** - * Verifica se o bilhete possui forma de pagamento Orden de serviço - * Mantis #12391 - * @param rcc - * @return - */ - private boolean isBilheteOrdemServico(BoletoComissao rcc) { - for (FormapagoVO formapago : rcc.getFormapagos()) { - if(formapago.getFormapagoId() == Constantes.FORMA_PAGO_ORDEN_SERVICIO.intValue()) { - return true; - } - } - return false; - } - - private List verificaEventoFinanceiroProDia(List eventosFinanceirosVOs, Date dataRegistro) { - List aux = new ArrayList(); - if(eventosFinanceirosVOs != null) { - for (EventosFinanceirosVO rcc : eventosFinanceirosVOs) { - if(rcc.getFeccorte() != null) { - if (DateUtil.compareOnlyDate(rcc.getFeccorte(), dataRegistro) == 0) { - aux.add(rcc); - } - } - } - } - return aux; - } - - private List verificaCalculoComissaoProDia(List list, Date dataRegistro) { - List aux = new ArrayList(); - for (BoletoComissao rcc : list) { - if (DateUtil.compareOnlyDate(rcc.getFeccorte(), dataRegistro) == 0) { - aux.add(rcc); - } - } - return aux; - } - - @Override - public List relatorioCalculoComissao(Integer empresaId, Date competencia, Date dataInicial, Date dataFinal, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { - List registrosCalculo = new ArrayList(); - List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); - Empresa empresa = empresaService.obtenerID(empresaId); - boolean indExibeComissaoZeradaAgencia = empresa.getIndExibeComissaoZeradaAgencia() != null ? empresa.getIndExibeComissaoZeradaAgencia() : false; - for (PuntoVenta puntoVenta : puntoventas) { - RegistroCalculo registroCalculo = null; - if(competencia != null) { - registroCalculo = relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresaId, competencia, usuarioId, isRetencaoDiaria, isRefazerCalculo); - } else if(dataInicial != null && dataFinal != null) { - registroCalculo = relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresaId, usuarioId, isRetencaoDiaria, isRefazerCalculo, dataInicial, dataFinal); - } - - if(registroCalculo == null) { - continue; - } - - /* - * Caso parametro de não exibir as agencias com comissão zerada esteja ativado - * o registro de calculo não deverá ser adicionado - * Mantis #12260 - */ - totalizarRegistroCalculo(registroCalculo, indExibeComissaoZeradaAgencia); - if(registroCalculo.getLsReceitas() != null && !registroCalculo.getLsReceitas().isEmpty()) { - registrosCalculo.add(registroCalculo); - } - } - ordernarResultado(registrosCalculo); - return registrosCalculo; - } - - private void ordernarResultado(List registrosCalculo) { - Collections.sort(registrosCalculo, new Comparator() { - @Override - public int compare(RegistroCalculo o1, RegistroCalculo o2) { - return o1.getNombpuntoventa().compareToIgnoreCase(o2.getNombpuntoventa()); - } - }); - } - - private void totalizarRegistroCalculo(RegistroCalculo registroCalculo, boolean indExibeComissaoZeradaAgencia) { - ComissaoReceita comissaoReceitaTotal = new ComissaoReceita(); - for (ComissaoReceita comissaoReceita : registroCalculo.getLsReceitas()) { - comissaoReceitaTotal.setNumPuntoVenta(registroCalculo.getNumPuntoVenta()); - comissaoReceitaTotal.setNombpuntoventa(registroCalculo.getNombpuntoventa()); - comissaoReceitaTotal.setReceitaComissao(comissaoReceitaTotal.getReceitaComissao().add(comissaoReceita.getReceitaComissao())); - comissaoReceitaTotal.setReceitaBPR(comissaoReceitaTotal.getReceitaBPR().add(comissaoReceita.getReceitaBPR())); - comissaoReceitaTotal.setReceitaGAP(comissaoReceitaTotal.getReceitaGAP().add(comissaoReceita.getReceitaGAP())); - comissaoReceitaTotal.setGapImpressa(comissaoReceitaTotal.getGapImpressa().add(comissaoReceita.getGapImpressa())); - comissaoReceitaTotal.setInternet(comissaoReceitaTotal.getInternet().add(comissaoReceita.getInternet())); - comissaoReceitaTotal.setCancelados(comissaoReceitaTotal.getCancelados().add(comissaoReceita.getCancelados())); - comissaoReceitaTotal.setCanceladosGAP(comissaoReceitaTotal.getCanceladosGAP().add(comissaoReceita.getCanceladosGAP())); - comissaoReceitaTotal.setDevolvidos(comissaoReceitaTotal.getDevolvidos().add(comissaoReceita.getDevolvidos())); - comissaoReceitaTotal.setDevolvidosGAP(comissaoReceitaTotal.getDevolvidosGAP().add(comissaoReceita.getDevolvidosGAP())); - comissaoReceitaTotal.setDevolucoesOrigem(comissaoReceitaTotal.getDevolucoesOrigem().add(comissaoReceita.getDevolucoesOrigem())); - comissaoReceitaTotal.setDevolucoesOrigemGAP(comissaoReceitaTotal.getDevolucoesOrigemGAP().add(comissaoReceita.getDevolucoesOrigemGAP())); - comissaoReceitaTotal.setReceitaExcessoBagagem(comissaoReceitaTotal.getReceitaExcessoBagagem().add(comissaoReceita.getReceitaExcessoBagagem())); - comissaoReceitaTotal.setReceitaSeguroOpcional(comissaoReceitaTotal.getReceitaSeguroOpcional().add(comissaoReceita.getReceitaSeguroOpcional())); - comissaoReceitaTotal.setReceitaSeguroOutros(comissaoReceitaTotal.getReceitaSeguroOutros().add(comissaoReceita.getReceitaSeguroOutros())); - comissaoReceitaTotal.setContImpressa(comissaoReceitaTotal.getContImpressa() + comissaoReceita.getContImpressa()); - comissaoReceitaTotal.setComissaoBPRDiaria(comissaoReceitaTotal.getComissaoBPRDiaria().add(comissaoReceita.getComissaoBPRDiaria())); - comissaoReceitaTotal.setComissaoExcessoBagagemDiaria(comissaoReceitaTotal.getComissaoExcessoBagagemDiaria().add(comissaoReceita.getComissaoExcessoBagagemDiaria())); - comissaoReceitaTotal.setComissaoSegOpcionalDiaria(comissaoReceitaTotal.getComissaoSegOpcionalDiaria().add(comissaoReceita.getComissaoSegOpcionalDiaria())); - comissaoReceitaTotal.setComissaoEntregaPassagemDiaria(comissaoReceitaTotal.getComissaoEntregaPassagemDiaria().add(comissaoReceita.getComissaoEntregaPassagemDiaria())); - comissaoReceitaTotal.setComissaoOutrosDiaria(comissaoReceitaTotal.getComissaoOutrosDiaria().add(comissaoReceita.getComissaoOutrosDiaria())); - } - registroCalculo.getLsReceitas().clear(); - if(indExibeComissaoZeradaAgencia || - (MoneyHelper.isMaior(comissaoReceitaTotal.getTotal(), BigDecimal.ZERO) || MoneyHelper.isMaior(comissaoReceitaTotal.getTotalComissao(), BigDecimal.ZERO))) { - registroCalculo.getLsReceitas().add(comissaoReceitaTotal); - } - } - - @Override - public void registrarCalculoComissao(Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException { - List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresa.getEmpresaId()); - for (PuntoVenta puntoVenta : puntoventas) { - registrarCalculoComissao(puntoVenta, empresa, periodo, ignorarComissaoGerada, usuarioId, isRetencaoDiaria, isRefazerCalculo); - } - } - - @Override - public void cancelarCalculoComissao(Integer empresaId, Date periodo) throws ComissaoException, BusinessException { - try { - List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); - for (PuntoVenta puntoVenta : puntoventas) { - try { - cancelarCalculoComissao(puntoVenta.getPuntoventaId(), empresaId, periodo); - } catch (ComissaoException e) { - /* Ignora a comissa quando o cancelamento é feito para todas as agencias */ - } catch (Exception e) { - throw e; - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, String competencia) throws ComissaoException { - try { - Map parametros = new HashMap(); - if(StringUtils.isNotBlank(competencia)) { - parametros.put("competenciaInicial", competencia); - parametros.put("competenciaFinal", competencia); - } - if(puntoVentaId != null && puntoVentaId > -1) { - parametros.put("puntoventaId", puntoVentaId); - } - if(empresaId != null) { - parametros.put("empresaId", empresaId); - } - - return comissaoDAO.buscaHistoricoComissao(parametros); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ComissaoException(e.getMessage(), e); - } - } - - @Override - public boolean enviarEmailReciboComissao(HistoricoComissao historicoComissao, byte[] recibo) { - try { - EmailConfigVO emailConfig = carregarConfiguracoesEmail(historicoComissao); - - if(emailConfig != null && StringUtils.isNotBlank(historicoComissao.getDescCorreo())) { - SendMail mail = new SendMail(); - mail.setEmailTo(historicoComissao.getDescCorreo()); - mail.setEmailFrom(emailConfig.getSmtpEmail()); - mail.setSmtpHost(emailConfig.getSmtp()); - mail.setSmtpPassword(emailConfig.getSenha()); - mail.setSmtpPort(emailConfig.getSmtpPorta()); - mail.setSmtpUser(emailConfig.getSmtpEmail()); - mail.setAuth(emailConfig.isAutenticacao()); - - if (StringUtils.isNotEmpty(emailConfig.getTipoAutorizacao())) { - mail.setAuthType(AuthType.valueOf(emailConfig.getTipoAutorizacao())); - } - - String assunto = null; - String texto = null; - String nomeArquivo = null; - if(StringUtils.isNotBlank(historicoComissao.getCompetencia())) { - assunto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.assunto", new String[] {Labels.getLabel("busquedaImportacionFiscalController.lbCompetencia.label"), historicoComissao.getCompetencia()}); - texto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.texto", new String[] {Labels.getLabel("busquedaImportacionFiscalController.lbCompetencia.label"), historicoComissao.getCompetencia()}); - nomeArquivo = historicoComissao.getCompetencia(); - } else if(historicoComissao.getDataInicial() != null && historicoComissao.getDataFinal() != null){ - StringBuilder sDatas = new StringBuilder(); - sDatas.append(DateUtil.getStringDate(historicoComissao.getDataInicial(), "dd/MM/yyyy")) - .append(" ") - .append(Labels.getLabel("lb.ate")) - .append(" ") - .append(DateUtil.getStringDate(historicoComissao.getDataFinal(), "dd/MM/yyyy")); - assunto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.assunto", new String[] {"Periodo", sDatas.toString()}); - texto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.texto", new String[] {"Periodo", sDatas.toString()}); - nomeArquivo = sDatas.toString().replaceAll(" ", "_"); - } - - mail.setSubject(assunto); - mail.setText(texto); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(recibo.length); - baos.write(recibo, 0, recibo.length); - - - mail.addAnexo(Labels.getLabel("busquedaCalculoComissaoController.recibo.email.nomeAnexo", new String[] {nomeArquivo}).concat(".pdf"), baos, MimeType.PDF); - mail.send(); - - return true; - } - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return false; - } - - private EmailConfigVO carregarConfiguracoesEmail(HistoricoComissao historicoComissao) { - EmailConfigVO emailConfigVO = carregarConstantesEmail(); - if(emailConfigVO == null && historicoComissao.getEmpresaId() != null) { - EmpresaEmailConfig empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(new Empresa(historicoComissao.getEmpresaId())); - if(empresaEmailConfig != null) { - emailConfigVO = new EmailConfigVO(); - emailConfigVO.setAutenticacao(BooleanUtils.toBoolean(empresaEmailConfig.getIndAutenticacao())); - emailConfigVO.setSenha(empresaEmailConfig.getSenha()); - emailConfigVO.setSmtp(empresaEmailConfig.getSmtp()); - emailConfigVO.setSmtpEmail(empresaEmailConfig.getSmtpEmail()); - emailConfigVO.setSmtpUser(empresaEmailConfig.getSmtpEmail()); - emailConfigVO.setSmtpPorta(empresaEmailConfig.getSmtpPorta()); - if (emailConfigVO.getTipoAutorizacao() != null) { - emailConfigVO.setTipoAutorizacao(empresaEmailConfig.getTipoAutorizacao()); - } - } - } - return emailConfigVO; - } - - private EmailConfigVO carregarConstantesEmail() { - EmailConfigVO emailConfigVO = new EmailConfigVO(); - Constante constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_EMAIL); - if(constante == null) { - return null; - } - emailConfigVO.setSmtpEmail(constante.getValorconstante()); - - constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_HOST); - if(constante == null) { - return null; - } - emailConfigVO.setSmtp(constante.getValorconstante()); - - constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_AUTENTICACAO); - if(constante == null) { - return null; - } - emailConfigVO.setAutenticacao(BooleanUtils.toBoolean(constante.getValorconstante())); - - constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_PASS); - if(constante == null) { - return null; - } - emailConfigVO.setSenha(constante.getValorconstante()); - - constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_PORT); - if(constante == null) { - return null; - } - emailConfigVO.setSmtpPorta(constante.getValorconstante()); - - constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_USER); - if(constante == null) { - return null; - } - emailConfigVO.setSmtpUser(constante.getValorconstante()); - - return emailConfigVO; - } - - private Date getDate(int dia, int mes, int ano) { - Calendar cData = Calendar.getInstance(); - cData.set(Calendar.DAY_OF_MONTH, dia); - cData.set(Calendar.MONTH, mes); - cData.set(Calendar.YEAR, ano); - return DateUtil.normalizarToFecha(cData.getTime()); - } - - @Override - public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date dataInicial, Date dataFinal, Integer usuarioId) throws ComissaoException, BusinessException { - try { - Calendar cDataAtual = Calendar.getInstance(); - cDataAtual.setTime(dataInicial); - while(DateUtil.compareOnlyDate(cDataAtual.getTime(), dataFinal) <= 0) { - realizarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), cDataAtual.getTime(), true, usuarioId, true); - cDataAtual.add(Calendar.DAY_OF_MONTH, 1); - } - } catch (ComissaoException e) { - log.error(e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public void retencaoAutomaticaComissao(Date dataRetencao) { - Integer usuarioId = 1; - if (UsuarioLogado.getUsuarioLogado() != null && UsuarioLogado.getUsuarioLogado().getUsuarioId() != null) { - usuarioId = UsuarioLogado.getUsuarioLogado().getUsuarioId(); - } - - List empresas = empresaService.buscarEmpresaPtoVtaComissao(); - List puntoVentas = puntoVentaService.buscarPuntoVentaPtoVtaComissao(empresas); - - String sDataRetencao = DateUtil.getStringDate(dataRetencao, "dd/MM/yyyy"); - - for (Empresa empresa : empresas) { - for (PuntoVenta puntoVenta : puntoVentas) { - String descretencao = "Empresa: "+ empresa.getNombempresa() + " - Agencia: " + puntoVenta.getNombpuntoventa() +" data: " + sDataRetencao; - log.info("Inicio Retencao " + descretencao); - try { - registrarCalculoComissao(puntoVenta, empresa, dataRetencao, dataRetencao, usuarioId); - log.info("Fim Retencao " + descretencao); - } catch (Exception e) { - log.info("Erro retencao " + descretencao); - log.error(e.getMessage(), e); - } - } - } - - /* Atualizando controle da retencao automatica */ - try { - ctrlFechamentoCaixaService.atualizarCtrlFechamentoCaixaStatus(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_CONCLUIDA, dataRetencao); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - - @Override - public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException { - Conferencia conferencia = new Conferencia(); - conferencia.setPuntoVenta(new PuntoVenta(puntoVentaId)); - conferencia.setEmpresa(new Empresa(empresaId)); - conferencia.setDataInicial(dataInicial); - conferencia.setDataFinal(dataFinal); - - return realizarCalculoComissao(puntoVentaId, empresaId, usuarioId, isRefazerCalculo, conferencia, dataInicial, dataFinal, false); - } - - @Override - public void registrarCalculoComissaoPeriodo(PuntoVenta puntoVenta, Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException { - - try { - - if (validaPeriodo(dataInicial, dataFinal)) { - - if(isRetencaoDiaria || conferenciaComissaoService.isConferenciaCompetenciaEncerrada(dataInicial, dataFinal, empresa, puntoVenta, false)) { - Comissao comissaoCadastrada = comissaoDAO.buscaComissaoVigencia(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), dataInicial, dataFinal); - if (comissaoCadastrada == null) { - - Conferencia conferencia = new Conferencia(); - conferencia.setPuntoVenta(puntoVenta); - conferencia.setEmpresa(empresa); - conferencia.setDataInicial(dataInicial); - conferencia.setDataFinal(dataFinal); - - RegistroCalculo rc = realizarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), usuarioId, isRefazerCalculo, conferencia, dataInicial, dataFinal, isRetencaoDiaria); - - gravarComissao(puntoVenta, empresa, rc, null, dataInicial, dataFinal); - } else if(!ignorarComissaoGerada){ - StringBuilder sDatas = new StringBuilder(); - sDatas.append(DateUtil.getStringDate(comissaoCadastrada.getDataInicial(), "dd/MM/yyyy")) - .append(" ") - .append(Labels.getLabel("lb.ate")) - .append(" ") - .append(DateUtil.getStringDate(comissaoCadastrada.getDataFinal(), "dd/MM/yyyy")); - throw new ComissaoException("busquedaCalculoComissaoController.registroPeriodo.exception", null, comissaoCadastrada.getPuntoVenta().getNombpuntoventa(), sDatas.toString()); - } - } else { - StringBuilder sDatas = new StringBuilder(); - sDatas.append(DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")) - .append(" ") - .append(Labels.getLabel("lb.ate")) - .append(" ") - .append(DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); - throw new ComissaoException("busquedaCalculoComissaoController.conferenciaNaoEncerradaPeriodo.exception", null, puntoVenta.getNombpuntoventa(), sDatas.toString()); - } - } else { - throw new ComissaoException("busquedaCalculoComissaoController.periodo.exception"); - } - - } catch (ComissaoException e) { - log.error(e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ComissaoException(e.getMessage(), e); - } - } - - @Override - public void registrarCalculoComissaoPeriodo(Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException { - List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresa.getEmpresaId()); - for (PuntoVenta puntoVenta : puntoventas) { - registrarCalculoComissaoPeriodo(puntoVenta, empresa, ignorarComissaoGerada, usuarioId, isRetencaoDiaria, isRefazerCalculo, dataInicial, dataFinal); - } - } - - @Override - public void cancelarCalculoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException { - try { - Comissao comissao = comissaoDAO.buscaComissaoVigencia(puntoVentaId, empresaId, dataInicial, dataFinal); - if (comissao != null) { - comissaoService.borrar(comissao); - } else { - throw new ComissaoException("busquedaCalculoComissaoController.comissao.exception"); - } - } catch (ComissaoException e) { - log.error(e.getMessage(), e); - throw e; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public void cancelarCalculoComissaoPeriodo(Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException { - try { - List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); - for (PuntoVenta puntoVenta : puntoventas) { - try { - cancelarCalculoComissaoPeriodo(puntoVenta.getPuntoventaId(), empresaId, dataInicial, dataFinal); - } catch (ComissaoException e) { - } catch (Exception e) { - throw e; - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException { - try { - Map parametros = new HashMap(); - if(dataInicial != null) { - parametros.put("dataInicial", DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")); - } - if(dataFinal != null) { - parametros.put("dataFinal", DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); - } - if(puntoVentaId != null && puntoVentaId > -1) { - parametros.put("puntoventaId", puntoVentaId); - } - if(empresaId != null) { - parametros.put("empresaId", empresaId); - } - - return comissaoDAO.buscaHistoricoComissao(parametros); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ComissaoException(e.getMessage(), e); - } - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.ByteArrayOutputStream; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; +import com.rjconsultores.ventaboletos.dao.ComissaoDAO; +import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.Comissao; +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.DescontoComissao; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; +import com.rjconsultores.ventaboletos.entidad.EmpresaImposto; +import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; +import com.rjconsultores.ventaboletos.entidad.PtovtaComissao.Receita; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; +import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; +import com.rjconsultores.ventaboletos.enums.MimeType; +import com.rjconsultores.ventaboletos.enums.ModeloComissaoImpressaoPosterior; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.ComissaoException; +import com.rjconsultores.ventaboletos.service.CalculoComissaoService; +import com.rjconsultores.ventaboletos.service.ComissaoReceitaService; +import com.rjconsultores.ventaboletos.service.ComissaoService; +import com.rjconsultores.ventaboletos.service.ConferenciaComissaoService; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.service.CtrlFechamentoCaixaService; +import com.rjconsultores.ventaboletos.service.DescontoComissaoService; +import com.rjconsultores.ventaboletos.service.EmpresaEmailConfigService; +import com.rjconsultores.ventaboletos.service.EmpresaImpostoService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.PtovtaComissaoService; +import com.rjconsultores.ventaboletos.service.PuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.utilerias.SendMail; +import com.rjconsultores.ventaboletos.utilerias.SendMail.AuthType; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.comissao.BoletoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.ComissaoDesconto; +import com.rjconsultores.ventaboletos.vo.comissao.ComissaoDesconto.TipoDesconto; +import com.rjconsultores.ventaboletos.vo.comissao.ComissaoLogVO; +import com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita; +import com.rjconsultores.ventaboletos.vo.comissao.EmailConfigVO; +import com.rjconsultores.ventaboletos.vo.comissao.EventosFinanceirosVO; +import com.rjconsultores.ventaboletos.vo.comissao.FormapagoVO; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; +import com.rjconsultores.ventaboletos.vo.comissao.RegistroCalculo; + +@Service("calculoComissaoService") +public class CalculoComissaoServiceImpl implements CalculoComissaoService { + + private static final Logger log = LogManager.getLogger(CalculoComissaoServiceImpl.class); + private static final BigDecimal CEM = BigDecimal.TEN.multiply(BigDecimal.TEN); + + @Autowired + private PtovtaComissaoService ptovtaComissaoService; + + @Autowired + private EmpresaImpostoService empresaImpostoService; + + @Autowired + private ComissaoService comissaoService; + + @Autowired + private ComissaoDAO comissaoDAO; + + @Autowired + private ConferenciaComissaoDAO conferenciaComissaoDAO; + + @Autowired + private ConferenciaComissaoService conferenciaComissaoService; + + @Autowired + private DescontoComissaoService descontoComissaoService; + + @Autowired + private ConstanteService constanteService; + + @Autowired + private ComissaoReceitaService comissaoReceitaService; + + @Autowired + private EmpresaService empresaService; + + @Autowired + private PuntoVentaService puntoVentaService; + + @Autowired + private CtrlFechamentoCaixaService ctrlFechamentoCaixaService; + + @Autowired + private EmpresaEmailConfigService empresaEmailConfigService; + + public boolean validaCompetencia(Date periodo) { + Calendar calendario = Calendar.getInstance(); + calendario.setTime(periodo); + + int mes = calendario.get(Calendar.MONTH) + 1; + int ano = calendario.get(Calendar.YEAR); + + Calendar now = Calendar.getInstance(); + int mesNow = now.get(Calendar.MONTH) + 1; + int anoNow = now.get(Calendar.YEAR); + + if (anoNow == ano) { + if (mesNow > mes) { + return true; + } + + } else if (anoNow > ano) { + return true; + } + + return false; + } + + public boolean validaPeriodo(Date dataInicial, Date dataFinal) { + Calendar cal = Calendar.getInstance(); + cal.setTime(dataInicial); + int monthInicial = cal.get(Calendar.MONTH); + int yearInicial = cal.get(Calendar.YEAR); + + cal.setTime(dataFinal); + int monthFinal = cal.get(Calendar.MONTH); + int yearFinal = cal.get(Calendar.YEAR); + + if(monthInicial != monthFinal || yearFinal != yearInicial){ + return false; + } + + return true; + } + + @Override + public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException { + + try { + + if (validaCompetencia(periodo)) { + + String competencia = DateUtil.getStringDate(periodo, "MM/yyyy"); + + if(isRetencaoDiaria || conferenciaComissaoService.isConferenciaCompetenciaEncerrada(competencia, empresa, puntoVenta, false)) { + Comissao comissaoCadastrada = comissaoDAO.buscaComissaoVigencia(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), competencia); + if (comissaoCadastrada == null) { + + RegistroCalculo rc = realizarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo, isRetencaoDiaria, usuarioId, isRefazerCalculo); + + gravarComissao(puntoVenta, empresa, rc, competencia, null, null); + } else if(!ignorarComissaoGerada){ + throw new ComissaoException("busquedaCalculoComissaoController.registro.exception", null, comissaoCadastrada.getPuntoVenta().getNombpuntoventa()); + } + } else { + throw new ComissaoException("busquedaCalculoComissaoController.conferenciaNaoEncerrada.exception", null, puntoVenta.getNombpuntoventa()); + } + } else { + throw new ComissaoException("busquedaCalculoComissaoController.competencia.exception"); + } + + } catch (ComissaoException e) { + log.error(e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ComissaoException(e.getMessage(), e); + } + } + + /** + * Grava a comissao gerada + * @param puntoVenta + * @param empresa + * @param registroCalculo + * @param competencia + * @throws ComissaoException + */ + private void gravarComissao(PuntoVenta puntoVenta, Empresa empresa, RegistroCalculo registroCalculo, String competencia, Date dataInicial, Date dataFinal) throws ComissaoException { + try { + Comissao comissao = new Comissao(); + + if(StringUtils.isNotBlank(competencia)) { + comissao.setCompetencia(competencia); + } else if(dataInicial != null && dataFinal != null){ + comissao.setDataInicial(dataInicial); + comissao.setDataFinal(dataFinal); + } + + comissao.setEmpresaId(empresa.getEmpresaId()); + comissao.setPuntoVenta(puntoVenta); + comissao.setBonificacaoMetas(registroCalculo.getComissaoBonificaoMetas()); + comissao.setComissaoBpr(registroCalculo.getComissaoBPR()); + comissao.setEntregasPassagem(registroCalculo.getComissaoEntregaPassagem()); + comissao.setReceitaExcessobagagem(registroCalculo.getComissaoExcessoBagagem()); + comissao.setReceitaSeguroopcional(registroCalculo.getComissaoSegOpcional()); + comissao.setReceitaSeguro(registroCalculo.getComissaoSeguro()); + comissao.setReceitaOutros(registroCalculo.getComissaoOutros()); + comissao.setRoyaties(registroCalculo.getRoyaties()); + comissao.setIssRetido(registroCalculo.getRetidoISS()); + + comissao.setIndPago(false); + comissao.setUsuarioPagamentoId(null); + comissao.setDataPagamento(null); + comissao.setDescontosEventuais(BigDecimal.ZERO); + comissao.setDescontosFixos(BigDecimal.ZERO); + + for (ComissaoDesconto cd : registroCalculo.getLsDescontos()) { + if (cd.getTipo().equals(TipoDesconto.EVENTUAL)) { + comissao.setDescontosEventuais(MoneyHelper.somar(comissao.getDescontosEventuais(), cd.getValorDesconto())); + } else if (cd.getTipo().equals(TipoDesconto.FIXO)) { + comissao.setDescontosFixos(MoneyHelper.somar(comissao.getDescontosFixos(), cd.getValorDesconto())); + } + } + + for (ComissaoReceita comissaoReceita : registroCalculo.getLsReceitas()) { + comissao.setReceitaBPR(MoneyHelper.somar(comissao.getReceitaBPR(), comissaoReceita.getReceitaBPR(), 2)); + comissao.setReceitaGAP(MoneyHelper.somar(comissao.getReceitaGAP(), comissaoReceita.getReceitaGAP(), 2)); + comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getDevolvidosRelatorio(), 2)); + comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getDevolvidosGAPRelatorio(), 2)); + comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getCancelados(), 2)); + comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getCanceladosGAP(), 2)); + comissao.setDevolvidos(MoneyHelper.somar(comissao.getDevolvidos(), comissaoReceita.getCanceladosGAP(), 2)); + comissao.setReceitaBrutaExcessoBagagem(MoneyHelper.somar(comissao.getReceitaBrutaExcessoBagagem(), comissaoReceita.getReceitaExcessoBagagem(), 2)); + comissao.setReceitaBrutaSeguroopcional(MoneyHelper.somar(comissao.getReceitaBrutaSeguroopcional(), comissaoReceita.getReceitaSeguroOpcional(), 2)); + comissao.setReceitaBrutaSeguro(MoneyHelper.somar(comissao.getReceitaBrutaSeguro(), comissaoReceita.getReceitaSeguro(), 2)); + } + + comissao = comissaoService.suscribir(comissao); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ComissaoException(e.getMessage(), e); + } + } + + @Override + public void cancelarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo) throws ComissaoException, BusinessException { + try { + String competencia = DateUtil.getStringDate(periodo, "MM/yyyy"); + Comissao comissao = comissaoDAO.buscaComissaoVigencia(puntoVentaId, empresaId, competencia); + if (comissao != null) { + comissaoService.borrar(comissao); + } else { + throw new ComissaoException("busquedaCalculoComissaoController.comissao.exception"); + } + } catch (ComissaoException e) { + log.error(e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { + return realizarCalculoComissao(puntoVentaId, empresaId, periodo, isRetencaoDiaria, usuarioId, isRefazerCalculo); + } + + private BigDecimal calculoComisssaoBPR(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal bpr, BigDecimal gap, boolean isBilheteGap, ComissaoLogVO comissaoLog) { + + // comissão BPR = Receita comissão * (% Com BPR) + BigDecimal recbpr = BigDecimal.ZERO; + BigDecimal receitaBPR = MoneyHelper.somar(bpr, gap, 2); + + BigDecimal percentualComissao = BigDecimal.ZERO; + if (isAltaTemporada) { + percentualComissao = ptovtaComissao.getPassagemAlta() != null ? ptovtaComissao.getPassagemAlta() : BigDecimal.ZERO; + } else { + percentualComissao = ptovtaComissao.getPassagemBaixa() != null ? ptovtaComissao.getPassagemBaixa() : BigDecimal.ZERO; + } + + log.info(String.format(":: Percentual comissão: %s ::", percentualComissao)); + + if(isBilheteGap && ModeloComissaoImpressaoPosterior.COMPARTILHADA.equals(ptovtaComissao.getModeloComissaoImpressaoPosterior())) { + if (isAltaTemporada) { + percentualComissao = ptovtaComissao.getValorVendaGapCompAlta() != null ? ptovtaComissao.getValorVendaGapCompAlta() : BigDecimal.ZERO; + } else { + percentualComissao = ptovtaComissao.getValorVendaGapComp() != null ? ptovtaComissao.getValorVendaGapComp() : BigDecimal.ZERO; + } + log.info(String.format(":: Comissao Compartilhada Configurada para Bilhetes Imp. Post. - Percentual comissão Alterado para: %s ::", percentualComissao)); + } + + comissaoLog.setPorcComissao(percentualComissao); + + recbpr = MoneyHelper.multiplicar(receitaBPR, MoneyHelper.dividir(percentualComissao,CEM,4), 4); + + return recbpr; + } + + private BigDecimal calculoEntregaPassagem(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal gapImpressa, BigDecimal internet, int contImpressa) { + + // EntregaPassagem (Internet/Venda impressão Posterior/Outros) + BigDecimal entregaPassagem = BigDecimal.ZERO; + BigDecimal receitaEntrega = MoneyHelper.somar(gapImpressa, internet, 2); + + log.info(String.format(":: Modelo Comissao Configurado Para Entrega Passagem: %s ::", ptovtaComissao.getModeloComissaoImpressaoPosterior())); + if(ModeloComissaoImpressaoPosterior.PADRAO.equals(ptovtaComissao.getModeloComissaoImpressaoPosterior())) { + if(isAltaTemporada) { + if(ptovtaComissao.getValorImpressaoGapAlta() != null) { + if (BooleanUtils.toBoolean(ptovtaComissao.getIndimpressaogapporc())) { + entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpressaoGapAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpressaoGapAlta(),CEM,4) : BigDecimal.ZERO, 4); + } else { + entregaPassagem = ptovtaComissao.getValorImpressaoGapAlta() != null ? MoneyHelper.multiplicar(ptovtaComissao.getValorImpressaoGapAlta(),new BigDecimal(contImpressa), 2) : BigDecimal.ZERO; + } + } + } else { + if(ptovtaComissao.getValorImpressaoGap() != null) { + if (BooleanUtils.toBoolean(ptovtaComissao.getIndimpressaogapporc())) { + entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpressaoGap() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpressaoGap(),CEM,4) : BigDecimal.ZERO, 4); + } else { + entregaPassagem = ptovtaComissao.getValorImpressaoGap() != null ? MoneyHelper.multiplicar(ptovtaComissao.getValorImpressaoGap(),new BigDecimal(contImpressa), 2) : BigDecimal.ZERO; + } + } + } + } else if(ModeloComissaoImpressaoPosterior.COMPARTILHADA.equals(ptovtaComissao.getModeloComissaoImpressaoPosterior())) { + if(isAltaTemporada) { + entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpGapCompAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpGapCompAlta(),CEM,4) : BigDecimal.ZERO, 4); + } else { + entregaPassagem = MoneyHelper.multiplicar(receitaEntrega, ptovtaComissao.getValorImpGapComp() != null ? MoneyHelper.dividir(ptovtaComissao.getValorImpGapComp(),CEM,4) : BigDecimal.ZERO, 4); + } + } + + return entregaPassagem; + } + + private BigDecimal calculoExcessoBagagem(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal excBag, ComissaoLogVO comissaoLog) { + + // comissão Excesso = Receita Excesso Bagagem * (% Com. Exc. Bag) + BigDecimal excessoBagagem = BigDecimal.ZERO; + if (isAltaTemporada) { + comissaoLog.setPorcComissao(ptovtaComissao.getExcessoAlta()); + excessoBagagem = MoneyHelper.multiplicar(excBag, ptovtaComissao.getExcessoAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getExcessoAlta(), CEM, 4) : BigDecimal.ZERO, 4); + } else { + comissaoLog.setPorcComissao(ptovtaComissao.getExcessoBaixa()); + excessoBagagem = MoneyHelper.multiplicar(excBag, ptovtaComissao.getExcessoBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getExcessoBaixa(), CEM, 4) : BigDecimal.ZERO, 4); + } + + return excessoBagagem; + } + + private BigDecimal calculoSeguroObrigatorio(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal seguroObrigatorio) { + + // comissão Seg. Obrigatorio = Receita Seguro Obrigatorio * (% Com. Seg. Pol) + BigDecimal recSeguroObrigatorio = BigDecimal.ZERO; + if (isAltaTemporada) { + recSeguroObrigatorio = MoneyHelper.multiplicar(seguroObrigatorio, ptovtaComissao.getSeguroobrigatorioAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroobrigatorioAlta(), CEM, 4) : BigDecimal.ZERO, 4); + } else { + recSeguroObrigatorio = MoneyHelper.multiplicar(seguroObrigatorio, ptovtaComissao.getSeguroobrigatorioBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroobrigatorioBaixa(), CEM, 4) : BigDecimal.ZERO, 4); + } + return recSeguroObrigatorio; + } + + private BigDecimal calculoSeguroOpcional(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal segOpcional, ComissaoLogVO comissaoLog) { + + // comissão Seg. Opcional = Receita Seguro Opcional * (% Com. Seg. Pol) + BigDecimal recsegOpcional = BigDecimal.ZERO; + if (isAltaTemporada) { + comissaoLog.setPorcComissao(ptovtaComissao.getSeguroAlta()); + recsegOpcional = MoneyHelper.multiplicar(segOpcional, ptovtaComissao.getSeguroAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroAlta(), CEM, 4) : BigDecimal.ZERO, 4); + } else { + comissaoLog.setPorcComissao(ptovtaComissao.getSeguroBaixa()); + recsegOpcional = MoneyHelper.multiplicar(segOpcional, ptovtaComissao.getSeguroBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getSeguroBaixa(), CEM, 4) : BigDecimal.ZERO, 4); + } + return recsegOpcional; + } + + private BigDecimal calculoOutros(boolean isAltaTemporada, PtovtaComissao ptovtaComissao, BigDecimal outros, ComissaoLogVO comissaoLog) { + + // comissão Seg. Opcional = Receita Seguro Opcional * (% Com. Seg. Pol) + BigDecimal recoutros = BigDecimal.ZERO; + if (isAltaTemporada) { + comissaoLog.setPorcComissao(ptovtaComissao.getOutrosAlta()); + recoutros = MoneyHelper.multiplicar(outros, ptovtaComissao.getOutrosAlta() != null ? MoneyHelper.dividir(ptovtaComissao.getOutrosAlta(), CEM, 4) : BigDecimal.ZERO, 4); + } else { + comissaoLog.setPorcComissao(ptovtaComissao.getOutrosBaixa()); + recoutros = MoneyHelper.multiplicar(outros, ptovtaComissao.getOutrosBaixa() != null ? MoneyHelper.dividir(ptovtaComissao.getOutrosBaixa(), CEM, 4) : BigDecimal.ZERO, 4); + } + return recoutros; + } + + private Map calculoDescontos(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal, PtovtaComissao ptovtaComissao) { + + List lsDescontos = new ArrayList(); + BigDecimal valorDescontoTotal = BigDecimal.ZERO; + + List itensDescontos = descontoComissaoService.buscaDescontoComissaoPeriodo(puntoVentaId, empresaId, dataInicial, dataFinal); + + for (DescontoComissao dc : itensDescontos) { + + BigDecimal valorDesconto = dc.getPreco(); + valorDescontoTotal = MoneyHelper.somar(valorDescontoTotal, valorDesconto, 2); + + ComissaoDesconto desconto = new ComissaoDesconto(); + if (dc.getDatafinal() == null) { + desconto.setTipo(TipoDesconto.FIXO); + } else { + desconto.setTipo(TipoDesconto.EVENTUAL); + } + desconto.setNomeDesconto(dc.getItemDesconto().getNomitemdesconto()); + desconto.setValorDesconto(valorDesconto); + + lsDescontos.add(desconto); + } + + Map respDescontos = new HashMap(); + respDescontos.put("LISTA_DESCONTOS", lsDescontos); + respDescontos.put("VALOR_DESCONTOS", valorDescontoTotal); + + return respDescontos; + } + + @Override + public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { + + Conferencia conferencia = new Conferencia(); + conferencia.setPuntoVenta(new PuntoVenta(puntoVentaId)); + conferencia.setEmpresa(new Empresa(empresaId)); + + Calendar calendario = Calendar.getInstance(); + calendario.setTime(periodo); + int diaInicial = -1; + int diaFinal = -1; + int mes = calendario.get(Calendar.MONTH); + int ano = calendario.get(Calendar.YEAR); + + if(isRetencaoDiaria) { + conferencia.setDatamovimento(periodo); + diaInicial = calendario.get(Calendar.DAY_OF_MONTH); + diaFinal = calendario.get(Calendar.DAY_OF_MONTH); + } else { + conferencia.setCompetencia(DateUtil.getStringDate(periodo, "MM/yyyy")); + diaInicial = calendario.getActualMinimum(Calendar.DAY_OF_MONTH); + diaFinal = calendario.getActualMaximum(Calendar.DAY_OF_MONTH); + } + + Date dataInicial = getDate(diaInicial, mes, ano); + Date dataFinal = getDate(diaFinal, mes, ano); + + return realizarCalculoComissao(puntoVentaId, empresaId, usuarioId, isRefazerCalculo, conferencia, dataInicial, dataFinal, isRetencaoDiaria); + + } + + /** + * Realiza calculo da comissao + * @param puntoVentaId + * @param empresaId + * @param usuarioId + * @param isRefazerCalculo + * @param conferencia + * @param dataInicial + * @param dataFinal + * @param isRetencaoDiaria + * @return + * @throws BusinessException + * @throws ComissaoException + */ + private RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Integer usuarioId, Boolean isRefazerCalculo, Conferencia conferencia, Date dataInicial, Date dataFinal, boolean isRetencaoDiaria) throws BusinessException, ComissaoException { + try { + PtovtaComissao ptovtaComissao = ptovtaComissaoService.buscarPuntaVentaEmpresa(puntoVentaId, empresaId); + if (ptovtaComissao != null && (ptovtaComissao.getIndretercomissao() == null || !ptovtaComissao.getIndretercomissao())) { + //Abate no valor da comissão bpr as saídas de caixa + boolean consideraBilhetesDevolvidosEmOutraAgencia = (ptovtaComissao.getIndbilhetesdevcanorigem() == null)?false:ptovtaComissao.getIndbilhetesdevcanorigem(); + + List receitas = null; + if(isRefazerCalculo) { + comissaoReceitaService.limparComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); + List receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, true, consideraBilhetesDevolvidosEmOutraAgencia); + log.info("Total de bilhetes: " + receitasBoleto.size()); + List eventosFinanceirosVOs = conferenciaComissaoDAO.carregarEventosFinanceiros(conferencia); + log.info("Total de eventos extras: " + eventosFinanceirosVOs.size()); + receitas = calculaReceitaComissao(empresaId, ptovtaComissao, receitasBoleto, eventosFinanceirosVOs, dataInicial, dataFinal); + reterComissaoReceitaDiaria(empresaId, puntoVentaId, usuarioId, receitas); + } else { + receitas = recuperarComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); + } + + if(!isRetencaoDiaria) { + return calcularRegistroCalculo(ptovtaComissao, puntoVentaId, empresaId, dataInicial, dataFinal, receitas); + } + } else { + if(ptovtaComissao != null && ptovtaComissao.getIndretercomissao() != null && ptovtaComissao.getIndretercomissao()) { + throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissaoReterComissao.exception", null, ptovtaComissao.getDescComissaoId() != null ? ptovtaComissao.getPuntoventaId().getNombpuntoventa() : ""); + } else if(!isRefazerCalculo) { + throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissao.exception"); + } + } + + }catch(ComissaoException e ){ + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException("busquedaCalculoComissaoController.PtovtaComissao.exception"); + } + + return null; + } + + private List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { + return comissaoReceitaService.recuperarComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); + } + + /** + * Retem dados para calculo da comissao + * @param empresaId + * @param puntoVentaId + * @param usuarioId + * @param receitas + * @throws BusinessException + */ + private void reterComissaoReceitaDiaria(Integer empresaId, Integer puntoVentaId, Integer usuarioId, List receitas) throws BusinessException { + comissaoReceitaService.reterComissaoReceitaDiaria(empresaId, puntoVentaId, usuarioId, receitas); + } + + /** + * Carrega os dados de registro de calculo, conforme receitas + * @param ptovtaComissao + * @param puntoVentaId + * @param empresaId + * @param dataInicial + * @param dataFinal + * @param receitas + * @return + * @throws BusinessException + */ + @SuppressWarnings("unchecked") + private RegistroCalculo calcularRegistroCalculo(PtovtaComissao ptovtaComissao, Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal, List receitas) throws BusinessException { + try { + RegistroCalculo rc = new RegistroCalculo(); + rc.setNombpuntoventa(ptovtaComissao.getPuntoventaId().getNombpuntoventa()); + rc.setNumPuntoVenta(ptovtaComissao.getPuntoventaId().getNumPuntoVenta()); + + BigDecimal comissaoBPR = BigDecimal.ZERO; + BigDecimal comissaoExcessoBagagem = BigDecimal.ZERO; + BigDecimal comissaoSegOpcional = BigDecimal.ZERO; + BigDecimal comissaoSeguro = BigDecimal.ZERO; + BigDecimal comissaoEntregaPassagem = BigDecimal.ZERO; + BigDecimal comissaoOutros = BigDecimal.ZERO; + BigDecimal receitaTotal = BigDecimal.ZERO; + BigDecimal comissaoTotal = BigDecimal.ZERO; + + for (ComissaoReceita cr : receitas) { + receitaTotal = MoneyHelper.somar(receitaTotal, cr.getReceitaComissao()); + comissaoBPR = MoneyHelper.somar(comissaoBPR, cr.getComissaoBPRDiaria()); + comissaoEntregaPassagem = MoneyHelper.somar(comissaoEntregaPassagem, cr.getComissaoEntregaPassagemDiaria()); + comissaoExcessoBagagem = MoneyHelper.somar(comissaoExcessoBagagem, cr.getComissaoExcessoBagagemDiaria()); + comissaoSegOpcional = MoneyHelper.somar(comissaoSegOpcional, cr.getComissaoSegOpcionalDiaria()); + comissaoSeguro = MoneyHelper.somar(comissaoSeguro, cr.getComissaoSeguroObrigatorioDiaria()); + comissaoOutros = MoneyHelper.somar(comissaoOutros, cr.getComissaoOutrosDiaria()); + comissaoTotal = MoneyHelper.somar(comissaoTotal, cr.getTotalComissao()); + } + + rc.setLsReceitas(receitas); + + rc.setComissaoBPR(comissaoBPR); + rc.setComissaoExcessoBagagem(comissaoExcessoBagagem); + rc.setComissaoSegOpcional(comissaoSegOpcional); + rc.setComissaoSeguro(comissaoSeguro); + rc.setComissaoEntregaPassagem(comissaoEntregaPassagem); + rc.setComissaoOutros(comissaoOutros); + + // Descontos (Fixos e Eventuais) + Map respDescontos = calculoDescontos(puntoVentaId, empresaId, dataInicial, dataFinal, ptovtaComissao); + rc.setDescontos((BigDecimal) respDescontos.get("VALOR_DESCONTOS")); + rc.setLsDescontos((List) respDescontos.get("LISTA_DESCONTOS")); + + /** + * Bonificação Metas - Meta = Eh o valor estipulado de receita dentro do periodo que a agencia deve alcançar. - Bonificação = Eh uma porcentagem paga encima da comissao, por alcançar a meta. + */ + BigDecimal comissaoBonificaoMetas = BigDecimal.ZERO; + rc.setComissaoBonificaoMetas(comissaoBonificaoMetas); + + // Royaties + BigDecimal royaties = BigDecimal.ZERO; + if(ptovtaComissao.getRoyalties() != null) { + royaties = MoneyHelper.multiplicar(receitaTotal, MoneyHelper.dividir(ptovtaComissao.getRoyalties(), CEM)); + } + rc.setRoyaties(royaties); + + // ISS retido + BigDecimal issRetido = BigDecimal.ZERO; + if(ptovtaComissao.getIssretido() != null) { + issRetido = MoneyHelper.multiplicar(comissaoTotal, MoneyHelper.dividir(ptovtaComissao.getIssretido(), CEM)); + } + rc.setRetidoISS(issRetido); + + // comissão é pagar = comissão BPR + comissão Excesso Bagagem + comissão Seg. Opcional + Bonificação Metas + Internet(EntregaPassagem) + BigDecimal comissaoPagar = BigDecimal.ZERO; + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoBPR); + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoExcessoBagagem); + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoSeguro); + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoSegOpcional); + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoEntregaPassagem); + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoOutros); + comissaoPagar = MoneyHelper.somar(comissaoPagar,comissaoBonificaoMetas); + + // - Descontos (Fixos e Eventuais) - Royaties - ISS retido + comissaoPagar = MoneyHelper.subtrair(comissaoPagar,rc.getDescontos()); + comissaoPagar = MoneyHelper.subtrair(comissaoPagar,royaties); + comissaoPagar = MoneyHelper.subtrair(comissaoPagar,issRetido); + rc.setComissaoPagar(comissaoPagar); + + return rc; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + private boolean validaAltaTemporada(List impostos, Integer mes, Integer estadoId) { + if(impostos != null && mes != null && estadoId != null) { + + for (EmpresaImposto ei : impostos) { + if(ei.getEstado() != null) { + if (ei.getEstado().getEstadoId().equals(estadoId)) { + switch (mes) { + case Calendar.JANUARY: + return ei.getIndJaneiro() == null ? false : ei.getIndJaneiro(); + case Calendar.FEBRUARY: + return ei.getIndFevereiro() == null ? false : ei.getIndFevereiro(); + case Calendar.MARCH: + return ei.getIndMarco() == null ? false : ei.getIndMarco(); + case Calendar.APRIL: + return ei.getIndAbril() == null ? false : ei.getIndAbril(); + case Calendar.MAY: + return ei.getIndMaio() == null ? false : ei.getIndMaio(); + case Calendar.JUNE: + return ei.getIndJunho() == null ? false : ei.getIndJunho(); + case Calendar.JULY: + return ei.getIndJulho() == null ? false : ei.getIndJulho(); + case Calendar.AUGUST: + return ei.getIndAgosto() == null ? false : ei.getIndAgosto(); + case Calendar.SEPTEMBER: + return ei.getIndSetembro() == null ? false : ei.getIndSetembro(); + case Calendar.OCTOBER: + return ei.getIndOutubro() == null ? false : ei.getIndOutubro(); + case Calendar.NOVEMBER: + return ei.getIndNovembro() == null ? false : ei.getIndNovembro(); + case Calendar.DECEMBER: + return ei.getIndDezembro() == null ? false : ei.getIndDezembro(); + default: + break; + } + } + } + } + + } + + return false; + } + + private List calculaReceitaComissao(Integer empresaId, PtovtaComissao ptovtaComissao, List receitasBoleto, List eventosFinanceirosVOs, Date dataInicial, Date dataFinal) { + + Calendar cDataInicial = Calendar.getInstance(); + cDataInicial.setTime(dataInicial); + Integer diaInicial = cDataInicial.get(Calendar.DAY_OF_MONTH); + + Calendar cDataFinal = Calendar.getInstance(); + cDataFinal.setTime(dataInicial); + Integer diaFinal = cDataFinal.get(Calendar.DAY_OF_MONTH); + + Integer mes = cDataInicial.get(Calendar.MONTH); + Integer ano = cDataInicial.get(Calendar.YEAR); + + List impostos = empresaImpostoService.buscarEmpresaImposto(empresaId); + boolean isConsideraBilhetesDevolvidosEmOutraAgencia = ptovtaComissao.getIndbilhetesdevcanorigem() == null ? false : ptovtaComissao.getIndbilhetesdevcanorigem(); + boolean isPagaComissaoBilheteOrdemServico = ptovtaComissao.getIndPagaComissaoBilheteOS() != null ? ptovtaComissao.getIndPagaComissaoBilheteOS() : false; + boolean isDevolucaoComissaoTransferenciaGeraCaja = ptovtaComissao.getEmpresaId().getIndComTransfGeraCaja(); + boolean isSeguroObrigatorioReceitaBPR = ptovtaComissao.getSeguroReceita() || ptovtaComissao.getSeguroDev(); + + List receitas = new ArrayList(); + for (int dia = diaInicial; dia <= diaFinal; dia++) { + Calendar cDataRegistro = Calendar.getInstance(); + cDataRegistro.set(Calendar.DAY_OF_MONTH, dia); + cDataRegistro.set(Calendar.MONTH, mes); + cDataRegistro.set(Calendar.YEAR, ano); + + Date dataRegistro = DateUtil.normalizarToFecha(cDataRegistro.getTime()); + + List list = verificaCalculoComissaoProDia(receitasBoleto, dataRegistro); + + ComissaoReceita cr = new ComissaoReceita(); + cr.setData(dataRegistro); + + BigDecimal receitaComissao = BigDecimal.ZERO; + + BigDecimal receitaBPR = BigDecimal.ZERO; + BigDecimal receitaGAP = BigDecimal.ZERO; + BigDecimal internet = BigDecimal.ZERO; + BigDecimal receitaSeguroObrigatorio = BigDecimal.ZERO; + BigDecimal receitaExcessoBagagem = BigDecimal.ZERO; + BigDecimal receitaSeguroOpcional = BigDecimal.ZERO; + BigDecimal receitaSeguroOutros = BigDecimal.ZERO; + + BigDecimal cancelados = BigDecimal.ZERO; + BigDecimal canceladosOrigem = BigDecimal.ZERO; + BigDecimal devolvidos = BigDecimal.ZERO; + BigDecimal devolvidosOrigem = BigDecimal.ZERO; + BigDecimal canceladosGAP = BigDecimal.ZERO; + BigDecimal canceladosGAPOrigem = BigDecimal.ZERO; + BigDecimal devolvidosGAP = BigDecimal.ZERO; + BigDecimal devolvidosGAPOrigem = BigDecimal.ZERO; + + BigDecimal gapImpressa = BigDecimal.ZERO; + int contImpressa = 0; + + BigDecimal comissaoBPR = BigDecimal.ZERO; + BigDecimal comissaoExcessoBagagem = BigDecimal.ZERO; + BigDecimal comissaoSegOpcional = BigDecimal.ZERO; + BigDecimal comissaoEntregaPassagem = BigDecimal.ZERO; + BigDecimal comissaoOutros = BigDecimal.ZERO; + BigDecimal comissaoSeguroObrigatorio = BigDecimal.ZERO; + + // Receita Total -- bruta/liquida - abatimento do valor do icms + boolean isReceitaLiquida = false; + Receita receita = Receita.getByValor(ptovtaComissao.getReceita()); + if (receita.equals(Receita.RECEITALIQUIDA)) { + isReceitaLiquida = true; + } + + /* Calculando comissão para os boletos */ + for (BoletoComissao rcc : list) { + + /* + * Mantis #12391 + * Verifica se a agencia paga comissão para bilhete de ordem de servico, + * caso não faça pagamento, o bilhete é ignorado */ + if(!isPagaComissaoBilheteOrdemServico && isBilheteOrdemServico(rcc)) { + continue; + } + + boolean isAltaTemporada = validaAltaTemporada(impostos, mes, rcc.getEstadoId()); + + IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto()); + boolean isSaidaCaixa = rcc.getMotivoCancelacionId() != null; + boolean isEntregaPassagem = statusBoleto.equals(IndStatusBoleto.E) && (rcc.getMotivoCancelacionId() == null); + + /* + * Exclui os bilhetes que não foram entregues na agencia da comissão que está sendo calculada + */ + if(isEntregaPassagem && !ptovtaComissao.getPuntoventaId().getPuntoventaId().equals(rcc.getPuntoVentaId())) { + continue; + } + + if(rcc.isMotivocancelacionQuitacaoOcd() || rcc.isDiferencaTrocaGeracaoOcd()) { + continue; + } + + if(rcc.isMotivocancelacionTransferido() && (rcc.getIndreimpresion() || !isDevolucaoComissaoTransferenciaGeraCaja)) { + continue; + } + + ComissaoLogVO comissaoLog = new ComissaoLogVO(); + comissaoLog.setFeccorte(dataRegistro); + comissaoLog.setCajaId(rcc.getCajaId()); + comissaoLog.setEmpresaId(empresaId); + comissaoLog.setPuntoventaId(rcc.getPuntoVentaId()); + comissaoLog.setTurnoId(rcc.getTurnoId()); + comissaoLog.setUsuarioId(rcc.getUsuarioId()); + comissaoLog.setOrigem("ADM"); + + StringBuilder sTextoLog = new StringBuilder(); + sTextoLog.append("[CAJA_ID: ") + .append(rcc.getCajaId()) + .append("] ") + .append("[BILHETE: ") + .append(rcc.getNumFolioSistema()) + .append("] ") + .append("[INDSTATUSBOLETO: ") + .append(rcc.getIndstatusboleto()) + .append("] ") + .append("[MOTIVO_CANCELAMENTO: ") + .append(rcc.getMotivoCancelacionId() != null ? rcc.getMotivoCancelacionId() : "") + .append("] ") + .append("[TIPO_VENDA: ") + .append(rcc.getTipoVenta()) + .append("] "); + + BigDecimal receitaItem = BigDecimal.ZERO; + BigDecimal receitaDevItem = BigDecimal.ZERO; + BigDecimal receitaSeguroObrigatorioItem = BigDecimal.ZERO; + BigDecimal receitaSeguroObrigatorioDevItem = BigDecimal.ZERO; + + if (!isSaidaCaixa){ + // Totais + if (BooleanUtils.toBoolean(ptovtaComissao.getTarifaReceita())) { + receitaItem = MoneyHelper.somar(receitaItem, rcc.getValorpagado()); + } + + if (BooleanUtils.toBoolean(ptovtaComissao.getTaxaReceita())) { + receitaItem = MoneyHelper.somar(receitaItem, rcc.getEmbarque()); + } + + if (BooleanUtils.toBoolean(ptovtaComissao.getPedagioReceita())) { + receitaItem = MoneyHelper.somar(receitaItem, rcc.getPedagio()); + } + + if(isSeguroObrigatorioReceitaBPR) { + if (BooleanUtils.toBoolean(ptovtaComissao.getSeguroReceita())) { + receitaItem = MoneyHelper.somar(receitaItem, rcc.getSeguro()); + } + } else { + receitaSeguroObrigatorioItem = MoneyHelper.somar(receitaSeguroObrigatorioItem, rcc.getSeguro()); + } + + } + + if (isSaidaCaixa){ + // Totais de devolução / Cancelamento + if (BooleanUtils.toBoolean(ptovtaComissao.getTarifaDev())) { + receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getValorpagado()); + } + + if (BooleanUtils.toBoolean(ptovtaComissao.getTaxaDev())) { + receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getEmbarque()); + } + + if (BooleanUtils.toBoolean(ptovtaComissao.getPedagioDev())) { + receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getPedagio()); + } + + if(isSeguroObrigatorioReceitaBPR) { + if (BooleanUtils.toBoolean(ptovtaComissao.getSeguroDev())) { + receitaDevItem = MoneyHelper.somar(receitaDevItem, rcc.getSeguro()); + } + } else { + receitaSeguroObrigatorioDevItem = MoneyHelper.somar(receitaSeguroObrigatorioDevItem, rcc.getSeguro()); + } + + } + + // Calculo de ICMS sobre o valor do bilhete + if (isReceitaLiquida) { + BigDecimal icms = MoneyHelper.multiplicar(receitaItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); + receitaItem = MoneyHelper.subtrair(receitaItem, icms); + + BigDecimal icmsDev = MoneyHelper.multiplicar(receitaDevItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); + receitaDevItem = MoneyHelper.subtrair(receitaDevItem,icmsDev); + + icms = MoneyHelper.multiplicar(receitaSeguroObrigatorioItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); + receitaSeguroObrigatorioItem = MoneyHelper.subtrair(receitaSeguroObrigatorioItem, icms); + + icmsDev = MoneyHelper.multiplicar(receitaSeguroObrigatorioDevItem, MoneyHelper.dividir(rcc.getIcmsBase() != null ? rcc.getIcmsBase() : BigDecimal.ZERO, CEM)); + receitaSeguroObrigatorioDevItem = MoneyHelper.subtrair(receitaSeguroObrigatorioDevItem,icmsDev); + + } + + BigDecimal bpr = BigDecimal.ZERO; + BigDecimal tmpComissaoSeguroObrigatorio = BigDecimal.ZERO; + // Boletos impressos no punto venta + if (isEntregaPassagem) { + contImpressa++; + gapImpressa = MoneyHelper.somar(gapImpressa, receitaItem, receitaSeguroObrigatorioItem); + + BigDecimal receitaTotalPassagem = MoneyHelper.somar(receitaItem, receitaSeguroObrigatorioItem); + + BigDecimal entregaPassagem = calculoEntregaPassagem(isAltaTemporada, ptovtaComissao, receitaTotalPassagem, BigDecimal.ZERO, 1); + comissaoEntregaPassagem = MoneyHelper.somar(comissaoEntregaPassagem, entregaPassagem, 4); + + sTextoLog.append("[RECEITA_IMPRESSAO_IMP_POS: ") + .append(receitaTotalPassagem) + .append("] ") + .append("[COMISSAO_IMPRESSAO_IMP_POS: ") + .append(comissaoEntregaPassagem) + .append("] "); + + } else { + + // Receita GAP + if (rcc.getTipoVenta().equals(Constantes.TPV_BOLETO_REMOTO.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_CALL_CENTER.intValue())) { + receitaGAP = MoneyHelper.somar(receitaGAP, receitaItem); + receitaGAP = MoneyHelper.somar(receitaGAP, receitaSeguroObrigatorioItem); + + bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, BigDecimal.ZERO, receitaItem, rcc.isBilheteGap(), comissaoLog); + + } + // Internet + else if (rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { + internet = MoneyHelper.somar(internet, receitaItem); + internet = MoneyHelper.somar(internet, receitaSeguroObrigatorioItem); + + bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, BigDecimal.ZERO, receitaItem, rcc.isBilheteGap(), comissaoLog); + + } + + // Receita BPR + else { + receitaBPR = MoneyHelper.somar(receitaBPR, receitaItem); + receitaSeguroObrigatorio = MoneyHelper.somar(receitaSeguroObrigatorio, receitaSeguroObrigatorioItem); + + bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaItem, BigDecimal.ZERO, rcc.isBilheteGap(), comissaoLog); + + } + + tmpComissaoSeguroObrigatorio = calculoSeguroObrigatorio(isAltaTemporada, ptovtaComissao, receitaSeguroObrigatorioItem); + comissaoSeguroObrigatorio = MoneyHelper.somar(comissaoSeguroObrigatorio, tmpComissaoSeguroObrigatorio, 4); + + comissaoBPR = MoneyHelper.somar(comissaoBPR, bpr, 4); + + if(!isSaidaCaixa) { + BigDecimal valorBase = MoneyHelper.somar(receitaItem, receitaSeguroObrigatorioItem); + BigDecimal valorComissao = MoneyHelper.somar(bpr, tmpComissaoSeguroObrigatorio); + + comissaoLog.setValorBase(valorBase); + comissaoLog.setValorComissao(valorComissao); + + sTextoLog.append("[RECEITA_ITEM: ") + .append(receitaItem) + .append("] ") + .append("[COMISSAO_BPR: ") + .append(bpr) + .append("] ") + .append("[COMISSAO_BPR_ATUAL: ") + .append(comissaoBPR) + .append("] ") + .append("[RECEITA_SEGURO_OBRIGATORIO: ") + .append(receitaSeguroObrigatorioItem) + .append("] ") + .append("[COMISSAO_SEGURO_OBRIGATORIO: ") + .append(tmpComissaoSeguroObrigatorio) + .append("] ") + .append("[COMISSAO_SEGURO_OBRIGATORIO_ATUAL: ") + .append(comissaoSeguroObrigatorio) + .append("] "); + } + } + + if (isSaidaCaixa) { + receitaSeguroObrigatorio = MoneyHelper.somar( receitaSeguroObrigatorio , receitaSeguroObrigatorioDevItem.negate(), 4 ); + // devolução Receita + if (isBilheteDevolucao(rcc, isDevolucaoComissaoTransferenciaGeraCaja)) { + + // devolução Receita GAP + if (rcc.getTipoVenta().equals(Constantes.TPV_BOLETO_REMOTO.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_CALL_CENTER.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { + + // Impresso Venta de otro punto venta + if (!rcc.getPtoVtaOrigem()) { + devolvidosGAPOrigem = MoneyHelper.somar(devolvidosGAPOrigem, receitaDevItem); + //devolvidosGAPOrigem = MoneyHelper.somar(devolvidosGAPOrigem, receitaSeguroObrigatorioDevItem); + } + + /* + * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, + * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde + * foi feita a operação esteja desmarcado + * Mantis #11015 + */ + if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { + devolvidosGAP = MoneyHelper.somar(devolvidosGAP, receitaDevItem); + //devolvidosGAP = MoneyHelper.somar(devolvidosGAP, receitaSeguroObrigatorioDevItem); + } + + } else { + // Impresso Venta de otro punto venta + if (!rcc.getPtoVtaOrigem()) { + devolvidosOrigem = MoneyHelper.somar(devolvidosOrigem, receitaDevItem); + //devolvidosOrigem = MoneyHelper.somar(devolvidosOrigem, receitaSeguroObrigatorioDevItem); + } + + /* + * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, + * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde + * foi feita a operação esteja desmarcado + * Mantis #11015 + */ + if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { + devolvidos = MoneyHelper.somar(devolvidos, receitaDevItem); + //devolvidos = MoneyHelper.somar(devolvidos, receitaSeguroObrigatorioDevItem); + } + } + + } + + // Cancelamento Receita + else { + // Cancelamento Receita GAP + if (rcc.getTipoVenta().equals(Constantes.TPV_BOLETO_REMOTO.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_CALL_CENTER.intValue()) || rcc.getTipoVenta().equals(Constantes.TPV_POR_INTERNET.intValue())) { + if (!rcc.getPtoVtaOrigem()) { + canceladosGAPOrigem = MoneyHelper.somar(canceladosGAPOrigem, receitaDevItem); + //canceladosGAPOrigem = MoneyHelper.somar(canceladosGAPOrigem, receitaSeguroObrigatorioDevItem); + } + + /* + * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, + * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde + * foi feita a operação esteja desmarcado + * Mantis #11015 + */ + if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { + canceladosGAP = MoneyHelper.somar(canceladosGAP, receitaDevItem); + //canceladosGAP = MoneyHelper.somar(canceladosGAP, receitaSeguroObrigatorioDevItem); + } + } else { + if (!rcc.getPtoVtaOrigem()) { + canceladosOrigem = MoneyHelper.somar(canceladosOrigem, receitaDevItem); + //canceladosOrigem = MoneyHelper.somar(canceladosOrigem, receitaSeguroObrigatorioDevItem); + } + + /* + * Adiciona o valor nos devolvidos caso o bilhete seja do proprio ponto de venda, + * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde + * foi feita a operação esteja desmarcado + * Mantis #11015 + */ + if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { + cancelados = MoneyHelper.somar(cancelados, receitaDevItem); + //cancelados = MoneyHelper.somar(cancelados, receitaSeguroObrigatorioDevItem); + } + } + } + + /* + * Calcula a comissão caso o bilhete seja do proprio ponto de venda, + * ou caso o parametro de considerar cancelamento/devolução no ponto de venda onde + * foi feita a operação esteja desmarcado + * Mantis #11015 + */ + if(rcc.getPtoVtaOrigem() || !isConsideraBilhetesDevolvidosEmOutraAgencia) { + bpr = calculoComisssaoBPR(isAltaTemporada, ptovtaComissao, receitaDevItem, BigDecimal.ZERO, rcc.isBilheteGap(), comissaoLog); + + tmpComissaoSeguroObrigatorio = calculoSeguroObrigatorio(isAltaTemporada, ptovtaComissao, receitaSeguroObrigatorioDevItem); + comissaoSeguroObrigatorio = MoneyHelper.somar(comissaoSeguroObrigatorio, tmpComissaoSeguroObrigatorio.negate(), 4); + + //bpr = MoneyHelper.somar(bpr, tmpComissaoSeguroObrigatorio, 4); + + comissaoBPR = MoneyHelper.somar(comissaoBPR, bpr.negate(), 4); + + BigDecimal valorBase = MoneyHelper.somar(receitaDevItem.negate(), receitaSeguroObrigatorioDevItem.negate()); + BigDecimal valorComissao = MoneyHelper.somar(bpr.negate(), tmpComissaoSeguroObrigatorio.negate()); + + comissaoLog.setValorBase(valorBase); + comissaoLog.setValorComissao(valorComissao); + + sTextoLog.append("[RECEITA_DEV_ITEM: ") + .append(receitaDevItem.negate()) + .append("] ") + .append("[COMISSAO_BPR_DEV: ") + .append(bpr.negate()) + .append("] ") + .append("[COMISSAO_BPR_ATUAL: ") + .append(comissaoBPR) + .append("] ") + .append("[RECEITA_SEGURO_OBRIGATORIO_DEV: ") + .append(receitaSeguroObrigatorioDevItem.negate()) + .append("] ") + .append("[COMISSAO_SEGURO_OBRIGATORIO_DEV: ") + .append(tmpComissaoSeguroObrigatorio.negate()) + .append("] ") + .append("[COMISSAO_SEGURO_OBRIGATORIO_ATUAL: ") + .append(comissaoSeguroObrigatorio) + .append("] "); + } + } + + comissaoLog.setTexto(sTextoLog.toString()); + cr.getLsComissaoLog().add(comissaoLog); + + /* + log.info("---------"); + log.info("CajaId=" + rcc.getCajaId() + ", numFolioSistema=" + rcc.getNumFolioSistema() + ", nombpasajero=" + rcc.getNombpasajero() + ", indstatusboleto=" + rcc.getIndstatusboleto() + ", motivocancelacionId=" + rcc.getMotivoCancelacionId() + ", PuntoventaId=" + rcc.getPuntoVentaId() + ", PtovtaventaId=" + rcc.getPtovtaventaId()); + log.info("Total Bilhete: " + rcc.getTotal()); + log.info("PtoVtaOrigem: " + rcc.getPtoVtaOrigem()); + log.info("Status: " + rcc.getIndstatusboleto()); + log.info("receitaItem: " + receitaItem); + log.info("receitaDevItem: " + receitaDevItem); + log.info("receitaSeguroObrigatorioItem: " + receitaSeguroObrigatorioItem); + log.info("receitaSeguroObrigatorioDevItem: " + receitaSeguroObrigatorioDevItem); + log.info("comissaoBPRItem: " + bpr); + log.info("receitaGAP: " + receitaGAP); + log.info("receitaBPR: " + receitaBPR); + log.info("ComissaoBPR: " + comissaoBPR); + log.info("comissaoSeguroObrigatorio: " + comissaoSeguroObrigatorio); + log.info("cancelados: " + cancelados); + log.info("canceladosOrigem: " + canceladosOrigem); + log.info("devolvidos: " + devolvidos); + log.info("devolvidosOrigem: " + devolvidosOrigem); + log.info("canceladosGAP: " + canceladosGAP); + log.info("canceladosGAPOrigem: " + canceladosGAPOrigem); + log.info("devolvidosGAP: " + devolvidosGAP); + log.info("devolvidosGAPOrigem: " + devolvidosGAPOrigem); + */ + } + + /* Calculando comissão para os eventos extras */ + List listEventosFinanceiros = verificaEventoFinanceiroProDia(eventosFinanceirosVOs, dataRegistro); + for (EventosFinanceirosVO eventosFinanceiros : listEventosFinanceiros) { + ComissaoLogVO comissaoLog = new ComissaoLogVO(); + comissaoLog.setFeccorte(dataRegistro); + comissaoLog.setCajadiversosId(eventosFinanceiros.getCajaDiversosId()); + comissaoLog.setEmpresaId(empresaId); + comissaoLog.setPuntoventaId(ptovtaComissao.getPuntoventaId().getPuntoventaId()); + comissaoLog.setTurnoId(eventosFinanceiros.getTurnoId()); + comissaoLog.setUsuarioId(eventosFinanceiros.getUsuarioId()); + comissaoLog.setOrigem("ADM"); + + boolean isAltaTemporada = validaAltaTemporada(impostos, mes, eventosFinanceiros.getEstadoId()); + + if(TipoEventoExtra.EXCESSO_BAGAGEM.toString().equals(eventosFinanceiros.getCvetipoevento())) { + receitaExcessoBagagem = MoneyHelper.somar(receitaExcessoBagagem, eventosFinanceiros.getImpingreso()); + BigDecimal excessoBagagem = calculoExcessoBagagem(isAltaTemporada, ptovtaComissao, eventosFinanceiros.getImpingreso(), comissaoLog); + comissaoExcessoBagagem = MoneyHelper.somar(comissaoExcessoBagagem, excessoBagagem, 4); + + adicionarTextoComissaoLog(comissaoLog, TipoEventoExtra.EXCESSO_BAGAGEM.toString(), receitaExcessoBagagem, excessoBagagem); + } else if(TipoEventoExtra.SEGURO_OPCIONAL.toString().equals(eventosFinanceiros.getCvetipoevento())) { + receitaSeguroOpcional = MoneyHelper.somar(receitaSeguroOpcional, eventosFinanceiros.getImpingreso()); + BigDecimal segOpcional = calculoSeguroOpcional(isAltaTemporada, ptovtaComissao, eventosFinanceiros.getImpingreso(), comissaoLog); + comissaoSegOpcional = MoneyHelper.somar(comissaoSegOpcional, segOpcional, 4); + + adicionarTextoComissaoLog(comissaoLog, TipoEventoExtra.SEGURO_OPCIONAL.toString(), receitaSeguroOpcional, segOpcional); + } else { + receitaSeguroOutros = MoneyHelper.somar(receitaSeguroOutros, eventosFinanceiros.getImpingreso()); + BigDecimal outros = calculoOutros(isAltaTemporada, ptovtaComissao, eventosFinanceiros.getImpingreso(), comissaoLog); + comissaoOutros = MoneyHelper.somar(comissaoOutros, outros, 4); + + adicionarTextoComissaoLog(comissaoLog, "OUTROS", receitaSeguroOutros, outros); + } + + cr.getLsComissaoLog().add(comissaoLog); + } + + cr.setCancelados(cancelados); + cr.setCanceladosGAP(canceladosGAP); + cr.setDevolvidos(devolvidos); + cr.setDevolvidosGAP(devolvidosGAP); + cr.setDevolucoesOrigem(devolvidosOrigem); + cr.setDevolucoesOrigemGAP(devolvidosGAPOrigem); + + cr.setReceitaBPR(receitaBPR); + cr.setReceitaSeguro(receitaSeguroObrigatorio); + cr.setReceitaExcessoBagagem(receitaExcessoBagagem); + cr.setReceitaGAP(receitaGAP); + cr.setReceitaSeguroOpcional(receitaSeguroOpcional); + cr.setReceitaSeguroOutros(receitaSeguroOutros); + cr.setInternet(internet); + + cr.setGapImpressa(gapImpressa); + cr.setContImpressa(contImpressa); + + // Receita comissão = Receita BPR + Receita GAP + Internet - Cancelados - Cancelados GAP - Devoluções - Devoluções GAP + receitaComissao = MoneyHelper.somar(receitaComissao,receitaBPR); + receitaComissao = MoneyHelper.somar(receitaComissao,receitaGAP); + receitaComissao = MoneyHelper.somar(receitaComissao,internet); + + receitaComissao = MoneyHelper.subtrair(receitaComissao,cancelados); + receitaComissao = MoneyHelper.subtrair(receitaComissao,devolvidos); + receitaComissao = MoneyHelper.subtrair(receitaComissao,devolvidosGAP); + receitaComissao = MoneyHelper.subtrair(receitaComissao,canceladosGAP); + + cr.setReceitaComissao(receitaComissao); + + cr.setComissaoBPRDiaria(comissaoBPR); + cr.setComissaoEntregaPassagemDiaria(comissaoEntregaPassagem); + cr.setComissaoExcessoBagagemDiaria(comissaoExcessoBagagem); + cr.setComissaoSegOpcionalDiaria(comissaoSegOpcional); + cr.setComissaoOutrosDiaria(comissaoOutros); + cr.setComissaoSeguroObrigatorioDiaria(comissaoSeguroObrigatorio); + + receitas.add(cr); + } + + return receitas; + + } + + private void adicionarTextoComissaoLog(ComissaoLogVO comissaoLog, String campo, BigDecimal receitaComissao, BigDecimal comissao) { + comissaoLog.setValorBase(receitaComissao); + comissaoLog.setValorComissao(comissao); + + StringBuilder sTexto = new StringBuilder(); + sTexto.append("[CAJADIVERSOS_ID: ") + .append(comissaoLog.getCajadiversosId()) + .append(": ") + .append("[RECEITA_") + .append(campo) + .append(": ") + .append(receitaComissao) + .append("] [COMISSAO_") + .append(campo) + .append(": ") + .append(comissao) + .append("]"); + + comissaoLog.setTexto(sTexto.toString()); + } + + private boolean isBilheteDevolucao(BoletoComissao rcc, boolean isDevolucaoComissaoTransferenciaGeraCaja) { + return rcc.isMotivocancelacionDevolvido() || + rcc.isMotivocancelacionGeracaoOcd() || + rcc.isMotivocancelacionTrocado() || + rcc.isMotivocancelacionQuitacaoOcd() || + (rcc.isMotivocancelacionTransferido() && !rcc.getIndreimpresion() && isDevolucaoComissaoTransferenciaGeraCaja); + } + + /** + * Verifica se o bilhete possui forma de pagamento Orden de serviço + * Mantis #12391 + * @param rcc + * @return + */ + private boolean isBilheteOrdemServico(BoletoComissao rcc) { + for (FormapagoVO formapago : rcc.getFormapagos()) { + if(formapago.getFormapagoId() == Constantes.FORMA_PAGO_ORDEN_SERVICIO.intValue()) { + return true; + } + } + return false; + } + + private List verificaEventoFinanceiroProDia(List eventosFinanceirosVOs, Date dataRegistro) { + List aux = new ArrayList(); + if(eventosFinanceirosVOs != null) { + for (EventosFinanceirosVO rcc : eventosFinanceirosVOs) { + if(rcc.getFeccorte() != null) { + if (DateUtil.compareOnlyDate(rcc.getFeccorte(), dataRegistro) == 0) { + aux.add(rcc); + } + } + } + } + return aux; + } + + private List verificaCalculoComissaoProDia(List list, Date dataRegistro) { + List aux = new ArrayList(); + for (BoletoComissao rcc : list) { + if (DateUtil.compareOnlyDate(rcc.getFeccorte(), dataRegistro) == 0) { + aux.add(rcc); + } + } + return aux; + } + + @Override + public List relatorioCalculoComissao(Integer empresaId, Date competencia, Date dataInicial, Date dataFinal, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { + List registrosCalculo = new ArrayList(); + List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); + Empresa empresa = empresaService.obtenerID(empresaId); + boolean indExibeComissaoZeradaAgencia = empresa.getIndExibeComissaoZeradaAgencia() != null ? empresa.getIndExibeComissaoZeradaAgencia() : false; + for (PuntoVenta puntoVenta : puntoventas) { + RegistroCalculo registroCalculo = null; + if(competencia != null) { + registroCalculo = relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresaId, competencia, usuarioId, isRetencaoDiaria, isRefazerCalculo); + } else if(dataInicial != null && dataFinal != null) { + registroCalculo = relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresaId, usuarioId, isRetencaoDiaria, isRefazerCalculo, dataInicial, dataFinal); + } + + if(registroCalculo == null) { + continue; + } + + /* + * Caso parametro de não exibir as agencias com comissão zerada esteja ativado + * o registro de calculo não deverá ser adicionado + * Mantis #12260 + */ + totalizarRegistroCalculo(registroCalculo, indExibeComissaoZeradaAgencia); + if(registroCalculo.getLsReceitas() != null && !registroCalculo.getLsReceitas().isEmpty()) { + registrosCalculo.add(registroCalculo); + } + } + ordernarResultado(registrosCalculo); + return registrosCalculo; + } + + private void ordernarResultado(List registrosCalculo) { + Collections.sort(registrosCalculo, new Comparator() { + @Override + public int compare(RegistroCalculo o1, RegistroCalculo o2) { + return o1.getNombpuntoventa().compareToIgnoreCase(o2.getNombpuntoventa()); + } + }); + } + + private void totalizarRegistroCalculo(RegistroCalculo registroCalculo, boolean indExibeComissaoZeradaAgencia) { + ComissaoReceita comissaoReceitaTotal = new ComissaoReceita(); + for (ComissaoReceita comissaoReceita : registroCalculo.getLsReceitas()) { + comissaoReceitaTotal.setNumPuntoVenta(registroCalculo.getNumPuntoVenta()); + comissaoReceitaTotal.setNombpuntoventa(registroCalculo.getNombpuntoventa()); + comissaoReceitaTotal.setReceitaComissao(comissaoReceitaTotal.getReceitaComissao().add(comissaoReceita.getReceitaComissao())); + comissaoReceitaTotal.setReceitaBPR(comissaoReceitaTotal.getReceitaBPR().add(comissaoReceita.getReceitaBPR())); + comissaoReceitaTotal.setReceitaGAP(comissaoReceitaTotal.getReceitaGAP().add(comissaoReceita.getReceitaGAP())); + comissaoReceitaTotal.setGapImpressa(comissaoReceitaTotal.getGapImpressa().add(comissaoReceita.getGapImpressa())); + comissaoReceitaTotal.setInternet(comissaoReceitaTotal.getInternet().add(comissaoReceita.getInternet())); + comissaoReceitaTotal.setCancelados(comissaoReceitaTotal.getCancelados().add(comissaoReceita.getCancelados())); + comissaoReceitaTotal.setCanceladosGAP(comissaoReceitaTotal.getCanceladosGAP().add(comissaoReceita.getCanceladosGAP())); + comissaoReceitaTotal.setDevolvidos(comissaoReceitaTotal.getDevolvidos().add(comissaoReceita.getDevolvidos())); + comissaoReceitaTotal.setDevolvidosGAP(comissaoReceitaTotal.getDevolvidosGAP().add(comissaoReceita.getDevolvidosGAP())); + comissaoReceitaTotal.setDevolucoesOrigem(comissaoReceitaTotal.getDevolucoesOrigem().add(comissaoReceita.getDevolucoesOrigem())); + comissaoReceitaTotal.setDevolucoesOrigemGAP(comissaoReceitaTotal.getDevolucoesOrigemGAP().add(comissaoReceita.getDevolucoesOrigemGAP())); + comissaoReceitaTotal.setReceitaExcessoBagagem(comissaoReceitaTotal.getReceitaExcessoBagagem().add(comissaoReceita.getReceitaExcessoBagagem())); + comissaoReceitaTotal.setReceitaSeguroOpcional(comissaoReceitaTotal.getReceitaSeguroOpcional().add(comissaoReceita.getReceitaSeguroOpcional())); + comissaoReceitaTotal.setReceitaSeguroOutros(comissaoReceitaTotal.getReceitaSeguroOutros().add(comissaoReceita.getReceitaSeguroOutros())); + comissaoReceitaTotal.setContImpressa(comissaoReceitaTotal.getContImpressa() + comissaoReceita.getContImpressa()); + comissaoReceitaTotal.setComissaoBPRDiaria(comissaoReceitaTotal.getComissaoBPRDiaria().add(comissaoReceita.getComissaoBPRDiaria())); + comissaoReceitaTotal.setComissaoExcessoBagagemDiaria(comissaoReceitaTotal.getComissaoExcessoBagagemDiaria().add(comissaoReceita.getComissaoExcessoBagagemDiaria())); + comissaoReceitaTotal.setComissaoSegOpcionalDiaria(comissaoReceitaTotal.getComissaoSegOpcionalDiaria().add(comissaoReceita.getComissaoSegOpcionalDiaria())); + comissaoReceitaTotal.setComissaoEntregaPassagemDiaria(comissaoReceitaTotal.getComissaoEntregaPassagemDiaria().add(comissaoReceita.getComissaoEntregaPassagemDiaria())); + comissaoReceitaTotal.setComissaoOutrosDiaria(comissaoReceitaTotal.getComissaoOutrosDiaria().add(comissaoReceita.getComissaoOutrosDiaria())); + } + registroCalculo.getLsReceitas().clear(); + if(indExibeComissaoZeradaAgencia || + (MoneyHelper.isMaior(comissaoReceitaTotal.getTotal(), BigDecimal.ZERO) || MoneyHelper.isMaior(comissaoReceitaTotal.getTotalComissao(), BigDecimal.ZERO))) { + registroCalculo.getLsReceitas().add(comissaoReceitaTotal); + } + } + + @Override + public void registrarCalculoComissao(Empresa empresa, Date periodo, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo) throws ComissaoException { + List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresa.getEmpresaId()); + for (PuntoVenta puntoVenta : puntoventas) { + registrarCalculoComissao(puntoVenta, empresa, periodo, ignorarComissaoGerada, usuarioId, isRetencaoDiaria, isRefazerCalculo); + } + } + + @Override + public void cancelarCalculoComissao(Integer empresaId, Date periodo) throws ComissaoException, BusinessException { + try { + List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); + for (PuntoVenta puntoVenta : puntoventas) { + try { + cancelarCalculoComissao(puntoVenta.getPuntoventaId(), empresaId, periodo); + } catch (ComissaoException e) { + /* Ignora a comissa quando o cancelamento é feito para todas as agencias */ + } catch (Exception e) { + throw e; + } + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, String competencia) throws ComissaoException { + try { + Map parametros = new HashMap(); + if(StringUtils.isNotBlank(competencia)) { + parametros.put("competenciaInicial", competencia); + parametros.put("competenciaFinal", competencia); + } + if(puntoVentaId != null && puntoVentaId > -1) { + parametros.put("puntoventaId", puntoVentaId); + } + if(empresaId != null) { + parametros.put("empresaId", empresaId); + } + + return comissaoDAO.buscaHistoricoComissao(parametros); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ComissaoException(e.getMessage(), e); + } + } + + @Override + public boolean enviarEmailReciboComissao(HistoricoComissao historicoComissao, byte[] recibo) { + try { + EmailConfigVO emailConfig = carregarConfiguracoesEmail(historicoComissao); + + if(emailConfig != null && StringUtils.isNotBlank(historicoComissao.getDescCorreo())) { + SendMail mail = new SendMail(); + mail.setEmailTo(historicoComissao.getDescCorreo()); + mail.setEmailFrom(emailConfig.getSmtpEmail()); + mail.setSmtpHost(emailConfig.getSmtp()); + mail.setSmtpPassword(emailConfig.getSenha()); + mail.setSmtpPort(emailConfig.getSmtpPorta()); + mail.setSmtpUser(emailConfig.getSmtpEmail()); + mail.setAuth(emailConfig.isAutenticacao()); + + if (StringUtils.isNotEmpty(emailConfig.getTipoAutorizacao())) { + mail.setAuthType(AuthType.valueOf(emailConfig.getTipoAutorizacao())); + } + + String assunto = null; + String texto = null; + String nomeArquivo = null; + if(StringUtils.isNotBlank(historicoComissao.getCompetencia())) { + assunto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.assunto", new String[] {Labels.getLabel("busquedaImportacionFiscalController.lbCompetencia.label"), historicoComissao.getCompetencia()}); + texto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.texto", new String[] {Labels.getLabel("busquedaImportacionFiscalController.lbCompetencia.label"), historicoComissao.getCompetencia()}); + nomeArquivo = historicoComissao.getCompetencia(); + } else if(historicoComissao.getDataInicial() != null && historicoComissao.getDataFinal() != null){ + StringBuilder sDatas = new StringBuilder(); + sDatas.append(DateUtil.getStringDate(historicoComissao.getDataInicial(), "dd/MM/yyyy")) + .append(" ") + .append(Labels.getLabel("lb.ate")) + .append(" ") + .append(DateUtil.getStringDate(historicoComissao.getDataFinal(), "dd/MM/yyyy")); + assunto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.assunto", new String[] {"Periodo", sDatas.toString()}); + texto = Labels.getLabel("busquedaCalculoComissaoController.recibo.email.texto", new String[] {"Periodo", sDatas.toString()}); + nomeArquivo = sDatas.toString().replaceAll(" ", "_"); + } + + mail.setSubject(assunto); + mail.setText(texto); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(recibo.length); + baos.write(recibo, 0, recibo.length); + + + mail.addAnexo(Labels.getLabel("busquedaCalculoComissaoController.recibo.email.nomeAnexo", new String[] {nomeArquivo}).concat(".pdf"), baos, MimeType.PDF); + mail.send(); + + return true; + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return false; + } + + private EmailConfigVO carregarConfiguracoesEmail(HistoricoComissao historicoComissao) { + EmailConfigVO emailConfigVO = carregarConstantesEmail(); + if(emailConfigVO == null && historicoComissao.getEmpresaId() != null) { + EmpresaEmailConfig empresaEmailConfig = empresaEmailConfigService.buscarPorEmpresa(new Empresa(historicoComissao.getEmpresaId())); + if(empresaEmailConfig != null) { + emailConfigVO = new EmailConfigVO(); + emailConfigVO.setAutenticacao(BooleanUtils.toBoolean(empresaEmailConfig.getIndAutenticacao())); + emailConfigVO.setSenha(empresaEmailConfig.getSenha()); + emailConfigVO.setSmtp(empresaEmailConfig.getSmtp()); + emailConfigVO.setSmtpEmail(empresaEmailConfig.getSmtpEmail()); + emailConfigVO.setSmtpUser(empresaEmailConfig.getSmtpEmail()); + emailConfigVO.setSmtpPorta(empresaEmailConfig.getSmtpPorta()); + if (emailConfigVO.getTipoAutorizacao() != null) { + emailConfigVO.setTipoAutorizacao(empresaEmailConfig.getTipoAutorizacao()); + } + } + } + return emailConfigVO; + } + + private EmailConfigVO carregarConstantesEmail() { + EmailConfigVO emailConfigVO = new EmailConfigVO(); + Constante constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_EMAIL); + if(constante == null) { + return null; + } + emailConfigVO.setSmtpEmail(constante.getValorconstante()); + + constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_HOST); + if(constante == null) { + return null; + } + emailConfigVO.setSmtp(constante.getValorconstante()); + + constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_AUTENTICACAO); + if(constante == null) { + return null; + } + emailConfigVO.setAutenticacao(BooleanUtils.toBoolean(constante.getValorconstante())); + + constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_PASS); + if(constante == null) { + return null; + } + emailConfigVO.setSenha(constante.getValorconstante()); + + constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_PORT); + if(constante == null) { + return null; + } + emailConfigVO.setSmtpPorta(constante.getValorconstante()); + + constante = constanteService.buscarPorNomeConstante(Constantes.SMTP_COMISSAO_USER); + if(constante == null) { + return null; + } + emailConfigVO.setSmtpUser(constante.getValorconstante()); + + return emailConfigVO; + } + + private Date getDate(int dia, int mes, int ano) { + Calendar cData = Calendar.getInstance(); + cData.set(Calendar.DAY_OF_MONTH, dia); + cData.set(Calendar.MONTH, mes); + cData.set(Calendar.YEAR, ano); + return DateUtil.normalizarToFecha(cData.getTime()); + } + + @Override + public void registrarCalculoComissao(PuntoVenta puntoVenta, Empresa empresa, Date dataInicial, Date dataFinal, Integer usuarioId) throws ComissaoException, BusinessException { + try { + Calendar cDataAtual = Calendar.getInstance(); + cDataAtual.setTime(dataInicial); + while(DateUtil.compareOnlyDate(cDataAtual.getTime(), dataFinal) <= 0) { + realizarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), cDataAtual.getTime(), true, usuarioId, true); + cDataAtual.add(Calendar.DAY_OF_MONTH, 1); + } + } catch (ComissaoException e) { + log.error(e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public void retencaoAutomaticaComissao(Date dataRetencao) { + Integer usuarioId = 1; + if (UsuarioLogado.getUsuarioLogado() != null && UsuarioLogado.getUsuarioLogado().getUsuarioId() != null) { + usuarioId = UsuarioLogado.getUsuarioLogado().getUsuarioId(); + } + + List empresas = empresaService.buscarEmpresaPtoVtaComissao(); + List puntoVentas = puntoVentaService.buscarPuntoVentaPtoVtaComissao(empresas); + + String sDataRetencao = DateUtil.getStringDate(dataRetencao, "dd/MM/yyyy"); + + for (Empresa empresa : empresas) { + for (PuntoVenta puntoVenta : puntoVentas) { + String descretencao = "Empresa: "+ empresa.getNombempresa() + " - Agencia: " + puntoVenta.getNombpuntoventa() +" data: " + sDataRetencao; + log.info("Inicio Retencao " + descretencao); + try { + registrarCalculoComissao(puntoVenta, empresa, dataRetencao, dataRetencao, usuarioId); + log.info("Fim Retencao " + descretencao); + } catch (Exception e) { + log.info("Erro retencao " + descretencao); + log.error(e.getMessage(), e); + } + } + } + + /* Atualizando controle da retencao automatica */ + try { + ctrlFechamentoCaixaService.atualizarCtrlFechamentoCaixaStatus(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_CONCLUIDA, dataRetencao); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + @Override + public RegistroCalculo relatorioCalculoComissao(Integer puntoVentaId, Integer empresaId, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException { + Conferencia conferencia = new Conferencia(); + conferencia.setPuntoVenta(new PuntoVenta(puntoVentaId)); + conferencia.setEmpresa(new Empresa(empresaId)); + conferencia.setDataInicial(dataInicial); + conferencia.setDataFinal(dataFinal); + + return realizarCalculoComissao(puntoVentaId, empresaId, usuarioId, isRefazerCalculo, conferencia, dataInicial, dataFinal, false); + } + + @Override + public void registrarCalculoComissaoPeriodo(PuntoVenta puntoVenta, Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException { + + try { + + if (validaPeriodo(dataInicial, dataFinal)) { + + if(isRetencaoDiaria || conferenciaComissaoService.isConferenciaCompetenciaEncerrada(dataInicial, dataFinal, empresa, puntoVenta, false)) { + Comissao comissaoCadastrada = comissaoDAO.buscaComissaoVigencia(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), dataInicial, dataFinal); + if (comissaoCadastrada == null) { + + Conferencia conferencia = new Conferencia(); + conferencia.setPuntoVenta(puntoVenta); + conferencia.setEmpresa(empresa); + conferencia.setDataInicial(dataInicial); + conferencia.setDataFinal(dataFinal); + + RegistroCalculo rc = realizarCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), usuarioId, isRefazerCalculo, conferencia, dataInicial, dataFinal, isRetencaoDiaria); + + gravarComissao(puntoVenta, empresa, rc, null, dataInicial, dataFinal); + } else if(!ignorarComissaoGerada){ + StringBuilder sDatas = new StringBuilder(); + sDatas.append(DateUtil.getStringDate(comissaoCadastrada.getDataInicial(), "dd/MM/yyyy")) + .append(" ") + .append(Labels.getLabel("lb.ate")) + .append(" ") + .append(DateUtil.getStringDate(comissaoCadastrada.getDataFinal(), "dd/MM/yyyy")); + throw new ComissaoException("busquedaCalculoComissaoController.registroPeriodo.exception", null, comissaoCadastrada.getPuntoVenta().getNombpuntoventa(), sDatas.toString()); + } + } else { + StringBuilder sDatas = new StringBuilder(); + sDatas.append(DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")) + .append(" ") + .append(Labels.getLabel("lb.ate")) + .append(" ") + .append(DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); + throw new ComissaoException("busquedaCalculoComissaoController.conferenciaNaoEncerradaPeriodo.exception", null, puntoVenta.getNombpuntoventa(), sDatas.toString()); + } + } else { + throw new ComissaoException("busquedaCalculoComissaoController.periodo.exception"); + } + + } catch (ComissaoException e) { + log.error(e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ComissaoException(e.getMessage(), e); + } + } + + @Override + public void registrarCalculoComissaoPeriodo(Empresa empresa, boolean ignorarComissaoGerada, Integer usuarioId, Boolean isRetencaoDiaria, Boolean isRefazerCalculo, Date dataInicial, Date dataFinal) throws ComissaoException { + List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresa.getEmpresaId()); + for (PuntoVenta puntoVenta : puntoventas) { + registrarCalculoComissaoPeriodo(puntoVenta, empresa, ignorarComissaoGerada, usuarioId, isRetencaoDiaria, isRefazerCalculo, dataInicial, dataFinal); + } + } + + @Override + public void cancelarCalculoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException { + try { + Comissao comissao = comissaoDAO.buscaComissaoVigencia(puntoVentaId, empresaId, dataInicial, dataFinal); + if (comissao != null) { + comissaoService.borrar(comissao); + } else { + throw new ComissaoException("busquedaCalculoComissaoController.comissao.exception"); + } + } catch (ComissaoException e) { + log.error(e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public void cancelarCalculoComissaoPeriodo(Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException, BusinessException { + try { + List puntoventas = comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); + for (PuntoVenta puntoVenta : puntoventas) { + try { + cancelarCalculoComissaoPeriodo(puntoVenta.getPuntoventaId(), empresaId, dataInicial, dataFinal); + } catch (ComissaoException e) { + } catch (Exception e) { + throw e; + } + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public List relatorioReciboComissao(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) throws ComissaoException { + try { + Map parametros = new HashMap(); + if(dataInicial != null) { + parametros.put("dataInicial", DateUtil.getStringDate(dataInicial, "dd/MM/yyyy")); + } + if(dataFinal != null) { + parametros.put("dataFinal", DateUtil.getStringDate(dataFinal, "dd/MM/yyyy")); + } + if(puntoVentaId != null && puntoVentaId > -1) { + parametros.put("puntoventaId", puntoVentaId); + } + if(empresaId != null) { + parametros.put("empresaId", empresaId); + } + + return comissaoDAO.buscaHistoricoComissao(parametros); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ComissaoException(e.getMessage(), e); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CancelacionCargoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CancelacionCargoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CancelacionCargoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CancelacionCargoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CancelacionCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CancelacionCtrlServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CancelacionCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CancelacionCtrlServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeExcepcionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeExcepcionServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeExcepcionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeExcepcionServiceImpl.java index 078eb0657..0a667716f 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeExcepcionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeExcepcionServiceImpl.java @@ -1,60 +1,60 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CasetaPeajeExcepcionDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; -import com.rjconsultores.ventaboletos.service.CasetaPeajeExcepcionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("casetaPeajeExcepcionService") -public class CasetaPeajeExcepcionServiceImpl implements CasetaPeajeExcepcionService { - - @Autowired - private CasetaPeajeExcepcionDAO casetaPeajeExcepcionDAO; - - @Override - public List buscarPorCasetaPeaje(CasetaPeaje caseta){ - return casetaPeajeExcepcionDAO.obtenerPorCasetaPeaje(caseta); - } - - @Override - public List obtenerTodos() { - return casetaPeajeExcepcionDAO.obtenerTodos(); - } - - @Override - public CasetaPeajeExcepcion obtenerID(Integer id) { - return casetaPeajeExcepcionDAO.obtenerID(id); - } - - @Transactional - public CasetaPeajeExcepcion suscribir(CasetaPeajeExcepcion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return casetaPeajeExcepcionDAO.suscribir(entidad); - } - - @Transactional - public CasetaPeajeExcepcion actualizacion(CasetaPeajeExcepcion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return casetaPeajeExcepcionDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(CasetaPeajeExcepcion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - casetaPeajeExcepcionDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CasetaPeajeExcepcionDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; +import com.rjconsultores.ventaboletos.service.CasetaPeajeExcepcionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("casetaPeajeExcepcionService") +public class CasetaPeajeExcepcionServiceImpl implements CasetaPeajeExcepcionService { + + @Autowired + private CasetaPeajeExcepcionDAO casetaPeajeExcepcionDAO; + + @Override + public List buscarPorCasetaPeaje(CasetaPeaje caseta){ + return casetaPeajeExcepcionDAO.obtenerPorCasetaPeaje(caseta); + } + + @Override + public List obtenerTodos() { + return casetaPeajeExcepcionDAO.obtenerTodos(); + } + + @Override + public CasetaPeajeExcepcion obtenerID(Integer id) { + return casetaPeajeExcepcionDAO.obtenerID(id); + } + + @Transactional + public CasetaPeajeExcepcion suscribir(CasetaPeajeExcepcion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return casetaPeajeExcepcionDAO.suscribir(entidad); + } + + @Transactional + public CasetaPeajeExcepcion actualizacion(CasetaPeajeExcepcion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return casetaPeajeExcepcionDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(CasetaPeajeExcepcion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + casetaPeajeExcepcionDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java index e40e377f7..a00d13fab 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java @@ -1,99 +1,99 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CasetaPeajeDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; -import com.rjconsultores.ventaboletos.service.CasetaPeajeService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("casetaPeajeService") -public class CasetaPeajeServiceImpl implements CasetaPeajeService { - - @Autowired - private CasetaPeajeDAO casetaPeajeDAO; - - @Override - public List obtenerTodos() { - return casetaPeajeDAO.obtenerTodos(); - } - - @Override - public List buscarTodosOrdenadoPorDescricao() { - return casetaPeajeDAO.buscarTodosOrdenadoPorDescricao(); - } - - @Transactional - public CasetaPeaje obtenerID(Integer id) { - return casetaPeajeDAO.obtenerID(id); - } - - @Transactional - public CasetaPeaje suscribir(CasetaPeaje entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return casetaPeajeDAO.suscribir(entidad); - } - - @Transactional - public CasetaPeaje actualizacion(CasetaPeaje entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return casetaPeajeDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(CasetaPeaje entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - casetaPeajeDAO.actualizacion(entidad); - } - - @Override - public List buscar(String descricaoCasetaPeaje) { - return casetaPeajeDAO.buscar(descricaoCasetaPeaje); - } - - @Override - public Boolean validarDescricaoCasetaPeaje(CasetaPeaje casetaPeaje) { - List pracas = buscar(casetaPeaje.getDesccaseta()); - - if(casetaPeaje.getCasetaPeajeId() == null) { - if(pracas.isEmpty()){ - return Boolean.TRUE; - } - } else { - if(pracas.isEmpty() || pracas.get(0).getCasetaPeajeId().equals(casetaPeaje.getCasetaPeajeId())) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } - } - - return Boolean.FALSE; - } - - @Override - public void deletarVigencias(List cpes) { - casetaPeajeDAO.deletarVigencias(cpes); - } - - @Override - @Transactional - public CasetaPeaje suscribirOrActualizacion(CasetaPeaje casetaPeaje) { - if(casetaPeaje.getCasetaPeajeId() == null) { - return suscribir(casetaPeaje); - } else { - return actualizacion(casetaPeaje); - } - } +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CasetaPeajeDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; +import com.rjconsultores.ventaboletos.service.CasetaPeajeService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("casetaPeajeService") +public class CasetaPeajeServiceImpl implements CasetaPeajeService { + + @Autowired + private CasetaPeajeDAO casetaPeajeDAO; + + @Override + public List obtenerTodos() { + return casetaPeajeDAO.obtenerTodos(); + } + + @Override + public List buscarTodosOrdenadoPorDescricao() { + return casetaPeajeDAO.buscarTodosOrdenadoPorDescricao(); + } + + @Transactional + public CasetaPeaje obtenerID(Integer id) { + return casetaPeajeDAO.obtenerID(id); + } + + @Transactional + public CasetaPeaje suscribir(CasetaPeaje entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return casetaPeajeDAO.suscribir(entidad); + } + + @Transactional + public CasetaPeaje actualizacion(CasetaPeaje entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return casetaPeajeDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(CasetaPeaje entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + casetaPeajeDAO.actualizacion(entidad); + } + + @Override + public List buscar(String descricaoCasetaPeaje) { + return casetaPeajeDAO.buscar(descricaoCasetaPeaje); + } + + @Override + public Boolean validarDescricaoCasetaPeaje(CasetaPeaje casetaPeaje) { + List pracas = buscar(casetaPeaje.getDesccaseta()); + + if(casetaPeaje.getCasetaPeajeId() == null) { + if(pracas.isEmpty()){ + return Boolean.TRUE; + } + } else { + if(pracas.isEmpty() || pracas.get(0).getCasetaPeajeId().equals(casetaPeaje.getCasetaPeajeId())) { + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + return Boolean.FALSE; + } + + @Override + public void deletarVigencias(List cpes) { + casetaPeajeDAO.deletarVigencias(cpes); + } + + @Override + @Transactional + public CasetaPeaje suscribirOrActualizacion(CasetaPeaje casetaPeaje) { + if(casetaPeaje.getCasetaPeajeId() == null) { + return suscribir(casetaPeaje); + } else { + return actualizacion(casetaPeaje); + } + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaBloqueioImpPosteriorServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaBloqueioImpPosteriorServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaBloqueioImpPosteriorServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaBloqueioImpPosteriorServiceImpl.java index f6a142ee1..1f8b102e3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaBloqueioImpPosteriorServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaBloqueioImpPosteriorServiceImpl.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CategoriaBloqueioImpPosteriorDAO; -import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; -import com.rjconsultores.ventaboletos.service.CategoriaBloqueioImpPosteriorService; - -@Service("categoriaBloqueioImpPosteriorService") -public class CategoriaBloqueioImpPosteriorServiceImpl implements CategoriaBloqueioImpPosteriorService { - - @Autowired - private CategoriaBloqueioImpPosteriorDAO categoriaDAO; - - public List obtenerTodos() { - return categoriaDAO.obtenerTodos(); - } - - public CategoriaBloqueioImpPosterior obtenerID(Integer id) { - return categoriaDAO.obtenerID(id); - } - - @Transactional - public CategoriaBloqueioImpPosterior suscribir(CategoriaBloqueioImpPosterior entidad) { - - return categoriaDAO.suscribir(entidad); - } - - @Transactional - public CategoriaBloqueioImpPosterior actualizacion(CategoriaBloqueioImpPosterior entidad) { - - return categoriaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(CategoriaBloqueioImpPosterior entidad) { - - categoriaDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CategoriaBloqueioImpPosteriorDAO; +import com.rjconsultores.ventaboletos.entidad.CategoriaBloqueioImpPosterior; +import com.rjconsultores.ventaboletos.service.CategoriaBloqueioImpPosteriorService; + +@Service("categoriaBloqueioImpPosteriorService") +public class CategoriaBloqueioImpPosteriorServiceImpl implements CategoriaBloqueioImpPosteriorService { + + @Autowired + private CategoriaBloqueioImpPosteriorDAO categoriaDAO; + + public List obtenerTodos() { + return categoriaDAO.obtenerTodos(); + } + + public CategoriaBloqueioImpPosterior obtenerID(Integer id) { + return categoriaDAO.obtenerID(id); + } + + @Transactional + public CategoriaBloqueioImpPosterior suscribir(CategoriaBloqueioImpPosterior entidad) { + + return categoriaDAO.suscribir(entidad); + } + + @Transactional + public CategoriaBloqueioImpPosterior actualizacion(CategoriaBloqueioImpPosterior entidad) { + + return categoriaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(CategoriaBloqueioImpPosterior entidad) { + + categoriaDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaClaseServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaClaseServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaClaseServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaClaseServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCorridaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCorridaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaCorridaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCorridaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java index 3a45dd57b..869ab3248 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaCtrlServiceImpl.java @@ -1,240 +1,240 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CategoriaCtrlDAO; -import com.rjconsultores.ventaboletos.dao.CategoriaDAO; -import com.rjconsultores.ventaboletos.dao.ConstanteDAO; -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.CategoriaClase; -import com.rjconsultores.ventaboletos.entidad.CategoriaCorrida; -import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; -import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; -import com.rjconsultores.ventaboletos.entidad.CategoriaMarca; -import com.rjconsultores.ventaboletos.entidad.CategoriaMercado; -import com.rjconsultores.ventaboletos.entidad.CategoriaPeriodo; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.service.CategoriaCtrlService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Administrador - */ -@Service("categoriaCtrlService") -public class CategoriaCtrlServiceImpl implements CategoriaCtrlService { - - public static final int CATEGORIA_ADULTO = 1; - private static final String CVE_SISTEMA_CATEGORIA_FIDELIDADE = "FIDELIDADE"; - private static final String CONSTANTE_URL_WS_FIDELIDADE = "URL_WS_FIDELIDADE"; - private static final String CONSTANTE_SENHA_WS_FIDELIDADE = "SENHA_WS_FIDELIDADE"; - private static final String CONSTANTE_USUARIO_WS_FIDELIDADE = "USUARIO_WS_FIDELIDADE"; - private static final int CANT_MAX_CATEGORIA_ADULTO = 200; - @Autowired - private CategoriaCtrlDAO categoriaCtrlDAO; - @Autowired - private CategoriaDAO categoriaDAO; - - @Autowired - private ConstanteDAO constanteDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - private static Logger log = LogManager.getLogger(CategoriaCtrlServiceImpl.class); - - @Override - public CategoriaCtrl obtenerID(Integer id) { - - return categoriaCtrlDAO.obtenerID(id); - - } - - @Override - @Transactional - public CategoriaCtrl suscribir(CategoriaCtrl entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - entidad = categoriaCtrlDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - return entidad; - } - - /** - * Verifica se existe la categoria adulto. Sino existe, la adicciona. - * - * @param categoriaCtrl - */ - @Override - public CategoriaCtrl checarCategoriaAdulto(CategoriaCtrl categoriaCtrl, Boolean rdVendeAbertoSim, Boolean chkCancelaEmAberto, Boolean chkDevolveEmAberto, Boolean chkCancelaEmergencialEmAberto, Boolean chkTrocaTiturlidadeEmAberto, Boolean chkTrocaEmAberto) { - boolean existeAdulto = false; - List lsCategorias = new ArrayList(); - lsCategorias.addAll(categoriaCtrl.getCategoriaDescuentoList()); - - for (CategoriaDescuento cd : categoriaCtrl.getCategoriaDescuentoList()) { - if (cd.getCategoria().getCategoriaId().equals(CATEGORIA_ADULTO)) { - existeAdulto = true; - } - } - if (!existeAdulto) { - CategoriaDescuento categoriaDescuentoAdulto = this.getCategoriaDescuentoAdulto(categoriaCtrl); - - categoriaDescuentoAdulto.setIndVentaAbierto(rdVendeAbertoSim); - - if(rdVendeAbertoSim) { - //Aberto Vendido - categoriaDescuentoAdulto.setIndCancelaEmAberto(chkCancelaEmAberto); - categoriaDescuentoAdulto.setIndDevolveEmAberto(chkDevolveEmAberto); - categoriaDescuentoAdulto.setIndCancelaEmergencialEmAberto(chkCancelaEmergencialEmAberto); - categoriaDescuentoAdulto.setIndTrocaTitularidadeEmAberto(chkTrocaTiturlidadeEmAberto); - categoriaDescuentoAdulto.setIndTrocaEmAberto(chkTrocaEmAberto); - } else { - categoriaDescuentoAdulto.setIndCancelaEmAberto(false); - categoriaDescuentoAdulto.setIndDevolveEmAberto(false); - categoriaDescuentoAdulto.setIndCancelaEmergencialEmAberto(false); - categoriaDescuentoAdulto.setIndTrocaTitularidadeEmAberto(false); - categoriaDescuentoAdulto.setIndTrocaEmAberto(false); - } - - lsCategorias.add(categoriaDescuentoAdulto); - } - categoriaCtrl.setCategoriaDescuentoList(lsCategorias); - return categoriaCtrl; - } - - @Override - @Transactional - public CategoriaCtrl actualizacion(CategoriaCtrl entidad) { - - CategoriaCtrl originalClone = null; - try { - originalClone = entidad.getCloneObject(); - - } catch (Exception e) { - log.error("Erro ao clonar CategoriaCtrl: ",e); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - entidad = categoriaCtrlDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - return entidad; - - } - - @Override - @Transactional - public void borrar(CategoriaCtrl entidad) { - - for (CategoriaClase cc : entidad.getCategoriaClaseList()) { - cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - cc.setFecmodif(Calendar.getInstance().getTime()); - cc.setActivo(Boolean.FALSE); - } - for (CategoriaCorrida cc : entidad.getCategoriaCorridaList()) { - cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - cc.setFecmodif(Calendar.getInstance().getTime()); - cc.setActivo(Boolean.FALSE); - } - for (CategoriaDescuento cc : entidad.getCategoriaDescuentoList()) { - cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - cc.setFecmodif(Calendar.getInstance().getTime()); - cc.setActivo(Boolean.FALSE); - } - for (CategoriaMarca cc : entidad.getCategoriaMarcaList()) { - cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - cc.setFecmodif(Calendar.getInstance().getTime()); - cc.setActivo(Boolean.FALSE); - } - for (CategoriaMercado cc : entidad.getCategoriaMercadoList()) { - cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - cc.setFecmodif(Calendar.getInstance().getTime()); - cc.setActivo(Boolean.FALSE); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - categoriaCtrlDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - } - - private CategoriaDescuento getCategoriaDescuentoAdulto(CategoriaCtrl categoriaCtrl) { - CategoriaDescuento cd = new CategoriaDescuento(); - cd.setActivo(Boolean.TRUE); - cd.setCantautorizada(CANT_MAX_CATEGORIA_ADULTO); - cd.setCategoria(categoriaDAO.obtenerID(CATEGORIA_ADULTO)); - cd.setDescuentoimporte(BigDecimal.ZERO); - cd.setDescuentoporc(BigDecimal.ZERO); - - CategoriaPeriodo cp = new CategoriaPeriodo(); - cp.setActivo(Boolean.TRUE); - cp.setCategoriaDescuento(cd); - - Calendar datFin = Calendar.getInstance(); - datFin.set(2300, 11, 31); - - Calendar datInicio = Calendar.getInstance(); - datInicio.set(2000, 11, 31); - - cp.setFecfin(datFin.getTime()); - cp.setFecinicio(datInicio.getTime()); - - cp.setFecmodif(new java.util.Date()); - cp.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - List lsCatPeriodo = new ArrayList(); - lsCatPeriodo.add(cp); - - cd.setCategoriaPeriodoList(lsCatPeriodo); - cd.setCategoriaCtrl(categoriaCtrl); - cd.setFecmodif(new java.util.Date()); - cd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - cd.setIndAplicaFeriado(CategoriaDescuento.DisponibilidadeFeriado.GERARSEMPRE.valor()); - cd.setIndImporteOutros(true); - cd.setIndImportePedagio(true); - cd.setIndImporteSeguro(true); - cd.setIndImporteTxEmbarque(true); - - return cd; - } - - @Override - public boolean validaCategoriaProgramaFidelidade(Categoria categoria){ - - if(categoria.getCvesistema() != null && categoria.getCvesistema().equals(CVE_SISTEMA_CATEGORIA_FIDELIDADE)){ - Constante url = constanteDAO.buscarPorNomeConstante(CONSTANTE_URL_WS_FIDELIDADE); - Constante usuario = constanteDAO.buscarPorNomeConstante(CONSTANTE_USUARIO_WS_FIDELIDADE); - Constante senha = constanteDAO.buscarPorNomeConstante(CONSTANTE_SENHA_WS_FIDELIDADE); - - if(url == null || url.getValorconstante() == null || url.getValorconstante().isEmpty() || - usuario == null || usuario.getValorconstante() == null || usuario.getValorconstante().isEmpty() || - senha == null || senha.getValorconstante() == null || senha.getValorconstante().isEmpty()){ - - return Boolean.FALSE; - } - } - - return Boolean.TRUE; - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CategoriaCtrlDAO; +import com.rjconsultores.ventaboletos.dao.CategoriaDAO; +import com.rjconsultores.ventaboletos.dao.ConstanteDAO; +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.CategoriaClase; +import com.rjconsultores.ventaboletos.entidad.CategoriaCorrida; +import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; +import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; +import com.rjconsultores.ventaboletos.entidad.CategoriaMarca; +import com.rjconsultores.ventaboletos.entidad.CategoriaMercado; +import com.rjconsultores.ventaboletos.entidad.CategoriaPeriodo; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.service.CategoriaCtrlService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Administrador + */ +@Service("categoriaCtrlService") +public class CategoriaCtrlServiceImpl implements CategoriaCtrlService { + + public static final int CATEGORIA_ADULTO = 1; + private static final String CVE_SISTEMA_CATEGORIA_FIDELIDADE = "FIDELIDADE"; + private static final String CONSTANTE_URL_WS_FIDELIDADE = "URL_WS_FIDELIDADE"; + private static final String CONSTANTE_SENHA_WS_FIDELIDADE = "SENHA_WS_FIDELIDADE"; + private static final String CONSTANTE_USUARIO_WS_FIDELIDADE = "USUARIO_WS_FIDELIDADE"; + private static final int CANT_MAX_CATEGORIA_ADULTO = 200; + @Autowired + private CategoriaCtrlDAO categoriaCtrlDAO; + @Autowired + private CategoriaDAO categoriaDAO; + + @Autowired + private ConstanteDAO constanteDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + private static Logger log = LogManager.getLogger(CategoriaCtrlServiceImpl.class); + + @Override + public CategoriaCtrl obtenerID(Integer id) { + + return categoriaCtrlDAO.obtenerID(id); + + } + + @Override + @Transactional + public CategoriaCtrl suscribir(CategoriaCtrl entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + entidad = categoriaCtrlDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + return entidad; + } + + /** + * Verifica se existe la categoria adulto. Sino existe, la adicciona. + * + * @param categoriaCtrl + */ + @Override + public CategoriaCtrl checarCategoriaAdulto(CategoriaCtrl categoriaCtrl, Boolean rdVendeAbertoSim, Boolean chkCancelaEmAberto, Boolean chkDevolveEmAberto, Boolean chkCancelaEmergencialEmAberto, Boolean chkTrocaTiturlidadeEmAberto, Boolean chkTrocaEmAberto) { + boolean existeAdulto = false; + List lsCategorias = new ArrayList(); + lsCategorias.addAll(categoriaCtrl.getCategoriaDescuentoList()); + + for (CategoriaDescuento cd : categoriaCtrl.getCategoriaDescuentoList()) { + if (cd.getCategoria().getCategoriaId().equals(CATEGORIA_ADULTO)) { + existeAdulto = true; + } + } + if (!existeAdulto) { + CategoriaDescuento categoriaDescuentoAdulto = this.getCategoriaDescuentoAdulto(categoriaCtrl); + + categoriaDescuentoAdulto.setIndVentaAbierto(rdVendeAbertoSim); + + if(rdVendeAbertoSim) { + //Aberto Vendido + categoriaDescuentoAdulto.setIndCancelaEmAberto(chkCancelaEmAberto); + categoriaDescuentoAdulto.setIndDevolveEmAberto(chkDevolveEmAberto); + categoriaDescuentoAdulto.setIndCancelaEmergencialEmAberto(chkCancelaEmergencialEmAberto); + categoriaDescuentoAdulto.setIndTrocaTitularidadeEmAberto(chkTrocaTiturlidadeEmAberto); + categoriaDescuentoAdulto.setIndTrocaEmAberto(chkTrocaEmAberto); + } else { + categoriaDescuentoAdulto.setIndCancelaEmAberto(false); + categoriaDescuentoAdulto.setIndDevolveEmAberto(false); + categoriaDescuentoAdulto.setIndCancelaEmergencialEmAberto(false); + categoriaDescuentoAdulto.setIndTrocaTitularidadeEmAberto(false); + categoriaDescuentoAdulto.setIndTrocaEmAberto(false); + } + + lsCategorias.add(categoriaDescuentoAdulto); + } + categoriaCtrl.setCategoriaDescuentoList(lsCategorias); + return categoriaCtrl; + } + + @Override + @Transactional + public CategoriaCtrl actualizacion(CategoriaCtrl entidad) { + + CategoriaCtrl originalClone = null; + try { + originalClone = entidad.getCloneObject(); + + } catch (Exception e) { + log.error("Erro ao clonar CategoriaCtrl: ",e); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + entidad = categoriaCtrlDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + return entidad; + + } + + @Override + @Transactional + public void borrar(CategoriaCtrl entidad) { + + for (CategoriaClase cc : entidad.getCategoriaClaseList()) { + cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + cc.setFecmodif(Calendar.getInstance().getTime()); + cc.setActivo(Boolean.FALSE); + } + for (CategoriaCorrida cc : entidad.getCategoriaCorridaList()) { + cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + cc.setFecmodif(Calendar.getInstance().getTime()); + cc.setActivo(Boolean.FALSE); + } + for (CategoriaDescuento cc : entidad.getCategoriaDescuentoList()) { + cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + cc.setFecmodif(Calendar.getInstance().getTime()); + cc.setActivo(Boolean.FALSE); + } + for (CategoriaMarca cc : entidad.getCategoriaMarcaList()) { + cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + cc.setFecmodif(Calendar.getInstance().getTime()); + cc.setActivo(Boolean.FALSE); + } + for (CategoriaMercado cc : entidad.getCategoriaMercadoList()) { + cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + cc.setFecmodif(Calendar.getInstance().getTime()); + cc.setActivo(Boolean.FALSE); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + categoriaCtrlDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + } + + private CategoriaDescuento getCategoriaDescuentoAdulto(CategoriaCtrl categoriaCtrl) { + CategoriaDescuento cd = new CategoriaDescuento(); + cd.setActivo(Boolean.TRUE); + cd.setCantautorizada(CANT_MAX_CATEGORIA_ADULTO); + cd.setCategoria(categoriaDAO.obtenerID(CATEGORIA_ADULTO)); + cd.setDescuentoimporte(BigDecimal.ZERO); + cd.setDescuentoporc(BigDecimal.ZERO); + + CategoriaPeriodo cp = new CategoriaPeriodo(); + cp.setActivo(Boolean.TRUE); + cp.setCategoriaDescuento(cd); + + Calendar datFin = Calendar.getInstance(); + datFin.set(2300, 11, 31); + + Calendar datInicio = Calendar.getInstance(); + datInicio.set(2000, 11, 31); + + cp.setFecfin(datFin.getTime()); + cp.setFecinicio(datInicio.getTime()); + + cp.setFecmodif(new java.util.Date()); + cp.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + List lsCatPeriodo = new ArrayList(); + lsCatPeriodo.add(cp); + + cd.setCategoriaPeriodoList(lsCatPeriodo); + cd.setCategoriaCtrl(categoriaCtrl); + cd.setFecmodif(new java.util.Date()); + cd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + cd.setIndAplicaFeriado(CategoriaDescuento.DisponibilidadeFeriado.GERARSEMPRE.valor()); + cd.setIndImporteOutros(true); + cd.setIndImportePedagio(true); + cd.setIndImporteSeguro(true); + cd.setIndImporteTxEmbarque(true); + + return cd; + } + + @Override + public boolean validaCategoriaProgramaFidelidade(Categoria categoria){ + + if(categoria.getCvesistema() != null && categoria.getCvesistema().equals(CVE_SISTEMA_CATEGORIA_FIDELIDADE)){ + Constante url = constanteDAO.buscarPorNomeConstante(CONSTANTE_URL_WS_FIDELIDADE); + Constante usuario = constanteDAO.buscarPorNomeConstante(CONSTANTE_USUARIO_WS_FIDELIDADE); + Constante senha = constanteDAO.buscarPorNomeConstante(CONSTANTE_SENHA_WS_FIDELIDADE); + + if(url == null || url.getValorconstante() == null || url.getValorconstante().isEmpty() || + usuario == null || usuario.getValorconstante() == null || usuario.getValorconstante().isEmpty() || + senha == null || senha.getValorconstante() == null || senha.getValorconstante().isEmpty()){ + + return Boolean.FALSE; + } + } + + return Boolean.TRUE; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaDescuentoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaDescuentoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaDescuentoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaDescuentoServiceImpl.java index edc4b1cd8..3980d4fad 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaDescuentoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaDescuentoServiceImpl.java @@ -1,82 +1,82 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CategoriaDescuentoDAO; -import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; -import com.rjconsultores.ventaboletos.service.CategoriaDescuentoService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Administrador - */ -@Service("categoriaDescuentoService") -public class CategoriaDescuentoServiceImpl implements CategoriaDescuentoService { - - @Autowired - private CategoriaDescuentoDAO categoriaDescuentoDAO; - private static Logger log = LogManager.getLogger(CategoriaDescuentoServiceImpl.class); - @Autowired - private LogAuditoriaService logAuditoriaService; - - - public List obtenerTodos() { - return categoriaDescuentoDAO.obtenerTodos(); - } - - public CategoriaDescuento obtenerID(Integer id) { - return categoriaDescuentoDAO.obtenerID(id); - } - - @Transactional - public CategoriaDescuento suscribir(CategoriaDescuento entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - entidad = categoriaDescuentoDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, null); - return entidad; - } - - @Transactional - public CategoriaDescuento actualizacion(CategoriaDescuento entidad) { - - CategoriaDescuento originalClone = null; - try { - originalClone = entidad.getCloneObject(); - } catch (Exception e) { - log.error("Erro ao clonar TitularId",e); - } - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - entidad = categoriaDescuentoDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, null); - return entidad; - } - - @Transactional - public void borrar(CategoriaDescuento entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - categoriaDescuentoDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, null); - - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CategoriaDescuentoDAO; +import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; +import com.rjconsultores.ventaboletos.service.CategoriaDescuentoService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Administrador + */ +@Service("categoriaDescuentoService") +public class CategoriaDescuentoServiceImpl implements CategoriaDescuentoService { + + @Autowired + private CategoriaDescuentoDAO categoriaDescuentoDAO; + private static Logger log = LogManager.getLogger(CategoriaDescuentoServiceImpl.class); + @Autowired + private LogAuditoriaService logAuditoriaService; + + + public List obtenerTodos() { + return categoriaDescuentoDAO.obtenerTodos(); + } + + public CategoriaDescuento obtenerID(Integer id) { + return categoriaDescuentoDAO.obtenerID(id); + } + + @Transactional + public CategoriaDescuento suscribir(CategoriaDescuento entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + entidad = categoriaDescuentoDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, null); + return entidad; + } + + @Transactional + public CategoriaDescuento actualizacion(CategoriaDescuento entidad) { + + CategoriaDescuento originalClone = null; + try { + originalClone = entidad.getCloneObject(); + } catch (Exception e) { + log.error("Erro ao clonar TitularId",e); + } + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + entidad = categoriaDescuentoDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, null); + return entidad; + } + + @Transactional + public void borrar(CategoriaDescuento entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + categoriaDescuentoDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, null); + + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaFormAutorizacaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaFormAutorizacaoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaFormAutorizacaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaFormAutorizacaoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaMarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaMarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaMarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaMarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaMercadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaMercadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaMercadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaMercadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaOrgaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaOrgaoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaOrgaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaOrgaoServiceImpl.java index d7b2bb00a..f3caf0cdd 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaOrgaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaOrgaoServiceImpl.java @@ -1,77 +1,77 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CategoriaOrgaoDAO; -import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; -import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; -import com.rjconsultores.ventaboletos.service.CategoriaOrgaoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - - -@Service("categoriaOrgaoService") -public class CategoriaOrgaoServiceImpl implements CategoriaOrgaoService { - - @Autowired - private CategoriaOrgaoDAO categoriaOrgaoDAO; - - public List obtenerTodos() { - return categoriaOrgaoDAO.obtenerTodos(); - } - - public CategoriaOrgao obtenerID(Integer id) { - return categoriaOrgaoDAO.obtenerID(id); - } - - @Transactional - public CategoriaOrgao suscribir(CategoriaOrgao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return categoriaOrgaoDAO.suscribir(entidad); - } - - @Transactional - public CategoriaOrgao actualizacion(CategoriaOrgao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return categoriaOrgaoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(CategoriaOrgao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - categoriaOrgaoDAO.actualizacion(entidad); - } - - public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl) { - return categoriaOrgaoDAO.busquedaPorCategoriaCtrl(categoriaCtrl); - } - - @Override - @Transactional - public void actualizacionAuditagem(List lsCategoriaOrgao) { - for (CategoriaOrgao cc : lsCategoriaOrgao) { - if(Boolean.TRUE.equals(cc.getActivo())) { - continue; - } - categoriaOrgaoDAO.actualizacion(cc); - } - - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CategoriaOrgaoDAO; +import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; +import com.rjconsultores.ventaboletos.entidad.CategoriaOrgao; +import com.rjconsultores.ventaboletos.service.CategoriaOrgaoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + + +@Service("categoriaOrgaoService") +public class CategoriaOrgaoServiceImpl implements CategoriaOrgaoService { + + @Autowired + private CategoriaOrgaoDAO categoriaOrgaoDAO; + + public List obtenerTodos() { + return categoriaOrgaoDAO.obtenerTodos(); + } + + public CategoriaOrgao obtenerID(Integer id) { + return categoriaOrgaoDAO.obtenerID(id); + } + + @Transactional + public CategoriaOrgao suscribir(CategoriaOrgao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return categoriaOrgaoDAO.suscribir(entidad); + } + + @Transactional + public CategoriaOrgao actualizacion(CategoriaOrgao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return categoriaOrgaoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(CategoriaOrgao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + categoriaOrgaoDAO.actualizacion(entidad); + } + + public CategoriaOrgao busquedaPorCategoriaCtrl(CategoriaCtrl categoriaCtrl) { + return categoriaOrgaoDAO.busquedaPorCategoriaCtrl(categoriaCtrl); + } + + @Override + @Transactional + public void actualizacionAuditagem(List lsCategoriaOrgao) { + for (CategoriaOrgao cc : lsCategoriaOrgao) { + if(Boolean.TRUE.equals(cc.getActivo())) { + continue; + } + categoriaOrgaoDAO.actualizacion(cc); + } + + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaPeriodoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaPeriodoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaPeriodoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaPeriodoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaExcecaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaExcecaoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaExcecaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaExcecaoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaRutaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java index 9672b0e92..b3a0862f4 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java @@ -1,147 +1,147 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CategoriaDAO; -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.CategoriaCtrl; -import com.rjconsultores.ventaboletos.service.CategoriaService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Administrador - */ -@Service("categoriaService") -public class CategoriaServiceImpl implements CategoriaService { - - @Autowired - private CategoriaDAO categoriaDAO; - private static Logger log = LogManager.getLogger(CategoriaServiceImpl.class); - @Autowired - private LogAuditoriaService logAuditoriaService; - - - public List obtenerTodos() { - return categoriaDAO.obtenerTodos(); - } - - public Categoria obtenerID(Integer id) { - - Categoria categoria = categoriaDAO.obtenerID(id); - try { - categoria.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return categoria; - - - } - - @Transactional - public Categoria suscribir(Categoria entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - entidad = categoriaDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, null); - - logAuditoriaService.auditar(null, entidad, null); - return entidad; - - } - - @Transactional - public Categoria actualizacion(Categoria entidad) { - - Categoria originalClone = null; - try { - originalClone = entidad.getCloneObject(); - } catch (Exception e) { - log.error("Erro ao clonar TitularId",e); - } - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - entidad = categoriaDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, null); - return entidad; - } - - @Transactional - public void borrar(Categoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - categoriaDAO.actualizacion(entidad); - } - - public List buscar(String desccategoria) { - return categoriaDAO.buscar(desccategoria); - } - - @Override - public List buscarCategoriaPesquisada(String desccategoria) { - return categoriaDAO.buscarCategoriaPesquisada(desccategoria); - } - - public List obtenerTodasCategoriasVisibles() { - List listCategoriasVisibles = new ArrayList(); - List lsCategorias = obtenerTodos(); - - for (Categoria c : lsCategorias) { - boolean esVisible = true; - for (Integer id : CategoriaCtrl.idsCategoriasNoVisible) { - if (id.equals(c.getCategoriaId())) { - esVisible = false; - } - } - if (esVisible) { - listCategoriasVisibles.add(c); - } - - } - return listCategoriasVisibles; - } - - @Override - public Categoria buscarUmaCategoria(String desccategoria) { - List categoriaList = buscar(desccategoria); - if (categoriaList.isEmpty()) { - return null; - } - return categoriaList.get(0); - } - - @Override - public List buscarCategoriaOrgaoConcedente(String orgaoConcedente) { - List listCategorias = new ArrayList(); - List categoriaList = categoriaDAO.buscarCategoriaOrgaoConcedente(orgaoConcedente); - int listSize = categoriaList.size(); - - for (int c =0; c obtenerTodos() { + return categoriaDAO.obtenerTodos(); + } + + public Categoria obtenerID(Integer id) { + + Categoria categoria = categoriaDAO.obtenerID(id); + try { + categoria.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return categoria; + + + } + + @Transactional + public Categoria suscribir(Categoria entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + entidad = categoriaDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, null); + + logAuditoriaService.auditar(null, entidad, null); + return entidad; + + } + + @Transactional + public Categoria actualizacion(Categoria entidad) { + + Categoria originalClone = null; + try { + originalClone = entidad.getCloneObject(); + } catch (Exception e) { + log.error("Erro ao clonar TitularId",e); + } + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + entidad = categoriaDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, null); + return entidad; + } + + @Transactional + public void borrar(Categoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + categoriaDAO.actualizacion(entidad); + } + + public List buscar(String desccategoria) { + return categoriaDAO.buscar(desccategoria); + } + + @Override + public List buscarCategoriaPesquisada(String desccategoria) { + return categoriaDAO.buscarCategoriaPesquisada(desccategoria); + } + + public List obtenerTodasCategoriasVisibles() { + List listCategoriasVisibles = new ArrayList(); + List lsCategorias = obtenerTodos(); + + for (Categoria c : lsCategorias) { + boolean esVisible = true; + for (Integer id : CategoriaCtrl.idsCategoriasNoVisible) { + if (id.equals(c.getCategoriaId())) { + esVisible = false; + } + } + if (esVisible) { + listCategoriasVisibles.add(c); + } + + } + return listCategoriasVisibles; + } + + @Override + public Categoria buscarUmaCategoria(String desccategoria) { + List categoriaList = buscar(desccategoria); + if (categoriaList.isEmpty()) { + return null; + } + return categoriaList.get(0); + } + + @Override + public List buscarCategoriaOrgaoConcedente(String orgaoConcedente) { + List listCategorias = new ArrayList(); + List categoriaList = categoriaDAO.buscarCategoriaOrgaoConcedente(orgaoConcedente); + int listSize = categoriaList.size(); + + for (int c =0; c obtenerTodos() { - return clienteCursoDAO.obtenerTodos(); - } - - @Override - public ClienteCurso obtenerID(Integer id) { - return clienteCursoDAO.obtenerID(id); - } - - @Transactional - @Override - public ClienteCurso suscribir(ClienteCurso entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return clienteCursoDAO.suscribir(entidad); - } - - @Transactional - @Override - public ClienteCurso actualizacion(ClienteCurso entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return clienteCursoDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(ClienteCurso entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - clienteCursoDAO.actualizacion(entidad); - } - - @Override - public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso) { - return clienteCursoDAO.buscarClienteCurso(cliente, curso); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ClienteCursoDAO; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteCurso; +import com.rjconsultores.ventaboletos.entidad.Curso; +import com.rjconsultores.ventaboletos.service.ClienteCursoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("clienteCursoService") +public class ClienteCursoServiceImpl implements ClienteCursoService { + + @Autowired + private ClienteCursoDAO clienteCursoDAO; + + @Override + public List obtenerTodos() { + return clienteCursoDAO.obtenerTodos(); + } + + @Override + public ClienteCurso obtenerID(Integer id) { + return clienteCursoDAO.obtenerID(id); + } + + @Transactional + @Override + public ClienteCurso suscribir(ClienteCurso entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return clienteCursoDAO.suscribir(entidad); + } + + @Transactional + @Override + public ClienteCurso actualizacion(ClienteCurso entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return clienteCursoDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(ClienteCurso entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + clienteCursoDAO.actualizacion(entidad); + } + + @Override + public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso) { + return clienteCursoDAO.buscarClienteCurso(cliente, curso); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ClienteDescuentoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteDescuentoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ClienteDescuentoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteDescuentoServiceImpl.java index 64733b5ca..477f7ce66 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ClienteDescuentoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteDescuentoServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ClienteDescuentoDAO; -import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; -import com.rjconsultores.ventaboletos.service.ClienteDescuentoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("clienteDescuentoService") -public class ClienteDescuentoServiceImpl implements ClienteDescuentoService { - - @Autowired - private ClienteDescuentoDAO clienteDescuentoDAO; - - @Transactional - public ClienteDescuento suscribir(ClienteDescuento entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(0); - - return clienteDescuentoDAO.suscribir(entidad); - } - - public ClienteDescuento obtenerID(Integer id) { - return clienteDescuentoDAO.obtenerID(id); - } - - - public List obtenerTodos() { - return clienteDescuentoDAO.obtenerTodos(); - } - - @Transactional - public void borrar(ClienteDescuento entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(0); - - clienteDescuentoDAO.borrar(entidad); - } - - @Transactional - public ClienteDescuento actualizacion(ClienteDescuento entidad) { - return clienteDescuentoDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ClienteDescuentoDAO; +import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; +import com.rjconsultores.ventaboletos.service.ClienteDescuentoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("clienteDescuentoService") +public class ClienteDescuentoServiceImpl implements ClienteDescuentoService { + + @Autowired + private ClienteDescuentoDAO clienteDescuentoDAO; + + @Transactional + public ClienteDescuento suscribir(ClienteDescuento entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(0); + + return clienteDescuentoDAO.suscribir(entidad); + } + + public ClienteDescuento obtenerID(Integer id) { + return clienteDescuentoDAO.obtenerID(id); + } + + + public List obtenerTodos() { + return clienteDescuentoDAO.obtenerTodos(); + } + + @Transactional + public void borrar(ClienteDescuento entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(0); + + clienteDescuentoDAO.borrar(entidad); + } + + @Transactional + public ClienteDescuento actualizacion(ClienteDescuento entidad) { + return clienteDescuentoDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ClienteDireccionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteDireccionServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ClienteDireccionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteDireccionServiceImpl.java index 695d41fc0..5db246afa 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ClienteDireccionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteDireccionServiceImpl.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ClienteDireccionDAO; -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; -import com.rjconsultores.ventaboletos.service.ClienteDireccionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Desenvolvimento - */ -@Service("clienteDireccionService") -public class ClienteDireccionServiceImpl implements ClienteDireccionService { - - @Autowired - private ClienteDireccionDAO clienteDAO; - - public List obtenerTodos() { - return clienteDAO.obtenerTodos(); - } - - public ClienteDireccion obtenerID(Integer id) { - return clienteDAO.obtenerID(id); - } - - @Transactional - public ClienteDireccion suscribir(ClienteDireccion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return clienteDAO.suscribir(entidad); - } - - @Transactional - public ClienteDireccion actualizacion(ClienteDireccion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return clienteDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ClienteDireccion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - clienteDAO.actualizacion(entidad); - } - - public List buscar(Integer clienteId) { - return clienteDAO.buscar(clienteId); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ClienteDireccionDAO; +import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; +import com.rjconsultores.ventaboletos.service.ClienteDireccionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Desenvolvimento + */ +@Service("clienteDireccionService") +public class ClienteDireccionServiceImpl implements ClienteDireccionService { + + @Autowired + private ClienteDireccionDAO clienteDAO; + + public List obtenerTodos() { + return clienteDAO.obtenerTodos(); + } + + public ClienteDireccion obtenerID(Integer id) { + return clienteDAO.obtenerID(id); + } + + @Transactional + public ClienteDireccion suscribir(ClienteDireccion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return clienteDAO.suscribir(entidad); + } + + @Transactional + public ClienteDireccion actualizacion(ClienteDireccion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return clienteDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ClienteDireccion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + clienteDAO.actualizacion(entidad); + } + + public List buscar(Integer clienteId) { + return clienteDAO.buscar(clienteId); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ClienteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ClienteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteServiceImpl.java index 63de6a96e..bb1f3d41d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ClienteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ClienteServiceImpl.java @@ -1,84 +1,84 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ClienteDAO; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.service.ClienteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Desenvolvimento - */ -@Service("clienteService") -public class ClienteServiceImpl implements ClienteService { - - @Autowired - private ClienteDAO clienteDAO; - - public List obtenerTodos() { - return clienteDAO.obtenerTodos(); - } - - public Cliente obtenerID(Integer id) { - return clienteDAO.obtenerID(id); - } - - @Transactional - public Cliente suscribir(Cliente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return clienteDAO.suscribir(entidad); - } - - @Transactional - public Cliente actualizacion(Cliente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return clienteDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(Cliente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - clienteDAO.actualizacion(entidad); - } - - public List buscar(String nombCliente) { - return clienteDAO.buscar(nombCliente); - } - - @Override - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa) { - return clienteDAO.buscarPorNumeroFidelidade(numeroFidelidade, empresa); - } - - @Override - public List buscarPorDocumento(String documento) { - return clienteDAO.buscarPorDocumento(documento); - } - - @Override - public Cliente buscarPorNumeroFidelidade(String numeroFidelidade) { - // TODO Auto-generated method stub - return clienteDAO.buscarPorNumeroFidelidade(numeroFidelidade); - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ClienteDAO; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.service.ClienteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Desenvolvimento + */ +@Service("clienteService") +public class ClienteServiceImpl implements ClienteService { + + @Autowired + private ClienteDAO clienteDAO; + + public List obtenerTodos() { + return clienteDAO.obtenerTodos(); + } + + public Cliente obtenerID(Integer id) { + return clienteDAO.obtenerID(id); + } + + @Transactional + public Cliente suscribir(Cliente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return clienteDAO.suscribir(entidad); + } + + @Transactional + public Cliente actualizacion(Cliente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return clienteDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(Cliente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + clienteDAO.actualizacion(entidad); + } + + public List buscar(String nombCliente) { + return clienteDAO.buscar(nombCliente); + } + + @Override + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade, Empresa empresa) { + return clienteDAO.buscarPorNumeroFidelidade(numeroFidelidade, empresa); + } + + @Override + public List buscarPorDocumento(String documento) { + return clienteDAO.buscarPorDocumento(documento); + } + + @Override + public Cliente buscarPorNumeroFidelidade(String numeroFidelidade) { + // TODO Auto-generated method stub + return clienteDAO.buscarPorNumeroFidelidade(numeroFidelidade); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CobrancaAdcPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CobrancaAdcPuntoVentaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CobrancaAdcPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CobrancaAdcPuntoVentaServiceImpl.java index 8cef830bd..b8d88eb8d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CobrancaAdcPuntoVentaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CobrancaAdcPuntoVentaServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CobrancaAdcPuntoVentaDAO; -import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.CobrancaAdcPuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("cobrancaAdcPuntoVentaService") -public class CobrancaAdcPuntoVentaServiceImpl implements CobrancaAdcPuntoVentaService { - - @Autowired - CobrancaAdcPuntoVentaDAO cobrancaAdcPuntoVentaDAO; - - @Override - public List obtenerTodos() { - return cobrancaAdcPuntoVentaDAO.obtenerTodos(); - } - - @Override - public CobrancaAdcPuntoVenta obtenerID(Integer id) { - return cobrancaAdcPuntoVentaDAO.obtenerID(id); - } - - @Override - @Transactional - public CobrancaAdcPuntoVenta suscribir(CobrancaAdcPuntoVenta entidad) { - entidad.setActivo(true); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return cobrancaAdcPuntoVentaDAO.suscribir(entidad); - } - - @Override - @Transactional - public CobrancaAdcPuntoVenta actualizacion(CobrancaAdcPuntoVenta entidad) { - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return cobrancaAdcPuntoVentaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(CobrancaAdcPuntoVenta entidad) { - entidad.setActivo(false); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - cobrancaAdcPuntoVentaDAO.actualizacion(entidad); - } - - public List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal) { - return cobrancaAdcPuntoVentaDAO.buscaHistoricoCobranca(cobranca, dataInicial, dataFinal); - } - - @Override - public List buscarTodasAsCobrancas(PuntoVenta puntoVenta) { - return cobrancaAdcPuntoVentaDAO.buscarTodasAsCobrancas(puntoVenta); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CobrancaAdcPuntoVentaDAO; +import com.rjconsultores.ventaboletos.entidad.CobrancaAdcPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.CobrancaAdicionalHistorico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.CobrancaAdcPuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("cobrancaAdcPuntoVentaService") +public class CobrancaAdcPuntoVentaServiceImpl implements CobrancaAdcPuntoVentaService { + + @Autowired + CobrancaAdcPuntoVentaDAO cobrancaAdcPuntoVentaDAO; + + @Override + public List obtenerTodos() { + return cobrancaAdcPuntoVentaDAO.obtenerTodos(); + } + + @Override + public CobrancaAdcPuntoVenta obtenerID(Integer id) { + return cobrancaAdcPuntoVentaDAO.obtenerID(id); + } + + @Override + @Transactional + public CobrancaAdcPuntoVenta suscribir(CobrancaAdcPuntoVenta entidad) { + entidad.setActivo(true); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return cobrancaAdcPuntoVentaDAO.suscribir(entidad); + } + + @Override + @Transactional + public CobrancaAdcPuntoVenta actualizacion(CobrancaAdcPuntoVenta entidad) { + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return cobrancaAdcPuntoVentaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(CobrancaAdcPuntoVenta entidad) { + entidad.setActivo(false); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + cobrancaAdcPuntoVentaDAO.actualizacion(entidad); + } + + public List buscaHistoricoCobranca(CobrancaAdcPuntoVenta cobranca, Date dataInicial, Date dataFinal) { + return cobrancaAdcPuntoVentaDAO.buscaHistoricoCobranca(cobranca, dataInicial, dataFinal); + } + + @Override + public List buscarTodasAsCobrancas(PuntoVenta puntoVenta) { + return cobrancaAdcPuntoVentaDAO.buscarTodasAsCobrancas(puntoVenta); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CodigoBarraTrechoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CodigoBarraTrechoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CodigoBarraTrechoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CodigoBarraTrechoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java index 402e97916..d6474a8aa 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java @@ -1,106 +1,106 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CoeficienteTarifaDAO; -import com.rjconsultores.ventaboletos.dao.OrgaoTramoDAO; -import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; -import com.rjconsultores.ventaboletos.service.CoeficienteTarifaService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("coeficienteTarifaService") -public class CoeficienteTarifaServiceImpl implements CoeficienteTarifaService { - - @Autowired - private CoeficienteTarifaDAO coeficienteTarifaDAO; - @Autowired - private OrgaoTramoDAO orgaoTramoDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - private static final Logger log = LogManager.getLogger(OrgaoConcedenteServiceImpl.class); - - - public List obtenerTodos() { - return coeficienteTarifaDAO.obtenerTodos(); - } - - public CoeficienteTarifa obtenerID(Integer id) { - - CoeficienteTarifa coeficienteTarifa = coeficienteTarifaDAO.obtenerID(id); - - try { - coeficienteTarifa.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return coeficienteTarifa; - - } - - @Transactional - public CoeficienteTarifa suscribir(CoeficienteTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - - entidad = coeficienteTarifaDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, null); - return entidad; - } - - @Transactional - public CoeficienteTarifa actualizacion(CoeficienteTarifa entidad) { - - - try { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - CoeficienteTarifa originalClone = entidad.getCloneObject(); - entidad = coeficienteTarifaDAO.actualizacion(entidad); - - logAuditoriaService.auditar(originalClone, entidad, null); - - - } catch (Exception e) { - log.error(e); - } - - return entidad; - } - - @Transactional - public void borrar(CoeficienteTarifa entidad) throws RegistroConDependenciaException { - long count =0; - count +=orgaoTramoDAO.count("coeficienteTarifa1", entidad); - count +=orgaoTramoDAO.count("coeficienteTarifa2", entidad); - count +=orgaoTramoDAO.count("coeficienteTarifa3", entidad); - - if (count >0 ){ - throw new RegistroConDependenciaException(); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - entidad = coeficienteTarifaDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, null); - } - - public List buscar(String nomb) { - return coeficienteTarifaDAO.buscar(nomb); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CoeficienteTarifaDAO; +import com.rjconsultores.ventaboletos.dao.OrgaoTramoDAO; +import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; +import com.rjconsultores.ventaboletos.service.CoeficienteTarifaService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("coeficienteTarifaService") +public class CoeficienteTarifaServiceImpl implements CoeficienteTarifaService { + + @Autowired + private CoeficienteTarifaDAO coeficienteTarifaDAO; + @Autowired + private OrgaoTramoDAO orgaoTramoDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + private static final Logger log = LogManager.getLogger(OrgaoConcedenteServiceImpl.class); + + + public List obtenerTodos() { + return coeficienteTarifaDAO.obtenerTodos(); + } + + public CoeficienteTarifa obtenerID(Integer id) { + + CoeficienteTarifa coeficienteTarifa = coeficienteTarifaDAO.obtenerID(id); + + try { + coeficienteTarifa.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return coeficienteTarifa; + + } + + @Transactional + public CoeficienteTarifa suscribir(CoeficienteTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + + entidad = coeficienteTarifaDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, null); + return entidad; + } + + @Transactional + public CoeficienteTarifa actualizacion(CoeficienteTarifa entidad) { + + + try { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + CoeficienteTarifa originalClone = entidad.getCloneObject(); + entidad = coeficienteTarifaDAO.actualizacion(entidad); + + logAuditoriaService.auditar(originalClone, entidad, null); + + + } catch (Exception e) { + log.error(e); + } + + return entidad; + } + + @Transactional + public void borrar(CoeficienteTarifa entidad) throws RegistroConDependenciaException { + long count =0; + count +=orgaoTramoDAO.count("coeficienteTarifa1", entidad); + count +=orgaoTramoDAO.count("coeficienteTarifa2", entidad); + count +=orgaoTramoDAO.count("coeficienteTarifa3", entidad); + + if (count >0 ){ + throw new RegistroConDependenciaException(); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + entidad = coeficienteTarifaDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, null); + } + + public List buscar(String nomb) { + return coeficienteTarifaDAO.buscar(nomb); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ColoniaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ColoniaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ColoniaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ColoniaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ComisionistaExternoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComisionistaExternoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ComisionistaExternoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComisionistaExternoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ComissaoReceitaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComissaoReceitaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ComissaoReceitaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComissaoReceitaServiceImpl.java index 3d7ee0735..377d20b2c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ComissaoReceitaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComissaoReceitaServiceImpl.java @@ -1,153 +1,153 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ComissaoLogDAO; -import com.rjconsultores.ventaboletos.dao.ComissaoReceitaDAO; -import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.ComissaoReceitaService; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("comissaoReceitaService") -public class ComissaoReceitaServiceImpl implements ComissaoReceitaService { - - private static final Logger log = LogManager.getLogger(CalculoComissaoServiceImpl.class); - - @Autowired - private ComissaoReceitaDAO comissaoReceitaDAO; - - @Autowired - private ComissaoLogDAO comissaoLogDAO; - - @Override - public List obtenerTodos() { - return comissaoReceitaDAO.obtenerTodos(); - } - - @Override - public ComissaoReceita obtenerID(Integer id) { - return comissaoReceitaDAO.obtenerID(id); - } - - @Override - @Transactional - public ComissaoReceita suscribir(ComissaoReceita entidad) { - entidad.setActivo(Boolean.TRUE); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - return comissaoReceitaDAO.suscribir(entidad); - } - - @Override - @Transactional - public ComissaoReceita actualizacion(ComissaoReceita entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - return comissaoReceitaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ComissaoReceita entidad) { - entidad.setActivo(Boolean.TRUE); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - comissaoReceitaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void reterComissaoReceitaDiaria(Integer empresaId, Integer puntoVentaId, Integer usuarioId, List receitas) throws BusinessException { - try { - Empresa empresa = new Empresa(empresaId); - PuntoVenta puntoVenta = new PuntoVenta(puntoVentaId); - for (com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita comissaoReceitaVO : receitas) { - ComissaoReceita comissaoReceita = new ComissaoReceita(comissaoReceitaVO); - comissaoReceita.setEmpresa(empresa); - comissaoReceita.setPuntoVenta(puntoVenta); - comissaoReceita.setUsuarioId(usuarioId); - comissaoReceitaDAO.suscribir(comissaoReceita); - comissaoLogDAO.suscribirTodos(comissaoReceitaVO.getLsComissaoLog()); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - - @Override - public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { - - List lsComissaoReceitasVO = new ArrayList(); - List lsComissaoReceitas = comissaoReceitaDAO.recuperarComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); - for (ComissaoReceita comissaoReceita : lsComissaoReceitas) { - com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita comissaoReceitaVO = new com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita(); - comissaoReceitaVO.setCancelados(comissaoReceita.getCancelados()); - comissaoReceitaVO.setCanceladosGAP(comissaoReceita.getCancelgap()); - comissaoReceitaVO.setComissaoBPRDiaria(comissaoReceita.getComissaoBpr()); - comissaoReceitaVO.setComissaoEntregaPassagemDiaria(comissaoReceita.getComissaoEntregaPassagem()); - comissaoReceitaVO.setComissaoExcessoBagagemDiaria(comissaoReceita.getComissaoExcessoBagagem()); - comissaoReceitaVO.setComissaoOutrosDiaria(comissaoReceita.getComissaoOutros()); - comissaoReceitaVO.setComissaoSegOpcionalDiaria(comissaoReceita.getComissaoSegOpcional()); - comissaoReceitaVO.setComissaoSeguroObrigatorioDiaria(comissaoReceita.getComissaoSegObrigatorio()); - comissaoReceitaVO.setContImpressa(comissaoReceita.getQtdeImpgap()); - comissaoReceitaVO.setData(comissaoReceita.getDatamovimento()); - comissaoReceitaVO.setDevolucoesOrigem(comissaoReceita.getDevolvidosOrigem()); - comissaoReceitaVO.setDevolucoesOrigemGAP(comissaoReceita.getDevolvidosOrigemGap()); - comissaoReceitaVO.setDevolvidos(comissaoReceita.getDevolvidos()); - comissaoReceitaVO.setDevolvidosGAP(comissaoReceita.getDevgap()); - comissaoReceitaVO.setGapImpressa(comissaoReceita.getImpgap()); - comissaoReceitaVO.setInternet(comissaoReceita.getInternet()); - comissaoReceitaVO.setReceitaBPR(comissaoReceita.getBpr()); - comissaoReceitaVO.setReceitaExcessoBagagem(comissaoReceita.getExcessoBagagem()); - comissaoReceitaVO.setReceitaGAP(comissaoReceita.getGap()); - comissaoReceitaVO.setReceitaSeguroOpcional(comissaoReceita.getSegOpcional()); - comissaoReceitaVO.setReceitaSeguro(comissaoReceita.getSegObrigatorio()); - comissaoReceitaVO.setReceitaSeguroOutros(comissaoReceita.getReceitaOutros()); - - BigDecimal receitaComissao = BigDecimal.ZERO; - receitaComissao = MoneyHelper.somar(receitaComissao,comissaoReceitaVO.getReceitaBPR()); - receitaComissao = MoneyHelper.somar(receitaComissao,comissaoReceitaVO.getReceitaSeguro()); - receitaComissao = MoneyHelper.somar(receitaComissao,comissaoReceitaVO.getReceitaGAP()); - - receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getCancelados()); - receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getDevolvidos()); - receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getDevolvidosGAP()); - receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getCanceladosGAP()); - - comissaoReceitaVO.setReceitaComissao(receitaComissao); - - lsComissaoReceitasVO.add(comissaoReceitaVO); - - } - - return lsComissaoReceitasVO; - } - - @Override - @Transactional - public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) throws BusinessException { - try { - comissaoReceitaDAO.limparComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); - comissaoLogDAO.limparComissaoLog(empresaId, puntoVentaId, dataInicial, dataFinal); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ComissaoLogDAO; +import com.rjconsultores.ventaboletos.dao.ComissaoReceitaDAO; +import com.rjconsultores.ventaboletos.entidad.ComissaoReceita; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.ComissaoReceitaService; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("comissaoReceitaService") +public class ComissaoReceitaServiceImpl implements ComissaoReceitaService { + + private static final Logger log = LogManager.getLogger(CalculoComissaoServiceImpl.class); + + @Autowired + private ComissaoReceitaDAO comissaoReceitaDAO; + + @Autowired + private ComissaoLogDAO comissaoLogDAO; + + @Override + public List obtenerTodos() { + return comissaoReceitaDAO.obtenerTodos(); + } + + @Override + public ComissaoReceita obtenerID(Integer id) { + return comissaoReceitaDAO.obtenerID(id); + } + + @Override + @Transactional + public ComissaoReceita suscribir(ComissaoReceita entidad) { + entidad.setActivo(Boolean.TRUE); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + return comissaoReceitaDAO.suscribir(entidad); + } + + @Override + @Transactional + public ComissaoReceita actualizacion(ComissaoReceita entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + return comissaoReceitaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ComissaoReceita entidad) { + entidad.setActivo(Boolean.TRUE); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + comissaoReceitaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void reterComissaoReceitaDiaria(Integer empresaId, Integer puntoVentaId, Integer usuarioId, List receitas) throws BusinessException { + try { + Empresa empresa = new Empresa(empresaId); + PuntoVenta puntoVenta = new PuntoVenta(puntoVentaId); + for (com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita comissaoReceitaVO : receitas) { + ComissaoReceita comissaoReceita = new ComissaoReceita(comissaoReceitaVO); + comissaoReceita.setEmpresa(empresa); + comissaoReceita.setPuntoVenta(puntoVenta); + comissaoReceita.setUsuarioId(usuarioId); + comissaoReceitaDAO.suscribir(comissaoReceita); + comissaoLogDAO.suscribirTodos(comissaoReceitaVO.getLsComissaoLog()); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + + @Override + public List recuperarComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) { + + List lsComissaoReceitasVO = new ArrayList(); + List lsComissaoReceitas = comissaoReceitaDAO.recuperarComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); + for (ComissaoReceita comissaoReceita : lsComissaoReceitas) { + com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita comissaoReceitaVO = new com.rjconsultores.ventaboletos.vo.comissao.ComissaoReceita(); + comissaoReceitaVO.setCancelados(comissaoReceita.getCancelados()); + comissaoReceitaVO.setCanceladosGAP(comissaoReceita.getCancelgap()); + comissaoReceitaVO.setComissaoBPRDiaria(comissaoReceita.getComissaoBpr()); + comissaoReceitaVO.setComissaoEntregaPassagemDiaria(comissaoReceita.getComissaoEntregaPassagem()); + comissaoReceitaVO.setComissaoExcessoBagagemDiaria(comissaoReceita.getComissaoExcessoBagagem()); + comissaoReceitaVO.setComissaoOutrosDiaria(comissaoReceita.getComissaoOutros()); + comissaoReceitaVO.setComissaoSegOpcionalDiaria(comissaoReceita.getComissaoSegOpcional()); + comissaoReceitaVO.setComissaoSeguroObrigatorioDiaria(comissaoReceita.getComissaoSegObrigatorio()); + comissaoReceitaVO.setContImpressa(comissaoReceita.getQtdeImpgap()); + comissaoReceitaVO.setData(comissaoReceita.getDatamovimento()); + comissaoReceitaVO.setDevolucoesOrigem(comissaoReceita.getDevolvidosOrigem()); + comissaoReceitaVO.setDevolucoesOrigemGAP(comissaoReceita.getDevolvidosOrigemGap()); + comissaoReceitaVO.setDevolvidos(comissaoReceita.getDevolvidos()); + comissaoReceitaVO.setDevolvidosGAP(comissaoReceita.getDevgap()); + comissaoReceitaVO.setGapImpressa(comissaoReceita.getImpgap()); + comissaoReceitaVO.setInternet(comissaoReceita.getInternet()); + comissaoReceitaVO.setReceitaBPR(comissaoReceita.getBpr()); + comissaoReceitaVO.setReceitaExcessoBagagem(comissaoReceita.getExcessoBagagem()); + comissaoReceitaVO.setReceitaGAP(comissaoReceita.getGap()); + comissaoReceitaVO.setReceitaSeguroOpcional(comissaoReceita.getSegOpcional()); + comissaoReceitaVO.setReceitaSeguro(comissaoReceita.getSegObrigatorio()); + comissaoReceitaVO.setReceitaSeguroOutros(comissaoReceita.getReceitaOutros()); + + BigDecimal receitaComissao = BigDecimal.ZERO; + receitaComissao = MoneyHelper.somar(receitaComissao,comissaoReceitaVO.getReceitaBPR()); + receitaComissao = MoneyHelper.somar(receitaComissao,comissaoReceitaVO.getReceitaSeguro()); + receitaComissao = MoneyHelper.somar(receitaComissao,comissaoReceitaVO.getReceitaGAP()); + + receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getCancelados()); + receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getDevolvidos()); + receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getDevolvidosGAP()); + receitaComissao = MoneyHelper.subtrair(receitaComissao,comissaoReceitaVO.getCanceladosGAP()); + + comissaoReceitaVO.setReceitaComissao(receitaComissao); + + lsComissaoReceitasVO.add(comissaoReceitaVO); + + } + + return lsComissaoReceitasVO; + } + + @Override + @Transactional + public void limparComissaoReceita(Integer empresaId, Integer puntoVentaId, Date dataInicial, Date dataFinal) throws BusinessException { + try { + comissaoReceitaDAO.limparComissaoReceita(empresaId, puntoVentaId, dataInicial, dataFinal); + comissaoLogDAO.limparComissaoLog(empresaId, puntoVentaId, dataInicial, dataFinal); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java index 36d65225f..22b46efe7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ComissaoServiceImpl.java @@ -1,88 +1,88 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.Comissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.ComissaoService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; - -@Service("comissaoService") -public class ComissaoServiceImpl implements ComissaoService { - - @Autowired - private ComissaoDAO comissaoDAO; - - @Override - public List obtenerTodos() { - return comissaoDAO.obtenerTodos(); - } - - @Override - public Comissao obtenerID(Integer id) { - return comissaoDAO.obtenerID(id); - } - - @Override - @Transactional - public Comissao suscribir(Comissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return comissaoDAO.suscribir(entidad); - } - - @Override - @Transactional - public Comissao actualizacion(Comissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return comissaoDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(Comissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - comissaoDAO.actualizacion(entidad); - } - - @Override - public List buscaHistoricoComissao(Integer puntoVentaId, Integer empresaId, Date periodoInicio, Date periodoFim) { - String competenciaInicial = DateUtil.getStringDate(periodoInicio, "MM/yyyy"); - String competenciaFinal = DateUtil.getStringDate(periodoFim, "MM/yyyy"); - - Map parametros = new HashMap(); - parametros.put("competenciaInicial", competenciaInicial); - parametros.put("competenciaFinal", competenciaFinal); - parametros.put("empresaId", empresaId); - - if(puntoVentaId != null && puntoVentaId > -1) { - parametros.put("puntoventaId", puntoVentaId); - } - - return comissaoDAO.buscaHistoricoComissao(parametros); - } - - @Override - public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) { - return comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.Comissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.ComissaoService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; + +@Service("comissaoService") +public class ComissaoServiceImpl implements ComissaoService { + + @Autowired + private ComissaoDAO comissaoDAO; + + @Override + public List obtenerTodos() { + return comissaoDAO.obtenerTodos(); + } + + @Override + public Comissao obtenerID(Integer id) { + return comissaoDAO.obtenerID(id); + } + + @Override + @Transactional + public Comissao suscribir(Comissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return comissaoDAO.suscribir(entidad); + } + + @Override + @Transactional + public Comissao actualizacion(Comissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return comissaoDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(Comissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + comissaoDAO.actualizacion(entidad); + } + + @Override + public List buscaHistoricoComissao(Integer puntoVentaId, Integer empresaId, Date periodoInicio, Date periodoFim) { + String competenciaInicial = DateUtil.getStringDate(periodoInicio, "MM/yyyy"); + String competenciaFinal = DateUtil.getStringDate(periodoFim, "MM/yyyy"); + + Map parametros = new HashMap(); + parametros.put("competenciaInicial", competenciaInicial); + parametros.put("competenciaFinal", competenciaFinal); + parametros.put("empresaId", empresaId); + + if(puntoVentaId != null && puntoVentaId > -1) { + parametros.put("puntoventaId", puntoVentaId); + } + + return comissaoDAO.buscaHistoricoComissao(parametros); + } + + @Override + public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) { + return comissaoDAO.buscaPuntoVentasEmpresaComComissaoParametrizada(empresaId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CompaniaBancariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CompaniaBancariaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CompaniaBancariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CompaniaBancariaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConductorServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConductorServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConductorServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConductorServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionConfServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionConfServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionConfServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionConfServiceImpl.java index ff4ca30d1..5b5936a70 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionConfServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionConfServiceImpl.java @@ -1,73 +1,73 @@ - -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Collection; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionConfDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionConf; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.service.ConexionConfService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("conexionConfService") -public class ConexionConfServiceImpl implements ConexionConfService { - @Autowired - private ConexionConfDAO conexionConfDAO; - - public List obtenerTodos() { - return conexionConfDAO.obtenerTodos(); - } - - public ConexionConf obtenerID(Long id) { - return conexionConfDAO.obtenerID(id); - } - - @Transactional - public ConexionConf suscribir(ConexionConf entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionConfDAO.suscribir(entidad); - } - - @Transactional - public ConexionConf actualizacion(ConexionConf entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionConfDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ConexionConf entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - conexionConfDAO.actualizacion(entidad); - } - - @Override - public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo) { - return conexionConfDAO.buscar(conexionCtrlId, numgrupo); - } - - @Override - public List buscarPorConexionCtrl(ConexionCtrl entidad) { - return conexionConfDAO.buscarPorConexionCtrl(entidad); - } - - @Override - @Transactional - public void suscribirTodos(Collection conexionesConf) { - conexionConfDAO.suscribirTodos(conexionesConf); - } -} + +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Collection; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionConfDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionConf; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.service.ConexionConfService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("conexionConfService") +public class ConexionConfServiceImpl implements ConexionConfService { + @Autowired + private ConexionConfDAO conexionConfDAO; + + public List obtenerTodos() { + return conexionConfDAO.obtenerTodos(); + } + + public ConexionConf obtenerID(Long id) { + return conexionConfDAO.obtenerID(id); + } + + @Transactional + public ConexionConf suscribir(ConexionConf entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionConfDAO.suscribir(entidad); + } + + @Transactional + public ConexionConf actualizacion(ConexionConf entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionConfDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ConexionConf entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + conexionConfDAO.actualizacion(entidad); + } + + @Override + public ConexionConf buscar(Long conexionCtrlId, Integer numgrupo) { + return conexionConfDAO.buscar(conexionCtrlId, numgrupo); + } + + @Override + public List buscarPorConexionCtrl(ConexionCtrl entidad) { + return conexionConfDAO.buscarPorConexionCtrl(entidad); + } + + @Override + @Transactional + public void suscribirTodos(Collection conexionesConf) { + conexionConfDAO.suscribirTodos(conexionesConf); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionCtrlServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionCtrlServiceImpl.java index 557303206..e75830548 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionCtrlServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionCtrlServiceImpl.java @@ -1,144 +1,144 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionCtrlDAO; -import com.rjconsultores.ventaboletos.dao.ConexionRutaCtrlDAO; -import com.rjconsultores.ventaboletos.dao.ConexionRutaTramoCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.entidad.ConexionConf; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; -import com.rjconsultores.ventaboletos.entidad.PricingConexao; -import com.rjconsultores.ventaboletos.service.ConexionConfService; -import com.rjconsultores.ventaboletos.service.ConexionCtrlService; -import com.rjconsultores.ventaboletos.service.ConexionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -@Service("conexionCtrlService") -public class ConexionCtrlServiceImpl implements ConexionCtrlService { - @Autowired - private ConexionCtrlDAO conexionCtrlDAO; - @Autowired - private ConexionService conexionService; - @Autowired - private ConexionConfService conexionConfDAO; - @Autowired - private ConexionRutaTramoCtrlDAO conexionRutaTramoCtrlDAO; - @Autowired - private ConexionRutaCtrlDAO conexionRutaCtrlDAO; - - - public List obtenerTodos() { - return conexionCtrlDAO.obtenerTodos(); - } - - public ConexionCtrl obtenerID(Long id) { - return conexionCtrlDAO.obtenerID(id); - } - - @Transactional - public ConexionCtrl suscribir(ConexionCtrl entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionCtrlDAO.suscribir(entidad); - } - - @Transactional - public ConexionCtrl actualizacion(ConexionCtrl entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionCtrlDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ConexionCtrl entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - List lsConexion = conexionService.buscarPorConexionCtrl(entidad.getConexionctrlId()); - for (Conexion conexion : lsConexion) { - conexionService.borrar(conexion); - - if(conexion.getRutaId() != null) { - borrarConexionRuta(conexion); - } - } - - List lsConexionConf = conexionConfDAO.buscarPorConexionCtrl(entidad); - for (ConexionConf conexionConf : lsConexionConf) { - conexionConfDAO.borrar(conexionConf); - } - - conexionCtrlDAO.actualizacion(entidad); - } - - @Transactional - private void borrarConexionRuta(Conexion conexion) { - - ConexionRutaCtrl conexionRutaCtrl = null; - - if(conexion.getConexionRutaTramoId() != null) { - ConexionRutaTramoCtrl conexionRutaTramoCtrl = conexionRutaTramoCtrlDAO.obtenerID(conexion.getConexionRutaTramoId()); - conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaTramoCtrl.setActivo(Boolean.FALSE); - conexionRutaTramoCtrlDAO.actualizacion(conexionRutaTramoCtrl); - - conexionRutaCtrl = conexionRutaTramoCtrl.getConexionRutaCtrl(); - conexionRutaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaCtrl.setActivo(Boolean.FALSE); - conexionRutaCtrlDAO.actualizacion(conexionRutaCtrl); - } - - } - - @Override - public List buscarConexionesCtrl(Integer origenId, Integer destinoId) { - return conexionCtrlDAO.buscarConexionesCtrl(origenId, destinoId); - } - - @Override - @Transactional - public void suscribirTodos(List conexionCtrlList) { - for (ConexionCtrl conexionCtrl : conexionCtrlList) { - conexionCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionCtrl.setActivo(true); - } - conexionCtrlDAO.suscribirTodos(conexionCtrlList); - } - - @Override - public List buscarTodasConexionesCtrlPricing() { - return conexionCtrlDAO.buscarTodasConexionesCtrlPricing(); - } - - @Override - public List carregarConexoesCadastradas(Long conexionctrlId) { - return conexionCtrlDAO.carregarConexoesCadastradas(conexionctrlId); - } - - @Override - public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId) { - return conexionCtrlDAO.carregarConexoesCadastradas(origenId, destinoId, conexionctrlId); - } - - public void limparPesquisaPricingConexao(Integer pricingId) { - conexionCtrlDAO.limparPesquisaPricingConexao(pricingId); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionCtrlDAO; +import com.rjconsultores.ventaboletos.dao.ConexionRutaCtrlDAO; +import com.rjconsultores.ventaboletos.dao.ConexionRutaTramoCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.entidad.ConexionConf; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; +import com.rjconsultores.ventaboletos.entidad.PricingConexao; +import com.rjconsultores.ventaboletos.service.ConexionConfService; +import com.rjconsultores.ventaboletos.service.ConexionCtrlService; +import com.rjconsultores.ventaboletos.service.ConexionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +@Service("conexionCtrlService") +public class ConexionCtrlServiceImpl implements ConexionCtrlService { + @Autowired + private ConexionCtrlDAO conexionCtrlDAO; + @Autowired + private ConexionService conexionService; + @Autowired + private ConexionConfService conexionConfDAO; + @Autowired + private ConexionRutaTramoCtrlDAO conexionRutaTramoCtrlDAO; + @Autowired + private ConexionRutaCtrlDAO conexionRutaCtrlDAO; + + + public List obtenerTodos() { + return conexionCtrlDAO.obtenerTodos(); + } + + public ConexionCtrl obtenerID(Long id) { + return conexionCtrlDAO.obtenerID(id); + } + + @Transactional + public ConexionCtrl suscribir(ConexionCtrl entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionCtrlDAO.suscribir(entidad); + } + + @Transactional + public ConexionCtrl actualizacion(ConexionCtrl entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionCtrlDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ConexionCtrl entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + List lsConexion = conexionService.buscarPorConexionCtrl(entidad.getConexionctrlId()); + for (Conexion conexion : lsConexion) { + conexionService.borrar(conexion); + + if(conexion.getRutaId() != null) { + borrarConexionRuta(conexion); + } + } + + List lsConexionConf = conexionConfDAO.buscarPorConexionCtrl(entidad); + for (ConexionConf conexionConf : lsConexionConf) { + conexionConfDAO.borrar(conexionConf); + } + + conexionCtrlDAO.actualizacion(entidad); + } + + @Transactional + private void borrarConexionRuta(Conexion conexion) { + + ConexionRutaCtrl conexionRutaCtrl = null; + + if(conexion.getConexionRutaTramoId() != null) { + ConexionRutaTramoCtrl conexionRutaTramoCtrl = conexionRutaTramoCtrlDAO.obtenerID(conexion.getConexionRutaTramoId()); + conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaTramoCtrl.setActivo(Boolean.FALSE); + conexionRutaTramoCtrlDAO.actualizacion(conexionRutaTramoCtrl); + + conexionRutaCtrl = conexionRutaTramoCtrl.getConexionRutaCtrl(); + conexionRutaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaCtrl.setActivo(Boolean.FALSE); + conexionRutaCtrlDAO.actualizacion(conexionRutaCtrl); + } + + } + + @Override + public List buscarConexionesCtrl(Integer origenId, Integer destinoId) { + return conexionCtrlDAO.buscarConexionesCtrl(origenId, destinoId); + } + + @Override + @Transactional + public void suscribirTodos(List conexionCtrlList) { + for (ConexionCtrl conexionCtrl : conexionCtrlList) { + conexionCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionCtrl.setActivo(true); + } + conexionCtrlDAO.suscribirTodos(conexionCtrlList); + } + + @Override + public List buscarTodasConexionesCtrlPricing() { + return conexionCtrlDAO.buscarTodasConexionesCtrlPricing(); + } + + @Override + public List carregarConexoesCadastradas(Long conexionctrlId) { + return conexionCtrlDAO.carregarConexoesCadastradas(conexionctrlId); + } + + @Override + public List carregarConexoesCadastradas(Integer origenId, Integer destinoId, Long conexionctrlId) { + return conexionCtrlDAO.carregarConexoesCadastradas(origenId, destinoId, conexionctrlId); + } + + public void limparPesquisaPricingConexao(Integer pricingId) { + conexionCtrlDAO.limparPesquisaPricingConexao(pricingId); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionDescuentoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionDescuentoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionDescuentoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionDescuentoServiceImpl.java index cefb50653..3cb43f248 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionDescuentoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionDescuentoServiceImpl.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.hibernate.ConexionDescuentoHibernateDAO; -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; -import com.rjconsultores.ventaboletos.service.ConexionDescuentoService; - -@Service("conexionDescuentoService") -public class ConexionDescuentoServiceImpl implements ConexionDescuentoService { - @Autowired - ConexionDescuentoHibernateDAO conexionDescuentoHDAO; - - @Override - public List buscarPorConexion(Conexion conexion) { - return conexionDescuentoHDAO.bucarPorConexion(conexion.getConexionId()); - } - - @Override - public List buscarPorConexionInativos(Conexion conexion) { - return conexionDescuentoHDAO.bucarPorConexionInativos(conexion.getConexionId()); - } - - @Override - @Transactional - public ConexionDescuento suscribir(ConexionDescuento conexionDescuento) { - conexionDescuento.setActivo(true); - conexionDescuento.setFecModif(Calendar.getInstance().getTime()); - if (conexionDescuento.getIdConexionDescuento() == null) { - return conexionDescuentoHDAO.suscribir(conexionDescuento); - } - return conexionDescuentoHDAO.actualizacion(conexionDescuento); - } - - @Override - @Transactional - public void borrar(ConexionDescuento conexionDescuento) { - conexionDescuento.setActivo(false); - this.suscribir(conexionDescuento); - } - - @Override - @Transactional - public void suscribirTodos(List conexionesDescuentos) { - for (ConexionDescuento conexionDescuento : conexionesDescuentos) { - conexionDescuento.setFecModif(Calendar.getInstance().getTime()); - } - conexionDescuentoHDAO.suscribirTodos(conexionesDescuentos); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.hibernate.ConexionDescuentoHibernateDAO; +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.entidad.ConexionDescuento; +import com.rjconsultores.ventaboletos.service.ConexionDescuentoService; + +@Service("conexionDescuentoService") +public class ConexionDescuentoServiceImpl implements ConexionDescuentoService { + @Autowired + ConexionDescuentoHibernateDAO conexionDescuentoHDAO; + + @Override + public List buscarPorConexion(Conexion conexion) { + return conexionDescuentoHDAO.bucarPorConexion(conexion.getConexionId()); + } + + @Override + public List buscarPorConexionInativos(Conexion conexion) { + return conexionDescuentoHDAO.bucarPorConexionInativos(conexion.getConexionId()); + } + + @Override + @Transactional + public ConexionDescuento suscribir(ConexionDescuento conexionDescuento) { + conexionDescuento.setActivo(true); + conexionDescuento.setFecModif(Calendar.getInstance().getTime()); + if (conexionDescuento.getIdConexionDescuento() == null) { + return conexionDescuentoHDAO.suscribir(conexionDescuento); + } + return conexionDescuentoHDAO.actualizacion(conexionDescuento); + } + + @Override + @Transactional + public void borrar(ConexionDescuento conexionDescuento) { + conexionDescuento.setActivo(false); + this.suscribir(conexionDescuento); + } + + @Override + @Transactional + public void suscribirTodos(List conexionesDescuentos) { + for (ConexionDescuento conexionDescuento : conexionesDescuentos) { + conexionDescuento.setFecModif(Calendar.getInstance().getTime()); + } + conexionDescuentoHDAO.suscribirTodos(conexionesDescuentos); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionRutaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionRutaServiceImpl.java index dce11144d..3b391d702 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionRutaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionRutaServiceImpl.java @@ -1,66 +1,66 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionExcepcionRutaDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; -import com.rjconsultores.ventaboletos.service.ConexionExcepcionRutaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("conexionExcepcionRutaService") -public class ConexionExcepcionRutaServiceImpl implements ConexionExcepcionRutaService { - - @Autowired - private ConexionExcepcionRutaDAO conexionExcepcionRutaDAO; - - @Override - public List obtenerTodos() { - return conexionExcepcionRutaDAO.obtenerTodos(); - } - - @Override - public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { - return conexionExcepcionRutaDAO.obtenerConexionExcepcionsActivo(conexionctrlId); - } - - @Override - public ConexionExcepcionRuta obtenerID(Long id) { - return conexionExcepcionRutaDAO.obtenerID(id); - } - - @Override - @Transactional - public ConexionExcepcionRuta suscribir(ConexionExcepcionRuta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionExcepcionRutaDAO.suscribir(entidad); - } - - @Override - @Transactional - public ConexionExcepcionRuta actualizacion(ConexionExcepcionRuta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionExcepcionRutaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ConexionExcepcionRuta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - conexionExcepcionRutaDAO.actualizacion(entidad); - - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionExcepcionRutaDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcionRuta; +import com.rjconsultores.ventaboletos.service.ConexionExcepcionRutaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("conexionExcepcionRutaService") +public class ConexionExcepcionRutaServiceImpl implements ConexionExcepcionRutaService { + + @Autowired + private ConexionExcepcionRutaDAO conexionExcepcionRutaDAO; + + @Override + public List obtenerTodos() { + return conexionExcepcionRutaDAO.obtenerTodos(); + } + + @Override + public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { + return conexionExcepcionRutaDAO.obtenerConexionExcepcionsActivo(conexionctrlId); + } + + @Override + public ConexionExcepcionRuta obtenerID(Long id) { + return conexionExcepcionRutaDAO.obtenerID(id); + } + + @Override + @Transactional + public ConexionExcepcionRuta suscribir(ConexionExcepcionRuta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionExcepcionRutaDAO.suscribir(entidad); + } + + @Override + @Transactional + public ConexionExcepcionRuta actualizacion(ConexionExcepcionRuta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionExcepcionRutaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ConexionExcepcionRuta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + conexionExcepcionRutaDAO.actualizacion(entidad); + + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionServiceImpl.java index 013b0f01f..c234efe05 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionExcepcionServiceImpl.java @@ -1,67 +1,67 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionExcepcionDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; -import com.rjconsultores.ventaboletos.service.ConexionExcepcionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("conexionExcepcionService") -public class ConexionExcepcionServiceImpl implements ConexionExcepcionService { - - @Autowired - private ConexionExcepcionDAO conexionExcepcionDAO; - - @Override - public List obtenerTodos() { - return conexionExcepcionDAO.obtenerTodos(); - } - - @Override - public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { - return conexionExcepcionDAO.obtenerConexionExcepcionsActivo(conexionctrlId); - } - - @Override - public ConexionExcepcion obtenerID(Long id) { - return conexionExcepcionDAO.obtenerID(id); - } - - @Override - @Transactional - public ConexionExcepcion suscribir(ConexionExcepcion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionExcepcionDAO.suscribir(entidad); - } - - @Override - @Transactional - public ConexionExcepcion actualizacion(ConexionExcepcion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return conexionExcepcionDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ConexionExcepcion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - conexionExcepcionDAO.actualizacion(entidad); - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionExcepcionDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionExcepcion; +import com.rjconsultores.ventaboletos.service.ConexionExcepcionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("conexionExcepcionService") +public class ConexionExcepcionServiceImpl implements ConexionExcepcionService { + + @Autowired + private ConexionExcepcionDAO conexionExcepcionDAO; + + @Override + public List obtenerTodos() { + return conexionExcepcionDAO.obtenerTodos(); + } + + @Override + public List obtenerConexionExcepcionsActivo(Long conexionctrlId) { + return conexionExcepcionDAO.obtenerConexionExcepcionsActivo(conexionctrlId); + } + + @Override + public ConexionExcepcion obtenerID(Long id) { + return conexionExcepcionDAO.obtenerID(id); + } + + @Override + @Transactional + public ConexionExcepcion suscribir(ConexionExcepcion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionExcepcionDAO.suscribir(entidad); + } + + @Override + @Transactional + public ConexionExcepcion actualizacion(ConexionExcepcion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return conexionExcepcionDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ConexionExcepcion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + conexionExcepcionDAO.actualizacion(entidad); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCombinacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCombinacionServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCombinacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCombinacionServiceImpl.java index 0f100b088..df15bb1db 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCombinacionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCombinacionServiceImpl.java @@ -1,339 +1,339 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.ParadaDAO; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.service.ConexionRutaCombinacionService; -import com.rjconsultores.ventaboletos.service.ParadaService; -import com.rjconsultores.ventaboletos.service.RutaCombinacionService; -import com.rjconsultores.ventaboletos.vo.conexion.OrdenarLocalidadesGeradas; -import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -@Service("conexionRutaCombinacionFactory") -public class ConexionRutaCombinacionServiceImpl implements ConexionRutaCombinacionService { - - @Autowired - private RutaCombinacionService rutaCombinacionService; - - @Autowired - private ParadaService paradaService; - - private Map criandoCacheLocalidades(List list) { - Map cacheLocalidades = new HashMap(); - for (Parada parada : list) { - cacheLocalidades.put(parada.getParadaId(), parada); - } - return cacheLocalidades; - } - - private void gerarCombinacao(LinkedList> lists, List rutasEixoA, List rutasEixoB, List rutasEixoC, List localidadesGeradas, List conexoesCtrl, Map cacheLocalidades, Boolean isConexaoPorAgrupamento) { - - - Set combinacoes = new TreeSet(); - - for (Parada s : lists.removeFirst()) - combinacoes.add(s.getParadaId().toString()); - - while (!lists.isEmpty()) { - List next = lists.removeFirst(); - Set novasCombinacoes = new TreeSet(); - for (String s1 : combinacoes) { - for (Parada s2 : next) { - novasCombinacoes.add(s1 + ";" + s2.getParadaId()); - } - } - combinacoes = novasCombinacoes; - } - //System.out.println(combinacoes); - - Set rutasVendaA = rutaCombinacionService.rutasCombinacionVenda(rutasEixoA); - Set rutasVendaB = rutaCombinacionService.rutasCombinacionVenda(rutasEixoB); - - if(rutasEixoC == null) { - gerarLocalidadesEixoAB(rutasEixoA, rutasEixoB, localidadesGeradas, combinacoes, conexoesCtrl, cacheLocalidades, rutasVendaA, rutasVendaB, isConexaoPorAgrupamento); - }else { - Set rutasVendaC = rutaCombinacionService.rutasCombinacionVenda(rutasEixoC); - gerarLocalidadesEixoABC(rutasEixoA, rutasEixoB,rutasEixoC, localidadesGeradas, combinacoes, conexoesCtrl, cacheLocalidades, rutasVendaA, rutasVendaB, rutasVendaC ); - } - - Collections.sort(localidadesGeradas, new OrdenarLocalidadesGeradas()); - } - - - private void gerarLocalidadesEixoAB(List rutasEixoA, List rutasEixoB, List localidadesGeradas, Set combinacoes, List conexoesCtrl, Map cacheLocalidades, Set rutasVendaA, Set rutasVendaB, Boolean isConexaoPorAgrupamento) { - short i = 1; - String[] valoresCalculados; - - for (Ruta rutaEixoA : rutasEixoA) { - for (Ruta rutaEixoB : rutasEixoB) { - for (String comb : combinacoes) { - valoresCalculados = comb.split(";"); - if(valoresCalculados != null && valoresCalculados.length == 4) { - Integer origemConexaoCtrl = Integer.parseInt(valoresCalculados[0]); - Integer destinoConexaoCtrl = Integer.parseInt(valoresCalculados[3]); - if(origemConexaoCtrl == null || cacheLocalidades.get(origemConexaoCtrl) == null || - destinoConexaoCtrl == null || cacheLocalidades.get(destinoConexaoCtrl) == null) { - continue; - } - - ConexionCtrlVO conexionCtrl = adicionarConexao(conexoesCtrl, origemConexaoCtrl, destinoConexaoCtrl); - ConexionRutaCtrlVO conexionRutaCtrl = new ConexionRutaCtrlVO(rutaEixoA.getRutaId(), rutaEixoB.getRutaId(), null); - - ParadaVOConexionRuta trechoA = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[1])), rutaEixoA.getRutaId(), rutaEixoA.getNumRuta(), i, true, - cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), - conexionCtrl, conexionRutaCtrl, rutaEixoA.getDescSentido()); - i++; - - ParadaVOConexionRuta trechoB = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[2])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), rutaEixoB.getRutaId(), rutaEixoB.getNumRuta(), i, true, - cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), - conexionCtrl, conexionRutaCtrl, rutaEixoB.getDescSentido()); - i++; - - adicionarLocalidadeGerada(conexionCtrl, localidadesGeradas, trechoA, trechoB, null, rutasVendaA, rutasVendaB, new HashSet(), isConexaoPorAgrupamento); - - i = 1; - } - - } - } - } - - removerConexionCtrlInvalida(conexoesCtrl); - } - - /** - * @param conexoesCtrl - * @param origemConexaoCtrl - * @param destinoConexaoCtrl - * @return - */ - private ConexionCtrlVO adicionarConexao(List conexoesCtrl, Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { - ConexionCtrlVO conexionCtrl = null; - Integer grupo = 0; - for (ConexionCtrlVO conexionCtrlTemp : conexoesCtrl) { - if(conexionCtrlTemp.isOrigemDestinoIgual(origemConexaoCtrl, destinoConexaoCtrl)) { - grupo++; - } - } - - if(conexionCtrl == null) { - conexionCtrl = new ConexionCtrlVO(origemConexaoCtrl, destinoConexaoCtrl); - conexionCtrl.setGrupo(grupo); - } - - conexionCtrl.incrementarGrupo(); - - conexoesCtrl.add(conexionCtrl); - - return conexionCtrl; - } - - private void adicionarLocalidadeGerada(ConexionCtrlVO conexionCtrl, List localidadesGeradas, ParadaVOConexionRuta trechoA, ParadaVOConexionRuta trechoB, ParadaVOConexionRuta trechoC, Set rutasVendaA, Set rutasVendaB, Set rutasVendaC, Boolean isConexaoPorAgrupamento) { - boolean isTrechoAVende = false; - boolean isTrechoBVende = false; - - if(isDadosNotNull(trechoA)) { - isTrechoAVende = rutasVendaA == null ? false : rutasVendaA.contains(trechoA.getRutaId() + "-" + trechoA.getParadaOrigem().getParadaId() + "-" + trechoA.getParadaDestino().getParadaId()); - } - - if(isDadosNotNull(trechoB)) { - isTrechoBVende = rutasVendaB == null ? false : rutasVendaB.contains(trechoB.getRutaId() + "-" + trechoB.getParadaOrigem().getParadaId() + "-" + trechoB.getParadaDestino().getParadaId()); - } - - boolean isTrechoCVende = true; - if(trechoC != null) { - if(isDadosNotNull(trechoC)) { - isTrechoCVende = rutasVendaC == null ? false : rutasVendaC.contains(trechoC.getRutaId() + "-" + trechoC.getParadaOrigem().getParadaId() + "-" + trechoC.getParadaDestino().getParadaId()); - } else { - isTrechoCVende = false; - } - } - - if((isTrechoAVende && isTrechoBVende && isTrechoCVende) || Boolean.TRUE.equals(isConexaoPorAgrupamento)) { - localidadesGeradas.add(trechoA); - localidadesGeradas.add(trechoB); - if(trechoC != null) { - localidadesGeradas.add(trechoC); - } - conexionCtrl.setValida(true); - } else { - conexionCtrl.decrementarGrupo(); - } - } - - private void gerarLocalidadesEixoABC(List rutasEixoA, List rutasEixoB, List rutasEixoC, List localidadesGeradas, Set combinations, List conexoesCtrl, Map cacheLocalidades, Set rutasVendaA, Set rutasVendaB, Set rutasVendaC) { - - short i = 1; - String[] valoresCalculados = null; - for (Ruta rutaEixoA : rutasEixoA) { - - for (Ruta rutaEixoB : rutasEixoB) { - for (Ruta rutaEixoC : rutasEixoC) { - for (String comb : combinations) { - valoresCalculados = comb.split(";"); - if(valoresCalculados != null && valoresCalculados.length == 5) { - Integer origemConexaoCtrl = Integer.parseInt(valoresCalculados[0]); - Integer destinoConexaoCtrl = Integer.parseInt(valoresCalculados[4]); - if(origemConexaoCtrl == null || cacheLocalidades.get(origemConexaoCtrl) == null || - destinoConexaoCtrl == null || cacheLocalidades.get(destinoConexaoCtrl) == null) { - continue; - } - - ConexionCtrlVO conexionCtrl = adicionarConexao(conexoesCtrl, origemConexaoCtrl, destinoConexaoCtrl); - ConexionRutaCtrlVO conexionRutaCtrl = new ConexionRutaCtrlVO(rutaEixoA.getRutaId(), rutaEixoB.getRutaId(), rutaEixoC.getRutaId()); - - ParadaVOConexionRuta trechoA = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[1])), rutaEixoA.getRutaId(), rutaEixoA.getNumRuta(), i, true, - cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), - conexionCtrl, conexionRutaCtrl, rutaEixoA.getDescSentido()); - i++; - - ParadaVOConexionRuta trechoB = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[2])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), rutaEixoB.getRutaId(), rutaEixoB.getNumRuta(), i, true, - cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), - conexionCtrl, conexionRutaCtrl, rutaEixoB.getDescSentido()); - i++; - - ParadaVOConexionRuta trechoC = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), rutaEixoC.getRutaId(), rutaEixoC.getNumRuta(), i, true, - cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), - conexionCtrl, conexionRutaCtrl, rutaEixoC.getDescSentido()); - i++; - - adicionarLocalidadeGerada(conexionCtrl, localidadesGeradas, trechoA, trechoB, trechoC, rutasVendaA, rutasVendaB, rutasVendaC, null); - - i = 1; - } - } - } - - } - } - - removerConexionCtrlInvalida(conexoesCtrl); - } - - private void removerConexionCtrlInvalida(List conexoesCtrl) { - List temp = new ArrayList(0); - for (ConexionCtrlVO conexionCtrl : conexoesCtrl) { - if(conexionCtrl.isValida()) { - temp.add(conexionCtrl); - } - } - conexoesCtrl.clear(); - conexoesCtrl.addAll(temp); - } - - public void gerarCombinacionEntre2Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List rutasEixoA2, List rutasEixoB2, List localidadesGeradas, List conexoesCtrl, Boolean isConexaoPorAgrupamento) { - - for (int i = 0; i < lsLocalidadesComuns.size(); i++) { - - List listParada2 = Arrays.asList(lsLocalidadesComuns.get(i)); - List listParada3 = Arrays.asList(lsLocalidadesComuns.get(i)); - - LinkedList> lists = new LinkedList>(); - - lists.add(listParada1); - lists.add(listParada2); - lists.add(listParada3); - lists.add(listParada4); - - List localidades = new ArrayList(); - localidades.addAll(listParada1); - localidades.addAll(listParada2); - localidades.addAll(listParada3); - localidades.addAll(listParada4); - List localidadesAux = new ArrayList(); - localidadesAux.addAll(localidades); - for (Parada parada : localidadesAux) { - if(parada.getAgrupamentoParada() !=null) { - List paradaAgrupamentoList = paradaService.buscarPorAgrupamentoParadaId(parada.getAgrupamentoParada()); - if(paradaAgrupamentoList!=null && !paradaAgrupamentoList.isEmpty()) { - for (Parada paradaAgrupamento : paradaAgrupamentoList) { - if(!localidades.contains(paradaAgrupamento)) { - localidades.add(paradaAgrupamento); - } - } - } - } - } - - Map cacheLocalidades = criandoCacheLocalidades(localidades); - gerarCombinacao(lists, rutasEixoA, rutasEixoB, null, localidadesGeradas, conexoesCtrl, cacheLocalidades, isConexaoPorAgrupamento); - - } - - } - - public List getParadasByAgrupamentoId(Parada parada) { - List localidades = new ArrayList(); - List paradaAgrupamentoList = paradaService.buscarPorAgrupamentoParadaId(parada.getAgrupamentoParada()); - if(paradaAgrupamentoList!=null && !paradaAgrupamentoList.isEmpty()) { - for (Parada paradaAgrupamento : paradaAgrupamentoList) { - if(!localidades.contains(paradaAgrupamento)) { - localidades.add(paradaAgrupamento); - } - } - } - return localidades; - } - - public void gerarCombinacionEntre3Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List listParadasC, List rutasEixoA2, List rutasEixoB2, List rutasEixoC, List localidadesGeradas, List conexoesCtrl) { - - for (int i = 0; i < lsLocalidadesComuns.size(); i++) { - - List listParada2 = Arrays.asList(lsLocalidadesComuns.get(i)); - List listParada3 = Arrays.asList(lsLocalidadesComuns.get(i)); - - LinkedList> lists = new LinkedList>(); - - lists.add(listParada1); - lists.add(listParada2); - lists.add(listParada3); - lists.add(listParada4); - lists.add(listParadasC); - - List localidades = new ArrayList(); - localidades.addAll(listParada1); - localidades.addAll(listParada2); - localidades.addAll(listParada3); - localidades.addAll(listParada4); - localidades.addAll(listParadasC); - - Map cacheLocalidades = criandoCacheLocalidades(localidades); - gerarCombinacao(lists, rutasEixoA, rutasEixoB, rutasEixoC, localidadesGeradas, conexoesCtrl, cacheLocalidades, null); - - } - } - - public List extrairConexionRutaCtrl(List localidadesGeradas) { - List list = new ArrayList(0); - for (ParadaVOConexionRuta paradaVOConexionRuta : localidadesGeradas) { - if(!list.contains(paradaVOConexionRuta.getConexionRutaCtrl())) { - list.add(paradaVOConexionRuta.getConexionRutaCtrl()); - } - } - return list; - } - - private boolean isDadosNotNull(ParadaVOConexionRuta trecho) { - return trecho != null && - trecho.getRutaId() != null && - trecho.getParadaOrigem() != null && - trecho.getParadaDestino() != null; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.ParadaDAO; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.service.ConexionRutaCombinacionService; +import com.rjconsultores.ventaboletos.service.ParadaService; +import com.rjconsultores.ventaboletos.service.RutaCombinacionService; +import com.rjconsultores.ventaboletos.vo.conexion.OrdenarLocalidadesGeradas; +import com.rjconsultores.ventaboletos.vo.parada.ConexionCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +@Service("conexionRutaCombinacionFactory") +public class ConexionRutaCombinacionServiceImpl implements ConexionRutaCombinacionService { + + @Autowired + private RutaCombinacionService rutaCombinacionService; + + @Autowired + private ParadaService paradaService; + + private Map criandoCacheLocalidades(List list) { + Map cacheLocalidades = new HashMap(); + for (Parada parada : list) { + cacheLocalidades.put(parada.getParadaId(), parada); + } + return cacheLocalidades; + } + + private void gerarCombinacao(LinkedList> lists, List rutasEixoA, List rutasEixoB, List rutasEixoC, List localidadesGeradas, List conexoesCtrl, Map cacheLocalidades, Boolean isConexaoPorAgrupamento) { + + + Set combinacoes = new TreeSet(); + + for (Parada s : lists.removeFirst()) + combinacoes.add(s.getParadaId().toString()); + + while (!lists.isEmpty()) { + List next = lists.removeFirst(); + Set novasCombinacoes = new TreeSet(); + for (String s1 : combinacoes) { + for (Parada s2 : next) { + novasCombinacoes.add(s1 + ";" + s2.getParadaId()); + } + } + combinacoes = novasCombinacoes; + } + //System.out.println(combinacoes); + + Set rutasVendaA = rutaCombinacionService.rutasCombinacionVenda(rutasEixoA); + Set rutasVendaB = rutaCombinacionService.rutasCombinacionVenda(rutasEixoB); + + if(rutasEixoC == null) { + gerarLocalidadesEixoAB(rutasEixoA, rutasEixoB, localidadesGeradas, combinacoes, conexoesCtrl, cacheLocalidades, rutasVendaA, rutasVendaB, isConexaoPorAgrupamento); + }else { + Set rutasVendaC = rutaCombinacionService.rutasCombinacionVenda(rutasEixoC); + gerarLocalidadesEixoABC(rutasEixoA, rutasEixoB,rutasEixoC, localidadesGeradas, combinacoes, conexoesCtrl, cacheLocalidades, rutasVendaA, rutasVendaB, rutasVendaC ); + } + + Collections.sort(localidadesGeradas, new OrdenarLocalidadesGeradas()); + } + + + private void gerarLocalidadesEixoAB(List rutasEixoA, List rutasEixoB, List localidadesGeradas, Set combinacoes, List conexoesCtrl, Map cacheLocalidades, Set rutasVendaA, Set rutasVendaB, Boolean isConexaoPorAgrupamento) { + short i = 1; + String[] valoresCalculados; + + for (Ruta rutaEixoA : rutasEixoA) { + for (Ruta rutaEixoB : rutasEixoB) { + for (String comb : combinacoes) { + valoresCalculados = comb.split(";"); + if(valoresCalculados != null && valoresCalculados.length == 4) { + Integer origemConexaoCtrl = Integer.parseInt(valoresCalculados[0]); + Integer destinoConexaoCtrl = Integer.parseInt(valoresCalculados[3]); + if(origemConexaoCtrl == null || cacheLocalidades.get(origemConexaoCtrl) == null || + destinoConexaoCtrl == null || cacheLocalidades.get(destinoConexaoCtrl) == null) { + continue; + } + + ConexionCtrlVO conexionCtrl = adicionarConexao(conexoesCtrl, origemConexaoCtrl, destinoConexaoCtrl); + ConexionRutaCtrlVO conexionRutaCtrl = new ConexionRutaCtrlVO(rutaEixoA.getRutaId(), rutaEixoB.getRutaId(), null); + + ParadaVOConexionRuta trechoA = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[1])), rutaEixoA.getRutaId(), rutaEixoA.getNumRuta(), i, true, + cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), + conexionCtrl, conexionRutaCtrl, rutaEixoA.getDescSentido()); + i++; + + ParadaVOConexionRuta trechoB = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[2])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), rutaEixoB.getRutaId(), rutaEixoB.getNumRuta(), i, true, + cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), + conexionCtrl, conexionRutaCtrl, rutaEixoB.getDescSentido()); + i++; + + adicionarLocalidadeGerada(conexionCtrl, localidadesGeradas, trechoA, trechoB, null, rutasVendaA, rutasVendaB, new HashSet(), isConexaoPorAgrupamento); + + i = 1; + } + + } + } + } + + removerConexionCtrlInvalida(conexoesCtrl); + } + + /** + * @param conexoesCtrl + * @param origemConexaoCtrl + * @param destinoConexaoCtrl + * @return + */ + private ConexionCtrlVO adicionarConexao(List conexoesCtrl, Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { + ConexionCtrlVO conexionCtrl = null; + Integer grupo = 0; + for (ConexionCtrlVO conexionCtrlTemp : conexoesCtrl) { + if(conexionCtrlTemp.isOrigemDestinoIgual(origemConexaoCtrl, destinoConexaoCtrl)) { + grupo++; + } + } + + if(conexionCtrl == null) { + conexionCtrl = new ConexionCtrlVO(origemConexaoCtrl, destinoConexaoCtrl); + conexionCtrl.setGrupo(grupo); + } + + conexionCtrl.incrementarGrupo(); + + conexoesCtrl.add(conexionCtrl); + + return conexionCtrl; + } + + private void adicionarLocalidadeGerada(ConexionCtrlVO conexionCtrl, List localidadesGeradas, ParadaVOConexionRuta trechoA, ParadaVOConexionRuta trechoB, ParadaVOConexionRuta trechoC, Set rutasVendaA, Set rutasVendaB, Set rutasVendaC, Boolean isConexaoPorAgrupamento) { + boolean isTrechoAVende = false; + boolean isTrechoBVende = false; + + if(isDadosNotNull(trechoA)) { + isTrechoAVende = rutasVendaA == null ? false : rutasVendaA.contains(trechoA.getRutaId() + "-" + trechoA.getParadaOrigem().getParadaId() + "-" + trechoA.getParadaDestino().getParadaId()); + } + + if(isDadosNotNull(trechoB)) { + isTrechoBVende = rutasVendaB == null ? false : rutasVendaB.contains(trechoB.getRutaId() + "-" + trechoB.getParadaOrigem().getParadaId() + "-" + trechoB.getParadaDestino().getParadaId()); + } + + boolean isTrechoCVende = true; + if(trechoC != null) { + if(isDadosNotNull(trechoC)) { + isTrechoCVende = rutasVendaC == null ? false : rutasVendaC.contains(trechoC.getRutaId() + "-" + trechoC.getParadaOrigem().getParadaId() + "-" + trechoC.getParadaDestino().getParadaId()); + } else { + isTrechoCVende = false; + } + } + + if((isTrechoAVende && isTrechoBVende && isTrechoCVende) || Boolean.TRUE.equals(isConexaoPorAgrupamento)) { + localidadesGeradas.add(trechoA); + localidadesGeradas.add(trechoB); + if(trechoC != null) { + localidadesGeradas.add(trechoC); + } + conexionCtrl.setValida(true); + } else { + conexionCtrl.decrementarGrupo(); + } + } + + private void gerarLocalidadesEixoABC(List rutasEixoA, List rutasEixoB, List rutasEixoC, List localidadesGeradas, Set combinations, List conexoesCtrl, Map cacheLocalidades, Set rutasVendaA, Set rutasVendaB, Set rutasVendaC) { + + short i = 1; + String[] valoresCalculados = null; + for (Ruta rutaEixoA : rutasEixoA) { + + for (Ruta rutaEixoB : rutasEixoB) { + for (Ruta rutaEixoC : rutasEixoC) { + for (String comb : combinations) { + valoresCalculados = comb.split(";"); + if(valoresCalculados != null && valoresCalculados.length == 5) { + Integer origemConexaoCtrl = Integer.parseInt(valoresCalculados[0]); + Integer destinoConexaoCtrl = Integer.parseInt(valoresCalculados[4]); + if(origemConexaoCtrl == null || cacheLocalidades.get(origemConexaoCtrl) == null || + destinoConexaoCtrl == null || cacheLocalidades.get(destinoConexaoCtrl) == null) { + continue; + } + + ConexionCtrlVO conexionCtrl = adicionarConexao(conexoesCtrl, origemConexaoCtrl, destinoConexaoCtrl); + ConexionRutaCtrlVO conexionRutaCtrl = new ConexionRutaCtrlVO(rutaEixoA.getRutaId(), rutaEixoB.getRutaId(), rutaEixoC.getRutaId()); + + ParadaVOConexionRuta trechoA = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[1])), rutaEixoA.getRutaId(), rutaEixoA.getNumRuta(), i, true, + cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), + conexionCtrl, conexionRutaCtrl, rutaEixoA.getDescSentido()); + i++; + + ParadaVOConexionRuta trechoB = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[2])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), rutaEixoB.getRutaId(), rutaEixoB.getNumRuta(), i, true, + cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), + conexionCtrl, conexionRutaCtrl, rutaEixoB.getDescSentido()); + i++; + + ParadaVOConexionRuta trechoC = new ParadaVOConexionRuta(conexionCtrl.getGrupo(), cacheLocalidades.get(Integer.parseInt(valoresCalculados[3])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), rutaEixoC.getRutaId(), rutaEixoC.getNumRuta(), i, true, + cacheLocalidades.get(Integer.parseInt(valoresCalculados[0])), cacheLocalidades.get(Integer.parseInt(valoresCalculados[4])), + conexionCtrl, conexionRutaCtrl, rutaEixoC.getDescSentido()); + i++; + + adicionarLocalidadeGerada(conexionCtrl, localidadesGeradas, trechoA, trechoB, trechoC, rutasVendaA, rutasVendaB, rutasVendaC, null); + + i = 1; + } + } + } + + } + } + + removerConexionCtrlInvalida(conexoesCtrl); + } + + private void removerConexionCtrlInvalida(List conexoesCtrl) { + List temp = new ArrayList(0); + for (ConexionCtrlVO conexionCtrl : conexoesCtrl) { + if(conexionCtrl.isValida()) { + temp.add(conexionCtrl); + } + } + conexoesCtrl.clear(); + conexoesCtrl.addAll(temp); + } + + public void gerarCombinacionEntre2Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List rutasEixoA2, List rutasEixoB2, List localidadesGeradas, List conexoesCtrl, Boolean isConexaoPorAgrupamento) { + + for (int i = 0; i < lsLocalidadesComuns.size(); i++) { + + List listParada2 = Arrays.asList(lsLocalidadesComuns.get(i)); + List listParada3 = Arrays.asList(lsLocalidadesComuns.get(i)); + + LinkedList> lists = new LinkedList>(); + + lists.add(listParada1); + lists.add(listParada2); + lists.add(listParada3); + lists.add(listParada4); + + List localidades = new ArrayList(); + localidades.addAll(listParada1); + localidades.addAll(listParada2); + localidades.addAll(listParada3); + localidades.addAll(listParada4); + List localidadesAux = new ArrayList(); + localidadesAux.addAll(localidades); + for (Parada parada : localidadesAux) { + if(parada.getAgrupamentoParada() !=null) { + List paradaAgrupamentoList = paradaService.buscarPorAgrupamentoParadaId(parada.getAgrupamentoParada()); + if(paradaAgrupamentoList!=null && !paradaAgrupamentoList.isEmpty()) { + for (Parada paradaAgrupamento : paradaAgrupamentoList) { + if(!localidades.contains(paradaAgrupamento)) { + localidades.add(paradaAgrupamento); + } + } + } + } + } + + Map cacheLocalidades = criandoCacheLocalidades(localidades); + gerarCombinacao(lists, rutasEixoA, rutasEixoB, null, localidadesGeradas, conexoesCtrl, cacheLocalidades, isConexaoPorAgrupamento); + + } + + } + + public List getParadasByAgrupamentoId(Parada parada) { + List localidades = new ArrayList(); + List paradaAgrupamentoList = paradaService.buscarPorAgrupamentoParadaId(parada.getAgrupamentoParada()); + if(paradaAgrupamentoList!=null && !paradaAgrupamentoList.isEmpty()) { + for (Parada paradaAgrupamento : paradaAgrupamentoList) { + if(!localidades.contains(paradaAgrupamento)) { + localidades.add(paradaAgrupamento); + } + } + } + return localidades; + } + + public void gerarCombinacionEntre3Eixos(List listParada1, List rutasEixoA, List rutasEixoB, List lsLocalidadesComuns, List listParada4, List listParadasC, List rutasEixoA2, List rutasEixoB2, List rutasEixoC, List localidadesGeradas, List conexoesCtrl) { + + for (int i = 0; i < lsLocalidadesComuns.size(); i++) { + + List listParada2 = Arrays.asList(lsLocalidadesComuns.get(i)); + List listParada3 = Arrays.asList(lsLocalidadesComuns.get(i)); + + LinkedList> lists = new LinkedList>(); + + lists.add(listParada1); + lists.add(listParada2); + lists.add(listParada3); + lists.add(listParada4); + lists.add(listParadasC); + + List localidades = new ArrayList(); + localidades.addAll(listParada1); + localidades.addAll(listParada2); + localidades.addAll(listParada3); + localidades.addAll(listParada4); + localidades.addAll(listParadasC); + + Map cacheLocalidades = criandoCacheLocalidades(localidades); + gerarCombinacao(lists, rutasEixoA, rutasEixoB, rutasEixoC, localidadesGeradas, conexoesCtrl, cacheLocalidades, null); + + } + } + + public List extrairConexionRutaCtrl(List localidadesGeradas) { + List list = new ArrayList(0); + for (ParadaVOConexionRuta paradaVOConexionRuta : localidadesGeradas) { + if(!list.contains(paradaVOConexionRuta.getConexionRutaCtrl())) { + list.add(paradaVOConexionRuta.getConexionRutaCtrl()); + } + } + return list; + } + + private boolean isDadosNotNull(ParadaVOConexionRuta trecho) { + return trecho != null && + trecho.getRutaId() != null && + trecho.getParadaOrigem() != null && + trecho.getParadaDestino() != null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaConfServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaConfServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaConfServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaConfServiceImpl.java index da60f1426..f13a302c5 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaConfServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaConfServiceImpl.java @@ -1,297 +1,297 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaConfDAO; -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.entidad.ConexionConf; -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.service.ConexionConfService; -import com.rjconsultores.ventaboletos.service.ConexionCtrlService; -import com.rjconsultores.ventaboletos.service.ConexionRutaConfService; -import com.rjconsultores.ventaboletos.service.ConexionRutaCtrlService; -import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionPtoVtaService; -import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionTipoPtoVtaService; -import com.rjconsultores.ventaboletos.service.ConexionRutaTramoCtrlService; -import com.rjconsultores.ventaboletos.service.ConexionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; -import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -@Service("conexionRutaConfService") -public class ConexionRutaConfServiceImpl implements ConexionRutaConfService { - - @Autowired - private ConexionRutaConfDAO conexionRutaConfDAO; - - @Autowired - private ConexionRutaExcepcionTipoPtoVtaService conexionRutaExcepcionTipoPtoVtaService; - - @Autowired - private ConexionRutaExcepcionPtoVtaService conexionRutaRestricaoPtoVtaService; - - @Autowired - private ConexionRutaCtrlService conexionRutaCtrlService; - - @Autowired - private ConexionRutaTramoCtrlService conexionRutaTramoCtrlService; - - @Autowired - private ConexionCtrlService conexionCtrlService; - - @Autowired - private ConexionConfService conexionConfService; - - @Autowired - private ConexionService conexionService; - - @Override - @Transactional - public ConexionRutaConf suscribir(ConexionRutaConf conexionRutaConf) { - - conexionRutaConf.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaConf.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaConf.setActivo(Boolean.TRUE); - - return conexionRutaConfDAO.suscribir(conexionRutaConf); - } - - @Override - @Transactional - public ConexionRutaConf actualizacion(ConexionRutaConf conexionRutaConf) { - conexionRutaConf.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaConf.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaConf.setActivo(Boolean.TRUE); - return conexionRutaConfDAO.actualizacion(conexionRutaConf); - } - - @Override - @Transactional - public void borrar(ConexionRutaConf conexionRutaTramoCtrl) { - - conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaTramoCtrl.setActivo(Boolean.FALSE); - - conexionRutaConfDAO.actualizacion(conexionRutaTramoCtrl); - - } - - @Transactional - @Override - public void borrar(List lsConexionRutaConf) { - for (ConexionRutaConf conexion : lsConexionRutaConf) { - borrar(conexion); - } - } - - @Override - @Transactional - public void suscribirTodos(List lsConexionRutaConf) { - for (ConexionRutaConf conexion : lsConexionRutaConf) { - suscribir(conexion); - } - } - - @Override - public List obtenerTodosActivo() { - return conexionRutaConfDAO.obtenerTodosActivo(); - } - - @Override - public List buscarPorDescricao(String descricao) { - return conexionRutaConfDAO.buscarPorDescricao(descricao); - } - - @Transactional - @Override - public ConexionRutaConf obtenerID(Integer id) { - return conexionRutaConfDAO.obtenerID(id); - } - - @Override - @Transactional - public void excluirConfiguracao(ConexionRutaConf conexion, boolean excluirConexionRutaConf, boolean isConexionGerada) { - conexionRutaConfDAO.excluirConfiguracao(conexion, UsuarioLogado.getUsuarioLogado().getUsuarioId(), excluirConexionRutaConf, isConexionGerada); - } - - @Override - @Transactional - public ConexionRutaConf salvarConfiguracao(ConexionRutaConf conexionRutaConf, List canalVentas, List puntoVentas, - List conexoesCtrl, List rutas, List localidadesCombinadas, - boolean isConexionGerada) { - conexionRutaConf = suscribirOrActualizacion(conexionRutaConf); - - salvarCanalVentasRutaCtrl(conexionRutaConf, canalVentas); - salvarPuntoVentasRutaCtrl(conexionRutaConf, puntoVentas); - - if(isConexionGerada) { - salvarConexionesRutaCtrl(conexionRutaConf, conexoesCtrl, rutas, localidadesCombinadas); - } else { - conexionRutaConfDAO.atualizarTempoMinimoEMaximo(conexionRutaConf); - } - - return conexionRutaConf; - } - - private ConexionRutaConf suscribirOrActualizacion(ConexionRutaConf conexion) { - if(conexion.getConexionRutaConfId() != null) { - return actualizacion(conexion); - } else { - return suscribir(conexion); - } - } - - private void salvarCanalVentasRutaCtrl(ConexionRutaConf conexionRutaConf, List canalVentas) { - for (TipoPuntoVenta tipoPuntoVenta : canalVentas) { - ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionPtoVta = new ConexionRutaExcepcionTipoPtoVta(); - conexionRutaExcepcionPtoVta.setTipoPtovta(tipoPuntoVenta); - conexionRutaExcepcionPtoVta.setConexionRutaConf(conexionRutaConf); - conexionRutaExcepcionPtoVta = conexionRutaExcepcionTipoPtoVtaService.suscribir(conexionRutaExcepcionPtoVta); - } - } - - private void salvarPuntoVentasRutaCtrl(ConexionRutaConf conexionRutaConf, List puntoVentas) { - for (PuntoVenta puntoVenta : puntoVentas) { - ConexionRutaExcepcionPtoVta conexionRutaExcepcionPtoVta = new ConexionRutaExcepcionPtoVta(); - conexionRutaExcepcionPtoVta.setConexionRutaConf(conexionRutaConf); - conexionRutaExcepcionPtoVta.setPuntoVenta(puntoVenta); - conexionRutaExcepcionPtoVta = conexionRutaRestricaoPtoVtaService.suscribir(conexionRutaExcepcionPtoVta); - } - } - - private void salvarConexionesRutaCtrl(ConexionRutaConf conexionRutaConf, List conexoesCtrl, List rutas, List localidadesCombinadas) { - List lsConexionRutaCtrl = new ArrayList(); - for (ConexionRutaCtrlVO conexionRutaCtrlVO : rutas) { - ConexionRutaCtrl conexionRutaCtrl = new ConexionRutaCtrl(); - conexionRutaCtrl.setRutaOrigen(new Ruta(conexionRutaCtrlVO.getRutaIdA())); - conexionRutaCtrl.setRutaDestino(new Ruta(conexionRutaCtrlVO.getRutaIdB())); - if(conexionRutaCtrlVO.getRutaIdC() != null) { - conexionRutaCtrl.setRutaDestinoC(new Ruta(conexionRutaCtrlVO.getRutaIdC())); - } - conexionRutaCtrl.setConexionRutaConf(conexionRutaConf); - conexionRutaCtrl = conexionRutaCtrlService.suscribir(conexionRutaCtrl); - lsConexionRutaCtrl.add(conexionRutaCtrl); - } - List lsConexionRutaTramo = salvarConexionesRutaTramoCtrl(lsConexionRutaCtrl, localidadesCombinadas); - salvarConexao(conexionRutaConf, conexoesCtrl, lsConexionRutaTramo, localidadesCombinadas); - } - - private List salvarConexionesRutaTramoCtrl(List rutasEntidades, List localidadesCombinadas) { - List lsConexionRutaTramo = new ArrayList(0); - for (ParadaVOConexionRuta vo : localidadesCombinadas) { - ConexionRutaTramoCtrl conexionRutaTramoCtrl = new ConexionRutaTramoCtrl(); - conexionRutaTramoCtrl.setOrigen(vo.getParadaOrigem()); - conexionRutaTramoCtrl.setDestino(vo.getParadaDestino()); - conexionRutaTramoCtrl.setRuta(new Ruta(vo.getRutaId())); - conexionRutaTramoCtrl.setSecuencia(vo.getSecuencia()); - - if(vo.getConexionRutaCtrl() != null && vo.getConexionRutaCtrl().getRutaIdC() == null) { - conexionRutaTramoCtrl.setConexionRutaCtrl(ConexionRutaCtrl.getConexionRutaCtrl(rutasEntidades, - vo.getConexionRutaCtrl().getRutaIdA(), - vo.getConexionRutaCtrl().getRutaIdB())); - } else if(vo.getConexionRutaCtrl() != null && vo.getConexionRutaCtrl().getRutaIdC() != null) { - conexionRutaTramoCtrl.setConexionRutaCtrl(ConexionRutaCtrl.getConexionRutaCtrl(rutasEntidades, - vo.getConexionRutaCtrl().getRutaIdA(), - vo.getConexionRutaCtrl().getRutaIdB(), - vo.getConexionRutaCtrl().getRutaIdC())); - } else { - conexionRutaTramoCtrl.setConexionRutaCtrl(ConexionRutaCtrl.getConexionRutaCtrl(rutasEntidades)); - } - - conexionRutaTramoCtrl.setValido(true); - conexionRutaTramoCtrl.setGrupo(vo.getGrupo()); - conexionRutaTramoCtrl = conexionRutaTramoCtrlService.suscribir(conexionRutaTramoCtrl); - vo.setConexionRutaTramoId(conexionRutaTramoCtrl.getConexionRutaTramoId()); - - lsConexionRutaTramo.add(conexionRutaTramoCtrl); - } - - return lsConexionRutaTramo; - } - - private void salvarConexao(ConexionRutaConf conexionRutaConf, List conexoesCtrl, List lsConexionRutaTramo, List localidadesCombinadas) { - for (ConexionCtrl conexionCtrl : conexoesCtrl) { - conexionCtrl = conexionCtrlService.suscribir(conexionCtrl); - salvarConexionesConf(conexionRutaConf, conexionCtrl); - salvarConexiones(conexionCtrl, lsConexionRutaTramo, localidadesCombinadas); - } - } - - private void salvarConexionesConf(ConexionRutaConf conexionRutaConf, ConexionCtrl conexionCtrl) { - ConexionConf conexionConf = new ConexionConf(); - conexionConf.setConexionCtrl(conexionCtrl); - conexionConf.setGrupo(conexionCtrl.getGrupos()); - conexionConf.setIndisponible(false); - conexionConf.setTiempoMin(conexionRutaConf.getTiempoMin()); - conexionConf.setTiempoMax(conexionRutaConf.getTiempoMax()); - conexionConf = conexionConfService.suscribir(conexionConf); - } - - private void salvarConexiones(ConexionCtrl conexionCtrl, List lsConexionRutaTramo, List localidadesCombinadas) { - List conexionRutaTramoCtrls = recuperarConexionRutaTramoCtrl(conexionCtrl, lsConexionRutaTramo, localidadesCombinadas); - for (ConexionRutaTramoCtrl conexionRutaTramoCtrl : conexionRutaTramoCtrls) { - Conexion conexion = new Conexion(); - conexion.setConexionctrlId(conexionCtrl.getConexionctrlId()); - conexion.setOrigenId(conexionRutaTramoCtrl.getOrigen().getParadaId()); - conexion.setDestinoId(conexionRutaTramoCtrl.getDestino().getParadaId()); - conexion.setNumgrupo(conexionRutaTramoCtrl.getGrupo()); - conexion.setNumsecuencia(conexionRutaTramoCtrl.getSecuencia()); - conexion.setRutaId(conexionRutaTramoCtrl.getRuta().getRutaId()); - conexion.setConexionRutaTramoId(conexionRutaTramoCtrl.getConexionRutaTramoId()); - - if(conexionRutaTramoCtrl.getConexionCtrl() != null) { - conexionRutaTramoCtrl.getConexionCtrl().setConexionctrlId(conexionCtrl.getConexionctrlId()); - } - - conexion = conexionService.suscribir(conexion); - } - } - - private List recuperarConexionRutaTramoCtrl(ConexionCtrl conexionCtrl, List lsConexionRutaTramo, List localidadesCombinadas) { - List list = new ArrayList(0); - for (ParadaVOConexionRuta trecho: localidadesCombinadas) { - if(trecho.getConexionCtrl().isOrigemDestinoGrupoIgual(conexionCtrl.getOrigenId(), conexionCtrl.getDestinoId(), conexionCtrl.getGrupos())) { - ConexionRutaTramoCtrl aux = new ConexionRutaTramoCtrl(trecho.getConexionRutaTramoId()); - Integer idx = lsConexionRutaTramo.indexOf(aux); - if(idx > -1) { - ConexionRutaTramoCtrl aux2 = lsConexionRutaTramo.get(idx); - aux2.setConexionCtrl(trecho.getConexionCtrl()); - list.add(aux2); - } - } - } - return list; - } - - @Override - public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId) { - return conexionRutaConfDAO.carregarConexoesCadastradas(conexionrutaconfId); - } - - @Override - public List> buscarRutasPorConexionConf(Integer conexionRutaConfId) { - return conexionRutaConfDAO.buscarRutasPorConexionConf(conexionRutaConfId); - } - - @Override - public ConexionRutaConf getByIdActivo(Integer conexionRutaConfId) { - return conexionRutaConfDAO.getByIdActivo(conexionRutaConfId); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaConfDAO; +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.entidad.ConexionConf; +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; +import com.rjconsultores.ventaboletos.service.ConexionConfService; +import com.rjconsultores.ventaboletos.service.ConexionCtrlService; +import com.rjconsultores.ventaboletos.service.ConexionRutaConfService; +import com.rjconsultores.ventaboletos.service.ConexionRutaCtrlService; +import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionPtoVtaService; +import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionTipoPtoVtaService; +import com.rjconsultores.ventaboletos.service.ConexionRutaTramoCtrlService; +import com.rjconsultores.ventaboletos.service.ConexionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaConfVO; +import com.rjconsultores.ventaboletos.vo.parada.ConexionRutaCtrlVO; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +@Service("conexionRutaConfService") +public class ConexionRutaConfServiceImpl implements ConexionRutaConfService { + + @Autowired + private ConexionRutaConfDAO conexionRutaConfDAO; + + @Autowired + private ConexionRutaExcepcionTipoPtoVtaService conexionRutaExcepcionTipoPtoVtaService; + + @Autowired + private ConexionRutaExcepcionPtoVtaService conexionRutaRestricaoPtoVtaService; + + @Autowired + private ConexionRutaCtrlService conexionRutaCtrlService; + + @Autowired + private ConexionRutaTramoCtrlService conexionRutaTramoCtrlService; + + @Autowired + private ConexionCtrlService conexionCtrlService; + + @Autowired + private ConexionConfService conexionConfService; + + @Autowired + private ConexionService conexionService; + + @Override + @Transactional + public ConexionRutaConf suscribir(ConexionRutaConf conexionRutaConf) { + + conexionRutaConf.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaConf.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaConf.setActivo(Boolean.TRUE); + + return conexionRutaConfDAO.suscribir(conexionRutaConf); + } + + @Override + @Transactional + public ConexionRutaConf actualizacion(ConexionRutaConf conexionRutaConf) { + conexionRutaConf.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaConf.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaConf.setActivo(Boolean.TRUE); + return conexionRutaConfDAO.actualizacion(conexionRutaConf); + } + + @Override + @Transactional + public void borrar(ConexionRutaConf conexionRutaTramoCtrl) { + + conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaTramoCtrl.setActivo(Boolean.FALSE); + + conexionRutaConfDAO.actualizacion(conexionRutaTramoCtrl); + + } + + @Transactional + @Override + public void borrar(List lsConexionRutaConf) { + for (ConexionRutaConf conexion : lsConexionRutaConf) { + borrar(conexion); + } + } + + @Override + @Transactional + public void suscribirTodos(List lsConexionRutaConf) { + for (ConexionRutaConf conexion : lsConexionRutaConf) { + suscribir(conexion); + } + } + + @Override + public List obtenerTodosActivo() { + return conexionRutaConfDAO.obtenerTodosActivo(); + } + + @Override + public List buscarPorDescricao(String descricao) { + return conexionRutaConfDAO.buscarPorDescricao(descricao); + } + + @Transactional + @Override + public ConexionRutaConf obtenerID(Integer id) { + return conexionRutaConfDAO.obtenerID(id); + } + + @Override + @Transactional + public void excluirConfiguracao(ConexionRutaConf conexion, boolean excluirConexionRutaConf, boolean isConexionGerada) { + conexionRutaConfDAO.excluirConfiguracao(conexion, UsuarioLogado.getUsuarioLogado().getUsuarioId(), excluirConexionRutaConf, isConexionGerada); + } + + @Override + @Transactional + public ConexionRutaConf salvarConfiguracao(ConexionRutaConf conexionRutaConf, List canalVentas, List puntoVentas, + List conexoesCtrl, List rutas, List localidadesCombinadas, + boolean isConexionGerada) { + conexionRutaConf = suscribirOrActualizacion(conexionRutaConf); + + salvarCanalVentasRutaCtrl(conexionRutaConf, canalVentas); + salvarPuntoVentasRutaCtrl(conexionRutaConf, puntoVentas); + + if(isConexionGerada) { + salvarConexionesRutaCtrl(conexionRutaConf, conexoesCtrl, rutas, localidadesCombinadas); + } else { + conexionRutaConfDAO.atualizarTempoMinimoEMaximo(conexionRutaConf); + } + + return conexionRutaConf; + } + + private ConexionRutaConf suscribirOrActualizacion(ConexionRutaConf conexion) { + if(conexion.getConexionRutaConfId() != null) { + return actualizacion(conexion); + } else { + return suscribir(conexion); + } + } + + private void salvarCanalVentasRutaCtrl(ConexionRutaConf conexionRutaConf, List canalVentas) { + for (TipoPuntoVenta tipoPuntoVenta : canalVentas) { + ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionPtoVta = new ConexionRutaExcepcionTipoPtoVta(); + conexionRutaExcepcionPtoVta.setTipoPtovta(tipoPuntoVenta); + conexionRutaExcepcionPtoVta.setConexionRutaConf(conexionRutaConf); + conexionRutaExcepcionPtoVta = conexionRutaExcepcionTipoPtoVtaService.suscribir(conexionRutaExcepcionPtoVta); + } + } + + private void salvarPuntoVentasRutaCtrl(ConexionRutaConf conexionRutaConf, List puntoVentas) { + for (PuntoVenta puntoVenta : puntoVentas) { + ConexionRutaExcepcionPtoVta conexionRutaExcepcionPtoVta = new ConexionRutaExcepcionPtoVta(); + conexionRutaExcepcionPtoVta.setConexionRutaConf(conexionRutaConf); + conexionRutaExcepcionPtoVta.setPuntoVenta(puntoVenta); + conexionRutaExcepcionPtoVta = conexionRutaRestricaoPtoVtaService.suscribir(conexionRutaExcepcionPtoVta); + } + } + + private void salvarConexionesRutaCtrl(ConexionRutaConf conexionRutaConf, List conexoesCtrl, List rutas, List localidadesCombinadas) { + List lsConexionRutaCtrl = new ArrayList(); + for (ConexionRutaCtrlVO conexionRutaCtrlVO : rutas) { + ConexionRutaCtrl conexionRutaCtrl = new ConexionRutaCtrl(); + conexionRutaCtrl.setRutaOrigen(new Ruta(conexionRutaCtrlVO.getRutaIdA())); + conexionRutaCtrl.setRutaDestino(new Ruta(conexionRutaCtrlVO.getRutaIdB())); + if(conexionRutaCtrlVO.getRutaIdC() != null) { + conexionRutaCtrl.setRutaDestinoC(new Ruta(conexionRutaCtrlVO.getRutaIdC())); + } + conexionRutaCtrl.setConexionRutaConf(conexionRutaConf); + conexionRutaCtrl = conexionRutaCtrlService.suscribir(conexionRutaCtrl); + lsConexionRutaCtrl.add(conexionRutaCtrl); + } + List lsConexionRutaTramo = salvarConexionesRutaTramoCtrl(lsConexionRutaCtrl, localidadesCombinadas); + salvarConexao(conexionRutaConf, conexoesCtrl, lsConexionRutaTramo, localidadesCombinadas); + } + + private List salvarConexionesRutaTramoCtrl(List rutasEntidades, List localidadesCombinadas) { + List lsConexionRutaTramo = new ArrayList(0); + for (ParadaVOConexionRuta vo : localidadesCombinadas) { + ConexionRutaTramoCtrl conexionRutaTramoCtrl = new ConexionRutaTramoCtrl(); + conexionRutaTramoCtrl.setOrigen(vo.getParadaOrigem()); + conexionRutaTramoCtrl.setDestino(vo.getParadaDestino()); + conexionRutaTramoCtrl.setRuta(new Ruta(vo.getRutaId())); + conexionRutaTramoCtrl.setSecuencia(vo.getSecuencia()); + + if(vo.getConexionRutaCtrl() != null && vo.getConexionRutaCtrl().getRutaIdC() == null) { + conexionRutaTramoCtrl.setConexionRutaCtrl(ConexionRutaCtrl.getConexionRutaCtrl(rutasEntidades, + vo.getConexionRutaCtrl().getRutaIdA(), + vo.getConexionRutaCtrl().getRutaIdB())); + } else if(vo.getConexionRutaCtrl() != null && vo.getConexionRutaCtrl().getRutaIdC() != null) { + conexionRutaTramoCtrl.setConexionRutaCtrl(ConexionRutaCtrl.getConexionRutaCtrl(rutasEntidades, + vo.getConexionRutaCtrl().getRutaIdA(), + vo.getConexionRutaCtrl().getRutaIdB(), + vo.getConexionRutaCtrl().getRutaIdC())); + } else { + conexionRutaTramoCtrl.setConexionRutaCtrl(ConexionRutaCtrl.getConexionRutaCtrl(rutasEntidades)); + } + + conexionRutaTramoCtrl.setValido(true); + conexionRutaTramoCtrl.setGrupo(vo.getGrupo()); + conexionRutaTramoCtrl = conexionRutaTramoCtrlService.suscribir(conexionRutaTramoCtrl); + vo.setConexionRutaTramoId(conexionRutaTramoCtrl.getConexionRutaTramoId()); + + lsConexionRutaTramo.add(conexionRutaTramoCtrl); + } + + return lsConexionRutaTramo; + } + + private void salvarConexao(ConexionRutaConf conexionRutaConf, List conexoesCtrl, List lsConexionRutaTramo, List localidadesCombinadas) { + for (ConexionCtrl conexionCtrl : conexoesCtrl) { + conexionCtrl = conexionCtrlService.suscribir(conexionCtrl); + salvarConexionesConf(conexionRutaConf, conexionCtrl); + salvarConexiones(conexionCtrl, lsConexionRutaTramo, localidadesCombinadas); + } + } + + private void salvarConexionesConf(ConexionRutaConf conexionRutaConf, ConexionCtrl conexionCtrl) { + ConexionConf conexionConf = new ConexionConf(); + conexionConf.setConexionCtrl(conexionCtrl); + conexionConf.setGrupo(conexionCtrl.getGrupos()); + conexionConf.setIndisponible(false); + conexionConf.setTiempoMin(conexionRutaConf.getTiempoMin()); + conexionConf.setTiempoMax(conexionRutaConf.getTiempoMax()); + conexionConf = conexionConfService.suscribir(conexionConf); + } + + private void salvarConexiones(ConexionCtrl conexionCtrl, List lsConexionRutaTramo, List localidadesCombinadas) { + List conexionRutaTramoCtrls = recuperarConexionRutaTramoCtrl(conexionCtrl, lsConexionRutaTramo, localidadesCombinadas); + for (ConexionRutaTramoCtrl conexionRutaTramoCtrl : conexionRutaTramoCtrls) { + Conexion conexion = new Conexion(); + conexion.setConexionctrlId(conexionCtrl.getConexionctrlId()); + conexion.setOrigenId(conexionRutaTramoCtrl.getOrigen().getParadaId()); + conexion.setDestinoId(conexionRutaTramoCtrl.getDestino().getParadaId()); + conexion.setNumgrupo(conexionRutaTramoCtrl.getGrupo()); + conexion.setNumsecuencia(conexionRutaTramoCtrl.getSecuencia()); + conexion.setRutaId(conexionRutaTramoCtrl.getRuta().getRutaId()); + conexion.setConexionRutaTramoId(conexionRutaTramoCtrl.getConexionRutaTramoId()); + + if(conexionRutaTramoCtrl.getConexionCtrl() != null) { + conexionRutaTramoCtrl.getConexionCtrl().setConexionctrlId(conexionCtrl.getConexionctrlId()); + } + + conexion = conexionService.suscribir(conexion); + } + } + + private List recuperarConexionRutaTramoCtrl(ConexionCtrl conexionCtrl, List lsConexionRutaTramo, List localidadesCombinadas) { + List list = new ArrayList(0); + for (ParadaVOConexionRuta trecho: localidadesCombinadas) { + if(trecho.getConexionCtrl().isOrigemDestinoGrupoIgual(conexionCtrl.getOrigenId(), conexionCtrl.getDestinoId(), conexionCtrl.getGrupos())) { + ConexionRutaTramoCtrl aux = new ConexionRutaTramoCtrl(trecho.getConexionRutaTramoId()); + Integer idx = lsConexionRutaTramo.indexOf(aux); + if(idx > -1) { + ConexionRutaTramoCtrl aux2 = lsConexionRutaTramo.get(idx); + aux2.setConexionCtrl(trecho.getConexionCtrl()); + list.add(aux2); + } + } + } + return list; + } + + @Override + public ConexionRutaConfVO carregarConexoesCadastradas(Integer conexionrutaconfId) { + return conexionRutaConfDAO.carregarConexoesCadastradas(conexionrutaconfId); + } + + @Override + public List> buscarRutasPorConexionConf(Integer conexionRutaConfId) { + return conexionRutaConfDAO.buscarRutasPorConexionConf(conexionRutaConfId); + } + + @Override + public ConexionRutaConf getByIdActivo(Integer conexionRutaConfId) { + return conexionRutaConfDAO.getByIdActivo(conexionRutaConfId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCtrlServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCtrlServiceImpl.java index c58101c97..8231a1e1d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCtrlServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaCtrlServiceImpl.java @@ -1,84 +1,84 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.service.ConexionRutaCtrlService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; - -@Service("conexionServiceRutaCtrl") -public class ConexionRutaCtrlServiceImpl implements ConexionRutaCtrlService { - - @Autowired - private ConexionRutaCtrlDAO conexionRutaCtrlDAO; - - @Override - @Transactional - public ConexionRutaCtrl suscribir(ConexionRutaCtrl conexionRutaCtrl) { - - conexionRutaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaCtrl.setActivo(Boolean.TRUE); - - return conexionRutaCtrlDAO.suscribir(conexionRutaCtrl); - } - - @Override - public ConexionRutaCtrl actualizacion(ConexionRutaCtrl conexion) { - // TODO Auto-generated method stub - return null; - } - - @Override - @Transactional - public void borrar(ConexionRutaCtrl conexionRutaCtrl) { - - conexionRutaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaCtrl.setActivo(Boolean.FALSE); - - conexionRutaCtrlDAO.actualizacion(conexionRutaCtrl); - - } - - @Override - public List buscarPorConexionCtrl(Long conexcionCtrlId) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void borrar(List lsConexion) { - - } - - @Override - public void suscribirTodos(List conexiones) { - // TODO Auto-generated method stub - - } - - @Override - public List buscarConexionesValidas() { - return conexionRutaCtrlDAO.buscarConexionesValidas(); - } - - @Override - public List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId) { - return conexionRutaCtrlDAO.buscarConexionesValidas(rutaOrigemId, rutaDestinoId); - } - - @Override - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { - return conexionRutaCtrlDAO.buscarPorConexionConf(conexionRutaConf); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.service.ConexionRutaCtrlService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionRutaVO; + +@Service("conexionServiceRutaCtrl") +public class ConexionRutaCtrlServiceImpl implements ConexionRutaCtrlService { + + @Autowired + private ConexionRutaCtrlDAO conexionRutaCtrlDAO; + + @Override + @Transactional + public ConexionRutaCtrl suscribir(ConexionRutaCtrl conexionRutaCtrl) { + + conexionRutaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaCtrl.setActivo(Boolean.TRUE); + + return conexionRutaCtrlDAO.suscribir(conexionRutaCtrl); + } + + @Override + public ConexionRutaCtrl actualizacion(ConexionRutaCtrl conexion) { + // TODO Auto-generated method stub + return null; + } + + @Override + @Transactional + public void borrar(ConexionRutaCtrl conexionRutaCtrl) { + + conexionRutaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaCtrl.setActivo(Boolean.FALSE); + + conexionRutaCtrlDAO.actualizacion(conexionRutaCtrl); + + } + + @Override + public List buscarPorConexionCtrl(Long conexcionCtrlId) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void borrar(List lsConexion) { + + } + + @Override + public void suscribirTodos(List conexiones) { + // TODO Auto-generated method stub + + } + + @Override + public List buscarConexionesValidas() { + return conexionRutaCtrlDAO.buscarConexionesValidas(); + } + + @Override + public List buscarConexionesValidas(Integer rutaOrigemId, Integer rutaDestinoId) { + return conexionRutaCtrlDAO.buscarConexionesValidas(rutaOrigemId, rutaDestinoId); + } + + @Override + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { + return conexionRutaCtrlDAO.buscarPorConexionConf(conexionRutaConf); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaExcepcionPtoVtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaExcepcionPtoVtaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaExcepcionPtoVtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaExcepcionPtoVtaServiceImpl.java index eecf8169f..d19bb2a1b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaExcepcionPtoVtaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaExcepcionPtoVtaServiceImpl.java @@ -1,79 +1,79 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionPtoVtaDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; -import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionPtoVtaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("conexionRutaExcepcionPtoVtaService") -public class ConexionRutaExcepcionPtoVtaServiceImpl implements ConexionRutaExcepcionPtoVtaService { - - @Autowired - private ConexionRutaExcepcionPtoVtaDAO conexionRutaExcepcionPtoVtaDAO; - - @Override - public void gerarConexiones() { - // TODO Auto-generated method stub - - } - - @Override - @Transactional - public ConexionRutaExcepcionPtoVta suscribir(ConexionRutaExcepcionPtoVta conexionRutaPtoVta) { - - conexionRutaPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaPtoVta.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaPtoVta.setActivo(Boolean.TRUE); - - return conexionRutaExcepcionPtoVtaDAO.actualizacion(conexionRutaPtoVta); - } - - @Override - public ConexionRutaExcepcionPtoVta actualizacion(ConexionRutaExcepcionPtoVta conexion) { - return null; - } - - @Override - @Transactional - public void borrar(ConexionRutaExcepcionPtoVta entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); -// conexionRutaExcepcionPtoVtaDAO.update(entidad); - conexionRutaExcepcionPtoVtaDAO.actualizacion(entidad); - - } - - @Override - @Transactional - public void borrar(List lsConexion) { - for (ConexionRutaExcepcionPtoVta conexionRutaExcepcionPtoVta : lsConexion) { - borrar(conexionRutaExcepcionPtoVta); - } - } - - @Override - @Transactional - public void suscribirTodos(List conexionRutaExcepcionPtoVtas) { - - for (ConexionRutaExcepcionPtoVta conexion : conexionRutaExcepcionPtoVtas) { - suscribir(conexion); - } - - } - - @Override - public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { - return conexionRutaExcepcionPtoVtaDAO.buscarPorConexionConf(conexionRutaConf); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionPtoVtaDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionPtoVta; +import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionPtoVtaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("conexionRutaExcepcionPtoVtaService") +public class ConexionRutaExcepcionPtoVtaServiceImpl implements ConexionRutaExcepcionPtoVtaService { + + @Autowired + private ConexionRutaExcepcionPtoVtaDAO conexionRutaExcepcionPtoVtaDAO; + + @Override + public void gerarConexiones() { + // TODO Auto-generated method stub + + } + + @Override + @Transactional + public ConexionRutaExcepcionPtoVta suscribir(ConexionRutaExcepcionPtoVta conexionRutaPtoVta) { + + conexionRutaPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaPtoVta.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaPtoVta.setActivo(Boolean.TRUE); + + return conexionRutaExcepcionPtoVtaDAO.actualizacion(conexionRutaPtoVta); + } + + @Override + public ConexionRutaExcepcionPtoVta actualizacion(ConexionRutaExcepcionPtoVta conexion) { + return null; + } + + @Override + @Transactional + public void borrar(ConexionRutaExcepcionPtoVta entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); +// conexionRutaExcepcionPtoVtaDAO.update(entidad); + conexionRutaExcepcionPtoVtaDAO.actualizacion(entidad); + + } + + @Override + @Transactional + public void borrar(List lsConexion) { + for (ConexionRutaExcepcionPtoVta conexionRutaExcepcionPtoVta : lsConexion) { + borrar(conexionRutaExcepcionPtoVta); + } + } + + @Override + @Transactional + public void suscribirTodos(List conexionRutaExcepcionPtoVtas) { + + for (ConexionRutaExcepcionPtoVta conexion : conexionRutaExcepcionPtoVtas) { + suscribir(conexion); + } + + } + + @Override + public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { + return conexionRutaExcepcionPtoVtaDAO.buscarPorConexionConf(conexionRutaConf); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTipoPtoVtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTipoPtoVtaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTipoPtoVtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTipoPtoVtaServiceImpl.java index 450513c09..d5bc801a2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTipoPtoVtaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTipoPtoVtaServiceImpl.java @@ -1,86 +1,86 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionTipoPtoVtaDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; -import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionTipoPtoVtaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("conexionRutaExcepcionTipoPtoVtaService") -public class ConexionRutaTipoPtoVtaServiceImpl implements ConexionRutaExcepcionTipoPtoVtaService { - - @Autowired - private ConexionRutaExcepcionTipoPtoVtaDAO conexionRutaExcepcionTipoPtoVtaDAO; - - @Override - public void gerarConexiones() { - // TODO Auto-generated method stub - - } - - @Override - @Transactional - public ConexionRutaExcepcionTipoPtoVta suscribir(ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionTipoPtoVta) { - - conexionRutaExcepcionTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaExcepcionTipoPtoVta.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaExcepcionTipoPtoVta.setActivo(Boolean.TRUE); - - return conexionRutaExcepcionTipoPtoVtaDAO.suscribir(conexionRutaExcepcionTipoPtoVta); - } - - @Override - public ConexionRutaExcepcionTipoPtoVta actualizacion(ConexionRutaExcepcionTipoPtoVta conexion) { - // TODO Auto-generated method stub - return null; - } - - @Override - @Transactional - public void borrar(ConexionRutaExcepcionTipoPtoVta entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - conexionRutaExcepcionTipoPtoVtaDAO.actualizacion(entidad); - - } - - @Override - public List buscarPorConexionCtrl(Long conexcionCtrlId) { - // TODO Auto-generated method stub - return null; - } - - @Override - @Transactional - public void borrar(List lsConexion) { - for (ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionTipoPtoVta : lsConexion) { - borrar(conexionRutaExcepcionTipoPtoVta); - } - - } - - @Override - @Transactional - public void suscribirTodos(List cnexionRutaExcepcionTipoPtoVtas) { - - for (ConexionRutaExcepcionTipoPtoVta conexion : cnexionRutaExcepcionTipoPtoVtas) { - suscribir(conexion); - } - } - - @Override - public List buscarPorConexionConf(ConexionRutaConf conexionRutaCtrl) { - return conexionRutaExcepcionTipoPtoVtaDAO.buscarPorConexionConf(conexionRutaCtrl); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaExcepcionTipoPtoVtaDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaConf; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaExcepcionTipoPtoVta; +import com.rjconsultores.ventaboletos.service.ConexionRutaExcepcionTipoPtoVtaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("conexionRutaExcepcionTipoPtoVtaService") +public class ConexionRutaTipoPtoVtaServiceImpl implements ConexionRutaExcepcionTipoPtoVtaService { + + @Autowired + private ConexionRutaExcepcionTipoPtoVtaDAO conexionRutaExcepcionTipoPtoVtaDAO; + + @Override + public void gerarConexiones() { + // TODO Auto-generated method stub + + } + + @Override + @Transactional + public ConexionRutaExcepcionTipoPtoVta suscribir(ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionTipoPtoVta) { + + conexionRutaExcepcionTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaExcepcionTipoPtoVta.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaExcepcionTipoPtoVta.setActivo(Boolean.TRUE); + + return conexionRutaExcepcionTipoPtoVtaDAO.suscribir(conexionRutaExcepcionTipoPtoVta); + } + + @Override + public ConexionRutaExcepcionTipoPtoVta actualizacion(ConexionRutaExcepcionTipoPtoVta conexion) { + // TODO Auto-generated method stub + return null; + } + + @Override + @Transactional + public void borrar(ConexionRutaExcepcionTipoPtoVta entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + conexionRutaExcepcionTipoPtoVtaDAO.actualizacion(entidad); + + } + + @Override + public List buscarPorConexionCtrl(Long conexcionCtrlId) { + // TODO Auto-generated method stub + return null; + } + + @Override + @Transactional + public void borrar(List lsConexion) { + for (ConexionRutaExcepcionTipoPtoVta conexionRutaExcepcionTipoPtoVta : lsConexion) { + borrar(conexionRutaExcepcionTipoPtoVta); + } + + } + + @Override + @Transactional + public void suscribirTodos(List cnexionRutaExcepcionTipoPtoVtas) { + + for (ConexionRutaExcepcionTipoPtoVta conexion : cnexionRutaExcepcionTipoPtoVtas) { + suscribir(conexion); + } + } + + @Override + public List buscarPorConexionConf(ConexionRutaConf conexionRutaCtrl) { + return conexionRutaExcepcionTipoPtoVtaDAO.buscarPorConexionConf(conexionRutaCtrl); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTramoCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTramoCtrlServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTramoCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTramoCtrlServiceImpl.java index e5d657fa2..1bc4bd16f 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTramoCtrlServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaTramoCtrlServiceImpl.java @@ -1,142 +1,142 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionRutaTramoCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; -import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.service.ConexionRutaTramoCtrlService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * @author valdevir.silva - * - */ -@Service("conexionRutaTramoCtrlService") -public class ConexionRutaTramoCtrlServiceImpl implements ConexionRutaTramoCtrlService { - - private static final char EIXO_C = 'C'; - private static final char EIXO_B = 'B'; - private static final char EIXO_A = 'A'; - @Autowired - private ConexionRutaTramoCtrlDAO conexionRutaTramoCtrlDAO; - - @Override - @Transactional - public ConexionRutaTramoCtrl suscribir(ConexionRutaTramoCtrl conexionRutaTramoCtrl) { - - conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaTramoCtrl.setActivo(Boolean.TRUE); - - return conexionRutaTramoCtrlDAO.suscribir(conexionRutaTramoCtrl); - } - - @Override - public ConexionRutaTramoCtrl actualizacion(ConexionRutaTramoCtrl conexion) { - // TODO Auto-generated method stub - return null; - } - - @Override - @Transactional - public void borrar(ConexionRutaTramoCtrl conexionRutaTramoCtrl) { - - conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); - conexionRutaTramoCtrl.setActivo(Boolean.FALSE); - - conexionRutaTramoCtrlDAO.actualizacion(conexionRutaTramoCtrl); - - } - - @Override - public List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId) { - return conexionRutaTramoCtrlDAO.buscarPorConexionRutaCtrl(conexionRutaCtrl, rutaId); - } - - @Transactional - @Override - public void borrar(List lsConexionRutaTramoCtrl) { - for (ConexionRutaTramoCtrl conexion : lsConexionRutaTramoCtrl) { - borrar(conexion); - } - } - - @Override - @Transactional - public void suscribirTodos(List lsConexionRutaTramoCtrl) { - for (ConexionRutaTramoCtrl conexion : lsConexionRutaTramoCtrl) { - suscribir(conexion); - } - } - - @Override - public ConexionRutaTramoCtrl buscarPorId(Long conexionRutaTramoId) { - return conexionRutaTramoCtrlDAO.obtenerID(conexionRutaTramoId); - } - - @Override - public boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer rutaDestinoCId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId) { - return conexionRutaTramoCtrlDAO.validarConexioneRutasExistentes(rutaOrigenId, rutaDestinoId, rutaDestinoCId, paradaOrigenId, paradaDestinoId, origemTrechoId, destinoTrechoId); - } - - /** - *Busca localidades cadastradas para Eixo A - */ - @Override - public List buscarLocalidadesEixoA(Integer conexionRutaConfId) { - return validaAgrupamentoLocalidade(conexionRutaTramoCtrlDAO.buscarLocalidadesPorConexionRutaConfAndEixo(conexionRutaConfId, EIXO_A)); - - } - - public List validaAgrupamentoLocalidade(List localidadesList){ - for (Parada parada : localidadesList) { - if(parada.getAgrupamentoParada()!=null) { - parada.setDescparada(parada.getAgrupamentoParada().getDescAgrupamentoParada()); - parada.setCveparada(parada.getAgrupamentoParada().getCveAgrupamentoParada()); - } - } - return localidadesList; - } - - - /** - *Busca localidades castradas para Eixo B - */ - @Override - public List buscarLocalidadeEixoB(Integer conexionRutaConfId) { - return validaAgrupamentoLocalidade(conexionRutaTramoCtrlDAO.buscarLocalidadesPorConexionRutaConfAndEixo(conexionRutaConfId, EIXO_B)); - } - - /** - *Busca localidades cadastradas para Eixo C - */ - @Override - public List buscarLocalidadesEixoC(Integer conexionRutaConfId) { - return validaAgrupamentoLocalidade(conexionRutaTramoCtrlDAO.buscarLocalidadesPorConexionRutaConfAndEixo(conexionRutaConfId, EIXO_C)); - } - - @Override - public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId) { - return conexionRutaTramoCtrlDAO.buscarTodasLocalidadesOrigem(conexionRutaConfId); - } - - @Override - public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId) { - return conexionRutaTramoCtrlDAO.buscarTodasLocalidadesDestino(conexionRutaConfId); - } - - @Override - public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId) { - return conexionRutaTramoCtrlDAO.buscarTodasLocalidadesDestinoC(conexionRutaConfId); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionRutaTramoCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaCtrl; +import com.rjconsultores.ventaboletos.entidad.ConexionRutaTramoCtrl; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.service.ConexionRutaTramoCtrlService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * @author valdevir.silva + * + */ +@Service("conexionRutaTramoCtrlService") +public class ConexionRutaTramoCtrlServiceImpl implements ConexionRutaTramoCtrlService { + + private static final char EIXO_C = 'C'; + private static final char EIXO_B = 'B'; + private static final char EIXO_A = 'A'; + @Autowired + private ConexionRutaTramoCtrlDAO conexionRutaTramoCtrlDAO; + + @Override + @Transactional + public ConexionRutaTramoCtrl suscribir(ConexionRutaTramoCtrl conexionRutaTramoCtrl) { + + conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaTramoCtrl.setActivo(Boolean.TRUE); + + return conexionRutaTramoCtrlDAO.suscribir(conexionRutaTramoCtrl); + } + + @Override + public ConexionRutaTramoCtrl actualizacion(ConexionRutaTramoCtrl conexion) { + // TODO Auto-generated method stub + return null; + } + + @Override + @Transactional + public void borrar(ConexionRutaTramoCtrl conexionRutaTramoCtrl) { + + conexionRutaTramoCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexionRutaTramoCtrl.setFecmodif(Calendar.getInstance().getTime()); + conexionRutaTramoCtrl.setActivo(Boolean.FALSE); + + conexionRutaTramoCtrlDAO.actualizacion(conexionRutaTramoCtrl); + + } + + @Override + public List buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId) { + return conexionRutaTramoCtrlDAO.buscarPorConexionRutaCtrl(conexionRutaCtrl, rutaId); + } + + @Transactional + @Override + public void borrar(List lsConexionRutaTramoCtrl) { + for (ConexionRutaTramoCtrl conexion : lsConexionRutaTramoCtrl) { + borrar(conexion); + } + } + + @Override + @Transactional + public void suscribirTodos(List lsConexionRutaTramoCtrl) { + for (ConexionRutaTramoCtrl conexion : lsConexionRutaTramoCtrl) { + suscribir(conexion); + } + } + + @Override + public ConexionRutaTramoCtrl buscarPorId(Long conexionRutaTramoId) { + return conexionRutaTramoCtrlDAO.obtenerID(conexionRutaTramoId); + } + + @Override + public boolean validarConexioneRutasExistentes(Integer rutaOrigenId, Integer rutaDestinoId, Integer rutaDestinoCId, Integer paradaOrigenId, Integer paradaDestinoId, Integer origemTrechoId, Integer destinoTrechoId) { + return conexionRutaTramoCtrlDAO.validarConexioneRutasExistentes(rutaOrigenId, rutaDestinoId, rutaDestinoCId, paradaOrigenId, paradaDestinoId, origemTrechoId, destinoTrechoId); + } + + /** + *Busca localidades cadastradas para Eixo A + */ + @Override + public List buscarLocalidadesEixoA(Integer conexionRutaConfId) { + return validaAgrupamentoLocalidade(conexionRutaTramoCtrlDAO.buscarLocalidadesPorConexionRutaConfAndEixo(conexionRutaConfId, EIXO_A)); + + } + + public List validaAgrupamentoLocalidade(List localidadesList){ + for (Parada parada : localidadesList) { + if(parada.getAgrupamentoParada()!=null) { + parada.setDescparada(parada.getAgrupamentoParada().getDescAgrupamentoParada()); + parada.setCveparada(parada.getAgrupamentoParada().getCveAgrupamentoParada()); + } + } + return localidadesList; + } + + + /** + *Busca localidades castradas para Eixo B + */ + @Override + public List buscarLocalidadeEixoB(Integer conexionRutaConfId) { + return validaAgrupamentoLocalidade(conexionRutaTramoCtrlDAO.buscarLocalidadesPorConexionRutaConfAndEixo(conexionRutaConfId, EIXO_B)); + } + + /** + *Busca localidades cadastradas para Eixo C + */ + @Override + public List buscarLocalidadesEixoC(Integer conexionRutaConfId) { + return validaAgrupamentoLocalidade(conexionRutaTramoCtrlDAO.buscarLocalidadesPorConexionRutaConfAndEixo(conexionRutaConfId, EIXO_C)); + } + + @Override + public List buscarTodasLocalidadesOrigem(Integer conexionRutaConfId) { + return conexionRutaTramoCtrlDAO.buscarTodasLocalidadesOrigem(conexionRutaConfId); + } + + @Override + public List buscarTodasLocalidadesDestino(Integer conexionRutaConfId) { + return conexionRutaTramoCtrlDAO.buscarTodasLocalidadesDestino(conexionRutaConfId); + } + + @Override + public List buscarTodasLocalidadesDestinoC(Integer conexionRutaConfId) { + return conexionRutaTramoCtrlDAO.buscarTodasLocalidadesDestinoC(conexionRutaConfId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java index 0ed2dfad4..2ea615f59 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java @@ -1,93 +1,93 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConexionDAO; -import com.rjconsultores.ventaboletos.entidad.Conexion; -import com.rjconsultores.ventaboletos.service.ConexionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; - -@Service("conexionService") -public class ConexionServiceImpl implements ConexionService { - - @Autowired - private ConexionDAO conexionDAO; - - @Override - @Transactional - public void gerarConexiones() { - conexionDAO.generarConexiones(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } - - @Override - public List buscarConexionesValidas() { - return conexionDAO.buscarConexionesValidas(); - } - - @Override - public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId) { - return conexionDAO.buscarConexiones(isBuscaAgrupada, origenId, destinoId); - } - - @Override - @Transactional - public Conexion suscribir(Conexion conexion) { - conexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexion.setFecmodif(Calendar.getInstance().getTime()); - conexion.setActivo(Boolean.TRUE); - - return conexionDAO.suscribir(conexion); - } - - @Override - @Transactional - public Conexion actualizacion(Conexion conexion) { - conexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexion.setFecmodif(Calendar.getInstance().getTime()); - conexion.setActivo(Boolean.TRUE); - - return conexionDAO.actualizacion(conexion); - } - - @Override - public List buscarPorConexionCtrl(Long conexcionCtrlId) { - return conexionDAO.buscarPorConexionCtrl(conexcionCtrlId); - } - - @Override - @Transactional - public void borrar(Conexion conexion) { - conexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - conexion.setFecmodif(Calendar.getInstance().getTime()); - conexion.setActivo(Boolean.FALSE); - - conexionDAO.actualizacion(conexion); - } - - @Override - @Transactional - public void borrar(List lsConexion) { - for (Conexion conexion : lsConexion) { - borrar(conexion); - } - - } - - @Override - @Transactional - public void suscribirTodos(List conexiones) { - conexionDAO.suscribirTodos(conexiones); - } - - @Override - @Transactional - public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId) { - return conexionDAO.buscarPorConexionRutaTramoCtrl(conexionRutaTramoId); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConexionDAO; +import com.rjconsultores.ventaboletos.entidad.Conexion; +import com.rjconsultores.ventaboletos.service.ConexionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.conexion.ConexionVO; + +@Service("conexionService") +public class ConexionServiceImpl implements ConexionService { + + @Autowired + private ConexionDAO conexionDAO; + + @Override + @Transactional + public void gerarConexiones() { + conexionDAO.generarConexiones(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } + + @Override + public List buscarConexionesValidas() { + return conexionDAO.buscarConexionesValidas(); + } + + @Override + public List buscarConexiones(boolean isBuscaAgrupada, Integer origenId, Integer destinoId) { + return conexionDAO.buscarConexiones(isBuscaAgrupada, origenId, destinoId); + } + + @Override + @Transactional + public Conexion suscribir(Conexion conexion) { + conexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexion.setFecmodif(Calendar.getInstance().getTime()); + conexion.setActivo(Boolean.TRUE); + + return conexionDAO.suscribir(conexion); + } + + @Override + @Transactional + public Conexion actualizacion(Conexion conexion) { + conexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexion.setFecmodif(Calendar.getInstance().getTime()); + conexion.setActivo(Boolean.TRUE); + + return conexionDAO.actualizacion(conexion); + } + + @Override + public List buscarPorConexionCtrl(Long conexcionCtrlId) { + return conexionDAO.buscarPorConexionCtrl(conexcionCtrlId); + } + + @Override + @Transactional + public void borrar(Conexion conexion) { + conexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + conexion.setFecmodif(Calendar.getInstance().getTime()); + conexion.setActivo(Boolean.FALSE); + + conexionDAO.actualizacion(conexion); + } + + @Override + @Transactional + public void borrar(List lsConexion) { + for (Conexion conexion : lsConexion) { + borrar(conexion); + } + + } + + @Override + @Transactional + public void suscribirTodos(List conexiones) { + conexionDAO.suscribirTodos(conexiones); + } + + @Override + @Transactional + public Conexion buscarPorConexionRutaTramoCtrl(Integer conexionRutaTramoId) { + return conexionDAO.buscarPorConexionRutaTramoCtrl(conexionRutaTramoId); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfComprovantePassagemServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfComprovantePassagemServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfComprovantePassagemServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfComprovantePassagemServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfContratoPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfContratoPuntoVentaServiceImpl.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfContratoPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfContratoPuntoVentaServiceImpl.java index f9460433f..bb7bf514e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfContratoPuntoVentaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfContratoPuntoVentaServiceImpl.java @@ -1,129 +1,129 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.UnsupportedEncodingException; -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfContratoPuntoVentaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; -import com.rjconsultores.ventaboletos.service.ConfContratoPuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; - -@Service("confContratoPuntoVentaService") -public class ConfContratoPuntoVentaServiceImpl implements ConfContratoPuntoVentaService { - - @Autowired - private ConfContratoPuntoVentaDAO confContratoPuntoVentaDAO; - - @Override - public List obtenerTodos() { - return confContratoPuntoVentaDAO.obtenerTodos(); - } - - @Override - public ConfContratoPuntoVenta obtenerID(Integer id) { - return confContratoPuntoVentaDAO.obtenerID(id); - } - - @Transactional - public ConfContratoPuntoVenta suscribir(ConfContratoPuntoVenta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confContratoPuntoVentaDAO.suscribir(entidad); - } - - @Transactional - public ConfContratoPuntoVenta actualizacion(ConfContratoPuntoVenta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confContratoPuntoVentaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ConfContratoPuntoVenta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confContratoPuntoVentaDAO.actualizacion(entidad); - } - - @Override - public ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaId) { - return confContratoPuntoVentaDAO.buscarInformacoesPontoVendaparaGerarContratos(puntoVentaId, empresaId ); - } - - - @Override - public String formatarLayout(ConfLayoutContratoVO confLayoutContratoVO, String html) { - - StringBuilder htmlFormatado = new StringBuilder(); - criarCabecalho(htmlFormatado); - html = html.replace("{nomeLocalidade}", confLayoutContratoVO.getNomeLocalidade()) - .replace("{CNPJ}", confLayoutContratoVO.getCNPJ()) - .replace("{dataAbertura}", confLayoutContratoVO.getDataAbertura() != null ? DateUtil.getStringDate(confLayoutContratoVO.getDataAbertura(), "dd/MM/yyyy") : "") - .replace("{razaoSocial}", confLayoutContratoVO.getRazaoSocial()) - .replace("{nomeCidade}", confLayoutContratoVO.getNomeCidade()) - .replace("{email}", confLayoutContratoVO.getEmail()) - .replace("{codigoPostal}", confLayoutContratoVO.getCodigoPostal()) - .replace("{numero}", confLayoutContratoVO.getNumero() != null ? confLayoutContratoVO.getNumero() : "") - .replace("{passagemAlta}", confLayoutContratoVO.getPassagemAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getPassagemAlta()) : "0") - .replace("{passagemBaixa}", confLayoutContratoVO.getPassagemBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getPassagemBaixa()) : "0") - .replace("{seguroObrigatorioBaixa}", confLayoutContratoVO.getSeguroObrigatorioBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroObrigatorioBaixa()) : "0") - .replace("{seguroObrigatorioAlta}", confLayoutContratoVO.getSeguroObrigatorioAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroObrigatorioAlta()) : "0") - .replace("{valorVendaGapBaixa}", confLayoutContratoVO.getValorVendaGapBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapBaixa()) : "0") - .replace("{valorVendaGapAlta}", confLayoutContratoVO.getValorVendaGapAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapAlta()) : "0") - .replace("{valorVendaGapBaixaImp}", confLayoutContratoVO.getValorVendaGapBaixaImp() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapBaixaImp()) : "0") - .replace("{valorVendaGapAltaImp}", confLayoutContratoVO.getValorVendaGapAltaImp() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapAltaImp()) : "0") - .replace("{seguroBaixa}", confLayoutContratoVO.getSeguroBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroBaixa()) : "0") - .replace("{seguroAlta}", confLayoutContratoVO.getSeguroAlta()!= null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroAlta()) : "0") - .replace("{outrosBaixa}", confLayoutContratoVO.getOutrosBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getOutrosBaixa()) : "0") - .replace("{outrosAlta}", confLayoutContratoVO.getOutrosAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getOutrosAlta()) : "0") - .replace("{excessoBaixa}", confLayoutContratoVO.getExcesssoBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getExcesssoBaixa()): "0") - .replace("{excessoAlta}", confLayoutContratoVO.getExcesssoAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getExcesssoAlta()) :"0") - .replace("{nomeTitular}", confLayoutContratoVO.getNomeTitular()) - .replace("{nomeBanco}", confLayoutContratoVO.getNomeBanco()) - .replace("{numeroAgencia}", confLayoutContratoVO.getNumeroAgencia()) - .replace("{numeroConta}", confLayoutContratoVO.getNumeroConta()) - .replace("{tipoSocio}", confLayoutContratoVO.getTipoSocio() != null ? confLayoutContratoVO.getTipoSocio() : "") - .replace("{bairro}", confLayoutContratoVO.getBairro() != null ? confLayoutContratoVO.getBairro() : "" ) - .replace("{rua}", confLayoutContratoVO.getRua() != null ? confLayoutContratoVO.getRua() : "" ); - - htmlFormatado.append(formatarUTF(html)); - htmlFormatado.append(""); - - - - return htmlFormatado.toString(); - } - - private void criarCabecalho(StringBuilder htmlFormatado) { - - htmlFormatado.append(" "); - htmlFormatado.append(""); - htmlFormatado.append(""); - } - - private String formatarUTF(String html) { - - String output = ""; - try { - output = new String(html.getBytes("UTF-8"), "ISO-8859-1"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return output; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.UnsupportedEncodingException; +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfContratoPuntoVentaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfContratoPuntoVenta; +import com.rjconsultores.ventaboletos.service.ConfContratoPuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.configuracioneccomerciales.ConfLayoutContratoVO; + +@Service("confContratoPuntoVentaService") +public class ConfContratoPuntoVentaServiceImpl implements ConfContratoPuntoVentaService { + + @Autowired + private ConfContratoPuntoVentaDAO confContratoPuntoVentaDAO; + + @Override + public List obtenerTodos() { + return confContratoPuntoVentaDAO.obtenerTodos(); + } + + @Override + public ConfContratoPuntoVenta obtenerID(Integer id) { + return confContratoPuntoVentaDAO.obtenerID(id); + } + + @Transactional + public ConfContratoPuntoVenta suscribir(ConfContratoPuntoVenta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confContratoPuntoVentaDAO.suscribir(entidad); + } + + @Transactional + public ConfContratoPuntoVenta actualizacion(ConfContratoPuntoVenta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confContratoPuntoVentaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ConfContratoPuntoVenta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confContratoPuntoVentaDAO.actualizacion(entidad); + } + + @Override + public ConfLayoutContratoVO buscarInformacoesPontoVendaparaGerarContratos(Integer puntoVentaId, Integer empresaId) { + return confContratoPuntoVentaDAO.buscarInformacoesPontoVendaparaGerarContratos(puntoVentaId, empresaId ); + } + + + @Override + public String formatarLayout(ConfLayoutContratoVO confLayoutContratoVO, String html) { + + StringBuilder htmlFormatado = new StringBuilder(); + criarCabecalho(htmlFormatado); + html = html.replace("{nomeLocalidade}", confLayoutContratoVO.getNomeLocalidade()) + .replace("{CNPJ}", confLayoutContratoVO.getCNPJ()) + .replace("{dataAbertura}", confLayoutContratoVO.getDataAbertura() != null ? DateUtil.getStringDate(confLayoutContratoVO.getDataAbertura(), "dd/MM/yyyy") : "") + .replace("{razaoSocial}", confLayoutContratoVO.getRazaoSocial()) + .replace("{nomeCidade}", confLayoutContratoVO.getNomeCidade()) + .replace("{email}", confLayoutContratoVO.getEmail()) + .replace("{codigoPostal}", confLayoutContratoVO.getCodigoPostal()) + .replace("{numero}", confLayoutContratoVO.getNumero() != null ? confLayoutContratoVO.getNumero() : "") + .replace("{passagemAlta}", confLayoutContratoVO.getPassagemAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getPassagemAlta()) : "0") + .replace("{passagemBaixa}", confLayoutContratoVO.getPassagemBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getPassagemBaixa()) : "0") + .replace("{seguroObrigatorioBaixa}", confLayoutContratoVO.getSeguroObrigatorioBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroObrigatorioBaixa()) : "0") + .replace("{seguroObrigatorioAlta}", confLayoutContratoVO.getSeguroObrigatorioAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroObrigatorioAlta()) : "0") + .replace("{valorVendaGapBaixa}", confLayoutContratoVO.getValorVendaGapBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapBaixa()) : "0") + .replace("{valorVendaGapAlta}", confLayoutContratoVO.getValorVendaGapAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapAlta()) : "0") + .replace("{valorVendaGapBaixaImp}", confLayoutContratoVO.getValorVendaGapBaixaImp() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapBaixaImp()) : "0") + .replace("{valorVendaGapAltaImp}", confLayoutContratoVO.getValorVendaGapAltaImp() != null ? MoneyHelper.getValor(confLayoutContratoVO.getValorVendaGapAltaImp()) : "0") + .replace("{seguroBaixa}", confLayoutContratoVO.getSeguroBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroBaixa()) : "0") + .replace("{seguroAlta}", confLayoutContratoVO.getSeguroAlta()!= null ? MoneyHelper.getValor(confLayoutContratoVO.getSeguroAlta()) : "0") + .replace("{outrosBaixa}", confLayoutContratoVO.getOutrosBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getOutrosBaixa()) : "0") + .replace("{outrosAlta}", confLayoutContratoVO.getOutrosAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getOutrosAlta()) : "0") + .replace("{excessoBaixa}", confLayoutContratoVO.getExcesssoBaixa() != null ? MoneyHelper.getValor(confLayoutContratoVO.getExcesssoBaixa()): "0") + .replace("{excessoAlta}", confLayoutContratoVO.getExcesssoAlta() != null ? MoneyHelper.getValor(confLayoutContratoVO.getExcesssoAlta()) :"0") + .replace("{nomeTitular}", confLayoutContratoVO.getNomeTitular()) + .replace("{nomeBanco}", confLayoutContratoVO.getNomeBanco()) + .replace("{numeroAgencia}", confLayoutContratoVO.getNumeroAgencia()) + .replace("{numeroConta}", confLayoutContratoVO.getNumeroConta()) + .replace("{tipoSocio}", confLayoutContratoVO.getTipoSocio() != null ? confLayoutContratoVO.getTipoSocio() : "") + .replace("{bairro}", confLayoutContratoVO.getBairro() != null ? confLayoutContratoVO.getBairro() : "" ) + .replace("{rua}", confLayoutContratoVO.getRua() != null ? confLayoutContratoVO.getRua() : "" ); + + htmlFormatado.append(formatarUTF(html)); + htmlFormatado.append(""); + + + + return htmlFormatado.toString(); + } + + private void criarCabecalho(StringBuilder htmlFormatado) { + + htmlFormatado.append(" "); + htmlFormatado.append(""); + htmlFormatado.append(""); + } + + private String formatarUTF(String html) { + + String output = ""; + try { + output = new String(html.getBytes("UTF-8"), "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return output; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java index 51bbb4bce..07b9376ce 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java @@ -1,248 +1,248 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Set; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoCanalVentaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.ConfRestricaoCanalVentaService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoCanalVentaService") -public class ConfRestricaoCanalVentaServiceImpl implements ConfRestricaoCanalVentaService { - - @Autowired - private ConfRestricaoCanalVentaDAO confRestricaoCanalVentaDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - private static Logger log = LogManager.getLogger(ConfRestricaoCanalVentaServiceImpl.class); - - - public ConfRestricaoCanalVenta obtenerID(Long id) { - return confRestricaoCanalVentaDAO.obtenerID(id); - } - - @Transactional - @Override - public ConfRestricaoCanalVenta suscribirActualizar(ConfRestricaoCanalVenta entidad) throws BusinessException { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - ConfRestricaoCanalVenta originalClone = null; - try { - originalClone = entidad.getCloneObject(); - - } catch (Exception e) { - log.error("Erro ao clonar CategoriaCtrl: ",e); - } - - if (entidad.getConfRestricaoCanalVentaId() == null){ - confRestricaoCanalVentaDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - return entidad; - }else{ - confRestricaoCanalVentaDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - return entidad; - } - } - @Transactional - public void borrar(ConfRestricaoCanalVenta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoCanalVentaDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - } - - - @Override - public void borrarList(Set confRestricaoCanalVentaSelecionadas) { - List listConfRestricaoCanalVentaIds =retornarListConfRestricaoCanalVentaIds(confRestricaoCanalVentaSelecionadas); - confRestricaoCanalVentaDAO.inativarListConfRestricaoCanalVenta(listConfRestricaoCanalVentaIds, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } - - - private List retornarListConfRestricaoCanalVentaIds(Set ConfRestricaoCanalVentaSelecionadas) { - List listConfRestricaoCanalVentaIds = new ArrayList(); - for (ConfRestricaoCanalVenta c : ConfRestricaoCanalVentaSelecionadas) { - listConfRestricaoCanalVentaIds.add(c.getConfRestricaoCanalVentaId().intValue()); - } - return listConfRestricaoCanalVentaIds; - } - - @SuppressWarnings("unused") - private boolean isBloqueoExistente(ConfRestricaoCanalVenta c , List confRestricaoCanalVentaList){ - - List ls = new ArrayList() ; - - for (int i = 0; i < confRestricaoCanalVentaList.size(); i++){ - ConfRestricaoCanalVenta elementList = (ConfRestricaoCanalVenta)confRestricaoCanalVentaList.get(i); - if(c.getConfRestricaoCanalVentaId() == null){ - if(isConfRestricaoCanalVentasEquivalentes(c , elementList)){ - return true; - } - }else{ - if(!c.getConfRestricaoCanalVentaId().equals(elementList.getConfRestricaoCanalVentaId())){ - isConfRestricaoCanalVentasEquivalentes(c , elementList); - }else{ - continue; - } - } - } - return false; - } - - private boolean isConfRestricaoCanalVentasEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(isRutasTipoPvCorridaIdOrigemDestinoEquivalentes(a,b) - && (((a.getFecCorrida() != null) != (b.getFecCorrida() != null)) ? false : true) - && ((a.getFecCorrida() != null ) && (b.getFecCorrida() != null) ? true : false ) - && ((((a.getFecCorrida().compareTo(b.getFecCorrida())) == 0)) ? true : false ) - && isIntercessaoDiasSemana(a,b) - ){ - return true; - }else if(isRutasTipoPvCorridaIdOrigemDestinoEquivalentes(a,b) - && ((a.getFecCorrida() == null) ) && ( (b.getFecCorrida() == null) ) - && isIntercessaoDiasSemana(a,b) - ){ - return true; - } - return false; - } - - private boolean isRutasTipoPvCorridaIdOrigemDestinoEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(isRutasEquivalentes(a,b) - && isTipoPVEquivalentes(a,b) - && isCorridaIdEquivalentes(a,b) - && isOrigemEquivalentes(a,b) - && isDestinoEquivalentes(a,b)){ - return true; - }else{ - return false; - } - } - - private boolean isRutasEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(a.getRuta() == null && b.getRuta() == null ){ - return true; - } - if(a.getRuta() == null && b.getRuta() != null ){ - return false; - } - if(a.getRuta() != null && b.getRuta() == null ){ - return false; - } - if(a.getRuta() != null && b.getRuta() != null ){ - return a.getRuta().equals(b.getRuta()); - } - return false; - } - - private boolean isTipoPVEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(a.getTipoPuntoVenta() == null && b.getTipoPuntoVenta() == null ){ - return true; - } - if(a.getTipoPuntoVenta() == null && b.getTipoPuntoVenta() != null ){ - return false; - } - if(a.getTipoPuntoVenta() != null && b.getTipoPuntoVenta() == null ){ - return false; - } - if(a.getTipoPuntoVenta() != null && b.getTipoPuntoVenta() != null ){ - return a.getTipoPuntoVenta().equals(b.getTipoPuntoVenta()); - } - return false; - } - - private boolean isCorridaIdEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(a.getCorridaId() == null && b.getCorridaId() == null ){ - return true; - } - if(a.getCorridaId() == null && b.getCorridaId() != null ){ - return false; - } - if(a.getCorridaId() != null && b.getCorridaId() == null ){ - return false; - } - if(a.getCorridaId() != null && b.getCorridaId() != null ){ - return a.getCorridaId().equals(b.getCorridaId()); - } - return false; - } - - private boolean isOrigemEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(a.getOrigem() == null && b.getOrigem() == null ){ - return true; - } - if(a.getOrigem() == null && b.getOrigem() != null ){ - return false; - } - if(a.getOrigem() != null && b.getOrigem() == null ){ - return false; - } - if(a.getOrigem() != null && b.getOrigem() != null ){ - return a.getOrigem().equals(b.getOrigem()); - } - return false; - } - - private boolean isDestinoEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if(a.getDestino() == null && b.getDestino() == null ){ - return true; - } - if(a.getDestino() == null && b.getDestino() != null ){ - return false; - } - if(a.getDestino() != null && b.getDestino() == null ){ - return false; - } - if(a.getDestino() != null && b.getDestino() != null ){ - return a.getDestino().equals(b.getDestino()); - } - return false; - } - - private boolean isIntercessaoDiasSemana(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ - if( ((a.getDomingo() != null ? a.getDomingo() : false) && (b.getDomingo() != null ? b.getDomingo() : false )) - || (a.getSegunda()!= null ? a.getSegunda() : false) && (b.getSegunda() != null ? b.getSegunda() : false) - || (a.getTerca() != null ? a.getTerca() : false ) && (b.getTerca() != null ? b.getTerca() : false) - || (a.getQuarta()!= null ? a.getQuarta() : false ) && (b.getQuarta() != null ? b.getQuarta() : false) - || (a.getQuinta() != null ? a.getQuinta() : false) && (b.getQuinta() != null ? b.getQuinta() : false) - || (a.getSexta() != null ? a.getSexta() : false) && (b.getSexta() != null ? b.getSexta() : false ) - || (a.getSabado() != null ? a.getSabado() : false ) && (b.getSabado() != null ? b.getSabado() : false) ){ - return true; - } - if(null == a.getSegunda() - && null == b.getSegunda() - && null == a.getTerca() - && null == b.getTerca() - && null == a.getQuarta() - && null == b.getQuarta() - && null == a.getQuinta() - && null == b.getQuinta() - && null == a.getSexta() - && null == b.getSexta() - && null == a.getSabado() - && null == b.getSabado() - && null == a.getDomingo() - && null == b.getDomingo()){ - return true; - } - - return false; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoCanalVentaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.ConfRestricaoCanalVentaService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoCanalVentaService") +public class ConfRestricaoCanalVentaServiceImpl implements ConfRestricaoCanalVentaService { + + @Autowired + private ConfRestricaoCanalVentaDAO confRestricaoCanalVentaDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + private static Logger log = LogManager.getLogger(ConfRestricaoCanalVentaServiceImpl.class); + + + public ConfRestricaoCanalVenta obtenerID(Long id) { + return confRestricaoCanalVentaDAO.obtenerID(id); + } + + @Transactional + @Override + public ConfRestricaoCanalVenta suscribirActualizar(ConfRestricaoCanalVenta entidad) throws BusinessException { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + ConfRestricaoCanalVenta originalClone = null; + try { + originalClone = entidad.getCloneObject(); + + } catch (Exception e) { + log.error("Erro ao clonar CategoriaCtrl: ",e); + } + + if (entidad.getConfRestricaoCanalVentaId() == null){ + confRestricaoCanalVentaDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + return entidad; + }else{ + confRestricaoCanalVentaDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + return entidad; + } + } + @Transactional + public void borrar(ConfRestricaoCanalVenta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoCanalVentaDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + } + + + @Override + public void borrarList(Set confRestricaoCanalVentaSelecionadas) { + List listConfRestricaoCanalVentaIds =retornarListConfRestricaoCanalVentaIds(confRestricaoCanalVentaSelecionadas); + confRestricaoCanalVentaDAO.inativarListConfRestricaoCanalVenta(listConfRestricaoCanalVentaIds, UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } + + + private List retornarListConfRestricaoCanalVentaIds(Set ConfRestricaoCanalVentaSelecionadas) { + List listConfRestricaoCanalVentaIds = new ArrayList(); + for (ConfRestricaoCanalVenta c : ConfRestricaoCanalVentaSelecionadas) { + listConfRestricaoCanalVentaIds.add(c.getConfRestricaoCanalVentaId().intValue()); + } + return listConfRestricaoCanalVentaIds; + } + + @SuppressWarnings("unused") + private boolean isBloqueoExistente(ConfRestricaoCanalVenta c , List confRestricaoCanalVentaList){ + + List ls = new ArrayList() ; + + for (int i = 0; i < confRestricaoCanalVentaList.size(); i++){ + ConfRestricaoCanalVenta elementList = (ConfRestricaoCanalVenta)confRestricaoCanalVentaList.get(i); + if(c.getConfRestricaoCanalVentaId() == null){ + if(isConfRestricaoCanalVentasEquivalentes(c , elementList)){ + return true; + } + }else{ + if(!c.getConfRestricaoCanalVentaId().equals(elementList.getConfRestricaoCanalVentaId())){ + isConfRestricaoCanalVentasEquivalentes(c , elementList); + }else{ + continue; + } + } + } + return false; + } + + private boolean isConfRestricaoCanalVentasEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(isRutasTipoPvCorridaIdOrigemDestinoEquivalentes(a,b) + && (((a.getFecCorrida() != null) != (b.getFecCorrida() != null)) ? false : true) + && ((a.getFecCorrida() != null ) && (b.getFecCorrida() != null) ? true : false ) + && ((((a.getFecCorrida().compareTo(b.getFecCorrida())) == 0)) ? true : false ) + && isIntercessaoDiasSemana(a,b) + ){ + return true; + }else if(isRutasTipoPvCorridaIdOrigemDestinoEquivalentes(a,b) + && ((a.getFecCorrida() == null) ) && ( (b.getFecCorrida() == null) ) + && isIntercessaoDiasSemana(a,b) + ){ + return true; + } + return false; + } + + private boolean isRutasTipoPvCorridaIdOrigemDestinoEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(isRutasEquivalentes(a,b) + && isTipoPVEquivalentes(a,b) + && isCorridaIdEquivalentes(a,b) + && isOrigemEquivalentes(a,b) + && isDestinoEquivalentes(a,b)){ + return true; + }else{ + return false; + } + } + + private boolean isRutasEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(a.getRuta() == null && b.getRuta() == null ){ + return true; + } + if(a.getRuta() == null && b.getRuta() != null ){ + return false; + } + if(a.getRuta() != null && b.getRuta() == null ){ + return false; + } + if(a.getRuta() != null && b.getRuta() != null ){ + return a.getRuta().equals(b.getRuta()); + } + return false; + } + + private boolean isTipoPVEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(a.getTipoPuntoVenta() == null && b.getTipoPuntoVenta() == null ){ + return true; + } + if(a.getTipoPuntoVenta() == null && b.getTipoPuntoVenta() != null ){ + return false; + } + if(a.getTipoPuntoVenta() != null && b.getTipoPuntoVenta() == null ){ + return false; + } + if(a.getTipoPuntoVenta() != null && b.getTipoPuntoVenta() != null ){ + return a.getTipoPuntoVenta().equals(b.getTipoPuntoVenta()); + } + return false; + } + + private boolean isCorridaIdEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(a.getCorridaId() == null && b.getCorridaId() == null ){ + return true; + } + if(a.getCorridaId() == null && b.getCorridaId() != null ){ + return false; + } + if(a.getCorridaId() != null && b.getCorridaId() == null ){ + return false; + } + if(a.getCorridaId() != null && b.getCorridaId() != null ){ + return a.getCorridaId().equals(b.getCorridaId()); + } + return false; + } + + private boolean isOrigemEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(a.getOrigem() == null && b.getOrigem() == null ){ + return true; + } + if(a.getOrigem() == null && b.getOrigem() != null ){ + return false; + } + if(a.getOrigem() != null && b.getOrigem() == null ){ + return false; + } + if(a.getOrigem() != null && b.getOrigem() != null ){ + return a.getOrigem().equals(b.getOrigem()); + } + return false; + } + + private boolean isDestinoEquivalentes(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if(a.getDestino() == null && b.getDestino() == null ){ + return true; + } + if(a.getDestino() == null && b.getDestino() != null ){ + return false; + } + if(a.getDestino() != null && b.getDestino() == null ){ + return false; + } + if(a.getDestino() != null && b.getDestino() != null ){ + return a.getDestino().equals(b.getDestino()); + } + return false; + } + + private boolean isIntercessaoDiasSemana(ConfRestricaoCanalVenta a , ConfRestricaoCanalVenta b){ + if( ((a.getDomingo() != null ? a.getDomingo() : false) && (b.getDomingo() != null ? b.getDomingo() : false )) + || (a.getSegunda()!= null ? a.getSegunda() : false) && (b.getSegunda() != null ? b.getSegunda() : false) + || (a.getTerca() != null ? a.getTerca() : false ) && (b.getTerca() != null ? b.getTerca() : false) + || (a.getQuarta()!= null ? a.getQuarta() : false ) && (b.getQuarta() != null ? b.getQuarta() : false) + || (a.getQuinta() != null ? a.getQuinta() : false) && (b.getQuinta() != null ? b.getQuinta() : false) + || (a.getSexta() != null ? a.getSexta() : false) && (b.getSexta() != null ? b.getSexta() : false ) + || (a.getSabado() != null ? a.getSabado() : false ) && (b.getSabado() != null ? b.getSabado() : false) ){ + return true; + } + if(null == a.getSegunda() + && null == b.getSegunda() + && null == a.getTerca() + && null == b.getTerca() + && null == a.getQuarta() + && null == b.getQuarta() + && null == a.getQuinta() + && null == b.getQuinta() + && null == a.getSexta() + && null == b.getSexta() + && null == a.getSabado() + && null == b.getSabado() + && null == a.getDomingo() + && null == b.getDomingo()){ + return true; + } + + return false; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoExcecaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoExcecaoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoExcecaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoExcecaoServiceImpl.java index ae169d9a7..78be28400 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoExcecaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoExcecaoServiceImpl.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoExcecaoDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; -import com.rjconsultores.ventaboletos.service.ConfRestricaoExcecaoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoExcecaoService") -public class ConfRestricaoExcecaoServiceImpl implements ConfRestricaoExcecaoService { - - @Autowired - private ConfRestricaoExcecaoDAO confRestricaoExcecaoDAO; - - public List obtenerTodos() { - return confRestricaoExcecaoDAO.obtenerTodos(); - } - - public ConfRestricaoExcecao obtenerID(Integer id) { - return confRestricaoExcecaoDAO.obtenerID(id); - } - - @Transactional - public ConfRestricaoExcecao suscribir(ConfRestricaoExcecao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoExcecaoDAO.suscribir(entidad); - } - - @Transactional - public ConfRestricaoExcecao actualizacion(ConfRestricaoExcecao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoExcecaoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ConfRestricaoExcecao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoExcecaoDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoExcecaoDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoExcecao; +import com.rjconsultores.ventaboletos.service.ConfRestricaoExcecaoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoExcecaoService") +public class ConfRestricaoExcecaoServiceImpl implements ConfRestricaoExcecaoService { + + @Autowired + private ConfRestricaoExcecaoDAO confRestricaoExcecaoDAO; + + public List obtenerTodos() { + return confRestricaoExcecaoDAO.obtenerTodos(); + } + + public ConfRestricaoExcecao obtenerID(Integer id) { + return confRestricaoExcecaoDAO.obtenerID(id); + } + + @Transactional + public ConfRestricaoExcecao suscribir(ConfRestricaoExcecao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoExcecaoDAO.suscribir(entidad); + } + + @Transactional + public ConfRestricaoExcecao actualizacion(ConfRestricaoExcecao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoExcecaoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ConfRestricaoExcecao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoExcecaoDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoOrgaoConcedenteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoOrgaoConcedenteServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoOrgaoConcedenteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoOrgaoConcedenteServiceImpl.java index 474421f55..c001c13b7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoOrgaoConcedenteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoOrgaoConcedenteServiceImpl.java @@ -1,79 +1,79 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoOrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.service.ConfRestricaoOrgaoConcedenteService; -import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoOrgaoConcedenteService") -public class ConfRestricaoOrgaoConcedenteServiceImpl implements ConfRestricaoOrgaoConcedenteService { - - @Autowired - ConfRestricaoOrgaoConcedenteDAO confRestricaoOrgaoConcedenteDAO; - @Autowired - private OrgaoConcedenteService orgaoConcedenteService; - - @Override - public List obtenerTodos() { - return confRestricaoOrgaoConcedenteDAO.obtenerTodos(); - } - - @Override - public ConfRestricaoOrgaoConcedente obtenerID(Integer id) { - return confRestricaoOrgaoConcedenteDAO.obtenerID(id); - } - - @Override - public ConfRestricaoOrgaoConcedente obtenerOrgaoCOncedenteTodos() { - - ConfRestricaoOrgaoConcedente entidad = new ConfRestricaoOrgaoConcedente(); - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - OrgaoConcedente orgaoConcedente = orgaoConcedenteService.obtenerID(-1); - entidad.setOrgaoConcedente(orgaoConcedente); - - return entidad; - } - - @Override - @Transactional - public ConfRestricaoOrgaoConcedente suscribir(ConfRestricaoOrgaoConcedente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoOrgaoConcedenteDAO.suscribir(entidad); - } - - @Override - @Transactional - public ConfRestricaoOrgaoConcedente actualizacion(ConfRestricaoOrgaoConcedente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoOrgaoConcedenteDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ConfRestricaoOrgaoConcedente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoOrgaoConcedenteDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoOrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoOrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.service.ConfRestricaoOrgaoConcedenteService; +import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoOrgaoConcedenteService") +public class ConfRestricaoOrgaoConcedenteServiceImpl implements ConfRestricaoOrgaoConcedenteService { + + @Autowired + ConfRestricaoOrgaoConcedenteDAO confRestricaoOrgaoConcedenteDAO; + @Autowired + private OrgaoConcedenteService orgaoConcedenteService; + + @Override + public List obtenerTodos() { + return confRestricaoOrgaoConcedenteDAO.obtenerTodos(); + } + + @Override + public ConfRestricaoOrgaoConcedente obtenerID(Integer id) { + return confRestricaoOrgaoConcedenteDAO.obtenerID(id); + } + + @Override + public ConfRestricaoOrgaoConcedente obtenerOrgaoCOncedenteTodos() { + + ConfRestricaoOrgaoConcedente entidad = new ConfRestricaoOrgaoConcedente(); + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + OrgaoConcedente orgaoConcedente = orgaoConcedenteService.obtenerID(-1); + entidad.setOrgaoConcedente(orgaoConcedente); + + return entidad; + } + + @Override + @Transactional + public ConfRestricaoOrgaoConcedente suscribir(ConfRestricaoOrgaoConcedente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoOrgaoConcedenteDAO.suscribir(entidad); + } + + @Override + @Transactional + public ConfRestricaoOrgaoConcedente actualizacion(ConfRestricaoOrgaoConcedente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoOrgaoConcedenteDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ConfRestricaoOrgaoConcedente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoOrgaoConcedenteDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoPtovtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoPtovtaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoPtovtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoPtovtaServiceImpl.java index 5cd020692..6ff1cf3a9 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoPtovtaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoPtovtaServiceImpl.java @@ -1,79 +1,79 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoPtovtaDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.ConfRestricaoPtovtaService; -import com.rjconsultores.ventaboletos.service.PuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoPtovtaService") -public class ConfRestricaoPtovtaServiceImpl implements ConfRestricaoPtovtaService { - - @Autowired - ConfRestricaoPtovtaDAO confRestricaoPtovtaDAO; - @Autowired - private PuntoVentaService puntoVentaService; - - @Override - public List obtenerTodos() { - return confRestricaoPtovtaDAO.obtenerTodos(); - } - - @Override - public ConfRestricaoPtovta obtenerID(Integer id) { - return confRestricaoPtovtaDAO.obtenerID(id); - } - - @Override - public ConfRestricaoPtovta obtenerPtovtaTodos() { - - ConfRestricaoPtovta entidad = new ConfRestricaoPtovta(); - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - PuntoVenta puntoVenta = puntoVentaService.obtenerID(-1); - entidad.setPuntoVenta(puntoVenta); - - return entidad; - } - - @Override - @Transactional - public ConfRestricaoPtovta suscribir(ConfRestricaoPtovta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoPtovtaDAO.suscribir(entidad); - } - - @Override - @Transactional - public ConfRestricaoPtovta actualizacion(ConfRestricaoPtovta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoPtovtaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ConfRestricaoPtovta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoPtovtaDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoPtovtaDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoPtovta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.ConfRestricaoPtovtaService; +import com.rjconsultores.ventaboletos.service.PuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoPtovtaService") +public class ConfRestricaoPtovtaServiceImpl implements ConfRestricaoPtovtaService { + + @Autowired + ConfRestricaoPtovtaDAO confRestricaoPtovtaDAO; + @Autowired + private PuntoVentaService puntoVentaService; + + @Override + public List obtenerTodos() { + return confRestricaoPtovtaDAO.obtenerTodos(); + } + + @Override + public ConfRestricaoPtovta obtenerID(Integer id) { + return confRestricaoPtovtaDAO.obtenerID(id); + } + + @Override + public ConfRestricaoPtovta obtenerPtovtaTodos() { + + ConfRestricaoPtovta entidad = new ConfRestricaoPtovta(); + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + PuntoVenta puntoVenta = puntoVentaService.obtenerID(-1); + entidad.setPuntoVenta(puntoVenta); + + return entidad; + } + + @Override + @Transactional + public ConfRestricaoPtovta suscribir(ConfRestricaoPtovta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoPtovtaDAO.suscribir(entidad); + } + + @Override + @Transactional + public ConfRestricaoPtovta actualizacion(ConfRestricaoPtovta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoPtovtaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ConfRestricaoPtovta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoPtovtaDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoRutasServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoRutasServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoRutasServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoRutasServiceImpl.java index 0fa375f84..3c6ff68ab 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoRutasServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoRutasServiceImpl.java @@ -1,79 +1,79 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoRutasDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.service.ConfRestricaoRutasService; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoRutasService") -public class ConfRestricaoRutasServiceImpl implements ConfRestricaoRutasService { - - @Autowired - private ConfRestricaoRutasDAO confRestricaoRutasDAO; - @Autowired - private RutaService rutaService; - - @Override - public List obtenerTodos() { - return confRestricaoRutasDAO.obtenerTodos(); - } - - @Override - public ConfRestricaoRutas obtenerID(Integer id) { - return confRestricaoRutasDAO.obtenerID(id); - } - - @Override - public ConfRestricaoRutas obtenerRutasTodos() { - - ConfRestricaoRutas entidad = new ConfRestricaoRutas(); - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - Ruta ruta = rutaService.obtenerID(-1); - entidad.setRuta(ruta); - - return entidad; - } - - @Override - @Transactional - public ConfRestricaoRutas suscribir(ConfRestricaoRutas entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoRutasDAO.suscribir(entidad); - } - - @Override - @Transactional - public ConfRestricaoRutas actualizacion(ConfRestricaoRutas entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoRutasDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ConfRestricaoRutas entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoRutasDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoRutasDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoRutas; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.service.ConfRestricaoRutasService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoRutasService") +public class ConfRestricaoRutasServiceImpl implements ConfRestricaoRutasService { + + @Autowired + private ConfRestricaoRutasDAO confRestricaoRutasDAO; + @Autowired + private RutaService rutaService; + + @Override + public List obtenerTodos() { + return confRestricaoRutasDAO.obtenerTodos(); + } + + @Override + public ConfRestricaoRutas obtenerID(Integer id) { + return confRestricaoRutasDAO.obtenerID(id); + } + + @Override + public ConfRestricaoRutas obtenerRutasTodos() { + + ConfRestricaoRutas entidad = new ConfRestricaoRutas(); + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + Ruta ruta = rutaService.obtenerID(-1); + entidad.setRuta(ruta); + + return entidad; + } + + @Override + @Transactional + public ConfRestricaoRutas suscribir(ConfRestricaoRutas entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoRutasDAO.suscribir(entidad); + } + + @Override + @Transactional + public ConfRestricaoRutas actualizacion(ConfRestricaoRutas entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoRutasDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ConfRestricaoRutas entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoRutasDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoOCServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoOCServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoOCServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoOCServiceImpl.java index 5ab4c81c1..87d17a430 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoOCServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoOCServiceImpl.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoOCDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.service.ConfRestricaoTramoOCService; -import com.rjconsultores.ventaboletos.service.ParadaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoTramoOCService") -public class ConfRestricaoTramoOCServiceImpl implements ConfRestricaoTramoOCService { - - @Autowired - ConfRestricaoTramoOCDAO confRestricaoTramoOCDAO; - @Autowired - private ParadaService paradaService; - - @Override - public List obtenerTodos() { - return confRestricaoTramoOCDAO.obtenerTodos(); - } - - @Override - public ConfRestricaoTramoOC obtenerID(Integer id) { - return confRestricaoTramoOCDAO.obtenerID(id); - } - - @Override - public ConfRestricaoTramoOC obtenerTramoOCTodos() { - - ConfRestricaoTramoOC entidad = new ConfRestricaoTramoOC(); - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - Parada parada = paradaService.obtenerID(-1); - entidad.setOrigem(parada); - entidad.setDestino(parada); - return entidad; - } - - @Override - @Transactional - public ConfRestricaoTramoOC suscribir(ConfRestricaoTramoOC entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoTramoOCDAO.suscribir(entidad); - } - - @Override - @Transactional - public ConfRestricaoTramoOC actualizacion(ConfRestricaoTramoOC entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoTramoOCDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(ConfRestricaoTramoOC entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoTramoOCDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoOCDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramoOC; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.service.ConfRestricaoTramoOCService; +import com.rjconsultores.ventaboletos.service.ParadaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoTramoOCService") +public class ConfRestricaoTramoOCServiceImpl implements ConfRestricaoTramoOCService { + + @Autowired + ConfRestricaoTramoOCDAO confRestricaoTramoOCDAO; + @Autowired + private ParadaService paradaService; + + @Override + public List obtenerTodos() { + return confRestricaoTramoOCDAO.obtenerTodos(); + } + + @Override + public ConfRestricaoTramoOC obtenerID(Integer id) { + return confRestricaoTramoOCDAO.obtenerID(id); + } + + @Override + public ConfRestricaoTramoOC obtenerTramoOCTodos() { + + ConfRestricaoTramoOC entidad = new ConfRestricaoTramoOC(); + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + Parada parada = paradaService.obtenerID(-1); + entidad.setOrigem(parada); + entidad.setDestino(parada); + return entidad; + } + + @Override + @Transactional + public ConfRestricaoTramoOC suscribir(ConfRestricaoTramoOC entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoTramoOCDAO.suscribir(entidad); + } + + @Override + @Transactional + public ConfRestricaoTramoOC actualizacion(ConfRestricaoTramoOC entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoTramoOCDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(ConfRestricaoTramoOC entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoTramoOCDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoServiceImpl.java index 11cf73ecb..03603f52e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoTramoServiceImpl.java @@ -1,75 +1,75 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; -import com.rjconsultores.ventaboletos.service.ConfRestricaoTramoService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confRestricaoTramoService") -public class ConfRestricaoTramoServiceImpl implements ConfRestricaoTramoService { - - @Autowired - private ConfRestricaoTramoDAO confRestricaoTramoDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - - @Override - public List obtenerTodos() { - return confRestricaoTramoDAO.obtenerTodos(); - } - - @Override - public ConfRestricaoTramo obtenerID(Long id) { - return confRestricaoTramoDAO.obtenerID(id); - } - @Transactional - @Override - public ConfRestricaoTramo suscribir(ConfRestricaoTramo entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoTramoDAO.suscribir(entidad); - } - @Transactional - @Override - public ConfRestricaoTramo actualizacion(ConfRestricaoTramo entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confRestricaoTramoDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(ConfRestricaoTramo entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confRestricaoTramoDAO.actualizacion(entidad); -// logAuditoriaService.auditarExclusao(entidad, null); - - } - - @Override - @Transactional - public void actualizacionAuditagem(List lsConfRestricaoTramo) { - for (ConfRestricaoTramo cc : lsConfRestricaoTramo) { - if(Boolean.TRUE.equals(cc.getActivo())) { - continue; - } - confRestricaoTramoDAO.actualizacion(cc); - } - - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoTramoDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoTramo; +import com.rjconsultores.ventaboletos.service.ConfRestricaoTramoService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confRestricaoTramoService") +public class ConfRestricaoTramoServiceImpl implements ConfRestricaoTramoService { + + @Autowired + private ConfRestricaoTramoDAO confRestricaoTramoDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + + @Override + public List obtenerTodos() { + return confRestricaoTramoDAO.obtenerTodos(); + } + + @Override + public ConfRestricaoTramo obtenerID(Long id) { + return confRestricaoTramoDAO.obtenerID(id); + } + @Transactional + @Override + public ConfRestricaoTramo suscribir(ConfRestricaoTramo entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoTramoDAO.suscribir(entidad); + } + @Transactional + @Override + public ConfRestricaoTramo actualizacion(ConfRestricaoTramo entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confRestricaoTramoDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(ConfRestricaoTramo entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confRestricaoTramoDAO.actualizacion(entidad); +// logAuditoriaService.auditarExclusao(entidad, null); + + } + + @Override + @Transactional + public void actualizacionAuditagem(List lsConfRestricaoTramo) { + for (ConfRestricaoTramo cc : lsConfRestricaoTramo) { + if(Boolean.TRUE.equals(cc.getActivo())) { + continue; + } + confRestricaoTramoDAO.actualizacion(cc); + } + + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java index 6c190433c..d3bd68780 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoVendaWebServiceImpl.java @@ -1,81 +1,81 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfRestricaoVendaWebDAO; -import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; -import com.rjconsultores.ventaboletos.service.ConfRestricaoVendaWebService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - - -@Service("confRestricaoVendaWebService") -public class ConfRestricaoVendaWebServiceImpl implements ConfRestricaoVendaWebService{ - - @Autowired - private ConfRestricaoVendaWebDAO confRestricaoVendaWebDAO; - private static Logger log = LogManager.getLogger(ConfRestricaoVendaWebServiceImpl.class); - @Autowired - private LogAuditoriaService logAuditoriaService; - - - @Override - @Transactional - public ConfRestricaoVendaWeb suscribir(ConfRestricaoVendaWeb entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - confRestricaoVendaWebDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - return entidad; - } - - @Override - public ConfRestricaoVendaWeb obtenerID(Integer id) { - return confRestricaoVendaWebDAO.obtenerID(id); - } - - @Override - public List obtenerTodos() { - return confRestricaoVendaWebDAO.obtenerTodos(); - } - - @Override - @Transactional - public void borrar(ConfRestricaoVendaWeb entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - confRestricaoVendaWebDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - } - - @Override - @Transactional - public ConfRestricaoVendaWeb actualizacion(ConfRestricaoVendaWeb entidad) { - - ConfRestricaoVendaWeb originalClone = null; - try { - originalClone = entidad.getCloneObject(); - } catch (Exception e) { - log.error("Erro ao clonar TitularId",e); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - confRestricaoVendaWebDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - return entidad; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfRestricaoVendaWebDAO; +import com.rjconsultores.ventaboletos.entidad.ConfRestricaoVendaWeb; +import com.rjconsultores.ventaboletos.service.ConfRestricaoVendaWebService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + + +@Service("confRestricaoVendaWebService") +public class ConfRestricaoVendaWebServiceImpl implements ConfRestricaoVendaWebService{ + + @Autowired + private ConfRestricaoVendaWebDAO confRestricaoVendaWebDAO; + private static Logger log = LogManager.getLogger(ConfRestricaoVendaWebServiceImpl.class); + @Autowired + private LogAuditoriaService logAuditoriaService; + + + @Override + @Transactional + public ConfRestricaoVendaWeb suscribir(ConfRestricaoVendaWeb entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + confRestricaoVendaWebDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + return entidad; + } + + @Override + public ConfRestricaoVendaWeb obtenerID(Integer id) { + return confRestricaoVendaWebDAO.obtenerID(id); + } + + @Override + public List obtenerTodos() { + return confRestricaoVendaWebDAO.obtenerTodos(); + } + + @Override + @Transactional + public void borrar(ConfRestricaoVendaWeb entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + confRestricaoVendaWebDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + } + + @Override + @Transactional + public ConfRestricaoVendaWeb actualizacion(ConfRestricaoVendaWeb entidad) { + + ConfRestricaoVendaWeb originalClone = null; + try { + originalClone = entidad.getCloneObject(); + } catch (Exception e) { + log.error("Erro ao clonar TitularId",e); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + confRestricaoVendaWebDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + return entidad; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfTotemServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemServiceImpl.java index 999c56512..cf05a814a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemServiceImpl.java @@ -1,61 +1,61 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConfTotemDAO; -import com.rjconsultores.ventaboletos.entidad.ConfTotem; -import com.rjconsultores.ventaboletos.service.ConfTotemService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("confTotemService") -public class ConfTotemServiceImpl implements ConfTotemService { - - @Autowired - private ConfTotemDAO confTotemDAO; - - public List obtenerTodos() { - return confTotemDAO.obtenerTodos(); - } - - public ConfTotem obtenerID(Integer id) { - return confTotemDAO.obtenerID(id); - } - - @Transactional(propagation = Propagation.SUPPORTS) - public ConfTotem suscribir(ConfTotem entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado() != null ? UsuarioLogado.getUsuarioLogado().getUsuarioId() : null); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confTotemDAO.suscribir(entidad); - } - - @Transactional - public ConfTotem actualizacion(ConfTotem entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return confTotemDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ConfTotem entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - confTotemDAO.actualizacion(entidad); - } - - @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public ConfTotem buscar(String chave) { - return confTotemDAO.buscar(chave); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConfTotemDAO; +import com.rjconsultores.ventaboletos.entidad.ConfTotem; +import com.rjconsultores.ventaboletos.service.ConfTotemService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("confTotemService") +public class ConfTotemServiceImpl implements ConfTotemService { + + @Autowired + private ConfTotemDAO confTotemDAO; + + public List obtenerTodos() { + return confTotemDAO.obtenerTodos(); + } + + public ConfTotem obtenerID(Integer id) { + return confTotemDAO.obtenerID(id); + } + + @Transactional(propagation = Propagation.SUPPORTS) + public ConfTotem suscribir(ConfTotem entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado() != null ? UsuarioLogado.getUsuarioLogado().getUsuarioId() : null); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confTotemDAO.suscribir(entidad); + } + + @Transactional + public ConfTotem actualizacion(ConfTotem entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return confTotemDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ConfTotem entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + confTotemDAO.actualizacion(entidad); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public ConfTotem buscar(String chave) { + return confTotemDAO.buscar(chave); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemVentaRapidaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemVentaRapidaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfTotemVentaRapidaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfTotemVentaRapidaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaPendenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaPendenciaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ConferenciaPendenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaPendenciaServiceImpl.java index 95beec822..3e35f556e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaPendenciaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaPendenciaServiceImpl.java @@ -1,51 +1,51 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConferenciaPendenciaDAO; -import com.rjconsultores.ventaboletos.entidad.ConferenciaPendencia; -import com.rjconsultores.ventaboletos.service.ConferenciaPendenciaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("conferenciaPendenciaService") -public class ConferenciaPendenciaServiceImpl implements ConferenciaPendenciaService { - - @Autowired - ConferenciaPendenciaDAO conferenciaPendenciaDAO; - - @Override - public List obtenerTodos() { - return conferenciaPendenciaDAO.obtenerTodos(); - } - - @Override - public ConferenciaPendencia obtenerID(Integer id) { - return conferenciaPendenciaDAO.obtenerID(id); - } - - @Transactional - public ConferenciaPendencia suscribir(ConferenciaPendencia entidad) { - entidad.setFecmodif(new Date()); - entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); - if (entidad.getConferenciapendenciaId() == null) { - return conferenciaPendenciaDAO.suscribir(entidad); - } - return conferenciaPendenciaDAO.actualizacion(entidad); - } - - @Override - public ConferenciaPendencia actualizacion(ConferenciaPendencia entidad) { - return conferenciaPendenciaDAO.actualizacion(entidad); - } - - @Override - public void borrar(ConferenciaPendencia entidad) { - conferenciaPendenciaDAO.borrar(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConferenciaPendenciaDAO; +import com.rjconsultores.ventaboletos.entidad.ConferenciaPendencia; +import com.rjconsultores.ventaboletos.service.ConferenciaPendenciaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("conferenciaPendenciaService") +public class ConferenciaPendenciaServiceImpl implements ConferenciaPendenciaService { + + @Autowired + ConferenciaPendenciaDAO conferenciaPendenciaDAO; + + @Override + public List obtenerTodos() { + return conferenciaPendenciaDAO.obtenerTodos(); + } + + @Override + public ConferenciaPendencia obtenerID(Integer id) { + return conferenciaPendenciaDAO.obtenerID(id); + } + + @Transactional + public ConferenciaPendencia suscribir(ConferenciaPendencia entidad) { + entidad.setFecmodif(new Date()); + entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); + if (entidad.getConferenciapendenciaId() == null) { + return conferenciaPendenciaDAO.suscribir(entidad); + } + return conferenciaPendenciaDAO.actualizacion(entidad); + } + + @Override + public ConferenciaPendencia actualizacion(ConferenciaPendencia entidad) { + return conferenciaPendenciaDAO.actualizacion(entidad); + } + + @Override + public void borrar(ConferenciaPendencia entidad) { + conferenciaPendenciaDAO.borrar(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfigRestriccionPagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfigRestriccionPagoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfigRestriccionPagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfigRestriccionPagoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoParadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoParadaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoParadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoParadaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConfiguracionProductoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConstanteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ContaMDServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ContaMDServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ContaMDServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ContaMDServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ContratoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ContratoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ContratoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ContratoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java index e00f99b21..66abbfe4a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ControleSerieEmbarcadaServiceImpl.java @@ -1,83 +1,83 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CtrlSerieBPeDAO; -import com.rjconsultores.ventaboletos.dao.CtrlSerieEmbarcadaDAO; -import com.rjconsultores.ventaboletos.entidad.CtrlSerieBPe; -import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; -import com.rjconsultores.ventaboletos.exception.SerieEmbarcadaNaoDisponivelException; -import com.rjconsultores.ventaboletos.service.ControleSerieEmbarcadaService; -import com.rjconsultores.ventaboletos.vo.embarcada.SerieEmbarcada; - -@Service("controleSerieEmbarcadaService") -public class ControleSerieEmbarcadaServiceImpl implements ControleSerieEmbarcadaService { - - private static final Logger log = LogManager.getLogger(ControleSerieEmbarcadaServiceImpl.class); - - @Autowired - private CtrlSerieEmbarcadaDAO ctrlSerieEmbarcadaDAO; - - @Autowired - private CtrlSerieBPeDAO ctrlSerieBPeDAO; - - @Override - @Transactional - public SerieEmbarcada buscarSerieEmbarcada(CtrlSerieEmbarcada controleSerieEmbarcada) { - SerieEmbarcada serieembarcada = null; - - log.info(String.format("BuscarSerieEmbarcada :: Empresa:%s Estado:%s" , controleSerieEmbarcada.getEmpresa().getEmpresaId(),controleSerieEmbarcada.getEstado())); - - // Verificando se há Serie Embarcada disponível para reaproveitamento - int tentativas = 0; - - do { - tentativas++; - - try { - serieembarcada = ctrlSerieEmbarcadaDAO.buscarSerieEmbarcadaDisponivel(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId()); - } catch (SerieEmbarcadaNaoDisponivelException e) { - break; - } - - if (tentativas >= 5) { - break; - } - - } while (serieembarcada == null); - - // Caso não haja reaproveitamento de série, devo buscar a próxima série disponível na sequncia padrão - if (serieembarcada == null) { - log.info("BuscarSerieEmbarcada :: Reaproveitamento nao disponivel"); - Integer serieVlmax, SerieEmbarcada, serieBpe, serie, serieBpeSeq; - CtrlSerieBPe ctrlSerieBpe = ctrlSerieBPeDAO.buscarPorEmpresaEstado(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId()); - if( ctrlSerieBpe == null || ctrlSerieBpe.getSerie() == null ) { - log.info(String.format("BuscarSerieEmbarcada :: Serie não encontrada para Empresa:%s Estado:%s" , controleSerieEmbarcada.getEmpresa().getEmpresaId(),controleSerieEmbarcada.getEstado())); - throw new RuntimeException( String.format("Serie não encontrada para Empresa:%s Estado:%s" , controleSerieEmbarcada.getEmpresa().getEmpresaId(),controleSerieEmbarcada.getEstado()) ); - } - - serieBpe = Integer.valueOf(ctrlSerieBpe.getSerie()); - SerieEmbarcada = ctrlSerieBPeDAO.buscarSerieEmb(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId().toString()); - serieVlmax = (serieBpe < SerieEmbarcada ? SerieEmbarcada : serieBpe); - serie = (serieVlmax == null ? 1 : serieVlmax + 1); - - log.info(String.format("BuscarSerieEmbarcada :: Serie em uso [%d]", serie)); - - ctrlSerieBPeDAO.gerarSeqSerieBPe(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getCveestado(), serie); - serieBpeSeq = ctrlSerieBPeDAO.buscarSequencia(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getCveestado()); - serie = (serie <= serieBpeSeq ? serieBpeSeq : serie); - - log.info(String.format("BuscarSerieEmbarcada :: Serie selecionada [%d]", serie)); - - serieembarcada = new SerieEmbarcada(); - serieembarcada.setSerie(serie.toString()); - serieembarcada.setNumero("0"); - } - - return serieembarcada; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CtrlSerieBPeDAO; +import com.rjconsultores.ventaboletos.dao.CtrlSerieEmbarcadaDAO; +import com.rjconsultores.ventaboletos.entidad.CtrlSerieBPe; +import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; +import com.rjconsultores.ventaboletos.exception.SerieEmbarcadaNaoDisponivelException; +import com.rjconsultores.ventaboletos.service.ControleSerieEmbarcadaService; +import com.rjconsultores.ventaboletos.vo.embarcada.SerieEmbarcada; + +@Service("controleSerieEmbarcadaService") +public class ControleSerieEmbarcadaServiceImpl implements ControleSerieEmbarcadaService { + + private static final Logger log = LogManager.getLogger(ControleSerieEmbarcadaServiceImpl.class); + + @Autowired + private CtrlSerieEmbarcadaDAO ctrlSerieEmbarcadaDAO; + + @Autowired + private CtrlSerieBPeDAO ctrlSerieBPeDAO; + + @Override + @Transactional + public SerieEmbarcada buscarSerieEmbarcada(CtrlSerieEmbarcada controleSerieEmbarcada) { + SerieEmbarcada serieembarcada = null; + + log.info(String.format("BuscarSerieEmbarcada :: Empresa:%s Estado:%s" , controleSerieEmbarcada.getEmpresa().getEmpresaId(),controleSerieEmbarcada.getEstado())); + + // Verificando se há Serie Embarcada disponível para reaproveitamento + int tentativas = 0; + + do { + tentativas++; + + try { + serieembarcada = ctrlSerieEmbarcadaDAO.buscarSerieEmbarcadaDisponivel(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId()); + } catch (SerieEmbarcadaNaoDisponivelException e) { + break; + } + + if (tentativas >= 5) { + break; + } + + } while (serieembarcada == null); + + // Caso não haja reaproveitamento de série, devo buscar a próxima série disponível na sequncia padrão + if (serieembarcada == null) { + log.info("BuscarSerieEmbarcada :: Reaproveitamento nao disponivel"); + Integer serieVlmax, SerieEmbarcada, serieBpe, serie, serieBpeSeq; + CtrlSerieBPe ctrlSerieBpe = ctrlSerieBPeDAO.buscarPorEmpresaEstado(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId()); + if( ctrlSerieBpe == null || ctrlSerieBpe.getSerie() == null ) { + log.info(String.format("BuscarSerieEmbarcada :: Serie não encontrada para Empresa:%s Estado:%s" , controleSerieEmbarcada.getEmpresa().getEmpresaId(),controleSerieEmbarcada.getEstado())); + throw new RuntimeException( String.format("Serie não encontrada para Empresa:%s Estado:%s" , controleSerieEmbarcada.getEmpresa().getEmpresaId(),controleSerieEmbarcada.getEstado()) ); + } + + serieBpe = Integer.valueOf(ctrlSerieBpe.getSerie()); + SerieEmbarcada = ctrlSerieBPeDAO.buscarSerieEmb(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getEstadoId().toString()); + serieVlmax = (serieBpe < SerieEmbarcada ? SerieEmbarcada : serieBpe); + serie = (serieVlmax == null ? 1 : serieVlmax + 1); + + log.info(String.format("BuscarSerieEmbarcada :: Serie em uso [%d]", serie)); + + ctrlSerieBPeDAO.gerarSeqSerieBPe(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getCveestado(), serie); + serieBpeSeq = ctrlSerieBPeDAO.buscarSequencia(controleSerieEmbarcada.getEmpresa().getEmpresaId(), controleSerieEmbarcada.getEstado().getCveestado()); + serie = (serie <= serieBpeSeq ? serieBpeSeq : serie); + + log.info(String.format("BuscarSerieEmbarcada :: Serie selecionada [%d]", serie)); + + serieembarcada = new SerieEmbarcada(); + serieembarcada.setSerie(serie.toString()); + serieembarcada.setNumero("0"); + } + + return serieembarcada; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConvenioDetServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConvenioDetServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConvenioDetServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConvenioDetServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConvenioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConvenioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConvenioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConvenioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConvenioTransportadoraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConvenioTransportadoraServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ConvenioTransportadoraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ConvenioTransportadoraServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaCtrlServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CorridaCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaCtrlServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaInfoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaInfoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CorridaInfoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaInfoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index 51b1bb431..f9d1ec4f4 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -1,1866 +1,1866 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; -import java.util.Locale; - -import javax.persistence.Transient; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.support.DefaultTransactionDefinition; - -import com.rjconsultores.ventaboletos.dao.CorridaDAO; -import com.rjconsultores.ventaboletos.dao.EsquemaCorridaDAO; -import com.rjconsultores.ventaboletos.dao.TramoTiempoDAO; -import com.rjconsultores.ventaboletos.entidad.AsientoExclusivo; -import com.rjconsultores.ventaboletos.entidad.Ciudad; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.Corrida.Id; -import com.rjconsultores.ventaboletos.entidad.CorridaCtrl; -import com.rjconsultores.ventaboletos.entidad.CorridaInfo; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.DetDiagramaAutobus; -import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EsquemaAsiento; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaInfo; -import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaCombinacion; -import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; -import com.rjconsultores.ventaboletos.entidad.Tarifa; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.entidad.TramoServicio; -import com.rjconsultores.ventaboletos.entidad.TramoTiempo; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.enums.StatusFlexBus; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.AsientoExclusivoService; -import com.rjconsultores.ventaboletos.service.BoletoService; -import com.rjconsultores.ventaboletos.service.ClienteService; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.CorridaCtrlService; -import com.rjconsultores.ventaboletos.service.CorridaInfoService; -import com.rjconsultores.ventaboletos.service.CorridaService; -import com.rjconsultores.ventaboletos.service.CorridaTramoService; -import com.rjconsultores.ventaboletos.service.DetDiagramaAutobusService; -import com.rjconsultores.ventaboletos.service.EsquemaAsientoService; -import com.rjconsultores.ventaboletos.service.EsquemaCorridaInfoService; -import com.rjconsultores.ventaboletos.service.EsquemaCorridaService; -import com.rjconsultores.ventaboletos.service.EsquemaTramoService; -import com.rjconsultores.ventaboletos.service.ReservaEspecialClienteService; -import com.rjconsultores.ventaboletos.service.RutaSecuenciaService; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.service.TarifaService; -import com.rjconsultores.ventaboletos.service.TramoService; -import com.rjconsultores.ventaboletos.service.TramoServicioService; -import com.rjconsultores.ventaboletos.service.VigenciaTarifaService; -import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.FeriadoCache; -import com.rjconsultores.ventaboletos.utilerias.HoraSistema; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; - -/** - * - * @author rodrigo - */ -@Service("corridaService") -public class CorridaServiceImpl implements CorridaService { - - private static final Logger log = LogManager.getLogger(CorridaServiceImpl.class); - private static int CANT_MAX_CORRIDA_GERA_MANUAL = 40; - - // Tipo de venda Reserva - private static final Integer TPV_RESERVA_NORMAL = 15; - - @Autowired - private CorridaDAO corridaDAO; - @Autowired - private EsquemaAsientoService esquemaAsientoService; - @Autowired - private CorridaCtrlService corridaCtrlService; - @Autowired - private RutaService rutaService; - @Autowired - private TramoServicioService tramoServicioService; - @Autowired - private TramoTiempoDAO tramoTiempoDAO; - @Autowired - private AsientoExclusivoService asientoExclusivoService; - @Autowired - private EsquemaTramoService esquemaTramoService; - @Autowired - private EsquemaCorridaService esquemaCorridaService; - @Autowired - private EsquemaCorridaDAO esquemaCorridaDAO; - @Autowired - private DetDiagramaAutobusService detDiagramaAutobusService; - @Autowired - private ConstanteService constanteService; - @Autowired - private RutaSecuenciaService rutaSecuenciaService; - private PlatformTransactionManager transactionManager; - @Transient - private int cantCorridaGenerada; - @Transient - private int cantCorridaCommit; - @Autowired - private FeriadoCache feriadoCache; - @Autowired - private BoletoService boletoService; - @Autowired - private ReservaEspecialClienteService reservaEspecialClientService; - @Autowired - private TarifaService tarifaService; - @Autowired - TramoService tramoService; - @Autowired - VigenciaTarifaService vigenciaTarifaService; - @Autowired - ClienteService clienteService; - @Autowired - private CorridaInfoService corridaInfoService; - @Autowired - private EsquemaCorridaInfoService esquemaCorridaInfoService; - @Autowired - private CorridaTramoService corridaTramosService; - - @Autowired - public CorridaServiceImpl(@Qualifier("transactionManager") PlatformTransactionManager transactionManager) { - this.transactionManager = transactionManager; - } - - @Override - public List obtenerTodos() { - return corridaDAO.obtenerTodos(); - } - - @Override - public Corrida obtenerID(Corrida.Id id) { - return corridaDAO.obtenerID(id); - } - - @Override - public List buscarPorFecCorrida(Date value) { - return corridaDAO.buscarPorFecCorrida(value); - } - - @Override - public List buscarPorId(Integer idCorrida) { - return corridaDAO.buscarPorId(idCorrida); - } - - @Override - public List verificarCorridaId(Integer corridaId) { - return corridaDAO.verificarCorridaId(corridaId); - } - - @Override - public List buscarDistinct(Parada ori, Parada des, Date horaSalidaInicio, Date horaSalidaFin, ClaseServicio cs, Integer corridaId) { - return corridaDAO.buscarDistinct(ori, des, (horaSalidaInicio == null) ? null : DateUtil.getFecInicio(horaSalidaInicio).getTime(), (horaSalidaFin == null) ? null : DateUtil.getFecInicio(horaSalidaFin).getTime(), cs, corridaId); - } - - @Transactional - public Corrida suscribir(Corrida entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(ActivoUtil.ATIVO); - - return corridaDAO.suscribir(entidad); - } - - @Transactional - public Corrida actualizacion(Corrida entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(ActivoUtil.ATIVO); - - return corridaDAO.actualizacion(entidad); - } - - - @Transactional - public void borrar(Corrida entidad) { - corridaDAO.borrar(entidad); - } - - @Override - public List buscarPorAutobusCorridasFuturas(DiagramaAutobus diagramaAutobus) { - return corridaDAO.buscarPorAutobusCorridasFuturas(diagramaAutobus); - } - - @Override - public List buscarPorRolOperativoCorridasFuturas(DiagramaAutobus diagramaAutobus) { - return corridaDAO.buscarPorRolOperativoCorridasFuturas(diagramaAutobus); - } - - @Override - public List buscarFiltro(Parada ori, Parada des, Date hora, ClaseServicio cs) { - return corridaDAO.buscarFiltro(ori, des, hora, cs); - } - - public Boolean existeCorrida(Long id){ - return corridaDAO.existeCorrida(id); - } - - private Boolean geraDiaSemana(Integer diaSemana, EsquemaCorrida esquemaCorrida) { - Boolean retorno = Boolean.FALSE; - switch (diaSemana) { - case 1: { - // diaSemana = "Domingo"; - if (esquemaCorrida.getInddomingo() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getInddomingo()) { - retorno = Boolean.TRUE; - } - break; - } - case 2: { - // diaSemana = "Segunda"; - if (esquemaCorrida.getIndlunes() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getIndlunes()) { - retorno = Boolean.TRUE; - } - break; - } - case 3: { - // diaSemana = "Terca"; - if (esquemaCorrida.getIndmartes() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getIndmartes()) { - retorno = Boolean.TRUE; - } - break; - } - case 4: { - // diaSemana = "Quarta"; - if (esquemaCorrida.getIndmiercoles() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getIndmiercoles()) { - retorno = Boolean.TRUE; - } - break; - } - case 5: { - // diaSemana = "Quinta"; - if (esquemaCorrida.getIndjueves() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getIndjueves()) { - - retorno = Boolean.TRUE; - } - break; - } - case 6: { - // diaSemana = "Sexta"; - if (esquemaCorrida.getIndviernes() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getIndviernes()) { - retorno = Boolean.TRUE; - } - break; - } - case 7: { - // diaSemana = "Sabado"; - if (esquemaCorrida.getIndsabado() == null) { - retorno = Boolean.FALSE; - } else if (esquemaCorrida.getIndsabado()) { - retorno = Boolean.TRUE; - } - break; - } - } - - return retorno; - } - - private boolean temCorridaDiaSemana(Integer diaSemana, EsquemaCorrida esquemaCorrida, Boolean isFeriado) { - Boolean retorno = Boolean.FALSE; - - if (esquemaCorrida.getIndGeneraFeriado() != null) { - if (esquemaCorrida.getIndGeneraFeriado().equals("S")) { - retorno = geraDiaSemana(diaSemana, esquemaCorrida); - } else if (isFeriado) { - if (esquemaCorrida.getIndGeneraFeriado().equals("F")) { - retorno = geraDiaSemana(diaSemana, esquemaCorrida); - } - } else if (esquemaCorrida.getIndGeneraFeriado().equals("N")) { - retorno = geraDiaSemana(diaSemana, esquemaCorrida); - } - } else { - retorno = geraDiaSemana(diaSemana, esquemaCorrida); - } - - return retorno; - } - - private Date calcularFechorllegada(EsquemaTramo esquemaTramo, ClaseServicio clase, Date dataGeracao, Date horaChegada) { - GregorianCalendar gHoraChegada = new GregorianCalendar(); - gHoraChegada.setTime(horaChegada); - HoraSistema hs = null; - - if (esquemaTramo.getExcepcionRecorrido() != null) { - hs = new HoraSistema(esquemaTramo.getExcepcionRecorrido()); - - gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); - gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); - } else { - Tramo tramo = esquemaTramo.getTramo(); - List lsTramoServicio = tramoServicioService.buscarPorTramoServico(tramo, clase); - - for (TramoServicio ts : lsTramoServicio) { - hs = new HoraSistema(ts.getTiemporecorrido()); - - gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); - gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); - } - } - - return gHoraChegada.getTime(); - } - - @SuppressWarnings("deprecation") - private Date calcularFechorsalida(EsquemaTramo esquemaTramo, Date dataGeracao, Date horaChegadaAnterior, java.util.Date tiempoEstanciaAnterior) { - Date horaSaida; - - if (horaChegadaAnterior == null) { - horaSaida = truncarDataHora(dataGeracao, esquemaTramo.getEsquemaCorrida().getHorasalida()); - } else { - GregorianCalendar gHoraSaidaProximo = new GregorianCalendar(); - gHoraSaidaProximo.setTime(horaChegadaAnterior); - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - log.debug("Tempo Recorrido : " + sdf.format(gHoraSaidaProximo.getTime())); - - if (tiempoEstanciaAnterior != null) { - gHoraSaidaProximo.add(Calendar.MINUTE, tiempoEstanciaAnterior.getMinutes()); - gHoraSaidaProximo.add(Calendar.HOUR_OF_DAY, tiempoEstanciaAnterior.getHours()); - - log.debug("Tempo Recorrido + Estancia: " + sdf.format(gHoraSaidaProximo.getTime())); - } - - horaSaida = gHoraSaidaProximo.getTime(); - } - - GregorianCalendar gHoraSaida = new GregorianCalendar(); - gHoraSaida.setTime(horaSaida); - - return gHoraSaida.getTime(); - } - - /** - * Adiciciona as horas do parametro hora na data dataGeracao. - * - * Alem disso eh zerado os campos segundos e milisegundos. - * - * @param dataGeracao - * @param hora - * @return - */ - private Date truncarDataHora(Date dataGeracao, Date hora) { - Date dataCorreta = new Date(); - - GregorianCalendar gAux = new GregorianCalendar(); - gAux.setTime(hora); - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(dataGeracao); - gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); - gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); - gcalendar.set(Calendar.SECOND, 0); - gcalendar.set(Calendar.MILLISECOND, 0); - - dataCorreta = gcalendar.getTime(); - - return dataCorreta; - } - - private boolean isFeriado(java.sql.Date data, EsquemaCorrida esquemaCorrida) { - Empresa empresa = esquemaCorrida.getEmpresa(); - - Estado estadoOrigem = null; - List lsRutaSequencia = rutaSecuenciaService.buscarSecuenciaOrdenado(esquemaCorrida.getRuta()); - if (!lsRutaSequencia.isEmpty()) { - Tramo tramoOrigem = lsRutaSequencia.get(0).getTramo(); - Parada origem = tramoOrigem.getOrigem(); - estadoOrigem = origem.getCiudad().getEstado(); - } - - return feriadoCache.ehFeriado(data, empresa, estadoOrigem); - } - - /** - * Indica si el esquemaCorrida informado tiene una vigencia válida para la data de generacion - * - * @param esquemaCorrida - * @param dataGeracao - * @return - */ - private boolean vigenciaValida(EsquemaCorrida esquemaCorrida, Date dataGeracao) { - if ((DateUtil.compareOnlyDate(dataGeracao, esquemaCorrida.getEsquemaOperacional().getFecfinvigencia()) <= 0) && - (DateUtil.compareOnlyDate(dataGeracao, esquemaCorrida.getEsquemaOperacional().getFecniciovigencia()) >= 0)) { - - return true; - } - return false; - } - - /** - * Genera una corrida para el esquemaCorrida informado en la fecha informada.
- * - * Cuando la corrida no es generada :
- * - corrida ya existe : eso es checado por el numCorrida e dataGeneracion
- * - la fecha de generacion no tiene una vigencia válida
- * - el status del esquema corrida no es autorizado ("A")
- * - * - * @param esquemaCorrida - * @param diaSemana - * @param dataGeracao - * @return - La corrida generada o null si no fue generada. - */ - @SuppressWarnings("deprecation") - private Corrida generarCorrida(EsquemaCorrida esquemaCorrida, Date dataGeracao, boolean isPisoExtra, Boolean isFeriado, List corridaTramoList, boolean isValidaActivo) { - - - Corrida corrida = null; - try { - - GregorianCalendar calendario = new GregorianCalendar(); - calendario.setTime(dataGeracao); - Integer diaSemana = calendario.get(Calendar.DAY_OF_WEEK); - Ruta ruta = esquemaCorrida.getRuta(); - ClaseServicio claseServicio = esquemaCorrida.getClaseServicio(); - Marca marca = esquemaCorrida.getMarca(); - Date horario = esquemaCorrida.getHorasalida(); - horario = DateUtil.normalizar(horario); - Integer numCorrida = esquemaCorrida.getNumCorrida(); - Corrida.Id id = new Corrida.Id(); - id.setCorridaId(numCorrida); - id.setFeccorrida(DateUtil.normalizarToFecha(dataGeracao)); - List lsEsquemaTramo = null; - Parada origemCorrida = null; - Parada destinoCorrida =null; - boolean isValidaTrecho = true; - if(corridaTramoList !=null && !corridaTramoList.isEmpty()) { - origemCorrida = corridaTramoList.get(0).getOrigem(); - destinoCorrida = corridaTramoList.get(corridaTramoList.size()-1).getDestino(); - isValidaTrecho = false; - }else { - lsEsquemaTramo = esquemaTramoService.obtenerPorEsquemaCorridaOrderNumSec(esquemaCorrida); - origemCorrida = lsEsquemaTramo.get(0).getTramo().getOrigem(); - destinoCorrida = lsEsquemaTramo.get(lsEsquemaTramo.size() - 1).getTramo().getDestino(); - } - - - if(!realizaValidacoesGerais(esquemaCorrida, dataGeracao, diaSemana, isFeriado, ruta, id, numCorrida, - horario, claseServicio, marca, isPisoExtra, lsEsquemaTramo, isValidaActivo, isValidaTrecho)) { - return null; - } - - - /* Como o numCorrida corresponde ao corrida_id do corridaCtrl, ou seja, é chave primaria, temos que buscar somente por esse campo - Caso o registro já exista, atualizamos os dados dele. Sendo assim, o que vai indicar a "duplicidade" de uma corrida será apenas o número dela e não mais o conjunto : clase + marca + horario + ruta*/ - - CorridaCtrl corridaCtrl = criaCorridaCtrl(isPisoExtra, ruta, claseServicio, marca, horario, numCorrida); - - corrida = criaCorrida(esquemaCorrida, dataGeracao, id, lsEsquemaTramo, origemCorrida, destinoCorrida, - corridaCtrl, corridaTramoList, isValidaActivo); - - cantCorridaGenerada++; - - criaAssentoExclusivo(esquemaCorrida, corrida); - - } catch (Exception ex) { - log.error("", ex); - } - - return corrida; - } - - private Corrida criaCorrida(EsquemaCorrida esquemaCorrida, Date dataGeracao, Corrida.Id id, - List lsEsquemaTramo, Parada origemCorrida, Parada destinoCorrida, CorridaCtrl corridaCtrl, List corridaTramoList, boolean isCorridaInativa) { - Corrida corrida; - corrida = new Corrida(); - corrida.setId(id); - corrida.setEsquemaCorrida(esquemaCorrida); - corrida.setCorridaCtrl(corridaCtrl); - corrida.setAutobus(esquemaCorrida.getAutoBus()!= null ? esquemaCorrida.getAutoBus() : null); - corrida.setClaseServicio(corridaCtrl.getClaseServicio()); - corrida.setConductor(null); - if (esquemaCorrida.getIndCorridaExtra()) { - corrida.setTipoServicio(new Short("2")); - } else { - corrida.setTipoServicio(new Short("1")); - } - corrida.setInfoCorrida(esquemaCorrida.getInfoCorrida()); - Integer cantparados = esquemaCorrida.getCantparados(); - if (cantparados != null) { - corrida.setCantParados(cantparados.shortValue()); - } - - corrida.setEsquemaAgrupacionId(esquemaCorrida.getEsquemaAgrupacionId()); - - corrida.setEmpresa(esquemaCorrida.getEmpresa()); - corrida.setEmpresa1(esquemaCorrida.getEmpresa1()); - - corrida.setFechorsalida(truncarDataHora(dataGeracao, esquemaCorrida.getHorasalida())); - corrida.setFechorSalidaOriginal(corrida.getFechorsalida()); - - if (esquemaCorrida.getStatusCorrida().equals("A")) { - corrida.setIndstatuscorrida("H"); - corrida.setActivo(ActivoUtil.ATIVO); - } else if (esquemaCorrida.getStatusCorrida().equals("L")) { - corrida.setIndstatuscorrida("P"); - corrida.setActivo(ActivoUtil.INATIVO); - } - - corrida.setMarca(esquemaCorrida.getMarca()); - corrida.setNodo(corridaCtrl.getNodo()); - corrida.setDivision(esquemaCorrida.getDivision()); - corrida.setRuta(esquemaCorrida.getRuta()); - corrida.setRolOperativo(esquemaCorrida.getRolOperativo()); - corrida.setZona(null); - corrida.setOrigem(origemCorrida); - corrida.setDestino(destinoCorrida); - - validaFlexBus(esquemaCorrida, corrida); - List lsCorridaTramo = null; - Date fechorSalidaOriginalH = null; - if(corridaTramoList!=null && !corridaTramoList.isEmpty()) { - lsCorridaTramo = corridaTramoList; - }else { - lsCorridaTramo = corridaTramosService.criaCorridaTramoList(esquemaCorrida.getAutoBus(), dataGeracao, fechorSalidaOriginalH, lsEsquemaTramo, corridaCtrl.getNodo(), corrida.getClaseServicio(), esquemaCorrida.getStatusCorrida()); - for (CorridaTramo corridaTramo : lsCorridaTramo) { - corridaTramo.setCorrida(corrida); - } - } - - corrida.setCorridaTramoList(lsCorridaTramo); - - corrida.setFecmodif(Calendar.getInstance().getTime()); - - if (UsuarioLogado.getUsuarioLogado() != null) { - corrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } else { - corrida.setUsuarioId(1); - } - corrida.setIndTipoVenta(null); - corrida.setCodProdutoFiscal(UtiliteriasFiscal.defineCodigoProduto(corrida.getOrigem().getParadaId(), corrida.getDestino().getParadaId(), corrida.getRuta().getRutaId())); - if(!isCorridaInativa) { - corrida = corridaDAO.suscribir(corrida); - }else { - corrida = corridaDAO.actualizacion(corrida); - } - - return corrida; - } - - private CorridaCtrl criaCorridaCtrl(boolean isPisoExtra, Ruta ruta, ClaseServicio claseServicio, Marca marca, - Date horario, Integer numCorrida) { - CorridaCtrl corridaCtrl = corridaCtrlService.obtenerID(numCorrida); - - boolean novoRegistro = false; - - if (corridaCtrl == null) { - corridaCtrl = new CorridaCtrl(); - novoRegistro = true; - } - - corridaCtrl.setCorridaId(numCorrida); - corridaCtrl.setMarca(marca); - corridaCtrl.setRuta(ruta); - corridaCtrl.setClaseServicio(claseServicio); - corridaCtrl.setHorario(horario); - - // parada origem - Parada origen = rutaService.getOrigem(ruta); - if (origen == null) { - log.info("origen nao encontrado para a ruta = " + ruta.getRutaId()); - } - corridaCtrl.setNodo((origen == null) ? null : origen.getNodo()); - - corridaCtrl.setActivo(Boolean.TRUE); - corridaCtrl.setFecmodif(Calendar.getInstance().getTime()); - - if (UsuarioLogado.getUsuarioLogado() != null) { - corridaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } - - corridaCtrl.setPisoExtra(isPisoExtra); - - if (novoRegistro) { - corridaCtrl = corridaCtrlService.suscribir(corridaCtrl); - } else { - corridaCtrl = corridaCtrlService.actualizacion(corridaCtrl); - } - return corridaCtrl; - } - - - - private void validaFlexBus(EsquemaCorrida esquemaCorrida, Corrida corrida) { - if(esquemaCorrida.getIsFlexBus()) { - corrida.setOcupacaoMinima(esquemaCorrida.getOcupacaoMinima()); - corrida.setHorasParaConfirmacao(esquemaCorrida.getHorasParaConfirmacao()); - corrida.setMinutosParaConfirmacao(esquemaCorrida.getMinutosParaConfirmacao()); - corrida.setIsFlexBus(Boolean.TRUE); - - corrida.setStatusFlexBus(StatusFlexBus.EM_RESERVA.getStatus()); - } - } - - private Boolean realizaValidacoesGerais(EsquemaCorrida esquemaCorrida, Date dataGeracao, Integer diaSemana, Boolean isFeriado, - Ruta ruta, Corrida.Id id, Integer numCorrida, Date horario, ClaseServicio claseServicio, Marca marca, Boolean isPisoExtra, - List lsEsquemaTramo, boolean isGeraCorridaInativa, boolean isValidaTrecho ){ - Integer corridaId = esquemaCorrida.getNumCorrida(); - String fecCorrida = DateUtil.getStringDate(horario); - if (!vigenciaValida(esquemaCorrida, dataGeracao)) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + " vigencia invalida=" + dataGeracao); - return Boolean.FALSE; - } - - if (!((esquemaCorrida.getStatusCorrida() != null) && (esquemaCorrida.getStatusCorrida().equals("A") || esquemaCorrida.getStatusCorrida().equals("L")))) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + "status corrida invalido=" + esquemaCorrida.getStatusCorrida()); - return Boolean.FALSE; - } - - if (esquemaCorrida.getIndDiaSimDiaNao() == null || esquemaCorrida.getIndDiaSimDiaNao() == Boolean.FALSE) { - if (!temCorridaDiaSemana(diaSemana, esquemaCorrida, isFeriado)) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + "dia semana no valido=" + diaSemana); - return Boolean.FALSE; - } - } - - if(!isGeraCorridaInativa) { - if (!tramoServicioService.existenTiemposTramosEsquema(esquemaCorrida.getEsquemacorridaId())) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida +". Nao foi cadastrado o tempo de todos os trechos do esquema corrida=" + esquemaCorrida.getEsquemacorridaId()); - return Boolean.FALSE; - } - } - - if(!validaCorridaDiaSimDiaNao(esquemaCorrida, dataGeracao, numCorrida)) { - return Boolean.FALSE; - } - - if(!isGeraCorridaInativa) { - if (corridaDAO.existe(id)) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". corrida existe = " + numCorrida + ";" + ruta.getDescruta() + ";" + DateUtil.getStringDate(dataGeracao) + ";" + DateUtil.getStringDate(horario, "HH:mm") + ";" + claseServicio.getDescclase() + ";" + marca.getDescmarca() + " Piso: " + isPisoExtra); - return Boolean.FALSE; - } - } - if(isValidaTrecho) { - if(!realizaValidacoesTrecho(corridaId, fecCorrida, lsEsquemaTramo)) { - return Boolean.FALSE; - } - } - - - if(marca !=null && Boolean.FALSE.equals(marca.getActivo())){ - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". MarcaId=" + marca.getMarcaId() +" inativa, corrida não pode ser gerada"); - return Boolean.FALSE; - } - - return Boolean.TRUE; - } - - private boolean realizaValidacoesTrecho(Integer corridaId, String fecCorrida,List lsEsquemaTramo ) { - if (lsEsquemaTramo == null || lsEsquemaTramo.isEmpty()) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". Não contem trechos (EsquemaTramo nulo ou vazio)"); - return Boolean.FALSE; - } - EsquemaTramo primeiroTrechoCorrida = lsEsquemaTramo.get(0); - Parada origemCorrida = primeiroTrechoCorrida.getTramo().getOrigem(); - if (origemCorrida == null) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". Origem não preenchido (Primeiro trecho EsquemaTramo)"); - return Boolean.FALSE; - } - - - EsquemaTramo ultimoTrechoCorrida = lsEsquemaTramo.get(lsEsquemaTramo.size() - 1); - Parada destinoCorrida = ultimoTrechoCorrida.getTramo().getDestino(); - if (destinoCorrida == null) { - log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". Destino não preenchido (Último trecho EsquemaTramo)"); - return Boolean.FALSE; - } - - return true; - } - - private Boolean validaCorridaDiaSimDiaNao(EsquemaCorrida esquemaCorrida, Date dataGeracao, Integer numCorrida ){ - if (Boolean.TRUE.equals(esquemaCorrida.getIndDiaSimDiaNao())) { - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataGeracao); - calendarData.add(Calendar.DATE, -1); - - Corrida.Id corridaOntem = new Corrida.Id(); - - corridaOntem.setCorridaId(numCorrida); - corridaOntem.setFeccorrida(DateUtil.normalizarToFecha(calendarData.getTime())); - - if (corridaDAO.existe(corridaOntem)) { - log.info("Esquema configurado para gerar dia sim dia não e já possui corrida gerado no dia anterior, por isso não está data: " + DateUtil.getStringDate(dataGeracao)); - return Boolean.FALSE; - } - } - return Boolean.TRUE; - } - - private Calendar getCalendarFechorllegada(Date fecHorallegada) { - Calendar llegada = Calendar.getInstance(); - llegada.setTime(fecHorallegada); - llegada.set(llegada.get(Calendar.YEAR), llegada.get(Calendar.MONTH), llegada.get(Calendar.DATE), - llegada.get(Calendar.HOUR_OF_DAY), llegada.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); - return llegada; - } - - private Calendar getCalendarFechorSalida(Date fecHorSalida) { - Calendar salida = Calendar.getInstance(); - salida.setTime(fecHorSalida); - salida.set(salida.get(Calendar.YEAR), salida.get(Calendar.MONTH), salida.get(Calendar.DATE), - salida.get(Calendar.HOUR_OF_DAY), salida.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); - return salida; - } - - private void criaAssentoExclusivo(EsquemaCorrida esquemaCorrida, Corrida corrida) { - List lsEsquemaAsiento = esquemaAsientoService.obtenerPorCorrida(esquemaCorrida); - for (EsquemaAsiento ea : lsEsquemaAsiento) { - DetDiagramaAutobus detDiagramaAutobus = detDiagramaAutobusService.obtenerPorDiagramaAutobusAsiento(esquemaCorrida.getDiagramaAutobusId(), ea.getNumasiento()); - if (detDiagramaAutobus != null && detDiagramaAutobus.getVendible()) { - AsientoExclusivo asientoExclusivo = new AsientoExclusivo(); - asientoExclusivo.setCorrida(corrida); - asientoExclusivo.setMotivobloqueo(null); - asientoExclusivo.setNodo(corrida.getNodo()); - asientoExclusivo.setNumasiento(ea.getNumasiento()); - asientoExclusivo.setVendible(ea.getIndvendible()); - asientoExclusivo.setParada(ea.getParada()); - asientoExclusivo.setTiempoLiberacion(ea.getTiempoLiberacion()); - if (ea.getIndvendible()) { - asientoExclusivo.setMotivobloqueo(null); - } else { - asientoExclusivo.setMotivobloqueo(ea.getMotivobloqueo()); - asientoExclusivo.setDestino(ea.getDestino()); - } - - asientoExclusivo.setActivo(Boolean.TRUE); - asientoExclusivo.setFecmodif(Calendar.getInstance().getTime()); - if (UsuarioLogado.getUsuarioLogado() != null) { - asientoExclusivo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } - - asientoExclusivo = asientoExclusivoService.suscribir(asientoExclusivo); - } - } - } - - private Date calcularHusoHorVeranoLlegada(EsquemaTramo esquemaTramo, CorridaTramo corridaTramo) { - - Ciudad ciudadOrigen = esquemaTramo.getTramo().getOrigem().getCiudad(); - Estado estadoOrigen = ciudadOrigen.getEstado(); - - int tiempoOrigen = estadoOrigen.getTiempoHorHuso() == null ? 0 : estadoOrigen.getTiempoHorHuso(); - - Date fecInicioHorVerano = estadoOrigen.getFecInicioHorVerano(); - Date fecFinHorVerano = estadoOrigen.getFecFinoHorVerano(); - - - - if ((fecInicioHorVerano != null) && (fecFinHorVerano != null)) { - if ((DateUtil.compareOnlyDate(fecInicioHorVerano, corridaTramo.getFechorsalida()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVerano, corridaTramo.getFechorsalida()) >= 0)) { - tiempoOrigen += estadoOrigen.getTiempoHorVerano(); - } - } - // 21688 - Ciudad ciudadDestino = esquemaTramo.getTramo().getDestino().getCiudad(); - Estado estadoDestino = ciudadDestino.getEstado(); - int tiempoDestino = 0; - - if (!estadoDestino.equals(estadoOrigen)) { - tiempoDestino = estadoDestino.getTiempoHorHuso() == null ? 0 : estadoDestino.getTiempoHorHuso(); - - - - Date fecInicioHorVeranoDestino = estadoDestino.getFecInicioHorVerano(); - Date fecFinHorVeranDestino = estadoDestino.getFecFinoHorVerano(); - - if ((fecInicioHorVeranoDestino != null) && (fecFinHorVeranDestino != null)) { - if ((DateUtil.compareOnlyDate(fecInicioHorVeranoDestino, corridaTramo.getFechorllegada()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVeranDestino, corridaTramo.getFechorllegada()) >= 0)) { - tiempoDestino += estadoDestino.getTiempoHorVerano(); - } - } - } else { - tiempoDestino =0; - tiempoOrigen=0; - } - - //Consideração do fuso por cidade. - //Nesse caso, é mandatório em relação ao estado.Ou seja, equanto que no fuso do estado, - //tem que haver Mudança de estado, para a cidade NÃO, pois pode-se considerar cada cidade - //como um único estado. Sendo assim, devendo ser considerado sempre quando preenchido - if ( (ciudadOrigen.getZonaHoraria() != null) && (ciudadOrigen.getZonaHoraria() != 0 )){ - log.info("Fuso da cidade origem " + ciudadOrigen.getNombciudad() + " : " + ciudadOrigen.getZonaHoraria()); - - tiempoOrigen += ciudadOrigen.getZonaHoraria(); - } - - if ( (ciudadDestino.getZonaHoraria() != null) && (ciudadDestino.getZonaHoraria() != 0 )){ - log.info("Fuso da cidade destino " + ciudadDestino.getNombciudad() + " : " + ciudadDestino.getZonaHoraria()); - - tiempoDestino += ciudadDestino.getZonaHoraria(); - } - //Fim consideração fuso por cidade - - Calendar horLlegada = null; - - long elapsedMinutes = DateUtil.getElapsedMinutos(corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); - - horLlegada = Calendar.getInstance(); - horLlegada.setTime(corridaTramo.getFechorsalidaH()); - - horLlegada.add(Calendar.MINUTE, (int) elapsedMinutes); - - // Si los tiempos son distintos, hube cambio de huso horario/horario de verano - if (tiempoOrigen != tiempoDestino) { - horLlegada.add(Calendar.HOUR, difHuso(tiempoOrigen, tiempoDestino)); - - } - - return (horLlegada == null) ? null : horLlegada.getTime(); - } - - private int difHuso(int a, int b) { - return b - a; - } - - public Boolean generarCorrida(Date dataGeracao, List lsEsquemaCorrida, boolean isGeracaoAutomaticaCorrida, List corridaTramoList, boolean isValidaActivo) { - - DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); - - // TODO: Melhorar o tratamento às transações manuais em caso de erro,etc - TransactionStatus status = transactionManager.getTransaction(def); - cantCorridaGenerada = 0; - cantCorridaCommit = 1; - java.sql.Date data = new java.sql.Date(dataGeracao.getTime()); - - Integer unUsuarioId = constanteService.buscarValorConstantePorNomeConstante("USUARIO_RESERVA_CLIENTES"); - Integer unPuntoVenta= constanteService.buscarValorConstantePorNomeConstante("PUNTOVENTA_RESERVA_CLIENTES"); - Integer estacionId = constanteService.buscarValorConstantePorNomeConstante("ESTACION_RESERVA_CLIENTES"); - - boolean corridaGerada = true; - - Corrida corrida = null; - Corrida corridaPisoExtra = null; - Corrida corridaPisoExtra2 = null; - try { - - for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { - log.info("esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - - //Usado para validar se deve buscar o primeiro piso e vincular com o segungo/terceiro caso ele ja esteja criado - boolean isSegundoOuTerceiroPiso = false; - - if (isGeracaoAutomaticaCorrida) { - boolean esHijoRebote = esquemaCorridaDAO.esHijoRebote(esquemaCorrida); - boolean esSegundoPiso = esquemaCorridaDAO.esSegundoPiso(esquemaCorrida); - - //Nessas duas condições, o "filho" só é gerado a partir do esquema corrida "pai" - if (esHijoRebote || esSegundoPiso) { - log.info(String.format("Esquema nao gerado. esHijoRebote:%s ; esSegundoPiso: %s",esHijoRebote,esSegundoPiso)); - corridaGerada = false; - continue; - } - } else { - // Caso nao seja automatico e o segundo piso seja enviado, busca o primeiro piso e geram os dois (ou tres pisos), - // caso o primeiro piso ja exista, o segundo e gerado e os dois sao vinculados - boolean esHijoRebote = esquemaCorridaDAO.esHijoRebote(esquemaCorrida); - - //Nessas tres condições, o "filho" só é gerado a partir do esquema corrida "pai" - if (esHijoRebote) { - log.info("E segundo HijoRebote, procurando a corrida Pai. "); - - esquemaCorrida = esquemaCorridaDAO.buscarEsquemaPeloHijoRebote(esquemaCorrida); - - if(esquemaCorrida == null) { - log.info(String.format("Esquema nao gerado. esHijoRebote:%s ; ",esHijoRebote)); - corridaGerada = false; - continue; - } - log.info("Corrida Pai esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - } - - boolean esSegundoPiso = esquemaCorridaDAO.esSegundoPiso(esquemaCorrida); - - if(esSegundoPiso) { - isSegundoOuTerceiroPiso = true; - log.info("E segundo Piso, procurando o primeiro piso para gerar. "); - esquemaCorrida = esquemaCorridaDAO.buscarPrimeiroPisoPeloSegundo(esquemaCorrida); - - if(esquemaCorrida == null) { - log.info("Primeiro piso nao encontrado, nao ira gerar o servico: " ); - corridaGerada = false; - continue; - } - - log.info("Primeiro Piso esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - } - - boolean esTerceiroPiso = esquemaCorridaDAO.esTerceiroPiso(esquemaCorrida); - - if(esTerceiroPiso) { - isSegundoOuTerceiroPiso = true; - log.info("E terceiro Piso, procurando o primeiro piso para gerar. "); - esquemaCorrida = esquemaCorridaDAO.buscarPrimeiroPisoPeloTerceiro(esquemaCorrida); - - if(esquemaCorrida == null) { - log.info("Primeiro piso nao encontrado, nao ira gerar o servico: " ); - corridaGerada = false; - continue; - } - log.info("Primeiro Piso esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - } - } - - if(esquemaCorrida.getIndCorridaDesativada()) { - log.info("Corrida desativada nao sera gerada. " + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - corridaGerada = false; - continue; - } - - Boolean isFeriado = this.isFeriado(data, esquemaCorrida); - corrida = generarCorrida(esquemaCorrida, dataGeracao, false, isFeriado, corridaTramoList, isValidaActivo); - - - corridaPisoExtra = null; - corridaPisoExtra2 = null; - - if (corrida == null && !isSegundoOuTerceiroPiso) { - corridaGerada = false; - continue; - - } else if(corrida == null && isSegundoOuTerceiroPiso) { - log.info(" Primeiro piso ja existe, buscando corrida para vincular ao piso extra"); - corrida = corridaDAO.buscarPorId(criarIdCorrida(dataGeracao, esquemaCorrida)); - - if (corrida == null) { - log.info("Nao foi encontrada corrida original, nao sera gerado o segundo/terceiro piso"); - corridaGerada = false; - continue; - } - } - - // PISO EXTRA - if (esquemaCorrida.getPisoExtra() != null && esquemaCorrida.getPisoExtra()) { - - EsquemaCorrida esquemaCorridaSegundoPiso = esquemaCorridaDAO.buscarPeloNumCorrida(esquemaCorrida.getNumCorridaPisoExtra()); - - String mensagemLog = String.format("Esquema/Corrida primeiro piso: %s/%s ; Esquema/Corrida segundo piso: %s/%s ",esquemaCorrida.getEsquemacorridaId(),esquemaCorrida.getNumCorrida(), esquemaCorridaSegundoPiso.getEsquemacorridaId(),esquemaCorridaSegundoPiso.getNumCorrida() ); - log.info(mensagemLog); - - if(esquemaCorridaSegundoPiso.getIndCorridaDesativada()) { - log.info("Corrida desativada nao sera gerada. " + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - corridaGerada = false; - continue; - } - - corridaPisoExtra = generarCorrida(esquemaCorridaSegundoPiso, dataGeracao, true, isFeriado, null, false); - Boolean atualizarPisoExtra = false; - - // caso corrida segundo piso for gerada antes, atualizar - atualizarPisoExtra = atualizarCorridaPisoExtra(corridaPisoExtra, esquemaCorridaSegundoPiso, data, mensagemLog, atualizarPisoExtra); - - alterarNumPisoCorridaPisoExtra(corrida, corridaPisoExtra, mensagemLog, atualizarPisoExtra, false); - - //Valida se existe configuração de reserva para o cliente e crria Cria reserva para 2º piso - if(corridaPisoExtra !=null) { - if(unUsuarioId!=null && unPuntoVenta!=null && estacionId!=null) { - validaCriaReservaCliente(corridaPisoExtra, unUsuarioId, unPuntoVenta, estacionId); - }else { - log.error("Usuario ou ponto de venda ou estação não definidos para reserva especial nas contantes"); - } - } - - if(esquemaCorrida.getNumCorridaPisoExtra2() != null) { - - EsquemaCorrida esquemaCorridaTerceiroPiso = esquemaCorridaDAO.buscarPeloNumCorrida(esquemaCorrida.getNumCorridaPisoExtra2()); - - if(esquemaCorridaTerceiroPiso != null) { - - mensagemLog = String.format("Esquema/Corrida primeiro piso: %s/%s ; Esquema/Corrida terceiro piso: %s/%s ",esquemaCorrida.getEsquemacorridaId(),esquemaCorrida.getNumCorrida(), esquemaCorridaTerceiroPiso.getEsquemacorridaId(),esquemaCorridaTerceiroPiso.getNumCorrida() ); - log.info(mensagemLog); - - if(esquemaCorridaTerceiroPiso.getIndCorridaDesativada()) { - log.info("Corrida desativada nao sera gerada. " + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); - corridaGerada = false; - continue; - } - - corridaPisoExtra2 = generarCorrida(esquemaCorridaTerceiroPiso, dataGeracao, true, isFeriado, null, false); - atualizarPisoExtra = false; - - // caso corrida segundo piso for gerada antes, atualizar - atualizarPisoExtra = atualizarCorridaPisoExtra(corridaPisoExtra2, esquemaCorridaTerceiroPiso, data, mensagemLog, atualizarPisoExtra); - - // caso corrida segundo piso for gerada antes, atualizar - alterarNumPisoCorridaPisoExtra(corrida, corridaPisoExtra2, mensagemLog, atualizarPisoExtra, true); - - //Valida se existe configuração de reserva para o cliente e crria Cria reserva para 2º piso - if(corridaPisoExtra !=null) { - if(unUsuarioId!=null && unPuntoVenta!=null && estacionId!=null) { - validaCriaReservaCliente(corridaPisoExtra, unUsuarioId, unPuntoVenta, estacionId); - }else { - log.error("Usuario ou ponto de venda ou estação não definidos para reserva nas contantes"); - } - } - } - } - } - - if (esquemaCorrida.getEsquemaCorridaRebote() != null) { - criaCorridaRebote(dataGeracao, corrida, corridaPisoExtra, corridaPisoExtra2, esquemaCorrida, - isFeriado); - } - - if(corrida != null) { - generarCorridaInfo(corrida, esquemaCorrida); - } - - if (cantCorridaGenerada >= cantCorridaCommit) { - cantCorridaGenerada = 0; - transactionManager.commit(status); - status = transactionManager.getTransaction(def); - } - - } - }catch (Exception e) { - log.error("Erro ao gerar corrida", e ); - } - finally { - if ((status != null) && (!status.isCompleted())) { - transactionManager.commit(status); - } - } - //Valida se existe configuração de reserva para o cliente e cria Cria reserva - if(corrida !=null) { - if(unUsuarioId!=null && unPuntoVenta!=null && estacionId!=null) { - validaCriaReservaCliente(corrida, unUsuarioId, unPuntoVenta, estacionId); - }else { - log.error("Usuario ou ponto de venda ou estação não definidos para reserva especial nas contantes"); - } - } - - return corridaGerada; - } - - private Id criarIdCorrida(Date dataGeracao, EsquemaCorrida esquemaCorrida) { - Corrida.Id id = new Corrida.Id(); - id.setCorridaId(esquemaCorrida.getNumCorrida()); - id.setFeccorrida(DateUtil.normalizarToFecha(dataGeracao)); - - return id; - } - - private void criaCorridaRebote(Date dataGeracao, Corrida corrida, Corrida corridaPisoExtra, - Corrida corridaPisoExtra2, EsquemaCorrida esquemaCorrida, Boolean isFeriado) { - log.info("Corrida Rebote=" + esquemaCorrida.getEsquemacorridaId()); - - Corrida corridaRebote = generarCorrida(esquemaCorrida.getEsquemaCorridaRebote(), dataGeracao, false, isFeriado, null, false); - Corrida corridaPisoExtraRebote = null; - boolean generaReboteDiaSeguinte = false; - - if (corridaRebote != null) { - EsquemaCorrida ecRebote = esquemaCorrida.getEsquemaCorridaRebote(); - if (ecRebote.getPisoExtra() != null && ecRebote.getPisoExtra()) { - - EsquemaCorrida esquemaCorridaSegundoPiso = esquemaCorridaDAO.buscarPeloNumCorrida(ecRebote.getNumCorridaPisoExtra()); - - log.info(String.format("Esquema/Corrida primeiro piso: %s/%s ; Esquema/Corrida segundo piso: %s/%s ",ecRebote.getEsquemacorridaId(),ecRebote.getNumCorrida(), esquemaCorridaSegundoPiso.getEsquemacorridaId(),esquemaCorridaSegundoPiso.getNumCorrida() )); - - corridaPisoExtraRebote = generarCorrida(esquemaCorridaSegundoPiso, dataGeracao, true, isFeriado, null, false); - - if (corridaRebote != null && corridaPisoExtraRebote != null) { - // Salvando Referencia da Corrida no piso extra - corridaPisoExtraRebote.setCorridaPiso(corridaRebote); - corridaPisoExtraRebote.setNumPiso(2); - corridaPisoExtraRebote = corridaDAO.actualizacion(corridaPisoExtraRebote); - - // Referencia do Piso extra na Corrida - corridaRebote.setCorridaPiso(corridaPisoExtraRebote); - corridaRebote.setNumPiso(1); - corridaRebote = corridaDAO.actualizacion(corridaRebote); - } - } - // RebotePisoExtra - if (DateUtil.compareDate(corrida.getFechorsalida(), corridaRebote.getFechorsalida()) > 0) { - generaReboteDiaSeguinte = true; // si fue generado con una fechamenor tienes que generar para el dia seguinte - } - } else { - generaReboteDiaSeguinte = true;// si no fue encontrado para el dia de hoy,genera para manhana - } - - if (generaReboteDiaSeguinte) { - log.info("Haciendo la busqueda por el esquema rebote para el dia seguiente pues ya existe al dia de hoy"); - - corridaRebote = generarReboteDiaSeguinte(esquemaCorrida, dataGeracao); - - if (corridaPisoExtraRebote != null) { - corridaPisoExtraRebote = generarReboteDiaSeguinte(esquemaCorrida, dataGeracao); - } - - if (corridaRebote == null) { - log.info("No fue posible generar la corrida rebote. No fue encontrado esquema para la fecha del dia seguinte a " + dataGeracao); - } - } - if (corridaRebote != null) { - log.info("Rebote generado=" + corridaRebote.getId()); - corrida.setCorridaRebote(corridaRebote); - corridaDAO.actualizacion(corrida); - } - - if (corridaPisoExtraRebote != null && corridaPisoExtra != null) { - log.info("Rebote Piso Extra Generado=" + corridaPisoExtraRebote.getId()); - corridaPisoExtra.setCorridaRebote(corridaPisoExtraRebote); - corridaDAO.actualizacion(corridaPisoExtra); - } - - if (corridaPisoExtraRebote != null && corridaPisoExtra2 != null) { - log.info("Rebote Piso Extra Generado=" + corridaPisoExtraRebote.getId()); - corridaPisoExtra2.setCorridaRebote(corridaPisoExtraRebote); - corridaDAO.actualizacion(corridaPisoExtra2); - } - } - - private void validaCriaReservaCliente(Corrida corrida, Integer unUsuarioId, Integer unPuntoVenta, Integer estacionId) { - try { - List reservaEspecialClienteList = reservaEspecialClientService.bucarReservaEspecialByCorridaId(corrida.getId().getCorridaId().longValue()) ; - if(reservaEspecialClienteList !=null) { - for (ReservaEspecialCliente reservaEspecialCliente : reservaEspecialClienteList) { - Date dataAtual = new Date (); - //Valida se esta dentro da vigência - if(DateUtil.isMenor(reservaEspecialCliente.getFecinicio(), dataAtual) && DateUtil.isMaior(reservaEspecialCliente.getFecfinal(), dataAtual)){ - Integer unoTerminalOrigenId = reservaEspecialCliente.getOrigem().getParadaId(); - Integer unoTerminalDestinoId = reservaEspecialCliente.getDestino().getParadaId(); - String unoAsientoSelec = reservaEspecialCliente.getNumAsentoCorrida().toString(); - Integer unaCorridaId =corrida.getId().getCorridaId().intValue(); - Date unaFecCorrida= corrida.getId().getFeccorrida(); - Integer unoTipoVenta= TPV_RESERVA_NORMAL; - Integer unaCategoriaSelec= 1 ; - String unoNumeOperacion= null ; - Tramo tramo = null; - Date fecViaje = corrida.getFechorsalida(); - Ruta ruta = rutaService.obtenerID(corrida.getRuta().getRutaId()); - for(RutaCombinacion rutaCombinacion :ruta.getRutaCombinacionList()) { - if((rutaCombinacion.getTramo().getOrigem().getParadaId().intValue()==unoTerminalOrigenId.intValue()) - && (rutaCombinacion.getTramo().getDestino().getParadaId().intValue()==unoTerminalDestinoId.intValue()) ) { - tramo = rutaCombinacion.getTramo(); - break; - } - } - - for (CorridaTramo corridaTramo : corrida.getCorridaTramoList()) { - //(Se origem corridatramo = origem cadastrada && destino corridatramo = destino cadastrado) - // ou (se origem corridatramo = destino do cadastrado), tendo em vista que corridatramo são as sequencias e não as combinações - if(corridaTramo.getOrigem()!=null && corridaTramo.getOrigem().getParadaId().intValue()==unoTerminalOrigenId.intValue() - && corridaTramo.getDestino()!=null && corridaTramo.getDestino().getParadaId().intValue()==unoTerminalDestinoId.intValue()) { - fecViaje = corridaTramo.getFechorsalidaH(); - break; - } - } - if(fecViaje!=null) { - if(!isDiaSemnanaOK(reservaEspecialCliente, fecViaje)) { - log.error("Reserva não será realizada. Dia da semana desta corrida não corresponde ao dia da semana configurado na resserva epecial para o clienteId:" - + reservaEspecialCliente.getClienteId() + " reservaEspecialClienteId:" + reservaEspecialCliente.getReservaEspecialClienteId() + " para a corrida:" + corrida.getId().getCorridaId() + "na data" + fecViaje); - continue; - } - } - - if(tramo==null) { - log.error("Reserva não será realizada. não foi encontrado trecho com Origem:" + unoTerminalOrigenId + " Destino:" +unoTerminalDestinoId + " para a corrida:" + corrida.getId().getCorridaId()); - continue; - } - List vigenciaTarifaList = vigenciaTarifaService.buscarVigenciasIntervalo(new VigenciaTarifa(corrida.getFechorSalidaOriginal(), corrida.getFechorSalidaOriginal())); - if(vigenciaTarifaList==null || vigenciaTarifaList.isEmpty()) { - log.error("Reserva não será realizada. não foi encontrado Vigência Tarifa com Origem:" + unoTerminalOrigenId + " Destino:" +unoTerminalDestinoId + " para a corrida:" + corrida.getId().getCorridaId()); - continue; - } - Tarifa tarifa = tarifaService.buscar(tramo, corrida.getMarca(), corrida.getClaseServicio(), vigenciaTarifaList!=null ? vigenciaTarifaList.get(0) : null, new Moneda(1), corrida.getRuta()); - if(tarifa==null ) { - log.error("Reserva não será realizada. não foi encontrado Tarifa com Origem:" + unoTerminalOrigenId + " Destino:" +unoTerminalDestinoId + " para a corrida:" + corrida.getId().getCorridaId()); - continue; - } - BigDecimal valorTarifa= tarifa!=null ? tarifa.getPrecio() : null ; - BigDecimal valorSeguro= tarifa!=null ? tarifa.getImporteseguro() : null ; - BigDecimal valorTaxaEmbarque= tarifa!=null ? tarifa.getImportetaxaembarque() : null ; - BigDecimal valorPedagio = tarifa!=null ? tarifa.getImportepedagio() : null ; - Long tempoReserva = null; - if(reservaEspecialCliente.getClienteId() ==null) { - log.error("Cliente id não foi cadastrado (null) para reservaId=" + reservaEspecialCliente.getReservaEspecialClienteId() + " da corrida_id =" + reservaEspecialCliente.getCorridaId() ); - continue; - } - Cliente cliente = clienteService.obtenerID(reservaEspecialCliente.getClienteId().intValue()); - if(cliente ==null || !Boolean.TRUE.equals(cliente.getActivo())) { - continue; - } - String clienteFidelidadId = null; - try { - clienteFidelidadId = cliente.getListClienteFidelidad().get(0).getClienteFidelidadId().toString(); - } catch (Exception e) { - log.error("Boleto Reserva não gerado. Erro ao obter cliente fidelidade para o clienteId:" + cliente.getClienteId(), e ); - continue; - } - boletoService.criaBoletoReserva(unoAsientoSelec, unaCorridaId, unaFecCorrida, unoTerminalOrigenId, - unoTerminalDestinoId, unoTipoVenta, unaCategoriaSelec, unoNumeOperacion, unUsuarioId, unPuntoVenta, - reservaEspecialCliente.getClienteId().intValue(), corrida.getRuta().getRutaId(), valorTarifa, tempoReserva, - estacionId, cliente.getNumIdentificaUno(), clienteFidelidadId, - corrida.getClaseServicio().getClaseservicioId(), corrida.getMarca().getMarcaId(), fecViaje, corrida.getEmpresa().getEmpresaId(), - cliente.getNombcliente(), valorSeguro, valorTaxaEmbarque, valorPedagio); - } - } - } - } catch (Exception e) { - log.error("Erro ao validar/criar reserva especial de clientes para corridaId: " + corrida.getId().getCorridaId() , e); - } - } - - /** - * Valida se o dia da semana desta corrida está configurado para gerar reserva especial de clientes - * @param reservaEspecialCliente - * @param fecViaje - * @return - */ - private boolean isDiaSemnanaOK(ReservaEspecialCliente reservaEspecialCliente, Date fecViaje) { - int diaSemanaInt = DateUtil.getDiaDaSemana(fecViaje); - boolean isDiaSemanaOK = false; - switch (diaSemanaInt) { - case 1: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndDomingo()) ? true :false ; - break; - case 2: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndSegunda()) ? true :false ; - break; - case 3: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndTerca()) ? true :false ; - break; - case 4: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndQuarta()) ? true :false ; - break; - case 5: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndQuinta()) ? true :false ; - break; - case 6: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndSexta()) ? true :false ; - break; - case 7: - isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndSabado()) ? true :false ; - break; - default: - break; - } - return isDiaSemanaOK; - } - - private void alterarNumPisoCorridaPisoExtra(Corrida corrida, Corrida corridaPisoExtra, String mensagemLog, Boolean atualizarPisoExtra, boolean isPiso3) { - if (corrida != null && corridaPisoExtra != null) { - log.info(mensagemLog + "; atualizando as corridas do piso 1 e 2"); - // Salvando Referencia da Corrida no piso extra - corridaPisoExtra.setCorridaPiso(corrida); - corridaPisoExtra.setNumPiso(isPiso3 ? 3 : 2); - corridaPisoExtra = corridaDAO.actualizacion(corridaPisoExtra); - // Referencia do Piso extra na Corrida - corrida.setCorridaPiso(corridaPisoExtra); - corrida.setNumPiso(1); - corrida = corridaDAO.actualizacion(corrida); - - if(atualizarPisoExtra) { - corridaDAO.actualizacion(corridaPisoExtra); - } - } else { - log.info(mensagemLog + "; nao foram atualizadas as corridas do piso 1 e 2"); - } - } - - private Boolean atualizarCorridaPisoExtra(Corrida corridaPisoExtra, EsquemaCorrida esquemaCorridaSegundoPiso, java.sql.Date data, String mensagemLog, Boolean atualizarPisoExtra) { - // caso corrida segundo piso for gerada antes, atualizar - if(corridaPisoExtra == null) { - Id id = new Id(); - id.setCorridaId(esquemaCorridaSegundoPiso.getNumCorrida()); - id.setFeccorrida(data); - - corridaPisoExtra = corridaDAO.buscarPorId(id); - - atualizarPisoExtra = corridaPisoExtra == null ? false : true; - log.info(mensagemLog + "; atualizarPisoExtra=" + atualizarPisoExtra); - } - - return atualizarPisoExtra; - } - - /** - * Verifica se hay una excepcione de tiempo para el tramo informado. - * - * @param corridaTramo - * @param claseServicio - * @return - Si existe una excepcion, regresa la nueva fecLlegada para el tramo, sino, regreso null - */ - private Date arreglaExcepcionTiempo(CorridaTramo corridaTramo, ClaseServicio claseServicio) { - Date nuevaFecLlegada = null; - - Tramo tramo = corridaTramo.getTramo(); - - List lsExcepciones = tramoTiempoDAO.buscar(tramo, claseServicio, corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); - - if (!lsExcepciones.isEmpty()) { - TramoTiempo tramoTiempo = lsExcepciones.get(0); - List diasSemana = getDiaDeLaSemana(tramoTiempo); - - Calendar fecCorrida = Calendar.getInstance(); - fecCorrida.setTime(corridaTramo.getFechorllegada()); - - if (diasSemana.contains(fecCorrida.get(Calendar.DAY_OF_WEEK))) { - - Calendar fechorsalida = Calendar.getInstance(); - fechorsalida.setTime(corridaTramo.getFechorsalida()); - - HoraSistema horaSistema = new HoraSistema(tramoTiempo.getTiemporecorrido()); - - fechorsalida.add(Calendar.HOUR, horaSistema.getHora()); - fechorsalida.add(Calendar.MINUTE, horaSistema.getMinuto()); - - nuevaFecLlegada = fechorsalida.getTime(); - } - } - - return nuevaFecLlegada; - } - - private Corrida generarReboteDiaSeguinte(EsquemaCorrida esquemaCorrida, Date dataGeracao) { - Calendar tmp = Calendar.getInstance(); - tmp.setTime(dataGeracao); - tmp.add(Calendar.DAY_OF_MONTH, 1); - java.sql.Date data = new java.sql.Date(dataGeracao.getTime()); - Boolean isFeriado = this.isFeriado(data, esquemaCorrida); - - return generarCorrida(esquemaCorrida.getEsquemaCorridaRebote(), tmp.getTime(), false, isFeriado, null, false); - } - - private List getDiaDeLaSemana(TramoTiempo tramoTiempo) { - List diasValidos = new ArrayList(); - - if (tramoTiempo.getIndapliclun()) { - diasValidos.add(Calendar.MONDAY); - } - if (tramoTiempo.getIndaplicmar()) { - diasValidos.add(Calendar.TUESDAY); - } - if (tramoTiempo.getIndaplicmie()) { - diasValidos.add(Calendar.WEDNESDAY); - } - if (tramoTiempo.getIndaplicjue()) { - diasValidos.add(Calendar.THURSDAY); - } - if (tramoTiempo.getIndaplicvie()) { - diasValidos.add(Calendar.FRIDAY); - } - if (tramoTiempo.getIndaplicsab()) { - diasValidos.add(Calendar.SATURDAY); - } - if (tramoTiempo.getIndaplicdom()) { - diasValidos.add(Calendar.SUNDAY); - } - - return diasValidos; - } - - @Override - public Date calcularDataFinalGeneracionCorrida() { - Date dataDe = new Date(); - - Constante constante = constanteService.buscarPorNomeConstante("CANT_DIAS_GENERACION_CORRIDA"); - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataDe); - calendarData.add(Calendar.DATE, Integer.parseInt(constante.getValorconstante())); - Date dataAte = calendarData.getTime(); - - return dataAte; - } - - private boolean generaCorridaAprimorada() { - try { - Constante constante = constanteService.buscarPorNomeConstante("GENERACION_CORRIDA_APRIMORADA"); - return (constante != null && StringUtils.isNotBlank(constante.getValorconstante()) - && Boolean.valueOf(constante.getValorconstante())) ? Boolean.TRUE : Boolean.FALSE; - } catch (Exception e) { - } - - return Boolean.FALSE; - } - - @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public boolean generarCorridaAutomatica() { - - if (generaCorridaAprimorada()) { - return generarCorridaAutomaticaAprimorada(); - } else { - return generarCorridaAutomaticaPadrao(); - } - } - - private boolean generarCorridaAutomaticaPadrao() { - feriadoCache.limpar(); - - Date dataDe = Calendar.getInstance().getTime(); - - Date dataAteConstante = calcularDataFinalGeneracionCorrida(); - Boolean hayErroConstante = !generarCorridaAutomaticaConstanteDias(dataDe, dataAteConstante); - - log.debug("corrida generadas por la constante. hayError=" + hayErroConstante); - - Boolean hayErroQtdeDias = !generarCorridaAutomaticaQtdeDias(dataDe); - - log.debug("corrida generadas por la cant de dias.hayError=" + hayErroQtdeDias); - - return hayErroConstante && hayErroQtdeDias; - } - - private boolean generarCorridaAutomaticaAprimorada() { - feriadoCache.limpar(); - - Date dataDe = Calendar.getInstance().getTime(); - - Date dataAteConstante = calcularDataFinalGeneracionCorrida(); - Boolean hayErroConstante = !generarCorridaAutomaticaAprimorada(dataDe, dataAteConstante); - - log.debug("corrida generadas aprimorada por la cant de dias.hayError=" + hayErroConstante); - - return hayErroConstante; - } - - private boolean generarCorridaAutomaticaQtdeDias(Date dataDeOriginal) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - - log.debug(" Generacion cant dias " + sdf.format(dataDeOriginal)); - - // TODO: Melhorar o tratamento às transações manuais em caso de erro,etc - DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); - TransactionStatus status = transactionManager.getTransaction(def); - - List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigenciaQtdeDiasNotNull(dataDeOriginal); - for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { - log.debug("esquemaCorrida=" + esquemaCorrida.getEsquemacorridaId()); - - Integer qtdeDiasGerar = esquemaCorrida.getCantDiasGeneracion(); - - if (qtdeDiasGerar <= 0) { - log.debug("cant dias <=0"); - - continue; - } - - log.debug("cantDiasGenerar=" + qtdeDiasGerar); - - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataDeOriginal); - calendarData.add(Calendar.DATE, qtdeDiasGerar - 1); - - Date dataAte = calendarData.getTime(); - Date dataDe = new Date(dataDeOriginal.getTime()); - - log.debug("Periodo generacion = " + sdf.format(dataDe) + " hasta " + sdf.format(dataAte)); - - if (DateUtil.compareOnlyDate(dataAte, esquemaCorrida.getEsquemaOperacional().getFecfinvigencia()) > 0) { - log.info("Cant dias excede final de la vigencia"); - dataAte = esquemaCorrida.getEsquemaOperacional().getFecfinvigencia(); - } - - try { - while (DateUtil.compareOnlyDate(dataDe, dataAte) <= 0) { - - - List lsTmp = new ArrayList(); - lsTmp.add(esquemaCorrida); - - this.generarCorrida(dataDe, lsTmp, true, null, false); - - calendarData.setTime(dataDe); - calendarData.add(Calendar.DATE, 1); - dataDe = calendarData.getTime(); - } - log.info("commit bloco corridas"); - transactionManager.commit(status); - status = transactionManager.getTransaction(def); - } catch (Exception ex) { - log.error("", ex); - log.error(" Erro ao gerar corrida = " + esquemaCorrida.getNumCorrida() + " esquemaCorrida = " + esquemaCorrida.getEsquemacorridaId()); - transactionManager.rollback(status); - status = transactionManager.getTransaction(def); - } - } - - if (!status.isCompleted()) { - log.info("commit bloco final"); - transactionManager.commit(status); - } - - return Boolean.TRUE; - } - - private boolean generarCorridaAutomaticaConstanteDias(Date dataDe, Date dataAte) { - boolean generacionExitosa = true; - SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); - - log.debug("** AUTO - Data De: " + sdfData.format(dataDe) + " **Data Ateh: " + sdfData.format(dataAte)); - - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataAte); - calendarData.add(Calendar.DATE, 1); - dataAte = calendarData.getTime(); - try { - while (dataDe.before(dataAte)) { - log.debug("*** Data: " + sdfData.format(dataDe)); - - List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigenciaQtdeDiasNull(dataDe); - - Boolean dentroVigenciaEsquemaOperacional = !lsEsquemaCorrida.isEmpty(); - if (dentroVigenciaEsquemaOperacional) { - log.debug("Geracao de servicos sem cant dias especifico. Adotando o padrao"); - - this.generarCorrida(dataDe, lsEsquemaCorrida, true, null, false); - - } else { - log.info("No hay esquema vigente para la fecha " + sdfData.format(dataDe)); - } - - calendarData.setTime(dataDe); - calendarData.add(Calendar.DATE, 1); - dataDe = calendarData.getTime(); - } - } catch (Exception ex) { - log.error("Erro ao gerar corridas: " + ex, ex); - generacionExitosa = false; - } - - return generacionExitosa; - } - - private boolean generarCorridaAutomaticaAprimorada(final Date dataInico, final Date dataConstanteFim) { - boolean generacionExitosa = true; - SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); - - log.debug("** AUTO - Data De: " + sdfData.format(dataInico) + " **Data Ateh: " + sdfData.format(dataConstanteFim)); - - // TODO: Melhorar o tratamento às transações manuais em caso de erro,etc - DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); - TransactionStatus status = transactionManager.getTransaction(def); - - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataConstanteFim); - - - Date dataAte = calendarData.getTime(); - - try { - log.info("*** Data: " + sdfData.format(dataAte)); - List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigencia(dataInico); - - Date dataInicial = DateUtil.normalizarToFecha(dataInico); - - Boolean dentroVigenciaEsquemaOperacional = !lsEsquemaCorrida.isEmpty(); - if (dentroVigenciaEsquemaOperacional) { - - for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { - log.debug("esquemaCorrida=" + esquemaCorrida.getEsquemacorridaId()); - - Integer qtdeDiasGerar = esquemaCorrida.getCantDiasGeneracion(); - - if (qtdeDiasGerar != null && qtdeDiasGerar >= 0) { - log.info("cantDiasGenerar=" + qtdeDiasGerar); - - Calendar calendarDiasGenerar = Calendar.getInstance(); - calendarDiasGenerar.setTime(dataInicial); - calendarDiasGenerar.add(Calendar.DATE, qtdeDiasGerar); - dataAte = DateUtil.normalizarToFecha(calendarDiasGenerar.getTime()); - } else { - calendarData.setTime(dataConstanteFim); - dataAte = DateUtil.normalizarToFecha(calendarData.getTime()); - } - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - log.debug("Periodo generacion = " + sdf.format(dataInicial) + " hasta " + sdf.format(dataAte)); - - if (DateUtil.compareOnlyDate(dataAte, esquemaCorrida.getEsquemaOperacional().getFecfinvigencia()) > 0) { - log.info("Cant dias excede final de la vigencia"); - dataAte = esquemaCorrida.getEsquemaOperacional().getFecfinvigencia(); - } - - try { - while (DateUtil.compareOnlyDate(dataAte, dataInicial) >= 0) { - - boolean corridaExiste = corridaDAO.existe(new Corrida.Id(esquemaCorrida.getNumCorrida(), dataAte)); - String strDataGeracao = DateUtil.getStringDate(dataAte); - - log.info(String.format("Corrida existe = %s [%s - %s]",corridaExiste,esquemaCorrida.getNumCorrida() ,strDataGeracao)); - - //A corrida já existir é a única condição para parar de gerar. - //Se a corrida não for gerada (rotina mais abaixo), podem haver várias condições: o dia da semana, feriado, etc - if (corridaExiste){ - log.info(String.format("Corrida do dia já gerada ", esquemaCorrida.getNumCorrida(), strDataGeracao)); - - break; - } - - boolean corridaGerada = this.generarCorrida(dataAte, Arrays.asList(esquemaCorrida), false, null, false); - - log.info(String.format("Corrida gerada = %s [%s - %s]",corridaGerada,esquemaCorrida.getNumCorrida() ,strDataGeracao)); - - calendarData.setTime(dataAte); - calendarData.add(Calendar.DATE, -1); - dataAte = calendarData.getTime(); - } - - log.info("commit bloco corridas"); - - transactionManager.commit(status); - status = transactionManager.getTransaction(def); - } catch (Exception ex) { - log.error("", ex); - log.error(" Erro ao gerar corrida = " + esquemaCorrida.getNumCorrida() + " esquemaCorrida = " + esquemaCorrida.getEsquemacorridaId()); - transactionManager.rollback(status); - status = transactionManager.getTransaction(def); - } - } - - } else { - log.info("No hay esquema vigente para la fecha " + sdfData.format(dataInicial)); - } - - } catch (Exception ex) { - log.error("Erro ao gerar corridas: " + ex, ex); - generacionExitosa = false; - } - - return generacionExitosa; - } - - private int cantDiasMaxGerarCorridasManual() { - - Constante constante = constanteService.buscarPorNomeConstante("CANT_MAX_CORRIDA_GERA_MANUAL"); - - if ((constante == null) || (StringUtils.isBlank(constante.getValorconstante()))) { - return CANT_MAX_CORRIDA_GERA_MANUAL; - } - - return Integer.valueOf(constante.getValorconstante()); - - } - - public Long generarCorridasSelecionadas(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws BusinessException { - - int cantDiasGeneracion = DateUtil.getElapsedDias(dataDe, dataAte); - - int cantDiasMaxGerarCorridasManual = cantDiasMaxGerarCorridasManual(); - - log.info("cantDiasGeneracion=" + cantDiasGeneracion); - log.info("cantDiasMaxGerarCorridasManual=" + cantDiasMaxGerarCorridasManual); - - if (cantDiasGeneracion > cantDiasMaxGerarCorridasManual()) { - throw new BusinessException("corridaServiceImpl.geracaoCorrida.cantDiasManual", new Object[] { cantDiasMaxGerarCorridasManual }); - } - - SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); - - log.info("** SELECIONADOS - Data De: " + sdfData.format(dataDe) + " **Data Ateh: " + sdfData.format(dataAte)); - - Calendar calendarData = Calendar.getInstance(); - calendarData.setTime(dataDe); - - Long cantInicio = corridaDAO.cantCorridaGeneradasHoy(); - - while (DateUtil.compareOnlyDate(dataDe, dataAte) <= 0) { - log.info("*** Data: " + sdfData.format(dataDe)); - - this.generarCorrida(dataDe, lsEsquemaCorrida, false, null, false); - - calendarData.add(Calendar.DATE, 1); - dataDe = calendarData.getTime(); - } - - Long cantFim = corridaDAO.cantCorridaGeneradasHoy(); - - return cantFim - cantInicio; - } - - public List buscarGroupCorrridaId(Integer corridaId, Date dateInicio, Date dateFin) { - GregorianCalendar gCalendarDe = new GregorianCalendar(); - gCalendarDe.setTime(dateInicio); - gCalendarDe.set(Calendar.HOUR_OF_DAY, 0); - gCalendarDe.set(Calendar.MINUTE, 0); - gCalendarDe.set(Calendar.SECOND, 0); - gCalendarDe.set(Calendar.MILLISECOND, 0); - - GregorianCalendar gCalendarAte = new GregorianCalendar(); - gCalendarAte.setTime(dateFin); - gCalendarAte.set(Calendar.HOUR_OF_DAY, 0); - gCalendarAte.set(Calendar.MINUTE, 0); - gCalendarAte.set(Calendar.SECOND, 0); - gCalendarAte.set(Calendar.MILLISECOND, 0); - - return corridaDAO.buscarGroupCorrridaId(corridaId, gCalendarDe.getTime(), gCalendarAte.getTime()); - } - - @Override - public List buscarGroupCorrridaId(Integer corridaId, Integer origem, Integer destino, Integer ruta, Integer numRuta, Date dateInicio, Date dateFin) { - GregorianCalendar gCalendarDe = new GregorianCalendar(); - gCalendarDe.setTime(dateInicio); - gCalendarDe.set(Calendar.HOUR_OF_DAY, 0); - gCalendarDe.set(Calendar.MINUTE, 0); - gCalendarDe.set(Calendar.SECOND, 0); - gCalendarDe.set(Calendar.MILLISECOND, 0); - - GregorianCalendar gCalendarAte = new GregorianCalendar(); - gCalendarAte.setTime(dateFin); - gCalendarAte.set(Calendar.HOUR_OF_DAY, 0); - gCalendarAte.set(Calendar.MINUTE, 0); - gCalendarAte.set(Calendar.SECOND, 0); - gCalendarAte.set(Calendar.MILLISECOND, 0); - - return corridaDAO.buscarGroupCorrridaId(corridaId, origem, destino, ruta, numRuta, gCalendarDe.getTime(), gCalendarAte.getTime()); - } - - @Override - public Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial, Integer corridaId) { - try { - List corridas = corridaDAO.buscarPorEstado(estado, dataInicial, corridaId); - corridaDAO.actualizaFecHusoFecVerano(corridas); - return Boolean.TRUE; - - } catch (Exception ex) { - log.error("Erro ao atualizar corridas FecHuso FecVerano: " + ex, ex); - } - return Boolean.FALSE; - - } - - @Override - public Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial) { - return atualizarCorridaFecHusoFecVerano(estado, dataInicial, null); - } - - @Override - public List buscarCorridaRelAproveitamento(Parada origem, Parada destino, - Date feccorrida, Integer corridaId) { - - List ls = new ArrayList(); - ls =corridaDAO.buscarCorridaRelAproveitamento(origem, destino, feccorrida, corridaId); - return ls; - - } - - @Override - public Corrida buscaCorrridaFutura(Ruta ruta, Date fecInicio) { - return corridaDAO.buscaCorrridaFutura(ruta, fecInicio); - } - - @Override - @Transactional - public Boolean editarCorridaPorOutraCorrida(Estado estado, Date dataInicial, Integer corridaId, Date dataPadrao) { - List corridas = corridaDAO.buscarPorEstado(estado, dataInicial, corridaId); - - if (corridas == null || corridas.isEmpty()){ - return false; - } - - Corrida corrida = corridaDAO.buscarPorId(new Corrida(corridaId, dataPadrao).getId()); - if(corrida != null){ - corridaDAO.editarCorridaPorOutraCorrida(corridas,corrida); - }else { - return false; - } - return true; - } - - public Integer buscarOcupacaoCorrida(Corrida corrida) { - return corridaDAO.buscarOcupacaoCorrida(corrida); - } - - @Override - public Corrida buscarPorId(Id id) { - // TODO Auto-generated method stub - return corridaDAO.buscarPorId(id); - } - - @Override - public Corrida buscarCorridaAtivaPorId(Id id) { - return corridaDAO.buscarCorridaAtivaPorId(id); - } - - private void generarCorridaInfo(Corrida corrida, EsquemaCorrida esquemaCorrida) { - - if(corrida != null && corrida.getId() != null && corrida.getId().getFeccorrida() != null && corrida.getId().getCorridaId() != null) { - - if(esquemaCorrida != null) { - - List lsEsquemaCorridaInfo = esquemaCorridaInfoService.obtenerPorEsquemaCorrida(esquemaCorrida); - - if(lsEsquemaCorridaInfo != null) { - - for (EsquemaCorridaInfo esquemaCorridaInfo : lsEsquemaCorridaInfo) { - - CorridaInfo corridaInfo = new CorridaInfo(); - corridaInfo.setOrigem(esquemaCorridaInfo.getOrigem()); - corridaInfo.setDestino(esquemaCorridaInfo.getDestino()); - corridaInfo.setCorrida(corrida); - corridaInfo.setInfoCorrida(esquemaCorridaInfo.getInfoCorrida()); - corridaInfoService.suscribir(corridaInfo); - } - } - - } - } - } - - public static void main(String[] args) { - Date dataInicialFiltroCorridaExistente = new Date(); - Date dataFinalFiltroCorridaExistente = DateUtil.somarDias(dataInicialFiltroCorridaExistente, 7); - - LocalDate inicioLocalDate = dataInicialFiltroCorridaExistente.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - LocalDate fimLocalDate = dataFinalFiltroCorridaExistente.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1); - for (LocalDate date = inicioLocalDate; date.isBefore(fimLocalDate); date = date.plusDays(1)) { - Date dataIter = Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant()); - DateFormat formatter = new SimpleDateFormat("EEE", new Locale("pt", "BR")); - String dia = formatter.format(dataIter); - System.out.println("Teste dia:" + dia); - } - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; +import java.util.Locale; + +import javax.persistence.Transient; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.DefaultTransactionDefinition; + +import com.rjconsultores.ventaboletos.dao.CorridaDAO; +import com.rjconsultores.ventaboletos.dao.EsquemaCorridaDAO; +import com.rjconsultores.ventaboletos.dao.TramoTiempoDAO; +import com.rjconsultores.ventaboletos.entidad.AsientoExclusivo; +import com.rjconsultores.ventaboletos.entidad.Ciudad; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.Corrida.Id; +import com.rjconsultores.ventaboletos.entidad.CorridaCtrl; +import com.rjconsultores.ventaboletos.entidad.CorridaInfo; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.DetDiagramaAutobus; +import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EsquemaAsiento; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaInfo; +import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaCombinacion; +import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; +import com.rjconsultores.ventaboletos.entidad.Tarifa; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.entidad.TramoServicio; +import com.rjconsultores.ventaboletos.entidad.TramoTiempo; +import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; +import com.rjconsultores.ventaboletos.enums.StatusFlexBus; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.AsientoExclusivoService; +import com.rjconsultores.ventaboletos.service.BoletoService; +import com.rjconsultores.ventaboletos.service.ClienteService; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.service.CorridaCtrlService; +import com.rjconsultores.ventaboletos.service.CorridaInfoService; +import com.rjconsultores.ventaboletos.service.CorridaService; +import com.rjconsultores.ventaboletos.service.CorridaTramoService; +import com.rjconsultores.ventaboletos.service.DetDiagramaAutobusService; +import com.rjconsultores.ventaboletos.service.EsquemaAsientoService; +import com.rjconsultores.ventaboletos.service.EsquemaCorridaInfoService; +import com.rjconsultores.ventaboletos.service.EsquemaCorridaService; +import com.rjconsultores.ventaboletos.service.EsquemaTramoService; +import com.rjconsultores.ventaboletos.service.ReservaEspecialClienteService; +import com.rjconsultores.ventaboletos.service.RutaSecuenciaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.service.TarifaService; +import com.rjconsultores.ventaboletos.service.TramoService; +import com.rjconsultores.ventaboletos.service.TramoServicioService; +import com.rjconsultores.ventaboletos.service.VigenciaTarifaService; +import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.FeriadoCache; +import com.rjconsultores.ventaboletos.utilerias.HoraSistema; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; + +/** + * + * @author rodrigo + */ +@Service("corridaService") +public class CorridaServiceImpl implements CorridaService { + + private static final Logger log = LogManager.getLogger(CorridaServiceImpl.class); + private static int CANT_MAX_CORRIDA_GERA_MANUAL = 40; + + // Tipo de venda Reserva + private static final Integer TPV_RESERVA_NORMAL = 15; + + @Autowired + private CorridaDAO corridaDAO; + @Autowired + private EsquemaAsientoService esquemaAsientoService; + @Autowired + private CorridaCtrlService corridaCtrlService; + @Autowired + private RutaService rutaService; + @Autowired + private TramoServicioService tramoServicioService; + @Autowired + private TramoTiempoDAO tramoTiempoDAO; + @Autowired + private AsientoExclusivoService asientoExclusivoService; + @Autowired + private EsquemaTramoService esquemaTramoService; + @Autowired + private EsquemaCorridaService esquemaCorridaService; + @Autowired + private EsquemaCorridaDAO esquemaCorridaDAO; + @Autowired + private DetDiagramaAutobusService detDiagramaAutobusService; + @Autowired + private ConstanteService constanteService; + @Autowired + private RutaSecuenciaService rutaSecuenciaService; + private PlatformTransactionManager transactionManager; + @Transient + private int cantCorridaGenerada; + @Transient + private int cantCorridaCommit; + @Autowired + private FeriadoCache feriadoCache; + @Autowired + private BoletoService boletoService; + @Autowired + private ReservaEspecialClienteService reservaEspecialClientService; + @Autowired + private TarifaService tarifaService; + @Autowired + TramoService tramoService; + @Autowired + VigenciaTarifaService vigenciaTarifaService; + @Autowired + ClienteService clienteService; + @Autowired + private CorridaInfoService corridaInfoService; + @Autowired + private EsquemaCorridaInfoService esquemaCorridaInfoService; + @Autowired + private CorridaTramoService corridaTramosService; + + @Autowired + public CorridaServiceImpl(@Qualifier("transactionManager") PlatformTransactionManager transactionManager) { + this.transactionManager = transactionManager; + } + + @Override + public List obtenerTodos() { + return corridaDAO.obtenerTodos(); + } + + @Override + public Corrida obtenerID(Corrida.Id id) { + return corridaDAO.obtenerID(id); + } + + @Override + public List buscarPorFecCorrida(Date value) { + return corridaDAO.buscarPorFecCorrida(value); + } + + @Override + public List buscarPorId(Integer idCorrida) { + return corridaDAO.buscarPorId(idCorrida); + } + + @Override + public List verificarCorridaId(Integer corridaId) { + return corridaDAO.verificarCorridaId(corridaId); + } + + @Override + public List buscarDistinct(Parada ori, Parada des, Date horaSalidaInicio, Date horaSalidaFin, ClaseServicio cs, Integer corridaId) { + return corridaDAO.buscarDistinct(ori, des, (horaSalidaInicio == null) ? null : DateUtil.getFecInicio(horaSalidaInicio).getTime(), (horaSalidaFin == null) ? null : DateUtil.getFecInicio(horaSalidaFin).getTime(), cs, corridaId); + } + + @Transactional + public Corrida suscribir(Corrida entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(ActivoUtil.ATIVO); + + return corridaDAO.suscribir(entidad); + } + + @Transactional + public Corrida actualizacion(Corrida entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(ActivoUtil.ATIVO); + + return corridaDAO.actualizacion(entidad); + } + + + @Transactional + public void borrar(Corrida entidad) { + corridaDAO.borrar(entidad); + } + + @Override + public List buscarPorAutobusCorridasFuturas(DiagramaAutobus diagramaAutobus) { + return corridaDAO.buscarPorAutobusCorridasFuturas(diagramaAutobus); + } + + @Override + public List buscarPorRolOperativoCorridasFuturas(DiagramaAutobus diagramaAutobus) { + return corridaDAO.buscarPorRolOperativoCorridasFuturas(diagramaAutobus); + } + + @Override + public List buscarFiltro(Parada ori, Parada des, Date hora, ClaseServicio cs) { + return corridaDAO.buscarFiltro(ori, des, hora, cs); + } + + public Boolean existeCorrida(Long id){ + return corridaDAO.existeCorrida(id); + } + + private Boolean geraDiaSemana(Integer diaSemana, EsquemaCorrida esquemaCorrida) { + Boolean retorno = Boolean.FALSE; + switch (diaSemana) { + case 1: { + // diaSemana = "Domingo"; + if (esquemaCorrida.getInddomingo() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getInddomingo()) { + retorno = Boolean.TRUE; + } + break; + } + case 2: { + // diaSemana = "Segunda"; + if (esquemaCorrida.getIndlunes() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getIndlunes()) { + retorno = Boolean.TRUE; + } + break; + } + case 3: { + // diaSemana = "Terca"; + if (esquemaCorrida.getIndmartes() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getIndmartes()) { + retorno = Boolean.TRUE; + } + break; + } + case 4: { + // diaSemana = "Quarta"; + if (esquemaCorrida.getIndmiercoles() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getIndmiercoles()) { + retorno = Boolean.TRUE; + } + break; + } + case 5: { + // diaSemana = "Quinta"; + if (esquemaCorrida.getIndjueves() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getIndjueves()) { + + retorno = Boolean.TRUE; + } + break; + } + case 6: { + // diaSemana = "Sexta"; + if (esquemaCorrida.getIndviernes() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getIndviernes()) { + retorno = Boolean.TRUE; + } + break; + } + case 7: { + // diaSemana = "Sabado"; + if (esquemaCorrida.getIndsabado() == null) { + retorno = Boolean.FALSE; + } else if (esquemaCorrida.getIndsabado()) { + retorno = Boolean.TRUE; + } + break; + } + } + + return retorno; + } + + private boolean temCorridaDiaSemana(Integer diaSemana, EsquemaCorrida esquemaCorrida, Boolean isFeriado) { + Boolean retorno = Boolean.FALSE; + + if (esquemaCorrida.getIndGeneraFeriado() != null) { + if (esquemaCorrida.getIndGeneraFeriado().equals("S")) { + retorno = geraDiaSemana(diaSemana, esquemaCorrida); + } else if (isFeriado) { + if (esquemaCorrida.getIndGeneraFeriado().equals("F")) { + retorno = geraDiaSemana(diaSemana, esquemaCorrida); + } + } else if (esquemaCorrida.getIndGeneraFeriado().equals("N")) { + retorno = geraDiaSemana(diaSemana, esquemaCorrida); + } + } else { + retorno = geraDiaSemana(diaSemana, esquemaCorrida); + } + + return retorno; + } + + private Date calcularFechorllegada(EsquemaTramo esquemaTramo, ClaseServicio clase, Date dataGeracao, Date horaChegada) { + GregorianCalendar gHoraChegada = new GregorianCalendar(); + gHoraChegada.setTime(horaChegada); + HoraSistema hs = null; + + if (esquemaTramo.getExcepcionRecorrido() != null) { + hs = new HoraSistema(esquemaTramo.getExcepcionRecorrido()); + + gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); + gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); + } else { + Tramo tramo = esquemaTramo.getTramo(); + List lsTramoServicio = tramoServicioService.buscarPorTramoServico(tramo, clase); + + for (TramoServicio ts : lsTramoServicio) { + hs = new HoraSistema(ts.getTiemporecorrido()); + + gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); + gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); + } + } + + return gHoraChegada.getTime(); + } + + @SuppressWarnings("deprecation") + private Date calcularFechorsalida(EsquemaTramo esquemaTramo, Date dataGeracao, Date horaChegadaAnterior, java.util.Date tiempoEstanciaAnterior) { + Date horaSaida; + + if (horaChegadaAnterior == null) { + horaSaida = truncarDataHora(dataGeracao, esquemaTramo.getEsquemaCorrida().getHorasalida()); + } else { + GregorianCalendar gHoraSaidaProximo = new GregorianCalendar(); + gHoraSaidaProximo.setTime(horaChegadaAnterior); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + log.debug("Tempo Recorrido : " + sdf.format(gHoraSaidaProximo.getTime())); + + if (tiempoEstanciaAnterior != null) { + gHoraSaidaProximo.add(Calendar.MINUTE, tiempoEstanciaAnterior.getMinutes()); + gHoraSaidaProximo.add(Calendar.HOUR_OF_DAY, tiempoEstanciaAnterior.getHours()); + + log.debug("Tempo Recorrido + Estancia: " + sdf.format(gHoraSaidaProximo.getTime())); + } + + horaSaida = gHoraSaidaProximo.getTime(); + } + + GregorianCalendar gHoraSaida = new GregorianCalendar(); + gHoraSaida.setTime(horaSaida); + + return gHoraSaida.getTime(); + } + + /** + * Adiciciona as horas do parametro hora na data dataGeracao. + * + * Alem disso eh zerado os campos segundos e milisegundos. + * + * @param dataGeracao + * @param hora + * @return + */ + private Date truncarDataHora(Date dataGeracao, Date hora) { + Date dataCorreta = new Date(); + + GregorianCalendar gAux = new GregorianCalendar(); + gAux.setTime(hora); + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(dataGeracao); + gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); + gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); + gcalendar.set(Calendar.SECOND, 0); + gcalendar.set(Calendar.MILLISECOND, 0); + + dataCorreta = gcalendar.getTime(); + + return dataCorreta; + } + + private boolean isFeriado(java.sql.Date data, EsquemaCorrida esquemaCorrida) { + Empresa empresa = esquemaCorrida.getEmpresa(); + + Estado estadoOrigem = null; + List lsRutaSequencia = rutaSecuenciaService.buscarSecuenciaOrdenado(esquemaCorrida.getRuta()); + if (!lsRutaSequencia.isEmpty()) { + Tramo tramoOrigem = lsRutaSequencia.get(0).getTramo(); + Parada origem = tramoOrigem.getOrigem(); + estadoOrigem = origem.getCiudad().getEstado(); + } + + return feriadoCache.ehFeriado(data, empresa, estadoOrigem); + } + + /** + * Indica si el esquemaCorrida informado tiene una vigencia válida para la data de generacion + * + * @param esquemaCorrida + * @param dataGeracao + * @return + */ + private boolean vigenciaValida(EsquemaCorrida esquemaCorrida, Date dataGeracao) { + if ((DateUtil.compareOnlyDate(dataGeracao, esquemaCorrida.getEsquemaOperacional().getFecfinvigencia()) <= 0) && + (DateUtil.compareOnlyDate(dataGeracao, esquemaCorrida.getEsquemaOperacional().getFecniciovigencia()) >= 0)) { + + return true; + } + return false; + } + + /** + * Genera una corrida para el esquemaCorrida informado en la fecha informada.
+ * + * Cuando la corrida no es generada :
+ * - corrida ya existe : eso es checado por el numCorrida e dataGeneracion
+ * - la fecha de generacion no tiene una vigencia válida
+ * - el status del esquema corrida no es autorizado ("A")
+ * + * + * @param esquemaCorrida + * @param diaSemana + * @param dataGeracao + * @return - La corrida generada o null si no fue generada. + */ + @SuppressWarnings("deprecation") + private Corrida generarCorrida(EsquemaCorrida esquemaCorrida, Date dataGeracao, boolean isPisoExtra, Boolean isFeriado, List corridaTramoList, boolean isValidaActivo) { + + + Corrida corrida = null; + try { + + GregorianCalendar calendario = new GregorianCalendar(); + calendario.setTime(dataGeracao); + Integer diaSemana = calendario.get(Calendar.DAY_OF_WEEK); + Ruta ruta = esquemaCorrida.getRuta(); + ClaseServicio claseServicio = esquemaCorrida.getClaseServicio(); + Marca marca = esquemaCorrida.getMarca(); + Date horario = esquemaCorrida.getHorasalida(); + horario = DateUtil.normalizar(horario); + Integer numCorrida = esquemaCorrida.getNumCorrida(); + Corrida.Id id = new Corrida.Id(); + id.setCorridaId(numCorrida); + id.setFeccorrida(DateUtil.normalizarToFecha(dataGeracao)); + List lsEsquemaTramo = null; + Parada origemCorrida = null; + Parada destinoCorrida =null; + boolean isValidaTrecho = true; + if(corridaTramoList !=null && !corridaTramoList.isEmpty()) { + origemCorrida = corridaTramoList.get(0).getOrigem(); + destinoCorrida = corridaTramoList.get(corridaTramoList.size()-1).getDestino(); + isValidaTrecho = false; + }else { + lsEsquemaTramo = esquemaTramoService.obtenerPorEsquemaCorridaOrderNumSec(esquemaCorrida); + origemCorrida = lsEsquemaTramo.get(0).getTramo().getOrigem(); + destinoCorrida = lsEsquemaTramo.get(lsEsquemaTramo.size() - 1).getTramo().getDestino(); + } + + + if(!realizaValidacoesGerais(esquemaCorrida, dataGeracao, diaSemana, isFeriado, ruta, id, numCorrida, + horario, claseServicio, marca, isPisoExtra, lsEsquemaTramo, isValidaActivo, isValidaTrecho)) { + return null; + } + + + /* Como o numCorrida corresponde ao corrida_id do corridaCtrl, ou seja, é chave primaria, temos que buscar somente por esse campo + Caso o registro já exista, atualizamos os dados dele. Sendo assim, o que vai indicar a "duplicidade" de uma corrida será apenas o número dela e não mais o conjunto : clase + marca + horario + ruta*/ + + CorridaCtrl corridaCtrl = criaCorridaCtrl(isPisoExtra, ruta, claseServicio, marca, horario, numCorrida); + + corrida = criaCorrida(esquemaCorrida, dataGeracao, id, lsEsquemaTramo, origemCorrida, destinoCorrida, + corridaCtrl, corridaTramoList, isValidaActivo); + + cantCorridaGenerada++; + + criaAssentoExclusivo(esquemaCorrida, corrida); + + } catch (Exception ex) { + log.error("", ex); + } + + return corrida; + } + + private Corrida criaCorrida(EsquemaCorrida esquemaCorrida, Date dataGeracao, Corrida.Id id, + List lsEsquemaTramo, Parada origemCorrida, Parada destinoCorrida, CorridaCtrl corridaCtrl, List corridaTramoList, boolean isCorridaInativa) { + Corrida corrida; + corrida = new Corrida(); + corrida.setId(id); + corrida.setEsquemaCorrida(esquemaCorrida); + corrida.setCorridaCtrl(corridaCtrl); + corrida.setAutobus(esquemaCorrida.getAutoBus()!= null ? esquemaCorrida.getAutoBus() : null); + corrida.setClaseServicio(corridaCtrl.getClaseServicio()); + corrida.setConductor(null); + if (esquemaCorrida.getIndCorridaExtra()) { + corrida.setTipoServicio(new Short("2")); + } else { + corrida.setTipoServicio(new Short("1")); + } + corrida.setInfoCorrida(esquemaCorrida.getInfoCorrida()); + Integer cantparados = esquemaCorrida.getCantparados(); + if (cantparados != null) { + corrida.setCantParados(cantparados.shortValue()); + } + + corrida.setEsquemaAgrupacionId(esquemaCorrida.getEsquemaAgrupacionId()); + + corrida.setEmpresa(esquemaCorrida.getEmpresa()); + corrida.setEmpresa1(esquemaCorrida.getEmpresa1()); + + corrida.setFechorsalida(truncarDataHora(dataGeracao, esquemaCorrida.getHorasalida())); + corrida.setFechorSalidaOriginal(corrida.getFechorsalida()); + + if (esquemaCorrida.getStatusCorrida().equals("A")) { + corrida.setIndstatuscorrida("H"); + corrida.setActivo(ActivoUtil.ATIVO); + } else if (esquemaCorrida.getStatusCorrida().equals("L")) { + corrida.setIndstatuscorrida("P"); + corrida.setActivo(ActivoUtil.INATIVO); + } + + corrida.setMarca(esquemaCorrida.getMarca()); + corrida.setNodo(corridaCtrl.getNodo()); + corrida.setDivision(esquemaCorrida.getDivision()); + corrida.setRuta(esquemaCorrida.getRuta()); + corrida.setRolOperativo(esquemaCorrida.getRolOperativo()); + corrida.setZona(null); + corrida.setOrigem(origemCorrida); + corrida.setDestino(destinoCorrida); + + validaFlexBus(esquemaCorrida, corrida); + List lsCorridaTramo = null; + Date fechorSalidaOriginalH = null; + if(corridaTramoList!=null && !corridaTramoList.isEmpty()) { + lsCorridaTramo = corridaTramoList; + }else { + lsCorridaTramo = corridaTramosService.criaCorridaTramoList(esquemaCorrida.getAutoBus(), dataGeracao, fechorSalidaOriginalH, lsEsquemaTramo, corridaCtrl.getNodo(), corrida.getClaseServicio(), esquemaCorrida.getStatusCorrida()); + for (CorridaTramo corridaTramo : lsCorridaTramo) { + corridaTramo.setCorrida(corrida); + } + } + + corrida.setCorridaTramoList(lsCorridaTramo); + + corrida.setFecmodif(Calendar.getInstance().getTime()); + + if (UsuarioLogado.getUsuarioLogado() != null) { + corrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } else { + corrida.setUsuarioId(1); + } + corrida.setIndTipoVenta(null); + corrida.setCodProdutoFiscal(UtiliteriasFiscal.defineCodigoProduto(corrida.getOrigem().getParadaId(), corrida.getDestino().getParadaId(), corrida.getRuta().getRutaId())); + if(!isCorridaInativa) { + corrida = corridaDAO.suscribir(corrida); + }else { + corrida = corridaDAO.actualizacion(corrida); + } + + return corrida; + } + + private CorridaCtrl criaCorridaCtrl(boolean isPisoExtra, Ruta ruta, ClaseServicio claseServicio, Marca marca, + Date horario, Integer numCorrida) { + CorridaCtrl corridaCtrl = corridaCtrlService.obtenerID(numCorrida); + + boolean novoRegistro = false; + + if (corridaCtrl == null) { + corridaCtrl = new CorridaCtrl(); + novoRegistro = true; + } + + corridaCtrl.setCorridaId(numCorrida); + corridaCtrl.setMarca(marca); + corridaCtrl.setRuta(ruta); + corridaCtrl.setClaseServicio(claseServicio); + corridaCtrl.setHorario(horario); + + // parada origem + Parada origen = rutaService.getOrigem(ruta); + if (origen == null) { + log.info("origen nao encontrado para a ruta = " + ruta.getRutaId()); + } + corridaCtrl.setNodo((origen == null) ? null : origen.getNodo()); + + corridaCtrl.setActivo(Boolean.TRUE); + corridaCtrl.setFecmodif(Calendar.getInstance().getTime()); + + if (UsuarioLogado.getUsuarioLogado() != null) { + corridaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } + + corridaCtrl.setPisoExtra(isPisoExtra); + + if (novoRegistro) { + corridaCtrl = corridaCtrlService.suscribir(corridaCtrl); + } else { + corridaCtrl = corridaCtrlService.actualizacion(corridaCtrl); + } + return corridaCtrl; + } + + + + private void validaFlexBus(EsquemaCorrida esquemaCorrida, Corrida corrida) { + if(esquemaCorrida.getIsFlexBus()) { + corrida.setOcupacaoMinima(esquemaCorrida.getOcupacaoMinima()); + corrida.setHorasParaConfirmacao(esquemaCorrida.getHorasParaConfirmacao()); + corrida.setMinutosParaConfirmacao(esquemaCorrida.getMinutosParaConfirmacao()); + corrida.setIsFlexBus(Boolean.TRUE); + + corrida.setStatusFlexBus(StatusFlexBus.EM_RESERVA.getStatus()); + } + } + + private Boolean realizaValidacoesGerais(EsquemaCorrida esquemaCorrida, Date dataGeracao, Integer diaSemana, Boolean isFeriado, + Ruta ruta, Corrida.Id id, Integer numCorrida, Date horario, ClaseServicio claseServicio, Marca marca, Boolean isPisoExtra, + List lsEsquemaTramo, boolean isGeraCorridaInativa, boolean isValidaTrecho ){ + Integer corridaId = esquemaCorrida.getNumCorrida(); + String fecCorrida = DateUtil.getStringDate(horario); + if (!vigenciaValida(esquemaCorrida, dataGeracao)) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + " vigencia invalida=" + dataGeracao); + return Boolean.FALSE; + } + + if (!((esquemaCorrida.getStatusCorrida() != null) && (esquemaCorrida.getStatusCorrida().equals("A") || esquemaCorrida.getStatusCorrida().equals("L")))) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + "status corrida invalido=" + esquemaCorrida.getStatusCorrida()); + return Boolean.FALSE; + } + + if (esquemaCorrida.getIndDiaSimDiaNao() == null || esquemaCorrida.getIndDiaSimDiaNao() == Boolean.FALSE) { + if (!temCorridaDiaSemana(diaSemana, esquemaCorrida, isFeriado)) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + "dia semana no valido=" + diaSemana); + return Boolean.FALSE; + } + } + + if(!isGeraCorridaInativa) { + if (!tramoServicioService.existenTiemposTramosEsquema(esquemaCorrida.getEsquemacorridaId())) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida +". Nao foi cadastrado o tempo de todos os trechos do esquema corrida=" + esquemaCorrida.getEsquemacorridaId()); + return Boolean.FALSE; + } + } + + if(!validaCorridaDiaSimDiaNao(esquemaCorrida, dataGeracao, numCorrida)) { + return Boolean.FALSE; + } + + if(!isGeraCorridaInativa) { + if (corridaDAO.existe(id)) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". corrida existe = " + numCorrida + ";" + ruta.getDescruta() + ";" + DateUtil.getStringDate(dataGeracao) + ";" + DateUtil.getStringDate(horario, "HH:mm") + ";" + claseServicio.getDescclase() + ";" + marca.getDescmarca() + " Piso: " + isPisoExtra); + return Boolean.FALSE; + } + } + if(isValidaTrecho) { + if(!realizaValidacoesTrecho(corridaId, fecCorrida, lsEsquemaTramo)) { + return Boolean.FALSE; + } + } + + + if(marca !=null && Boolean.FALSE.equals(marca.getActivo())){ + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". MarcaId=" + marca.getMarcaId() +" inativa, corrida não pode ser gerada"); + return Boolean.FALSE; + } + + return Boolean.TRUE; + } + + private boolean realizaValidacoesTrecho(Integer corridaId, String fecCorrida,List lsEsquemaTramo ) { + if (lsEsquemaTramo == null || lsEsquemaTramo.isEmpty()) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". Não contem trechos (EsquemaTramo nulo ou vazio)"); + return Boolean.FALSE; + } + EsquemaTramo primeiroTrechoCorrida = lsEsquemaTramo.get(0); + Parada origemCorrida = primeiroTrechoCorrida.getTramo().getOrigem(); + if (origemCorrida == null) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". Origem não preenchido (Primeiro trecho EsquemaTramo)"); + return Boolean.FALSE; + } + + + EsquemaTramo ultimoTrechoCorrida = lsEsquemaTramo.get(lsEsquemaTramo.size() - 1); + Parada destinoCorrida = ultimoTrechoCorrida.getTramo().getDestino(); + if (destinoCorrida == null) { + log.error("CorridaId:" + corridaId + " FecCorrida:" + fecCorrida + ". Destino não preenchido (Último trecho EsquemaTramo)"); + return Boolean.FALSE; + } + + return true; + } + + private Boolean validaCorridaDiaSimDiaNao(EsquemaCorrida esquemaCorrida, Date dataGeracao, Integer numCorrida ){ + if (Boolean.TRUE.equals(esquemaCorrida.getIndDiaSimDiaNao())) { + Calendar calendarData = Calendar.getInstance(); + calendarData.setTime(dataGeracao); + calendarData.add(Calendar.DATE, -1); + + Corrida.Id corridaOntem = new Corrida.Id(); + + corridaOntem.setCorridaId(numCorrida); + corridaOntem.setFeccorrida(DateUtil.normalizarToFecha(calendarData.getTime())); + + if (corridaDAO.existe(corridaOntem)) { + log.info("Esquema configurado para gerar dia sim dia não e já possui corrida gerado no dia anterior, por isso não está data: " + DateUtil.getStringDate(dataGeracao)); + return Boolean.FALSE; + } + } + return Boolean.TRUE; + } + + private Calendar getCalendarFechorllegada(Date fecHorallegada) { + Calendar llegada = Calendar.getInstance(); + llegada.setTime(fecHorallegada); + llegada.set(llegada.get(Calendar.YEAR), llegada.get(Calendar.MONTH), llegada.get(Calendar.DATE), + llegada.get(Calendar.HOUR_OF_DAY), llegada.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); + return llegada; + } + + private Calendar getCalendarFechorSalida(Date fecHorSalida) { + Calendar salida = Calendar.getInstance(); + salida.setTime(fecHorSalida); + salida.set(salida.get(Calendar.YEAR), salida.get(Calendar.MONTH), salida.get(Calendar.DATE), + salida.get(Calendar.HOUR_OF_DAY), salida.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); + return salida; + } + + private void criaAssentoExclusivo(EsquemaCorrida esquemaCorrida, Corrida corrida) { + List lsEsquemaAsiento = esquemaAsientoService.obtenerPorCorrida(esquemaCorrida); + for (EsquemaAsiento ea : lsEsquemaAsiento) { + DetDiagramaAutobus detDiagramaAutobus = detDiagramaAutobusService.obtenerPorDiagramaAutobusAsiento(esquemaCorrida.getDiagramaAutobusId(), ea.getNumasiento()); + if (detDiagramaAutobus != null && detDiagramaAutobus.getVendible()) { + AsientoExclusivo asientoExclusivo = new AsientoExclusivo(); + asientoExclusivo.setCorrida(corrida); + asientoExclusivo.setMotivobloqueo(null); + asientoExclusivo.setNodo(corrida.getNodo()); + asientoExclusivo.setNumasiento(ea.getNumasiento()); + asientoExclusivo.setVendible(ea.getIndvendible()); + asientoExclusivo.setParada(ea.getParada()); + asientoExclusivo.setTiempoLiberacion(ea.getTiempoLiberacion()); + if (ea.getIndvendible()) { + asientoExclusivo.setMotivobloqueo(null); + } else { + asientoExclusivo.setMotivobloqueo(ea.getMotivobloqueo()); + asientoExclusivo.setDestino(ea.getDestino()); + } + + asientoExclusivo.setActivo(Boolean.TRUE); + asientoExclusivo.setFecmodif(Calendar.getInstance().getTime()); + if (UsuarioLogado.getUsuarioLogado() != null) { + asientoExclusivo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } + + asientoExclusivo = asientoExclusivoService.suscribir(asientoExclusivo); + } + } + } + + private Date calcularHusoHorVeranoLlegada(EsquemaTramo esquemaTramo, CorridaTramo corridaTramo) { + + Ciudad ciudadOrigen = esquemaTramo.getTramo().getOrigem().getCiudad(); + Estado estadoOrigen = ciudadOrigen.getEstado(); + + int tiempoOrigen = estadoOrigen.getTiempoHorHuso() == null ? 0 : estadoOrigen.getTiempoHorHuso(); + + Date fecInicioHorVerano = estadoOrigen.getFecInicioHorVerano(); + Date fecFinHorVerano = estadoOrigen.getFecFinoHorVerano(); + + + + if ((fecInicioHorVerano != null) && (fecFinHorVerano != null)) { + if ((DateUtil.compareOnlyDate(fecInicioHorVerano, corridaTramo.getFechorsalida()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVerano, corridaTramo.getFechorsalida()) >= 0)) { + tiempoOrigen += estadoOrigen.getTiempoHorVerano(); + } + } + // 21688 + Ciudad ciudadDestino = esquemaTramo.getTramo().getDestino().getCiudad(); + Estado estadoDestino = ciudadDestino.getEstado(); + int tiempoDestino = 0; + + if (!estadoDestino.equals(estadoOrigen)) { + tiempoDestino = estadoDestino.getTiempoHorHuso() == null ? 0 : estadoDestino.getTiempoHorHuso(); + + + + Date fecInicioHorVeranoDestino = estadoDestino.getFecInicioHorVerano(); + Date fecFinHorVeranDestino = estadoDestino.getFecFinoHorVerano(); + + if ((fecInicioHorVeranoDestino != null) && (fecFinHorVeranDestino != null)) { + if ((DateUtil.compareOnlyDate(fecInicioHorVeranoDestino, corridaTramo.getFechorllegada()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVeranDestino, corridaTramo.getFechorllegada()) >= 0)) { + tiempoDestino += estadoDestino.getTiempoHorVerano(); + } + } + } else { + tiempoDestino =0; + tiempoOrigen=0; + } + + //Consideração do fuso por cidade. + //Nesse caso, é mandatório em relação ao estado.Ou seja, equanto que no fuso do estado, + //tem que haver Mudança de estado, para a cidade NÃO, pois pode-se considerar cada cidade + //como um único estado. Sendo assim, devendo ser considerado sempre quando preenchido + if ( (ciudadOrigen.getZonaHoraria() != null) && (ciudadOrigen.getZonaHoraria() != 0 )){ + log.info("Fuso da cidade origem " + ciudadOrigen.getNombciudad() + " : " + ciudadOrigen.getZonaHoraria()); + + tiempoOrigen += ciudadOrigen.getZonaHoraria(); + } + + if ( (ciudadDestino.getZonaHoraria() != null) && (ciudadDestino.getZonaHoraria() != 0 )){ + log.info("Fuso da cidade destino " + ciudadDestino.getNombciudad() + " : " + ciudadDestino.getZonaHoraria()); + + tiempoDestino += ciudadDestino.getZonaHoraria(); + } + //Fim consideração fuso por cidade + + Calendar horLlegada = null; + + long elapsedMinutes = DateUtil.getElapsedMinutos(corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); + + horLlegada = Calendar.getInstance(); + horLlegada.setTime(corridaTramo.getFechorsalidaH()); + + horLlegada.add(Calendar.MINUTE, (int) elapsedMinutes); + + // Si los tiempos son distintos, hube cambio de huso horario/horario de verano + if (tiempoOrigen != tiempoDestino) { + horLlegada.add(Calendar.HOUR, difHuso(tiempoOrigen, tiempoDestino)); + + } + + return (horLlegada == null) ? null : horLlegada.getTime(); + } + + private int difHuso(int a, int b) { + return b - a; + } + + public Boolean generarCorrida(Date dataGeracao, List lsEsquemaCorrida, boolean isGeracaoAutomaticaCorrida, List corridaTramoList, boolean isValidaActivo) { + + DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); + + // TODO: Melhorar o tratamento às transações manuais em caso de erro,etc + TransactionStatus status = transactionManager.getTransaction(def); + cantCorridaGenerada = 0; + cantCorridaCommit = 1; + java.sql.Date data = new java.sql.Date(dataGeracao.getTime()); + + Integer unUsuarioId = constanteService.buscarValorConstantePorNomeConstante("USUARIO_RESERVA_CLIENTES"); + Integer unPuntoVenta= constanteService.buscarValorConstantePorNomeConstante("PUNTOVENTA_RESERVA_CLIENTES"); + Integer estacionId = constanteService.buscarValorConstantePorNomeConstante("ESTACION_RESERVA_CLIENTES"); + + boolean corridaGerada = true; + + Corrida corrida = null; + Corrida corridaPisoExtra = null; + Corrida corridaPisoExtra2 = null; + try { + + for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { + log.info("esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + + //Usado para validar se deve buscar o primeiro piso e vincular com o segungo/terceiro caso ele ja esteja criado + boolean isSegundoOuTerceiroPiso = false; + + if (isGeracaoAutomaticaCorrida) { + boolean esHijoRebote = esquemaCorridaDAO.esHijoRebote(esquemaCorrida); + boolean esSegundoPiso = esquemaCorridaDAO.esSegundoPiso(esquemaCorrida); + + //Nessas duas condições, o "filho" só é gerado a partir do esquema corrida "pai" + if (esHijoRebote || esSegundoPiso) { + log.info(String.format("Esquema nao gerado. esHijoRebote:%s ; esSegundoPiso: %s",esHijoRebote,esSegundoPiso)); + corridaGerada = false; + continue; + } + } else { + // Caso nao seja automatico e o segundo piso seja enviado, busca o primeiro piso e geram os dois (ou tres pisos), + // caso o primeiro piso ja exista, o segundo e gerado e os dois sao vinculados + boolean esHijoRebote = esquemaCorridaDAO.esHijoRebote(esquemaCorrida); + + //Nessas tres condições, o "filho" só é gerado a partir do esquema corrida "pai" + if (esHijoRebote) { + log.info("E segundo HijoRebote, procurando a corrida Pai. "); + + esquemaCorrida = esquemaCorridaDAO.buscarEsquemaPeloHijoRebote(esquemaCorrida); + + if(esquemaCorrida == null) { + log.info(String.format("Esquema nao gerado. esHijoRebote:%s ; ",esHijoRebote)); + corridaGerada = false; + continue; + } + log.info("Corrida Pai esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + } + + boolean esSegundoPiso = esquemaCorridaDAO.esSegundoPiso(esquemaCorrida); + + if(esSegundoPiso) { + isSegundoOuTerceiroPiso = true; + log.info("E segundo Piso, procurando o primeiro piso para gerar. "); + esquemaCorrida = esquemaCorridaDAO.buscarPrimeiroPisoPeloSegundo(esquemaCorrida); + + if(esquemaCorrida == null) { + log.info("Primeiro piso nao encontrado, nao ira gerar o servico: " ); + corridaGerada = false; + continue; + } + + log.info("Primeiro Piso esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + } + + boolean esTerceiroPiso = esquemaCorridaDAO.esTerceiroPiso(esquemaCorrida); + + if(esTerceiroPiso) { + isSegundoOuTerceiroPiso = true; + log.info("E terceiro Piso, procurando o primeiro piso para gerar. "); + esquemaCorrida = esquemaCorridaDAO.buscarPrimeiroPisoPeloTerceiro(esquemaCorrida); + + if(esquemaCorrida == null) { + log.info("Primeiro piso nao encontrado, nao ira gerar o servico: " ); + corridaGerada = false; + continue; + } + log.info("Primeiro Piso esquema=" + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + } + } + + if(esquemaCorrida.getIndCorridaDesativada()) { + log.info("Corrida desativada nao sera gerada. " + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + corridaGerada = false; + continue; + } + + Boolean isFeriado = this.isFeriado(data, esquemaCorrida); + corrida = generarCorrida(esquemaCorrida, dataGeracao, false, isFeriado, corridaTramoList, isValidaActivo); + + + corridaPisoExtra = null; + corridaPisoExtra2 = null; + + if (corrida == null && !isSegundoOuTerceiroPiso) { + corridaGerada = false; + continue; + + } else if(corrida == null && isSegundoOuTerceiroPiso) { + log.info(" Primeiro piso ja existe, buscando corrida para vincular ao piso extra"); + corrida = corridaDAO.buscarPorId(criarIdCorrida(dataGeracao, esquemaCorrida)); + + if (corrida == null) { + log.info("Nao foi encontrada corrida original, nao sera gerado o segundo/terceiro piso"); + corridaGerada = false; + continue; + } + } + + // PISO EXTRA + if (esquemaCorrida.getPisoExtra() != null && esquemaCorrida.getPisoExtra()) { + + EsquemaCorrida esquemaCorridaSegundoPiso = esquemaCorridaDAO.buscarPeloNumCorrida(esquemaCorrida.getNumCorridaPisoExtra()); + + String mensagemLog = String.format("Esquema/Corrida primeiro piso: %s/%s ; Esquema/Corrida segundo piso: %s/%s ",esquemaCorrida.getEsquemacorridaId(),esquemaCorrida.getNumCorrida(), esquemaCorridaSegundoPiso.getEsquemacorridaId(),esquemaCorridaSegundoPiso.getNumCorrida() ); + log.info(mensagemLog); + + if(esquemaCorridaSegundoPiso.getIndCorridaDesativada()) { + log.info("Corrida desativada nao sera gerada. " + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + corridaGerada = false; + continue; + } + + corridaPisoExtra = generarCorrida(esquemaCorridaSegundoPiso, dataGeracao, true, isFeriado, null, false); + Boolean atualizarPisoExtra = false; + + // caso corrida segundo piso for gerada antes, atualizar + atualizarPisoExtra = atualizarCorridaPisoExtra(corridaPisoExtra, esquemaCorridaSegundoPiso, data, mensagemLog, atualizarPisoExtra); + + alterarNumPisoCorridaPisoExtra(corrida, corridaPisoExtra, mensagemLog, atualizarPisoExtra, false); + + //Valida se existe configuração de reserva para o cliente e crria Cria reserva para 2º piso + if(corridaPisoExtra !=null) { + if(unUsuarioId!=null && unPuntoVenta!=null && estacionId!=null) { + validaCriaReservaCliente(corridaPisoExtra, unUsuarioId, unPuntoVenta, estacionId); + }else { + log.error("Usuario ou ponto de venda ou estação não definidos para reserva especial nas contantes"); + } + } + + if(esquemaCorrida.getNumCorridaPisoExtra2() != null) { + + EsquemaCorrida esquemaCorridaTerceiroPiso = esquemaCorridaDAO.buscarPeloNumCorrida(esquemaCorrida.getNumCorridaPisoExtra2()); + + if(esquemaCorridaTerceiroPiso != null) { + + mensagemLog = String.format("Esquema/Corrida primeiro piso: %s/%s ; Esquema/Corrida terceiro piso: %s/%s ",esquemaCorrida.getEsquemacorridaId(),esquemaCorrida.getNumCorrida(), esquemaCorridaTerceiroPiso.getEsquemacorridaId(),esquemaCorridaTerceiroPiso.getNumCorrida() ); + log.info(mensagemLog); + + if(esquemaCorridaTerceiroPiso.getIndCorridaDesativada()) { + log.info("Corrida desativada nao sera gerada. " + esquemaCorrida.getEsquemacorridaId() + " numCorrida=" + esquemaCorrida.getNumCorrida()); + corridaGerada = false; + continue; + } + + corridaPisoExtra2 = generarCorrida(esquemaCorridaTerceiroPiso, dataGeracao, true, isFeriado, null, false); + atualizarPisoExtra = false; + + // caso corrida segundo piso for gerada antes, atualizar + atualizarPisoExtra = atualizarCorridaPisoExtra(corridaPisoExtra2, esquemaCorridaTerceiroPiso, data, mensagemLog, atualizarPisoExtra); + + // caso corrida segundo piso for gerada antes, atualizar + alterarNumPisoCorridaPisoExtra(corrida, corridaPisoExtra2, mensagemLog, atualizarPisoExtra, true); + + //Valida se existe configuração de reserva para o cliente e crria Cria reserva para 2º piso + if(corridaPisoExtra !=null) { + if(unUsuarioId!=null && unPuntoVenta!=null && estacionId!=null) { + validaCriaReservaCliente(corridaPisoExtra, unUsuarioId, unPuntoVenta, estacionId); + }else { + log.error("Usuario ou ponto de venda ou estação não definidos para reserva nas contantes"); + } + } + } + } + } + + if (esquemaCorrida.getEsquemaCorridaRebote() != null) { + criaCorridaRebote(dataGeracao, corrida, corridaPisoExtra, corridaPisoExtra2, esquemaCorrida, + isFeriado); + } + + if(corrida != null) { + generarCorridaInfo(corrida, esquemaCorrida); + } + + if (cantCorridaGenerada >= cantCorridaCommit) { + cantCorridaGenerada = 0; + transactionManager.commit(status); + status = transactionManager.getTransaction(def); + } + + } + }catch (Exception e) { + log.error("Erro ao gerar corrida", e ); + } + finally { + if ((status != null) && (!status.isCompleted())) { + transactionManager.commit(status); + } + } + //Valida se existe configuração de reserva para o cliente e cria Cria reserva + if(corrida !=null) { + if(unUsuarioId!=null && unPuntoVenta!=null && estacionId!=null) { + validaCriaReservaCliente(corrida, unUsuarioId, unPuntoVenta, estacionId); + }else { + log.error("Usuario ou ponto de venda ou estação não definidos para reserva especial nas contantes"); + } + } + + return corridaGerada; + } + + private Id criarIdCorrida(Date dataGeracao, EsquemaCorrida esquemaCorrida) { + Corrida.Id id = new Corrida.Id(); + id.setCorridaId(esquemaCorrida.getNumCorrida()); + id.setFeccorrida(DateUtil.normalizarToFecha(dataGeracao)); + + return id; + } + + private void criaCorridaRebote(Date dataGeracao, Corrida corrida, Corrida corridaPisoExtra, + Corrida corridaPisoExtra2, EsquemaCorrida esquemaCorrida, Boolean isFeriado) { + log.info("Corrida Rebote=" + esquemaCorrida.getEsquemacorridaId()); + + Corrida corridaRebote = generarCorrida(esquemaCorrida.getEsquemaCorridaRebote(), dataGeracao, false, isFeriado, null, false); + Corrida corridaPisoExtraRebote = null; + boolean generaReboteDiaSeguinte = false; + + if (corridaRebote != null) { + EsquemaCorrida ecRebote = esquemaCorrida.getEsquemaCorridaRebote(); + if (ecRebote.getPisoExtra() != null && ecRebote.getPisoExtra()) { + + EsquemaCorrida esquemaCorridaSegundoPiso = esquemaCorridaDAO.buscarPeloNumCorrida(ecRebote.getNumCorridaPisoExtra()); + + log.info(String.format("Esquema/Corrida primeiro piso: %s/%s ; Esquema/Corrida segundo piso: %s/%s ",ecRebote.getEsquemacorridaId(),ecRebote.getNumCorrida(), esquemaCorridaSegundoPiso.getEsquemacorridaId(),esquemaCorridaSegundoPiso.getNumCorrida() )); + + corridaPisoExtraRebote = generarCorrida(esquemaCorridaSegundoPiso, dataGeracao, true, isFeriado, null, false); + + if (corridaRebote != null && corridaPisoExtraRebote != null) { + // Salvando Referencia da Corrida no piso extra + corridaPisoExtraRebote.setCorridaPiso(corridaRebote); + corridaPisoExtraRebote.setNumPiso(2); + corridaPisoExtraRebote = corridaDAO.actualizacion(corridaPisoExtraRebote); + + // Referencia do Piso extra na Corrida + corridaRebote.setCorridaPiso(corridaPisoExtraRebote); + corridaRebote.setNumPiso(1); + corridaRebote = corridaDAO.actualizacion(corridaRebote); + } + } + // RebotePisoExtra + if (DateUtil.compareDate(corrida.getFechorsalida(), corridaRebote.getFechorsalida()) > 0) { + generaReboteDiaSeguinte = true; // si fue generado con una fechamenor tienes que generar para el dia seguinte + } + } else { + generaReboteDiaSeguinte = true;// si no fue encontrado para el dia de hoy,genera para manhana + } + + if (generaReboteDiaSeguinte) { + log.info("Haciendo la busqueda por el esquema rebote para el dia seguiente pues ya existe al dia de hoy"); + + corridaRebote = generarReboteDiaSeguinte(esquemaCorrida, dataGeracao); + + if (corridaPisoExtraRebote != null) { + corridaPisoExtraRebote = generarReboteDiaSeguinte(esquemaCorrida, dataGeracao); + } + + if (corridaRebote == null) { + log.info("No fue posible generar la corrida rebote. No fue encontrado esquema para la fecha del dia seguinte a " + dataGeracao); + } + } + if (corridaRebote != null) { + log.info("Rebote generado=" + corridaRebote.getId()); + corrida.setCorridaRebote(corridaRebote); + corridaDAO.actualizacion(corrida); + } + + if (corridaPisoExtraRebote != null && corridaPisoExtra != null) { + log.info("Rebote Piso Extra Generado=" + corridaPisoExtraRebote.getId()); + corridaPisoExtra.setCorridaRebote(corridaPisoExtraRebote); + corridaDAO.actualizacion(corridaPisoExtra); + } + + if (corridaPisoExtraRebote != null && corridaPisoExtra2 != null) { + log.info("Rebote Piso Extra Generado=" + corridaPisoExtraRebote.getId()); + corridaPisoExtra2.setCorridaRebote(corridaPisoExtraRebote); + corridaDAO.actualizacion(corridaPisoExtra2); + } + } + + private void validaCriaReservaCliente(Corrida corrida, Integer unUsuarioId, Integer unPuntoVenta, Integer estacionId) { + try { + List reservaEspecialClienteList = reservaEspecialClientService.bucarReservaEspecialByCorridaId(corrida.getId().getCorridaId().longValue()) ; + if(reservaEspecialClienteList !=null) { + for (ReservaEspecialCliente reservaEspecialCliente : reservaEspecialClienteList) { + Date dataAtual = new Date (); + //Valida se esta dentro da vigência + if(DateUtil.isMenor(reservaEspecialCliente.getFecinicio(), dataAtual) && DateUtil.isMaior(reservaEspecialCliente.getFecfinal(), dataAtual)){ + Integer unoTerminalOrigenId = reservaEspecialCliente.getOrigem().getParadaId(); + Integer unoTerminalDestinoId = reservaEspecialCliente.getDestino().getParadaId(); + String unoAsientoSelec = reservaEspecialCliente.getNumAsentoCorrida().toString(); + Integer unaCorridaId =corrida.getId().getCorridaId().intValue(); + Date unaFecCorrida= corrida.getId().getFeccorrida(); + Integer unoTipoVenta= TPV_RESERVA_NORMAL; + Integer unaCategoriaSelec= 1 ; + String unoNumeOperacion= null ; + Tramo tramo = null; + Date fecViaje = corrida.getFechorsalida(); + Ruta ruta = rutaService.obtenerID(corrida.getRuta().getRutaId()); + for(RutaCombinacion rutaCombinacion :ruta.getRutaCombinacionList()) { + if((rutaCombinacion.getTramo().getOrigem().getParadaId().intValue()==unoTerminalOrigenId.intValue()) + && (rutaCombinacion.getTramo().getDestino().getParadaId().intValue()==unoTerminalDestinoId.intValue()) ) { + tramo = rutaCombinacion.getTramo(); + break; + } + } + + for (CorridaTramo corridaTramo : corrida.getCorridaTramoList()) { + //(Se origem corridatramo = origem cadastrada && destino corridatramo = destino cadastrado) + // ou (se origem corridatramo = destino do cadastrado), tendo em vista que corridatramo são as sequencias e não as combinações + if(corridaTramo.getOrigem()!=null && corridaTramo.getOrigem().getParadaId().intValue()==unoTerminalOrigenId.intValue() + && corridaTramo.getDestino()!=null && corridaTramo.getDestino().getParadaId().intValue()==unoTerminalDestinoId.intValue()) { + fecViaje = corridaTramo.getFechorsalidaH(); + break; + } + } + if(fecViaje!=null) { + if(!isDiaSemnanaOK(reservaEspecialCliente, fecViaje)) { + log.error("Reserva não será realizada. Dia da semana desta corrida não corresponde ao dia da semana configurado na resserva epecial para o clienteId:" + + reservaEspecialCliente.getClienteId() + " reservaEspecialClienteId:" + reservaEspecialCliente.getReservaEspecialClienteId() + " para a corrida:" + corrida.getId().getCorridaId() + "na data" + fecViaje); + continue; + } + } + + if(tramo==null) { + log.error("Reserva não será realizada. não foi encontrado trecho com Origem:" + unoTerminalOrigenId + " Destino:" +unoTerminalDestinoId + " para a corrida:" + corrida.getId().getCorridaId()); + continue; + } + List vigenciaTarifaList = vigenciaTarifaService.buscarVigenciasIntervalo(new VigenciaTarifa(corrida.getFechorSalidaOriginal(), corrida.getFechorSalidaOriginal())); + if(vigenciaTarifaList==null || vigenciaTarifaList.isEmpty()) { + log.error("Reserva não será realizada. não foi encontrado Vigência Tarifa com Origem:" + unoTerminalOrigenId + " Destino:" +unoTerminalDestinoId + " para a corrida:" + corrida.getId().getCorridaId()); + continue; + } + Tarifa tarifa = tarifaService.buscar(tramo, corrida.getMarca(), corrida.getClaseServicio(), vigenciaTarifaList!=null ? vigenciaTarifaList.get(0) : null, new Moneda(1), corrida.getRuta()); + if(tarifa==null ) { + log.error("Reserva não será realizada. não foi encontrado Tarifa com Origem:" + unoTerminalOrigenId + " Destino:" +unoTerminalDestinoId + " para a corrida:" + corrida.getId().getCorridaId()); + continue; + } + BigDecimal valorTarifa= tarifa!=null ? tarifa.getPrecio() : null ; + BigDecimal valorSeguro= tarifa!=null ? tarifa.getImporteseguro() : null ; + BigDecimal valorTaxaEmbarque= tarifa!=null ? tarifa.getImportetaxaembarque() : null ; + BigDecimal valorPedagio = tarifa!=null ? tarifa.getImportepedagio() : null ; + Long tempoReserva = null; + if(reservaEspecialCliente.getClienteId() ==null) { + log.error("Cliente id não foi cadastrado (null) para reservaId=" + reservaEspecialCliente.getReservaEspecialClienteId() + " da corrida_id =" + reservaEspecialCliente.getCorridaId() ); + continue; + } + Cliente cliente = clienteService.obtenerID(reservaEspecialCliente.getClienteId().intValue()); + if(cliente ==null || !Boolean.TRUE.equals(cliente.getActivo())) { + continue; + } + String clienteFidelidadId = null; + try { + clienteFidelidadId = cliente.getListClienteFidelidad().get(0).getClienteFidelidadId().toString(); + } catch (Exception e) { + log.error("Boleto Reserva não gerado. Erro ao obter cliente fidelidade para o clienteId:" + cliente.getClienteId(), e ); + continue; + } + boletoService.criaBoletoReserva(unoAsientoSelec, unaCorridaId, unaFecCorrida, unoTerminalOrigenId, + unoTerminalDestinoId, unoTipoVenta, unaCategoriaSelec, unoNumeOperacion, unUsuarioId, unPuntoVenta, + reservaEspecialCliente.getClienteId().intValue(), corrida.getRuta().getRutaId(), valorTarifa, tempoReserva, + estacionId, cliente.getNumIdentificaUno(), clienteFidelidadId, + corrida.getClaseServicio().getClaseservicioId(), corrida.getMarca().getMarcaId(), fecViaje, corrida.getEmpresa().getEmpresaId(), + cliente.getNombcliente(), valorSeguro, valorTaxaEmbarque, valorPedagio); + } + } + } + } catch (Exception e) { + log.error("Erro ao validar/criar reserva especial de clientes para corridaId: " + corrida.getId().getCorridaId() , e); + } + } + + /** + * Valida se o dia da semana desta corrida está configurado para gerar reserva especial de clientes + * @param reservaEspecialCliente + * @param fecViaje + * @return + */ + private boolean isDiaSemnanaOK(ReservaEspecialCliente reservaEspecialCliente, Date fecViaje) { + int diaSemanaInt = DateUtil.getDiaDaSemana(fecViaje); + boolean isDiaSemanaOK = false; + switch (diaSemanaInt) { + case 1: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndDomingo()) ? true :false ; + break; + case 2: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndSegunda()) ? true :false ; + break; + case 3: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndTerca()) ? true :false ; + break; + case 4: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndQuarta()) ? true :false ; + break; + case 5: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndQuinta()) ? true :false ; + break; + case 6: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndSexta()) ? true :false ; + break; + case 7: + isDiaSemanaOK = Boolean.TRUE.equals(reservaEspecialCliente.getIndSabado()) ? true :false ; + break; + default: + break; + } + return isDiaSemanaOK; + } + + private void alterarNumPisoCorridaPisoExtra(Corrida corrida, Corrida corridaPisoExtra, String mensagemLog, Boolean atualizarPisoExtra, boolean isPiso3) { + if (corrida != null && corridaPisoExtra != null) { + log.info(mensagemLog + "; atualizando as corridas do piso 1 e 2"); + // Salvando Referencia da Corrida no piso extra + corridaPisoExtra.setCorridaPiso(corrida); + corridaPisoExtra.setNumPiso(isPiso3 ? 3 : 2); + corridaPisoExtra = corridaDAO.actualizacion(corridaPisoExtra); + // Referencia do Piso extra na Corrida + corrida.setCorridaPiso(corridaPisoExtra); + corrida.setNumPiso(1); + corrida = corridaDAO.actualizacion(corrida); + + if(atualizarPisoExtra) { + corridaDAO.actualizacion(corridaPisoExtra); + } + } else { + log.info(mensagemLog + "; nao foram atualizadas as corridas do piso 1 e 2"); + } + } + + private Boolean atualizarCorridaPisoExtra(Corrida corridaPisoExtra, EsquemaCorrida esquemaCorridaSegundoPiso, java.sql.Date data, String mensagemLog, Boolean atualizarPisoExtra) { + // caso corrida segundo piso for gerada antes, atualizar + if(corridaPisoExtra == null) { + Id id = new Id(); + id.setCorridaId(esquemaCorridaSegundoPiso.getNumCorrida()); + id.setFeccorrida(data); + + corridaPisoExtra = corridaDAO.buscarPorId(id); + + atualizarPisoExtra = corridaPisoExtra == null ? false : true; + log.info(mensagemLog + "; atualizarPisoExtra=" + atualizarPisoExtra); + } + + return atualizarPisoExtra; + } + + /** + * Verifica se hay una excepcione de tiempo para el tramo informado. + * + * @param corridaTramo + * @param claseServicio + * @return - Si existe una excepcion, regresa la nueva fecLlegada para el tramo, sino, regreso null + */ + private Date arreglaExcepcionTiempo(CorridaTramo corridaTramo, ClaseServicio claseServicio) { + Date nuevaFecLlegada = null; + + Tramo tramo = corridaTramo.getTramo(); + + List lsExcepciones = tramoTiempoDAO.buscar(tramo, claseServicio, corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); + + if (!lsExcepciones.isEmpty()) { + TramoTiempo tramoTiempo = lsExcepciones.get(0); + List diasSemana = getDiaDeLaSemana(tramoTiempo); + + Calendar fecCorrida = Calendar.getInstance(); + fecCorrida.setTime(corridaTramo.getFechorllegada()); + + if (diasSemana.contains(fecCorrida.get(Calendar.DAY_OF_WEEK))) { + + Calendar fechorsalida = Calendar.getInstance(); + fechorsalida.setTime(corridaTramo.getFechorsalida()); + + HoraSistema horaSistema = new HoraSistema(tramoTiempo.getTiemporecorrido()); + + fechorsalida.add(Calendar.HOUR, horaSistema.getHora()); + fechorsalida.add(Calendar.MINUTE, horaSistema.getMinuto()); + + nuevaFecLlegada = fechorsalida.getTime(); + } + } + + return nuevaFecLlegada; + } + + private Corrida generarReboteDiaSeguinte(EsquemaCorrida esquemaCorrida, Date dataGeracao) { + Calendar tmp = Calendar.getInstance(); + tmp.setTime(dataGeracao); + tmp.add(Calendar.DAY_OF_MONTH, 1); + java.sql.Date data = new java.sql.Date(dataGeracao.getTime()); + Boolean isFeriado = this.isFeriado(data, esquemaCorrida); + + return generarCorrida(esquemaCorrida.getEsquemaCorridaRebote(), tmp.getTime(), false, isFeriado, null, false); + } + + private List getDiaDeLaSemana(TramoTiempo tramoTiempo) { + List diasValidos = new ArrayList(); + + if (tramoTiempo.getIndapliclun()) { + diasValidos.add(Calendar.MONDAY); + } + if (tramoTiempo.getIndaplicmar()) { + diasValidos.add(Calendar.TUESDAY); + } + if (tramoTiempo.getIndaplicmie()) { + diasValidos.add(Calendar.WEDNESDAY); + } + if (tramoTiempo.getIndaplicjue()) { + diasValidos.add(Calendar.THURSDAY); + } + if (tramoTiempo.getIndaplicvie()) { + diasValidos.add(Calendar.FRIDAY); + } + if (tramoTiempo.getIndaplicsab()) { + diasValidos.add(Calendar.SATURDAY); + } + if (tramoTiempo.getIndaplicdom()) { + diasValidos.add(Calendar.SUNDAY); + } + + return diasValidos; + } + + @Override + public Date calcularDataFinalGeneracionCorrida() { + Date dataDe = new Date(); + + Constante constante = constanteService.buscarPorNomeConstante("CANT_DIAS_GENERACION_CORRIDA"); + Calendar calendarData = Calendar.getInstance(); + calendarData.setTime(dataDe); + calendarData.add(Calendar.DATE, Integer.parseInt(constante.getValorconstante())); + Date dataAte = calendarData.getTime(); + + return dataAte; + } + + private boolean generaCorridaAprimorada() { + try { + Constante constante = constanteService.buscarPorNomeConstante("GENERACION_CORRIDA_APRIMORADA"); + return (constante != null && StringUtils.isNotBlank(constante.getValorconstante()) + && Boolean.valueOf(constante.getValorconstante())) ? Boolean.TRUE : Boolean.FALSE; + } catch (Exception e) { + } + + return Boolean.FALSE; + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public boolean generarCorridaAutomatica() { + + if (generaCorridaAprimorada()) { + return generarCorridaAutomaticaAprimorada(); + } else { + return generarCorridaAutomaticaPadrao(); + } + } + + private boolean generarCorridaAutomaticaPadrao() { + feriadoCache.limpar(); + + Date dataDe = Calendar.getInstance().getTime(); + + Date dataAteConstante = calcularDataFinalGeneracionCorrida(); + Boolean hayErroConstante = !generarCorridaAutomaticaConstanteDias(dataDe, dataAteConstante); + + log.debug("corrida generadas por la constante. hayError=" + hayErroConstante); + + Boolean hayErroQtdeDias = !generarCorridaAutomaticaQtdeDias(dataDe); + + log.debug("corrida generadas por la cant de dias.hayError=" + hayErroQtdeDias); + + return hayErroConstante && hayErroQtdeDias; + } + + private boolean generarCorridaAutomaticaAprimorada() { + feriadoCache.limpar(); + + Date dataDe = Calendar.getInstance().getTime(); + + Date dataAteConstante = calcularDataFinalGeneracionCorrida(); + Boolean hayErroConstante = !generarCorridaAutomaticaAprimorada(dataDe, dataAteConstante); + + log.debug("corrida generadas aprimorada por la cant de dias.hayError=" + hayErroConstante); + + return hayErroConstante; + } + + private boolean generarCorridaAutomaticaQtdeDias(Date dataDeOriginal) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + log.debug(" Generacion cant dias " + sdf.format(dataDeOriginal)); + + // TODO: Melhorar o tratamento às transações manuais em caso de erro,etc + DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); + TransactionStatus status = transactionManager.getTransaction(def); + + List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigenciaQtdeDiasNotNull(dataDeOriginal); + for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { + log.debug("esquemaCorrida=" + esquemaCorrida.getEsquemacorridaId()); + + Integer qtdeDiasGerar = esquemaCorrida.getCantDiasGeneracion(); + + if (qtdeDiasGerar <= 0) { + log.debug("cant dias <=0"); + + continue; + } + + log.debug("cantDiasGenerar=" + qtdeDiasGerar); + + Calendar calendarData = Calendar.getInstance(); + calendarData.setTime(dataDeOriginal); + calendarData.add(Calendar.DATE, qtdeDiasGerar - 1); + + Date dataAte = calendarData.getTime(); + Date dataDe = new Date(dataDeOriginal.getTime()); + + log.debug("Periodo generacion = " + sdf.format(dataDe) + " hasta " + sdf.format(dataAte)); + + if (DateUtil.compareOnlyDate(dataAte, esquemaCorrida.getEsquemaOperacional().getFecfinvigencia()) > 0) { + log.info("Cant dias excede final de la vigencia"); + dataAte = esquemaCorrida.getEsquemaOperacional().getFecfinvigencia(); + } + + try { + while (DateUtil.compareOnlyDate(dataDe, dataAte) <= 0) { + + + List lsTmp = new ArrayList(); + lsTmp.add(esquemaCorrida); + + this.generarCorrida(dataDe, lsTmp, true, null, false); + + calendarData.setTime(dataDe); + calendarData.add(Calendar.DATE, 1); + dataDe = calendarData.getTime(); + } + log.info("commit bloco corridas"); + transactionManager.commit(status); + status = transactionManager.getTransaction(def); + } catch (Exception ex) { + log.error("", ex); + log.error(" Erro ao gerar corrida = " + esquemaCorrida.getNumCorrida() + " esquemaCorrida = " + esquemaCorrida.getEsquemacorridaId()); + transactionManager.rollback(status); + status = transactionManager.getTransaction(def); + } + } + + if (!status.isCompleted()) { + log.info("commit bloco final"); + transactionManager.commit(status); + } + + return Boolean.TRUE; + } + + private boolean generarCorridaAutomaticaConstanteDias(Date dataDe, Date dataAte) { + boolean generacionExitosa = true; + SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); + + log.debug("** AUTO - Data De: " + sdfData.format(dataDe) + " **Data Ateh: " + sdfData.format(dataAte)); + + Calendar calendarData = Calendar.getInstance(); + calendarData.setTime(dataAte); + calendarData.add(Calendar.DATE, 1); + dataAte = calendarData.getTime(); + try { + while (dataDe.before(dataAte)) { + log.debug("*** Data: " + sdfData.format(dataDe)); + + List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigenciaQtdeDiasNull(dataDe); + + Boolean dentroVigenciaEsquemaOperacional = !lsEsquemaCorrida.isEmpty(); + if (dentroVigenciaEsquemaOperacional) { + log.debug("Geracao de servicos sem cant dias especifico. Adotando o padrao"); + + this.generarCorrida(dataDe, lsEsquemaCorrida, true, null, false); + + } else { + log.info("No hay esquema vigente para la fecha " + sdfData.format(dataDe)); + } + + calendarData.setTime(dataDe); + calendarData.add(Calendar.DATE, 1); + dataDe = calendarData.getTime(); + } + } catch (Exception ex) { + log.error("Erro ao gerar corridas: " + ex, ex); + generacionExitosa = false; + } + + return generacionExitosa; + } + + private boolean generarCorridaAutomaticaAprimorada(final Date dataInico, final Date dataConstanteFim) { + boolean generacionExitosa = true; + SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); + + log.debug("** AUTO - Data De: " + sdfData.format(dataInico) + " **Data Ateh: " + sdfData.format(dataConstanteFim)); + + // TODO: Melhorar o tratamento às transações manuais em caso de erro,etc + DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); + TransactionStatus status = transactionManager.getTransaction(def); + + Calendar calendarData = Calendar.getInstance(); + calendarData.setTime(dataConstanteFim); + + + Date dataAte = calendarData.getTime(); + + try { + log.info("*** Data: " + sdfData.format(dataAte)); + List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigencia(dataInico); + + Date dataInicial = DateUtil.normalizarToFecha(dataInico); + + Boolean dentroVigenciaEsquemaOperacional = !lsEsquemaCorrida.isEmpty(); + if (dentroVigenciaEsquemaOperacional) { + + for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { + log.debug("esquemaCorrida=" + esquemaCorrida.getEsquemacorridaId()); + + Integer qtdeDiasGerar = esquemaCorrida.getCantDiasGeneracion(); + + if (qtdeDiasGerar != null && qtdeDiasGerar >= 0) { + log.info("cantDiasGenerar=" + qtdeDiasGerar); + + Calendar calendarDiasGenerar = Calendar.getInstance(); + calendarDiasGenerar.setTime(dataInicial); + calendarDiasGenerar.add(Calendar.DATE, qtdeDiasGerar); + dataAte = DateUtil.normalizarToFecha(calendarDiasGenerar.getTime()); + } else { + calendarData.setTime(dataConstanteFim); + dataAte = DateUtil.normalizarToFecha(calendarData.getTime()); + } + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + log.debug("Periodo generacion = " + sdf.format(dataInicial) + " hasta " + sdf.format(dataAte)); + + if (DateUtil.compareOnlyDate(dataAte, esquemaCorrida.getEsquemaOperacional().getFecfinvigencia()) > 0) { + log.info("Cant dias excede final de la vigencia"); + dataAte = esquemaCorrida.getEsquemaOperacional().getFecfinvigencia(); + } + + try { + while (DateUtil.compareOnlyDate(dataAte, dataInicial) >= 0) { + + boolean corridaExiste = corridaDAO.existe(new Corrida.Id(esquemaCorrida.getNumCorrida(), dataAte)); + String strDataGeracao = DateUtil.getStringDate(dataAte); + + log.info(String.format("Corrida existe = %s [%s - %s]",corridaExiste,esquemaCorrida.getNumCorrida() ,strDataGeracao)); + + //A corrida já existir é a única condição para parar de gerar. + //Se a corrida não for gerada (rotina mais abaixo), podem haver várias condições: o dia da semana, feriado, etc + if (corridaExiste){ + log.info(String.format("Corrida do dia já gerada ", esquemaCorrida.getNumCorrida(), strDataGeracao)); + + break; + } + + boolean corridaGerada = this.generarCorrida(dataAte, Arrays.asList(esquemaCorrida), false, null, false); + + log.info(String.format("Corrida gerada = %s [%s - %s]",corridaGerada,esquemaCorrida.getNumCorrida() ,strDataGeracao)); + + calendarData.setTime(dataAte); + calendarData.add(Calendar.DATE, -1); + dataAte = calendarData.getTime(); + } + + log.info("commit bloco corridas"); + + transactionManager.commit(status); + status = transactionManager.getTransaction(def); + } catch (Exception ex) { + log.error("", ex); + log.error(" Erro ao gerar corrida = " + esquemaCorrida.getNumCorrida() + " esquemaCorrida = " + esquemaCorrida.getEsquemacorridaId()); + transactionManager.rollback(status); + status = transactionManager.getTransaction(def); + } + } + + } else { + log.info("No hay esquema vigente para la fecha " + sdfData.format(dataInicial)); + } + + } catch (Exception ex) { + log.error("Erro ao gerar corridas: " + ex, ex); + generacionExitosa = false; + } + + return generacionExitosa; + } + + private int cantDiasMaxGerarCorridasManual() { + + Constante constante = constanteService.buscarPorNomeConstante("CANT_MAX_CORRIDA_GERA_MANUAL"); + + if ((constante == null) || (StringUtils.isBlank(constante.getValorconstante()))) { + return CANT_MAX_CORRIDA_GERA_MANUAL; + } + + return Integer.valueOf(constante.getValorconstante()); + + } + + public Long generarCorridasSelecionadas(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws BusinessException { + + int cantDiasGeneracion = DateUtil.getElapsedDias(dataDe, dataAte); + + int cantDiasMaxGerarCorridasManual = cantDiasMaxGerarCorridasManual(); + + log.info("cantDiasGeneracion=" + cantDiasGeneracion); + log.info("cantDiasMaxGerarCorridasManual=" + cantDiasMaxGerarCorridasManual); + + if (cantDiasGeneracion > cantDiasMaxGerarCorridasManual()) { + throw new BusinessException("corridaServiceImpl.geracaoCorrida.cantDiasManual", new Object[] { cantDiasMaxGerarCorridasManual }); + } + + SimpleDateFormat sdfData = new SimpleDateFormat("dd/MM/yyyy"); + + log.info("** SELECIONADOS - Data De: " + sdfData.format(dataDe) + " **Data Ateh: " + sdfData.format(dataAte)); + + Calendar calendarData = Calendar.getInstance(); + calendarData.setTime(dataDe); + + Long cantInicio = corridaDAO.cantCorridaGeneradasHoy(); + + while (DateUtil.compareOnlyDate(dataDe, dataAte) <= 0) { + log.info("*** Data: " + sdfData.format(dataDe)); + + this.generarCorrida(dataDe, lsEsquemaCorrida, false, null, false); + + calendarData.add(Calendar.DATE, 1); + dataDe = calendarData.getTime(); + } + + Long cantFim = corridaDAO.cantCorridaGeneradasHoy(); + + return cantFim - cantInicio; + } + + public List buscarGroupCorrridaId(Integer corridaId, Date dateInicio, Date dateFin) { + GregorianCalendar gCalendarDe = new GregorianCalendar(); + gCalendarDe.setTime(dateInicio); + gCalendarDe.set(Calendar.HOUR_OF_DAY, 0); + gCalendarDe.set(Calendar.MINUTE, 0); + gCalendarDe.set(Calendar.SECOND, 0); + gCalendarDe.set(Calendar.MILLISECOND, 0); + + GregorianCalendar gCalendarAte = new GregorianCalendar(); + gCalendarAte.setTime(dateFin); + gCalendarAte.set(Calendar.HOUR_OF_DAY, 0); + gCalendarAte.set(Calendar.MINUTE, 0); + gCalendarAte.set(Calendar.SECOND, 0); + gCalendarAte.set(Calendar.MILLISECOND, 0); + + return corridaDAO.buscarGroupCorrridaId(corridaId, gCalendarDe.getTime(), gCalendarAte.getTime()); + } + + @Override + public List buscarGroupCorrridaId(Integer corridaId, Integer origem, Integer destino, Integer ruta, Integer numRuta, Date dateInicio, Date dateFin) { + GregorianCalendar gCalendarDe = new GregorianCalendar(); + gCalendarDe.setTime(dateInicio); + gCalendarDe.set(Calendar.HOUR_OF_DAY, 0); + gCalendarDe.set(Calendar.MINUTE, 0); + gCalendarDe.set(Calendar.SECOND, 0); + gCalendarDe.set(Calendar.MILLISECOND, 0); + + GregorianCalendar gCalendarAte = new GregorianCalendar(); + gCalendarAte.setTime(dateFin); + gCalendarAte.set(Calendar.HOUR_OF_DAY, 0); + gCalendarAte.set(Calendar.MINUTE, 0); + gCalendarAte.set(Calendar.SECOND, 0); + gCalendarAte.set(Calendar.MILLISECOND, 0); + + return corridaDAO.buscarGroupCorrridaId(corridaId, origem, destino, ruta, numRuta, gCalendarDe.getTime(), gCalendarAte.getTime()); + } + + @Override + public Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial, Integer corridaId) { + try { + List corridas = corridaDAO.buscarPorEstado(estado, dataInicial, corridaId); + corridaDAO.actualizaFecHusoFecVerano(corridas); + return Boolean.TRUE; + + } catch (Exception ex) { + log.error("Erro ao atualizar corridas FecHuso FecVerano: " + ex, ex); + } + return Boolean.FALSE; + + } + + @Override + public Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial) { + return atualizarCorridaFecHusoFecVerano(estado, dataInicial, null); + } + + @Override + public List buscarCorridaRelAproveitamento(Parada origem, Parada destino, + Date feccorrida, Integer corridaId) { + + List ls = new ArrayList(); + ls =corridaDAO.buscarCorridaRelAproveitamento(origem, destino, feccorrida, corridaId); + return ls; + + } + + @Override + public Corrida buscaCorrridaFutura(Ruta ruta, Date fecInicio) { + return corridaDAO.buscaCorrridaFutura(ruta, fecInicio); + } + + @Override + @Transactional + public Boolean editarCorridaPorOutraCorrida(Estado estado, Date dataInicial, Integer corridaId, Date dataPadrao) { + List corridas = corridaDAO.buscarPorEstado(estado, dataInicial, corridaId); + + if (corridas == null || corridas.isEmpty()){ + return false; + } + + Corrida corrida = corridaDAO.buscarPorId(new Corrida(corridaId, dataPadrao).getId()); + if(corrida != null){ + corridaDAO.editarCorridaPorOutraCorrida(corridas,corrida); + }else { + return false; + } + return true; + } + + public Integer buscarOcupacaoCorrida(Corrida corrida) { + return corridaDAO.buscarOcupacaoCorrida(corrida); + } + + @Override + public Corrida buscarPorId(Id id) { + // TODO Auto-generated method stub + return corridaDAO.buscarPorId(id); + } + + @Override + public Corrida buscarCorridaAtivaPorId(Id id) { + return corridaDAO.buscarCorridaAtivaPorId(id); + } + + private void generarCorridaInfo(Corrida corrida, EsquemaCorrida esquemaCorrida) { + + if(corrida != null && corrida.getId() != null && corrida.getId().getFeccorrida() != null && corrida.getId().getCorridaId() != null) { + + if(esquemaCorrida != null) { + + List lsEsquemaCorridaInfo = esquemaCorridaInfoService.obtenerPorEsquemaCorrida(esquemaCorrida); + + if(lsEsquemaCorridaInfo != null) { + + for (EsquemaCorridaInfo esquemaCorridaInfo : lsEsquemaCorridaInfo) { + + CorridaInfo corridaInfo = new CorridaInfo(); + corridaInfo.setOrigem(esquemaCorridaInfo.getOrigem()); + corridaInfo.setDestino(esquemaCorridaInfo.getDestino()); + corridaInfo.setCorrida(corrida); + corridaInfo.setInfoCorrida(esquemaCorridaInfo.getInfoCorrida()); + corridaInfoService.suscribir(corridaInfo); + } + } + + } + } + } + + public static void main(String[] args) { + Date dataInicialFiltroCorridaExistente = new Date(); + Date dataFinalFiltroCorridaExistente = DateUtil.somarDias(dataInicialFiltroCorridaExistente, 7); + + LocalDate inicioLocalDate = dataInicialFiltroCorridaExistente.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + LocalDate fimLocalDate = dataFinalFiltroCorridaExistente.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1); + for (LocalDate date = inicioLocalDate; date.isBefore(fimLocalDate); date = date.plusDays(1)) { + Date dataIter = Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant()); + DateFormat formatter = new SimpleDateFormat("EEE", new Locale("pt", "BR")); + String dia = formatter.format(dataIter); + System.out.println("Teste dia:" + dia); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java index dfd26bf34..490446b5d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CorridaTramoServiceImpl.java @@ -1,558 +1,558 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; - -import org.apache.commons.lang.math.NumberUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; -import com.rjconsultores.ventaboletos.dao.TramoTiempoDAO; -import com.rjconsultores.ventaboletos.entidad.Autobus; -import com.rjconsultores.ventaboletos.entidad.Ciudad; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Nodo; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.entidad.TramoServicio; -import com.rjconsultores.ventaboletos.entidad.TramoTiempo; -import com.rjconsultores.ventaboletos.service.BoletoService; -import com.rjconsultores.ventaboletos.service.CorridaService; -import com.rjconsultores.ventaboletos.service.CorridaTramoService; -import com.rjconsultores.ventaboletos.service.TramoServicioService; -import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.HoraSistema; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("corridaTramoService") -public class CorridaTramoServiceImpl implements CorridaTramoService { - - - Logger log; - - @Autowired - private TramoServicioService tramoServicioService; - - @Autowired - private CorridaService corridaService; - - @Autowired - BoletoService boletoService; - - public CorridaTramoServiceImpl() { - super(); - log = LogManager.getLogger(CorridaTramoServiceImpl.class); - } - - - @Autowired - private CorridaTramoDAO corridaTramoDAO; - - @Autowired - private TramoTiempoDAO tramoTiempoDAO; - - @Override - public List obtenerTodos() { - return corridaTramoDAO.obtenerTodos(); - } - - @Override - public CorridaTramo obtenerID(Integer id) { - return corridaTramoDAO.obtenerID(id); - } - - - @Transactional - public CorridaTramo suscribir(CorridaTramo entidad) { - return corridaTramoDAO.suscribir(entidad); - } - - @Override - @Transactional - public CorridaTramo actualizacion(CorridaTramo entidad) { - return corridaTramoDAO.actualizacion(entidad); - } - - @Override - public void borrar(CorridaTramo entidad) { - corridaTramoDAO.borrar(entidad); - } - - @Override - public List obtenerTramoTarjetaEmitida() { - return corridaTramoDAO.obtenerTramoTarjetaEmitida(); - } - - - - @Override - @Transactional - public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsEsquemaTramoOrignal, Date horaSalidaOriginal) { - List corridaTramoListAntigas = corridaTramoDAO.buscaCorridaTramoByFecCorridaECorridaId(dataCorrida, esquemaCorrida.getNumCorrida(), false); - //Caso encontre nas CorridaTramo existente algum trecho vendido que não está nas configurações do serviço retorna null - - boolean permiteRecriarCorridaTramo= !isPermiteAlterarHorarioCorridaComVendas() ? Boolean.TRUE : (isPermiteAlterarHorarioCorridaComVendas() && validarSeHorarioCorridaFoiAlterado(esquemaCorrida.getHorasalida(), horaSalidaOriginal)? Boolean.FALSE :Boolean.TRUE); - - if(permiteRecriarCorridaTramo) { - if(!validaTramoInexistenteServicoComVenda(esquemaCorrida, dataCorrida, lsEsquemaTramoOrignal, corridaTramoListAntigas)) { - return corridaTramoListAntigas; - }; - } - - inativaCorridasTramos(corridaTramoListAntigas); - - Date fechorSalidaOriginalH = null; - List lsCorridaTramoNovas = criaCorridaTramoList(esquemaCorrida.getAutoBus(), dataCorrida, fechorSalidaOriginalH,esquemaTramoNovoList, null, esquemaCorrida.getClaseServicio(), esquemaCorrida.getStatusCorrida()); - - if(corrida==null) { - corrida = new Corrida(esquemaCorrida.getNumCorrida(), dataCorrida); - } - for (CorridaTramo corridaTramo : lsCorridaTramoNovas) { - corridaTramo.setCorrida(corrida); - } - return lsCorridaTramoNovas; - - } - - /** - * Valida se existe alguma CorrridaTramo atualmente que contem venda e não está nas configurações de Serviço. - * @param esquemaCorrida - * @param dataCorrida - * @param lsParadaEsquemaOrignal - * @param corridaTramoListAntigas - * @return - */ - private boolean validaTramoInexistenteServicoComVenda(EsquemaCorrida esquemaCorrida, Date dataCorrida, - List lsParadaEsquemaOrignal, List corridaTramoListAntigas) { - List corridaTramoInexistenteList = new ArrayList(); - for (CorridaTramo corridaTramo : corridaTramoListAntigas) { - boolean isTrechoExiste = false; - for (EsquemaTramo esquemaTramo : lsParadaEsquemaOrignal) { - if(esquemaTramo.getTramo().getOrigem().equals(corridaTramo.getTramo().getOrigem()) && - esquemaTramo.getTramo().getDestino().equals(corridaTramo.getDestino())) { - isTrechoExiste = true; - break; - } - } - if(!isTrechoExiste) { - corridaTramoInexistenteList.add(corridaTramo); - } - } - for (CorridaTramo corridaTramo : corridaTramoInexistenteList) { - if(boletoService.isExisteBoletoPorCorridaOrigemIdOuDestinoId(esquemaCorrida.getNumCorrida(), dataCorrida, corridaTramo.getOrigem().getParadaId(), corridaTramo.getDestino().getParadaId())){ - return false; - } - - } - return true; - } - - - - /** - * Verifica se hay una excepcione de tiempo para el tramo informado. - * - * @param corridaTramo - * @param claseServicio - * @return - Si existe una excepcion, regresa la nueva fecLlegada para el tramo, sino, regreso null - */ - private Date arreglaExcepcionTiempo(CorridaTramo corridaTramo, ClaseServicio claseServicio) { - Date nuevaFecLlegada = null; - - Tramo tramo = corridaTramo.getTramo(); - - List lsExcepciones = tramoTiempoDAO.buscar(tramo, claseServicio, corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); - - if (!lsExcepciones.isEmpty()) { - TramoTiempo tramoTiempo = lsExcepciones.get(0); - List diasSemana = getDiaDeLaSemana(tramoTiempo); - - Calendar fecCorrida = Calendar.getInstance(); - fecCorrida.setTime(corridaTramo.getFechorllegada()); - - if (diasSemana.contains(fecCorrida.get(Calendar.DAY_OF_WEEK))) { - - Calendar fechorsalida = Calendar.getInstance(); - fechorsalida.setTime(corridaTramo.getFechorsalida()); - - HoraSistema horaSistema = new HoraSistema(tramoTiempo.getTiemporecorrido()); - - fechorsalida.add(Calendar.HOUR, horaSistema.getHora()); - fechorsalida.add(Calendar.MINUTE, horaSistema.getMinuto()); - - nuevaFecLlegada = fechorsalida.getTime(); - } - } - - return nuevaFecLlegada; - } - - - - private Date calcularFechorllegada(EsquemaTramo esquemaTramo, ClaseServicio clase, Date dataGeracao, Date horaChegada) { - GregorianCalendar gHoraChegada = new GregorianCalendar(); - gHoraChegada.setTime(horaChegada); - HoraSistema hs = null; - - if (esquemaTramo.getExcepcionRecorrido() != null) { - hs = new HoraSistema(esquemaTramo.getExcepcionRecorrido()); - - gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); - gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); - } else { - Tramo tramo = esquemaTramo.getTramo(); - List lsTramoServicio = tramoServicioService.buscarPorTramoServico(tramo, clase); - - for (TramoServicio ts : lsTramoServicio) { - hs = new HoraSistema(ts.getTiemporecorrido()); - - gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); - gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); - } - } - - return gHoraChegada.getTime(); - } - - private Calendar getCalendarFechorllegada(Date fecHorallegada) { - Calendar llegada = Calendar.getInstance(); - llegada.setTime(fecHorallegada); - llegada.set(llegada.get(Calendar.YEAR), llegada.get(Calendar.MONTH), llegada.get(Calendar.DATE), - llegada.get(Calendar.HOUR_OF_DAY), llegada.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); - return llegada; - } - - private Calendar getCalendarFechorSalida(Date fecHorSalida) { - Calendar salida = Calendar.getInstance(); - salida.setTime(fecHorSalida); - salida.set(salida.get(Calendar.YEAR), salida.get(Calendar.MONTH), salida.get(Calendar.DATE), - salida.get(Calendar.HOUR_OF_DAY), salida.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); - return salida; - } - private Date calcularHusoHorVeranoLlegada(EsquemaTramo esquemaTramo, CorridaTramo corridaTramo) { - - Ciudad ciudadOrigen = esquemaTramo.getTramo().getOrigem().getCiudad(); - Estado estadoOrigen = ciudadOrigen.getEstado(); - - int tiempoOrigen = estadoOrigen.getTiempoHorHuso() == null ? 0 : estadoOrigen.getTiempoHorHuso(); - - Date fecInicioHorVerano = estadoOrigen.getFecInicioHorVerano(); - Date fecFinHorVerano = estadoOrigen.getFecFinoHorVerano(); - - - - if ((fecInicioHorVerano != null) && (fecFinHorVerano != null)) { - if ((DateUtil.compareOnlyDate(fecInicioHorVerano, corridaTramo.getFechorsalida()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVerano, corridaTramo.getFechorsalida()) >= 0)) { - tiempoOrigen += estadoOrigen.getTiempoHorVerano(); - } - } - // 21688 - Ciudad ciudadDestino = esquemaTramo.getTramo().getDestino().getCiudad(); - Estado estadoDestino = ciudadDestino.getEstado(); - int tiempoDestino = 0; - - if (!estadoDestino.equals(estadoOrigen)) { - tiempoDestino = estadoDestino.getTiempoHorHuso() == null ? 0 : estadoDestino.getTiempoHorHuso(); - - - - Date fecInicioHorVeranoDestino = estadoDestino.getFecInicioHorVerano(); - Date fecFinHorVeranDestino = estadoDestino.getFecFinoHorVerano(); - - if ((fecInicioHorVeranoDestino != null) && (fecFinHorVeranDestino != null)) { - if ((DateUtil.compareOnlyDate(fecInicioHorVeranoDestino, corridaTramo.getFechorllegada()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVeranDestino, corridaTramo.getFechorllegada()) >= 0)) { - tiempoDestino += estadoDestino.getTiempoHorVerano(); - } - } - } else { - tiempoDestino =0; - tiempoOrigen=0; - } - - //Consideração do fuso por cidade. - //Nesse caso, é mandatório em relação ao estado.Ou seja, equanto que no fuso do estado, - //tem que haver Mudança de estado, para a cidade NÃO, pois pode-se considerar cada cidade - //como um único estado. Sendo assim, devendo ser considerado sempre quando preenchido - if ( (ciudadOrigen.getZonaHoraria() != null) && (ciudadOrigen.getZonaHoraria() != 0 )){ - log.info("Fuso da cidade origem " + ciudadOrigen.getNombciudad() + " : " + ciudadOrigen.getZonaHoraria()); - - tiempoOrigen += ciudadOrigen.getZonaHoraria(); - } - - if ( (ciudadDestino.getZonaHoraria() != null) && (ciudadDestino.getZonaHoraria() != 0 )){ - log.info("Fuso da cidade destino " + ciudadDestino.getNombciudad() + " : " + ciudadDestino.getZonaHoraria()); - - tiempoDestino += ciudadDestino.getZonaHoraria(); - } - //Fim consideração fuso por cidade - - Calendar horLlegada = null; - - long elapsedMinutes = DateUtil.getElapsedMinutos(corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); - - horLlegada = Calendar.getInstance(); - horLlegada.setTime(corridaTramo.getFechorsalidaH()); - - horLlegada.add(Calendar.MINUTE, (int) elapsedMinutes); - - // Si los tiempos son distintos, hube cambio de huso horario/horario de verano - if (tiempoOrigen != tiempoDestino) { - horLlegada.add(Calendar.HOUR, (tiempoDestino - tiempoOrigen)); - - } - - return (horLlegada == null) ? null : horLlegada.getTime(); - } - - - @SuppressWarnings("deprecation") - private Date calcularFechorsalida(EsquemaTramo esquemaTramo, Date dataGeracao, Date horaChegadaAnterior, java.util.Date tiempoEstanciaAnterior) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - Date horaSaida; - - if (horaChegadaAnterior == null) { - horaSaida = truncarDataHora(dataGeracao, esquemaTramo.getEsquemaCorrida().getHorasalida()); - } else { - GregorianCalendar gHoraSaidaProximo = new GregorianCalendar(); - gHoraSaidaProximo.setTime(horaChegadaAnterior); - - log.debug("Tempo Recorrido : " + sdf.format(gHoraSaidaProximo.getTime())); - - if (tiempoEstanciaAnterior != null) { - gHoraSaidaProximo.add(Calendar.MINUTE, tiempoEstanciaAnterior.getMinutes()); - gHoraSaidaProximo.add(Calendar.HOUR_OF_DAY, tiempoEstanciaAnterior.getHours()); - - log.debug("Tempo Recorrido + Estancia: " + sdf.format(gHoraSaidaProximo.getTime())); - } - - horaSaida = gHoraSaidaProximo.getTime(); - } - - GregorianCalendar gHoraSaida = new GregorianCalendar(); - gHoraSaida.setTime(horaSaida); - - return gHoraSaida.getTime(); - } - - - /** - * Adiciciona as horas do parametro hora na data dataGeracao. - * - * Alem disso eh zerado os campos segundos e milisegundos. - * - * @param dataGeracao - * @param hora - * @return - */ - private Date truncarDataHora(Date dataGeracao, Date hora) { - Date dataCorreta = new Date(); - - GregorianCalendar gAux = new GregorianCalendar(); - gAux.setTime(hora); - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(dataGeracao); - gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); - gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); - gcalendar.set(Calendar.SECOND, 0); - gcalendar.set(Calendar.MILLISECOND, 0); - - dataCorreta = gcalendar.getTime(); - - return dataCorreta; - } - - - - private void inativaCorridasTramos(List corridaTramoList) { - //Inativa corrida tramo - for (CorridaTramo corridaTramo : corridaTramoList) { - corridaTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - corridaTramo.setFecmodif(new Date()); - corridaTramo.setActivo(0); - corridaTramoDAO.suscribir(corridaTramo); - - } - } - - - private List getDiaDeLaSemana(TramoTiempo tramoTiempo) { - List diasValidos = new ArrayList(); - - if (tramoTiempo.getIndapliclun()) { - diasValidos.add(Calendar.MONDAY); - } - if (tramoTiempo.getIndaplicmar()) { - diasValidos.add(Calendar.TUESDAY); - } - if (tramoTiempo.getIndaplicmie()) { - diasValidos.add(Calendar.WEDNESDAY); - } - if (tramoTiempo.getIndaplicjue()) { - diasValidos.add(Calendar.THURSDAY); - } - if (tramoTiempo.getIndaplicvie()) { - diasValidos.add(Calendar.FRIDAY); - } - if (tramoTiempo.getIndaplicsab()) { - diasValidos.add(Calendar.SATURDAY); - } - if (tramoTiempo.getIndaplicdom()) { - diasValidos.add(Calendar.SUNDAY); - } - - return diasValidos; - } - - private List carregaParadaIdItinerario(List miListTramos) { - List paradasIdItinerario = new ArrayList(); - for (CorridaTramo corridaTramo : miListTramos) { - if (!paradasIdItinerario.contains(corridaTramo.getOrigem().getParadaId())) { - paradasIdItinerario.add(corridaTramo.getOrigem().getParadaId()); - } - if (!paradasIdItinerario.contains(corridaTramo.getDestino().getParadaId())) { - paradasIdItinerario.add(corridaTramo.getDestino().getParadaId()); - } - } - return paradasIdItinerario; - } - - @Override - public List criaCorridaTramoList(Autobus autobus, Date dataGeracao, Date fechorSalidaOriginalH , - List lsEsquemaTramo, Nodo nodo, ClaseServicio claseServicio, String statusCorrida) { - List lsCorridaTramo = new ArrayList(); - Date horaChegadaAnterior = null; - Date husoHorVeranoLlegadaAnterior = null; - Integer numSec = 1; - for (EsquemaTramo esquemaTramo : lsEsquemaTramo) { - - CorridaTramo corridaTramo = new CorridaTramo(); - - corridaTramo.setAutobus(autobus!= null ? autobus : null); - corridaTramo.setConductor(null); - corridaTramo.setConductor1(null); - corridaTramo.setPlataforma(esquemaTramo.getPlataforma()); - corridaTramo.setTipoPassagem(esquemaTramo.getTipoPassagem()); - - corridaTramo.setTiempoEstancia(esquemaTramo.getTiempoEstancia()); - - // numSec: 1-2, 2-3, 3-4... - corridaTramo.setNumsecorigen(numSec.shortValue()); - numSec = numSec + 1; - corridaTramo.setNumsecdestino(numSec.shortValue()); - - Date fecHorSalida = calcularFechorsalida(esquemaTramo, dataGeracao, horaChegadaAnterior, esquemaTramo.getTiempoEstancia()); - corridaTramo.setFechorsalida( getCalendarFechorSalida(fecHorSalida).getTime()); - - Date fecHorallegada = calcularFechorllegada(esquemaTramo, claseServicio, dataGeracao, fecHorSalida); - corridaTramo.setFechorllegada(getCalendarFechorllegada(fecHorallegada).getTime()); - - horaChegadaAnterior = fecHorallegada; - - corridaTramo.setFechortarjetaviaje(null); - corridaTramo.setNodo(nodo); - - corridaTramo.setNumsecuencia(esquemaTramo.getNumsecuencia()); - Tramo tramo = esquemaTramo.getTramo(); - if (tramo != null) { - corridaTramo.setOrigem(tramo.getOrigem()); - corridaTramo.setDestino(tramo.getDestino()); - } - corridaTramo.setTramo(tramo); - corridaTramo.setUsuariotarjetaviajeId(null); - - Date excepcionTiempo = arreglaExcepcionTiempo(corridaTramo, claseServicio); - if (excepcionTiempo != null) { - corridaTramo.setFechorllegada(excepcionTiempo); - horaChegadaAnterior = excepcionTiempo; - } - - if ("A".equals(statusCorrida)) { - corridaTramo.setActivo(ActivoUtil.ATIVO); - } else if ("L".equals(statusCorrida)) { - corridaTramo.setActivo(ActivoUtil.INATIVO); - } - // - corridaTramo.setFecmodif(Calendar.getInstance().getTime()); - if (UsuarioLogado.getUsuarioLogado() != null) { - corridaTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } - //corridaTramo.setCorrida(corrida); - corridaTramo.setFechorSalidaOriginal(fecHorSalida); - - if (husoHorVeranoLlegadaAnterior == null) { - corridaTramo.setFechorsalidaH(corridaTramo.getFechorsalida()); - } else { - - // Ajusta tambem o tempo de instancia do calculo do horario de verao - if (esquemaTramo.getTiempoEstancia() != null) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - GregorianCalendar tmp = new GregorianCalendar(); - tmp.setTime(husoHorVeranoLlegadaAnterior); - - tmp.add(Calendar.MINUTE, esquemaTramo.getTiempoEstancia().getMinutes()); - tmp.add(Calendar.HOUR_OF_DAY, esquemaTramo.getTiempoEstancia().getHours()); - - log.debug("Tempo Recorrido H + Estancia: " + sdf.format(tmp.getTime())); - - husoHorVeranoLlegadaAnterior = tmp.getTime(); - - } - - corridaTramo.setFechorsalidaH(husoHorVeranoLlegadaAnterior); - } - - husoHorVeranoLlegadaAnterior = calcularHusoHorVeranoLlegada(esquemaTramo, corridaTramo); - - if (husoHorVeranoLlegadaAnterior != null) { - corridaTramo.setFechorllegadaH(husoHorVeranoLlegadaAnterior); - corridaTramo.setFechorSalidaOriginalH(husoHorVeranoLlegadaAnterior); - } else { - corridaTramo.setFechorllegadaH(corridaTramo.getFechorllegada()); - corridaTramo.setFechorSalidaOriginalH(corridaTramo.getFechorSalidaOriginal()); - } - - if (numSec == 1) { - fechorSalidaOriginalH = corridaTramo.getFechorsalidaH(); - //corrida.setFechorSalidaOriginalH(corridaTramo.getFechorsalidaH()); - } - - lsCorridaTramo.add(corridaTramo); - - } - return lsCorridaTramo; - } - - private boolean validarSeHorarioCorridaFoiAlterado(Date horaSalidaAtual, Date horaSalidaOriginal) { - try { - if(DateUtil.isIgual(DateUtil.getDateFromString(DateUtil.getStringDate(horaSalidaAtual,DateUtil.HHmm), DateUtil.HHmm),DateUtil.getDateFromString(DateUtil.getStringDate(horaSalidaOriginal,DateUtil.HHmm), DateUtil.HHmm))) { - return Boolean.FALSE; - } - } catch (ParseException e) { - log.error("Erro ao fazer parse :"+e); - return Boolean.FALSE; - } - return Boolean.TRUE; - } - private boolean isPermiteAlterarHorarioCorridaComVendas() { - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_PERMITE_ALTERAR_HORARIO_CORRIDA_COM_VENDAS.getDescricao(), Boolean.FALSE)) { - return Boolean.TRUE; - } - return Boolean.FALSE; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; + +import org.apache.commons.lang.math.NumberUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; +import com.rjconsultores.ventaboletos.dao.TramoTiempoDAO; +import com.rjconsultores.ventaboletos.entidad.Autobus; +import com.rjconsultores.ventaboletos.entidad.Ciudad; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Nodo; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.entidad.TramoServicio; +import com.rjconsultores.ventaboletos.entidad.TramoTiempo; +import com.rjconsultores.ventaboletos.service.BoletoService; +import com.rjconsultores.ventaboletos.service.CorridaService; +import com.rjconsultores.ventaboletos.service.CorridaTramoService; +import com.rjconsultores.ventaboletos.service.TramoServicioService; +import com.rjconsultores.ventaboletos.utilerias.ActivoUtil; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.HoraSistema; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("corridaTramoService") +public class CorridaTramoServiceImpl implements CorridaTramoService { + + + Logger log; + + @Autowired + private TramoServicioService tramoServicioService; + + @Autowired + private CorridaService corridaService; + + @Autowired + BoletoService boletoService; + + public CorridaTramoServiceImpl() { + super(); + log = LogManager.getLogger(CorridaTramoServiceImpl.class); + } + + + @Autowired + private CorridaTramoDAO corridaTramoDAO; + + @Autowired + private TramoTiempoDAO tramoTiempoDAO; + + @Override + public List obtenerTodos() { + return corridaTramoDAO.obtenerTodos(); + } + + @Override + public CorridaTramo obtenerID(Integer id) { + return corridaTramoDAO.obtenerID(id); + } + + + @Transactional + public CorridaTramo suscribir(CorridaTramo entidad) { + return corridaTramoDAO.suscribir(entidad); + } + + @Override + @Transactional + public CorridaTramo actualizacion(CorridaTramo entidad) { + return corridaTramoDAO.actualizacion(entidad); + } + + @Override + public void borrar(CorridaTramo entidad) { + corridaTramoDAO.borrar(entidad); + } + + @Override + public List obtenerTramoTarjetaEmitida() { + return corridaTramoDAO.obtenerTramoTarjetaEmitida(); + } + + + + @Override + @Transactional + public List recriaCorridaTramo(EsquemaCorrida esquemaCorrida, Date dataCorrida, List esquemaTramoNovoList, Corrida corrida, List lsEsquemaTramoOrignal, Date horaSalidaOriginal) { + List corridaTramoListAntigas = corridaTramoDAO.buscaCorridaTramoByFecCorridaECorridaId(dataCorrida, esquemaCorrida.getNumCorrida(), false); + //Caso encontre nas CorridaTramo existente algum trecho vendido que não está nas configurações do serviço retorna null + + boolean permiteRecriarCorridaTramo= !isPermiteAlterarHorarioCorridaComVendas() ? Boolean.TRUE : (isPermiteAlterarHorarioCorridaComVendas() && validarSeHorarioCorridaFoiAlterado(esquemaCorrida.getHorasalida(), horaSalidaOriginal)? Boolean.FALSE :Boolean.TRUE); + + if(permiteRecriarCorridaTramo) { + if(!validaTramoInexistenteServicoComVenda(esquemaCorrida, dataCorrida, lsEsquemaTramoOrignal, corridaTramoListAntigas)) { + return corridaTramoListAntigas; + }; + } + + inativaCorridasTramos(corridaTramoListAntigas); + + Date fechorSalidaOriginalH = null; + List lsCorridaTramoNovas = criaCorridaTramoList(esquemaCorrida.getAutoBus(), dataCorrida, fechorSalidaOriginalH,esquemaTramoNovoList, null, esquemaCorrida.getClaseServicio(), esquemaCorrida.getStatusCorrida()); + + if(corrida==null) { + corrida = new Corrida(esquemaCorrida.getNumCorrida(), dataCorrida); + } + for (CorridaTramo corridaTramo : lsCorridaTramoNovas) { + corridaTramo.setCorrida(corrida); + } + return lsCorridaTramoNovas; + + } + + /** + * Valida se existe alguma CorrridaTramo atualmente que contem venda e não está nas configurações de Serviço. + * @param esquemaCorrida + * @param dataCorrida + * @param lsParadaEsquemaOrignal + * @param corridaTramoListAntigas + * @return + */ + private boolean validaTramoInexistenteServicoComVenda(EsquemaCorrida esquemaCorrida, Date dataCorrida, + List lsParadaEsquemaOrignal, List corridaTramoListAntigas) { + List corridaTramoInexistenteList = new ArrayList(); + for (CorridaTramo corridaTramo : corridaTramoListAntigas) { + boolean isTrechoExiste = false; + for (EsquemaTramo esquemaTramo : lsParadaEsquemaOrignal) { + if(esquemaTramo.getTramo().getOrigem().equals(corridaTramo.getTramo().getOrigem()) && + esquemaTramo.getTramo().getDestino().equals(corridaTramo.getDestino())) { + isTrechoExiste = true; + break; + } + } + if(!isTrechoExiste) { + corridaTramoInexistenteList.add(corridaTramo); + } + } + for (CorridaTramo corridaTramo : corridaTramoInexistenteList) { + if(boletoService.isExisteBoletoPorCorridaOrigemIdOuDestinoId(esquemaCorrida.getNumCorrida(), dataCorrida, corridaTramo.getOrigem().getParadaId(), corridaTramo.getDestino().getParadaId())){ + return false; + } + + } + return true; + } + + + + /** + * Verifica se hay una excepcione de tiempo para el tramo informado. + * + * @param corridaTramo + * @param claseServicio + * @return - Si existe una excepcion, regresa la nueva fecLlegada para el tramo, sino, regreso null + */ + private Date arreglaExcepcionTiempo(CorridaTramo corridaTramo, ClaseServicio claseServicio) { + Date nuevaFecLlegada = null; + + Tramo tramo = corridaTramo.getTramo(); + + List lsExcepciones = tramoTiempoDAO.buscar(tramo, claseServicio, corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); + + if (!lsExcepciones.isEmpty()) { + TramoTiempo tramoTiempo = lsExcepciones.get(0); + List diasSemana = getDiaDeLaSemana(tramoTiempo); + + Calendar fecCorrida = Calendar.getInstance(); + fecCorrida.setTime(corridaTramo.getFechorllegada()); + + if (diasSemana.contains(fecCorrida.get(Calendar.DAY_OF_WEEK))) { + + Calendar fechorsalida = Calendar.getInstance(); + fechorsalida.setTime(corridaTramo.getFechorsalida()); + + HoraSistema horaSistema = new HoraSistema(tramoTiempo.getTiemporecorrido()); + + fechorsalida.add(Calendar.HOUR, horaSistema.getHora()); + fechorsalida.add(Calendar.MINUTE, horaSistema.getMinuto()); + + nuevaFecLlegada = fechorsalida.getTime(); + } + } + + return nuevaFecLlegada; + } + + + + private Date calcularFechorllegada(EsquemaTramo esquemaTramo, ClaseServicio clase, Date dataGeracao, Date horaChegada) { + GregorianCalendar gHoraChegada = new GregorianCalendar(); + gHoraChegada.setTime(horaChegada); + HoraSistema hs = null; + + if (esquemaTramo.getExcepcionRecorrido() != null) { + hs = new HoraSistema(esquemaTramo.getExcepcionRecorrido()); + + gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); + gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); + } else { + Tramo tramo = esquemaTramo.getTramo(); + List lsTramoServicio = tramoServicioService.buscarPorTramoServico(tramo, clase); + + for (TramoServicio ts : lsTramoServicio) { + hs = new HoraSistema(ts.getTiemporecorrido()); + + gHoraChegada.add(Calendar.HOUR_OF_DAY, hs.getHora()); + gHoraChegada.add(Calendar.MINUTE, hs.getMinuto()); + } + } + + return gHoraChegada.getTime(); + } + + private Calendar getCalendarFechorllegada(Date fecHorallegada) { + Calendar llegada = Calendar.getInstance(); + llegada.setTime(fecHorallegada); + llegada.set(llegada.get(Calendar.YEAR), llegada.get(Calendar.MONTH), llegada.get(Calendar.DATE), + llegada.get(Calendar.HOUR_OF_DAY), llegada.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); + return llegada; + } + + private Calendar getCalendarFechorSalida(Date fecHorSalida) { + Calendar salida = Calendar.getInstance(); + salida.setTime(fecHorSalida); + salida.set(salida.get(Calendar.YEAR), salida.get(Calendar.MONTH), salida.get(Calendar.DATE), + salida.get(Calendar.HOUR_OF_DAY), salida.get(Calendar.MINUTE), NumberUtils.INTEGER_ZERO); + return salida; + } + private Date calcularHusoHorVeranoLlegada(EsquemaTramo esquemaTramo, CorridaTramo corridaTramo) { + + Ciudad ciudadOrigen = esquemaTramo.getTramo().getOrigem().getCiudad(); + Estado estadoOrigen = ciudadOrigen.getEstado(); + + int tiempoOrigen = estadoOrigen.getTiempoHorHuso() == null ? 0 : estadoOrigen.getTiempoHorHuso(); + + Date fecInicioHorVerano = estadoOrigen.getFecInicioHorVerano(); + Date fecFinHorVerano = estadoOrigen.getFecFinoHorVerano(); + + + + if ((fecInicioHorVerano != null) && (fecFinHorVerano != null)) { + if ((DateUtil.compareOnlyDate(fecInicioHorVerano, corridaTramo.getFechorsalida()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVerano, corridaTramo.getFechorsalida()) >= 0)) { + tiempoOrigen += estadoOrigen.getTiempoHorVerano(); + } + } + // 21688 + Ciudad ciudadDestino = esquemaTramo.getTramo().getDestino().getCiudad(); + Estado estadoDestino = ciudadDestino.getEstado(); + int tiempoDestino = 0; + + if (!estadoDestino.equals(estadoOrigen)) { + tiempoDestino = estadoDestino.getTiempoHorHuso() == null ? 0 : estadoDestino.getTiempoHorHuso(); + + + + Date fecInicioHorVeranoDestino = estadoDestino.getFecInicioHorVerano(); + Date fecFinHorVeranDestino = estadoDestino.getFecFinoHorVerano(); + + if ((fecInicioHorVeranoDestino != null) && (fecFinHorVeranDestino != null)) { + if ((DateUtil.compareOnlyDate(fecInicioHorVeranoDestino, corridaTramo.getFechorllegada()) <= 0) && (DateUtil.compareOnlyDate(fecFinHorVeranDestino, corridaTramo.getFechorllegada()) >= 0)) { + tiempoDestino += estadoDestino.getTiempoHorVerano(); + } + } + } else { + tiempoDestino =0; + tiempoOrigen=0; + } + + //Consideração do fuso por cidade. + //Nesse caso, é mandatório em relação ao estado.Ou seja, equanto que no fuso do estado, + //tem que haver Mudança de estado, para a cidade NÃO, pois pode-se considerar cada cidade + //como um único estado. Sendo assim, devendo ser considerado sempre quando preenchido + if ( (ciudadOrigen.getZonaHoraria() != null) && (ciudadOrigen.getZonaHoraria() != 0 )){ + log.info("Fuso da cidade origem " + ciudadOrigen.getNombciudad() + " : " + ciudadOrigen.getZonaHoraria()); + + tiempoOrigen += ciudadOrigen.getZonaHoraria(); + } + + if ( (ciudadDestino.getZonaHoraria() != null) && (ciudadDestino.getZonaHoraria() != 0 )){ + log.info("Fuso da cidade destino " + ciudadDestino.getNombciudad() + " : " + ciudadDestino.getZonaHoraria()); + + tiempoDestino += ciudadDestino.getZonaHoraria(); + } + //Fim consideração fuso por cidade + + Calendar horLlegada = null; + + long elapsedMinutes = DateUtil.getElapsedMinutos(corridaTramo.getFechorsalida(), corridaTramo.getFechorllegada()); + + horLlegada = Calendar.getInstance(); + horLlegada.setTime(corridaTramo.getFechorsalidaH()); + + horLlegada.add(Calendar.MINUTE, (int) elapsedMinutes); + + // Si los tiempos son distintos, hube cambio de huso horario/horario de verano + if (tiempoOrigen != tiempoDestino) { + horLlegada.add(Calendar.HOUR, (tiempoDestino - tiempoOrigen)); + + } + + return (horLlegada == null) ? null : horLlegada.getTime(); + } + + + @SuppressWarnings("deprecation") + private Date calcularFechorsalida(EsquemaTramo esquemaTramo, Date dataGeracao, Date horaChegadaAnterior, java.util.Date tiempoEstanciaAnterior) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + Date horaSaida; + + if (horaChegadaAnterior == null) { + horaSaida = truncarDataHora(dataGeracao, esquemaTramo.getEsquemaCorrida().getHorasalida()); + } else { + GregorianCalendar gHoraSaidaProximo = new GregorianCalendar(); + gHoraSaidaProximo.setTime(horaChegadaAnterior); + + log.debug("Tempo Recorrido : " + sdf.format(gHoraSaidaProximo.getTime())); + + if (tiempoEstanciaAnterior != null) { + gHoraSaidaProximo.add(Calendar.MINUTE, tiempoEstanciaAnterior.getMinutes()); + gHoraSaidaProximo.add(Calendar.HOUR_OF_DAY, tiempoEstanciaAnterior.getHours()); + + log.debug("Tempo Recorrido + Estancia: " + sdf.format(gHoraSaidaProximo.getTime())); + } + + horaSaida = gHoraSaidaProximo.getTime(); + } + + GregorianCalendar gHoraSaida = new GregorianCalendar(); + gHoraSaida.setTime(horaSaida); + + return gHoraSaida.getTime(); + } + + + /** + * Adiciciona as horas do parametro hora na data dataGeracao. + * + * Alem disso eh zerado os campos segundos e milisegundos. + * + * @param dataGeracao + * @param hora + * @return + */ + private Date truncarDataHora(Date dataGeracao, Date hora) { + Date dataCorreta = new Date(); + + GregorianCalendar gAux = new GregorianCalendar(); + gAux.setTime(hora); + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(dataGeracao); + gcalendar.set(Calendar.HOUR_OF_DAY, gAux.get(Calendar.HOUR_OF_DAY)); + gcalendar.set(Calendar.MINUTE, gAux.get(Calendar.MINUTE)); + gcalendar.set(Calendar.SECOND, 0); + gcalendar.set(Calendar.MILLISECOND, 0); + + dataCorreta = gcalendar.getTime(); + + return dataCorreta; + } + + + + private void inativaCorridasTramos(List corridaTramoList) { + //Inativa corrida tramo + for (CorridaTramo corridaTramo : corridaTramoList) { + corridaTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + corridaTramo.setFecmodif(new Date()); + corridaTramo.setActivo(0); + corridaTramoDAO.suscribir(corridaTramo); + + } + } + + + private List getDiaDeLaSemana(TramoTiempo tramoTiempo) { + List diasValidos = new ArrayList(); + + if (tramoTiempo.getIndapliclun()) { + diasValidos.add(Calendar.MONDAY); + } + if (tramoTiempo.getIndaplicmar()) { + diasValidos.add(Calendar.TUESDAY); + } + if (tramoTiempo.getIndaplicmie()) { + diasValidos.add(Calendar.WEDNESDAY); + } + if (tramoTiempo.getIndaplicjue()) { + diasValidos.add(Calendar.THURSDAY); + } + if (tramoTiempo.getIndaplicvie()) { + diasValidos.add(Calendar.FRIDAY); + } + if (tramoTiempo.getIndaplicsab()) { + diasValidos.add(Calendar.SATURDAY); + } + if (tramoTiempo.getIndaplicdom()) { + diasValidos.add(Calendar.SUNDAY); + } + + return diasValidos; + } + + private List carregaParadaIdItinerario(List miListTramos) { + List paradasIdItinerario = new ArrayList(); + for (CorridaTramo corridaTramo : miListTramos) { + if (!paradasIdItinerario.contains(corridaTramo.getOrigem().getParadaId())) { + paradasIdItinerario.add(corridaTramo.getOrigem().getParadaId()); + } + if (!paradasIdItinerario.contains(corridaTramo.getDestino().getParadaId())) { + paradasIdItinerario.add(corridaTramo.getDestino().getParadaId()); + } + } + return paradasIdItinerario; + } + + @Override + public List criaCorridaTramoList(Autobus autobus, Date dataGeracao, Date fechorSalidaOriginalH , + List lsEsquemaTramo, Nodo nodo, ClaseServicio claseServicio, String statusCorrida) { + List lsCorridaTramo = new ArrayList(); + Date horaChegadaAnterior = null; + Date husoHorVeranoLlegadaAnterior = null; + Integer numSec = 1; + for (EsquemaTramo esquemaTramo : lsEsquemaTramo) { + + CorridaTramo corridaTramo = new CorridaTramo(); + + corridaTramo.setAutobus(autobus!= null ? autobus : null); + corridaTramo.setConductor(null); + corridaTramo.setConductor1(null); + corridaTramo.setPlataforma(esquemaTramo.getPlataforma()); + corridaTramo.setTipoPassagem(esquemaTramo.getTipoPassagem()); + + corridaTramo.setTiempoEstancia(esquemaTramo.getTiempoEstancia()); + + // numSec: 1-2, 2-3, 3-4... + corridaTramo.setNumsecorigen(numSec.shortValue()); + numSec = numSec + 1; + corridaTramo.setNumsecdestino(numSec.shortValue()); + + Date fecHorSalida = calcularFechorsalida(esquemaTramo, dataGeracao, horaChegadaAnterior, esquemaTramo.getTiempoEstancia()); + corridaTramo.setFechorsalida( getCalendarFechorSalida(fecHorSalida).getTime()); + + Date fecHorallegada = calcularFechorllegada(esquemaTramo, claseServicio, dataGeracao, fecHorSalida); + corridaTramo.setFechorllegada(getCalendarFechorllegada(fecHorallegada).getTime()); + + horaChegadaAnterior = fecHorallegada; + + corridaTramo.setFechortarjetaviaje(null); + corridaTramo.setNodo(nodo); + + corridaTramo.setNumsecuencia(esquemaTramo.getNumsecuencia()); + Tramo tramo = esquemaTramo.getTramo(); + if (tramo != null) { + corridaTramo.setOrigem(tramo.getOrigem()); + corridaTramo.setDestino(tramo.getDestino()); + } + corridaTramo.setTramo(tramo); + corridaTramo.setUsuariotarjetaviajeId(null); + + Date excepcionTiempo = arreglaExcepcionTiempo(corridaTramo, claseServicio); + if (excepcionTiempo != null) { + corridaTramo.setFechorllegada(excepcionTiempo); + horaChegadaAnterior = excepcionTiempo; + } + + if ("A".equals(statusCorrida)) { + corridaTramo.setActivo(ActivoUtil.ATIVO); + } else if ("L".equals(statusCorrida)) { + corridaTramo.setActivo(ActivoUtil.INATIVO); + } + // + corridaTramo.setFecmodif(Calendar.getInstance().getTime()); + if (UsuarioLogado.getUsuarioLogado() != null) { + corridaTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } + //corridaTramo.setCorrida(corrida); + corridaTramo.setFechorSalidaOriginal(fecHorSalida); + + if (husoHorVeranoLlegadaAnterior == null) { + corridaTramo.setFechorsalidaH(corridaTramo.getFechorsalida()); + } else { + + // Ajusta tambem o tempo de instancia do calculo do horario de verao + if (esquemaTramo.getTiempoEstancia() != null) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + GregorianCalendar tmp = new GregorianCalendar(); + tmp.setTime(husoHorVeranoLlegadaAnterior); + + tmp.add(Calendar.MINUTE, esquemaTramo.getTiempoEstancia().getMinutes()); + tmp.add(Calendar.HOUR_OF_DAY, esquemaTramo.getTiempoEstancia().getHours()); + + log.debug("Tempo Recorrido H + Estancia: " + sdf.format(tmp.getTime())); + + husoHorVeranoLlegadaAnterior = tmp.getTime(); + + } + + corridaTramo.setFechorsalidaH(husoHorVeranoLlegadaAnterior); + } + + husoHorVeranoLlegadaAnterior = calcularHusoHorVeranoLlegada(esquemaTramo, corridaTramo); + + if (husoHorVeranoLlegadaAnterior != null) { + corridaTramo.setFechorllegadaH(husoHorVeranoLlegadaAnterior); + corridaTramo.setFechorSalidaOriginalH(husoHorVeranoLlegadaAnterior); + } else { + corridaTramo.setFechorllegadaH(corridaTramo.getFechorllegada()); + corridaTramo.setFechorSalidaOriginalH(corridaTramo.getFechorSalidaOriginal()); + } + + if (numSec == 1) { + fechorSalidaOriginalH = corridaTramo.getFechorsalidaH(); + //corrida.setFechorSalidaOriginalH(corridaTramo.getFechorsalidaH()); + } + + lsCorridaTramo.add(corridaTramo); + + } + return lsCorridaTramo; + } + + private boolean validarSeHorarioCorridaFoiAlterado(Date horaSalidaAtual, Date horaSalidaOriginal) { + try { + if(DateUtil.isIgual(DateUtil.getDateFromString(DateUtil.getStringDate(horaSalidaAtual,DateUtil.HHmm), DateUtil.HHmm),DateUtil.getDateFromString(DateUtil.getStringDate(horaSalidaOriginal,DateUtil.HHmm), DateUtil.HHmm))) { + return Boolean.FALSE; + } + } catch (ParseException e) { + log.error("Erro ao fazer parse :"+e); + return Boolean.FALSE; + } + return Boolean.TRUE; + } + private boolean isPermiteAlterarHorarioCorridaComVendas() { + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_PERMITE_ALTERAR_HORARIO_CORRIDA_COM_VENDAS.getDescricao(), Boolean.FALSE)) { + return Boolean.TRUE; + } + return Boolean.FALSE; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CortesiaBeneficiarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CortesiaBeneficiarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CortesiaBeneficiarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CortesiaBeneficiarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CortesiaDireccionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CortesiaDireccionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CortesiaDireccionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CortesiaDireccionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CortesiaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CortesiaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CortesiaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CortesiaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java index 119c82efb..174699085 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java @@ -1,97 +1,97 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CtrlFechamentoCaixaDAO; -import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; -import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; -import com.rjconsultores.ventaboletos.service.CtrlFechamentoCaixaService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -@Service("ctrlFechamentoCaixaService") -public class CtrlFechamentoCaixaServiceImpl implements CtrlFechamentoCaixaService { - - private static final Logger log = LogManager.getLogger(CtrlFechamentoCaixaServiceImpl.class); - - @Autowired - CtrlFechamentoCaixaDAO ctrlFechamentoCaixaDAO; - - @Override - public List obtenerTodos() { - return ctrlFechamentoCaixaDAO.obtenerTodos(); - } - - @Override - public CtrlFechamentoCaixa obtenerID(Long id) { - return ctrlFechamentoCaixaDAO.obtenerID(id); - } - - @Override - @Transactional - public CtrlFechamentoCaixa suscribir(CtrlFechamentoCaixa entidad) { - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad = ctrlFechamentoCaixaDAO.suscribir(entidad); - return entidad; - } - - @Override - @Transactional - public CtrlFechamentoCaixa actualizacion(CtrlFechamentoCaixa entidad) { - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad = ctrlFechamentoCaixaDAO.actualizacion(entidad); - return entidad; - } - - @Override - @Transactional - public void borrar(CtrlFechamentoCaixa entidad) { - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - ctrlFechamentoCaixaDAO.borrar(entidad); - } - - @Override - @Transactional - public boolean autorizarExecutarRotinaRetencao(Date feccorte) { - try { - String sFeccorte = DateUtil.getStringDate(feccorte, "dd/MM/yyyy"); - CtrlFechamentoCaixa ctrlFechamentoCaixa = ctrlFechamentoCaixaDAO.obtenerFeccorte(feccorte); - if(ctrlFechamentoCaixa == null) { - log.info("Nenhum controle de retencao foi localizado para data: " + sFeccorte); - } else if(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_EM_ANDAMENTO.equals(ctrlFechamentoCaixa.getStatus())) { - log.info("Retencao de comissao em andamento para data: " + sFeccorte); - } else if(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_CONCLUIDA.equals(ctrlFechamentoCaixa.getStatus())) { - log.info("Retencao de comissao concluida para data: " + sFeccorte); - } else if(CtrlFechamentoCaixaStatus.LIBERADO_RETENCAO_COMISSAO.equals(ctrlFechamentoCaixa.getStatus())) { - log.info("Retencao de comissao liberada para data: " + sFeccorte); - ctrlFechamentoCaixa.setStatus(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_EM_ANDAMENTO); - actualizacion(ctrlFechamentoCaixa); - return true; - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return false; - } - - @Override - @Transactional - public void atualizarCtrlFechamentoCaixaStatus(CtrlFechamentoCaixaStatus status, Date dataRetencao) { - try { - CtrlFechamentoCaixa ctrlFechamentoCaixa = ctrlFechamentoCaixaDAO.obtenerFeccorte(dataRetencao); - ctrlFechamentoCaixa.setStatus(status); - actualizacion(ctrlFechamentoCaixa); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CtrlFechamentoCaixaDAO; +import com.rjconsultores.ventaboletos.entidad.CtrlFechamentoCaixa; +import com.rjconsultores.ventaboletos.enums.CtrlFechamentoCaixaStatus; +import com.rjconsultores.ventaboletos.service.CtrlFechamentoCaixaService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +@Service("ctrlFechamentoCaixaService") +public class CtrlFechamentoCaixaServiceImpl implements CtrlFechamentoCaixaService { + + private static final Logger log = LogManager.getLogger(CtrlFechamentoCaixaServiceImpl.class); + + @Autowired + CtrlFechamentoCaixaDAO ctrlFechamentoCaixaDAO; + + @Override + public List obtenerTodos() { + return ctrlFechamentoCaixaDAO.obtenerTodos(); + } + + @Override + public CtrlFechamentoCaixa obtenerID(Long id) { + return ctrlFechamentoCaixaDAO.obtenerID(id); + } + + @Override + @Transactional + public CtrlFechamentoCaixa suscribir(CtrlFechamentoCaixa entidad) { + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad = ctrlFechamentoCaixaDAO.suscribir(entidad); + return entidad; + } + + @Override + @Transactional + public CtrlFechamentoCaixa actualizacion(CtrlFechamentoCaixa entidad) { + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad = ctrlFechamentoCaixaDAO.actualizacion(entidad); + return entidad; + } + + @Override + @Transactional + public void borrar(CtrlFechamentoCaixa entidad) { + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + ctrlFechamentoCaixaDAO.borrar(entidad); + } + + @Override + @Transactional + public boolean autorizarExecutarRotinaRetencao(Date feccorte) { + try { + String sFeccorte = DateUtil.getStringDate(feccorte, "dd/MM/yyyy"); + CtrlFechamentoCaixa ctrlFechamentoCaixa = ctrlFechamentoCaixaDAO.obtenerFeccorte(feccorte); + if(ctrlFechamentoCaixa == null) { + log.info("Nenhum controle de retencao foi localizado para data: " + sFeccorte); + } else if(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_EM_ANDAMENTO.equals(ctrlFechamentoCaixa.getStatus())) { + log.info("Retencao de comissao em andamento para data: " + sFeccorte); + } else if(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_CONCLUIDA.equals(ctrlFechamentoCaixa.getStatus())) { + log.info("Retencao de comissao concluida para data: " + sFeccorte); + } else if(CtrlFechamentoCaixaStatus.LIBERADO_RETENCAO_COMISSAO.equals(ctrlFechamentoCaixa.getStatus())) { + log.info("Retencao de comissao liberada para data: " + sFeccorte); + ctrlFechamentoCaixa.setStatus(CtrlFechamentoCaixaStatus.RETENCAO_COMISSAO_EM_ANDAMENTO); + actualizacion(ctrlFechamentoCaixa); + return true; + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return false; + } + + @Override + @Transactional + public void atualizarCtrlFechamentoCaixaStatus(CtrlFechamentoCaixaStatus status, Date dataRetencao) { + try { + CtrlFechamentoCaixa ctrlFechamentoCaixa = ctrlFechamentoCaixaDAO.obtenerFeccorte(dataRetencao); + ctrlFechamentoCaixa.setStatus(status); + actualizacion(ctrlFechamentoCaixa); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CuponConvenioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CuponConvenioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CuponConvenioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CuponConvenioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CuponSecretariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CuponSecretariaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CuponSecretariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CuponSecretariaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CursoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CursoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/CursoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CursoServiceImpl.java index f220813fb..604bee690 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CursoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CursoServiceImpl.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CursoDAO; -import com.rjconsultores.ventaboletos.entidad.Curso; -import com.rjconsultores.ventaboletos.service.CursoService; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("cursoService") -public class CursoServiceImpl implements CursoService { - - @Autowired - private CursoDAO CursoDAO; - - public List obtenerTodos() { - return CursoDAO.obtenerTodos(); - } - - public Curso obtenerID(Integer id) { - return CursoDAO.obtenerID(id); - } - - @Transactional - public Curso suscribir(Curso entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return CursoDAO.suscribir(entidad); - } - - @Transactional - public Curso actualizacion(Curso entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return CursoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(Curso entidad) throws RegistroConDependenciaException { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - CursoDAO.actualizacion(entidad); - } - - - public List buscar(String nomcurso){ - return CursoDAO.buscar(nomcurso); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CursoDAO; +import com.rjconsultores.ventaboletos.entidad.Curso; +import com.rjconsultores.ventaboletos.service.CursoService; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("cursoService") +public class CursoServiceImpl implements CursoService { + + @Autowired + private CursoDAO CursoDAO; + + public List obtenerTodos() { + return CursoDAO.obtenerTodos(); + } + + public Curso obtenerID(Integer id) { + return CursoDAO.obtenerID(id); + } + + @Transactional + public Curso suscribir(Curso entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return CursoDAO.suscribir(entidad); + } + + @Transactional + public Curso actualizacion(Curso entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return CursoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(Curso entidad) throws RegistroConDependenciaException { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + CursoDAO.actualizacion(entidad); + } + + + public List buscar(String nomcurso){ + return CursoDAO.buscar(nomcurso); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CustomServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CustomServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/CustomServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/CustomServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DepositoBancarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DepositoBancarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/DepositoBancarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DepositoBancarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DescontoComissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DescontoComissaoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/DescontoComissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DescontoComissaoServiceImpl.java index e1fa81cf3..f015a84b3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/DescontoComissaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DescontoComissaoServiceImpl.java @@ -1,73 +1,73 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.DescontoComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.DescontoComissao; -import com.rjconsultores.ventaboletos.service.DescontoComissaoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("descontoComissaoService") -public class DescontoComissaoServiceImpl implements DescontoComissaoService { - - @Autowired - private DescontoComissaoDAO descontoComissaoDAO; - - @Override - public List obtenerTodos() { - return descontoComissaoDAO.obtenerTodos(); - } - - @Override - public DescontoComissao obtenerID(Long id) { - return descontoComissaoDAO.obtenerID(id); - } - - @Override - public List buscaDescontoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo) { - return descontoComissaoDAO.buscaDescontoComissao(puntoVentaId, empresaId, inicioPeriodo, fimPeriodo); - } - - @Transactional - @Override - public DescontoComissao suscribir(DescontoComissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return descontoComissaoDAO.suscribir(entidad); - } - - @Transactional - @Override - public DescontoComissao actualizacion(DescontoComissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return descontoComissaoDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(DescontoComissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - descontoComissaoDAO.actualizacion(entidad); - } - - @Override - @Transactional - public DescontoComissao suscribirOrActualizacion(DescontoComissao entidad) { - return entidad != null && entidad.getDescontocomissaoId() == null ? suscribir(entidad) : actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.DescontoComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.DescontoComissao; +import com.rjconsultores.ventaboletos.service.DescontoComissaoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("descontoComissaoService") +public class DescontoComissaoServiceImpl implements DescontoComissaoService { + + @Autowired + private DescontoComissaoDAO descontoComissaoDAO; + + @Override + public List obtenerTodos() { + return descontoComissaoDAO.obtenerTodos(); + } + + @Override + public DescontoComissao obtenerID(Long id) { + return descontoComissaoDAO.obtenerID(id); + } + + @Override + public List buscaDescontoComissaoPeriodo(Integer puntoVentaId, Integer empresaId, Date inicioPeriodo, Date fimPeriodo) { + return descontoComissaoDAO.buscaDescontoComissao(puntoVentaId, empresaId, inicioPeriodo, fimPeriodo); + } + + @Transactional + @Override + public DescontoComissao suscribir(DescontoComissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return descontoComissaoDAO.suscribir(entidad); + } + + @Transactional + @Override + public DescontoComissao actualizacion(DescontoComissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return descontoComissaoDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(DescontoComissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + descontoComissaoDAO.actualizacion(entidad); + } + + @Override + @Transactional + public DescontoComissao suscribirOrActualizacion(DescontoComissao entidad) { + return entidad != null && entidad.getDescontocomissaoId() == null ? suscribir(entidad) : actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DetAbastoBoletoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DetAbastoBoletoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/DetAbastoBoletoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DetAbastoBoletoServiceImpl.java index f3a8c1a0f..6ebe432c4 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/DetAbastoBoletoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DetAbastoBoletoServiceImpl.java @@ -1,141 +1,141 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.DetAbastoBoletoDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.DetAbastoBoletoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("detAbastoBoletoService") -public class DetAbastoBoletoServiceImpl implements DetAbastoBoletoService { - - @Autowired - private DetAbastoBoletoDAO detAbastoBoletoDAO; - - @Override - public List obtenerTodos() { - return detAbastoBoletoDAO.obtenerTodos(); - } - - @Override - public DetAbastoBoleto obtenerID(Integer id) { - return detAbastoBoletoDAO.obtenerID(id); - } - - @Transactional - public DetAbastoBoleto suscribir(DetAbastoBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return detAbastoBoletoDAO.suscribir(entidad); - } - - @Transactional - public DetAbastoBoleto actualizacion(DetAbastoBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return detAbastoBoletoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(DetAbastoBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - detAbastoBoletoDAO.actualizacion(entidad); - } - - @Override - public Long getSecuencia() { - return detAbastoBoletoDAO.getSecuencia(); - } - - @Override - public void desabilitaDetAbastos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa) { - - List detAbastoBoletos = detAbastoBoletoDAO.buscaDetAbastoBoletos(origem, numfolioinicial, numfoliofinal, numseriepreimpresa); - - if (!detAbastoBoletos.isEmpty()) { - detAbastoBoletoDAO.desativaDetAbastos(detAbastoBoletos); - - DetAbastoBoleto detAbastoBoletoInicial = detAbastoBoletos.get(0); - detAbastoBoletoInicial.setNumfoliofinal(numfolioinicial); - detAbastoBoletoInicial.setActivo(Boolean.TRUE); - detAbastoBoletoDAO.actualizacion(detAbastoBoletoInicial); - - DetAbastoBoleto detAbastoBoletoFinal = detAbastoBoletos.get(detAbastoBoletos.size() - 1); - detAbastoBoletoFinal.setNumfolioinicial(numfoliofinal); - detAbastoBoletoFinal.setActivo(Boolean.TRUE); - detAbastoBoletoDAO.actualizacion(detAbastoBoletoFinal); - } - } - - @Override - public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa) { - return detAbastoBoletoDAO.buscabDetAbastoBoletoAutomatico(estacion, numseriepreimpresa); - } - - @Override - public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(Aidf aidf) { - return detAbastoBoletoDAO.buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(aidf); - } - - @Override - public DetAbastoBoleto movimentaDetAbasto( - DetAbastoBoleto detAbasto, - AbastoBoleto abasto, - String folioInicial, - String folioFinal) throws BusinessException { - - if( detAbasto == null ) { - throw new BusinessException("movimentacionBilhetesController.MSG.origemNaoEncontrada"); - } - - try { - DetAbastoBoleto novo = new DetAbastoBoleto(); - - novo.setAidf(detAbasto.getAidf()); - novo.setIndinutiliza(detAbasto.getIndinutiliza()); - novo.setNummovimiento(detAbasto.getNummovimiento()); - novo.setNumseriepreimpresa(detAbasto.getNumseriepreimpresa()); - novo.setStatusenvio(detAbasto.getStatusenvio()); - novo.setStatusfirma(detAbasto.getStatusfirma()); - novo.setStatusoperacion(detAbasto.getStatusoperacion()); - novo.setAbastoBoleto(abasto); - novo.setNumfolioinicial(folioInicial); - novo.setNumfoliofinal(folioFinal); - return novo; - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - - } - - @Override - public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVenta, String folioInicial, String folioFinal) { - return detAbastoBoletoDAO.buscarPorAidf(aidfId, puntoVenta, folioInicial, folioFinal); - } - - @Override - public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem) { - return detAbastoBoletoDAO.buscarAidfsPorEmpresaAgencia(empresa, origem); - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.DetAbastoBoletoDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.DetAbastoBoletoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("detAbastoBoletoService") +public class DetAbastoBoletoServiceImpl implements DetAbastoBoletoService { + + @Autowired + private DetAbastoBoletoDAO detAbastoBoletoDAO; + + @Override + public List obtenerTodos() { + return detAbastoBoletoDAO.obtenerTodos(); + } + + @Override + public DetAbastoBoleto obtenerID(Integer id) { + return detAbastoBoletoDAO.obtenerID(id); + } + + @Transactional + public DetAbastoBoleto suscribir(DetAbastoBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return detAbastoBoletoDAO.suscribir(entidad); + } + + @Transactional + public DetAbastoBoleto actualizacion(DetAbastoBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return detAbastoBoletoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(DetAbastoBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + detAbastoBoletoDAO.actualizacion(entidad); + } + + @Override + public Long getSecuencia() { + return detAbastoBoletoDAO.getSecuencia(); + } + + @Override + public void desabilitaDetAbastos(Estacion origem, String numfolioinicial, String numfoliofinal, String numseriepreimpresa) { + + List detAbastoBoletos = detAbastoBoletoDAO.buscaDetAbastoBoletos(origem, numfolioinicial, numfoliofinal, numseriepreimpresa); + + if (!detAbastoBoletos.isEmpty()) { + detAbastoBoletoDAO.desativaDetAbastos(detAbastoBoletos); + + DetAbastoBoleto detAbastoBoletoInicial = detAbastoBoletos.get(0); + detAbastoBoletoInicial.setNumfoliofinal(numfolioinicial); + detAbastoBoletoInicial.setActivo(Boolean.TRUE); + detAbastoBoletoDAO.actualizacion(detAbastoBoletoInicial); + + DetAbastoBoleto detAbastoBoletoFinal = detAbastoBoletos.get(detAbastoBoletos.size() - 1); + detAbastoBoletoFinal.setNumfolioinicial(numfoliofinal); + detAbastoBoletoFinal.setActivo(Boolean.TRUE); + detAbastoBoletoDAO.actualizacion(detAbastoBoletoFinal); + } + } + + @Override + public List buscabDetAbastoBoletoAutomatico(Estacion estacion, String numseriepreimpresa) { + return detAbastoBoletoDAO.buscabDetAbastoBoletoAutomatico(estacion, numseriepreimpresa); + } + + @Override + public List buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(Aidf aidf) { + return detAbastoBoletoDAO.buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(aidf); + } + + @Override + public DetAbastoBoleto movimentaDetAbasto( + DetAbastoBoleto detAbasto, + AbastoBoleto abasto, + String folioInicial, + String folioFinal) throws BusinessException { + + if( detAbasto == null ) { + throw new BusinessException("movimentacionBilhetesController.MSG.origemNaoEncontrada"); + } + + try { + DetAbastoBoleto novo = new DetAbastoBoleto(); + + novo.setAidf(detAbasto.getAidf()); + novo.setIndinutiliza(detAbasto.getIndinutiliza()); + novo.setNummovimiento(detAbasto.getNummovimiento()); + novo.setNumseriepreimpresa(detAbasto.getNumseriepreimpresa()); + novo.setStatusenvio(detAbasto.getStatusenvio()); + novo.setStatusfirma(detAbasto.getStatusfirma()); + novo.setStatusoperacion(detAbasto.getStatusoperacion()); + novo.setAbastoBoleto(abasto); + novo.setNumfolioinicial(folioInicial); + novo.setNumfoliofinal(folioFinal); + return novo; + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + + } + + @Override + public DetAbastoBoleto buscarPorAidf(Long aidfId, Integer puntoVenta, String folioInicial, String folioFinal) { + return detAbastoBoletoDAO.buscarPorAidf(aidfId, puntoVenta, folioInicial, folioFinal); + } + + @Override + public List buscarAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta origem) { + return detAbastoBoletoDAO.buscarAidfsPorEmpresaAgencia(empresa, origem); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DetDiagramaAutobusServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DetDiagramaAutobusServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/DetDiagramaAutobusServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DetDiagramaAutobusServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DiagramaAutobusServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DiagramaAutobusServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/DiagramaAutobusServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DiagramaAutobusServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DisponibilidadServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DisponibilidadServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/DisponibilidadServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DisponibilidadServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaHistoricoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaHistoricoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaHistoricoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaHistoricoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DispositivoEmbarcadaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/DivisionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DivisionServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/DivisionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DivisionServiceImpl.java index 5543b545c..4df426fca 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/DivisionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/DivisionServiceImpl.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.DivisionDAO; -import com.rjconsultores.ventaboletos.entidad.Division; -import com.rjconsultores.ventaboletos.service.DivisionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("divisionService") -public class DivisionServiceImpl implements DivisionService { - - @Autowired - private DivisionDAO divisionDAO; - - @Override - public List obtenerTodos() { - return divisionDAO.obtenerTodos(); - } - - @Override - public Division obtenerID(Integer id) { - return divisionDAO.obtenerID(id); - } - - @Override - @Transactional - public Division suscribir(Division entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return divisionDAO.suscribir(entidad); - } - - @Override - @Transactional - public Division actualizacion(Division entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return divisionDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(Division entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - divisionDAO.actualizacion(entidad); - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.DivisionDAO; +import com.rjconsultores.ventaboletos.entidad.Division; +import com.rjconsultores.ventaboletos.service.DivisionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("divisionService") +public class DivisionServiceImpl implements DivisionService { + + @Autowired + private DivisionDAO divisionDAO; + + @Override + public List obtenerTodos() { + return divisionDAO.obtenerTodos(); + } + + @Override + public Division obtenerID(Integer id) { + return divisionDAO.obtenerID(id); + } + + @Override + @Transactional + public Division suscribir(Division entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return divisionDAO.suscribir(entidad); + } + + @Override + @Transactional + public Division actualizacion(Division entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return divisionDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(Division entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + divisionDAO.actualizacion(entidad); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmbarcadaDispOperadorServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmbarcadaDispOperadorServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmbarcadaDispOperadorServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmbarcadaDispOperadorServiceImpl.java index 2b5fbaffb..159e15035 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmbarcadaDispOperadorServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmbarcadaDispOperadorServiceImpl.java @@ -1,73 +1,73 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmbarcadaDispOperadorDAO; -import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; -import com.rjconsultores.ventaboletos.service.EmbarcadaDispOperadorService; - -@Service("embarcadaDispOperadorService") -public class EmbarcadaDispOperadorServiceImpl implements EmbarcadaDispOperadorService { - - @Autowired - private EmbarcadaDispOperadorDAO embarcadaDispOperadorDAO; - @Override - public List obtenerTodos() { - return null; - } - - @Override - public EmbarcadaDispOperador obtenerID(Long id) { - return null; - } - - @Override - public EmbarcadaDispOperador suscribir(EmbarcadaDispOperador entidad) { - return null; - } - - @Override - public EmbarcadaDispOperador actualizacion(EmbarcadaDispOperador entidad) { - return null; - } - - @Override - public void borrar(EmbarcadaDispOperador entidad) { - - } - - @Override - public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId) { - return embarcadaDispOperadorDAO.buscarEmbarcadaDispOperadorPorDispositivo(dispositivoEmbarcadaId); - } - - @Override - public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId) { - return embarcadaDispOperadorDAO.buscarEmbarcadaDispOperadorPorPuntoVenta(puntoVentaId); - } - - @Override - public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList) { - return embarcadaDispOperadorDAO.removerListEmbarcadaDispOperador(embarcadaDisOperadorList); - - } - - @Transactional - @Override - public boolean inserirListEmbarcadaDispOperador(List embarcadaDisOperadorList) { - try { - embarcadaDispOperadorDAO.suscribirTodos(embarcadaDisOperadorList); - }catch (Exception e) { - return false; - } - return true; - } - - - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmbarcadaDispOperadorDAO; +import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; +import com.rjconsultores.ventaboletos.service.EmbarcadaDispOperadorService; + +@Service("embarcadaDispOperadorService") +public class EmbarcadaDispOperadorServiceImpl implements EmbarcadaDispOperadorService { + + @Autowired + private EmbarcadaDispOperadorDAO embarcadaDispOperadorDAO; + @Override + public List obtenerTodos() { + return null; + } + + @Override + public EmbarcadaDispOperador obtenerID(Long id) { + return null; + } + + @Override + public EmbarcadaDispOperador suscribir(EmbarcadaDispOperador entidad) { + return null; + } + + @Override + public EmbarcadaDispOperador actualizacion(EmbarcadaDispOperador entidad) { + return null; + } + + @Override + public void borrar(EmbarcadaDispOperador entidad) { + + } + + @Override + public List buscarEmbarcadaDispOperadorPorDispositivo(Long dispositivoEmbarcadaId) { + return embarcadaDispOperadorDAO.buscarEmbarcadaDispOperadorPorDispositivo(dispositivoEmbarcadaId); + } + + @Override + public List buscarEmbarcadaDispOperadorPorPuntoVenta(Long puntoVentaId) { + return embarcadaDispOperadorDAO.buscarEmbarcadaDispOperadorPorPuntoVenta(puntoVentaId); + } + + @Override + public boolean removerListEmbarcadaDispOperador(List embarcadaDisOperadorList) { + return embarcadaDispOperadorDAO.removerListEmbarcadaDispOperador(embarcadaDisOperadorList); + + } + + @Transactional + @Override + public boolean inserirListEmbarcadaDispOperador(List embarcadaDisOperadorList) { + try { + embarcadaDispOperadorDAO.suscribirTodos(embarcadaDisOperadorList); + }catch (Exception e) { + return false; + } + return true; + } + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmbarqueCatracaRodoviariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmbarqueCatracaRodoviariaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/EmbarqueCatracaRodoviariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmbarqueCatracaRodoviariaServiceImpl.java index 3ddc0774e..2939142d6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmbarqueCatracaRodoviariaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmbarqueCatracaRodoviariaServiceImpl.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmbarqueCatracaRodoviariaDAO; -import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; -import com.rjconsultores.ventaboletos.service.EmbarqueCatracaRodoviariaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("embarqueCatracaRodoviariaService") -public class EmbarqueCatracaRodoviariaServiceImpl implements EmbarqueCatracaRodoviariaService { - @Autowired - private EmbarqueCatracaRodoviariaDAO embarqueCatracaDAO; - - @Override - public List obtenerTodos() { - return embarqueCatracaDAO.obtenerTodos(); - } - - @Transactional - public EmbarqueCatracaRodoviaria suscribir(EmbarqueCatracaRodoviaria embarqueCatracaRodoviaria) { - embarqueCatracaRodoviaria.setFecModif(new Date()); - embarqueCatracaRodoviaria.setUsuario(UsuarioLogado.getUsuarioLogado()); - if (embarqueCatracaRodoviaria.getEmbarqueCatracaRodoviariaId() == null) { - return embarqueCatracaDAO.suscribir(embarqueCatracaRodoviaria); - } - return embarqueCatracaDAO.actualizacion(embarqueCatracaRodoviaria); - } - - @Transactional - public void borrar(EmbarqueCatracaRodoviaria entidad) { - entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); - entidad.setFecModif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - embarqueCatracaDAO.actualizacion(entidad); - } +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmbarqueCatracaRodoviariaDAO; +import com.rjconsultores.ventaboletos.entidad.EmbarqueCatracaRodoviaria; +import com.rjconsultores.ventaboletos.service.EmbarqueCatracaRodoviariaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("embarqueCatracaRodoviariaService") +public class EmbarqueCatracaRodoviariaServiceImpl implements EmbarqueCatracaRodoviariaService { + @Autowired + private EmbarqueCatracaRodoviariaDAO embarqueCatracaDAO; + + @Override + public List obtenerTodos() { + return embarqueCatracaDAO.obtenerTodos(); + } + + @Transactional + public EmbarqueCatracaRodoviaria suscribir(EmbarqueCatracaRodoviaria embarqueCatracaRodoviaria) { + embarqueCatracaRodoviaria.setFecModif(new Date()); + embarqueCatracaRodoviaria.setUsuario(UsuarioLogado.getUsuarioLogado()); + if (embarqueCatracaRodoviaria.getEmbarqueCatracaRodoviariaId() == null) { + return embarqueCatracaDAO.suscribir(embarqueCatracaRodoviaria); + } + return embarqueCatracaDAO.actualizacion(embarqueCatracaRodoviaria); + } + + @Transactional + public void borrar(EmbarqueCatracaRodoviaria entidad) { + entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); + entidad.setFecModif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + embarqueCatracaDAO.actualizacion(entidad); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpleadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpleadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpleadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpleadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAdyenConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAdyenConfigServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaAdyenConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAdyenConfigServiceImpl.java index 24167a78c..85b09e1c9 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAdyenConfigServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAdyenConfigServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaAdyenConfigDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; -import com.rjconsultores.ventaboletos.service.EmpresaAdyenConfigService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaAdyenConfigService") -public class EmpresaAdyenConfigServiceImpl implements EmpresaAdyenConfigService { - - @Autowired - private EmpresaAdyenConfigDAO empresaAdyenConfigDAO; - - @Override - public List obtenerTodos() { - return empresaAdyenConfigDAO.obtenerTodos(); - } - - @Override - public EmpresaAdyenConfig obtenerID(Integer id) { - return empresaAdyenConfigDAO.obtenerID(id); - } - - @Override - @Transactional - public EmpresaAdyenConfig suscribir(EmpresaAdyenConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaAdyenConfigDAO.suscribir(entidad); - } - - @Override - @Transactional - public EmpresaAdyenConfig actualizacion(EmpresaAdyenConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaAdyenConfigDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(EmpresaAdyenConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - empresaAdyenConfigDAO.actualizacion(entidad); - - } - - @Override - public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa) { - return empresaAdyenConfigDAO.buscarPorEmpresa(empresa); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaAdyenConfigDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaAdyenConfig; +import com.rjconsultores.ventaboletos.service.EmpresaAdyenConfigService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaAdyenConfigService") +public class EmpresaAdyenConfigServiceImpl implements EmpresaAdyenConfigService { + + @Autowired + private EmpresaAdyenConfigDAO empresaAdyenConfigDAO; + + @Override + public List obtenerTodos() { + return empresaAdyenConfigDAO.obtenerTodos(); + } + + @Override + public EmpresaAdyenConfig obtenerID(Integer id) { + return empresaAdyenConfigDAO.obtenerID(id); + } + + @Override + @Transactional + public EmpresaAdyenConfig suscribir(EmpresaAdyenConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaAdyenConfigDAO.suscribir(entidad); + } + + @Override + @Transactional + public EmpresaAdyenConfig actualizacion(EmpresaAdyenConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaAdyenConfigDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(EmpresaAdyenConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + empresaAdyenConfigDAO.actualizacion(entidad); + + } + + @Override + public EmpresaAdyenConfig buscarPorEmpresa(Empresa empresa) { + return empresaAdyenConfigDAO.buscarPorEmpresa(empresa); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAsistenciaDeViajeConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAsistenciaDeViajeConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaAsistenciaDeViajeConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaAsistenciaDeViajeConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCertificadoConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCertificadoConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaCertificadoConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCertificadoConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCieloLinkServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCieloLinkServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaCieloLinkServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCieloLinkServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaComprovantePassagemConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaComprovantePassagemConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaComprovantePassagemConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaComprovantePassagemConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaConfigLayoutServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaConfigLayoutServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaConfigLayoutServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaConfigLayoutServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaContaBancariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaContaBancariaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaContaBancariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaContaBancariaServiceImpl.java index b9992ff53..d57237b83 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaContaBancariaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaContaBancariaServiceImpl.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaContaBancariaDAO; -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.EmpresaContaBancariaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaContaBancariaService") -public class EmpresaContaBancariaServiceImpl implements EmpresaContaBancariaService { - - @Autowired - private EmpresaContaBancariaDAO empresaContaBancariaDAO; - - @Transactional - public EmpresaContaBancaria suscribirActualizacion(EmpresaContaBancaria entidad) throws BusinessException { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (entidad.getEmpresaContaBancariaId() == null) { - - entidad = empresaContaBancariaDAO.suscribir(entidad); - -// gerarMarca(entidad); - - } else { - entidad = empresaContaBancariaDAO.actualizacion(entidad); - } - - return entidad; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaContaBancariaDAO; +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.EmpresaContaBancariaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaContaBancariaService") +public class EmpresaContaBancariaServiceImpl implements EmpresaContaBancariaService { + + @Autowired + private EmpresaContaBancariaDAO empresaContaBancariaDAO; + + @Transactional + public EmpresaContaBancaria suscribirActualizacion(EmpresaContaBancaria entidad) throws BusinessException { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (entidad.getEmpresaContaBancariaId() == null) { + + entidad = empresaContaBancariaDAO.suscribir(entidad); + +// gerarMarca(entidad); + + } else { + entidad = empresaContaBancariaDAO.actualizacion(entidad); + } + + return entidad; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCrediBancoConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCrediBancoConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaCrediBancoConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaCrediBancoConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailConfigServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailConfigServiceImpl.java index b7c9f07aa..3f4da312b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailConfigServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailConfigServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailConfigDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; -import com.rjconsultores.ventaboletos.service.EmpresaEmailConfigService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaEmailConfigService") -public class EmpresaEmailConfigServiceImpl implements EmpresaEmailConfigService { - - @Autowired - private EmpresaEmailConfigDAO empresaEmailConfigDAO; - - @Override - public List obtenerTodos() { - return empresaEmailConfigDAO.obtenerTodos(); - } - - @Override - public EmpresaEmailConfig obtenerID(Integer id) { - return empresaEmailConfigDAO.obtenerID(id); - } - - @Override - @Transactional - public EmpresaEmailConfig suscribir(EmpresaEmailConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailConfigDAO.suscribir(entidad); - } - - @Override - @Transactional - public EmpresaEmailConfig actualizacion(EmpresaEmailConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailConfigDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(EmpresaEmailConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - empresaEmailConfigDAO.actualizacion(entidad); - - } - - @Override - public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa) { - return empresaEmailConfigDAO.buscarPorEmpresa(empresa); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailConfigDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailConfig; +import com.rjconsultores.ventaboletos.service.EmpresaEmailConfigService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaEmailConfigService") +public class EmpresaEmailConfigServiceImpl implements EmpresaEmailConfigService { + + @Autowired + private EmpresaEmailConfigDAO empresaEmailConfigDAO; + + @Override + public List obtenerTodos() { + return empresaEmailConfigDAO.obtenerTodos(); + } + + @Override + public EmpresaEmailConfig obtenerID(Integer id) { + return empresaEmailConfigDAO.obtenerID(id); + } + + @Override + @Transactional + public EmpresaEmailConfig suscribir(EmpresaEmailConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailConfigDAO.suscribir(entidad); + } + + @Override + @Transactional + public EmpresaEmailConfig actualizacion(EmpresaEmailConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailConfigDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(EmpresaEmailConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + empresaEmailConfigDAO.actualizacion(entidad); + + } + + @Override + public EmpresaEmailConfig buscarPorEmpresa(Empresa empresa) { + return empresaEmailConfigDAO.buscarPorEmpresa(empresa); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailEComerceServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailEComerceServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailEComerceServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailEComerceServiceImpl.java index 77c60d58d..13b4cdebb 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailEComerceServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailEComerceServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailEComerceDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; -import com.rjconsultores.ventaboletos.service.EmpresaEmailEComerceService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaEmailEComerceService") -public class EmpresaEmailEComerceServiceImpl implements EmpresaEmailEComerceService { - - @Autowired - private EmpresaEmailEComerceDAO empresaEmailEComerceDAO; - - @Override - public List obtenerTodos() { - return empresaEmailEComerceDAO.obtenerTodos(); - } - - @Override - public EmpresaEmailEComerce obtenerID(Integer id) { - return empresaEmailEComerceDAO.obtenerID(id); - } - - @Override - @Transactional - public EmpresaEmailEComerce suscribir(EmpresaEmailEComerce entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailEComerceDAO.suscribir(entidad); - } - - @Override - @Transactional - public EmpresaEmailEComerce actualizacion(EmpresaEmailEComerce entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailEComerceDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(EmpresaEmailEComerce entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - empresaEmailEComerceDAO.actualizacion(entidad); - - } - - @Override - public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao) { - return empresaEmailEComerceDAO.buscarPorEmpresa(empresa, tipoOperacao); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailEComerceDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailEComerce; +import com.rjconsultores.ventaboletos.service.EmpresaEmailEComerceService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaEmailEComerceService") +public class EmpresaEmailEComerceServiceImpl implements EmpresaEmailEComerceService { + + @Autowired + private EmpresaEmailEComerceDAO empresaEmailEComerceDAO; + + @Override + public List obtenerTodos() { + return empresaEmailEComerceDAO.obtenerTodos(); + } + + @Override + public EmpresaEmailEComerce obtenerID(Integer id) { + return empresaEmailEComerceDAO.obtenerID(id); + } + + @Override + @Transactional + public EmpresaEmailEComerce suscribir(EmpresaEmailEComerce entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailEComerceDAO.suscribir(entidad); + } + + @Override + @Transactional + public EmpresaEmailEComerce actualizacion(EmpresaEmailEComerce entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailEComerceDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(EmpresaEmailEComerce entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + empresaEmailEComerceDAO.actualizacion(entidad); + + } + + @Override + public EmpresaEmailEComerce buscarPorEmpresa(Empresa empresa, String tipoOperacao) { + return empresaEmailEComerceDAO.buscarPorEmpresa(empresa, tipoOperacao); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailFlexBusServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailFlexBusServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailFlexBusServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailFlexBusServiceImpl.java index 0f1acbebc..cac22e366 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailFlexBusServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailFlexBusServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailFlexBusDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; -import com.rjconsultores.ventaboletos.service.EmpresaEmailFlexBusService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaEmailFlexBUsService") -public class EmpresaEmailFlexBusServiceImpl implements EmpresaEmailFlexBusService { - - @Autowired - private EmpresaEmailFlexBusDAO empresaEmailDAO; - - @Override - public List obtenerTodos() { - return empresaEmailDAO.obtenerTodos(); - } - - @Override - public EmpresaEmailFlexBus obtenerID(Integer id) { - return empresaEmailDAO.obtenerID(id); - } - - @Override - @Transactional - public EmpresaEmailFlexBus suscribir(EmpresaEmailFlexBus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailDAO.suscribir(entidad); - } - - @Override - @Transactional - public EmpresaEmailFlexBus actualizacion(EmpresaEmailFlexBus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(EmpresaEmailFlexBus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - empresaEmailDAO.actualizacion(entidad); - - } - - @Override - public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa) { - return empresaEmailDAO.buscarPorEmpresa(empresa); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailFlexBusDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmailFlexBus; +import com.rjconsultores.ventaboletos.service.EmpresaEmailFlexBusService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaEmailFlexBUsService") +public class EmpresaEmailFlexBusServiceImpl implements EmpresaEmailFlexBusService { + + @Autowired + private EmpresaEmailFlexBusDAO empresaEmailDAO; + + @Override + public List obtenerTodos() { + return empresaEmailDAO.obtenerTodos(); + } + + @Override + public EmpresaEmailFlexBus obtenerID(Integer id) { + return empresaEmailDAO.obtenerID(id); + } + + @Override + @Transactional + public EmpresaEmailFlexBus suscribir(EmpresaEmailFlexBus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailDAO.suscribir(entidad); + } + + @Override + @Transactional + public EmpresaEmailFlexBus actualizacion(EmpresaEmailFlexBus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(EmpresaEmailFlexBus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + empresaEmailDAO.actualizacion(entidad); + + } + + @Override + public EmpresaEmailFlexBus buscarPorEmpresa(Empresa empresa) { + return empresaEmailDAO.buscarPorEmpresa(empresa); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailServiceImpl.java index fcd78c1ef..5590030ef 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEmailServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaEmailDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; -import com.rjconsultores.ventaboletos.service.EmpresaEmailService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaEmailService") -public class EmpresaEmailServiceImpl implements EmpresaEmailService { - - @Autowired - private EmpresaEmailDAO empresaEmailDAO; - - @Override - public List obtenerTodos() { - return empresaEmailDAO.obtenerTodos(); - } - - @Override - public EmpresaEmail obtenerID(Integer id) { - return empresaEmailDAO.obtenerID(id); - } - - @Override - @Transactional - public EmpresaEmail suscribir(EmpresaEmail entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailDAO.suscribir(entidad); - } - - @Override - @Transactional - public EmpresaEmail actualizacion(EmpresaEmail entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaEmailDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(EmpresaEmail entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - empresaEmailDAO.actualizacion(entidad); - - } - - @Override - public EmpresaEmail buscarPorEmpresa(Empresa empresa) { - return empresaEmailDAO.buscarPorEmpresa(empresa); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaEmailDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEmail; +import com.rjconsultores.ventaboletos.service.EmpresaEmailService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaEmailService") +public class EmpresaEmailServiceImpl implements EmpresaEmailService { + + @Autowired + private EmpresaEmailDAO empresaEmailDAO; + + @Override + public List obtenerTodos() { + return empresaEmailDAO.obtenerTodos(); + } + + @Override + public EmpresaEmail obtenerID(Integer id) { + return empresaEmailDAO.obtenerID(id); + } + + @Override + @Transactional + public EmpresaEmail suscribir(EmpresaEmail entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailDAO.suscribir(entidad); + } + + @Override + @Transactional + public EmpresaEmail actualizacion(EmpresaEmail entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaEmailDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(EmpresaEmail entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + empresaEmailDAO.actualizacion(entidad); + + } + + @Override + public EmpresaEmail buscarPorEmpresa(Empresa empresa) { + return empresaEmailDAO.buscarPorEmpresa(empresa); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEquivalenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEquivalenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaEquivalenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaEquivalenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaImpostoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaImpostoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaImpostoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaImpostoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaIziPayServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaIziPayServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaIziPayServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaIziPayServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaMercadoPagoConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaMercadoPagoConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaMercadoPagoConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaMercadoPagoConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaNequiConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaNequiConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaNequiConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaNequiConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaPMArtespConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaPMArtespConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaPMArtespConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaPMArtespConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaRecargaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaRecargaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaRecargaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaRecargaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSaferConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSaferConfigServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaSaferConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSaferConfigServiceImpl.java index e044ea039..9715e637b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSaferConfigServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSaferConfigServiceImpl.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaSaferConfigDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; -import com.rjconsultores.ventaboletos.service.EmpresaSaferConfigService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaSaferConfigService") -public class EmpresaSaferConfigServiceImpl implements EmpresaSaferConfigService { - - @Autowired - private EmpresaSaferConfigDAO empresaSaferConfigDAO; - - @Override - public List obtenerTodos() { - return empresaSaferConfigDAO.obtenerTodos(); - } - - @Override - public EmpresaSaferConfig obtenerID(Integer id) { - return empresaSaferConfigDAO.obtenerID(id); - } - - @Override - @Transactional - public EmpresaSaferConfig suscribir(EmpresaSaferConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaSaferConfigDAO.suscribir(entidad); - } - - @Override - @Transactional - public EmpresaSaferConfig actualizacion(EmpresaSaferConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return empresaSaferConfigDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(EmpresaSaferConfig entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - empresaSaferConfigDAO.actualizacion(entidad); - - } - - @Override - public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa) { - return empresaSaferConfigDAO.buscarPorEmpresa(empresa); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaSaferConfigDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaSaferConfig; +import com.rjconsultores.ventaboletos.service.EmpresaSaferConfigService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaSaferConfigService") +public class EmpresaSaferConfigServiceImpl implements EmpresaSaferConfigService { + + @Autowired + private EmpresaSaferConfigDAO empresaSaferConfigDAO; + + @Override + public List obtenerTodos() { + return empresaSaferConfigDAO.obtenerTodos(); + } + + @Override + public EmpresaSaferConfig obtenerID(Integer id) { + return empresaSaferConfigDAO.obtenerID(id); + } + + @Override + @Transactional + public EmpresaSaferConfig suscribir(EmpresaSaferConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaSaferConfigDAO.suscribir(entidad); + } + + @Override + @Transactional + public EmpresaSaferConfig actualizacion(EmpresaSaferConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return empresaSaferConfigDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(EmpresaSaferConfig entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + empresaSaferConfigDAO.actualizacion(entidad); + + } + + @Override + public EmpresaSaferConfig buscarPorEmpresa(Empresa empresa) { + return empresaSaferConfigDAO.buscarPorEmpresa(empresa); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSicfeConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSicfeConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaSicfeConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaSicfeConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaTrocoSimplesServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaTrocoSimplesServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/EmpresaTrocoSimplesServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaTrocoSimplesServiceImpl.java index 35bb2d833..baa0bfdb7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaTrocoSimplesServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EmpresaTrocoSimplesServiceImpl.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EmpresaTrocoSimplesDAO; -import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.EmpresaTrocoSimplesService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("empresaTrocoSimplesService") -public class EmpresaTrocoSimplesServiceImpl implements EmpresaTrocoSimplesService { - - @Autowired - private EmpresaTrocoSimplesDAO empresaTrocoDAO; - - @Transactional(rollbackFor = BusinessException.class) - @Override - public EmpresaTrocoSimples suscribirActualizar(EmpresaTrocoSimples empresaTroco) throws BusinessException { - - empresaTroco.setFecmodif(new Date()); - empresaTroco.setUsuario(UsuarioLogado.getUsuarioLogado()); - - if (empresaTroco.getEmpresaTrocoSimplesId() == null) { - empresaTroco = empresaTrocoDAO.suscribir(empresaTroco); - } else { - empresaTroco = empresaTrocoDAO.actualizacion(empresaTroco); - } - - return empresaTroco; - } - - @Transactional - @Override - public void apagar(EmpresaTrocoSimples empresaTroco) throws BusinessException { - empresaTrocoDAO.borrar(empresaTroco); - } - - @Override - public EmpresaTrocoSimples buscarEmpresaTrocoSimplesPorEmpresaId(Integer empresaID) { - return empresaTrocoDAO.buscarPorEmpresaId(empresaID); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EmpresaTrocoSimplesDAO; +import com.rjconsultores.ventaboletos.entidad.EmpresaTrocoSimples; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.EmpresaTrocoSimplesService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("empresaTrocoSimplesService") +public class EmpresaTrocoSimplesServiceImpl implements EmpresaTrocoSimplesService { + + @Autowired + private EmpresaTrocoSimplesDAO empresaTrocoDAO; + + @Transactional(rollbackFor = BusinessException.class) + @Override + public EmpresaTrocoSimples suscribirActualizar(EmpresaTrocoSimples empresaTroco) throws BusinessException { + + empresaTroco.setFecmodif(new Date()); + empresaTroco.setUsuario(UsuarioLogado.getUsuarioLogado()); + + if (empresaTroco.getEmpresaTrocoSimplesId() == null) { + empresaTroco = empresaTrocoDAO.suscribir(empresaTroco); + } else { + empresaTroco = empresaTrocoDAO.actualizacion(empresaTroco); + } + + return empresaTroco; + } + + @Transactional + @Override + public void apagar(EmpresaTrocoSimples empresaTroco) throws BusinessException { + empresaTrocoDAO.borrar(empresaTroco); + } + + @Override + public EmpresaTrocoSimples buscarEmpresaTrocoSimplesPorEmpresaId(Integer empresaID) { + return empresaTrocoDAO.buscarPorEmpresaId(empresaID); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EnderecoApanheServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EnderecoApanheServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EnderecoApanheServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EnderecoApanheServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EscolaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EscolaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EscolaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EscolaServiceImpl.java index 78faee18a..c0d29812c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EscolaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EscolaServiceImpl.java @@ -1,61 +1,61 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EscolaDAO; -import com.rjconsultores.ventaboletos.entidad.Ciudad; -import com.rjconsultores.ventaboletos.entidad.Escola; -import com.rjconsultores.ventaboletos.service.EscolaService; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("escolaService") -public class EscolaServiceImpl implements EscolaService { - - @Autowired - private EscolaDAO EscolaDAO; - public List obtenerTodos() { - return EscolaDAO.obtenerTodos(); - } - - public Escola obtenerID(Integer id) { - return EscolaDAO.obtenerID(id); - } - - @Transactional - public Escola suscribir(Escola entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return EscolaDAO.suscribir(entidad); - } - - @Transactional - public Escola actualizacion(Escola entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return EscolaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(Escola entidad) throws RegistroConDependenciaException { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - EscolaDAO.actualizacion(entidad); - } - - public List buscar(String nombEscola, Ciudad ciudad) { - return EscolaDAO.buscar(nombEscola, ciudad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EscolaDAO; +import com.rjconsultores.ventaboletos.entidad.Ciudad; +import com.rjconsultores.ventaboletos.entidad.Escola; +import com.rjconsultores.ventaboletos.service.EscolaService; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("escolaService") +public class EscolaServiceImpl implements EscolaService { + + @Autowired + private EscolaDAO EscolaDAO; + public List obtenerTodos() { + return EscolaDAO.obtenerTodos(); + } + + public Escola obtenerID(Integer id) { + return EscolaDAO.obtenerID(id); + } + + @Transactional + public Escola suscribir(Escola entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return EscolaDAO.suscribir(entidad); + } + + @Transactional + public Escola actualizacion(Escola entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return EscolaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(Escola entidad) throws RegistroConDependenciaException { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + EscolaDAO.actualizacion(entidad); + } + + public List buscar(String nombEscola, Ciudad ciudad) { + return EscolaDAO.buscar(nombEscola, ciudad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAgrupacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAgrupacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaAgrupacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAgrupacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAsientoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAsientoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaAsientoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAsientoServiceImpl.java index 2df27ebdf..619dd8b83 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAsientoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaAsientoServiceImpl.java @@ -1,245 +1,245 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.dao.EsquemaAsientoDAO; -import com.rjconsultores.ventaboletos.dao.RutaSecuenciaDAO; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.DetDiagramaAutobus; -import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; -import com.rjconsultores.ventaboletos.entidad.EsquemaAsiento; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.DiagramaAutobusService; -import com.rjconsultores.ventaboletos.service.EsquemaAsientoService; -import com.rjconsultores.ventaboletos.service.RutaSecuenciaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Rafius - */ -@Service("esquemaAsientoService") -public class EsquemaAsientoServiceImpl implements EsquemaAsientoService { - - private static Logger log = LogManager.getLogger(EsquemaAsientoServiceImpl.class); - private static final String BLOQUEO_EXCLUSIVO = "BLOQUEO_EXCLUSIVO"; - private static final String BLOQUEO_OCUPACION = "BLOQUEO_OCUPACION"; - - @Autowired - private EsquemaAsientoDAO esquemaAsientoDAO; - - @Autowired - private RutaSecuenciaDAO rutaSecuenciaDAO; - - @Autowired - private DiagramaAutobusService diagramaAutobusService; - - @Autowired - private RutaSecuenciaService rutaSecuenciaService; - - @Autowired - ConstanteService constanteService; - - private EsquemaAsiento suscribir(EsquemaAsiento entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return esquemaAsientoDAO.suscribir(entidad); - } - - @Transactional - public void borrar(EsquemaAsiento entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - esquemaAsientoDAO.actualizacion(entidad); - } - - public List obtenerPorCorrida(EsquemaCorrida esquemaCorrida) { - return esquemaAsientoDAO.obtenerPorCorrida(esquemaCorrida); - } - - public EsquemaAsiento obtenerPorCorridaeAsiento(EsquemaCorrida esquemaCorrida, String asiento) { - return esquemaAsientoDAO.obtenerPorCorridaeAsiento(esquemaCorrida, asiento); - } - - @Transactional(rollbackFor = BusinessException.class) - @Override - public void bloqueoAsientoExclusivo(EsquemaCorrida esquemaCorrida, String strAsiento, Parada origen, Parada destino, Integer tiempoLiberacion) throws BusinessException { - - if (origen == null) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.origenObligatoria"); - } - - hacerBloqueo(BLOQUEO_EXCLUSIVO, esquemaCorrida, strAsiento, origen, destino, null, tiempoLiberacion); - } - - private boolean hacerBloqueo(String tipoBloqueo, EsquemaCorrida esquemaCorrida, String strAsiento, Parada origen, Parada destino, String motivoOcupacion, Integer tiempoLiberacion) throws BusinessException { - List asientos = cargarAsientos(strAsiento); - - DiagramaAutobus da = diagramaAutobusService.obtenerID(esquemaCorrida.getRolOperativo().getDiagramaAutobus().getDiagramaautobusId()); - - for (String asiento : asientos) { - - boolean vende = true; - boolean existe = false; - List listDda = da.getDetDiagramaAutobusList(); - for (DetDiagramaAutobus dd : listDda) { - if (dd.getAsiento().equals(asiento)) { - existe = true; - if (!dd.getVendible()) { - vende = false; - } - } - } - if (!existe) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.invalido"); - } - - if (vende) { - - if (reviseAsientoBloqueado(asiento, esquemaCorrida, origen, destino)) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.poltronaJahConfigurada", new Object[] { asiento }); - } - - EsquemaAsiento es = new EsquemaAsiento(); - es.setActivo(Boolean.TRUE); - es.setFecmodif(Calendar.getInstance().getTime()); - es.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - es.setNumasiento(asiento.toString()); - es.setTiempoLiberacion(tiempoLiberacion); - - if (tipoBloqueo.equals(BLOQUEO_EXCLUSIVO)) { - es.setIndvendible(Boolean.TRUE); - es.setParada(origen); - } else { - es.setIndvendible(Boolean.FALSE); - es.setParada(origen); - es.setDestino(destino); - es.setMotivobloqueo(motivoOcupacion); - } - - es.setEsquemaCorrida(esquemaCorrida); - es = suscribir(es); - - // validação extra para garantir que salvou corretamente - if (tipoBloqueo.equals(BLOQUEO_EXCLUSIVO)) { - - if (!(es.getIndvendible() && (es.getParada() != null) && (es.getDestino() == null))) { - - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.validacionGrabacion"); - } - - } else { - // validação extra para garantir que salvou corretamente - if (!(!es.getIndvendible() && (es.getParada() != null) && (es.getDestino() != null))) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.validacionGrabacion"); - } - } - - } else { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.poltronaNoVendible", new Object[] { asiento }); - } - } - - return true; - } - - private boolean reviseAsientoBloqueado(String asiento, EsquemaCorrida esquemaCorrida, Parada origen, Parada destino) { - - List numSequenciaOcupada = rutaSecuenciaService.obtenerNumRutaSecuenciaOcupadaPorCorridaAsiento(esquemaCorrida, asiento); - List numSequenciaSeleccionado = rutaSecuenciaService.obtenerNumRutaSecuenciaPorCorridaOrigemDestino(esquemaCorrida, origen, destino); - for (Short numSequencia : numSequenciaSeleccionado) { - if (numSequenciaOcupada.contains(numSequencia.intValue())) { - return true; - } - } - - return false; - - } - - @Transactional(rollbackFor = BusinessException.class) - @Override - public void bloqueoAsientoOcupacion(EsquemaCorrida esquemaCorrida, String strAsiento, Parada origen, Parada destino, Integer tiempoLiberacion, String motivoOcupacion) throws BusinessException { - - if (origen == null) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.origenObligatoria"); - } - if (destino == null) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.destinoObligatoria"); - } - if (StringUtils.isBlank(motivoOcupacion)) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.motivo"); - } - - if (!rutaSecuenciaDAO.paradaSecuenciaValida(esquemaCorrida.getRuta(), origen, destino)) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.tramo"); - } - - hacerBloqueo(BLOQUEO_OCUPACION, esquemaCorrida, strAsiento, origen, destino, motivoOcupacion, tiempoLiberacion); - } - - /** - * Hace la conversion de la string strAsientos en una lista de asientos válidos
- * - * @param strAsientos - * @return - * @throws BusinessException - */ - private List cargarAsientos(String strAsientos) throws BusinessException { - List todosAsientos = new ArrayList(); - - try { - String asientos[] = strAsientos.split(","); - - for (int i = 0; i < asientos.length; i++) { - if (asientos[i].contains("-")) { - String intervalo[] = asientos[i].split("-"); - Integer ini = Integer.parseInt(intervalo[0]); - Integer fim = Integer.parseInt(intervalo[1]); - - while (ini <= fim) { - todosAsientos.add(ini.toString()); - ini++; - } - } else { - Constante constNumAsientoComLetra = constanteService.buscarPorNomeConstante(Constantes.NUM_ASIENTO_CON_LETRA); - if (!constNumAsientoComLetra.getValorconstante().equals("true")) { - Integer.parseInt(asientos[i]); - } - // para validar - todosAsientos.add(asientos[i]); - } - } - } catch (NumberFormatException t) { - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.invalido"); - } catch (Throwable t) { - log.error("", t); - - throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.invalido"); - } - - return todosAsientos; - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.dao.EsquemaAsientoDAO; +import com.rjconsultores.ventaboletos.dao.RutaSecuenciaDAO; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.DetDiagramaAutobus; +import com.rjconsultores.ventaboletos.entidad.DiagramaAutobus; +import com.rjconsultores.ventaboletos.entidad.EsquemaAsiento; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.service.DiagramaAutobusService; +import com.rjconsultores.ventaboletos.service.EsquemaAsientoService; +import com.rjconsultores.ventaboletos.service.RutaSecuenciaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Rafius + */ +@Service("esquemaAsientoService") +public class EsquemaAsientoServiceImpl implements EsquemaAsientoService { + + private static Logger log = LogManager.getLogger(EsquemaAsientoServiceImpl.class); + private static final String BLOQUEO_EXCLUSIVO = "BLOQUEO_EXCLUSIVO"; + private static final String BLOQUEO_OCUPACION = "BLOQUEO_OCUPACION"; + + @Autowired + private EsquemaAsientoDAO esquemaAsientoDAO; + + @Autowired + private RutaSecuenciaDAO rutaSecuenciaDAO; + + @Autowired + private DiagramaAutobusService diagramaAutobusService; + + @Autowired + private RutaSecuenciaService rutaSecuenciaService; + + @Autowired + ConstanteService constanteService; + + private EsquemaAsiento suscribir(EsquemaAsiento entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return esquemaAsientoDAO.suscribir(entidad); + } + + @Transactional + public void borrar(EsquemaAsiento entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + esquemaAsientoDAO.actualizacion(entidad); + } + + public List obtenerPorCorrida(EsquemaCorrida esquemaCorrida) { + return esquemaAsientoDAO.obtenerPorCorrida(esquemaCorrida); + } + + public EsquemaAsiento obtenerPorCorridaeAsiento(EsquemaCorrida esquemaCorrida, String asiento) { + return esquemaAsientoDAO.obtenerPorCorridaeAsiento(esquemaCorrida, asiento); + } + + @Transactional(rollbackFor = BusinessException.class) + @Override + public void bloqueoAsientoExclusivo(EsquemaCorrida esquemaCorrida, String strAsiento, Parada origen, Parada destino, Integer tiempoLiberacion) throws BusinessException { + + if (origen == null) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.origenObligatoria"); + } + + hacerBloqueo(BLOQUEO_EXCLUSIVO, esquemaCorrida, strAsiento, origen, destino, null, tiempoLiberacion); + } + + private boolean hacerBloqueo(String tipoBloqueo, EsquemaCorrida esquemaCorrida, String strAsiento, Parada origen, Parada destino, String motivoOcupacion, Integer tiempoLiberacion) throws BusinessException { + List asientos = cargarAsientos(strAsiento); + + DiagramaAutobus da = diagramaAutobusService.obtenerID(esquemaCorrida.getRolOperativo().getDiagramaAutobus().getDiagramaautobusId()); + + for (String asiento : asientos) { + + boolean vende = true; + boolean existe = false; + List listDda = da.getDetDiagramaAutobusList(); + for (DetDiagramaAutobus dd : listDda) { + if (dd.getAsiento().equals(asiento)) { + existe = true; + if (!dd.getVendible()) { + vende = false; + } + } + } + if (!existe) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.invalido"); + } + + if (vende) { + + if (reviseAsientoBloqueado(asiento, esquemaCorrida, origen, destino)) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.poltronaJahConfigurada", new Object[] { asiento }); + } + + EsquemaAsiento es = new EsquemaAsiento(); + es.setActivo(Boolean.TRUE); + es.setFecmodif(Calendar.getInstance().getTime()); + es.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + es.setNumasiento(asiento.toString()); + es.setTiempoLiberacion(tiempoLiberacion); + + if (tipoBloqueo.equals(BLOQUEO_EXCLUSIVO)) { + es.setIndvendible(Boolean.TRUE); + es.setParada(origen); + } else { + es.setIndvendible(Boolean.FALSE); + es.setParada(origen); + es.setDestino(destino); + es.setMotivobloqueo(motivoOcupacion); + } + + es.setEsquemaCorrida(esquemaCorrida); + es = suscribir(es); + + // validação extra para garantir que salvou corretamente + if (tipoBloqueo.equals(BLOQUEO_EXCLUSIVO)) { + + if (!(es.getIndvendible() && (es.getParada() != null) && (es.getDestino() == null))) { + + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.validacionGrabacion"); + } + + } else { + // validação extra para garantir que salvou corretamente + if (!(!es.getIndvendible() && (es.getParada() != null) && (es.getDestino() != null))) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.validacionGrabacion"); + } + } + + } else { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.poltronaNoVendible", new Object[] { asiento }); + } + } + + return true; + } + + private boolean reviseAsientoBloqueado(String asiento, EsquemaCorrida esquemaCorrida, Parada origen, Parada destino) { + + List numSequenciaOcupada = rutaSecuenciaService.obtenerNumRutaSecuenciaOcupadaPorCorridaAsiento(esquemaCorrida, asiento); + List numSequenciaSeleccionado = rutaSecuenciaService.obtenerNumRutaSecuenciaPorCorridaOrigemDestino(esquemaCorrida, origen, destino); + for (Short numSequencia : numSequenciaSeleccionado) { + if (numSequenciaOcupada.contains(numSequencia.intValue())) { + return true; + } + } + + return false; + + } + + @Transactional(rollbackFor = BusinessException.class) + @Override + public void bloqueoAsientoOcupacion(EsquemaCorrida esquemaCorrida, String strAsiento, Parada origen, Parada destino, Integer tiempoLiberacion, String motivoOcupacion) throws BusinessException { + + if (origen == null) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.origenObligatoria"); + } + if (destino == null) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.destinoObligatoria"); + } + if (StringUtils.isBlank(motivoOcupacion)) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.motivo"); + } + + if (!rutaSecuenciaDAO.paradaSecuenciaValida(esquemaCorrida.getRuta(), origen, destino)) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.tramo"); + } + + hacerBloqueo(BLOQUEO_OCUPACION, esquemaCorrida, strAsiento, origen, destino, motivoOcupacion, tiempoLiberacion); + } + + /** + * Hace la conversion de la string strAsientos en una lista de asientos válidos
+ * + * @param strAsientos + * @return + * @throws BusinessException + */ + private List cargarAsientos(String strAsientos) throws BusinessException { + List todosAsientos = new ArrayList(); + + try { + String asientos[] = strAsientos.split(","); + + for (int i = 0; i < asientos.length; i++) { + if (asientos[i].contains("-")) { + String intervalo[] = asientos[i].split("-"); + Integer ini = Integer.parseInt(intervalo[0]); + Integer fim = Integer.parseInt(intervalo[1]); + + while (ini <= fim) { + todosAsientos.add(ini.toString()); + ini++; + } + } else { + Constante constNumAsientoComLetra = constanteService.buscarPorNomeConstante(Constantes.NUM_ASIENTO_CON_LETRA); + if (!constNumAsientoComLetra.getValorconstante().equals("true")) { + Integer.parseInt(asientos[i]); + } + // para validar + todosAsientos.add(asientos[i]); + } + } + } catch (NumberFormatException t) { + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.invalido"); + } catch (Throwable t) { + log.error("", t); + + throw new BusinessException("editarConfiguracionCorridaAsientoController.MSG.invalido"); + } + + return todosAsientos; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaEmbarqueDesembarqueServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaEmbarqueDesembarqueServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaEmbarqueDesembarqueServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaEmbarqueDesembarqueServiceImpl.java index 85cbae6cb..f21d80e52 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaEmbarqueDesembarqueServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaEmbarqueDesembarqueServiceImpl.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.EsquemaCorridaEmbarqueDesembarqueDAO; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaEmbarqueDesembarque; -import com.rjconsultores.ventaboletos.service.EsquemaCorridaEmbarqueDesembarqueService; - -@Service("esquemaCorridaEmbarqueDesembarqueService") -public class EsquemaCorridaEmbarqueDesembarqueServiceImpl implements EsquemaCorridaEmbarqueDesembarqueService { - - @Autowired - private EsquemaCorridaEmbarqueDesembarqueDAO esquemaCorridaEmbarqueDesembarqueDAO; - - @Override - public List obtenerTodos() { - return esquemaCorridaEmbarqueDesembarqueDAO.obtenerTodos(); - } - - @Override - public EsquemaCorridaEmbarqueDesembarque obtenerID(Integer id) { - return esquemaCorridaEmbarqueDesembarqueDAO.obtenerID(id); - } - - @Transactional - @Override - public EsquemaCorridaEmbarqueDesembarque suscribir(EsquemaCorridaEmbarqueDesembarque entidad) { - return esquemaCorridaEmbarqueDesembarqueDAO.suscribir(entidad); - } - - @Transactional - @Override - public EsquemaCorridaEmbarqueDesembarque actualizacion(EsquemaCorridaEmbarqueDesembarque entidad) { - return esquemaCorridaEmbarqueDesembarqueDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(EsquemaCorridaEmbarqueDesembarque entidad) { - esquemaCorridaEmbarqueDesembarqueDAO.borrar(entidad); - } - - @Override - public List obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida) { - return esquemaCorridaEmbarqueDesembarqueDAO.obtenerPorEsquemaCorrida(esquemaCorrida); - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.EsquemaCorridaEmbarqueDesembarqueDAO; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorridaEmbarqueDesembarque; +import com.rjconsultores.ventaboletos.service.EsquemaCorridaEmbarqueDesembarqueService; + +@Service("esquemaCorridaEmbarqueDesembarqueService") +public class EsquemaCorridaEmbarqueDesembarqueServiceImpl implements EsquemaCorridaEmbarqueDesembarqueService { + + @Autowired + private EsquemaCorridaEmbarqueDesembarqueDAO esquemaCorridaEmbarqueDesembarqueDAO; + + @Override + public List obtenerTodos() { + return esquemaCorridaEmbarqueDesembarqueDAO.obtenerTodos(); + } + + @Override + public EsquemaCorridaEmbarqueDesembarque obtenerID(Integer id) { + return esquemaCorridaEmbarqueDesembarqueDAO.obtenerID(id); + } + + @Transactional + @Override + public EsquemaCorridaEmbarqueDesembarque suscribir(EsquemaCorridaEmbarqueDesembarque entidad) { + return esquemaCorridaEmbarqueDesembarqueDAO.suscribir(entidad); + } + + @Transactional + @Override + public EsquemaCorridaEmbarqueDesembarque actualizacion(EsquemaCorridaEmbarqueDesembarque entidad) { + return esquemaCorridaEmbarqueDesembarqueDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(EsquemaCorridaEmbarqueDesembarque entidad) { + esquemaCorridaEmbarqueDesembarqueDAO.borrar(entidad); + } + + @Override + public List obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida) { + return esquemaCorridaEmbarqueDesembarqueDAO.obtenerPorEsquemaCorrida(esquemaCorrida); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaInfoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaInfoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaInfoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaInfoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaOperacionalServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaOperacionalServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaOperacionalServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaOperacionalServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaTramoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaTramoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EsquemaTramoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EsquemaTramoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EstadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EstadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/EstadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EstadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EventoExtraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EventoExtraServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/EventoExtraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EventoExtraServiceImpl.java index 235d1eaa3..f0748af67 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EventoExtraServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/EventoExtraServiceImpl.java @@ -1,68 +1,68 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.dao.EventoExtraDAO; -import com.rjconsultores.ventaboletos.entidad.EventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.service.EventoExtraService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Administrador - */ -@Service("eventoExtraService") -public class EventoExtraServiceImpl implements EventoExtraService { - - @Autowired - private EventoExtraDAO eventoExtraDAO; - - public List obtenerTodos() { - return eventoExtraDAO.obtenerTodos(); - } - - public EventoExtra obtenerID(Integer id) { - return eventoExtraDAO.obtenerID(id); - } - - @Transactional - public EventoExtra suscribir(EventoExtra entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return eventoExtraDAO.suscribir(entidad); - } - - @Transactional - public EventoExtra actualizacion(EventoExtra entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return eventoExtraDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(EventoExtra entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - eventoExtraDAO.actualizacion(entidad); - } - - @Transactional - public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra){ - return eventoExtraDAO.obtenerPorTipo(tipoEventoExtra); - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.dao.EventoExtraDAO; +import com.rjconsultores.ventaboletos.entidad.EventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.service.EventoExtraService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Administrador + */ +@Service("eventoExtraService") +public class EventoExtraServiceImpl implements EventoExtraService { + + @Autowired + private EventoExtraDAO eventoExtraDAO; + + public List obtenerTodos() { + return eventoExtraDAO.obtenerTodos(); + } + + public EventoExtra obtenerID(Integer id) { + return eventoExtraDAO.obtenerID(id); + } + + @Transactional + public EventoExtra suscribir(EventoExtra entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return eventoExtraDAO.suscribir(entidad); + } + + @Transactional + public EventoExtra actualizacion(EventoExtra entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return eventoExtraDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(EventoExtra entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + eventoExtraDAO.actualizacion(entidad); + } + + @Transactional + public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra){ + return eventoExtraDAO.obtenerPorTipo(tipoEventoExtra); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionPeajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionPeajeServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ExcepcionPeajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionPeajeServiceImpl.java index ec9a594ae..1923463a2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionPeajeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionPeajeServiceImpl.java @@ -1,91 +1,91 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ExcepcionPeajeDAO; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; -import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; -import com.rjconsultores.ventaboletos.service.ExcepcionPeajeService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("excepcionPeajeService") -public class ExcepcionPeajeServiceImpl implements ExcepcionPeajeService { - - @Autowired - private ExcepcionPeajeDAO excepcionPeajeDAO; - - public ExcepcionPeaje obtenerID(Integer id) { - return excepcionPeajeDAO.obtenerID(id); - } - - public List obtenerTodos() { - return excepcionPeajeDAO.obtenerTodos(); - } - - public List buscar(String descconvenio, String cveconvenio){ - return new ArrayList(); - } - - @Transactional - public ExcepcionPeaje suscribir(ExcepcionPeaje entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return excepcionPeajeDAO.suscribir(entidad); - } - - @Transactional - public ExcepcionPeaje actualizacion(ExcepcionPeaje entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return excepcionPeajeDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ExcepcionPeaje entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - -// for (ConvenioDet cd : entidad.getConvenioDetList()) { -// cd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// cd.setFecmodif(Calendar.getInstance().getTime()); -// cd.setActivo(Boolean.FALSE); -// } -// -// for (ConvenioPuntoVenta cpv: entidad.getConvenioPuntoVentaList()) { -// cpv.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// cpv.setFecmodif(Calendar.getInstance().getTime()); -// cpv.setActivo(Boolean.FALSE); -// } -// -// for (ConvenioUsuario cu : entidad.getConvenioUsuarioList()) { -// cu.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// cu.setFecmodif(Calendar.getInstance().getTime()); -// cu.setActivo(Boolean.FALSE); -// } -// -// for (ConvenioTramo ct : entidad.getConvenioTramoList()) { -// ct.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// ct.setFecmodif(Calendar.getInstance().getTime()); -// ct.setActivo(Boolean.FALSE); -// } - - excepcionPeajeDAO.actualizacion(entidad); - } - - @Override - public void deletarVigencias(List epv) { - excepcionPeajeDAO.deletarVigencias(epv); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ExcepcionPeajeDAO; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeaje; +import com.rjconsultores.ventaboletos.entidad.ExcepcionPeajeVigencia; +import com.rjconsultores.ventaboletos.service.ExcepcionPeajeService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("excepcionPeajeService") +public class ExcepcionPeajeServiceImpl implements ExcepcionPeajeService { + + @Autowired + private ExcepcionPeajeDAO excepcionPeajeDAO; + + public ExcepcionPeaje obtenerID(Integer id) { + return excepcionPeajeDAO.obtenerID(id); + } + + public List obtenerTodos() { + return excepcionPeajeDAO.obtenerTodos(); + } + + public List buscar(String descconvenio, String cveconvenio){ + return new ArrayList(); + } + + @Transactional + public ExcepcionPeaje suscribir(ExcepcionPeaje entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return excepcionPeajeDAO.suscribir(entidad); + } + + @Transactional + public ExcepcionPeaje actualizacion(ExcepcionPeaje entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return excepcionPeajeDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ExcepcionPeaje entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + +// for (ConvenioDet cd : entidad.getConvenioDetList()) { +// cd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); +// cd.setFecmodif(Calendar.getInstance().getTime()); +// cd.setActivo(Boolean.FALSE); +// } +// +// for (ConvenioPuntoVenta cpv: entidad.getConvenioPuntoVentaList()) { +// cpv.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); +// cpv.setFecmodif(Calendar.getInstance().getTime()); +// cpv.setActivo(Boolean.FALSE); +// } +// +// for (ConvenioUsuario cu : entidad.getConvenioUsuarioList()) { +// cu.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); +// cu.setFecmodif(Calendar.getInstance().getTime()); +// cu.setActivo(Boolean.FALSE); +// } +// +// for (ConvenioTramo ct : entidad.getConvenioTramoList()) { +// ct.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); +// ct.setFecmodif(Calendar.getInstance().getTime()); +// ct.setActivo(Boolean.FALSE); +// } + + excepcionPeajeDAO.actualizacion(entidad); + } + + @Override + public void deletarVigencias(List epv) { + excepcionPeajeDAO.deletarVigencias(epv); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionRedondoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionRedondoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ExcepcionRedondoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ExcepcionRedondoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamgeralServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamgeralServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamgeralServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamgeralServiceImpl.java index 28df9c276..8f3ddb173 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamgeralServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamgeralServiceImpl.java @@ -1,82 +1,82 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FechamentoParamgeralDAO; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; -import com.rjconsultores.ventaboletos.service.FechamentoParamgeralService; - -@Service("fechamentoParamgeralService") -public class FechamentoParamgeralServiceImpl implements FechamentoParamgeralService { - - @Autowired - private FechamentoParamgeralDAO fechamentoParamgeralDAO; - - @Override - public List obtenerTodos() { - return fechamentoParamgeralDAO.obtenerTodos(); - } - - @Override - public FechamentoParamgeral obtenerID(Long id) { - return fechamentoParamgeralDAO.obtenerID(id); - } - - @Override - @Transactional - public FechamentoParamgeral suscribir(FechamentoParamgeral entidad) { - return fechamentoParamgeralDAO.suscribir(entidad); - } - - @Override - @Transactional - public FechamentoParamgeral actualizacion(FechamentoParamgeral entidad) { - return fechamentoParamgeralDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(FechamentoParamgeral entidad) { - fechamentoParamgeralDAO.borrar(entidad); - } - - - public Long count(String campo, Object o) { - return fechamentoParamgeralDAO.count(campo, o); - } - - @Override - public List buscaParametrosPorEmpresas(List empresasId) { - return fechamentoParamgeralDAO.buscaParametrosPorEmpresas(empresasId); - } - - @Override - public List buscaParametrosPorEmpresa(Integer empresasId) { - return fechamentoParamgeralDAO.buscaParametrosPorEmpresa(empresasId); - } - - @Override - @Transactional - public FechamentoParamgeral suscribirOrActualizacion(FechamentoParamgeral fechamentoParamgeral) { - if(fechamentoParamgeral != null && fechamentoParamgeral.getFechamentoparamgeralId() == null) { - return suscribir(fechamentoParamgeral); - } else if(fechamentoParamgeral != null && fechamentoParamgeral.getFechamentoparamgeralId() != null) { - return actualizacion(fechamentoParamgeral); - } - return null; - } - - @Override - public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresaId, String boletoBancoCod) { - return fechamentoParamgeralDAO.buscaParametrosPorEmpresasBanco(empresaId, boletoBancoCod); - } - - - - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FechamentoParamgeralDAO; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamgeral; +import com.rjconsultores.ventaboletos.service.FechamentoParamgeralService; + +@Service("fechamentoParamgeralService") +public class FechamentoParamgeralServiceImpl implements FechamentoParamgeralService { + + @Autowired + private FechamentoParamgeralDAO fechamentoParamgeralDAO; + + @Override + public List obtenerTodos() { + return fechamentoParamgeralDAO.obtenerTodos(); + } + + @Override + public FechamentoParamgeral obtenerID(Long id) { + return fechamentoParamgeralDAO.obtenerID(id); + } + + @Override + @Transactional + public FechamentoParamgeral suscribir(FechamentoParamgeral entidad) { + return fechamentoParamgeralDAO.suscribir(entidad); + } + + @Override + @Transactional + public FechamentoParamgeral actualizacion(FechamentoParamgeral entidad) { + return fechamentoParamgeralDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(FechamentoParamgeral entidad) { + fechamentoParamgeralDAO.borrar(entidad); + } + + + public Long count(String campo, Object o) { + return fechamentoParamgeralDAO.count(campo, o); + } + + @Override + public List buscaParametrosPorEmpresas(List empresasId) { + return fechamentoParamgeralDAO.buscaParametrosPorEmpresas(empresasId); + } + + @Override + public List buscaParametrosPorEmpresa(Integer empresasId) { + return fechamentoParamgeralDAO.buscaParametrosPorEmpresa(empresasId); + } + + @Override + @Transactional + public FechamentoParamgeral suscribirOrActualizacion(FechamentoParamgeral fechamentoParamgeral) { + if(fechamentoParamgeral != null && fechamentoParamgeral.getFechamentoparamgeralId() == null) { + return suscribir(fechamentoParamgeral); + } else if(fechamentoParamgeral != null && fechamentoParamgeral.getFechamentoparamgeralId() != null) { + return actualizacion(fechamentoParamgeral); + } + return null; + } + + @Override + public FechamentoParamgeral buscaParametrosPorEmpresasBanco(Integer empresaId, String boletoBancoCod) { + return fechamentoParamgeralDAO.buscaParametrosPorEmpresasBanco(empresaId, boletoBancoCod); + } + + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java index a2995d782..ade530da8 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java @@ -1,104 +1,104 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FechamentoParamptovtaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.FechamentoParamptovtaService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; - -@Service("fechamentoParamptovtaService") -public class FechamentoParamptovtaServiceImpl implements FechamentoParamptovtaService { - - @Autowired - private FechamentoParamptovtaDAO fechamentoParamptovtaDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - private static final Logger log = LogManager.getLogger(FechamentoParamptovtaServiceImpl.class); - - - @Override - public List obtenerTodos() { - return fechamentoParamptovtaDAO.obtenerTodos(); - } - - @Override - public FechamentoParamptovta obtenerID(Long id) { - - return fechamentoParamptovtaDAO.obtenerID(id); - - } - - @Override - @Transactional - public FechamentoParamptovta suscribir(FechamentoParamptovta entidad) { - - fechamentoParamptovtaDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - return entidad; - } - - @Override - @Transactional - public FechamentoParamptovta actualizacion(FechamentoParamptovta entidad) { - entidad.setFecmodif(new Date()); - FechamentoParamptovta originalClone = null; - fechamentoParamptovtaDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - return entidad; - } - - @Override - @Transactional - public void borrar(FechamentoParamptovta entidad) { - - fechamentoParamptovtaDAO.borrar(entidad); - logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - } - - - public Long count(String campo, Object o) { - return fechamentoParamptovtaDAO.count(campo, o); - } - - @Override - public List buscaParametrosPorEmpresas(List empresasId) { - return fechamentoParamptovtaDAO.buscaParametrosPorEmpresas(empresasId); - } - - @Override - public List buscaParametrosPorEmpresa(Integer empresasId) { - return fechamentoParamptovtaDAO.buscaParametrosPorEmpresa(empresasId); - } - - @Override - @Transactional - public FechamentoParamptovta suscribirOrActualizacion(FechamentoParamptovta FechamentoParamptovta) { - if(FechamentoParamptovta != null && FechamentoParamptovta.getFechamentoparamptovtaId() == null) { - return suscribir(FechamentoParamptovta); - } else if(FechamentoParamptovta != null && FechamentoParamptovta.getFechamentoparamptovtaId() != null) { - return actualizacion(FechamentoParamptovta); - } - return null; - } - - @Override - public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa) { - List params = fechamentoParamptovtaDAO.buscaParametrosPorPuntoventa(puntoventa); - return params; - } - - @Override - public FechamentoParamptovta buscaParametrosPorPuntoventaEmpresa(PuntoVenta puntoventa, Empresa empresa) { - return fechamentoParamptovtaDAO.buscaParametrosPorPuntoventa(puntoventa, empresa); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FechamentoParamptovtaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoParamptovta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.FechamentoParamptovtaService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; + +@Service("fechamentoParamptovtaService") +public class FechamentoParamptovtaServiceImpl implements FechamentoParamptovtaService { + + @Autowired + private FechamentoParamptovtaDAO fechamentoParamptovtaDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + private static final Logger log = LogManager.getLogger(FechamentoParamptovtaServiceImpl.class); + + + @Override + public List obtenerTodos() { + return fechamentoParamptovtaDAO.obtenerTodos(); + } + + @Override + public FechamentoParamptovta obtenerID(Long id) { + + return fechamentoParamptovtaDAO.obtenerID(id); + + } + + @Override + @Transactional + public FechamentoParamptovta suscribir(FechamentoParamptovta entidad) { + + fechamentoParamptovtaDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + return entidad; + } + + @Override + @Transactional + public FechamentoParamptovta actualizacion(FechamentoParamptovta entidad) { + entidad.setFecmodif(new Date()); + FechamentoParamptovta originalClone = null; + fechamentoParamptovtaDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + return entidad; + } + + @Override + @Transactional + public void borrar(FechamentoParamptovta entidad) { + + fechamentoParamptovtaDAO.borrar(entidad); + logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + } + + + public Long count(String campo, Object o) { + return fechamentoParamptovtaDAO.count(campo, o); + } + + @Override + public List buscaParametrosPorEmpresas(List empresasId) { + return fechamentoParamptovtaDAO.buscaParametrosPorEmpresas(empresasId); + } + + @Override + public List buscaParametrosPorEmpresa(Integer empresasId) { + return fechamentoParamptovtaDAO.buscaParametrosPorEmpresa(empresasId); + } + + @Override + @Transactional + public FechamentoParamptovta suscribirOrActualizacion(FechamentoParamptovta FechamentoParamptovta) { + if(FechamentoParamptovta != null && FechamentoParamptovta.getFechamentoparamptovtaId() == null) { + return suscribir(FechamentoParamptovta); + } else if(FechamentoParamptovta != null && FechamentoParamptovta.getFechamentoparamptovtaId() != null) { + return actualizacion(FechamentoParamptovta); + } + return null; + } + + @Override + public List buscaParametrosPorPuntoventa(PuntoVenta puntoventa) { + List params = fechamentoParamptovtaDAO.buscaParametrosPorPuntoventa(puntoventa); + return params; + } + + @Override + public FechamentoParamptovta buscaParametrosPorPuntoventaEmpresa(PuntoVenta puntoventa, Empresa empresa) { + return fechamentoParamptovtaDAO.buscaParametrosPorPuntoventa(puntoventa, empresa); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FeriadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FeriadoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/FeriadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FeriadoServiceImpl.java index 11f17b0b1..095e0264d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FeriadoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FeriadoServiceImpl.java @@ -1,77 +1,77 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.sql.Date; -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FeriadoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.Feriado; -import com.rjconsultores.ventaboletos.service.FeriadoService; -import com.rjconsultores.ventaboletos.utilerias.FeriadoCache; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("feriadoService") -public class FeriadoServiceImpl implements FeriadoService { - - @Autowired - private FeriadoDAO feriadoDAO; - - @Autowired - private FeriadoCache feriadoCache; - - public List obtenerTodos() { - return feriadoDAO.obtenerTodos(); - } - - public Feriado obtenerID(Integer id) { - return feriadoDAO.obtenerID(id); - } - - @Transactional - public Feriado suscribir(Feriado entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - feriadoCache.limparData(entidad.getFecferiado(), entidad.getEmpresa() == null ? null : entidad.getEmpresa().getEmpresaId(), entidad.getEstado() == null ? null : entidad.getEstado().getEstadoId()); - - return feriadoDAO.suscribir(entidad); - } - - @Transactional - public Feriado actualizacion(Feriado entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - feriadoCache.limparData(entidad.getFecferiado(), entidad.getEmpresa() == null ? null : entidad.getEmpresa().getEmpresaId(), entidad.getEstado() == null ? null : entidad.getEstado().getEstadoId()); - - return feriadoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(Feriado entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - feriadoCache.limparData(entidad.getFecferiado(), entidad.getEmpresa() == null ? null : entidad.getEmpresa().getEmpresaId(), entidad.getEstado() == null ? null : entidad.getEstado().getEstadoId()); - - feriadoDAO.actualizacion(entidad); - } - - public List buscar(Date fecferiado) { - return feriadoDAO.buscar(fecferiado); - } - - @Override - public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado) { - return feriadoDAO.buscarDataEmpresaEstado(data, empresa, estado); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.sql.Date; +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FeriadoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.Feriado; +import com.rjconsultores.ventaboletos.service.FeriadoService; +import com.rjconsultores.ventaboletos.utilerias.FeriadoCache; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("feriadoService") +public class FeriadoServiceImpl implements FeriadoService { + + @Autowired + private FeriadoDAO feriadoDAO; + + @Autowired + private FeriadoCache feriadoCache; + + public List obtenerTodos() { + return feriadoDAO.obtenerTodos(); + } + + public Feriado obtenerID(Integer id) { + return feriadoDAO.obtenerID(id); + } + + @Transactional + public Feriado suscribir(Feriado entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + feriadoCache.limparData(entidad.getFecferiado(), entidad.getEmpresa() == null ? null : entidad.getEmpresa().getEmpresaId(), entidad.getEstado() == null ? null : entidad.getEstado().getEstadoId()); + + return feriadoDAO.suscribir(entidad); + } + + @Transactional + public Feriado actualizacion(Feriado entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + feriadoCache.limparData(entidad.getFecferiado(), entidad.getEmpresa() == null ? null : entidad.getEmpresa().getEmpresaId(), entidad.getEstado() == null ? null : entidad.getEstado().getEstadoId()); + + return feriadoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(Feriado entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + feriadoCache.limparData(entidad.getFecferiado(), entidad.getEmpresa() == null ? null : entidad.getEmpresa().getEmpresaId(), entidad.getEstado() == null ? null : entidad.getEstado().getEstadoId()); + + feriadoDAO.actualizacion(entidad); + } + + public List buscar(Date fecferiado) { + return feriadoDAO.buscar(fecferiado); + } + + @Override + public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado) { + return feriadoDAO.buscarDataEmpresaEstado(data, empresa, estado); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalAliquotaEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalAliquotaEmpresaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/FiscalAliquotaEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalAliquotaEmpresaServiceImpl.java index 8436c1245..a54c5ef00 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalAliquotaEmpresaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalAliquotaEmpresaServiceImpl.java @@ -1,49 +1,49 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FiscalAliquotaEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.FiscalAliquotaEmpresa; -import com.rjconsultores.ventaboletos.service.FiscalAliquotaEmpresaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("fiscalAliquotaEmpresa") -public class FiscalAliquotaEmpresaServiceImpl implements FiscalAliquotaEmpresaService { - - @Autowired - private FiscalAliquotaEmpresaDAO fiscalAliquotaEmpresaDAO; - - public List obtenerTodos() { - return fiscalAliquotaEmpresaDAO.obtenerTodos(); - } - - public FiscalAliquotaEmpresa obtenerID(Integer id) { - return fiscalAliquotaEmpresaDAO.obtenerID(id); - } - - @Transactional - public FiscalAliquotaEmpresa suscribirActualizar(FiscalAliquotaEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (entidad.getFiscalAliquotaEmpresaId() == null) { - return fiscalAliquotaEmpresaDAO.suscribir(entidad); - } - return fiscalAliquotaEmpresaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(FiscalAliquotaEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - fiscalAliquotaEmpresaDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FiscalAliquotaEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.FiscalAliquotaEmpresa; +import com.rjconsultores.ventaboletos.service.FiscalAliquotaEmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("fiscalAliquotaEmpresa") +public class FiscalAliquotaEmpresaServiceImpl implements FiscalAliquotaEmpresaService { + + @Autowired + private FiscalAliquotaEmpresaDAO fiscalAliquotaEmpresaDAO; + + public List obtenerTodos() { + return fiscalAliquotaEmpresaDAO.obtenerTodos(); + } + + public FiscalAliquotaEmpresa obtenerID(Integer id) { + return fiscalAliquotaEmpresaDAO.obtenerID(id); + } + + @Transactional + public FiscalAliquotaEmpresa suscribirActualizar(FiscalAliquotaEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (entidad.getFiscalAliquotaEmpresaId() == null) { + return fiscalAliquotaEmpresaDAO.suscribir(entidad); + } + return fiscalAliquotaEmpresaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(FiscalAliquotaEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + fiscalAliquotaEmpresaDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraEstadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraEstadoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraEstadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraEstadoServiceImpl.java index 6aeb1f2bc..45b2c4057 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraEstadoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraEstadoServiceImpl.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FiscalImpressoraEstadoDAO; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; -import com.rjconsultores.ventaboletos.service.FiscalImpressoraEstadoService; - -@Service("fiscalImpressoraEstadoService") -public class FiscalImpressoraEstadoServiceImpl implements FiscalImpressoraEstadoService { - - @Autowired - FiscalImpressoraEstadoDAO fiscalImpressoraEstadoDAO; - - @Override - public List obtenerTodos() { - return fiscalImpressoraEstadoDAO.obtenerTodos(); - } - - @Override - public FiscalImpressoraEstado obtenerID(Integer id) { - return fiscalImpressoraEstadoDAO.obtenerID(id); - } - - @Override - @Transactional - public FiscalImpressoraEstado suscribir(FiscalImpressoraEstado entidad) { - return fiscalImpressoraEstadoDAO.suscribir(entidad); - } - - @Override - @Transactional - public FiscalImpressoraEstado actualizacion(FiscalImpressoraEstado entidad) { - return fiscalImpressoraEstadoDAO.actualizacion(entidad); - } - - @Override - public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) { - return fiscalImpressoraEstadoDAO.retornaEstadosFiscalImpressora(fiscalImpressora); - } - - @Override - @Transactional - public void borrar(FiscalImpressoraEstado entidad) { - fiscalImpressoraEstadoDAO.borrar(entidad); - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FiscalImpressoraEstadoDAO; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressoraEstado; +import com.rjconsultores.ventaboletos.service.FiscalImpressoraEstadoService; + +@Service("fiscalImpressoraEstadoService") +public class FiscalImpressoraEstadoServiceImpl implements FiscalImpressoraEstadoService { + + @Autowired + FiscalImpressoraEstadoDAO fiscalImpressoraEstadoDAO; + + @Override + public List obtenerTodos() { + return fiscalImpressoraEstadoDAO.obtenerTodos(); + } + + @Override + public FiscalImpressoraEstado obtenerID(Integer id) { + return fiscalImpressoraEstadoDAO.obtenerID(id); + } + + @Override + @Transactional + public FiscalImpressoraEstado suscribir(FiscalImpressoraEstado entidad) { + return fiscalImpressoraEstadoDAO.suscribir(entidad); + } + + @Override + @Transactional + public FiscalImpressoraEstado actualizacion(FiscalImpressoraEstado entidad) { + return fiscalImpressoraEstadoDAO.actualizacion(entidad); + } + + @Override + public List retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) { + return fiscalImpressoraEstadoDAO.retornaEstadosFiscalImpressora(fiscalImpressora); + } + + @Override + @Transactional + public void borrar(FiscalImpressoraEstado entidad) { + fiscalImpressoraEstadoDAO.borrar(entidad); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraServiceImpl.java index 4f32d90bf..86b28a1e3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalImpressoraServiceImpl.java @@ -1,261 +1,261 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FiscalImpressoraDAO; -import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; -import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; -import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.FiscalImpressoraService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("fiscalImpressoraService") -public class FiscalImpressoraServiceImpl implements FiscalImpressoraService { - - public enum TipoTotalizadorNaoFiscal { - - CancImpPost(false), - CartaoCredDeb(false), - CanPassagem(false), - VendaManual(false), - ImpressaoPost(false), - SeguroOpcional(true), - CancSeguroOpcional(true), - Multa(true), - DiferencaMaior(true), - DiferencaMenor(true), - CUSTOM(true); - - private final boolean temEE; - private TipoTotalizadorNaoFiscal(boolean pTemEE) { temEE = pTemEE; } - public boolean isTemEE() { - return temEE; - } - } - - public enum TipoFormaPagamento { - TotalCartao, - PtaAtendido, - TrocaPassagem, - Gratuidade, - CUSTOM; - } - public enum TipoRelatorioGerencial { - RelatorioGeral, - CupomEmbarque, - CupomEmbGratuidade, - IdentificacaoPafECF, - ManifestoFiscal, - ParametrosConfiguracao, - IdentificacaoIdaVolta, - RelatorioDavDiv - /*CUSTOM*/; - } - - @Autowired - FiscalImpressoraDAO fiscalImpressoraDAO; - - @Override - public List obtenerTodos() { - return fiscalImpressoraDAO.obtenerTodos(); - } - - @Override - public FiscalImpressora obtenerID(Integer id) { - return fiscalImpressoraDAO.obtenerID(id); - } - - @Override - @Transactional - public FiscalImpressora suscribir(FiscalImpressora entidad) { - return fiscalImpressoraDAO.suscribir(entidad); - } - - @Override - @Transactional - public FiscalImpressora actualizacion(FiscalImpressora entidad) { - return fiscalImpressoraDAO.actualizacion(entidad); - } - - @Override - public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId) { - return fiscalImpressoraDAO.buscarTotsNaoFiscaisEmpresa(empresaEcfId); - } - - @Override - public List buscarFormaPagoEmpresa(Integer empresaEcfId) { - return fiscalImpressoraDAO.buscarFormaPagoEmpresa(empresaEcfId); - } - - @Override - public List buscarItensRelgerencialEmpresa(Integer empresaEcfId) { - return fiscalImpressoraDAO.buscarItensRelgerencialEmpresa(empresaEcfId); - } - - @Override - public List obtenerTodosTotnaofiscalEmpresa() { - return fiscalImpressoraDAO.obtenerTodosTotnaofiscalEmpresa(); - } - - @Override - public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id) { - return fiscalImpressoraDAO.obtenerIDTotnaofiscalEmpresa(id); - } - - @Override - @Transactional - public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa totnaofiscalEmpresa) { - totnaofiscalEmpresa.setActivo(false); - totnaofiscalEmpresa.setFecmodif(Calendar.getInstance().getTime()); - totnaofiscalEmpresa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - fiscalImpressoraDAO.borrarTotnaofiscalEmpresa(totnaofiscalEmpresa); - } - - @Override - @Transactional(rollbackFor=BusinessException.class) - public FiscalTotnaofiscalEmpresa suscribirActualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) throws BusinessException { - entidad.setActivo(true); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - - FiscalTotnaofiscalEmpresa item = null; - - if (!TipoTotalizadorNaoFiscal.CUSTOM.toString().equals(entidad.getTipototalizador())){ - item = fiscalImpressoraDAO.buscarTotNaoFiscal(entidad.getEmpresa(), entidad.getTipototalizador()); - }else{ - if (entidad.getTipoeventoextra() == null){ - item = fiscalImpressoraDAO.buscarTotNaoFiscal(entidad.getEmpresa(), entidad.getTipototalizador(),entidad.getDescricao()); - }else{ - item = fiscalImpressoraDAO.buscarTotNaoFiscal(entidad.getEmpresa(), entidad.getTipototalizador(),entidad.getDescricao(),entidad.getTipoeventoextra()); - } - } - - if ( (entidad.getFiscaltotnaofiscalId() == null) && (item != null) ){ - throw new BusinessException("editarTotnaofiscalEmpresaController.MSG.erroTipoTotalizador"); - } - - if ( (entidad.getFiscaltotnaofiscalId() != null) && (item != null) && (!item.getFiscaltotnaofiscalId().equals(entidad.getFiscaltotnaofiscalId())) ){ - throw new BusinessException("editarTotnaofiscalEmpresaController.MSG.erroTipoTotalizador"); - } - if (entidad.getFiscaltotnaofiscalId() == null){ - return fiscalImpressoraDAO.suscribirTotnaofiscalEmpresa(entidad); - }else{ - return fiscalImpressoraDAO.actualizarTotnaofiscalEmpresa(entidad); - } - } - - @Override - public List obtenerTodosFormapagoEmpresa() { - return fiscalImpressoraDAO.obtenerTodosFormapagoEmpresa(); - } - - @Override - public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id) { - return fiscalImpressoraDAO.obtenerIDFormapagoEmpresa(id); - } - - @Override - @Transactional(rollbackFor=BusinessException.class) - public FiscalFormapagoEmpresa suscribirActualizarFormapagoEmpresa(FiscalFormapagoEmpresa entidad) throws BusinessException { - - FiscalFormapagoEmpresa item = null; - - if (!TipoFormaPagamento.CUSTOM.toString().equals(entidad.getTipoformapago())){ - item = fiscalImpressoraDAO.buscarFormaPago(entidad.getEmpresa(), entidad.getTipoformapago()); - }else{ - - //para o tipo CUSTOM, é necessário informar a forma de pagammetno. Se NÃO dá problema no sco de vendas - if (entidad.getFormaPago() == null){ - throw new BusinessException("editarFormapagoEmpresaController.MSG.formaPagoObligatoria"); - } - - item = fiscalImpressoraDAO.buscarFormaPago(entidad.getEmpresa(), entidad.getTipoformapago(),entidad.getDescricao()); - } - - if ( (entidad.getFiscalformapagoempresaId() == null) && (item != null) ){ - throw new BusinessException("editarFormapagoEmpresaController.MSG.erroTipoFormaPago"); - } - - if ( (entidad.getFiscalformapagoempresaId() != null) && (item != null) && (!item.getFiscalformapagoempresaId().equals(entidad.getFiscalformapagoempresaId())) ){ - throw new BusinessException("editarFormapagoEmpresaController.MSG.erroTipoFormaPago"); - } - - entidad.setActivo(true); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - if (entidad.getFiscalformapagoempresaId() == null){ - return fiscalImpressoraDAO.suscribirFormapagoEmpresa(entidad); - }else{ - return fiscalImpressoraDAO.actualizacionFormapagoEmpresa(entidad); - } - } - - @Override - @Transactional(rollbackFor=BusinessException.class) - public FiscalFormapagoEmpresa borrarFormapagoEmpresa(FiscalFormapagoEmpresa entidad) { - entidad.setActivo(false); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - return fiscalImpressoraDAO.actualizacionFormapagoEmpresa(entidad); - } - - @Override - public List obtenerTodosRelgerencialEmpresa() { - return fiscalImpressoraDAO.obtenerTodosRelgerencialEmpresa(); - } - - @Override - public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id) { - return fiscalImpressoraDAO.obtenerIDRelgerencialEmpresa(id); - } - - @Override - @Transactional - public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { - return fiscalImpressoraDAO.suscribirRelgerencialEmpresa(entidad); - } - - - @Override - @Transactional(rollbackFor=BusinessException.class) - public FiscalRelgerencialEmpresa suscribirActualizarRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) throws BusinessException { - - FiscalRelgerencialEmpresa item = null; - - item = fiscalImpressoraDAO.buscarRelGerencial(entidad.getEmpresa(), entidad.getTiporelgerencial()); - - if ( (entidad.getFiscalrelgerencialId() == null) && (item != null) ){ - throw new BusinessException("editarRelgerencialEmpresaController.MSG.erroTipoRelgerencial"); - } - - if ( (entidad.getFiscalrelgerencialId() != null) && (item != null) && (!item.getFiscalrelgerencialId().equals(entidad.getFiscalrelgerencialId())) ){ - throw new BusinessException("editarRelgerencialEmpresaController.MSG.erroTipoRelgerencial"); - } - - entidad.setActivo(true); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - if (entidad.getFiscalrelgerencialId() == null){ - return fiscalImpressoraDAO.suscribirRelgerencialEmpresa(entidad); - }else{ - return fiscalImpressoraDAO.actualizacionRelgerencialEmpresa(entidad); - } - } - - - @Override - @Transactional - public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { - return fiscalImpressoraDAO.actualizacionRelgerencialEmpresa(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FiscalImpressoraDAO; +import com.rjconsultores.ventaboletos.entidad.FiscalFormapagoEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalImpressora; +import com.rjconsultores.ventaboletos.entidad.FiscalRelgerencialEmpresa; +import com.rjconsultores.ventaboletos.entidad.FiscalTotnaofiscalEmpresa; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.FiscalImpressoraService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("fiscalImpressoraService") +public class FiscalImpressoraServiceImpl implements FiscalImpressoraService { + + public enum TipoTotalizadorNaoFiscal { + + CancImpPost(false), + CartaoCredDeb(false), + CanPassagem(false), + VendaManual(false), + ImpressaoPost(false), + SeguroOpcional(true), + CancSeguroOpcional(true), + Multa(true), + DiferencaMaior(true), + DiferencaMenor(true), + CUSTOM(true); + + private final boolean temEE; + private TipoTotalizadorNaoFiscal(boolean pTemEE) { temEE = pTemEE; } + public boolean isTemEE() { + return temEE; + } + } + + public enum TipoFormaPagamento { + TotalCartao, + PtaAtendido, + TrocaPassagem, + Gratuidade, + CUSTOM; + } + public enum TipoRelatorioGerencial { + RelatorioGeral, + CupomEmbarque, + CupomEmbGratuidade, + IdentificacaoPafECF, + ManifestoFiscal, + ParametrosConfiguracao, + IdentificacaoIdaVolta, + RelatorioDavDiv + /*CUSTOM*/; + } + + @Autowired + FiscalImpressoraDAO fiscalImpressoraDAO; + + @Override + public List obtenerTodos() { + return fiscalImpressoraDAO.obtenerTodos(); + } + + @Override + public FiscalImpressora obtenerID(Integer id) { + return fiscalImpressoraDAO.obtenerID(id); + } + + @Override + @Transactional + public FiscalImpressora suscribir(FiscalImpressora entidad) { + return fiscalImpressoraDAO.suscribir(entidad); + } + + @Override + @Transactional + public FiscalImpressora actualizacion(FiscalImpressora entidad) { + return fiscalImpressoraDAO.actualizacion(entidad); + } + + @Override + public List buscarTotsNaoFiscaisEmpresa(Integer empresaEcfId) { + return fiscalImpressoraDAO.buscarTotsNaoFiscaisEmpresa(empresaEcfId); + } + + @Override + public List buscarFormaPagoEmpresa(Integer empresaEcfId) { + return fiscalImpressoraDAO.buscarFormaPagoEmpresa(empresaEcfId); + } + + @Override + public List buscarItensRelgerencialEmpresa(Integer empresaEcfId) { + return fiscalImpressoraDAO.buscarItensRelgerencialEmpresa(empresaEcfId); + } + + @Override + public List obtenerTodosTotnaofiscalEmpresa() { + return fiscalImpressoraDAO.obtenerTodosTotnaofiscalEmpresa(); + } + + @Override + public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id) { + return fiscalImpressoraDAO.obtenerIDTotnaofiscalEmpresa(id); + } + + @Override + @Transactional + public void borrarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa totnaofiscalEmpresa) { + totnaofiscalEmpresa.setActivo(false); + totnaofiscalEmpresa.setFecmodif(Calendar.getInstance().getTime()); + totnaofiscalEmpresa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + fiscalImpressoraDAO.borrarTotnaofiscalEmpresa(totnaofiscalEmpresa); + } + + @Override + @Transactional(rollbackFor=BusinessException.class) + public FiscalTotnaofiscalEmpresa suscribirActualizarTotnaofiscalEmpresa(FiscalTotnaofiscalEmpresa entidad) throws BusinessException { + entidad.setActivo(true); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + + FiscalTotnaofiscalEmpresa item = null; + + if (!TipoTotalizadorNaoFiscal.CUSTOM.toString().equals(entidad.getTipototalizador())){ + item = fiscalImpressoraDAO.buscarTotNaoFiscal(entidad.getEmpresa(), entidad.getTipototalizador()); + }else{ + if (entidad.getTipoeventoextra() == null){ + item = fiscalImpressoraDAO.buscarTotNaoFiscal(entidad.getEmpresa(), entidad.getTipototalizador(),entidad.getDescricao()); + }else{ + item = fiscalImpressoraDAO.buscarTotNaoFiscal(entidad.getEmpresa(), entidad.getTipototalizador(),entidad.getDescricao(),entidad.getTipoeventoextra()); + } + } + + if ( (entidad.getFiscaltotnaofiscalId() == null) && (item != null) ){ + throw new BusinessException("editarTotnaofiscalEmpresaController.MSG.erroTipoTotalizador"); + } + + if ( (entidad.getFiscaltotnaofiscalId() != null) && (item != null) && (!item.getFiscaltotnaofiscalId().equals(entidad.getFiscaltotnaofiscalId())) ){ + throw new BusinessException("editarTotnaofiscalEmpresaController.MSG.erroTipoTotalizador"); + } + if (entidad.getFiscaltotnaofiscalId() == null){ + return fiscalImpressoraDAO.suscribirTotnaofiscalEmpresa(entidad); + }else{ + return fiscalImpressoraDAO.actualizarTotnaofiscalEmpresa(entidad); + } + } + + @Override + public List obtenerTodosFormapagoEmpresa() { + return fiscalImpressoraDAO.obtenerTodosFormapagoEmpresa(); + } + + @Override + public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id) { + return fiscalImpressoraDAO.obtenerIDFormapagoEmpresa(id); + } + + @Override + @Transactional(rollbackFor=BusinessException.class) + public FiscalFormapagoEmpresa suscribirActualizarFormapagoEmpresa(FiscalFormapagoEmpresa entidad) throws BusinessException { + + FiscalFormapagoEmpresa item = null; + + if (!TipoFormaPagamento.CUSTOM.toString().equals(entidad.getTipoformapago())){ + item = fiscalImpressoraDAO.buscarFormaPago(entidad.getEmpresa(), entidad.getTipoformapago()); + }else{ + + //para o tipo CUSTOM, é necessário informar a forma de pagammetno. Se NÃO dá problema no sco de vendas + if (entidad.getFormaPago() == null){ + throw new BusinessException("editarFormapagoEmpresaController.MSG.formaPagoObligatoria"); + } + + item = fiscalImpressoraDAO.buscarFormaPago(entidad.getEmpresa(), entidad.getTipoformapago(),entidad.getDescricao()); + } + + if ( (entidad.getFiscalformapagoempresaId() == null) && (item != null) ){ + throw new BusinessException("editarFormapagoEmpresaController.MSG.erroTipoFormaPago"); + } + + if ( (entidad.getFiscalformapagoempresaId() != null) && (item != null) && (!item.getFiscalformapagoempresaId().equals(entidad.getFiscalformapagoempresaId())) ){ + throw new BusinessException("editarFormapagoEmpresaController.MSG.erroTipoFormaPago"); + } + + entidad.setActivo(true); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + if (entidad.getFiscalformapagoempresaId() == null){ + return fiscalImpressoraDAO.suscribirFormapagoEmpresa(entidad); + }else{ + return fiscalImpressoraDAO.actualizacionFormapagoEmpresa(entidad); + } + } + + @Override + @Transactional(rollbackFor=BusinessException.class) + public FiscalFormapagoEmpresa borrarFormapagoEmpresa(FiscalFormapagoEmpresa entidad) { + entidad.setActivo(false); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + return fiscalImpressoraDAO.actualizacionFormapagoEmpresa(entidad); + } + + @Override + public List obtenerTodosRelgerencialEmpresa() { + return fiscalImpressoraDAO.obtenerTodosRelgerencialEmpresa(); + } + + @Override + public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id) { + return fiscalImpressoraDAO.obtenerIDRelgerencialEmpresa(id); + } + + @Override + @Transactional + public FiscalRelgerencialEmpresa suscribirRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { + return fiscalImpressoraDAO.suscribirRelgerencialEmpresa(entidad); + } + + + @Override + @Transactional(rollbackFor=BusinessException.class) + public FiscalRelgerencialEmpresa suscribirActualizarRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) throws BusinessException { + + FiscalRelgerencialEmpresa item = null; + + item = fiscalImpressoraDAO.buscarRelGerencial(entidad.getEmpresa(), entidad.getTiporelgerencial()); + + if ( (entidad.getFiscalrelgerencialId() == null) && (item != null) ){ + throw new BusinessException("editarRelgerencialEmpresaController.MSG.erroTipoRelgerencial"); + } + + if ( (entidad.getFiscalrelgerencialId() != null) && (item != null) && (!item.getFiscalrelgerencialId().equals(entidad.getFiscalrelgerencialId())) ){ + throw new BusinessException("editarRelgerencialEmpresaController.MSG.erroTipoRelgerencial"); + } + + entidad.setActivo(true); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + if (entidad.getFiscalrelgerencialId() == null){ + return fiscalImpressoraDAO.suscribirRelgerencialEmpresa(entidad); + }else{ + return fiscalImpressoraDAO.actualizacionRelgerencialEmpresa(entidad); + } + } + + + @Override + @Transactional + public FiscalRelgerencialEmpresa actualizacionRelgerencialEmpresa(FiscalRelgerencialEmpresa entidad) { + return fiscalImpressoraDAO.actualizacionRelgerencialEmpresa(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java index 1ee2fd455..015f7d876 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java @@ -1,1076 +1,1076 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.math.BigDecimal; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import javax.sql.DataSource; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.datasource.DataSourceUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FiscalDAO; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; -import com.rjconsultores.ventaboletos.entidad.Estado; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.service.FiscalService; -import com.rjconsultores.ventaboletos.service.TipoEventoExtraService; -import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; -import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; -import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionECF; -import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionECFManual; -import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionECFReducaoZ; -import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionNaoFiscal; -import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionReducaoZ; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.ExportacaoFiscal; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPR; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCCF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCFC; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoICF; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoPRC; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoBPS; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoDBP; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoPAR; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoRMD; -import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqBPS; -import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; -import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorFiscalReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorManualFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorNaoFiscalVO; - -@Service("fiscalService") -public class FiscalServiceImpl implements FiscalService { - private static final Logger log = LogManager.getLogger(FiscalServiceImpl.class); - - public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; - public static final BigDecimal CEM = BigDecimal.valueOf(100); - public static final String QUEBRA_LINHA = "\r\n"; - - private List lsTipoEventoExtra; - - @Autowired - private TipoEventoExtraService tipoEventoExtraService; - - @Autowired - private FiscalDAO fiscalDAO; - - @Autowired - private DataSource dataSourceRead; - - @Autowired - private DataSource dataSource; - - @Autowired - private ExportacaoFiscal exportacaoFiscal; - - private Connection getConnection() { - return DataSourceUtils.getConnection(dataSource); - } - - private Connection getConnectionRead() { - return DataSourceUtils.getConnection(dataSourceRead); - } - - @Override - @Transactional - public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { - return fiscalDAO.gerarRegistroP2_F2(lsEsquemaCorrida, dataDe, dataAte); - } - - @Override - public void gravarRMDBoleto(List rmds, Aidf aidf, String folio, Empresa empresa, Estado estado, boolean isECF, boolean isBPR) { - Connection connection = null; - try { - connection = getConnection(); - fiscalDAO.gravarRMDBoleto(connection, rmds, aidf, folio, empresa.getEmpresaId(), estado.getEstadoId(), isECF, isBPR); - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - } - - @Override - public void cancelarRMDBoleto(Date inicio, Date fim, Empresa empresa, Estado estado, Aidf aidf, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR) { - Connection connection = null; - try { - connection = getConnection(); - fiscalDAO.cancelarRMDBoleto(connection, inicio, fim, empresa.getEmpresaId(), estado, aidf, folioInicial, folioFinal, isCancela, - isInativa, isECF, isBPR); - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - } - - @Override - public List getRegistroImpressaoRMDTipoBPR(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio) { - Connection connection = null; - try { - connection = getConnectionRead(); - return fiscalDAO.getRegistroImpressaoRMDTipoBPR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), rmd, folio); - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public List buscarRelatorioRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros) { - Connection connection = null; - try { - connection = getConnectionRead(); - return fiscalDAO.buscarRelatorioRDI(connection, inicio, fim, empresa.getEmpresaId(), estados, isReceitaTerceiros); - } catch (Exception e) { - log.error("", e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public List getRegistroImpressaoRMDTipoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio) { - Connection connection = null; - try { - connection = getConnectionRead(); - return fiscalDAO.getRegistroImpressaoRMDTipoECF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), rmd, folio); - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { - - Connection connection = null; - try { - connection = getConnectionRead(); - - List list = fiscalDAO.buscaDatosFiscaisECFManual(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), connection, isBoletoHist); - return new ArchivoIntegracionECFManual().importacionFiscalECFManual(inicio, fim, empresa, list); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionFiscalReducaoZPendencia(Date inicio, Date fim, Empresa empresa, Estado estado) { - - Connection connection = null; - try { - connection = getConnectionRead(); - - List list = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, connection); - return new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, true, list); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionFiscalReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado) { - - Connection connection = null; - try { - connection = getConnectionRead(); - - List list = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, connection); - return new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, false, list); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionFiscalECFPendencias(Date inicio, Date fim, Empresa empresa, Estado estado) { - Connection connection = null; - try { - connection = getConnectionRead(); - - List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, false, true, connection, false); - return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, false, true, list); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionFiscalECFCancelados(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { - Connection connection = null; - try { - connection = getConnectionRead(); - - List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, true, false, connection, isBoletoHist); - return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, true, false, list); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public HashMap importacionFiscalECFValidaReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { - - Connection connection = null; - try { - connection = getConnectionRead(); - - List listEcf = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, false, false, connection, isBoletoHist); - - List listRedZ = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, connection); - - ArchivoIntegracionECFReducaoZ ecfRedZ = new ArchivoIntegracionECFReducaoZ(); - ecfRedZ.importacionFiscalECFValidaReducaoZ(listEcf, listRedZ); - - List files = new ArrayList(); - files.add(new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, true, false, false, ecfRedZ.getListEcfValidos())); - files.add(new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, false, ecfRedZ.getListRedZValidos())); - - files.add(new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, false, true, ecfRedZ.getListEcfInvalidos())); - files.add(new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, true, ecfRedZ.getListRedZInvalidos())); - - HashMap result = new HashMap(); - result.put("arquivos", files); - result.put("ecfInvalidos", ecfRedZ.getListEcfInvalidos()); - result.put("redZInvalido", ecfRedZ.getListRedZInvalidos()); - - return result; - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - - return null; - } - - @Override - public File importacionFiscalECF(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { - Connection connection = null; - try { - connection = getConnectionRead(); - - List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, false, false, connection, isBoletoHist); - return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, true, false, false, list); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionNaoFiscal(Date inicio, Date fim, Empresa empresa, Estado estado) { - Connection connection = null; - try { - connection = getConnectionRead(); - - List importacionNaoFiscalVOs = fiscalDAO.buscaDatosNaoFiscais(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), connection); - - return new ArchivoIntegracionNaoFiscal().gerarArquivo(empresa.getCnpj(), importacionNaoFiscalVOs); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - return null; - } - - @Override - public File importacionFiscalECFXls(Empresa empresa, File arquivoTxt) { - return gerarArquivoEcfXlsGenerico(empresa, arquivoTxt); - } - - @Override - public File importacionFiscalReducaoZXls(Empresa empresa, File arquivoTxt) { - try { - List registros = carregarRegistrosReducaoZ(empresa, arquivoTxt); - return gerarArquivoReducaoZXls(registros, arquivoTxt.getName()); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return null; - } - - private List carregarRegistrosReducaoZ(Empresa empresa, File arquivoTxt) throws Exception { - List registros = new ArrayList(); - BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); - String linha = br.readLine(); - while (linha != null) { - LeitorFiscalReducaoZVO leitorFiscalReducaoZ = null; - int indice = -1; - if (linha.startsWith("1")) { - leitorFiscalReducaoZ = new LeitorFiscalReducaoZVO(); - leitorFiscalReducaoZ.setEmpresaId(empresa.getEmpresaId()); - leitorFiscalReducaoZ.setNombempresa(empresa.getNombempresa()); - leitorFiscalReducaoZ.setDatamov(linha.substring(1, 9).trim()); - leitorFiscalReducaoZ.setCnpj(linha.substring(9, 23).trim()); - leitorFiscalReducaoZ.setAliquota(BigDecimalUtil.getStringToBigDecimal(linha.substring(196, 210).trim(), 2, LocaleUtil.getLocale())); - - if (registros.contains(leitorFiscalReducaoZ)) { - indice = registros.indexOf(leitorFiscalReducaoZ); - leitorFiscalReducaoZ = registros.get(indice); - } - - leitorFiscalReducaoZ.setImposto(leitorFiscalReducaoZ.getImposto().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(272, 285).trim(), 2, LocaleUtil.getLocale()))); - leitorFiscalReducaoZ.setValorNaoTributado(leitorFiscalReducaoZ.getValorNaoTributado().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(182, 196).trim(), 2, LocaleUtil.getLocale()))); - leitorFiscalReducaoZ.setVendabrutadiaria(leitorFiscalReducaoZ.getVendabrutadiaria().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(126, 140).trim(), 2, LocaleUtil.getLocale()))); - - linha = br.readLine(); - } else { - linha = br.readLine(); - } - - if (leitorFiscalReducaoZ != null && indice > -1) { - registros.set(indice, leitorFiscalReducaoZ); - } else if (leitorFiscalReducaoZ != null) { - registros.add(leitorFiscalReducaoZ); - } - } - - br.close(); - - Collections.sort(registros); - - return registros; - } - - private File gerarArquivoReducaoZXls(List registros, String nomeArquivo) throws IOException { - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet firstSheet = workbook.createSheet(); - - int linha = 0; - - // Cabecalho - HSSFRow row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue("DATA_MOVIMENTO"); - row.createCell(1).setCellValue("EMPRESA"); - row.createCell(2).setCellValue("CNPJ"); - row.createCell(3).setCellValue("VENDA_BRUTA_DIARIA"); - row.createCell(4).setCellValue("VALOR_NAO_TRIBUTADO"); - row.createCell(5).setCellValue("ALIQUOTA"); - row.createCell(6).setCellValue("VALOR_ICMS"); - - for (LeitorFiscalReducaoZVO leitorFiscal : registros) { - row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue(leitorFiscal.getDatamov()); - row.createCell(1).setCellValue(leitorFiscal.getNombempresa()); - row.createCell(2).setCellValue(leitorFiscal.getCnpj()); - row.createCell(3).setCellValue(leitorFiscal.getVendabrutadiaria().doubleValue()); - row.createCell(4).setCellValue(leitorFiscal.getValorNaoTributado().doubleValue()); - row.createCell(5).setCellValue(leitorFiscal.getAliquota().doubleValue()); - row.createCell(6).setCellValue(leitorFiscal.getImposto().doubleValue()); - } - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - workbook.write(bos); - - nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; - File arquivo = File.createTempFile(nomeArquivo, ".xls"); - - FileOutputStream fos = new FileOutputStream(arquivo); - fos.write(bos.toByteArray()); - fos.close(); - - return arquivo; - } - - @Override - public File importacionFiscalECFManualXls(Empresa empresa, File arquivoTxt) { - try { - List registros = carregarRegistrosManualFiscal(empresa, arquivoTxt); - return gerarArquivoEcfManualXls(registros, arquivoTxt.getName()); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return null; - } - - private File gerarArquivoEcfManualXls(List registros, String nomeArquivo) throws Exception { - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet firstSheet = workbook.createSheet(); - - int linha = 0; - - // Cabecalho - HSSFRow row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue("DATA_EMISSAO"); - row.createCell(1).setCellValue("EMPRESA"); - row.createCell(2).setCellValue("UF_ORIGEM"); - row.createCell(3).setCellValue("UF_DESTINO"); - row.createCell(4).setCellValue("CLASSE"); - row.createCell(5).setCellValue("STATUS"); - row.createCell(6).setCellValue("TARIFA"); - row.createCell(7).setCellValue("TX_EMBARQUE"); - row.createCell(8).setCellValue("PEDAGIO"); - row.createCell(9).setCellValue("SEGURO"); - row.createCell(10).setCellValue("TOTAL"); - row.createCell(11).setCellValue("ALIQUOTA"); - row.createCell(12).setCellValue("VALOR_ICMS"); - row.createCell(13).setCellValue("QTDE"); - - for (LeitorManualFiscalVO leitorFiscal : registros) { - row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue(leitorFiscal.getDataEmissao()); - row.createCell(1).setCellValue(leitorFiscal.getNombempresa()); - row.createCell(2).setCellValue(leitorFiscal.getOrigenUf()); - row.createCell(3).setCellValue(leitorFiscal.getDestinoUf()); - row.createCell(4).setCellValue(leitorFiscal.getClaseServicio()); - row.createCell(5).setCellValue(leitorFiscal.getStatus()); - row.createCell(6).setCellValue(leitorFiscal.getValorItem().doubleValue()); - row.createCell(7).setCellValue(leitorFiscal.getImportetaxaembarque().doubleValue()); - row.createCell(8).setCellValue(leitorFiscal.getImportepedagio().doubleValue()); - row.createCell(9).setCellValue(leitorFiscal.getImporteseguro().doubleValue()); - row.createCell(10).setCellValue(leitorFiscal.getValorTotal().doubleValue()); - row.createCell(11).setCellValue(leitorFiscal.getIcms().doubleValue()); - row.createCell(12).setCellValue(leitorFiscal.getValorIcms().doubleValue()); - row.createCell(13).setCellValue(leitorFiscal.getQtdeItens()); - } - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - workbook.write(bos); - - nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; - File arquivo = File.createTempFile(nomeArquivo, ".xls"); - - FileOutputStream fos = new FileOutputStream(arquivo); - fos.write(bos.toByteArray()); - fos.close(); - - return arquivo; - } - - @Override - public File importacionNaoFiscalXls(Empresa empresa, File arquivoTxt) { - return gerarArquivoNaoFiscalXls(empresa, arquivoTxt); - } - - @Override - public File importacionFiscalECFCanceladosXls(Empresa empresa, File arquivoTxt) { - return gerarArquivoEcfXlsGenerico(empresa, arquivoTxt); - } - - private File gerarArquivoNaoFiscalXls(Empresa empresa, File arquivoTxt) { - try { - List registros = carregarRegistrosNaoFiscais(empresa, arquivoTxt); - return gerarArquivoNaoFiscaisXls(registros, arquivoTxt.getName()); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return null; - } - - private File gerarArquivoEcfXlsGenerico(Empresa empresa, File arquivoTxt) { - try { - List registros = carregarRegistrosEcf(empresa, arquivoTxt); - return gerarArquivoEcfXls(registros, arquivoTxt.getName()); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return null; - } - - private File gerarArquivoEcfXls(List registros, String nomeArquivo) throws IOException { - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet firstSheet = workbook.createSheet(); - - int linha = 0; - - // Cabecalho - HSSFRow row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue("DATA_EMISSAO"); - row.createCell(1).setCellValue("EMPRESA"); - row.createCell(2).setCellValue("UF_ORIGEM"); - row.createCell(3).setCellValue("UF_DESTINO"); - row.createCell(4).setCellValue("CLASSE"); - row.createCell(5).setCellValue("MOTIVO_CANCELAMENTO"); - row.createCell(6).setCellValue("TARIFA"); - row.createCell(7).setCellValue("TX_EMBARQUE"); - row.createCell(8).setCellValue("PEDAGIO"); - row.createCell(9).setCellValue("SEGURO"); - row.createCell(10).setCellValue("MULTA"); - row.createCell(11).setCellValue("TOTAL"); - row.createCell(12).setCellValue("ALIQUOTA_ICMS"); - row.createCell(13).setCellValue("VALOR_ICMS"); - row.createCell(14).setCellValue("QTDE"); - - for (LeitorFiscalVO leitorFiscal : registros) { - row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue(leitorFiscal.getDataEmissao()); - row.createCell(1).setCellValue(leitorFiscal.getNombempresa()); - row.createCell(2).setCellValue(leitorFiscal.getOrigenUf()); - row.createCell(3).setCellValue(leitorFiscal.getDestinoUf()); - row.createCell(4).setCellValue(leitorFiscal.getClaseServicio()); - row.createCell(5).setCellValue(leitorFiscal.getDescmotivocancelamento()); - row.createCell(6).setCellValue(leitorFiscal.getValorTarifa().doubleValue()); - row.createCell(7).setCellValue(leitorFiscal.getValorEmbarque().doubleValue()); - row.createCell(8).setCellValue(leitorFiscal.getValorPedagio().doubleValue()); - row.createCell(9).setCellValue(leitorFiscal.getValorSeguro().doubleValue()); - row.createCell(10).setCellValue(leitorFiscal.getValorMulta().doubleValue()); - row.createCell(11).setCellValue(leitorFiscal.getTotal().doubleValue()); - row.createCell(12).setCellValue(leitorFiscal.getAliquota().doubleValue()); - row.createCell(13).setCellValue(leitorFiscal.getValorIcms().doubleValue()); - row.createCell(14).setCellValue(leitorFiscal.getQtdeItens()); - } - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - workbook.write(bos); - - nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; - File arquivo = File.createTempFile(nomeArquivo, ".xls"); - - FileOutputStream fos = new FileOutputStream(arquivo); - fos.write(bos.toByteArray()); - fos.close(); - - return arquivo; - - } - - private List carregarRegistrosEcf(Empresa empresa, File arquivoTxt) throws Exception { - List registros = new ArrayList(); - BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); - String linha = br.readLine(); - while (linha != null) { - LeitorFiscalVO leitorFiscal = null; - int indice = -1; - if (linha.startsWith("1")) { - leitorFiscal = new LeitorFiscalVO(); - leitorFiscal.setEmpresaId(empresa.getEmpresaId()); - leitorFiscal.setNombempresa(empresa.getNombempresa()); - leitorFiscal.setDataEmissao(linha.substring(1, 9).trim()); - leitorFiscal.setOrigenUf(linha.substring(177, 179).trim()); - leitorFiscal.setDestinoUf(linha.substring(184, 186).trim()); - leitorFiscal.setClaseServicio(linha.substring(226, 256).trim()); - leitorFiscal.setDescmotivocancelamento(linha.substring(192, 212).trim()); - leitorFiscal.setAliquota(BigDecimalUtil.getStringToBigDecimal(linha.substring(79, 93).trim(), 2, LocaleUtil.getLocale())); - - if (registros.contains(leitorFiscal)) { - indice = registros.indexOf(leitorFiscal); - leitorFiscal = registros.get(indice); - } - - leitorFiscal.setQtdeItens(leitorFiscal.getQtdeItens() + 1); - linha = br.readLine(); - while (linha != null && linha.startsWith("2")) { - if (linha.indexOf("TA") >= 0) { - leitorFiscal.setValorTarifa(leitorFiscal.getValorTarifa().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - if (linha.indexOf("TX") >= 0) { - leitorFiscal.setValorEmbarque(leitorFiscal.getValorEmbarque().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - if (linha.indexOf("PE") >= 0) { - leitorFiscal.setValorPedagio(leitorFiscal.getValorPedagio().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - if (linha.indexOf("SE") >= 0) { - leitorFiscal.setValorSeguro(leitorFiscal.getValorSeguro().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - linha = br.readLine(); - } - } else { - linha = br.readLine(); - } - - if (leitorFiscal != null && indice > -1) { - registros.set(indice, leitorFiscal); - } else if (leitorFiscal != null) { - registros.add(leitorFiscal); - } - } - - br.close(); - - Collections.sort(registros); - - return registros; - } - - private List carregarRegistrosManualFiscal(Empresa empresa, File arquivoTxt) throws Exception { - List registros = new ArrayList(); - BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); - String linha = br.readLine(); - while (linha != null) { - LeitorManualFiscalVO leitorManualFiscal = null; - int indice = -1; - if (linha.startsWith("1")) { - leitorManualFiscal = new LeitorManualFiscalVO(); - leitorManualFiscal.setEmpresaId(empresa.getEmpresaId()); - leitorManualFiscal.setNombempresa(empresa.getNombempresa()); - leitorManualFiscal.setDataEmissao(linha.substring(1, 9).trim()); - leitorManualFiscal.setOrigenUf(linha.substring(177, 179).trim()); - leitorManualFiscal.setDestinoUf(linha.substring(184, 186).trim()); - leitorManualFiscal.setClaseServicio(linha.substring(226, 256).trim()); - leitorManualFiscal.setStatus(linha.substring(223, 224).trim()); - leitorManualFiscal.setIcms(BigDecimalUtil.getStringToBigDecimal(linha.substring(79, 93).trim(), 2, LocaleUtil.getLocale())); - - if (registros.contains(leitorManualFiscal)) { - indice = registros.indexOf(leitorManualFiscal); - leitorManualFiscal = registros.get(indice); - } - - leitorManualFiscal.setValorIcms(leitorManualFiscal.getValorIcms().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(93, 107).trim(), 2, LocaleUtil.getLocale()))); - leitorManualFiscal.setValorTotal(leitorManualFiscal.getValorTotal().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(51, 65).trim(), 2, LocaleUtil.getLocale()))); - - leitorManualFiscal.setQtdeItens(leitorManualFiscal.getQtdeItens() + 1); - linha = br.readLine(); - while (linha != null && linha.startsWith("2")) { - if (linha.indexOf("TA") >= 0) { - leitorManualFiscal.setValorItem(leitorManualFiscal.getValorItem().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - if (linha.indexOf("TX") >= 0) { - leitorManualFiscal.setImportetaxaembarque(leitorManualFiscal.getImportetaxaembarque().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - if (linha.indexOf("PE") >= 0) { - leitorManualFiscal.setImportepedagio(leitorManualFiscal.getImportepedagio().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - if (linha.indexOf("SE") >= 0) { - leitorManualFiscal.setImporteseguro(leitorManualFiscal.getImporteseguro().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); - } - - linha = br.readLine(); - } - } else { - linha = br.readLine(); - } - - if (leitorManualFiscal != null && indice > -1) { - registros.set(indice, leitorManualFiscal); - } else if (leitorManualFiscal != null) { - registros.add(leitorManualFiscal); - } - } - - br.close(); - - Collections.sort(registros); - - return registros; - } - - private List carregarRegistrosNaoFiscais(Empresa empresa, File arquivoTxt) throws Exception { - List registros = new ArrayList(); - BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); - String linha = br.readLine(); - while (linha != null) { - LeitorNaoFiscalVO naoFiscais = null; - int indice = -1; - if (linha.startsWith("1")) { - naoFiscais = new LeitorNaoFiscalVO(); - naoFiscais.setEmpresaId(empresa.getEmpresaId()); - naoFiscais.setNombempresa(empresa.getNombempresa()); - naoFiscais.setDatamov(linha.substring(1, 9).trim()); - - Integer tipoEventoExtraId = Integer.valueOf(linha.substring(69, 78).trim()); - TipoEventoExtra tipoEvento = getTipoEventoExtra(tipoEventoExtraId); - - naoFiscais.setTipoeventoextraId(tipoEvento.getTipoeventoextraId()); - naoFiscais.setDesctipoevento(tipoEvento.getDescTipoEvento()); - - if (registros.contains(naoFiscais)) { - indice = registros.indexOf(naoFiscais); - naoFiscais = registros.get(indice); - } - - naoFiscais.setValorTotal(naoFiscais.getValorTotal().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(52, 65).trim(), 2, LocaleUtil.getLocale()))); - - linha = br.readLine(); - } else { - linha = br.readLine(); - } - - if (naoFiscais != null && indice > -1) { - registros.set(indice, naoFiscais); - } else if (naoFiscais != null) { - registros.add(naoFiscais); - } - } - - br.close(); - - Collections.sort(registros); - - return registros; - } - - private File gerarArquivoNaoFiscaisXls(List registros, String nomeArquivo) throws IOException { - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet firstSheet = workbook.createSheet(); - - int linha = 0; - - // Cabecalho - HSSFRow row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue("DATA_EMISSAO"); - row.createCell(1).setCellValue("EMPRESA"); - row.createCell(2).setCellValue("CODIGO_NATUREZA"); - row.createCell(3).setCellValue("DESCRICAO_NATUREZA"); - row.createCell(4).setCellValue("VALOR_TOTAL"); - - for (LeitorNaoFiscalVO leitorNaoFiscal : registros) { - row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue(leitorNaoFiscal.getDatamov()); - row.createCell(1).setCellValue(leitorNaoFiscal.getNombempresa()); - row.createCell(2).setCellValue(leitorNaoFiscal.getTipoeventoextraId()); - row.createCell(3).setCellValue(leitorNaoFiscal.getDesctipoevento()); - row.createCell(4).setCellValue(leitorNaoFiscal.getValorTotal().doubleValue()); - } - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - workbook.write(bos); - - nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; - File arquivo = File.createTempFile(nomeArquivo, ".xls"); - - FileOutputStream fos = new FileOutputStream(arquivo); - fos.write(bos.toByteArray()); - fos.close(); - - return arquivo; - - } - - private TipoEventoExtra getTipoEventoExtra(Integer tipoEventoExtraId) { - for (TipoEventoExtra tipoEvento : getListTipoEventoExtra()) { - if (tipoEventoExtraId.equals(tipoEvento.getTipoeventoextraId())) - return tipoEvento; - } - return null; - } - - private List getListTipoEventoExtra() { - if (lsTipoEventoExtra == null) { - lsTipoEventoExtra = tipoEventoExtraService.obtenerTodos(); - } - return lsTipoEventoExtra; - } - - @Override - public File buscarArquivoExportacaoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo) { - Connection connection = null; - - try { - connection = getConnectionRead(); - - List tempos = new ArrayList(0); - Long begin = 0L; - String tempo = null; - - begin = Calendar.getInstance().getTimeInMillis(); - log.info("Buscando os registros ECF"); - ExportacaoECF exportacaoECF = fiscalDAO.buscarRegistroECF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - log.info("Total de registros: " + exportacaoECF.getListaRegistroECF().size()); - tempo = infoTempo("ECF", begin); - log.info("Tempo na busca dos registros " + tempo); - tempos.add(tempo); - - // CFC - begin = Calendar.getInstance().getTimeInMillis(); - List listaRegistroECFTipoCFC = new ArrayList(0); - log.info("Buscando os registros CFC (ECF)"); -// listaRegistroECFTipoCFC.addAll(fiscalDAO.buscarRegistroECFTipoCFC(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); - listaRegistroECFTipoCFC.addAll(exportacaoECF.getListaRegistroECFTipoCFC()); - log.info("Total de registros: " + listaRegistroECFTipoCFC.size()); - tempo = infoTempo("CFC", begin); - log.info("Tempo na busca dos registros " + tempo); - tempos.add(tempo); - - // CCF - begin = Calendar.getInstance().getTimeInMillis(); - List listaRegistroECFTipoCCF = new ArrayList(0); - log.info("Buscando os registros CCF (ECF)"); -// listaRegistroECFTipoCCF.addAll(fiscalDAO.buscarRegistroECFTipoCCF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); - listaRegistroECFTipoCCF.addAll(exportacaoECF.getListaRegistroECFTipoCCF()); - log.info("Total de registros: " + listaRegistroECFTipoCCF.size()); - tempo = infoTempo("CCF", begin); - log.info("Tempo na busca dos registros " + tempo); - tempos.add(tempo); - - // ICF - begin = Calendar.getInstance().getTimeInMillis(); - List listaRegistroECFTipoICF = new ArrayList(0); - log.info("Buscando os registros ICF (ECF)"); -// listaRegistroECFTipoICF.addAll(fiscalDAO.buscarRegistroECFTipoICF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); - listaRegistroECFTipoICF.addAll(exportacaoECF.getListaRegistroECFTipoICF()); - log.info("Total de registros: " + listaRegistroECFTipoICF.size()); - tempo = infoTempo("ICF", begin); - log.info("Tempo na busca dos registros " + tempo); - tempos.add(tempo); - - // PRC - begin = Calendar.getInstance().getTimeInMillis(); - List listaRegistroECFTipoPRC = new ArrayList(0); - log.info("Buscando os registros PRC (ECF)"); -// listaRegistroECFTipoPRC.addAll(fiscalDAO.buscarRegistroECFTipoPRC(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); - listaRegistroECFTipoPRC.addAll(exportacaoECF.getListaRegistroECFTipoPRC()); - log.info("Total de registros: " + listaRegistroECFTipoPRC.size()); - tempo = infoTempo("PRC", begin); - log.info("Tempo na busca dos registros " + tempo); - tempos.add(tempo); - - fiscalDAO.limparCache(connection); - - return exportacaoFiscal.gerarArquivoECF(tempos, nomeArquivo, inicio, fim, estado.getCveestado(), empresa.getNombempresa(), listaRegistroECFTipoCFC, listaRegistroECFTipoCCF, listaRegistroECFTipoICF, - listaRegistroECFTipoPRC); - - } catch (Exception e) { - log.error(e.getMessage(), e); - - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - - throw new RuntimeException(e); - } - } - - return null; - } - - private String infoTempo(final String descricao, final Long inicio) { - final Long termino = Calendar.getInstance().getTimeInMillis(); - final Long tempo = termino - inicio; - - return descricao + ": " + String.format("%dm %ds", TimeUnit.MILLISECONDS.toMinutes(tempo), TimeUnit.MILLISECONDS.toSeconds(tempo) - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(tempo))); - } - - @Override - public File buscarArquivoExportacaoRMD(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo) { - Connection connection = null; - - try { - connection = getConnectionRead(); - - String tempo = null; - Long begin = 0L; - - begin = Calendar.getInstance().getTimeInMillis(); - log.info("Buscando os registros BPR"); - ExportacaoBPR exportacaoBPR = fiscalDAO.buscarRegistroBPR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - log.info("Total de registros: " + exportacaoBPR.getListaRegistroBPR().size()); - tempo = infoTempo("BPR", begin); - log.info("Tempo na busca dos registros " + tempo); - - begin = Calendar.getInstance().getTimeInMillis(); - log.info("Buscando os registros PAR"); -// List listaRegistroRMDTipoPAR = fiscalDAO.buscarRegistroRMDTipoPAR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - List listaRegistroRMDTipoPAR = exportacaoBPR.getListaRegistroBPRTipoPAR(); - log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); - tempo = infoTempo("PAR", begin); - log.info("Tempo na busca dos registros " + tempo); - - begin = Calendar.getInstance().getTimeInMillis(); - log.info("Buscando os registros RMD"); -// List listaRegistroRMDTipoRMD = fiscalDAO.buscarRegistroRMDTipoRMD(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - List listaRegistroRMDTipoRMD = exportacaoBPR.getListaRegistroBPRTipoRMD(); - log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); - tempo = infoTempo("RMD", begin); - log.info("Tempo na busca dos registros " + tempo); - -// begin = Calendar.getInstance().getTimeInMillis(); -// log.info("Buscando os registros BPS"); -// List listaRegistroRMDTipoBPS = fiscalDAO.buscarRegistroRMDTipoBPS(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - List listaRegistroRMDTipoBPS = null; -// log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); -// tempo = infoTempo("BPS", begin); -// log.info("Tempo na busca dos registros " + tempo); - -// begin = Calendar.getInstance().getTimeInMillis(); -// log.info("Buscando os registros DBP"); -// List listaRegistroRMDTipoDBP = fiscalDAO.buscarRegistroRMDTipoDBP(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - List listaRegistroRMDTipoDBP = null; -// log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); -// tempo = infoTempo("DBP", begin); -// log.info("Tempo na busca dos registros " + tempo); - - begin = Calendar.getInstance().getTimeInMillis(); - log.info("Buscando os registros BPS"); -// List listaRegistroRMDTipoSeqBPS = fiscalDAO.buscarRegistroRMDSeqTipoBPS(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); - List listaRegistroRMDTipoSeqBPS = exportacaoBPR.getListaRegistroBPRTipoSeqBPS(); - log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); - tempo = infoTempo("BPS", begin); - log.info("Tempo na busca dos registros " + tempo); - - fiscalDAO.limparCache(connection); - - return exportacaoFiscal.gerarArquivoRMD(inicio, fim, nomeArquivo, empresa.getNombempresa(), listaRegistroRMDTipoPAR, listaRegistroRMDTipoRMD, listaRegistroRMDTipoBPS, - listaRegistroRMDTipoDBP, listaRegistroRMDTipoSeqBPS); - - } catch (Exception e) { - log.error(e.getMessage(), e); - - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - - throw new RuntimeException(e); - } - } - - return null; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import javax.sql.DataSource; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.datasource.DataSourceUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FiscalDAO; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.service.FiscalService; +import com.rjconsultores.ventaboletos.service.TipoEventoExtraService; +import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; +import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionECF; +import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionECFManual; +import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionECFReducaoZ; +import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionNaoFiscal; +import com.rjconsultores.ventaboletos.utilerias.archivointegracion.ArchivoIntegracionReducaoZ; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.ExportacaoFiscal; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoBPR; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCCF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoCFC; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoICF; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoECFTipoPRC; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoBPS; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoDBP; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoPAR; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoRMD; +import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRMDTipoSeqBPS; +import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorFiscalReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorManualFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorNaoFiscalVO; + +@Service("fiscalService") +public class FiscalServiceImpl implements FiscalService { + private static final Logger log = LogManager.getLogger(FiscalServiceImpl.class); + + public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; + public static final BigDecimal CEM = BigDecimal.valueOf(100); + public static final String QUEBRA_LINHA = "\r\n"; + + private List lsTipoEventoExtra; + + @Autowired + private TipoEventoExtraService tipoEventoExtraService; + + @Autowired + private FiscalDAO fiscalDAO; + + @Autowired + private DataSource dataSourceRead; + + @Autowired + private DataSource dataSource; + + @Autowired + private ExportacaoFiscal exportacaoFiscal; + + private Connection getConnection() { + return DataSourceUtils.getConnection(dataSource); + } + + private Connection getConnectionRead() { + return DataSourceUtils.getConnection(dataSourceRead); + } + + @Override + @Transactional + public int gerarRegistroP2_F2(List lsEsquemaCorrida, Date dataDe, Date dataAte) throws SQLException { + return fiscalDAO.gerarRegistroP2_F2(lsEsquemaCorrida, dataDe, dataAte); + } + + @Override + public void gravarRMDBoleto(List rmds, Aidf aidf, String folio, Empresa empresa, Estado estado, boolean isECF, boolean isBPR) { + Connection connection = null; + try { + connection = getConnection(); + fiscalDAO.gravarRMDBoleto(connection, rmds, aidf, folio, empresa.getEmpresaId(), estado.getEstadoId(), isECF, isBPR); + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + } + + @Override + public void cancelarRMDBoleto(Date inicio, Date fim, Empresa empresa, Estado estado, Aidf aidf, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa, boolean isECF, boolean isBPR) { + Connection connection = null; + try { + connection = getConnection(); + fiscalDAO.cancelarRMDBoleto(connection, inicio, fim, empresa.getEmpresaId(), estado, aidf, folioInicial, folioFinal, isCancela, + isInativa, isECF, isBPR); + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + } + + @Override + public List getRegistroImpressaoRMDTipoBPR(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio) { + Connection connection = null; + try { + connection = getConnectionRead(); + return fiscalDAO.getRegistroImpressaoRMDTipoBPR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), rmd, folio); + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public List buscarRelatorioRDI(Date inicio, Date fim, Empresa empresa, List estados, boolean isReceitaTerceiros) { + Connection connection = null; + try { + connection = getConnectionRead(); + return fiscalDAO.buscarRelatorioRDI(connection, inicio, fim, empresa.getEmpresaId(), estados, isReceitaTerceiros); + } catch (Exception e) { + log.error("", e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public List getRegistroImpressaoRMDTipoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String rmd, String folio) { + Connection connection = null; + try { + connection = getConnectionRead(); + return fiscalDAO.getRegistroImpressaoRMDTipoECF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado(), rmd, folio); + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { + + Connection connection = null; + try { + connection = getConnectionRead(); + + List list = fiscalDAO.buscaDatosFiscaisECFManual(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), connection, isBoletoHist); + return new ArchivoIntegracionECFManual().importacionFiscalECFManual(inicio, fim, empresa, list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionFiscalReducaoZPendencia(Date inicio, Date fim, Empresa empresa, Estado estado) { + + Connection connection = null; + try { + connection = getConnectionRead(); + + List list = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, connection); + return new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, true, list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionFiscalReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado) { + + Connection connection = null; + try { + connection = getConnectionRead(); + + List list = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, connection); + return new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, false, list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionFiscalECFPendencias(Date inicio, Date fim, Empresa empresa, Estado estado) { + Connection connection = null; + try { + connection = getConnectionRead(); + + List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, false, true, connection, false); + return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, false, true, list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionFiscalECFCancelados(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { + Connection connection = null; + try { + connection = getConnectionRead(); + + List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, true, false, connection, isBoletoHist); + return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, true, false, list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public HashMap importacionFiscalECFValidaReducaoZ(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { + + Connection connection = null; + try { + connection = getConnectionRead(); + + List listEcf = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, false, false, connection, isBoletoHist); + + List listRedZ = fiscalDAO.buscaDatosFiscaisReducaoZ(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), false, connection); + + ArchivoIntegracionECFReducaoZ ecfRedZ = new ArchivoIntegracionECFReducaoZ(); + ecfRedZ.importacionFiscalECFValidaReducaoZ(listEcf, listRedZ); + + List files = new ArrayList(); + files.add(new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, true, false, false, ecfRedZ.getListEcfValidos())); + files.add(new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, false, ecfRedZ.getListRedZValidos())); + + files.add(new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, false, false, true, ecfRedZ.getListEcfInvalidos())); + files.add(new ArchivoIntegracionReducaoZ().importacionReducaoZ(inicio, fim, empresa, true, ecfRedZ.getListRedZInvalidos())); + + HashMap result = new HashMap(); + result.put("arquivos", files); + result.put("ecfInvalidos", ecfRedZ.getListEcfInvalidos()); + result.put("redZInvalido", ecfRedZ.getListRedZInvalidos()); + + return result; + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + + return null; + } + + @Override + public File importacionFiscalECF(Date inicio, Date fim, Empresa empresa, Estado estado, boolean isBoletoHist) { + Connection connection = null; + try { + connection = getConnectionRead(); + + List list = fiscalDAO.buscaDatosFiscaisECF(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), true, false, false, connection, isBoletoHist); + return new ArchivoIntegracionECF().importacionFiscalECFGenerico(inicio, fim, empresa, true, false, false, list); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionNaoFiscal(Date inicio, Date fim, Empresa empresa, Estado estado) { + Connection connection = null; + try { + connection = getConnectionRead(); + + List importacionNaoFiscalVOs = fiscalDAO.buscaDatosNaoFiscais(inicio, fim, empresa.getEmpresaId(), estado.getEstadoId(), connection); + + return new ArchivoIntegracionNaoFiscal().gerarArquivo(empresa.getCnpj(), importacionNaoFiscalVOs); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + return null; + } + + @Override + public File importacionFiscalECFXls(Empresa empresa, File arquivoTxt) { + return gerarArquivoEcfXlsGenerico(empresa, arquivoTxt); + } + + @Override + public File importacionFiscalReducaoZXls(Empresa empresa, File arquivoTxt) { + try { + List registros = carregarRegistrosReducaoZ(empresa, arquivoTxt); + return gerarArquivoReducaoZXls(registros, arquivoTxt.getName()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return null; + } + + private List carregarRegistrosReducaoZ(Empresa empresa, File arquivoTxt) throws Exception { + List registros = new ArrayList(); + BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); + String linha = br.readLine(); + while (linha != null) { + LeitorFiscalReducaoZVO leitorFiscalReducaoZ = null; + int indice = -1; + if (linha.startsWith("1")) { + leitorFiscalReducaoZ = new LeitorFiscalReducaoZVO(); + leitorFiscalReducaoZ.setEmpresaId(empresa.getEmpresaId()); + leitorFiscalReducaoZ.setNombempresa(empresa.getNombempresa()); + leitorFiscalReducaoZ.setDatamov(linha.substring(1, 9).trim()); + leitorFiscalReducaoZ.setCnpj(linha.substring(9, 23).trim()); + leitorFiscalReducaoZ.setAliquota(BigDecimalUtil.getStringToBigDecimal(linha.substring(196, 210).trim(), 2, LocaleUtil.getLocale())); + + if (registros.contains(leitorFiscalReducaoZ)) { + indice = registros.indexOf(leitorFiscalReducaoZ); + leitorFiscalReducaoZ = registros.get(indice); + } + + leitorFiscalReducaoZ.setImposto(leitorFiscalReducaoZ.getImposto().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(272, 285).trim(), 2, LocaleUtil.getLocale()))); + leitorFiscalReducaoZ.setValorNaoTributado(leitorFiscalReducaoZ.getValorNaoTributado().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(182, 196).trim(), 2, LocaleUtil.getLocale()))); + leitorFiscalReducaoZ.setVendabrutadiaria(leitorFiscalReducaoZ.getVendabrutadiaria().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(126, 140).trim(), 2, LocaleUtil.getLocale()))); + + linha = br.readLine(); + } else { + linha = br.readLine(); + } + + if (leitorFiscalReducaoZ != null && indice > -1) { + registros.set(indice, leitorFiscalReducaoZ); + } else if (leitorFiscalReducaoZ != null) { + registros.add(leitorFiscalReducaoZ); + } + } + + br.close(); + + Collections.sort(registros); + + return registros; + } + + private File gerarArquivoReducaoZXls(List registros, String nomeArquivo) throws IOException { + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet firstSheet = workbook.createSheet(); + + int linha = 0; + + // Cabecalho + HSSFRow row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue("DATA_MOVIMENTO"); + row.createCell(1).setCellValue("EMPRESA"); + row.createCell(2).setCellValue("CNPJ"); + row.createCell(3).setCellValue("VENDA_BRUTA_DIARIA"); + row.createCell(4).setCellValue("VALOR_NAO_TRIBUTADO"); + row.createCell(5).setCellValue("ALIQUOTA"); + row.createCell(6).setCellValue("VALOR_ICMS"); + + for (LeitorFiscalReducaoZVO leitorFiscal : registros) { + row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue(leitorFiscal.getDatamov()); + row.createCell(1).setCellValue(leitorFiscal.getNombempresa()); + row.createCell(2).setCellValue(leitorFiscal.getCnpj()); + row.createCell(3).setCellValue(leitorFiscal.getVendabrutadiaria().doubleValue()); + row.createCell(4).setCellValue(leitorFiscal.getValorNaoTributado().doubleValue()); + row.createCell(5).setCellValue(leitorFiscal.getAliquota().doubleValue()); + row.createCell(6).setCellValue(leitorFiscal.getImposto().doubleValue()); + } + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + workbook.write(bos); + + nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; + File arquivo = File.createTempFile(nomeArquivo, ".xls"); + + FileOutputStream fos = new FileOutputStream(arquivo); + fos.write(bos.toByteArray()); + fos.close(); + + return arquivo; + } + + @Override + public File importacionFiscalECFManualXls(Empresa empresa, File arquivoTxt) { + try { + List registros = carregarRegistrosManualFiscal(empresa, arquivoTxt); + return gerarArquivoEcfManualXls(registros, arquivoTxt.getName()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return null; + } + + private File gerarArquivoEcfManualXls(List registros, String nomeArquivo) throws Exception { + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet firstSheet = workbook.createSheet(); + + int linha = 0; + + // Cabecalho + HSSFRow row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue("DATA_EMISSAO"); + row.createCell(1).setCellValue("EMPRESA"); + row.createCell(2).setCellValue("UF_ORIGEM"); + row.createCell(3).setCellValue("UF_DESTINO"); + row.createCell(4).setCellValue("CLASSE"); + row.createCell(5).setCellValue("STATUS"); + row.createCell(6).setCellValue("TARIFA"); + row.createCell(7).setCellValue("TX_EMBARQUE"); + row.createCell(8).setCellValue("PEDAGIO"); + row.createCell(9).setCellValue("SEGURO"); + row.createCell(10).setCellValue("TOTAL"); + row.createCell(11).setCellValue("ALIQUOTA"); + row.createCell(12).setCellValue("VALOR_ICMS"); + row.createCell(13).setCellValue("QTDE"); + + for (LeitorManualFiscalVO leitorFiscal : registros) { + row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue(leitorFiscal.getDataEmissao()); + row.createCell(1).setCellValue(leitorFiscal.getNombempresa()); + row.createCell(2).setCellValue(leitorFiscal.getOrigenUf()); + row.createCell(3).setCellValue(leitorFiscal.getDestinoUf()); + row.createCell(4).setCellValue(leitorFiscal.getClaseServicio()); + row.createCell(5).setCellValue(leitorFiscal.getStatus()); + row.createCell(6).setCellValue(leitorFiscal.getValorItem().doubleValue()); + row.createCell(7).setCellValue(leitorFiscal.getImportetaxaembarque().doubleValue()); + row.createCell(8).setCellValue(leitorFiscal.getImportepedagio().doubleValue()); + row.createCell(9).setCellValue(leitorFiscal.getImporteseguro().doubleValue()); + row.createCell(10).setCellValue(leitorFiscal.getValorTotal().doubleValue()); + row.createCell(11).setCellValue(leitorFiscal.getIcms().doubleValue()); + row.createCell(12).setCellValue(leitorFiscal.getValorIcms().doubleValue()); + row.createCell(13).setCellValue(leitorFiscal.getQtdeItens()); + } + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + workbook.write(bos); + + nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; + File arquivo = File.createTempFile(nomeArquivo, ".xls"); + + FileOutputStream fos = new FileOutputStream(arquivo); + fos.write(bos.toByteArray()); + fos.close(); + + return arquivo; + } + + @Override + public File importacionNaoFiscalXls(Empresa empresa, File arquivoTxt) { + return gerarArquivoNaoFiscalXls(empresa, arquivoTxt); + } + + @Override + public File importacionFiscalECFCanceladosXls(Empresa empresa, File arquivoTxt) { + return gerarArquivoEcfXlsGenerico(empresa, arquivoTxt); + } + + private File gerarArquivoNaoFiscalXls(Empresa empresa, File arquivoTxt) { + try { + List registros = carregarRegistrosNaoFiscais(empresa, arquivoTxt); + return gerarArquivoNaoFiscaisXls(registros, arquivoTxt.getName()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return null; + } + + private File gerarArquivoEcfXlsGenerico(Empresa empresa, File arquivoTxt) { + try { + List registros = carregarRegistrosEcf(empresa, arquivoTxt); + return gerarArquivoEcfXls(registros, arquivoTxt.getName()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return null; + } + + private File gerarArquivoEcfXls(List registros, String nomeArquivo) throws IOException { + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet firstSheet = workbook.createSheet(); + + int linha = 0; + + // Cabecalho + HSSFRow row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue("DATA_EMISSAO"); + row.createCell(1).setCellValue("EMPRESA"); + row.createCell(2).setCellValue("UF_ORIGEM"); + row.createCell(3).setCellValue("UF_DESTINO"); + row.createCell(4).setCellValue("CLASSE"); + row.createCell(5).setCellValue("MOTIVO_CANCELAMENTO"); + row.createCell(6).setCellValue("TARIFA"); + row.createCell(7).setCellValue("TX_EMBARQUE"); + row.createCell(8).setCellValue("PEDAGIO"); + row.createCell(9).setCellValue("SEGURO"); + row.createCell(10).setCellValue("MULTA"); + row.createCell(11).setCellValue("TOTAL"); + row.createCell(12).setCellValue("ALIQUOTA_ICMS"); + row.createCell(13).setCellValue("VALOR_ICMS"); + row.createCell(14).setCellValue("QTDE"); + + for (LeitorFiscalVO leitorFiscal : registros) { + row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue(leitorFiscal.getDataEmissao()); + row.createCell(1).setCellValue(leitorFiscal.getNombempresa()); + row.createCell(2).setCellValue(leitorFiscal.getOrigenUf()); + row.createCell(3).setCellValue(leitorFiscal.getDestinoUf()); + row.createCell(4).setCellValue(leitorFiscal.getClaseServicio()); + row.createCell(5).setCellValue(leitorFiscal.getDescmotivocancelamento()); + row.createCell(6).setCellValue(leitorFiscal.getValorTarifa().doubleValue()); + row.createCell(7).setCellValue(leitorFiscal.getValorEmbarque().doubleValue()); + row.createCell(8).setCellValue(leitorFiscal.getValorPedagio().doubleValue()); + row.createCell(9).setCellValue(leitorFiscal.getValorSeguro().doubleValue()); + row.createCell(10).setCellValue(leitorFiscal.getValorMulta().doubleValue()); + row.createCell(11).setCellValue(leitorFiscal.getTotal().doubleValue()); + row.createCell(12).setCellValue(leitorFiscal.getAliquota().doubleValue()); + row.createCell(13).setCellValue(leitorFiscal.getValorIcms().doubleValue()); + row.createCell(14).setCellValue(leitorFiscal.getQtdeItens()); + } + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + workbook.write(bos); + + nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; + File arquivo = File.createTempFile(nomeArquivo, ".xls"); + + FileOutputStream fos = new FileOutputStream(arquivo); + fos.write(bos.toByteArray()); + fos.close(); + + return arquivo; + + } + + private List carregarRegistrosEcf(Empresa empresa, File arquivoTxt) throws Exception { + List registros = new ArrayList(); + BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); + String linha = br.readLine(); + while (linha != null) { + LeitorFiscalVO leitorFiscal = null; + int indice = -1; + if (linha.startsWith("1")) { + leitorFiscal = new LeitorFiscalVO(); + leitorFiscal.setEmpresaId(empresa.getEmpresaId()); + leitorFiscal.setNombempresa(empresa.getNombempresa()); + leitorFiscal.setDataEmissao(linha.substring(1, 9).trim()); + leitorFiscal.setOrigenUf(linha.substring(177, 179).trim()); + leitorFiscal.setDestinoUf(linha.substring(184, 186).trim()); + leitorFiscal.setClaseServicio(linha.substring(226, 256).trim()); + leitorFiscal.setDescmotivocancelamento(linha.substring(192, 212).trim()); + leitorFiscal.setAliquota(BigDecimalUtil.getStringToBigDecimal(linha.substring(79, 93).trim(), 2, LocaleUtil.getLocale())); + + if (registros.contains(leitorFiscal)) { + indice = registros.indexOf(leitorFiscal); + leitorFiscal = registros.get(indice); + } + + leitorFiscal.setQtdeItens(leitorFiscal.getQtdeItens() + 1); + linha = br.readLine(); + while (linha != null && linha.startsWith("2")) { + if (linha.indexOf("TA") >= 0) { + leitorFiscal.setValorTarifa(leitorFiscal.getValorTarifa().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + if (linha.indexOf("TX") >= 0) { + leitorFiscal.setValorEmbarque(leitorFiscal.getValorEmbarque().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + if (linha.indexOf("PE") >= 0) { + leitorFiscal.setValorPedagio(leitorFiscal.getValorPedagio().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + if (linha.indexOf("SE") >= 0) { + leitorFiscal.setValorSeguro(leitorFiscal.getValorSeguro().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + linha = br.readLine(); + } + } else { + linha = br.readLine(); + } + + if (leitorFiscal != null && indice > -1) { + registros.set(indice, leitorFiscal); + } else if (leitorFiscal != null) { + registros.add(leitorFiscal); + } + } + + br.close(); + + Collections.sort(registros); + + return registros; + } + + private List carregarRegistrosManualFiscal(Empresa empresa, File arquivoTxt) throws Exception { + List registros = new ArrayList(); + BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); + String linha = br.readLine(); + while (linha != null) { + LeitorManualFiscalVO leitorManualFiscal = null; + int indice = -1; + if (linha.startsWith("1")) { + leitorManualFiscal = new LeitorManualFiscalVO(); + leitorManualFiscal.setEmpresaId(empresa.getEmpresaId()); + leitorManualFiscal.setNombempresa(empresa.getNombempresa()); + leitorManualFiscal.setDataEmissao(linha.substring(1, 9).trim()); + leitorManualFiscal.setOrigenUf(linha.substring(177, 179).trim()); + leitorManualFiscal.setDestinoUf(linha.substring(184, 186).trim()); + leitorManualFiscal.setClaseServicio(linha.substring(226, 256).trim()); + leitorManualFiscal.setStatus(linha.substring(223, 224).trim()); + leitorManualFiscal.setIcms(BigDecimalUtil.getStringToBigDecimal(linha.substring(79, 93).trim(), 2, LocaleUtil.getLocale())); + + if (registros.contains(leitorManualFiscal)) { + indice = registros.indexOf(leitorManualFiscal); + leitorManualFiscal = registros.get(indice); + } + + leitorManualFiscal.setValorIcms(leitorManualFiscal.getValorIcms().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(93, 107).trim(), 2, LocaleUtil.getLocale()))); + leitorManualFiscal.setValorTotal(leitorManualFiscal.getValorTotal().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(51, 65).trim(), 2, LocaleUtil.getLocale()))); + + leitorManualFiscal.setQtdeItens(leitorManualFiscal.getQtdeItens() + 1); + linha = br.readLine(); + while (linha != null && linha.startsWith("2")) { + if (linha.indexOf("TA") >= 0) { + leitorManualFiscal.setValorItem(leitorManualFiscal.getValorItem().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + if (linha.indexOf("TX") >= 0) { + leitorManualFiscal.setImportetaxaembarque(leitorManualFiscal.getImportetaxaembarque().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + if (linha.indexOf("PE") >= 0) { + leitorManualFiscal.setImportepedagio(leitorManualFiscal.getImportepedagio().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + if (linha.indexOf("SE") >= 0) { + leitorManualFiscal.setImporteseguro(leitorManualFiscal.getImporteseguro().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(47, 62).trim(), 2, LocaleUtil.getLocale()))); + } + + linha = br.readLine(); + } + } else { + linha = br.readLine(); + } + + if (leitorManualFiscal != null && indice > -1) { + registros.set(indice, leitorManualFiscal); + } else if (leitorManualFiscal != null) { + registros.add(leitorManualFiscal); + } + } + + br.close(); + + Collections.sort(registros); + + return registros; + } + + private List carregarRegistrosNaoFiscais(Empresa empresa, File arquivoTxt) throws Exception { + List registros = new ArrayList(); + BufferedReader br = new BufferedReader(new FileReader(arquivoTxt)); + String linha = br.readLine(); + while (linha != null) { + LeitorNaoFiscalVO naoFiscais = null; + int indice = -1; + if (linha.startsWith("1")) { + naoFiscais = new LeitorNaoFiscalVO(); + naoFiscais.setEmpresaId(empresa.getEmpresaId()); + naoFiscais.setNombempresa(empresa.getNombempresa()); + naoFiscais.setDatamov(linha.substring(1, 9).trim()); + + Integer tipoEventoExtraId = Integer.valueOf(linha.substring(69, 78).trim()); + TipoEventoExtra tipoEvento = getTipoEventoExtra(tipoEventoExtraId); + + naoFiscais.setTipoeventoextraId(tipoEvento.getTipoeventoextraId()); + naoFiscais.setDesctipoevento(tipoEvento.getDescTipoEvento()); + + if (registros.contains(naoFiscais)) { + indice = registros.indexOf(naoFiscais); + naoFiscais = registros.get(indice); + } + + naoFiscais.setValorTotal(naoFiscais.getValorTotal().add(BigDecimalUtil.getStringToBigDecimal(linha.substring(52, 65).trim(), 2, LocaleUtil.getLocale()))); + + linha = br.readLine(); + } else { + linha = br.readLine(); + } + + if (naoFiscais != null && indice > -1) { + registros.set(indice, naoFiscais); + } else if (naoFiscais != null) { + registros.add(naoFiscais); + } + } + + br.close(); + + Collections.sort(registros); + + return registros; + } + + private File gerarArquivoNaoFiscaisXls(List registros, String nomeArquivo) throws IOException { + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet firstSheet = workbook.createSheet(); + + int linha = 0; + + // Cabecalho + HSSFRow row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue("DATA_EMISSAO"); + row.createCell(1).setCellValue("EMPRESA"); + row.createCell(2).setCellValue("CODIGO_NATUREZA"); + row.createCell(3).setCellValue("DESCRICAO_NATUREZA"); + row.createCell(4).setCellValue("VALOR_TOTAL"); + + for (LeitorNaoFiscalVO leitorNaoFiscal : registros) { + row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue(leitorNaoFiscal.getDatamov()); + row.createCell(1).setCellValue(leitorNaoFiscal.getNombempresa()); + row.createCell(2).setCellValue(leitorNaoFiscal.getTipoeventoextraId()); + row.createCell(3).setCellValue(leitorNaoFiscal.getDesctipoevento()); + row.createCell(4).setCellValue(leitorNaoFiscal.getValorTotal().doubleValue()); + } + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + workbook.write(bos); + + nomeArquivo = "consolidado_" + nomeArquivo.split("\\.")[0]; + File arquivo = File.createTempFile(nomeArquivo, ".xls"); + + FileOutputStream fos = new FileOutputStream(arquivo); + fos.write(bos.toByteArray()); + fos.close(); + + return arquivo; + + } + + private TipoEventoExtra getTipoEventoExtra(Integer tipoEventoExtraId) { + for (TipoEventoExtra tipoEvento : getListTipoEventoExtra()) { + if (tipoEventoExtraId.equals(tipoEvento.getTipoeventoextraId())) + return tipoEvento; + } + return null; + } + + private List getListTipoEventoExtra() { + if (lsTipoEventoExtra == null) { + lsTipoEventoExtra = tipoEventoExtraService.obtenerTodos(); + } + return lsTipoEventoExtra; + } + + @Override + public File buscarArquivoExportacaoECF(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo) { + Connection connection = null; + + try { + connection = getConnectionRead(); + + List tempos = new ArrayList(0); + Long begin = 0L; + String tempo = null; + + begin = Calendar.getInstance().getTimeInMillis(); + log.info("Buscando os registros ECF"); + ExportacaoECF exportacaoECF = fiscalDAO.buscarRegistroECF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + log.info("Total de registros: " + exportacaoECF.getListaRegistroECF().size()); + tempo = infoTempo("ECF", begin); + log.info("Tempo na busca dos registros " + tempo); + tempos.add(tempo); + + // CFC + begin = Calendar.getInstance().getTimeInMillis(); + List listaRegistroECFTipoCFC = new ArrayList(0); + log.info("Buscando os registros CFC (ECF)"); +// listaRegistroECFTipoCFC.addAll(fiscalDAO.buscarRegistroECFTipoCFC(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); + listaRegistroECFTipoCFC.addAll(exportacaoECF.getListaRegistroECFTipoCFC()); + log.info("Total de registros: " + listaRegistroECFTipoCFC.size()); + tempo = infoTempo("CFC", begin); + log.info("Tempo na busca dos registros " + tempo); + tempos.add(tempo); + + // CCF + begin = Calendar.getInstance().getTimeInMillis(); + List listaRegistroECFTipoCCF = new ArrayList(0); + log.info("Buscando os registros CCF (ECF)"); +// listaRegistroECFTipoCCF.addAll(fiscalDAO.buscarRegistroECFTipoCCF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); + listaRegistroECFTipoCCF.addAll(exportacaoECF.getListaRegistroECFTipoCCF()); + log.info("Total de registros: " + listaRegistroECFTipoCCF.size()); + tempo = infoTempo("CCF", begin); + log.info("Tempo na busca dos registros " + tempo); + tempos.add(tempo); + + // ICF + begin = Calendar.getInstance().getTimeInMillis(); + List listaRegistroECFTipoICF = new ArrayList(0); + log.info("Buscando os registros ICF (ECF)"); +// listaRegistroECFTipoICF.addAll(fiscalDAO.buscarRegistroECFTipoICF(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); + listaRegistroECFTipoICF.addAll(exportacaoECF.getListaRegistroECFTipoICF()); + log.info("Total de registros: " + listaRegistroECFTipoICF.size()); + tempo = infoTempo("ICF", begin); + log.info("Tempo na busca dos registros " + tempo); + tempos.add(tempo); + + // PRC + begin = Calendar.getInstance().getTimeInMillis(); + List listaRegistroECFTipoPRC = new ArrayList(0); + log.info("Buscando os registros PRC (ECF)"); +// listaRegistroECFTipoPRC.addAll(fiscalDAO.buscarRegistroECFTipoPRC(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado())); + listaRegistroECFTipoPRC.addAll(exportacaoECF.getListaRegistroECFTipoPRC()); + log.info("Total de registros: " + listaRegistroECFTipoPRC.size()); + tempo = infoTempo("PRC", begin); + log.info("Tempo na busca dos registros " + tempo); + tempos.add(tempo); + + fiscalDAO.limparCache(connection); + + return exportacaoFiscal.gerarArquivoECF(tempos, nomeArquivo, inicio, fim, estado.getCveestado(), empresa.getNombempresa(), listaRegistroECFTipoCFC, listaRegistroECFTipoCCF, listaRegistroECFTipoICF, + listaRegistroECFTipoPRC); + + } catch (Exception e) { + log.error(e.getMessage(), e); + + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + + throw new RuntimeException(e); + } + } + + return null; + } + + private String infoTempo(final String descricao, final Long inicio) { + final Long termino = Calendar.getInstance().getTimeInMillis(); + final Long tempo = termino - inicio; + + return descricao + ": " + String.format("%dm %ds", TimeUnit.MILLISECONDS.toMinutes(tempo), TimeUnit.MILLISECONDS.toSeconds(tempo) - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(tempo))); + } + + @Override + public File buscarArquivoExportacaoRMD(Date inicio, Date fim, Empresa empresa, Estado estado, String nomeArquivo) { + Connection connection = null; + + try { + connection = getConnectionRead(); + + String tempo = null; + Long begin = 0L; + + begin = Calendar.getInstance().getTimeInMillis(); + log.info("Buscando os registros BPR"); + ExportacaoBPR exportacaoBPR = fiscalDAO.buscarRegistroBPR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + log.info("Total de registros: " + exportacaoBPR.getListaRegistroBPR().size()); + tempo = infoTempo("BPR", begin); + log.info("Tempo na busca dos registros " + tempo); + + begin = Calendar.getInstance().getTimeInMillis(); + log.info("Buscando os registros PAR"); +// List listaRegistroRMDTipoPAR = fiscalDAO.buscarRegistroRMDTipoPAR(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + List listaRegistroRMDTipoPAR = exportacaoBPR.getListaRegistroBPRTipoPAR(); + log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); + tempo = infoTempo("PAR", begin); + log.info("Tempo na busca dos registros " + tempo); + + begin = Calendar.getInstance().getTimeInMillis(); + log.info("Buscando os registros RMD"); +// List listaRegistroRMDTipoRMD = fiscalDAO.buscarRegistroRMDTipoRMD(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + List listaRegistroRMDTipoRMD = exportacaoBPR.getListaRegistroBPRTipoRMD(); + log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); + tempo = infoTempo("RMD", begin); + log.info("Tempo na busca dos registros " + tempo); + +// begin = Calendar.getInstance().getTimeInMillis(); +// log.info("Buscando os registros BPS"); +// List listaRegistroRMDTipoBPS = fiscalDAO.buscarRegistroRMDTipoBPS(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + List listaRegistroRMDTipoBPS = null; +// log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); +// tempo = infoTempo("BPS", begin); +// log.info("Tempo na busca dos registros " + tempo); + +// begin = Calendar.getInstance().getTimeInMillis(); +// log.info("Buscando os registros DBP"); +// List listaRegistroRMDTipoDBP = fiscalDAO.buscarRegistroRMDTipoDBP(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + List listaRegistroRMDTipoDBP = null; +// log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); +// tempo = infoTempo("DBP", begin); +// log.info("Tempo na busca dos registros " + tempo); + + begin = Calendar.getInstance().getTimeInMillis(); + log.info("Buscando os registros BPS"); +// List listaRegistroRMDTipoSeqBPS = fiscalDAO.buscarRegistroRMDSeqTipoBPS(connection, inicio, fim, empresa.getEmpresaId(), estado.getCveestado()); + List listaRegistroRMDTipoSeqBPS = exportacaoBPR.getListaRegistroBPRTipoSeqBPS(); + log.info("Total de registros: " + listaRegistroRMDTipoPAR.size()); + tempo = infoTempo("BPS", begin); + log.info("Tempo na busca dos registros " + tempo); + + fiscalDAO.limparCache(connection); + + return exportacaoFiscal.gerarArquivoRMD(inicio, fim, nomeArquivo, empresa.getNombempresa(), listaRegistroRMDTipoPAR, listaRegistroRMDTipoRMD, listaRegistroRMDTipoBPS, + listaRegistroRMDTipoDBP, listaRegistroRMDTipoSeqBPS); + + } catch (Exception e) { + log.error(e.getMessage(), e); + + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + + throw new RuntimeException(e); + } + } + + return null; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FlywayUtilServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FlywayUtilServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/FlywayUtilServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FlywayUtilServiceImpl.java index 271a0f55e..7a762b16a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FlywayUtilServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FlywayUtilServiceImpl.java @@ -1,31 +1,31 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.FlywayUtilDAO; -import com.rjconsultores.ventaboletos.service.FlywayUtilService; - -@Service("flywayUtilService") -public class FlywayUtilServiceImpl implements FlywayUtilService { - - private static Logger log = LogManager.getLogger(FlywayUtilServiceImpl.class); - - @Autowired - private FlywayUtilDAO flywayUtilDAO; - - @Override - public boolean existeErroExecucaoScript() { - boolean existeErro = true; - try{ - existeErro = flywayUtilDAO.existeErroExecucaoScript(); - }catch(Throwable t){ - log.error("",t); - } - - return existeErro; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.FlywayUtilDAO; +import com.rjconsultores.ventaboletos.service.FlywayUtilService; + +@Service("flywayUtilService") +public class FlywayUtilServiceImpl implements FlywayUtilService { + + private static Logger log = LogManager.getLogger(FlywayUtilServiceImpl.class); + + @Autowired + private FlywayUtilDAO flywayUtilDAO; + + @Override + public boolean existeErroExecucaoScript() { + boolean existeErro = true; + try{ + existeErro = flywayUtilDAO.existeErroExecucaoScript(); + }catch(Throwable t){ + log.error("",t); + } + + return existeErro; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FolioPreimpresoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FolioPreimpresoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/FolioPreimpresoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FolioPreimpresoServiceImpl.java index 5e73fe54d..9edb9b8a3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FolioPreimpresoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FolioPreimpresoServiceImpl.java @@ -1,65 +1,65 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FolioPreimpresoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; -import com.rjconsultores.ventaboletos.service.FolioPreimpresoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("folioPreimpresoService") -public class FolioPreimpresoServiceImpl implements FolioPreimpresoService { - - @Autowired - private FolioPreimpresoDAO folioPreimpresoDAO; - - @Override - public List obtenerTodos() { - return folioPreimpresoDAO.obtenerTodos(); - } - - @Override - public FolioPreimpreso obtenerID(Integer id) { - return folioPreimpresoDAO.obtenerID(id); - } - - @Transactional - public FolioPreimpreso suscribir(FolioPreimpreso entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return folioPreimpresoDAO.suscribir(entidad); - } - - @Transactional - public FolioPreimpreso actualizacion(FolioPreimpreso entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return folioPreimpresoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(FolioPreimpreso entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - folioPreimpresoDAO.actualizacion(entidad); - } - - @Override - public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa) { - return folioPreimpresoDAO.buscaFolioPreImpressoEstacionImpresora(estacion, empresa); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FolioPreimpresoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.FolioPreimpreso; +import com.rjconsultores.ventaboletos.service.FolioPreimpresoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("folioPreimpresoService") +public class FolioPreimpresoServiceImpl implements FolioPreimpresoService { + + @Autowired + private FolioPreimpresoDAO folioPreimpresoDAO; + + @Override + public List obtenerTodos() { + return folioPreimpresoDAO.obtenerTodos(); + } + + @Override + public FolioPreimpreso obtenerID(Integer id) { + return folioPreimpresoDAO.obtenerID(id); + } + + @Transactional + public FolioPreimpreso suscribir(FolioPreimpreso entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return folioPreimpresoDAO.suscribir(entidad); + } + + @Transactional + public FolioPreimpreso actualizacion(FolioPreimpreso entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return folioPreimpresoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(FolioPreimpreso entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + folioPreimpresoDAO.actualizacion(entidad); + } + + @Override + public FolioPreimpreso buscaFolioPreImpressoEstacionImpresora(Estacion estacion, Empresa empresa) { + return folioPreimpresoDAO.buscaFolioPreImpressoEstacionImpresora(estacion, empresa); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoDetServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoDetServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/FormaPagoDetServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoDetServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/FormaPagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoServiceImpl.java index 8059afc61..3de6f2eff 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FormaPagoServiceImpl.java @@ -1,114 +1,114 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.FormaPagoDAO; -import com.rjconsultores.ventaboletos.entidad.FormaPago; -import com.rjconsultores.ventaboletos.service.FormaPagoService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Administrador - */ -@Service("formaPagoService") -public class FormaPagoServiceImpl implements FormaPagoService { - - private Integer[] formasPagoEspeciales = {4, 5, 6, 9, 10, 11, 96, 97, 98, 99}; - - @Autowired - private FormaPagoDAO formaPagoDAO; - private static Logger log = LogManager.getLogger(PuntoVentaServiceImpl.class); - @Autowired - private LogAuditoriaService logAuditoriaService; - - - public List obtenerTodos() { - return formaPagoDAO.obtenerTodos(); - } - - public FormaPago obtenerID(Short id) { - - - FormaPago formaPago = formaPagoDAO.obtenerID(id); - - try { - formaPago.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return formaPago; - - } - - @Transactional - public FormaPago suscribir(FormaPago entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - - formaPagoDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, null); - - return entidad; - } - - @Transactional - public FormaPago actualizacion(FormaPago entidad) { - - FormaPago originalClone = null; - try { - originalClone = entidad.getCloneObject(); - } catch (CloneNotSupportedException e) { - log.error(e.getMessage(), e); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - formaPagoDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, -1); - - return entidad; - } - - @Transactional - public void borrar(FormaPago entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - formaPagoDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, null); - } - - public List buscarPorDescricao(String descpago) { - return formaPagoDAO.buscarPorDescricao(descpago); - } - - public List buscarFormasPagoExceptoEspeciales() { - return formaPagoDAO.buscarTodosExceto(formasPagoEspeciales); - } - - public List buscarNotIn(Short... idFormaPago) { - return formaPagoDAO.buscarNotIn(idFormaPago); - } - - public List buscarIn(Short... idFormaPago) { - return formaPagoDAO.buscarIn(idFormaPago); - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.FormaPagoDAO; +import com.rjconsultores.ventaboletos.entidad.FormaPago; +import com.rjconsultores.ventaboletos.service.FormaPagoService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Administrador + */ +@Service("formaPagoService") +public class FormaPagoServiceImpl implements FormaPagoService { + + private Integer[] formasPagoEspeciales = {4, 5, 6, 9, 10, 11, 96, 97, 98, 99}; + + @Autowired + private FormaPagoDAO formaPagoDAO; + private static Logger log = LogManager.getLogger(PuntoVentaServiceImpl.class); + @Autowired + private LogAuditoriaService logAuditoriaService; + + + public List obtenerTodos() { + return formaPagoDAO.obtenerTodos(); + } + + public FormaPago obtenerID(Short id) { + + + FormaPago formaPago = formaPagoDAO.obtenerID(id); + + try { + formaPago.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return formaPago; + + } + + @Transactional + public FormaPago suscribir(FormaPago entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + + formaPagoDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, null); + + return entidad; + } + + @Transactional + public FormaPago actualizacion(FormaPago entidad) { + + FormaPago originalClone = null; + try { + originalClone = entidad.getCloneObject(); + } catch (CloneNotSupportedException e) { + log.error(e.getMessage(), e); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + formaPagoDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, -1); + + return entidad; + } + + @Transactional + public void borrar(FormaPago entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + formaPagoDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, null); + } + + public List buscarPorDescricao(String descpago) { + return formaPagoDAO.buscarPorDescricao(descpago); + } + + public List buscarFormasPagoExceptoEspeciales() { + return formaPagoDAO.buscarTodosExceto(formasPagoEspeciales); + } + + public List buscarNotIn(Short... idFormaPago) { + return formaPagoDAO.buscarNotIn(idFormaPago); + } + + public List buscarIn(Short... idFormaPago) { + return formaPagoDAO.buscarIn(idFormaPago); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FuncionSistemaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FuncionSistemaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/FuncionSistemaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/FuncionSistemaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_GestaoPricingService.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_GestaoPricingService.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_GestaoPricingService.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_GestaoPricingService.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingAsientoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingAsientoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingAsientoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingAsientoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCategoriaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCategoriaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClaseServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClaseServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClaseServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClaseServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClasseTarifariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClasseTarifariaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClasseTarifariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingClasseTarifariaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCorridaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCorridaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCorridaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingCorridaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingDiaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingDiaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingDiaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingDiaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoAgenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoAgenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoAgenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoAgenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCanalVendasServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCanalVendasServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCanalVendasServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCanalVendasServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCategoriaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoCategoriaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoOcupacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoOcupacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoOcupacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoOcupacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingEspecificoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingFormapagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingFormapagoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingFormapagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingFormapagoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingGestaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingGestaoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingGestaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingGestaoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingImporteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingImporteServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingImporteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingImporteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMercadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMercadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMercadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingMercadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingOcupaAntecipaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingOcupaAntecipaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingOcupaAntecipaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingOcupaAntecipaServiceImpl.java index 04baf2145..e9705d297 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingOcupaAntecipaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingOcupaAntecipaServiceImpl.java @@ -1,293 +1,293 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.dao.GP_PricingOcupaAntecipaDAO; -import com.rjconsultores.ventaboletos.entidad.GP_Pricing; -import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.GP_PricingOcupaAntecipaService; -import com.rjconsultores.ventaboletos.utilerias.TraslaparUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaLegendaVO; -import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaLegendaVO.GP_PricingOcupaAtencipaLegendaItemVO; -import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaPoltronasVO; -import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaVO; - -@Service("gp_pricingOcupacionService") -public class GP_PricingOcupaAntecipaServiceImpl implements GP_PricingOcupaAntecipaService { - - private static final Logger log = LogManager.getLogger(GP_PricingOcupaAntecipaServiceImpl.class); - - @Autowired - private GP_PricingOcupaAntecipaDAO pricingOcupacionDAO; - - @Transactional - public GP_PricingOcupaAntecipa suscribir(GP_PricingOcupaAntecipa entidad) throws BusinessException { - traslapa(entidad); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(GP_Pricing.ATIVO); - - return pricingOcupacionDAO.suscribir(entidad); - } - - @Transactional(rollbackFor = BusinessException.class) - public GP_PricingOcupaAntecipa actualizacion(GP_PricingOcupaAntecipa entidad) throws BusinessException { - traslapa(entidad); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(GP_Pricing.ATIVO); - - return pricingOcupacionDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(GP_PricingOcupaAntecipa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(GP_Pricing.EXCLUIDO); - - pricingOcupacionDAO.actualizacion(entidad); - } - - public List updateList(GP_PricingOcupaAntecipa pricingOcupaAntecipa) { - List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); - return lsSalvos; - } - - private void traslapa(GP_PricingOcupaAntecipa pricingOcupaAntecipa) throws BusinessException { - - List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); - - // removo o pricing que eu estou validando - lsSalvos.remove(pricingOcupaAntecipa); - - BigDecimal cantocupaini = pricingOcupaAntecipa.getOcupacioninicial(); - BigDecimal cantocupafin = pricingOcupaAntecipa.getOcupacionfinal(); - - boolean validaCantPorcentaje = ((cantocupaini != null) && (cantocupafin != null)); - - Integer cantasientosmin = pricingOcupaAntecipa.getCantasientosmin(); - Integer cantasientosmax = pricingOcupaAntecipa.getCantasientosmax(); - - boolean validaCantAsientos = ((cantasientosmin != null) && (cantasientosmax != null)); - - Integer cantdiasmin = pricingOcupaAntecipa.getCantdiasmin(); - Integer cantdiasmax = pricingOcupaAntecipa.getCantdiasmax(); - - boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null)); - - for (GP_PricingOcupaAntecipa poa : lsSalvos) { - boolean traslapaCantPorcentaje = false; - if (validaCantPorcentaje) { - if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) { - traslapaCantPorcentaje = TraslaparUtil.intersectNum(poa.getOcupacioninicial(), poa.getOcupacionfinal(), cantocupaini, cantocupafin); - } - } - - boolean traslapaCantAsiento = false; - if (validaCantAsientos) { - if ((poa.getCantasientosmin() != null) && (poa.getCantasientosmax() != null)) { - traslapaCantAsiento = TraslaparUtil.intersectNum(poa.getCantasientosmin(), poa.getCantasientosmax(), cantasientosmin, cantasientosmax); - } - } - - boolean traslapaCantDias = false; - if (validaCantDias) { - if ((poa.getCantdiasmin() != null) && (poa.getCantdiasmax() != null)) { - traslapaCantDias = TraslaparUtil.intersectNum(poa.getCantdiasmin(), poa.getCantdiasmax(), cantdiasmin, cantdiasmax); - } - } - - if ((traslapaCantPorcentaje || traslapaCantAsiento ) && traslapaCantDias ){ - List args = new ArrayList(); - String dias = poa.getCantdiasmin() + "-" + poa.getCantdiasmax(); - args.add(dias); - String faixa = null; - if(traslapaCantPorcentaje) { - faixa = poa.getOcupacioninicial() + "-" + poa.getOcupacionfinal(); - } - if(traslapaCantAsiento) { - faixa = poa.getCantasientosmin() + "-" + poa.getCantasientosmax(); - } - args.add(faixa); - log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId()); - throw new BusinessException("pricingOcupaAntecipaServiceImpl.msg.traslapa", args.toArray()); - } - - } - - } - - @Override - public List carregarPricingOcupaAntecipaVO(Integer pricingId) { - List pricingOcupaAntecipas = carregarPricingOcupaAntecipa(pricingId); - return carregarPricingOcupaAntecipaVO(pricingOcupaAntecipas); - } - - @Override - public List carregarPricingOcupaAntecipaVO(List pricingOcupaAntecipas) { - List aux = new ArrayList(); - - for (GP_PricingOcupaAntecipa ocupacaoAntecipa: pricingOcupaAntecipas) { - Integer cantdiasmax = ocupacaoAntecipa.getCantdiasmax() != null ? ocupacaoAntecipa.getCantdiasmax() : GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT; - GP_PricingOcupaAntecipaVO ocupacao = new GP_PricingOcupaAntecipaVO(); - - ocupacao.setPricingocupaantecipaId(ocupacaoAntecipa.getPricingocupaantecipaId()); - ocupacao.setDias(ocupacaoAntecipa.getCantdiasmin() + "-" + cantdiasmax); - ocupacao.setDiaMin(ocupacaoAntecipa.getCantdiasmin()); - int linhaMax = cantdiasmax.equals(GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT) ? ocupacaoAntecipa.getCantdiasmin() + 10 : cantdiasmax; - if(linhaMax > GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT) { - linhaMax = GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT; - } - - ocupacao.setDiaMax(linhaMax); - - if(ocupacaoAntecipa.getOcupacioninicial() != null && ocupacaoAntecipa.getOcupacionfinal() != null) { - ocupacao.setOcupMin(ocupacaoAntecipa.getOcupacioninicial().intValue()); - ocupacao.setOcupMax(ocupacaoAntecipa.getOcupacionfinal().intValue()); - } else if(ocupacaoAntecipa.getCantasientosmin() != null && ocupacaoAntecipa.getCantasientosmax() != null) { - ocupacao.setOcupMin(ocupacaoAntecipa.getCantasientosmin().intValue()); - ocupacao.setOcupMax(ocupacaoAntecipa.getCantasientosmax().intValue()); - } - ocupacao.setCor(ocupacaoAntecipa.getCor()); - ocupacao.setPercentual(ocupacaoAntecipa.getPorcentaje()); - - ocupacao.marcarPoltronas(); - - aux.add(ocupacao); - } - - Collections.sort(aux, new Comparator() { - - @Override - public int compare(GP_PricingOcupaAntecipaVO o1, GP_PricingOcupaAntecipaVO o2) { - int retorno = o1.getDiaMin().compareTo(o2.getDiaMax()); - return retorno; - } - }); - - - List retorno = new ArrayList(); - for (GP_PricingOcupaAntecipaVO pricingOcupacaoAntecipa : aux) { - retorno.addAll(gerarDados(pricingOcupacaoAntecipa)); - } - - retorno = agruparMesmoDias(retorno); - - if(retorno.size() >= 3) { - retorno.get(retorno.size() - 2).setAuxDesc("..."); - } - - if(retorno.size() >= 2) { - retorno.get(retorno.size() - 1).setAuxDesc(GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT.toString()); - } - - return retorno; - } - - private List agruparMesmoDias(List lsOcupacaoAntecipas) { - List retorno = new ArrayList(); - for (GP_PricingOcupaAntecipaVO pricingOcupacaoAntecipa : lsOcupacaoAntecipas) { - GP_PricingOcupaAntecipaVO aux = new GP_PricingOcupaAntecipaVO(pricingOcupacaoAntecipa, true); - if(retorno.isEmpty() || !retorno.contains(aux)) { - retorno.add(aux); - } else { - int index = retorno.indexOf(pricingOcupacaoAntecipa); - retorno.get(index).getPoltronas().addAll(aux.getPoltronas()); - } - } - - adicionarPoltronasNaoMarcadas(retorno); - - return retorno; - } - - private void adicionarPoltronasNaoMarcadas(List lsRetorno) { - for (GP_PricingOcupaAntecipaVO pricingOcupacaoAntecipa : lsRetorno) { - List poltronasPadrao = GP_PricingOcupaAntecipaPoltronasVO.carregarPoltronasPadrao(); - poltronasPadrao.removeAll(pricingOcupacaoAntecipa.getPoltronas()); - pricingOcupacaoAntecipa.getPoltronas().addAll(poltronasPadrao); - Collections.sort(pricingOcupacaoAntecipa.getPoltronas(), new Comparator() { - @Override - public int compare(GP_PricingOcupaAntecipaPoltronasVO o1, GP_PricingOcupaAntecipaPoltronasVO o2) { - return o1.getPoltrona().compareTo(o2.getPoltrona()); - } - }); - } - } - - private List gerarDados(GP_PricingOcupaAntecipaVO ocupacao) { - List retorno = new ArrayList(); - for (int i = ocupacao.getDiaMin(); i <= ocupacao.getDiaMax(); i++) { - GP_PricingOcupaAntecipaVO pricingOcupacao = new GP_PricingOcupaAntecipaVO(ocupacao); - pricingOcupacao.setAntecipacao(i); - retorno.add(pricingOcupacao); - } - return retorno; - } - - @Override - public List carregarPricingOcupaAntecipaLegenda(Integer pricingId) { - List lsPricingOcupaAntecipa = carregarPricingOcupaAntecipa(pricingId); - - return carregarPricingOcupaAntecipaLegenda(lsPricingOcupaAntecipa); - } - - @Override - public List carregarPricingOcupaAntecipaLegenda(List lsPricingOcupaAntecipa) { - NumberFormat nf = NumberFormat.getPercentInstance(); - nf.setMaximumFractionDigits(2); - nf.setMinimumFractionDigits(2); - - GP_PricingOcupaAntecipaLegendaVO legendaDias = new GP_PricingOcupaAntecipaLegendaVO(); - GP_PricingOcupaAntecipaLegendaVO legendaPercentuais = new GP_PricingOcupaAntecipaLegendaVO(); - legendaDias.setLegenda(Labels.getLabel("editarPricingController.legenda.label")); - legendaDias.setItens(new ArrayList()); - legendaPercentuais.setItens(new ArrayList()); - for (GP_PricingOcupaAntecipa ocupaAntecipa : lsPricingOcupaAntecipa) { - Integer cantdiasmax = ocupaAntecipa.getCantdiasmax() != null ? ocupaAntecipa.getCantdiasmax() : GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT; - String dias = ocupaAntecipa.getCantdiasmin() + "-" + cantdiasmax; - GP_PricingOcupaAtencipaLegendaItemVO auxDias = legendaDias.new GP_PricingOcupaAtencipaLegendaItemVO(dias, nf.format(ocupaAntecipa.getPorcentaje().doubleValue()/100), ocupaAntecipa.getCor(), dias, ocupaAntecipa.getPricingocupaantecipaId()); - GP_PricingOcupaAtencipaLegendaItemVO auxPercentual = legendaDias.new GP_PricingOcupaAtencipaLegendaItemVO(nf.format(ocupaAntecipa.getPorcentaje().doubleValue()/100), nf.format(ocupaAntecipa.getPorcentaje().doubleValue()/100), ocupaAntecipa.getCor(), dias, ocupaAntecipa.getPricingocupaantecipaId()); - if(!legendaDias.getItens().contains(auxDias)) { - legendaDias.getItens().add(auxDias); - legendaPercentuais.getItens().add(auxPercentual); - } - } - List retorno = new ArrayList(); - retorno.add(legendaDias); - retorno.add(legendaPercentuais); - return retorno; - } - - @Override - public GP_PricingOcupaAntecipa obtenerID(Integer pricingocupaantecipaId) throws BusinessException { - return pricingOcupacionDAO.obtenerID(pricingocupaantecipaId); - } - - @Override - public List carregarPricingOcupaAntecipa(Integer pricingId) { - return pricingOcupacionDAO.buscarOcupaAntecipaPricingAtivos(pricingId); - } - - @Override - public List obtenerTodoPorPricing(GP_Pricing pricing) { - return pricingOcupacionDAO.obtenerTodoPorPricing(pricing); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.dao.GP_PricingOcupaAntecipaDAO; +import com.rjconsultores.ventaboletos.entidad.GP_Pricing; +import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.GP_PricingOcupaAntecipaService; +import com.rjconsultores.ventaboletos.utilerias.TraslaparUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaLegendaVO; +import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaLegendaVO.GP_PricingOcupaAtencipaLegendaItemVO; +import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaPoltronasVO; +import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingOcupaAntecipaVO; + +@Service("gp_pricingOcupacionService") +public class GP_PricingOcupaAntecipaServiceImpl implements GP_PricingOcupaAntecipaService { + + private static final Logger log = LogManager.getLogger(GP_PricingOcupaAntecipaServiceImpl.class); + + @Autowired + private GP_PricingOcupaAntecipaDAO pricingOcupacionDAO; + + @Transactional + public GP_PricingOcupaAntecipa suscribir(GP_PricingOcupaAntecipa entidad) throws BusinessException { + traslapa(entidad); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(GP_Pricing.ATIVO); + + return pricingOcupacionDAO.suscribir(entidad); + } + + @Transactional(rollbackFor = BusinessException.class) + public GP_PricingOcupaAntecipa actualizacion(GP_PricingOcupaAntecipa entidad) throws BusinessException { + traslapa(entidad); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(GP_Pricing.ATIVO); + + return pricingOcupacionDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(GP_PricingOcupaAntecipa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(GP_Pricing.EXCLUIDO); + + pricingOcupacionDAO.actualizacion(entidad); + } + + public List updateList(GP_PricingOcupaAntecipa pricingOcupaAntecipa) { + List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); + return lsSalvos; + } + + private void traslapa(GP_PricingOcupaAntecipa pricingOcupaAntecipa) throws BusinessException { + + List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); + + // removo o pricing que eu estou validando + lsSalvos.remove(pricingOcupaAntecipa); + + BigDecimal cantocupaini = pricingOcupaAntecipa.getOcupacioninicial(); + BigDecimal cantocupafin = pricingOcupaAntecipa.getOcupacionfinal(); + + boolean validaCantPorcentaje = ((cantocupaini != null) && (cantocupafin != null)); + + Integer cantasientosmin = pricingOcupaAntecipa.getCantasientosmin(); + Integer cantasientosmax = pricingOcupaAntecipa.getCantasientosmax(); + + boolean validaCantAsientos = ((cantasientosmin != null) && (cantasientosmax != null)); + + Integer cantdiasmin = pricingOcupaAntecipa.getCantdiasmin(); + Integer cantdiasmax = pricingOcupaAntecipa.getCantdiasmax(); + + boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null)); + + for (GP_PricingOcupaAntecipa poa : lsSalvos) { + boolean traslapaCantPorcentaje = false; + if (validaCantPorcentaje) { + if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) { + traslapaCantPorcentaje = TraslaparUtil.intersectNum(poa.getOcupacioninicial(), poa.getOcupacionfinal(), cantocupaini, cantocupafin); + } + } + + boolean traslapaCantAsiento = false; + if (validaCantAsientos) { + if ((poa.getCantasientosmin() != null) && (poa.getCantasientosmax() != null)) { + traslapaCantAsiento = TraslaparUtil.intersectNum(poa.getCantasientosmin(), poa.getCantasientosmax(), cantasientosmin, cantasientosmax); + } + } + + boolean traslapaCantDias = false; + if (validaCantDias) { + if ((poa.getCantdiasmin() != null) && (poa.getCantdiasmax() != null)) { + traslapaCantDias = TraslaparUtil.intersectNum(poa.getCantdiasmin(), poa.getCantdiasmax(), cantdiasmin, cantdiasmax); + } + } + + if ((traslapaCantPorcentaje || traslapaCantAsiento ) && traslapaCantDias ){ + List args = new ArrayList(); + String dias = poa.getCantdiasmin() + "-" + poa.getCantdiasmax(); + args.add(dias); + String faixa = null; + if(traslapaCantPorcentaje) { + faixa = poa.getOcupacioninicial() + "-" + poa.getOcupacionfinal(); + } + if(traslapaCantAsiento) { + faixa = poa.getCantasientosmin() + "-" + poa.getCantasientosmax(); + } + args.add(faixa); + log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId()); + throw new BusinessException("pricingOcupaAntecipaServiceImpl.msg.traslapa", args.toArray()); + } + + } + + } + + @Override + public List carregarPricingOcupaAntecipaVO(Integer pricingId) { + List pricingOcupaAntecipas = carregarPricingOcupaAntecipa(pricingId); + return carregarPricingOcupaAntecipaVO(pricingOcupaAntecipas); + } + + @Override + public List carregarPricingOcupaAntecipaVO(List pricingOcupaAntecipas) { + List aux = new ArrayList(); + + for (GP_PricingOcupaAntecipa ocupacaoAntecipa: pricingOcupaAntecipas) { + Integer cantdiasmax = ocupacaoAntecipa.getCantdiasmax() != null ? ocupacaoAntecipa.getCantdiasmax() : GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT; + GP_PricingOcupaAntecipaVO ocupacao = new GP_PricingOcupaAntecipaVO(); + + ocupacao.setPricingocupaantecipaId(ocupacaoAntecipa.getPricingocupaantecipaId()); + ocupacao.setDias(ocupacaoAntecipa.getCantdiasmin() + "-" + cantdiasmax); + ocupacao.setDiaMin(ocupacaoAntecipa.getCantdiasmin()); + int linhaMax = cantdiasmax.equals(GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT) ? ocupacaoAntecipa.getCantdiasmin() + 10 : cantdiasmax; + if(linhaMax > GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT) { + linhaMax = GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT; + } + + ocupacao.setDiaMax(linhaMax); + + if(ocupacaoAntecipa.getOcupacioninicial() != null && ocupacaoAntecipa.getOcupacionfinal() != null) { + ocupacao.setOcupMin(ocupacaoAntecipa.getOcupacioninicial().intValue()); + ocupacao.setOcupMax(ocupacaoAntecipa.getOcupacionfinal().intValue()); + } else if(ocupacaoAntecipa.getCantasientosmin() != null && ocupacaoAntecipa.getCantasientosmax() != null) { + ocupacao.setOcupMin(ocupacaoAntecipa.getCantasientosmin().intValue()); + ocupacao.setOcupMax(ocupacaoAntecipa.getCantasientosmax().intValue()); + } + ocupacao.setCor(ocupacaoAntecipa.getCor()); + ocupacao.setPercentual(ocupacaoAntecipa.getPorcentaje()); + + ocupacao.marcarPoltronas(); + + aux.add(ocupacao); + } + + Collections.sort(aux, new Comparator() { + + @Override + public int compare(GP_PricingOcupaAntecipaVO o1, GP_PricingOcupaAntecipaVO o2) { + int retorno = o1.getDiaMin().compareTo(o2.getDiaMax()); + return retorno; + } + }); + + + List retorno = new ArrayList(); + for (GP_PricingOcupaAntecipaVO pricingOcupacaoAntecipa : aux) { + retorno.addAll(gerarDados(pricingOcupacaoAntecipa)); + } + + retorno = agruparMesmoDias(retorno); + + if(retorno.size() >= 3) { + retorno.get(retorno.size() - 2).setAuxDesc("..."); + } + + if(retorno.size() >= 2) { + retorno.get(retorno.size() - 1).setAuxDesc(GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT.toString()); + } + + return retorno; + } + + private List agruparMesmoDias(List lsOcupacaoAntecipas) { + List retorno = new ArrayList(); + for (GP_PricingOcupaAntecipaVO pricingOcupacaoAntecipa : lsOcupacaoAntecipas) { + GP_PricingOcupaAntecipaVO aux = new GP_PricingOcupaAntecipaVO(pricingOcupacaoAntecipa, true); + if(retorno.isEmpty() || !retorno.contains(aux)) { + retorno.add(aux); + } else { + int index = retorno.indexOf(pricingOcupacaoAntecipa); + retorno.get(index).getPoltronas().addAll(aux.getPoltronas()); + } + } + + adicionarPoltronasNaoMarcadas(retorno); + + return retorno; + } + + private void adicionarPoltronasNaoMarcadas(List lsRetorno) { + for (GP_PricingOcupaAntecipaVO pricingOcupacaoAntecipa : lsRetorno) { + List poltronasPadrao = GP_PricingOcupaAntecipaPoltronasVO.carregarPoltronasPadrao(); + poltronasPadrao.removeAll(pricingOcupacaoAntecipa.getPoltronas()); + pricingOcupacaoAntecipa.getPoltronas().addAll(poltronasPadrao); + Collections.sort(pricingOcupacaoAntecipa.getPoltronas(), new Comparator() { + @Override + public int compare(GP_PricingOcupaAntecipaPoltronasVO o1, GP_PricingOcupaAntecipaPoltronasVO o2) { + return o1.getPoltrona().compareTo(o2.getPoltrona()); + } + }); + } + } + + private List gerarDados(GP_PricingOcupaAntecipaVO ocupacao) { + List retorno = new ArrayList(); + for (int i = ocupacao.getDiaMin(); i <= ocupacao.getDiaMax(); i++) { + GP_PricingOcupaAntecipaVO pricingOcupacao = new GP_PricingOcupaAntecipaVO(ocupacao); + pricingOcupacao.setAntecipacao(i); + retorno.add(pricingOcupacao); + } + return retorno; + } + + @Override + public List carregarPricingOcupaAntecipaLegenda(Integer pricingId) { + List lsPricingOcupaAntecipa = carregarPricingOcupaAntecipa(pricingId); + + return carregarPricingOcupaAntecipaLegenda(lsPricingOcupaAntecipa); + } + + @Override + public List carregarPricingOcupaAntecipaLegenda(List lsPricingOcupaAntecipa) { + NumberFormat nf = NumberFormat.getPercentInstance(); + nf.setMaximumFractionDigits(2); + nf.setMinimumFractionDigits(2); + + GP_PricingOcupaAntecipaLegendaVO legendaDias = new GP_PricingOcupaAntecipaLegendaVO(); + GP_PricingOcupaAntecipaLegendaVO legendaPercentuais = new GP_PricingOcupaAntecipaLegendaVO(); + legendaDias.setLegenda(Labels.getLabel("editarPricingController.legenda.label")); + legendaDias.setItens(new ArrayList()); + legendaPercentuais.setItens(new ArrayList()); + for (GP_PricingOcupaAntecipa ocupaAntecipa : lsPricingOcupaAntecipa) { + Integer cantdiasmax = ocupaAntecipa.getCantdiasmax() != null ? ocupaAntecipa.getCantdiasmax() : GP_PricingOcupaAntecipaVO.CANTDIASMAXDEFAULT; + String dias = ocupaAntecipa.getCantdiasmin() + "-" + cantdiasmax; + GP_PricingOcupaAtencipaLegendaItemVO auxDias = legendaDias.new GP_PricingOcupaAtencipaLegendaItemVO(dias, nf.format(ocupaAntecipa.getPorcentaje().doubleValue()/100), ocupaAntecipa.getCor(), dias, ocupaAntecipa.getPricingocupaantecipaId()); + GP_PricingOcupaAtencipaLegendaItemVO auxPercentual = legendaDias.new GP_PricingOcupaAtencipaLegendaItemVO(nf.format(ocupaAntecipa.getPorcentaje().doubleValue()/100), nf.format(ocupaAntecipa.getPorcentaje().doubleValue()/100), ocupaAntecipa.getCor(), dias, ocupaAntecipa.getPricingocupaantecipaId()); + if(!legendaDias.getItens().contains(auxDias)) { + legendaDias.getItens().add(auxDias); + legendaPercentuais.getItens().add(auxPercentual); + } + } + List retorno = new ArrayList(); + retorno.add(legendaDias); + retorno.add(legendaPercentuais); + return retorno; + } + + @Override + public GP_PricingOcupaAntecipa obtenerID(Integer pricingocupaantecipaId) throws BusinessException { + return pricingOcupacionDAO.obtenerID(pricingocupaantecipaId); + } + + @Override + public List carregarPricingOcupaAntecipa(Integer pricingId) { + return pricingOcupacionDAO.buscarOcupaAntecipaPricingAtivos(pricingId); + } + + @Override + public List obtenerTodoPorPricing(GP_Pricing pricing) { + return pricingOcupacionDAO.obtenerTodoPorPricing(pricing); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRevisaoValoresServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRevisaoValoresServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRevisaoValoresServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRevisaoValoresServiceImpl.java index 5499bdbf7..87bff4c48 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRevisaoValoresServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRevisaoValoresServiceImpl.java @@ -1,186 +1,186 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; -import com.rjconsultores.ventaboletos.dao.GP_PricingDAO; -import com.rjconsultores.ventaboletos.dao.TramoDAO; -import com.rjconsultores.ventaboletos.entidad.GP_PricingClase; -import com.rjconsultores.ventaboletos.entidad.GP_PricingCorrida; -import com.rjconsultores.ventaboletos.entidad.GP_PricingMarca; -import com.rjconsultores.ventaboletos.entidad.GP_PricingMercado; -import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa; -import com.rjconsultores.ventaboletos.entidad.GP_PricingRuta; -import com.rjconsultores.ventaboletos.entidad.GP_PricingVigencia; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.service.GP_PricingRevisaoValoresService; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingRevisaoValoresVO; - -@Service("gp_pricingRevisaoValoresService") -public class GP_PricingRevisaoValoresServiceImpl implements GP_PricingRevisaoValoresService { - - private static final Logger log = LogManager.getLogger(GP_PricingRevisaoValoresServiceImpl.class); - - @Autowired - private GP_PricingDAO pricingDAO; - @Autowired - private TramoDAO tramoDao; - @Autowired - private CorridaTramoDAO corridaTramoDAO; - - private static final BigDecimal HUNDRED = new BigDecimal(100); - - - @Override - public List obtenerTodos() { - return null; - } - - @Override - public GP_PricingRevisaoValoresVO obtenerID(Long id) { - return null; - } - - @Override - public GP_PricingRevisaoValoresVO suscribir(GP_PricingRevisaoValoresVO entidad) { - return null; - } - - @Override - public GP_PricingRevisaoValoresVO actualizacion(GP_PricingRevisaoValoresVO entidad) { - return null; - } - - @Override - public void borrar(GP_PricingRevisaoValoresVO entidad) { - } - - public List buscarPricingRevisaoValoresVO(List lsPricingVigencia, - List lsPricingClase, - List lsPricingMarca, List lsPricingMercado, - List lsPricingOcupaAntecipa, List lsPricingCorrida, - List lsPricingRuta) { - List classeServicioIds = validaPricingClasseServico(lsPricingClase); - List marcaIds = validaPricingMarca(lsPricingMarca); - List rutaIds = validaPricingRuta(lsPricingRuta); - List tramoIds = validaPricingTramo(lsPricingMercado); - tramoIds = validaPricingCorrida(lsPricingCorrida, tramoIds); - - - List pricingRevisaoValoresVOs = pricingDAO.buscarPricingRevisaoValoresVO(classeServicioIds, marcaIds, rutaIds, tramoIds ,lsPricingVigencia); - return validaDescontosCadastradosPricing(pricingRevisaoValoresVOs, lsPricingOcupaAntecipa); - } - - private List validaDescontosCadastradosPricing(List pricingRevisaoValoresVOs, List lsPricingOcupaAntecipa) { - List retornoPricingRevisaoValoresVOs = new ArrayList(); - if(!lsPricingOcupaAntecipa.isEmpty()) { - for (GP_PricingOcupaAntecipa gp_PricingOcupaAntecipa : lsPricingOcupaAntecipa) { - for (GP_PricingRevisaoValoresVO gp_PricingRevisaoValoresVO : pricingRevisaoValoresVOs) { - GP_PricingRevisaoValoresVO revisaoValoresVO = new GP_PricingRevisaoValoresVO(gp_PricingRevisaoValoresVO); - BigDecimal tarifaPricing = BigDecimal.ZERO; - String desconto = null; - String antecipacao = null; - String ocupacao = null; - if(gp_PricingOcupaAntecipa.getPorcentaje()!= null) { - tarifaPricing = MoneyHelper.getValorDescontadoPercentual(gp_PricingRevisaoValoresVO.getTarifaAtual(), gp_PricingOcupaAntecipa.getPorcentaje()); - desconto = gp_PricingOcupaAntecipa.getPorcentaje()+"%"; - }else { - tarifaPricing = gp_PricingRevisaoValoresVO.getTarifaAtual().subtract( gp_PricingOcupaAntecipa.getImporte()); - desconto = MoneyHelper.getValor(gp_PricingOcupaAntecipa.getImporte()); - } - antecipacao = gp_PricingOcupaAntecipa.getCantdiasmin() +" - "+ gp_PricingOcupaAntecipa.getCantdiasmax(); - ocupacao = gp_PricingOcupaAntecipa.getOcupacioninicial() +" - "+ gp_PricingOcupaAntecipa.getOcupacionfinal(); - revisaoValoresVO.setTarifaComPricing(tarifaPricing); - revisaoValoresVO.setDesconto(desconto); - revisaoValoresVO.setAntecipacao(antecipacao); - revisaoValoresVO.setOcupacao(ocupacao); - retornoPricingRevisaoValoresVOs.add(revisaoValoresVO); - } - } - - } - - return retornoPricingRevisaoValoresVOs; - } - - private List validaPricingCorrida(List lsPricingCorrida, List tramoIds) { - Set tramosCorrida = new HashSet(tramoIds); - for (GP_PricingCorrida gp_PricingCorrida : lsPricingCorrida) { - List listTramo = corridaTramoDAO.buscarTramoPorCorridaId(gp_PricingCorrida.getCorridaCtrl().getCorridaId()); - for (Tramo tramo : listTramo) { - tramosCorrida.add(tramo.getTramoId()); - } - } - return new ArrayList(tramosCorrida); - } - - private List validaPricingTramo(List lsPricingMercado) { - List tramos = new ArrayList(); - for (GP_PricingMercado gp_PricingMercado : lsPricingMercado) { - tramos = tramoDao.obtenerTramosPorOrigemDestino(gp_PricingMercado.getOrigen(), gp_PricingMercado.getDestino()); - } - Set tramosIds = new HashSet(); - if(tramos!= null && !tramos.isEmpty()) { - for (Tramo tramo : tramos) { - tramosIds.add(tramo.getTramoId()); - } - } - - - return new ArrayList(tramosIds); - } - - private List validaPricingRuta(List lsPricingRuta) { - List rutaIds = null; - if (!lsPricingRuta.isEmpty()) { - rutaIds = new ArrayList(); - for (GP_PricingRuta ruta : lsPricingRuta) { - if (ruta.getRuta().getRutaId() != -1) { - rutaIds.add(ruta.getRuta().getRutaId()); - } - } - } - return rutaIds; - } - - private List validaPricingMarca(List lsPricingMarca) { - List marcaIds = null; - if (!lsPricingMarca.isEmpty()) { - marcaIds = new ArrayList(); - for (GP_PricingMarca marca : lsPricingMarca) { - if (marca.getMarca().getMarcaId() != -1) { - marcaIds.add(marca.getMarca().getMarcaId().intValue()); - } - } - } - return marcaIds; - } - - /** - * @param lsPricingClase - * @return - */ - private List validaPricingClasseServico(List lsPricingClase) { - List classeServicioIds = null; - if (!lsPricingClase.isEmpty()) { - classeServicioIds = new ArrayList(); - for (GP_PricingClase clase : lsPricingClase) { - if (clase.getClaseServicio().getClaseservicioId() != -1) { - classeServicioIds.add(clase.getClaseServicio().getClaseservicioId()); - } - } - } - return classeServicioIds; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; +import com.rjconsultores.ventaboletos.dao.GP_PricingDAO; +import com.rjconsultores.ventaboletos.dao.TramoDAO; +import com.rjconsultores.ventaboletos.entidad.GP_PricingClase; +import com.rjconsultores.ventaboletos.entidad.GP_PricingCorrida; +import com.rjconsultores.ventaboletos.entidad.GP_PricingMarca; +import com.rjconsultores.ventaboletos.entidad.GP_PricingMercado; +import com.rjconsultores.ventaboletos.entidad.GP_PricingOcupaAntecipa; +import com.rjconsultores.ventaboletos.entidad.GP_PricingRuta; +import com.rjconsultores.ventaboletos.entidad.GP_PricingVigencia; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.service.GP_PricingRevisaoValoresService; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.vo.pricing.GP_PricingRevisaoValoresVO; + +@Service("gp_pricingRevisaoValoresService") +public class GP_PricingRevisaoValoresServiceImpl implements GP_PricingRevisaoValoresService { + + private static final Logger log = LogManager.getLogger(GP_PricingRevisaoValoresServiceImpl.class); + + @Autowired + private GP_PricingDAO pricingDAO; + @Autowired + private TramoDAO tramoDao; + @Autowired + private CorridaTramoDAO corridaTramoDAO; + + private static final BigDecimal HUNDRED = new BigDecimal(100); + + + @Override + public List obtenerTodos() { + return null; + } + + @Override + public GP_PricingRevisaoValoresVO obtenerID(Long id) { + return null; + } + + @Override + public GP_PricingRevisaoValoresVO suscribir(GP_PricingRevisaoValoresVO entidad) { + return null; + } + + @Override + public GP_PricingRevisaoValoresVO actualizacion(GP_PricingRevisaoValoresVO entidad) { + return null; + } + + @Override + public void borrar(GP_PricingRevisaoValoresVO entidad) { + } + + public List buscarPricingRevisaoValoresVO(List lsPricingVigencia, + List lsPricingClase, + List lsPricingMarca, List lsPricingMercado, + List lsPricingOcupaAntecipa, List lsPricingCorrida, + List lsPricingRuta) { + List classeServicioIds = validaPricingClasseServico(lsPricingClase); + List marcaIds = validaPricingMarca(lsPricingMarca); + List rutaIds = validaPricingRuta(lsPricingRuta); + List tramoIds = validaPricingTramo(lsPricingMercado); + tramoIds = validaPricingCorrida(lsPricingCorrida, tramoIds); + + + List pricingRevisaoValoresVOs = pricingDAO.buscarPricingRevisaoValoresVO(classeServicioIds, marcaIds, rutaIds, tramoIds ,lsPricingVigencia); + return validaDescontosCadastradosPricing(pricingRevisaoValoresVOs, lsPricingOcupaAntecipa); + } + + private List validaDescontosCadastradosPricing(List pricingRevisaoValoresVOs, List lsPricingOcupaAntecipa) { + List retornoPricingRevisaoValoresVOs = new ArrayList(); + if(!lsPricingOcupaAntecipa.isEmpty()) { + for (GP_PricingOcupaAntecipa gp_PricingOcupaAntecipa : lsPricingOcupaAntecipa) { + for (GP_PricingRevisaoValoresVO gp_PricingRevisaoValoresVO : pricingRevisaoValoresVOs) { + GP_PricingRevisaoValoresVO revisaoValoresVO = new GP_PricingRevisaoValoresVO(gp_PricingRevisaoValoresVO); + BigDecimal tarifaPricing = BigDecimal.ZERO; + String desconto = null; + String antecipacao = null; + String ocupacao = null; + if(gp_PricingOcupaAntecipa.getPorcentaje()!= null) { + tarifaPricing = MoneyHelper.getValorDescontadoPercentual(gp_PricingRevisaoValoresVO.getTarifaAtual(), gp_PricingOcupaAntecipa.getPorcentaje()); + desconto = gp_PricingOcupaAntecipa.getPorcentaje()+"%"; + }else { + tarifaPricing = gp_PricingRevisaoValoresVO.getTarifaAtual().subtract( gp_PricingOcupaAntecipa.getImporte()); + desconto = MoneyHelper.getValor(gp_PricingOcupaAntecipa.getImporte()); + } + antecipacao = gp_PricingOcupaAntecipa.getCantdiasmin() +" - "+ gp_PricingOcupaAntecipa.getCantdiasmax(); + ocupacao = gp_PricingOcupaAntecipa.getOcupacioninicial() +" - "+ gp_PricingOcupaAntecipa.getOcupacionfinal(); + revisaoValoresVO.setTarifaComPricing(tarifaPricing); + revisaoValoresVO.setDesconto(desconto); + revisaoValoresVO.setAntecipacao(antecipacao); + revisaoValoresVO.setOcupacao(ocupacao); + retornoPricingRevisaoValoresVOs.add(revisaoValoresVO); + } + } + + } + + return retornoPricingRevisaoValoresVOs; + } + + private List validaPricingCorrida(List lsPricingCorrida, List tramoIds) { + Set tramosCorrida = new HashSet(tramoIds); + for (GP_PricingCorrida gp_PricingCorrida : lsPricingCorrida) { + List listTramo = corridaTramoDAO.buscarTramoPorCorridaId(gp_PricingCorrida.getCorridaCtrl().getCorridaId()); + for (Tramo tramo : listTramo) { + tramosCorrida.add(tramo.getTramoId()); + } + } + return new ArrayList(tramosCorrida); + } + + private List validaPricingTramo(List lsPricingMercado) { + List tramos = new ArrayList(); + for (GP_PricingMercado gp_PricingMercado : lsPricingMercado) { + tramos = tramoDao.obtenerTramosPorOrigemDestino(gp_PricingMercado.getOrigen(), gp_PricingMercado.getDestino()); + } + Set tramosIds = new HashSet(); + if(tramos!= null && !tramos.isEmpty()) { + for (Tramo tramo : tramos) { + tramosIds.add(tramo.getTramoId()); + } + } + + + return new ArrayList(tramosIds); + } + + private List validaPricingRuta(List lsPricingRuta) { + List rutaIds = null; + if (!lsPricingRuta.isEmpty()) { + rutaIds = new ArrayList(); + for (GP_PricingRuta ruta : lsPricingRuta) { + if (ruta.getRuta().getRutaId() != -1) { + rutaIds.add(ruta.getRuta().getRutaId()); + } + } + } + return rutaIds; + } + + private List validaPricingMarca(List lsPricingMarca) { + List marcaIds = null; + if (!lsPricingMarca.isEmpty()) { + marcaIds = new ArrayList(); + for (GP_PricingMarca marca : lsPricingMarca) { + if (marca.getMarca().getMarcaId() != -1) { + marcaIds.add(marca.getMarca().getMarcaId().intValue()); + } + } + } + return marcaIds; + } + + /** + * @param lsPricingClase + * @return + */ + private List validaPricingClasseServico(List lsPricingClase) { + List classeServicioIds = null; + if (!lsPricingClase.isEmpty()) { + classeServicioIds = new ArrayList(); + for (GP_PricingClase clase : lsPricingClase) { + if (clase.getClaseServicio().getClaseservicioId() != -1) { + classeServicioIds.add(clase.getClaseServicio().getClaseservicioId()); + } + } + } + return classeServicioIds; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRutaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingRutaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoPtoVtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoPtoVtaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoPtoVtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoPtoVtaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingTipoServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingVigenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingVigenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GP_PricingVigenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingVigenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GrupoCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoCategoriaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/GrupoCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoCategoriaServiceImpl.java index 6824b5b04..392655675 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/GrupoCategoriaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoCategoriaServiceImpl.java @@ -1,60 +1,60 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.GrupoCategoriaDAO; -import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; -import com.rjconsultores.ventaboletos.service.GrupoCategoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("grupoCategoriaService") -public class GrupoCategoriaServiceImpl implements GrupoCategoriaService { - - @Autowired - private GrupoCategoriaDAO grupoCategoriaDAO; - - public List obtenerTodos() { - return grupoCategoriaDAO.obtenerTodos(); - } - - public GrupoCategoria obtenerID(Integer id) { - return grupoCategoriaDAO.obtenerID(id); - } - - @Transactional - public GrupoCategoria suscribir(GrupoCategoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return grupoCategoriaDAO.suscribir(entidad); - } - - @Transactional - public GrupoCategoria actualizacion(GrupoCategoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return grupoCategoriaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(GrupoCategoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - grupoCategoriaDAO.actualizacion(entidad); - } - - @Override - public List buscar(String descricao) { - return grupoCategoriaDAO.buscar(descricao); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.GrupoCategoriaDAO; +import com.rjconsultores.ventaboletos.entidad.GrupoCategoria; +import com.rjconsultores.ventaboletos.service.GrupoCategoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("grupoCategoriaService") +public class GrupoCategoriaServiceImpl implements GrupoCategoriaService { + + @Autowired + private GrupoCategoriaDAO grupoCategoriaDAO; + + public List obtenerTodos() { + return grupoCategoriaDAO.obtenerTodos(); + } + + public GrupoCategoria obtenerID(Integer id) { + return grupoCategoriaDAO.obtenerID(id); + } + + @Transactional + public GrupoCategoria suscribir(GrupoCategoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return grupoCategoriaDAO.suscribir(entidad); + } + + @Transactional + public GrupoCategoria actualizacion(GrupoCategoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return grupoCategoriaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(GrupoCategoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + grupoCategoriaDAO.actualizacion(entidad); + } + + @Override + public List buscar(String descricao) { + return grupoCategoriaDAO.buscar(descricao); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GrupoCortesiasServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoCortesiasServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GrupoCortesiasServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoCortesiasServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GrupoRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoRutaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/GrupoRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/GrupoRutaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/HeaderEsquemaCorridaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/HeaderEsquemaCorridaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/HeaderEsquemaCorridaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/HeaderEsquemaCorridaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/HistoricoFormaPagoPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/HistoricoFormaPagoPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/HistoricoFormaPagoPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/HistoricoFormaPagoPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/HotelServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/HotelServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/HotelServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/HotelServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImagemServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImagemServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ImagemServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImagemServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java index 33ed2aa58..3ad730338 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java @@ -1,805 +1,805 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.brazilutils.br.cpfcnpj.Cpf; -import org.brazilutils.validation.ValidationException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.zkoss.util.media.Media; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; -import com.rjconsultores.ventaboletos.entidad.ClienteFidelidad; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.TarjetaFidelidad; -import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; -import com.rjconsultores.ventaboletos.entidad.TipoOcupacion; -import com.rjconsultores.ventaboletos.passageirofrequente.vo.ClienteExcelVo; -import com.rjconsultores.ventaboletos.service.ClienteService; -import com.rjconsultores.ventaboletos.service.ImportacaoClientesService; -import com.rjconsultores.ventaboletos.service.TipoIdentificacionService; -import com.rjconsultores.ventaboletos.service.TipoOcupacionService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("importacaoClientesService") -public class ImportacaoClientesServiceImpl implements ImportacaoClientesService { - - @Autowired - private TipoOcupacionService tipoOcupacionService; - - @Autowired - TipoIdentificacionService tipoIdentificacionService; - - @Autowired - private ClienteService clienteService; - - private static final Logger log = LogManager.getLogger(ImportacaoClientesServiceImpl.class); - - @Override - public String[] lerArquivo(Reader reader, List empresas) { - String linha = null; - Integer index = 0; - StringBuilder qtdeGravados = new StringBuilder(); - StringBuilder erros = new StringBuilder(); - - Integer inseridos = 0; - Integer atualizados = 0; - - try { - BufferedReader leitor = new BufferedReader(reader); - - while ((linha = leitor.readLine()) != null) { - String[] dados = linha.replace("\"", "").split(","); - Integer[] gravados = salvarClientes(dados, empresas); - inseridos = gravados[0] + inseridos; - atualizados = gravados[1] + atualizados; - index++; - } - - leitor.close(); - - qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index).append(" importados.\n"); - qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); - qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); - - String[] resultado = { qtdeGravados.toString(), erros.toString() }; - return resultado; - - } catch (ArrayIndexOutOfBoundsException e) { - log.error(e); - String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; - erros.append(msg); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } catch (Exception e) { - erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); - log.error(e); - String[] resultado = { e.toString() }; - return resultado; - } - } - - @Override - public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception { - String nomeCliente = cliente[1].replace("\"", "").toUpperCase(); - Integer inseridos = new Integer(0); - Integer atualizados = new Integer(0); - Integer[] gravados = { 0, 0 }; - - for (Empresa e : empresas) { - - Cliente clienteGravar = clienteService.buscarPorNumeroFidelidade(cliente[0], e); - if (clienteGravar == null) { - clienteGravar = new Cliente(); - clienteGravar.setNombcliente(nomeCliente); - clienteGravar.setNumIdentificaUno(cliente[3]); - TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); - tarjetaFidelidad.setActivo(Boolean.TRUE); - tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); - tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - // cast para Integer para remover 0 a esquerda: - tarjetaFidelidad.setNumTarjeta(cliente[0]); - - List ls = new ArrayList(); - - ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); - clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); - clienteFidelidad.setActivo(Boolean.TRUE); - clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); - clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - clienteFidelidad.setCliente(clienteGravar); - clienteFidelidad.setEmpresa(e); - ls.add(clienteFidelidad); - - clienteGravar.setListClienteFidelidad(ls); - - clienteService.suscribir(clienteGravar); - inseridos = inseridos + 1; - gravados[0] = gravados[0] + inseridos; - } else { - clienteGravar.setNombcliente(nomeCliente); - clienteGravar.setNumIdentificaUno(cliente[3]); - clienteService.actualizacion(clienteGravar); - - atualizados = atualizados + 1; - gravados[1] = gravados[1] + atualizados; - } - } - return gravados; - } - - @Override - public String[] lerArquivoExcel(Media media, List empresas) { - - List lsTipoIdentificacion = tipoIdentificacionService.obtenerTodos(); - TipoIdentificacion tipoIdentificacionUno = null; - TipoIdentificacion tipoIdentificacionDoos = null; - - for (TipoIdentificacion t : lsTipoIdentificacion) { - if (t.getDesctipo().equalsIgnoreCase("cpf")) { - tipoIdentificacionUno = t; - } else if (t.getDesctipo().equalsIgnoreCase("rg")) { - tipoIdentificacionDoos = t; - } - if (tipoIdentificacionUno != null && tipoIdentificacionDoos != null) - break; - } - - Boolean usaCPFComoFidelidade = false; - Integer index = 1; - StringBuilder qtdeGravados = new StringBuilder(); - StringBuilder erros = new StringBuilder(); - Integer inseridos = 0; - Integer atualizados = 0; - Integer desconsiderados = 0; - InputStream isMExcel = media.getStreamData(); - Sheet sheet = null; - - if (media.getFormat().equals("xls")) { - HSSFWorkbook wb; - try { - wb = new HSSFWorkbook(isMExcel); - sheet = wb.getSheetAt(0); - } catch (IOException e) { - e.printStackTrace(); - } - - } else if (media.getFormat().equals("xlsx")) { - XSSFWorkbook wb; - try { - wb = new XSSFWorkbook(isMExcel); - sheet = wb.getSheetAt(0); - } catch (IOException e) { - log.error("", e); - } - } - - int rows = sheet.getPhysicalNumberOfRows(); - - log.info(String.format("Quantidade cliente:%s", rows)); - - if (validaSheet(sheet)) { - usaCPFComoFidelidade = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.USA_CPF_COMO_FIDELIDADE.getDescricao()); - log.info(String.format("usaCPFComoFidelidade:%s", usaCPFComoFidelidade)); - try { - for (index = 1; index < rows; index++) { - log.info(String.format("index cliente:%s", index)); - - Row row = sheet.getRow(index); - if (row == null) { - log.info("index/row empty"); - continue; - } - - Iterator cellIterator = row.cellIterator(); - ClienteExcelVo cliente = new ClienteExcelVo(); - - while (cellIterator.hasNext()) { - Cell cell = cellIterator.next(); - switch (cell.getColumnIndex()) { - case 0: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setCpf(cell.getStringCellValue()); - System.out.println(cliente.getCpf()); - break; - case 1: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setRg(cell.getStringCellValue()); - break; - case 2: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setNome(cell.getStringCellValue()); - break; - case 3: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setEmail(cell.getStringCellValue()); - break; - case 4: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setTelefone(cell.getStringCellValue()); - break; - case 5: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setCelular(cell.getStringCellValue()); - break; - case 6: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setFax(cell.getStringCellValue()); - break; - case 7: - - String dt = null; - - if (cell.getCellType() == Cell.CELL_TYPE_STRING) { - dt = cell.getStringCellValue(); - } else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) { - dt = cell.getDateCellValue() != null ? new SimpleDateFormat("dd/MM/yyyy").format(cell.getDateCellValue()) : null; - } - cliente.setNascimento(dt); - - break; - case 8: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setSexo(cell.getStringCellValue()); - break; - case 9: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setEndereco(cell.getStringCellValue()); - break; - case 10: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setBairro(cell.getStringCellValue()); - break; - case 11: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setCidade(cell.getStringCellValue()); - break; - case 12: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setEstado(cell.getStringCellValue()); - break; - - } - } - log.info(String.format("cliente:%s cpf:%s", cliente.getNome(), cliente.getCpf())); - - if (validaDadosPlanilha(cliente, erros)) { - log.info("enviado para gravação..."); - try { - Integer[] gravados = salvarClienteExcel(empresas, usaCPFComoFidelidade, cliente, tipoIdentificacionUno, tipoIdentificacionDoos, false); - inseridos = gravados[0] + inseridos; - atualizados = gravados[1] + atualizados; - desconsiderados = gravados[2] + desconsiderados; - } catch (Throwable e) { - log.error("Erro na gravação do registro. Favor revisar", e); - log.info("continuando importação"); - } - - } else { - log.info("cliente não validado"); - erros.append("\n erro ao gravar o cliente na linha "); - erros.append(index + 1).append(" do arquivo."); - } - } - qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index - 1).append(" importados.\n"); - qtdeGravados.append("Desconsiderados ").append(desconsiderados).append(" clientes.\n"); - qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); - qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); - String[] resultado = { qtdeGravados.toString(), erros.toString() }; - - log.info("importação finalizada"); - - return resultado; - - } catch (ArrayIndexOutOfBoundsException e) { - e.printStackTrace(); - String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; - erros.append(msg); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } catch (Exception e) { - e.printStackTrace(); - erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } - - } else { - erros.append("A estrutura do arquivo esta com erro ").append("\n"); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } - - } - - private Integer[] salvarClienteExcel(List empresas, Boolean usaCPFComoFidelidade, ClienteExcelVo cliente, - TipoIdentificacion tipoIdentificacionUno, TipoIdentificacion tipoIdentificacionDoos, boolean isImportacaoPolicial) throws ParseException { - Integer inseridos = new Integer(0); - Integer atualizados = new Integer(0); - Integer desconsiderados = new Integer(0); - Integer[] gravados = { 0, 0, 0 }; - Cliente clienteGravar = new Cliente(); - - String docBusca = cliente.getCpf(); - if (isImportacaoPolicial) { - docBusca = cliente.getRg(); - } - - List lsCliente = clienteService.buscarPorDocumento(docBusca); - - if (lsCliente != null && !lsCliente.isEmpty()) { - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_DESCONSIDERA_CLIENTE_NA_BASE.getDescricao())) { - desconsiderados = desconsiderados + 1; - gravados[2] = gravados[2] + desconsiderados; - return gravados; - } else { - clienteGravar = lsCliente.get(0); - } - } - - if (usaCPFComoFidelidade == null) - usaCPFComoFidelidade = false; - - criarFidelidadesTodasEmpresas(clienteGravar, empresas, cliente, usaCPFComoFidelidade); - - clienteGravar.setNombcliente(cliente.getNome()); - - if (isImportacaoPolicial) { - if (!StringUtils.isEmpty(cliente.getRg())) { - clienteGravar.setNumIdentificaUno(cliente.getRg()); - clienteGravar.setTipoIdentificacionUno(tipoIdentificacionUno); - } - - List ls = tipoOcupacionService.buscar("POLICIAL MILITAR", null); - if (ls == null || ls.isEmpty()) { - return null; - } else { - clienteGravar.setTipoocupacionId(ls != null && !ls.isEmpty() ? ls.get(0) : null); - } - - } else { - clienteGravar.setFecnacimiento(StringUtils.isEmpty(cliente.getNascimento()) ? null : retornaDate(cliente.getNascimento())); - clienteGravar.setDesccorreo(cliente.getEmail()); - - clienteGravar.setNumfax(cliente.getFax()); - clienteGravar.setNumtelefono(cliente.getTelefone()); - clienteGravar.setNumtelefonodos(cliente.getCelular()); - clienteGravar.setIndsexo(cliente.getSexo()); - clienteGravar.setNumIdentificaUno(cliente.getCpf()); - clienteGravar.setTipoIdentificacionUno(tipoIdentificacionUno); - - if (!StringUtils.isEmpty(cliente.getRg())) { - clienteGravar.setNumIdentificaDos(cliente.getRg()); - clienteGravar.setTipoIdentificacionDos(tipoIdentificacionDoos); - } - - setDirecion(clienteGravar, cliente); - } - - if (clienteGravar.getClienteId() == null) { - clienteGravar.setFecCadastro(new Date()); - clienteService.suscribir(clienteGravar); - inseridos = inseridos + 1; - gravados[0] = gravados[0] + inseridos; - - } else { - clienteService.actualizacion(clienteGravar); - atualizados = atualizados + 1; - gravados[1] = gravados[1] + atualizados; - } - - return gravados; - } - - private void setDirecion(Cliente cliente, ClienteExcelVo cExcel) { - List lsDirecion = new ArrayList(); - ClienteDireccion direccion = new ClienteDireccion(); - if ((cliente.getLsClienteDireccion() != null) - && (!cliente.getLsClienteDireccion().isEmpty())) { - if (cliente.getLsClienteDireccion().get(0) != null) { - direccion = cliente.getLsClienteDireccion().get(0); - cliente.getLsClienteDireccion().remove(0); - } - } - direccion.setDesestado(cExcel.getEstado()); - direccion.setDesciudad(cExcel.getCidade()); - direccion.setDesccolonia(cExcel.getBairro()); - direccion.setDesccalle(cExcel.getEndereco()); - direccion.setActivo(true); - direccion.setClienteId(cliente); - lsDirecion.add(direccion); - cliente.setLsClienteDireccion(lsDirecion); - - } - - private void criarFidelidadesTodasEmpresas(Cliente cliente, List empresas, ClienteExcelVo cExce, Boolean usaCPFComoFidelidade) { - - Boolean achou = false; - List fidelidades = null; - - if (cliente.getClienteId() == null) { - fidelidades = new ArrayList(); - for (Empresa e : empresas) { - fidelidades.add(criarFidelidade(e, cExce, usaCPFComoFidelidade)); - } - cliente.setListClienteFidelidad(fidelidades); - - } else { - fidelidades = cliente.getListClienteFidelidad(); - if (fidelidades == null || fidelidades.isEmpty()) { - for (Empresa e : empresas) { - fidelidades.add(criarFidelidade(e, cExce, usaCPFComoFidelidade)); - } - } else { - for (Empresa e : empresas) { - for (ClienteFidelidad f : fidelidades) { - if (f.getEmpresa().equals(e)) { - f.setActivo(true); - f.setFecmodif(new Date()); - TarjetaFidelidad tarjetaFidelidad = f.getTarjetaFidelidad(); - if (tarjetaFidelidad != null) { - tarjetaFidelidad.setActivo(true); - tarjetaFidelidad.setFecmodif(new Date()); - } - - achou = true; - break; - } - } - if (!achou) { - fidelidades.add(criarFidelidade(e, cExce, usaCPFComoFidelidade)); - } - achou = false; - } - } - } - - } - - private ClienteFidelidad criarFidelidade(Empresa e, ClienteExcelVo cExcel, Boolean usaCPFComoFidelidade) { - ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); - TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); - tarjetaFidelidad.setNumTarjeta(usaCPFComoFidelidade ? cExcel.getCpf() : cExcel.getRg()); - tarjetaFidelidad.setActivo(true); - tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); - tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - clienteFidelidad.setEmpresa(e); - clienteFidelidad.setActivo(true); - clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); - clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); - - return clienteFidelidad; - } - - public Boolean validaDadosPlanilha(ClienteExcelVo cliente, StringBuilder erros) { - - if (!StringUtils.isEmpty(cliente.getCpf())) { - try { - Long.parseLong(cliente.getCpf()); - if (!validarCPF(cliente.getCpf())) { - erros.append("CPF inválido."); - return false; - } - } catch (NumberFormatException e) { - erros.append("O CPF deve possuir apenas números."); - return false; - - } catch (Exception e) { - e.getMessage(); - erros.append("Erro ao obter o CPF."); - return false; - } - - } else { - erros.append("O CPF e obrigatório."); - return false; - } - - if (StringUtils.isEmpty(cliente.getNome())) { - erros.append("O NOME e obrigatório."); - return false; - } - - if (!StringUtils.isEmpty(cliente.getSexo())) { - if (!(cliente.getSexo().equalsIgnoreCase("f") || cliente.getSexo().equalsIgnoreCase("m") || cliente.getSexo().equalsIgnoreCase("masculino") || cliente.getSexo().equalsIgnoreCase("feminino"))) { - erros.append("Campo sexo foi informado incorretamente."); - return false; - } - } - - if (!StringUtils.isEmpty(cliente.getNascimento()) && cliente.getNascimento().matches("(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)")) { - SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - try { - dateFormat.parse(cliente.getNascimento()); - } catch (Exception e) { - erros.append("Campo Nascimento foi informado incorretamente."); - return false; - } - } - return true; - } - - private Boolean validaSheet(Sheet sheet) { - - Row row = sheet.getRow(0); - Iterator cellIterator = row.cellIterator(); - - while (cellIterator.hasNext()) { - Cell cell = cellIterator.next(); - switch (cell.getColumnIndex()) { - case 0: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.cpf"))) { - break; - } - return false; - case 1: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.rg"))) { - break; - } - return false; - case 2: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.nome"))) { - break; - } - return false; - case 3: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.email"))) { - break; - } - return false; - - case 4: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.telefone"))) { - break; - } - return false; - - case 5: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.celular"))) { - break; - } - return false; - - case 6: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.fax"))) { - break; - } - return false; - - case 7: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.nascimento"))) { - break; - } - return false; - - case 8: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.sexo"))) { - break; - } - return false; - case 9: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.endereco"))) { - break; - } - return false; - case 10: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.bairro"))) { - break; - } - return false; - case 11: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.cidade"))) { - break; - } - return false; - case 12: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.estado"))) { - break; - } - return false; - - } - - } - return true; - } - - private Boolean validaSheetImportacaoPolicial(Sheet sheet) { - - Row row = sheet.getRow(0); - Iterator cellIterator = row.cellIterator(); - - while (cellIterator.hasNext()) { - Cell cell = cellIterator.next(); - switch (cell.getColumnIndex()) { - case 0: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesPolicialController.HEADERCOLUMN.nome"))) { - break; - } - return false; - case 1: - if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesPolicialController.HEADERCOLUMN.rg"))) { - break; - } - return false; - } - } - return true; - } - - private Date retornaDate(String date) throws ParseException { - - SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - Date data = null; - data = (Date) dateFormat.parse(date); - return data; - - } - - private Boolean validarCPF(String numDoc) { - try { - // https://dicasdeprogramacao.com.br/algoritmo-para-validar-cpf - // O VAlidador não pegava os CPFs com todos os numeros iguais - if (numDoc.length() != 11 || numDoc.equals("00000000000") || numDoc.equals("11111111111") || numDoc.equals("22222222222") || - numDoc.equals("33333333333") || numDoc.equals("44444444444") || numDoc.equals("55555555555") || - numDoc.equals("66666666666") || numDoc.equals("77777777777") || numDoc.equals("88888888888") || - numDoc.equals("99999999999")) { - return false; - } - - Cpf cpf = new Cpf(numDoc); - if (!cpf.isValid()) { - return false; - } - } catch (ValidationException e) { - return false; - } - - return true; - } - - @Override - public String[] lerArquivoPolicialExcel(Media media, List empresas) { - - List lsTipoIdentificacion = tipoIdentificacionService.obtenerTodos(); - TipoIdentificacion tipoIdentificacionUno = null; - - for (TipoIdentificacion t : lsTipoIdentificacion) { - - if (t.getDesctipo().equalsIgnoreCase("rg")) { - tipoIdentificacionUno = t; - } - if (tipoIdentificacionUno != null) - break; - } - - Integer index = 1; - StringBuilder qtdeGravados = new StringBuilder(); - StringBuilder erros = new StringBuilder(); - Integer inseridos = 0; - Integer atualizados = 0; - Integer desconsiderados = 0; - InputStream isMExcel = media.getStreamData(); - Sheet sheet = null; - - if (media.getFormat().equals("xls")) { - HSSFWorkbook wb; - try { - wb = new HSSFWorkbook(isMExcel); - sheet = wb.getSheetAt(0); - } catch (IOException e) { - e.printStackTrace(); - } - - } else if (media.getFormat().equals("xlsx")) { - XSSFWorkbook wb; - try { - wb = new XSSFWorkbook(isMExcel); - sheet = wb.getSheetAt(0); - } catch (IOException e) { - log.error("", e); - } - } - - int rows = sheet.getPhysicalNumberOfRows(); - - log.info(String.format("Quantidade cliente:%s", rows)); - - if (validaSheetImportacaoPolicial(sheet)) { - - try { - for (index = 1; index < rows; index++) { - log.info(String.format("index cliente:%s", index)); - - Row row = sheet.getRow(index); - if (row == null) { - log.info("index/row empty"); - continue; - } - - Iterator cellIterator = row.cellIterator(); - ClienteExcelVo cliente = new ClienteExcelVo(); - - while (cellIterator.hasNext()) { - Cell cell = cellIterator.next(); - switch (cell.getColumnIndex()) { - case 0: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setNome(cell.getStringCellValue()); - break; - case 1: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setRg(cell.getStringCellValue()); - break; - } - } - log.info(String.format("cliente:%s rg:%s", cliente.getNome(), cliente.getRg())); - - log.info("enviado para gravação..."); - try { - Integer[] gravados = salvarClienteExcel(empresas, false, cliente, tipoIdentificacionUno, null, true); - inseridos = gravados[0] + inseridos; - atualizados = gravados[1] + atualizados; - desconsiderados = gravados[2] + desconsiderados; - } catch (Throwable e) { - log.error("Erro na gravação do registro. Favor revisar", e); - log.info("continuando importação"); - } - - } - qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index - 1).append(" importados.\n"); - qtdeGravados.append("Desconsiderados ").append(desconsiderados).append(" clientes.\n"); - qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); - qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); - String[] resultado = { qtdeGravados.toString(), erros.toString() }; - - log.info("importação finalizada"); - - return resultado; - - } catch (ArrayIndexOutOfBoundsException e) { - e.printStackTrace(); - String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; - erros.append(msg); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } catch (Exception e) { - e.printStackTrace(); - erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } - - } else { - erros.append("A estrutura do arquivo esta com erro ").append("\n"); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.brazilutils.br.cpfcnpj.Cpf; +import org.brazilutils.validation.ValidationException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.zkoss.util.media.Media; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; +import com.rjconsultores.ventaboletos.entidad.ClienteFidelidad; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.TarjetaFidelidad; +import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; +import com.rjconsultores.ventaboletos.entidad.TipoOcupacion; +import com.rjconsultores.ventaboletos.passageirofrequente.vo.ClienteExcelVo; +import com.rjconsultores.ventaboletos.service.ClienteService; +import com.rjconsultores.ventaboletos.service.ImportacaoClientesService; +import com.rjconsultores.ventaboletos.service.TipoIdentificacionService; +import com.rjconsultores.ventaboletos.service.TipoOcupacionService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("importacaoClientesService") +public class ImportacaoClientesServiceImpl implements ImportacaoClientesService { + + @Autowired + private TipoOcupacionService tipoOcupacionService; + + @Autowired + TipoIdentificacionService tipoIdentificacionService; + + @Autowired + private ClienteService clienteService; + + private static final Logger log = LogManager.getLogger(ImportacaoClientesServiceImpl.class); + + @Override + public String[] lerArquivo(Reader reader, List empresas) { + String linha = null; + Integer index = 0; + StringBuilder qtdeGravados = new StringBuilder(); + StringBuilder erros = new StringBuilder(); + + Integer inseridos = 0; + Integer atualizados = 0; + + try { + BufferedReader leitor = new BufferedReader(reader); + + while ((linha = leitor.readLine()) != null) { + String[] dados = linha.replace("\"", "").split(","); + Integer[] gravados = salvarClientes(dados, empresas); + inseridos = gravados[0] + inseridos; + atualizados = gravados[1] + atualizados; + index++; + } + + leitor.close(); + + qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index).append(" importados.\n"); + qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); + qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); + + String[] resultado = { qtdeGravados.toString(), erros.toString() }; + return resultado; + + } catch (ArrayIndexOutOfBoundsException e) { + log.error(e); + String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; + erros.append(msg); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } catch (Exception e) { + erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); + log.error(e); + String[] resultado = { e.toString() }; + return resultado; + } + } + + @Override + public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception { + String nomeCliente = cliente[1].replace("\"", "").toUpperCase(); + Integer inseridos = new Integer(0); + Integer atualizados = new Integer(0); + Integer[] gravados = { 0, 0 }; + + for (Empresa e : empresas) { + + Cliente clienteGravar = clienteService.buscarPorNumeroFidelidade(cliente[0], e); + if (clienteGravar == null) { + clienteGravar = new Cliente(); + clienteGravar.setNombcliente(nomeCliente); + clienteGravar.setNumIdentificaUno(cliente[3]); + TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); + tarjetaFidelidad.setActivo(Boolean.TRUE); + tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); + tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + // cast para Integer para remover 0 a esquerda: + tarjetaFidelidad.setNumTarjeta(cliente[0]); + + List ls = new ArrayList(); + + ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); + clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); + clienteFidelidad.setActivo(Boolean.TRUE); + clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); + clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + clienteFidelidad.setCliente(clienteGravar); + clienteFidelidad.setEmpresa(e); + ls.add(clienteFidelidad); + + clienteGravar.setListClienteFidelidad(ls); + + clienteService.suscribir(clienteGravar); + inseridos = inseridos + 1; + gravados[0] = gravados[0] + inseridos; + } else { + clienteGravar.setNombcliente(nomeCliente); + clienteGravar.setNumIdentificaUno(cliente[3]); + clienteService.actualizacion(clienteGravar); + + atualizados = atualizados + 1; + gravados[1] = gravados[1] + atualizados; + } + } + return gravados; + } + + @Override + public String[] lerArquivoExcel(Media media, List empresas) { + + List lsTipoIdentificacion = tipoIdentificacionService.obtenerTodos(); + TipoIdentificacion tipoIdentificacionUno = null; + TipoIdentificacion tipoIdentificacionDoos = null; + + for (TipoIdentificacion t : lsTipoIdentificacion) { + if (t.getDesctipo().equalsIgnoreCase("cpf")) { + tipoIdentificacionUno = t; + } else if (t.getDesctipo().equalsIgnoreCase("rg")) { + tipoIdentificacionDoos = t; + } + if (tipoIdentificacionUno != null && tipoIdentificacionDoos != null) + break; + } + + Boolean usaCPFComoFidelidade = false; + Integer index = 1; + StringBuilder qtdeGravados = new StringBuilder(); + StringBuilder erros = new StringBuilder(); + Integer inseridos = 0; + Integer atualizados = 0; + Integer desconsiderados = 0; + InputStream isMExcel = media.getStreamData(); + Sheet sheet = null; + + if (media.getFormat().equals("xls")) { + HSSFWorkbook wb; + try { + wb = new HSSFWorkbook(isMExcel); + sheet = wb.getSheetAt(0); + } catch (IOException e) { + e.printStackTrace(); + } + + } else if (media.getFormat().equals("xlsx")) { + XSSFWorkbook wb; + try { + wb = new XSSFWorkbook(isMExcel); + sheet = wb.getSheetAt(0); + } catch (IOException e) { + log.error("", e); + } + } + + int rows = sheet.getPhysicalNumberOfRows(); + + log.info(String.format("Quantidade cliente:%s", rows)); + + if (validaSheet(sheet)) { + usaCPFComoFidelidade = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.USA_CPF_COMO_FIDELIDADE.getDescricao()); + log.info(String.format("usaCPFComoFidelidade:%s", usaCPFComoFidelidade)); + try { + for (index = 1; index < rows; index++) { + log.info(String.format("index cliente:%s", index)); + + Row row = sheet.getRow(index); + if (row == null) { + log.info("index/row empty"); + continue; + } + + Iterator cellIterator = row.cellIterator(); + ClienteExcelVo cliente = new ClienteExcelVo(); + + while (cellIterator.hasNext()) { + Cell cell = cellIterator.next(); + switch (cell.getColumnIndex()) { + case 0: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setCpf(cell.getStringCellValue()); + System.out.println(cliente.getCpf()); + break; + case 1: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setRg(cell.getStringCellValue()); + break; + case 2: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setNome(cell.getStringCellValue()); + break; + case 3: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setEmail(cell.getStringCellValue()); + break; + case 4: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setTelefone(cell.getStringCellValue()); + break; + case 5: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setCelular(cell.getStringCellValue()); + break; + case 6: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setFax(cell.getStringCellValue()); + break; + case 7: + + String dt = null; + + if (cell.getCellType() == Cell.CELL_TYPE_STRING) { + dt = cell.getStringCellValue(); + } else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) { + dt = cell.getDateCellValue() != null ? new SimpleDateFormat("dd/MM/yyyy").format(cell.getDateCellValue()) : null; + } + cliente.setNascimento(dt); + + break; + case 8: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setSexo(cell.getStringCellValue()); + break; + case 9: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setEndereco(cell.getStringCellValue()); + break; + case 10: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setBairro(cell.getStringCellValue()); + break; + case 11: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setCidade(cell.getStringCellValue()); + break; + case 12: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setEstado(cell.getStringCellValue()); + break; + + } + } + log.info(String.format("cliente:%s cpf:%s", cliente.getNome(), cliente.getCpf())); + + if (validaDadosPlanilha(cliente, erros)) { + log.info("enviado para gravação..."); + try { + Integer[] gravados = salvarClienteExcel(empresas, usaCPFComoFidelidade, cliente, tipoIdentificacionUno, tipoIdentificacionDoos, false); + inseridos = gravados[0] + inseridos; + atualizados = gravados[1] + atualizados; + desconsiderados = gravados[2] + desconsiderados; + } catch (Throwable e) { + log.error("Erro na gravação do registro. Favor revisar", e); + log.info("continuando importação"); + } + + } else { + log.info("cliente não validado"); + erros.append("\n erro ao gravar o cliente na linha "); + erros.append(index + 1).append(" do arquivo."); + } + } + qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index - 1).append(" importados.\n"); + qtdeGravados.append("Desconsiderados ").append(desconsiderados).append(" clientes.\n"); + qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); + qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); + String[] resultado = { qtdeGravados.toString(), erros.toString() }; + + log.info("importação finalizada"); + + return resultado; + + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; + erros.append(msg); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } catch (Exception e) { + e.printStackTrace(); + erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } + + } else { + erros.append("A estrutura do arquivo esta com erro ").append("\n"); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } + + } + + private Integer[] salvarClienteExcel(List empresas, Boolean usaCPFComoFidelidade, ClienteExcelVo cliente, + TipoIdentificacion tipoIdentificacionUno, TipoIdentificacion tipoIdentificacionDoos, boolean isImportacaoPolicial) throws ParseException { + Integer inseridos = new Integer(0); + Integer atualizados = new Integer(0); + Integer desconsiderados = new Integer(0); + Integer[] gravados = { 0, 0, 0 }; + Cliente clienteGravar = new Cliente(); + + String docBusca = cliente.getCpf(); + if (isImportacaoPolicial) { + docBusca = cliente.getRg(); + } + + List lsCliente = clienteService.buscarPorDocumento(docBusca); + + if (lsCliente != null && !lsCliente.isEmpty()) { + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_DESCONSIDERA_CLIENTE_NA_BASE.getDescricao())) { + desconsiderados = desconsiderados + 1; + gravados[2] = gravados[2] + desconsiderados; + return gravados; + } else { + clienteGravar = lsCliente.get(0); + } + } + + if (usaCPFComoFidelidade == null) + usaCPFComoFidelidade = false; + + criarFidelidadesTodasEmpresas(clienteGravar, empresas, cliente, usaCPFComoFidelidade); + + clienteGravar.setNombcliente(cliente.getNome()); + + if (isImportacaoPolicial) { + if (!StringUtils.isEmpty(cliente.getRg())) { + clienteGravar.setNumIdentificaUno(cliente.getRg()); + clienteGravar.setTipoIdentificacionUno(tipoIdentificacionUno); + } + + List ls = tipoOcupacionService.buscar("POLICIAL MILITAR", null); + if (ls == null || ls.isEmpty()) { + return null; + } else { + clienteGravar.setTipoocupacionId(ls != null && !ls.isEmpty() ? ls.get(0) : null); + } + + } else { + clienteGravar.setFecnacimiento(StringUtils.isEmpty(cliente.getNascimento()) ? null : retornaDate(cliente.getNascimento())); + clienteGravar.setDesccorreo(cliente.getEmail()); + + clienteGravar.setNumfax(cliente.getFax()); + clienteGravar.setNumtelefono(cliente.getTelefone()); + clienteGravar.setNumtelefonodos(cliente.getCelular()); + clienteGravar.setIndsexo(cliente.getSexo()); + clienteGravar.setNumIdentificaUno(cliente.getCpf()); + clienteGravar.setTipoIdentificacionUno(tipoIdentificacionUno); + + if (!StringUtils.isEmpty(cliente.getRg())) { + clienteGravar.setNumIdentificaDos(cliente.getRg()); + clienteGravar.setTipoIdentificacionDos(tipoIdentificacionDoos); + } + + setDirecion(clienteGravar, cliente); + } + + if (clienteGravar.getClienteId() == null) { + clienteGravar.setFecCadastro(new Date()); + clienteService.suscribir(clienteGravar); + inseridos = inseridos + 1; + gravados[0] = gravados[0] + inseridos; + + } else { + clienteService.actualizacion(clienteGravar); + atualizados = atualizados + 1; + gravados[1] = gravados[1] + atualizados; + } + + return gravados; + } + + private void setDirecion(Cliente cliente, ClienteExcelVo cExcel) { + List lsDirecion = new ArrayList(); + ClienteDireccion direccion = new ClienteDireccion(); + if ((cliente.getLsClienteDireccion() != null) + && (!cliente.getLsClienteDireccion().isEmpty())) { + if (cliente.getLsClienteDireccion().get(0) != null) { + direccion = cliente.getLsClienteDireccion().get(0); + cliente.getLsClienteDireccion().remove(0); + } + } + direccion.setDesestado(cExcel.getEstado()); + direccion.setDesciudad(cExcel.getCidade()); + direccion.setDesccolonia(cExcel.getBairro()); + direccion.setDesccalle(cExcel.getEndereco()); + direccion.setActivo(true); + direccion.setClienteId(cliente); + lsDirecion.add(direccion); + cliente.setLsClienteDireccion(lsDirecion); + + } + + private void criarFidelidadesTodasEmpresas(Cliente cliente, List empresas, ClienteExcelVo cExce, Boolean usaCPFComoFidelidade) { + + Boolean achou = false; + List fidelidades = null; + + if (cliente.getClienteId() == null) { + fidelidades = new ArrayList(); + for (Empresa e : empresas) { + fidelidades.add(criarFidelidade(e, cExce, usaCPFComoFidelidade)); + } + cliente.setListClienteFidelidad(fidelidades); + + } else { + fidelidades = cliente.getListClienteFidelidad(); + if (fidelidades == null || fidelidades.isEmpty()) { + for (Empresa e : empresas) { + fidelidades.add(criarFidelidade(e, cExce, usaCPFComoFidelidade)); + } + } else { + for (Empresa e : empresas) { + for (ClienteFidelidad f : fidelidades) { + if (f.getEmpresa().equals(e)) { + f.setActivo(true); + f.setFecmodif(new Date()); + TarjetaFidelidad tarjetaFidelidad = f.getTarjetaFidelidad(); + if (tarjetaFidelidad != null) { + tarjetaFidelidad.setActivo(true); + tarjetaFidelidad.setFecmodif(new Date()); + } + + achou = true; + break; + } + } + if (!achou) { + fidelidades.add(criarFidelidade(e, cExce, usaCPFComoFidelidade)); + } + achou = false; + } + } + } + + } + + private ClienteFidelidad criarFidelidade(Empresa e, ClienteExcelVo cExcel, Boolean usaCPFComoFidelidade) { + ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); + TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); + tarjetaFidelidad.setNumTarjeta(usaCPFComoFidelidade ? cExcel.getCpf() : cExcel.getRg()); + tarjetaFidelidad.setActivo(true); + tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); + tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + clienteFidelidad.setEmpresa(e); + clienteFidelidad.setActivo(true); + clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); + clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); + + return clienteFidelidad; + } + + public Boolean validaDadosPlanilha(ClienteExcelVo cliente, StringBuilder erros) { + + if (!StringUtils.isEmpty(cliente.getCpf())) { + try { + Long.parseLong(cliente.getCpf()); + if (!validarCPF(cliente.getCpf())) { + erros.append("CPF inválido."); + return false; + } + } catch (NumberFormatException e) { + erros.append("O CPF deve possuir apenas números."); + return false; + + } catch (Exception e) { + e.getMessage(); + erros.append("Erro ao obter o CPF."); + return false; + } + + } else { + erros.append("O CPF e obrigatório."); + return false; + } + + if (StringUtils.isEmpty(cliente.getNome())) { + erros.append("O NOME e obrigatório."); + return false; + } + + if (!StringUtils.isEmpty(cliente.getSexo())) { + if (!(cliente.getSexo().equalsIgnoreCase("f") || cliente.getSexo().equalsIgnoreCase("m") || cliente.getSexo().equalsIgnoreCase("masculino") || cliente.getSexo().equalsIgnoreCase("feminino"))) { + erros.append("Campo sexo foi informado incorretamente."); + return false; + } + } + + if (!StringUtils.isEmpty(cliente.getNascimento()) && cliente.getNascimento().matches("(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + try { + dateFormat.parse(cliente.getNascimento()); + } catch (Exception e) { + erros.append("Campo Nascimento foi informado incorretamente."); + return false; + } + } + return true; + } + + private Boolean validaSheet(Sheet sheet) { + + Row row = sheet.getRow(0); + Iterator cellIterator = row.cellIterator(); + + while (cellIterator.hasNext()) { + Cell cell = cellIterator.next(); + switch (cell.getColumnIndex()) { + case 0: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.cpf"))) { + break; + } + return false; + case 1: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.rg"))) { + break; + } + return false; + case 2: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.nome"))) { + break; + } + return false; + case 3: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.email"))) { + break; + } + return false; + + case 4: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.telefone"))) { + break; + } + return false; + + case 5: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.celular"))) { + break; + } + return false; + + case 6: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.fax"))) { + break; + } + return false; + + case 7: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.nascimento"))) { + break; + } + return false; + + case 8: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.sexo"))) { + break; + } + return false; + case 9: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.endereco"))) { + break; + } + return false; + case 10: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.bairro"))) { + break; + } + return false; + case 11: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.cidade"))) { + break; + } + return false; + case 12: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesController.HEADERCOLUMN.estado"))) { + break; + } + return false; + + } + + } + return true; + } + + private Boolean validaSheetImportacaoPolicial(Sheet sheet) { + + Row row = sheet.getRow(0); + Iterator cellIterator = row.cellIterator(); + + while (cellIterator.hasNext()) { + Cell cell = cellIterator.next(); + switch (cell.getColumnIndex()) { + case 0: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesPolicialController.HEADERCOLUMN.nome"))) { + break; + } + return false; + case 1: + if (cell.getStringCellValue().equalsIgnoreCase(Labels.getLabel("importarClientesPolicialController.HEADERCOLUMN.rg"))) { + break; + } + return false; + } + } + return true; + } + + private Date retornaDate(String date) throws ParseException { + + SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + Date data = null; + data = (Date) dateFormat.parse(date); + return data; + + } + + private Boolean validarCPF(String numDoc) { + try { + // https://dicasdeprogramacao.com.br/algoritmo-para-validar-cpf + // O VAlidador não pegava os CPFs com todos os numeros iguais + if (numDoc.length() != 11 || numDoc.equals("00000000000") || numDoc.equals("11111111111") || numDoc.equals("22222222222") || + numDoc.equals("33333333333") || numDoc.equals("44444444444") || numDoc.equals("55555555555") || + numDoc.equals("66666666666") || numDoc.equals("77777777777") || numDoc.equals("88888888888") || + numDoc.equals("99999999999")) { + return false; + } + + Cpf cpf = new Cpf(numDoc); + if (!cpf.isValid()) { + return false; + } + } catch (ValidationException e) { + return false; + } + + return true; + } + + @Override + public String[] lerArquivoPolicialExcel(Media media, List empresas) { + + List lsTipoIdentificacion = tipoIdentificacionService.obtenerTodos(); + TipoIdentificacion tipoIdentificacionUno = null; + + for (TipoIdentificacion t : lsTipoIdentificacion) { + + if (t.getDesctipo().equalsIgnoreCase("rg")) { + tipoIdentificacionUno = t; + } + if (tipoIdentificacionUno != null) + break; + } + + Integer index = 1; + StringBuilder qtdeGravados = new StringBuilder(); + StringBuilder erros = new StringBuilder(); + Integer inseridos = 0; + Integer atualizados = 0; + Integer desconsiderados = 0; + InputStream isMExcel = media.getStreamData(); + Sheet sheet = null; + + if (media.getFormat().equals("xls")) { + HSSFWorkbook wb; + try { + wb = new HSSFWorkbook(isMExcel); + sheet = wb.getSheetAt(0); + } catch (IOException e) { + e.printStackTrace(); + } + + } else if (media.getFormat().equals("xlsx")) { + XSSFWorkbook wb; + try { + wb = new XSSFWorkbook(isMExcel); + sheet = wb.getSheetAt(0); + } catch (IOException e) { + log.error("", e); + } + } + + int rows = sheet.getPhysicalNumberOfRows(); + + log.info(String.format("Quantidade cliente:%s", rows)); + + if (validaSheetImportacaoPolicial(sheet)) { + + try { + for (index = 1; index < rows; index++) { + log.info(String.format("index cliente:%s", index)); + + Row row = sheet.getRow(index); + if (row == null) { + log.info("index/row empty"); + continue; + } + + Iterator cellIterator = row.cellIterator(); + ClienteExcelVo cliente = new ClienteExcelVo(); + + while (cellIterator.hasNext()) { + Cell cell = cellIterator.next(); + switch (cell.getColumnIndex()) { + case 0: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setNome(cell.getStringCellValue()); + break; + case 1: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setRg(cell.getStringCellValue()); + break; + } + } + log.info(String.format("cliente:%s rg:%s", cliente.getNome(), cliente.getRg())); + + log.info("enviado para gravação..."); + try { + Integer[] gravados = salvarClienteExcel(empresas, false, cliente, tipoIdentificacionUno, null, true); + inseridos = gravados[0] + inseridos; + atualizados = gravados[1] + atualizados; + desconsiderados = gravados[2] + desconsiderados; + } catch (Throwable e) { + log.error("Erro na gravação do registro. Favor revisar", e); + log.info("continuando importação"); + } + + } + qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index - 1).append(" importados.\n"); + qtdeGravados.append("Desconsiderados ").append(desconsiderados).append(" clientes.\n"); + qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); + qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); + String[] resultado = { qtdeGravados.toString(), erros.toString() }; + + log.info("importação finalizada"); + + return resultado; + + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; + erros.append(msg); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } catch (Exception e) { + e.printStackTrace(); + erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } + + } else { + erros.append("A estrutura do arquivo esta com erro ").append("\n"); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java index 6f5759c10..cd512e8e6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java @@ -1,726 +1,726 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.brazilutils.br.cpfcnpj.Cpf; -import org.brazilutils.validation.ValidationException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.zkoss.util.media.Media; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; -import com.rjconsultores.ventaboletos.entidad.ClienteFidelidad; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.TarjetaFidelidad; -import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; -import com.rjconsultores.ventaboletos.passageirofrequente.vo.ClienteExcelVo; -import com.rjconsultores.ventaboletos.service.ClienteService; -import com.rjconsultores.ventaboletos.service.ImportacaoClientesSrvpService; -import com.rjconsultores.ventaboletos.service.TipoIdentificacionService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("importacaoClientesSrvpService") -public class ImportacaoClientesSrvpServiceImpl implements ImportacaoClientesSrvpService { - - private static final String ESPACO_CARACTERE_ASCII = "[^\\x00-\\x7F]"; - @Autowired - TipoIdentificacionService tipoIdentificacionService; - @Autowired - private ClienteService clienteService; - private static final Logger log = LogManager.getLogger(ImportacaoClientesSrvpServiceImpl.class); - - @Override - public String[] lerArquivo(Reader reader, List empresas) { - String linha = null; - Integer index = 0; - StringBuilder qtdeGravados = new StringBuilder(); - StringBuilder erros = new StringBuilder(); - - Integer inseridos = 0; - Integer atualizados = 0; - - try { - BufferedReader leitor = new BufferedReader(reader); - - while ((linha = leitor.readLine()) != null) { - String[] dados = linha.replace("\"", "").split(","); - Integer[] gravados = salvarClientes(dados, empresas); - inseridos = gravados[0] + inseridos; - atualizados = gravados[1] + atualizados; - index++; - } - - leitor.close(); - - qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index).append(" importados.\n"); - qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); - qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); - - String[] resultado = { qtdeGravados.toString(), erros.toString() }; - return resultado; - - } catch (ArrayIndexOutOfBoundsException e) { - log.error(e); - String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; - erros.append(msg); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } catch (Exception e) { - erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); - log.error(e); - String[] resultado = { e.toString() }; - return resultado; - } - } - - @Override - public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception { - String nomeCliente = cliente[1].replace("\"", "").toUpperCase(); - Integer inseridos = new Integer(0); - Integer atualizados = new Integer(0); - Integer[] gravados = { 0, 0 }; - - for (Empresa e : empresas) { - - Cliente clienteGravar = clienteService.buscarPorNumeroFidelidade(cliente[0], e); - if (clienteGravar == null) { - clienteGravar = new Cliente(); - clienteGravar.setNombcliente(nomeCliente); - clienteGravar.setNumIdentificaUno(cliente[3]); - TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); - tarjetaFidelidad.setActivo(Boolean.TRUE); - tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); - tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - // cast para Integer para remover 0 a esquerda: - tarjetaFidelidad.setNumTarjeta(cliente[0]); - - List ls = new ArrayList(); - - ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); - clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); - clienteFidelidad.setActivo(Boolean.TRUE); - clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); - clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - clienteFidelidad.setCliente(clienteGravar); - clienteFidelidad.setEmpresa(e); - ls.add(clienteFidelidad); - - clienteGravar.setListClienteFidelidad(ls); - - clienteService.suscribir(clienteGravar); - inseridos = inseridos + 1; - gravados[0] = gravados[0] + inseridos; - } else { - clienteGravar.setNombcliente(nomeCliente); - clienteGravar.setNumIdentificaUno(cliente[3]); - clienteService.actualizacion(clienteGravar); - - atualizados = atualizados + 1; - gravados[1] = gravados[1] + atualizados; - } - } - return gravados; - } - - @Override - public String[] lerArquivoExcel(Media media, List empresas) { - - List lsTipoIdentificacion = tipoIdentificacionService.obtenerTodos(); - TipoIdentificacion tipoIdentificacionUno = null; - TipoIdentificacion tipoIdentificacionDoos = null; - - for (TipoIdentificacion t : lsTipoIdentificacion) { - if (t.getDesctipo().equalsIgnoreCase("cpf")) { - tipoIdentificacionUno = t; - } else if (t.getDesctipo().equalsIgnoreCase("rg")) { - tipoIdentificacionDoos = t; - } - if (tipoIdentificacionUno != null && tipoIdentificacionDoos != null) - break; - } - - Boolean usaCPFComoFidelidade = false; - Integer index = 1; - StringBuilder qtdeGravados = new StringBuilder(); - StringBuilder erros = new StringBuilder(); - Integer inseridos = 0; - Integer atualizados = 0; - Integer desconsiderados =0; - InputStream isMExcel = media.getStreamData(); - Sheet sheet = null; - - if (media.getFormat().equals("xls")) { - HSSFWorkbook wb; - try { - wb = new HSSFWorkbook(isMExcel); - sheet = wb.getSheetAt(0); - } catch (IOException e) { - e.printStackTrace(); - } - - } else if (media.getFormat().equals("xlsx")) { - XSSFWorkbook wb; - try { - wb = new XSSFWorkbook(isMExcel); - sheet = wb.getSheetAt(0); - } catch (IOException e) { - log.error("",e); - } - } - - int rows = sheet.getPhysicalNumberOfRows(); - - log.info(String.format("Quantidade cliente:%s",rows)); - - if (validaSheet(sheet)) { - usaCPFComoFidelidade = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.USA_CPF_COMO_FIDELIDADE.getDescricao()); - log.info(String.format("usaCPFComoFidelidade:%s",usaCPFComoFidelidade)); - try { - for (index = 1; index < rows; index++) { - log.info(String.format("index cliente:%s",index)); - - Row row = sheet.getRow(index); - if (row == null){ - log.info("index/row empty"); - continue; - } - - Iterator cellIterator = row.cellIterator(); - ClienteExcelVo cliente = new ClienteExcelVo(); - - while (cellIterator.hasNext()) { - Cell cell = cellIterator.next(); - switch (cell.getColumnIndex()) { - case 0: - try { - if(cell.getCellType() == Cell.CELL_TYPE_NUMERIC) { - cliente.setNumfidelidade(new Long(Math.round(cell.getNumericCellValue())).toString()); - }else { - if(StringUtils.isNotBlank(cell.getStringCellValue())) { - try { - cliente.setNumfidelidade(new Long(cell.getStringCellValue().trim().replaceAll(" ","")).toString()); - }catch (NumberFormatException e) { - cliente.setTelefone(""); - erros.append(cliente.getNumfidelidade() + " - Numero de Telefone incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); - erros.append("\n"); - } - } - } - }catch(Exception e) { - log.error("Erro na gravação do registro. Favor revisar",e); - } - break; - case 1: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setNome(cell.getStringCellValue()); - break; - case 2: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setTipodoc(cell.getStringCellValue()); - break; - case 3: - cell.setCellType(Cell.CELL_TYPE_STRING); - String numDocString = null; - - numDocString = cell.getStringCellValue(); - - cliente.setNumerodoc(numDocString); - cliente.setCpf(numDocString); - cliente.setRg(numDocString); - break; - case 4: - String dt = null; - try { - if (cell.getCellType() == Cell.CELL_TYPE_STRING && cell.getStringCellValue().length() ==6 ) { - dt = cell.getStringCellValue(); - } else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC ) { - String dataString = new Long(Math.round(cell.getNumericCellValue())).toString(); - if(dataString!=null && dataString.length() ==6) { - Date data = DateUtil.getDateFromString(dataString, DateUtil.ddMMaa_sembarra); - dt = DateUtil.getStringDate(data, DateUtil.ddMMaa_anodoisdigitos); - cliente.setNascimento(dt); - }else { - cliente.setNascimento(null); - erros.append(cliente.getNumfidelidade() + " - Data Nascimento formato incorreto: " + new Long(Math.round(cell.getNumericCellValue())).toString()); - erros.append("\n"); - - } - }else { - cliente.setNascimento(null); - erros.append(cliente.getNumfidelidade() + " - Data Nascimento formato incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); - erros.append("\n"); - - } - }catch (Exception e) { - cliente.setNascimento(null); - erros.append(cliente.getNumfidelidade() + " - Data Nascimento formato incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); - erros.append("\n"); - } - break; - case 5: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setNacionalidade(cell.getStringCellValue()); - break; - case 6: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setPaisresidencia(cell.getStringCellValue()); - break; - case 7: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setOcupacao(cell.getStringCellValue()); - break; - case 8: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setSexo(cell.getStringCellValue()); - break; - case 9: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setEstadocivil(cell.getStringCellValue()); - break; - case 10: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setEmail(cell.getStringCellValue()); - break; - case 11: - try { - if(cell.getCellType() == Cell.CELL_TYPE_NUMERIC) { - cliente.setTelefone(new Long(Math.round(cell.getNumericCellValue())).toString().trim().replaceAll(" ","")); - }else { - if(StringUtils.isNotBlank(cell.getStringCellValue())) { - try { - cliente.setTelefone(new Long(cell.getStringCellValue().trim().replaceAll(" ","")).toString()); - }catch (NumberFormatException e) { - cliente.setTelefone(""); - erros.append(cliente.getNumfidelidade() + " - Numero de Telefone incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); - erros.append("\n"); - } - } - } - }catch(Exception e) { - log.error("Erro na gravação do registro. Favor revisar",e); - } - break; - case 12: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setEndereco(cell.getStringCellValue()); - break; - case 13: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setCidade(cell.getStringCellValue()); - break; - case 14: - try { - cliente.setCep(cell.getStringCellValue()); - }catch(Exception e) { - log.error("Erro na gravação do registro. Favor revisar",e); - } - break; - case 15: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setObservacao(cell.getStringCellValue()); - break; - case 16: - cell.setCellType(Cell.CELL_TYPE_STRING); - cliente.setDesconto(cell.getStringCellValue()); - break; - } - } - - if (validaDadosPlanilha(cliente, erros)) { - log.info(String.format("cliente:%s cpf:%s RG:%s",cliente.getNome(),cliente.getCpf(), cliente.getRg())); - log.info("enviado para gravação..."); - try{ - Integer[] gravados = salvarClienteExcel(empresas, usaCPFComoFidelidade, cliente, tipoIdentificacionUno, tipoIdentificacionDoos); - inseridos = gravados[0] + inseridos; - atualizados = gravados[1] + atualizados; - desconsiderados = gravados[2] + desconsiderados; - }catch(Throwable e){ - log.error("Erro na gravação do registro. Favor revisar",e); - log.info("continuando importação"); - } - - } else { - log.info(String.format("cliente:%s cpf:%s",cliente.getNome(),cliente.getCpf())); - log.info("cliente não validado"); - erros.append("\n erro ao gravar o cliente na linha "); - erros.append(index + 1).append(" do arquivo."); - } - } - qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index-1).append(" importados.\n"); - qtdeGravados.append("Desconsiderados ").append(desconsiderados).append(" clientes.\n"); - qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); - qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); - String[] resultado = { qtdeGravados.toString(), erros.toString() }; - - log.info("importação finalizada"); - - return resultado; - - } catch (ArrayIndexOutOfBoundsException e) { - e.printStackTrace(); - String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; - erros.append(msg); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } catch (Exception e) { - e.printStackTrace(); - erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } - - } else { - erros.append("A estrutura do arquivo esta com erro ").append("\n"); - String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; - return resultado; - } - - } - - private Integer[] salvarClienteExcel(List empresas, Boolean usaCPFComoFidelidade, ClienteExcelVo cliente, TipoIdentificacion tipoIdentificacionUno, TipoIdentificacion tipoIdentificacionDoos) throws ParseException { - Integer inseridos = new Integer(0); - Integer atualizados = new Integer(0); - Integer desconsiderados = new Integer(0); - Integer[] gravados = { 0, 0, 0 }; - Cliente clienteGravar = new Cliente(); - - List lsCliente = null; - if(StringUtils.isNotEmpty(cliente.getCpf())) { - lsCliente = clienteService.buscarPorDocumento(cliente.getCpf()); - } - - if (lsCliente != null && !lsCliente.isEmpty()) { - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_DESCONSIDERA_CLIENTE_NA_BASE.getDescricao())) { - desconsiderados = desconsiderados + 1; - gravados[2] = gravados[2] + desconsiderados; - return gravados; - } else { - clienteGravar = lsCliente.get(0); - } - }else { - Cliente clienteGravarAux = clienteService.buscarPorNumeroFidelidade(cliente.getNumfidelidade()); - if(clienteGravarAux != null) { - clienteGravar = clienteGravarAux; - } - } - - criarFidelidadesTodasEmpresas(clienteGravar, empresas, cliente); - - clienteGravar.setFecnacimiento(StringUtils.isEmpty(cliente.getNascimento()) ? null : retornaDate(cliente.getNascimento())); - clienteGravar.setDesccorreo(cliente.getEmail()); - clienteGravar.setNombcliente(cliente.getNome()); - clienteGravar.setNumfax(cliente.getFax()); - clienteGravar.setNumtelefono(cliente.getTelefone()); - clienteGravar.setNumtelefonodos(cliente.getCelular()); - clienteGravar.setIndsexo(cliente.getSexo()); - clienteGravar.setNumIdentificaUno(cliente.getCpf()); - clienteGravar.setTipoIdentificacionUno(tipoIdentificacionUno); - if (!StringUtils.isEmpty(cliente.getRg())) { - clienteGravar.setNumIdentificaDos(cliente.getRg()); - clienteGravar.setTipoIdentificacionDos(tipoIdentificacionDoos); - } - setDirecion(clienteGravar, cliente); - if (clienteGravar.getClienteId() == null) { - clienteGravar.setFecCadastro(new Date()); - clienteService.suscribir(clienteGravar); - inseridos = inseridos + 1; - gravados[0] = gravados[0] + inseridos; - - } else { - clienteService.actualizacion(clienteGravar); - atualizados = atualizados + 1; - gravados[1] = gravados[1] + atualizados; - } - - return gravados; - } - - private void setDirecion(Cliente cliente, ClienteExcelVo cExcel) { - List lsDirecion = new ArrayList(); - ClienteDireccion direccion = new ClienteDireccion(); - if ((cliente.getLsClienteDireccion() != null) - && (!cliente.getLsClienteDireccion().isEmpty())) { - if (cliente.getLsClienteDireccion().get(0) != null) { - direccion = cliente.getLsClienteDireccion().get(0); - cliente.getLsClienteDireccion().remove(0); - } - } - direccion.setDesestado(cExcel.getEstado()); - direccion.setDesciudad(cExcel.getCidade()); - direccion.setDesccolonia(cExcel.getBairro()); - direccion.setDesccalle(cExcel.getEndereco()); - direccion.setActivo(true); - direccion.setClienteId(cliente); - lsDirecion.add(direccion); - cliente.setLsClienteDireccion(lsDirecion); - - } - - private void criarFidelidadesTodasEmpresas(Cliente cliente, List empresas, ClienteExcelVo cExce) { - - Boolean achou = false; - List fidelidades = null; - - if (cliente.getClienteId() == null) { - fidelidades = new ArrayList(); - for (Empresa e : empresas) { - fidelidades.add(criarFidelidade(e, cExce)); - } - cliente.setListClienteFidelidad(fidelidades); - - } else { - fidelidades = cliente.getListClienteFidelidad(); - if (fidelidades == null || fidelidades.isEmpty()) { - for (Empresa e : empresas) { - fidelidades.add(criarFidelidade(e, cExce)); - } - } else { - for (Empresa e : empresas) { - for (ClienteFidelidad f : fidelidades) { - if (f.getEmpresa().equals(e)) { - f.setActivo(true); - f.setFecmodif(new Date()); - TarjetaFidelidad tarjetaFidelidad = f.getTarjetaFidelidad(); - if (tarjetaFidelidad != null) { - tarjetaFidelidad.setActivo(true); - tarjetaFidelidad.setFecmodif(new Date()); - } - - achou = true; - break; - } - } - if (!achou) { - fidelidades.add(criarFidelidade(e, cExce)); - } - achou = false; - } - } - } - - } - - - private ClienteFidelidad criarFidelidade(Empresa e, ClienteExcelVo cExcel) { - ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); - TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); - tarjetaFidelidad.setNumTarjeta(cExcel.getNumfidelidade()); - tarjetaFidelidad.setActivo(true); - tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); - tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - clienteFidelidad.setEmpresa(e); - clienteFidelidad.setActivo(true); - clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); - clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); - - return clienteFidelidad; - } - - public Boolean validaDadosPlanilha(ClienteExcelVo cliente, StringBuilder erros) { - - if (!StringUtils.isEmpty(cliente.getCpf())) { - try { - Long.parseLong(cliente.getCpf().trim().replace(" ", "")); - if (!validarCPF(cliente.getCpf())) { - cliente.setCpf(null); - } - } catch (NumberFormatException e) { - cliente.setCpf(null); - } catch (Exception e) { - e.getMessage(); - - } - - } else { - erros.append(cliente.getNumfidelidade() + " - Documento e obrigatório."); - erros.append("\n"); - return false; - } - - if (StringUtils.isEmpty(cliente.getNome())) { - erros.append(cliente.getNumfidelidade() + " - O NOME e obrigatório."); - erros.append("\n"); - return false; - } - - if (!StringUtils.isEmpty(cliente.getSexo())) { - if (!(cliente.getSexo().equalsIgnoreCase("f") || cliente.getSexo().equalsIgnoreCase("m") || cliente.getSexo().equalsIgnoreCase("masculino") || cliente.getSexo().equalsIgnoreCase("feminino"))) { - //erros.append("Campo sexo foi informado incorretamente."); - //return false; - } - } - - if (!StringUtils.isEmpty(cliente.getNascimento()) && cliente.getNascimento().matches("(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)")) { - SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - try { - dateFormat.parse(cliente.getNascimento()); - } catch (Exception e) { - //erros.append("Campo Nascimento foi informado incorretamente."); - //return false; - } - } - return true; - } - - private Boolean validaSheet(Sheet sheet) { - - Row row = sheet.getRow(0); - Iterator cellIterator = row.cellIterator(); - - while (cellIterator.hasNext()) { - Cell cell = cellIterator.next(); - switch (cell.getColumnIndex()) { - case 0: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.numfidelidade"))) { - break; - } - return false; - - case 1: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.nome"))) { - break; - } - return false; - case 2: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.tipodoc"))) { - break; - } - return false; - case 3: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.numerodoc"))) { - break; - } - return false; - - case 4: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.datanascimento"))) { - break; - } - return false; - - case 5: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.nacionalidade"))) { - break; - } - return false; - - case 6: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.paisresidencia"))) { - break; - } - return false; - - case 7: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.ocupacao"))) { - break; - } - return false; - - case 8: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.sexo"))) { - break; - } - return false; - case 9: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.estadocivil"))) { - break; - } - return false; - case 10: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.email"))) { - break; - } - return false; - case 11: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.telefone"))) { - break; - } - return false; - case 12: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.endereco"))) { - break; - } - return false; - case 13: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.cidade"))) { - break; - } - return false; - case 14: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.cep"))) { - break; - } - return false; - case 15: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.observacao"))) { - break; - } - return false; - case 16: - if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.desconto"))) { - break; - } - return false; - } - - } - return true; - } - - private Date retornaDate(String date) throws ParseException { - - SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - Date data = null; - data = (Date) dateFormat.parse(date); - return data; - - } - - private Boolean validarCPF(String numDoc) { - try { - // https://dicasdeprogramacao.com.br/algoritmo-para-validar-cpf - // O VAlidador não pegava os CPFs com todos os numeros iguais - if (numDoc.length() != 11 || numDoc.equals("00000000000") || numDoc.equals("11111111111") || numDoc.equals("22222222222") || - numDoc.equals("33333333333") || numDoc.equals("44444444444") || numDoc.equals("55555555555") || - numDoc.equals("66666666666") || numDoc.equals("77777777777") || numDoc.equals("88888888888") || - numDoc.equals("99999999999")) { - return false; - } - - Cpf cpf = new Cpf(numDoc); - if (!cpf.isValid()) { - return false; - } - } catch (ValidationException e) { - return false; - } - - return true; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.brazilutils.br.cpfcnpj.Cpf; +import org.brazilutils.validation.ValidationException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.zkoss.util.media.Media; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.entidad.Cliente; +import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; +import com.rjconsultores.ventaboletos.entidad.ClienteFidelidad; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.TarjetaFidelidad; +import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; +import com.rjconsultores.ventaboletos.passageirofrequente.vo.ClienteExcelVo; +import com.rjconsultores.ventaboletos.service.ClienteService; +import com.rjconsultores.ventaboletos.service.ImportacaoClientesSrvpService; +import com.rjconsultores.ventaboletos.service.TipoIdentificacionService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("importacaoClientesSrvpService") +public class ImportacaoClientesSrvpServiceImpl implements ImportacaoClientesSrvpService { + + private static final String ESPACO_CARACTERE_ASCII = "[^\\x00-\\x7F]"; + @Autowired + TipoIdentificacionService tipoIdentificacionService; + @Autowired + private ClienteService clienteService; + private static final Logger log = LogManager.getLogger(ImportacaoClientesSrvpServiceImpl.class); + + @Override + public String[] lerArquivo(Reader reader, List empresas) { + String linha = null; + Integer index = 0; + StringBuilder qtdeGravados = new StringBuilder(); + StringBuilder erros = new StringBuilder(); + + Integer inseridos = 0; + Integer atualizados = 0; + + try { + BufferedReader leitor = new BufferedReader(reader); + + while ((linha = leitor.readLine()) != null) { + String[] dados = linha.replace("\"", "").split(","); + Integer[] gravados = salvarClientes(dados, empresas); + inseridos = gravados[0] + inseridos; + atualizados = gravados[1] + atualizados; + index++; + } + + leitor.close(); + + qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index).append(" importados.\n"); + qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); + qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); + + String[] resultado = { qtdeGravados.toString(), erros.toString() }; + return resultado; + + } catch (ArrayIndexOutOfBoundsException e) { + log.error(e); + String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; + erros.append(msg); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } catch (Exception e) { + erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); + log.error(e); + String[] resultado = { e.toString() }; + return resultado; + } + } + + @Override + public Integer[] salvarClientes(String[] cliente, List empresas) throws Exception { + String nomeCliente = cliente[1].replace("\"", "").toUpperCase(); + Integer inseridos = new Integer(0); + Integer atualizados = new Integer(0); + Integer[] gravados = { 0, 0 }; + + for (Empresa e : empresas) { + + Cliente clienteGravar = clienteService.buscarPorNumeroFidelidade(cliente[0], e); + if (clienteGravar == null) { + clienteGravar = new Cliente(); + clienteGravar.setNombcliente(nomeCliente); + clienteGravar.setNumIdentificaUno(cliente[3]); + TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); + tarjetaFidelidad.setActivo(Boolean.TRUE); + tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); + tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + // cast para Integer para remover 0 a esquerda: + tarjetaFidelidad.setNumTarjeta(cliente[0]); + + List ls = new ArrayList(); + + ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); + clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); + clienteFidelidad.setActivo(Boolean.TRUE); + clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); + clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + clienteFidelidad.setCliente(clienteGravar); + clienteFidelidad.setEmpresa(e); + ls.add(clienteFidelidad); + + clienteGravar.setListClienteFidelidad(ls); + + clienteService.suscribir(clienteGravar); + inseridos = inseridos + 1; + gravados[0] = gravados[0] + inseridos; + } else { + clienteGravar.setNombcliente(nomeCliente); + clienteGravar.setNumIdentificaUno(cliente[3]); + clienteService.actualizacion(clienteGravar); + + atualizados = atualizados + 1; + gravados[1] = gravados[1] + atualizados; + } + } + return gravados; + } + + @Override + public String[] lerArquivoExcel(Media media, List empresas) { + + List lsTipoIdentificacion = tipoIdentificacionService.obtenerTodos(); + TipoIdentificacion tipoIdentificacionUno = null; + TipoIdentificacion tipoIdentificacionDoos = null; + + for (TipoIdentificacion t : lsTipoIdentificacion) { + if (t.getDesctipo().equalsIgnoreCase("cpf")) { + tipoIdentificacionUno = t; + } else if (t.getDesctipo().equalsIgnoreCase("rg")) { + tipoIdentificacionDoos = t; + } + if (tipoIdentificacionUno != null && tipoIdentificacionDoos != null) + break; + } + + Boolean usaCPFComoFidelidade = false; + Integer index = 1; + StringBuilder qtdeGravados = new StringBuilder(); + StringBuilder erros = new StringBuilder(); + Integer inseridos = 0; + Integer atualizados = 0; + Integer desconsiderados =0; + InputStream isMExcel = media.getStreamData(); + Sheet sheet = null; + + if (media.getFormat().equals("xls")) { + HSSFWorkbook wb; + try { + wb = new HSSFWorkbook(isMExcel); + sheet = wb.getSheetAt(0); + } catch (IOException e) { + e.printStackTrace(); + } + + } else if (media.getFormat().equals("xlsx")) { + XSSFWorkbook wb; + try { + wb = new XSSFWorkbook(isMExcel); + sheet = wb.getSheetAt(0); + } catch (IOException e) { + log.error("",e); + } + } + + int rows = sheet.getPhysicalNumberOfRows(); + + log.info(String.format("Quantidade cliente:%s",rows)); + + if (validaSheet(sheet)) { + usaCPFComoFidelidade = ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.USA_CPF_COMO_FIDELIDADE.getDescricao()); + log.info(String.format("usaCPFComoFidelidade:%s",usaCPFComoFidelidade)); + try { + for (index = 1; index < rows; index++) { + log.info(String.format("index cliente:%s",index)); + + Row row = sheet.getRow(index); + if (row == null){ + log.info("index/row empty"); + continue; + } + + Iterator cellIterator = row.cellIterator(); + ClienteExcelVo cliente = new ClienteExcelVo(); + + while (cellIterator.hasNext()) { + Cell cell = cellIterator.next(); + switch (cell.getColumnIndex()) { + case 0: + try { + if(cell.getCellType() == Cell.CELL_TYPE_NUMERIC) { + cliente.setNumfidelidade(new Long(Math.round(cell.getNumericCellValue())).toString()); + }else { + if(StringUtils.isNotBlank(cell.getStringCellValue())) { + try { + cliente.setNumfidelidade(new Long(cell.getStringCellValue().trim().replaceAll(" ","")).toString()); + }catch (NumberFormatException e) { + cliente.setTelefone(""); + erros.append(cliente.getNumfidelidade() + " - Numero de Telefone incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); + erros.append("\n"); + } + } + } + }catch(Exception e) { + log.error("Erro na gravação do registro. Favor revisar",e); + } + break; + case 1: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setNome(cell.getStringCellValue()); + break; + case 2: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setTipodoc(cell.getStringCellValue()); + break; + case 3: + cell.setCellType(Cell.CELL_TYPE_STRING); + String numDocString = null; + + numDocString = cell.getStringCellValue(); + + cliente.setNumerodoc(numDocString); + cliente.setCpf(numDocString); + cliente.setRg(numDocString); + break; + case 4: + String dt = null; + try { + if (cell.getCellType() == Cell.CELL_TYPE_STRING && cell.getStringCellValue().length() ==6 ) { + dt = cell.getStringCellValue(); + } else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC ) { + String dataString = new Long(Math.round(cell.getNumericCellValue())).toString(); + if(dataString!=null && dataString.length() ==6) { + Date data = DateUtil.getDateFromString(dataString, DateUtil.ddMMaa_sembarra); + dt = DateUtil.getStringDate(data, DateUtil.ddMMaa_anodoisdigitos); + cliente.setNascimento(dt); + }else { + cliente.setNascimento(null); + erros.append(cliente.getNumfidelidade() + " - Data Nascimento formato incorreto: " + new Long(Math.round(cell.getNumericCellValue())).toString()); + erros.append("\n"); + + } + }else { + cliente.setNascimento(null); + erros.append(cliente.getNumfidelidade() + " - Data Nascimento formato incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); + erros.append("\n"); + + } + }catch (Exception e) { + cliente.setNascimento(null); + erros.append(cliente.getNumfidelidade() + " - Data Nascimento formato incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); + erros.append("\n"); + } + break; + case 5: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setNacionalidade(cell.getStringCellValue()); + break; + case 6: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setPaisresidencia(cell.getStringCellValue()); + break; + case 7: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setOcupacao(cell.getStringCellValue()); + break; + case 8: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setSexo(cell.getStringCellValue()); + break; + case 9: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setEstadocivil(cell.getStringCellValue()); + break; + case 10: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setEmail(cell.getStringCellValue()); + break; + case 11: + try { + if(cell.getCellType() == Cell.CELL_TYPE_NUMERIC) { + cliente.setTelefone(new Long(Math.round(cell.getNumericCellValue())).toString().trim().replaceAll(" ","")); + }else { + if(StringUtils.isNotBlank(cell.getStringCellValue())) { + try { + cliente.setTelefone(new Long(cell.getStringCellValue().trim().replaceAll(" ","")).toString()); + }catch (NumberFormatException e) { + cliente.setTelefone(""); + erros.append(cliente.getNumfidelidade() + " - Numero de Telefone incorreto: " + cell.getStringCellValue().trim().replaceAll(" ","").toString()); + erros.append("\n"); + } + } + } + }catch(Exception e) { + log.error("Erro na gravação do registro. Favor revisar",e); + } + break; + case 12: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setEndereco(cell.getStringCellValue()); + break; + case 13: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setCidade(cell.getStringCellValue()); + break; + case 14: + try { + cliente.setCep(cell.getStringCellValue()); + }catch(Exception e) { + log.error("Erro na gravação do registro. Favor revisar",e); + } + break; + case 15: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setObservacao(cell.getStringCellValue()); + break; + case 16: + cell.setCellType(Cell.CELL_TYPE_STRING); + cliente.setDesconto(cell.getStringCellValue()); + break; + } + } + + if (validaDadosPlanilha(cliente, erros)) { + log.info(String.format("cliente:%s cpf:%s RG:%s",cliente.getNome(),cliente.getCpf(), cliente.getRg())); + log.info("enviado para gravação..."); + try{ + Integer[] gravados = salvarClienteExcel(empresas, usaCPFComoFidelidade, cliente, tipoIdentificacionUno, tipoIdentificacionDoos); + inseridos = gravados[0] + inseridos; + atualizados = gravados[1] + atualizados; + desconsiderados = gravados[2] + desconsiderados; + }catch(Throwable e){ + log.error("Erro na gravação do registro. Favor revisar",e); + log.info("continuando importação"); + } + + } else { + log.info(String.format("cliente:%s cpf:%s",cliente.getNome(),cliente.getCpf())); + log.info("cliente não validado"); + erros.append("\n erro ao gravar o cliente na linha "); + erros.append(index + 1).append(" do arquivo."); + } + } + qtdeGravados.append("Gravados ").append(inseridos + atualizados).append(" clientes de ").append(index-1).append(" importados.\n"); + qtdeGravados.append("Desconsiderados ").append(desconsiderados).append(" clientes.\n"); + qtdeGravados.append("Atualizados ").append(atualizados).append(" clientes.\n"); + qtdeGravados.append("Inseridos ").append(inseridos).append(" novos clientes."); + String[] resultado = { qtdeGravados.toString(), erros.toString() }; + + log.info("importação finalizada"); + + return resultado; + + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + String msg = "Erro ao gravar cliente na linha " + (index + 1) + " do arquivo."; + erros.append(msg); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } catch (Exception e) { + e.printStackTrace(); + erros.append("Linha ").append(index).append(" do arquivo de clientes, erro: ").append(e.getCause().getCause()).append("\n"); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } + + } else { + erros.append("A estrutura do arquivo esta com erro ").append("\n"); + String[] resultado = { "Houve erro ao gravar os clientes, consulte o arquivo de erros.", erros.toString() }; + return resultado; + } + + } + + private Integer[] salvarClienteExcel(List empresas, Boolean usaCPFComoFidelidade, ClienteExcelVo cliente, TipoIdentificacion tipoIdentificacionUno, TipoIdentificacion tipoIdentificacionDoos) throws ParseException { + Integer inseridos = new Integer(0); + Integer atualizados = new Integer(0); + Integer desconsiderados = new Integer(0); + Integer[] gravados = { 0, 0, 0 }; + Cliente clienteGravar = new Cliente(); + + List lsCliente = null; + if(StringUtils.isNotEmpty(cliente.getCpf())) { + lsCliente = clienteService.buscarPorDocumento(cliente.getCpf()); + } + + if (lsCliente != null && !lsCliente.isEmpty()) { + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_DESCONSIDERA_CLIENTE_NA_BASE.getDescricao())) { + desconsiderados = desconsiderados + 1; + gravados[2] = gravados[2] + desconsiderados; + return gravados; + } else { + clienteGravar = lsCliente.get(0); + } + }else { + Cliente clienteGravarAux = clienteService.buscarPorNumeroFidelidade(cliente.getNumfidelidade()); + if(clienteGravarAux != null) { + clienteGravar = clienteGravarAux; + } + } + + criarFidelidadesTodasEmpresas(clienteGravar, empresas, cliente); + + clienteGravar.setFecnacimiento(StringUtils.isEmpty(cliente.getNascimento()) ? null : retornaDate(cliente.getNascimento())); + clienteGravar.setDesccorreo(cliente.getEmail()); + clienteGravar.setNombcliente(cliente.getNome()); + clienteGravar.setNumfax(cliente.getFax()); + clienteGravar.setNumtelefono(cliente.getTelefone()); + clienteGravar.setNumtelefonodos(cliente.getCelular()); + clienteGravar.setIndsexo(cliente.getSexo()); + clienteGravar.setNumIdentificaUno(cliente.getCpf()); + clienteGravar.setTipoIdentificacionUno(tipoIdentificacionUno); + if (!StringUtils.isEmpty(cliente.getRg())) { + clienteGravar.setNumIdentificaDos(cliente.getRg()); + clienteGravar.setTipoIdentificacionDos(tipoIdentificacionDoos); + } + setDirecion(clienteGravar, cliente); + if (clienteGravar.getClienteId() == null) { + clienteGravar.setFecCadastro(new Date()); + clienteService.suscribir(clienteGravar); + inseridos = inseridos + 1; + gravados[0] = gravados[0] + inseridos; + + } else { + clienteService.actualizacion(clienteGravar); + atualizados = atualizados + 1; + gravados[1] = gravados[1] + atualizados; + } + + return gravados; + } + + private void setDirecion(Cliente cliente, ClienteExcelVo cExcel) { + List lsDirecion = new ArrayList(); + ClienteDireccion direccion = new ClienteDireccion(); + if ((cliente.getLsClienteDireccion() != null) + && (!cliente.getLsClienteDireccion().isEmpty())) { + if (cliente.getLsClienteDireccion().get(0) != null) { + direccion = cliente.getLsClienteDireccion().get(0); + cliente.getLsClienteDireccion().remove(0); + } + } + direccion.setDesestado(cExcel.getEstado()); + direccion.setDesciudad(cExcel.getCidade()); + direccion.setDesccolonia(cExcel.getBairro()); + direccion.setDesccalle(cExcel.getEndereco()); + direccion.setActivo(true); + direccion.setClienteId(cliente); + lsDirecion.add(direccion); + cliente.setLsClienteDireccion(lsDirecion); + + } + + private void criarFidelidadesTodasEmpresas(Cliente cliente, List empresas, ClienteExcelVo cExce) { + + Boolean achou = false; + List fidelidades = null; + + if (cliente.getClienteId() == null) { + fidelidades = new ArrayList(); + for (Empresa e : empresas) { + fidelidades.add(criarFidelidade(e, cExce)); + } + cliente.setListClienteFidelidad(fidelidades); + + } else { + fidelidades = cliente.getListClienteFidelidad(); + if (fidelidades == null || fidelidades.isEmpty()) { + for (Empresa e : empresas) { + fidelidades.add(criarFidelidade(e, cExce)); + } + } else { + for (Empresa e : empresas) { + for (ClienteFidelidad f : fidelidades) { + if (f.getEmpresa().equals(e)) { + f.setActivo(true); + f.setFecmodif(new Date()); + TarjetaFidelidad tarjetaFidelidad = f.getTarjetaFidelidad(); + if (tarjetaFidelidad != null) { + tarjetaFidelidad.setActivo(true); + tarjetaFidelidad.setFecmodif(new Date()); + } + + achou = true; + break; + } + } + if (!achou) { + fidelidades.add(criarFidelidade(e, cExce)); + } + achou = false; + } + } + } + + } + + + private ClienteFidelidad criarFidelidade(Empresa e, ClienteExcelVo cExcel) { + ClienteFidelidad clienteFidelidad = new ClienteFidelidad(); + TarjetaFidelidad tarjetaFidelidad = new TarjetaFidelidad(); + tarjetaFidelidad.setNumTarjeta(cExcel.getNumfidelidade()); + tarjetaFidelidad.setActivo(true); + tarjetaFidelidad.setFecmodif(Calendar.getInstance().getTime()); + tarjetaFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + clienteFidelidad.setEmpresa(e); + clienteFidelidad.setActivo(true); + clienteFidelidad.setFecmodif(Calendar.getInstance().getTime()); + clienteFidelidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + clienteFidelidad.setTarjetaFidelidad(tarjetaFidelidad); + + return clienteFidelidad; + } + + public Boolean validaDadosPlanilha(ClienteExcelVo cliente, StringBuilder erros) { + + if (!StringUtils.isEmpty(cliente.getCpf())) { + try { + Long.parseLong(cliente.getCpf().trim().replace(" ", "")); + if (!validarCPF(cliente.getCpf())) { + cliente.setCpf(null); + } + } catch (NumberFormatException e) { + cliente.setCpf(null); + } catch (Exception e) { + e.getMessage(); + + } + + } else { + erros.append(cliente.getNumfidelidade() + " - Documento e obrigatório."); + erros.append("\n"); + return false; + } + + if (StringUtils.isEmpty(cliente.getNome())) { + erros.append(cliente.getNumfidelidade() + " - O NOME e obrigatório."); + erros.append("\n"); + return false; + } + + if (!StringUtils.isEmpty(cliente.getSexo())) { + if (!(cliente.getSexo().equalsIgnoreCase("f") || cliente.getSexo().equalsIgnoreCase("m") || cliente.getSexo().equalsIgnoreCase("masculino") || cliente.getSexo().equalsIgnoreCase("feminino"))) { + //erros.append("Campo sexo foi informado incorretamente."); + //return false; + } + } + + if (!StringUtils.isEmpty(cliente.getNascimento()) && cliente.getNascimento().matches("(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)")) { + SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + try { + dateFormat.parse(cliente.getNascimento()); + } catch (Exception e) { + //erros.append("Campo Nascimento foi informado incorretamente."); + //return false; + } + } + return true; + } + + private Boolean validaSheet(Sheet sheet) { + + Row row = sheet.getRow(0); + Iterator cellIterator = row.cellIterator(); + + while (cellIterator.hasNext()) { + Cell cell = cellIterator.next(); + switch (cell.getColumnIndex()) { + case 0: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.numfidelidade"))) { + break; + } + return false; + + case 1: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.nome"))) { + break; + } + return false; + case 2: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.tipodoc"))) { + break; + } + return false; + case 3: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.numerodoc"))) { + break; + } + return false; + + case 4: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.datanascimento"))) { + break; + } + return false; + + case 5: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.nacionalidade"))) { + break; + } + return false; + + case 6: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.paisresidencia"))) { + break; + } + return false; + + case 7: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.ocupacao"))) { + break; + } + return false; + + case 8: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.sexo"))) { + break; + } + return false; + case 9: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.estadocivil"))) { + break; + } + return false; + case 10: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.email"))) { + break; + } + return false; + case 11: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.telefone"))) { + break; + } + return false; + case 12: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.endereco"))) { + break; + } + return false; + case 13: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.cidade"))) { + break; + } + return false; + case 14: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.cep"))) { + break; + } + return false; + case 15: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.observacao"))) { + break; + } + return false; + case 16: + if (cell.getStringCellValue().replaceAll(ESPACO_CARACTERE_ASCII, "").equalsIgnoreCase(Labels.getLabel("importarClientesControllerSrvp.HEADERCOLUMN.desconto"))) { + break; + } + return false; + } + + } + return true; + } + + private Date retornaDate(String date) throws ParseException { + + SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + Date data = null; + data = (Date) dateFormat.parse(date); + return data; + + } + + private Boolean validarCPF(String numDoc) { + try { + // https://dicasdeprogramacao.com.br/algoritmo-para-validar-cpf + // O VAlidador não pegava os CPFs com todos os numeros iguais + if (numDoc.length() != 11 || numDoc.equals("00000000000") || numDoc.equals("11111111111") || numDoc.equals("22222222222") || + numDoc.equals("33333333333") || numDoc.equals("44444444444") || numDoc.equals("55555555555") || + numDoc.equals("66666666666") || numDoc.equals("77777777777") || numDoc.equals("88888888888") || + numDoc.equals("99999999999")) { + return false; + } + + Cpf cpf = new Cpf(numDoc); + if (!cpf.isValid()) { + return false; + } + } catch (ValidationException e) { + return false; + } + + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImpresionLayoutConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImpresionLayoutConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ImpresionLayoutConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ImpresionLayoutConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InstiFinanceiraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InstiFinanceiraServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/InstiFinanceiraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InstiFinanceiraServiceImpl.java index 10479d2c4..9057c83ec 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/InstiFinanceiraServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/InstiFinanceiraServiceImpl.java @@ -1,75 +1,75 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.dao.InstiFinanceiraDAO; -import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; -import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; -import com.rjconsultores.ventaboletos.service.InstiFinanceiraService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaBancoService") -public class InstiFinanceiraServiceImpl implements InstiFinanceiraService { - - @Autowired - private InstiFinanceiraDAO ptovtaBancoDAO; - - public List obtenerTodos() { - return ptovtaBancoDAO.obtenerTodos(); - } - - public InstiFinanceira obtenerID(Integer id) { - return ptovtaBancoDAO.obtenerID(id); - } - - @Transactional - public InstiFinanceira suscribir(InstiFinanceira entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaBancoDAO.suscribir(entidad); - } - - @Transactional - public InstiFinanceira actualizacion(InstiFinanceira entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaBancoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(InstiFinanceira entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaBancoDAO.actualizacion(entidad); - } - - public List buscar(String nome) { - return ptovtaBancoDAO.buscar(nome); - } - - @Override - public List buscarContasBancariasPorIdEmpresa(Integer empresaId) { - return ptovtaBancoDAO.buscarContasBancariasPorIdEmpresa(empresaId); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.dao.InstiFinanceiraDAO; +import com.rjconsultores.ventaboletos.entidad.EmpresaContaBancaria; +import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; +import com.rjconsultores.ventaboletos.service.InstiFinanceiraService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaBancoService") +public class InstiFinanceiraServiceImpl implements InstiFinanceiraService { + + @Autowired + private InstiFinanceiraDAO ptovtaBancoDAO; + + public List obtenerTodos() { + return ptovtaBancoDAO.obtenerTodos(); + } + + public InstiFinanceira obtenerID(Integer id) { + return ptovtaBancoDAO.obtenerID(id); + } + + @Transactional + public InstiFinanceira suscribir(InstiFinanceira entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaBancoDAO.suscribir(entidad); + } + + @Transactional + public InstiFinanceira actualizacion(InstiFinanceira entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaBancoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(InstiFinanceira entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaBancoDAO.actualizacion(entidad); + } + + public List buscar(String nome) { + return ptovtaBancoDAO.buscar(nome); + } + + @Override + public List buscarContasBancariasPorIdEmpresa(Integer empresaId) { + return ptovtaBancoDAO.buscarContasBancariasPorIdEmpresa(empresaId); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java index 20b210e75..f56aeef5b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java @@ -1,71 +1,71 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.dao.IntegracaoDerPrDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.service.IntegracaoService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; - -@Service("integracaoService") -public class IntegracaoServiceImpl implements IntegracaoService { - private static final Logger log = LogManager.getLogger(IntegracaoServiceImpl.class); - - public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; - public static final String QUEBRA_LINHA = "\r\n"; - - @Autowired - private IntegracaoDerPrDAO integracaoDerPrDAO; - - @Override - public File importacaoQdmpDer(Date inicio, Date fim, Empresa empresa, List lslinhas) { - try { - String nomeArquivo = "QDMP_DER" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - - File arquivoQdmp = File.createTempFile(nomeArquivo + "-", ".txt"); - - PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivoQdmp), Constantes.UTF_8)); - - for (Ruta ruta : lslinhas) { - String cabeca = integracaoDerPrDAO.buscarDadosImportacaoCabeca(inicio, fim, empresa, ruta.getRutaId()); - List listaQdmpLinha = integracaoDerPrDAO.buscarDadosImportacaoLinha(inicio, fim, empresa, ruta.getRutaId()); - String rodape = integracaoDerPrDAO.buscarDadosImportacaoRodape(inicio, fim, empresa, ruta.getRutaId()); - - writer.print(cabeca); - writer.print(QUEBRA_LINHA); - - for (QdmpDerLinhaVo qdmpDerLinhaVo : listaQdmpLinha) { - writer.print(qdmpDerLinhaVo.toString()); - writer.print(QUEBRA_LINHA); - } - - writer.print(rodape); - writer.print(QUEBRA_LINHA); - } - - writer.close(); - return arquivoQdmp; - - } catch (IOException e) { - log.error( e.getMessage(), e); - } - - return null; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.dao.IntegracaoDerPrDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.service.IntegracaoService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; + +@Service("integracaoService") +public class IntegracaoServiceImpl implements IntegracaoService { + private static final Logger log = LogManager.getLogger(IntegracaoServiceImpl.class); + + public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; + public static final String QUEBRA_LINHA = "\r\n"; + + @Autowired + private IntegracaoDerPrDAO integracaoDerPrDAO; + + @Override + public File importacaoQdmpDer(Date inicio, Date fim, Empresa empresa, List lslinhas) { + try { + String nomeArquivo = "QDMP_DER" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + + File arquivoQdmp = File.createTempFile(nomeArquivo + "-", ".txt"); + + PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivoQdmp), Constantes.UTF_8)); + + for (Ruta ruta : lslinhas) { + String cabeca = integracaoDerPrDAO.buscarDadosImportacaoCabeca(inicio, fim, empresa, ruta.getRutaId()); + List listaQdmpLinha = integracaoDerPrDAO.buscarDadosImportacaoLinha(inicio, fim, empresa, ruta.getRutaId()); + String rodape = integracaoDerPrDAO.buscarDadosImportacaoRodape(inicio, fim, empresa, ruta.getRutaId()); + + writer.print(cabeca); + writer.print(QUEBRA_LINHA); + + for (QdmpDerLinhaVo qdmpDerLinhaVo : listaQdmpLinha) { + writer.print(qdmpDerLinhaVo.toString()); + writer.print(QUEBRA_LINHA); + } + + writer.print(rodape); + writer.print(QUEBRA_LINHA); + } + + writer.close(); + return arquivoQdmp; + + } catch (IOException e) { + log.error( e.getMessage(), e); + } + + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoTotvsServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoTotvsServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/IntegracaoTotvsServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoTotvsServiceImpl.java index bb6e34701..052f757ef 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoTotvsServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoTotvsServiceImpl.java @@ -1,106 +1,106 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.CajaDAO; -import com.rjconsultores.ventaboletos.dao.CorridaDAO; -import com.rjconsultores.ventaboletos.dao.EsquemaCorridaDAO; -import com.rjconsultores.ventaboletos.dao.IntegracaoTotvsDAO; -import com.rjconsultores.ventaboletos.dao.MarcaDAO; -import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.IntegracaoTotvs; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.IntegracaoTotvsService; - -@Service("integracaoTotvsService") -public class IntegracaoTotvsServiceImpl implements IntegracaoTotvsService { - - private static final String BILHETE = "BILHETE"; - - @Autowired - CajaDAO cajaDao; - - @Autowired - PuntoVentaDAO puntoVentaDao; - - @Autowired - MarcaDAO marcaDao; - - @Autowired - CorridaDAO corridaDao; - - @Autowired - EsquemaCorridaDAO esquemaCorridaDao; - - @Autowired - IntegracaoTotvsDAO integracaoTotvsDAO; - - @Override - public Integer atualizaStstausBilhetesIntegrar(Empresa empresa, Date dataInicial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException { - Marca marca = null; - if (empresa != null) { - marca = marcaDao.buscarMarcaPorEmpresa(empresa); - } - return cajaDao.atualizaCajasIntegracaoTotvs(marca, dataInicial, dataFinal, puntoVenta); - } - - @Override - public List buscaPuntoVentaEmpresa(Empresa empresa) { - return puntoVentaDao.buscaPuntoVentaEmpresa(empresa); - - } - - @Override - @Transactional - public Integer solicitaReIntegracaoBilhete(Empresa empresa, Date dataInicial, Date dataFinal, PuntoVenta puntoVenta, Usuario usuario) throws BusinessException { - Integer retorno = atualizaStstausBilhetesIntegrar(empresa, dataInicial, dataFinal, puntoVenta); - if (retorno.intValue() > 0) { - IntegracaoTotvs integracaoTotvs = new IntegracaoTotvs(); - integracaoTotvs.setDescIntegracao(BILHETE); - integracaoTotvs.setFecInicio(dataInicial); - integracaoTotvs.setFecFin(dataFinal); - integracaoTotvs.setFecmodif(new Date()); - integracaoTotvs.setPuntoVentaId(puntoVenta.getPuntoventaId()); - integracaoTotvs.setEmpresaId(empresa.getEmpresaId()); - integracaoTotvs.setUsuarioId(usuario.getUsuarioId()); - integracaoTotvs.setActivo(Boolean.TRUE); - integracaoTotvs.setQtdadeResgistrosAtualizados(retorno); - integracaoTotvsDAO.suscribir(integracaoTotvs); - } - return retorno; - } - - @Override - public Integer atualizaStstausServicosIntegrar(Empresa empresa, Integer numServico) throws BusinessException { - Marca marca = null; - if (empresa != null) { - marca = marcaDao.buscarMarcaPorEmpresa(empresa); - } - return esquemaCorridaDao.atualizaServicoIntegracaoTotvs(marca, numServico); - } - - @Override - public Integer atualizaStstausCorridasIntegrar(Empresa empresa, Integer numCorrida, Date dataInicial, Date dataFinal) throws BusinessException { - Marca marca = null; - if (empresa != null) { - marca = marcaDao.buscarMarcaPorEmpresa(empresa); - } - return corridaDao.atualizaCorridasIntegracaoTotvs(marca, dataInicial, dataFinal, numCorrida); - } - - @Override - public void borrarByCorrida(Corrida corrida) { - integracaoTotvsDAO.borrarByCorrida(corrida); - - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CajaDAO; +import com.rjconsultores.ventaboletos.dao.CorridaDAO; +import com.rjconsultores.ventaboletos.dao.EsquemaCorridaDAO; +import com.rjconsultores.ventaboletos.dao.IntegracaoTotvsDAO; +import com.rjconsultores.ventaboletos.dao.MarcaDAO; +import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.IntegracaoTotvs; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.IntegracaoTotvsService; + +@Service("integracaoTotvsService") +public class IntegracaoTotvsServiceImpl implements IntegracaoTotvsService { + + private static final String BILHETE = "BILHETE"; + + @Autowired + CajaDAO cajaDao; + + @Autowired + PuntoVentaDAO puntoVentaDao; + + @Autowired + MarcaDAO marcaDao; + + @Autowired + CorridaDAO corridaDao; + + @Autowired + EsquemaCorridaDAO esquemaCorridaDao; + + @Autowired + IntegracaoTotvsDAO integracaoTotvsDAO; + + @Override + public Integer atualizaStstausBilhetesIntegrar(Empresa empresa, Date dataInicial, Date dataFinal, PuntoVenta puntoVenta) throws BusinessException { + Marca marca = null; + if (empresa != null) { + marca = marcaDao.buscarMarcaPorEmpresa(empresa); + } + return cajaDao.atualizaCajasIntegracaoTotvs(marca, dataInicial, dataFinal, puntoVenta); + } + + @Override + public List buscaPuntoVentaEmpresa(Empresa empresa) { + return puntoVentaDao.buscaPuntoVentaEmpresa(empresa); + + } + + @Override + @Transactional + public Integer solicitaReIntegracaoBilhete(Empresa empresa, Date dataInicial, Date dataFinal, PuntoVenta puntoVenta, Usuario usuario) throws BusinessException { + Integer retorno = atualizaStstausBilhetesIntegrar(empresa, dataInicial, dataFinal, puntoVenta); + if (retorno.intValue() > 0) { + IntegracaoTotvs integracaoTotvs = new IntegracaoTotvs(); + integracaoTotvs.setDescIntegracao(BILHETE); + integracaoTotvs.setFecInicio(dataInicial); + integracaoTotvs.setFecFin(dataFinal); + integracaoTotvs.setFecmodif(new Date()); + integracaoTotvs.setPuntoVentaId(puntoVenta.getPuntoventaId()); + integracaoTotvs.setEmpresaId(empresa.getEmpresaId()); + integracaoTotvs.setUsuarioId(usuario.getUsuarioId()); + integracaoTotvs.setActivo(Boolean.TRUE); + integracaoTotvs.setQtdadeResgistrosAtualizados(retorno); + integracaoTotvsDAO.suscribir(integracaoTotvs); + } + return retorno; + } + + @Override + public Integer atualizaStstausServicosIntegrar(Empresa empresa, Integer numServico) throws BusinessException { + Marca marca = null; + if (empresa != null) { + marca = marcaDao.buscarMarcaPorEmpresa(empresa); + } + return esquemaCorridaDao.atualizaServicoIntegracaoTotvs(marca, numServico); + } + + @Override + public Integer atualizaStstausCorridasIntegrar(Empresa empresa, Integer numCorrida, Date dataInicial, Date dataFinal) throws BusinessException { + Marca marca = null; + if (empresa != null) { + marca = marcaDao.buscarMarcaPorEmpresa(empresa); + } + return corridaDao.atualizaCorridasIntegracaoTotvs(marca, dataInicial, dataFinal, numCorrida); + } + + @Override + public void borrarByCorrida(Corrida corrida) { + integracaoTotvsDAO.borrarByCorrida(corrida); + + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ItemAdicionalServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ItemAdicionalServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ItemAdicionalServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ItemAdicionalServiceImpl.java index f7d6fca3a..c5fab0f1e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ItemAdicionalServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ItemAdicionalServiceImpl.java @@ -1,66 +1,66 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ItemAdicionalDAO; -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.service.ItemAdicionalService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("itemAdicionalService") -public class ItemAdicionalServiceImpl implements ItemAdicionalService { - - @Autowired - private ItemAdicionalDAO itemAdicionalDAO; - - @Override - public List obtenerTodos() { - return itemAdicionalDAO.obtenerTodos(); - } - - @Override - public ItemAdicional obtenerID(Integer id) { - return itemAdicionalDAO.obtenerID(id); - } - - @Transactional - @Override - public ItemAdicional suscribir(ItemAdicional entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return itemAdicionalDAO.suscribir(entidad); - } - - @Transactional - @Override - public ItemAdicional actualizacion(ItemAdicional entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return itemAdicionalDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(ItemAdicional entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - itemAdicionalDAO.actualizacion(entidad); - } - - @Override - public List buscaItemAdicionalPacote(Pacote pacote) { - return itemAdicionalDAO.buscaItemAdicionalPacote(pacote); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ItemAdicionalDAO; +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.service.ItemAdicionalService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("itemAdicionalService") +public class ItemAdicionalServiceImpl implements ItemAdicionalService { + + @Autowired + private ItemAdicionalDAO itemAdicionalDAO; + + @Override + public List obtenerTodos() { + return itemAdicionalDAO.obtenerTodos(); + } + + @Override + public ItemAdicional obtenerID(Integer id) { + return itemAdicionalDAO.obtenerID(id); + } + + @Transactional + @Override + public ItemAdicional suscribir(ItemAdicional entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return itemAdicionalDAO.suscribir(entidad); + } + + @Transactional + @Override + public ItemAdicional actualizacion(ItemAdicional entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return itemAdicionalDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(ItemAdicional entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + itemAdicionalDAO.actualizacion(entidad); + } + + @Override + public List buscaItemAdicionalPacote(Pacote pacote) { + return itemAdicionalDAO.buscaItemAdicionalPacote(pacote); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ItemDescontoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ItemDescontoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ItemDescontoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ItemDescontoServiceImpl.java index c08e4b327..fd78165ed 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ItemDescontoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ItemDescontoServiceImpl.java @@ -1,66 +1,66 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ItemDescontoDAO; -import com.rjconsultores.ventaboletos.entidad.ItemDesconto; -import com.rjconsultores.ventaboletos.service.ItemDescontoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ItemDescontoService") -public class ItemDescontoServiceImpl implements ItemDescontoService { - - @Autowired - private ItemDescontoDAO itemDescontoDAO; - - @Override - public List obtenerTodos() { - return itemDescontoDAO.obtenerTodos(); - } - - @Override - public ItemDesconto obtenerID(Long id) { - return itemDescontoDAO.obtenerID(id); - } - - @Transactional - @Override - public ItemDesconto suscribir(ItemDesconto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return itemDescontoDAO.suscribir(entidad); - } - - @Transactional - @Override - public ItemDesconto actualizacion(ItemDesconto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return itemDescontoDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(ItemDesconto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - itemDescontoDAO.actualizacion(entidad); - } - - @Override - public List buscarPorNome(String nomitemdesconto) { - return itemDescontoDAO.buscarPorNome(nomitemdesconto); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ItemDescontoDAO; +import com.rjconsultores.ventaboletos.entidad.ItemDesconto; +import com.rjconsultores.ventaboletos.service.ItemDescontoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ItemDescontoService") +public class ItemDescontoServiceImpl implements ItemDescontoService { + + @Autowired + private ItemDescontoDAO itemDescontoDAO; + + @Override + public List obtenerTodos() { + return itemDescontoDAO.obtenerTodos(); + } + + @Override + public ItemDesconto obtenerID(Long id) { + return itemDescontoDAO.obtenerID(id); + } + + @Transactional + @Override + public ItemDesconto suscribir(ItemDesconto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return itemDescontoDAO.suscribir(entidad); + } + + @Transactional + @Override + public ItemDesconto actualizacion(ItemDesconto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return itemDescontoDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(ItemDesconto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + itemDescontoDAO.actualizacion(entidad); + } + + @Override + public List buscarPorNome(String nomitemdesconto) { + return itemDescontoDAO.buscarPorNome(nomitemdesconto); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java index 93362e4a2..cc8ec25f6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java @@ -1,135 +1,135 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.LogAuditoriaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.LogAuditoria; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -import br.com.rjconsultores.auditador.auditadores.Auditador; -import br.com.rjconsultores.auditador.enums.AuditadorTipoAlteracao; -import br.com.rjconsultores.auditador.model.AuditadorObjects; - -@Service("LogAuditoriaService") -public class LogAuditoriaServiceImpl implements LogAuditoriaService { - - private static final Logger log = LogManager.getLogger(LogAuditoriaServiceImpl.class); - - @Autowired - private LogAuditoriaDAO logAuditoriaDAO; - - @Override - public List obtenerTodos() { - return logAuditoriaDAO.obtenerTodos(); - } - - @Override - public LogAuditoria obtenerID(Long id) { - return logAuditoriaDAO.obtenerID(id); - } - - @Override - @Transactional - public LogAuditoria suscribir(LogAuditoria entidad) { - entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return logAuditoriaDAO.suscribir(entidad); - } - - @Override - @Transactional - public LogAuditoria actualizacion(LogAuditoria entidad) { - entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return logAuditoriaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(LogAuditoria entidad) { - entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - logAuditoriaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void auditar(Object original, Object novo, Integer empresaId) { - try { - log.info(String.format(":: Iniciando gravação registros de auditoria classe: %s", novo.getClass().getSimpleName())); - Integer totalRegistrosAuditados = 0; - List lista = Auditador.getInstance().auditar(original, novo); - if(lista != null && !lista.isEmpty()) { - suscribir(lista, empresaId); - totalRegistrosAuditados = lista.size(); - } - log.info(String.format(":: Fim gravação registros de auditoria classe: %s - Total Registros auditados: %d", novo.getClass().getSimpleName(), totalRegistrosAuditados)); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - - private LogAuditoria convertToLogAuditoria(AuditadorObjects log, Integer empresaId) { - LogAuditoria logAuditoria = new LogAuditoria(); - logAuditoria.setUsuario(UsuarioLogado.getUsuarioLogado()); - logAuditoria.setFecmodif(Calendar.getInstance().getTime()); - logAuditoria.setActivo(Boolean.TRUE); - logAuditoria.setCampoAlterado(log.getCampoAlterado() != null ? log.getCampoAlterado().toUpperCase() : null); - logAuditoria.setClasseAlterada(log.getClasseAlterada()); - logAuditoria.setClassePrincipal(log.getClassePrincipal()); - logAuditoria.setTela(log.getTela()); - logAuditoria.setTipoAlteracao(log.getTipoAlteracao() != null ? log.getTipoAlteracao().toString() : AuditadorTipoAlteracao.ALTERACAO.toString()); - logAuditoria.setValorAnterior(log.getValorAnterior() != null ? log.getValorAnterior().toUpperCase() : null); - logAuditoria.setValorNovo(log.getValorNovo() != null ? log.getValorNovo().toUpperCase() : null); - logAuditoria.setIdAuditado(log.getIdAuditado()); - - if(empresaId != null) { - logAuditoria.setEmpresa(new Empresa(empresaId)); - } - return logAuditoria; - } - - @Override - @Transactional - public void auditarExclusao(Object objeto, Integer empresaId) { - try { - log.info(String.format(":: Iniciando gravação registros de auditoria de exclusao classe: %s", objeto.getClass().getSimpleName())); - Integer totalRegistrosAuditados = 0; - List lista = Auditador.getInstance().auditarExclusao(objeto); - if(lista != null && !lista.isEmpty()) { - suscribir(lista, empresaId); - totalRegistrosAuditados = lista.size(); - } - log.info(String.format(":: Fim gravação registros de auditoria de exclusao classe: %s - Total Registros auditados: %d", objeto.getClass().getSimpleName(), totalRegistrosAuditados)); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - - @Override - public List listarTodasAsTelas() { - return logAuditoriaDAO.listarTodasAsTelas(); - } - - @Override - @Transactional - public void suscribir(List lsObjects, Integer empresaId) { - for (AuditadorObjects auditado : lsObjects) { - LogAuditoria logAuditoria = convertToLogAuditoria(auditado, empresaId); - suscribir(logAuditoria); - } - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.LogAuditoriaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.LogAuditoria; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +import br.com.rjconsultores.auditador.auditadores.Auditador; +import br.com.rjconsultores.auditador.enums.AuditadorTipoAlteracao; +import br.com.rjconsultores.auditador.model.AuditadorObjects; + +@Service("LogAuditoriaService") +public class LogAuditoriaServiceImpl implements LogAuditoriaService { + + private static final Logger log = LogManager.getLogger(LogAuditoriaServiceImpl.class); + + @Autowired + private LogAuditoriaDAO logAuditoriaDAO; + + @Override + public List obtenerTodos() { + return logAuditoriaDAO.obtenerTodos(); + } + + @Override + public LogAuditoria obtenerID(Long id) { + return logAuditoriaDAO.obtenerID(id); + } + + @Override + @Transactional + public LogAuditoria suscribir(LogAuditoria entidad) { + entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return logAuditoriaDAO.suscribir(entidad); + } + + @Override + @Transactional + public LogAuditoria actualizacion(LogAuditoria entidad) { + entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return logAuditoriaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(LogAuditoria entidad) { + entidad.setUsuario(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + logAuditoriaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void auditar(Object original, Object novo, Integer empresaId) { + try { + log.info(String.format(":: Iniciando gravação registros de auditoria classe: %s", novo.getClass().getSimpleName())); + Integer totalRegistrosAuditados = 0; + List lista = Auditador.getInstance().auditar(original, novo); + if(lista != null && !lista.isEmpty()) { + suscribir(lista, empresaId); + totalRegistrosAuditados = lista.size(); + } + log.info(String.format(":: Fim gravação registros de auditoria classe: %s - Total Registros auditados: %d", novo.getClass().getSimpleName(), totalRegistrosAuditados)); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + private LogAuditoria convertToLogAuditoria(AuditadorObjects log, Integer empresaId) { + LogAuditoria logAuditoria = new LogAuditoria(); + logAuditoria.setUsuario(UsuarioLogado.getUsuarioLogado()); + logAuditoria.setFecmodif(Calendar.getInstance().getTime()); + logAuditoria.setActivo(Boolean.TRUE); + logAuditoria.setCampoAlterado(log.getCampoAlterado() != null ? log.getCampoAlterado().toUpperCase() : null); + logAuditoria.setClasseAlterada(log.getClasseAlterada()); + logAuditoria.setClassePrincipal(log.getClassePrincipal()); + logAuditoria.setTela(log.getTela()); + logAuditoria.setTipoAlteracao(log.getTipoAlteracao() != null ? log.getTipoAlteracao().toString() : AuditadorTipoAlteracao.ALTERACAO.toString()); + logAuditoria.setValorAnterior(log.getValorAnterior() != null ? log.getValorAnterior().toUpperCase() : null); + logAuditoria.setValorNovo(log.getValorNovo() != null ? log.getValorNovo().toUpperCase() : null); + logAuditoria.setIdAuditado(log.getIdAuditado()); + + if(empresaId != null) { + logAuditoria.setEmpresa(new Empresa(empresaId)); + } + return logAuditoria; + } + + @Override + @Transactional + public void auditarExclusao(Object objeto, Integer empresaId) { + try { + log.info(String.format(":: Iniciando gravação registros de auditoria de exclusao classe: %s", objeto.getClass().getSimpleName())); + Integer totalRegistrosAuditados = 0; + List lista = Auditador.getInstance().auditarExclusao(objeto); + if(lista != null && !lista.isEmpty()) { + suscribir(lista, empresaId); + totalRegistrosAuditados = lista.size(); + } + log.info(String.format(":: Fim gravação registros de auditoria de exclusao classe: %s - Total Registros auditados: %d", objeto.getClass().getSimpleName(), totalRegistrosAuditados)); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + @Override + public List listarTodasAsTelas() { + return logAuditoriaDAO.listarTodasAsTelas(); + } + + @Override + @Transactional + public void suscribir(List lsObjects, Integer empresaId) { + for (AuditadorObjects auditado : lsObjects) { + LogAuditoria logAuditoria = convertToLogAuditoria(auditado, empresaId); + suscribir(logAuditoria); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/LogDespesasReceitasDivServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/LogDespesasReceitasDivServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/LogDespesasReceitasDivServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/LogDespesasReceitasDivServiceImpl.java index 00fd5a890..32ff3f6b2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/LogDespesasReceitasDivServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/LogDespesasReceitasDivServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.LogDespesaReceitaDivDAO; -import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; -import com.rjconsultores.ventaboletos.service.LogDespesasReceitasDivService; - -@Service("logDespesasReceitasDivService") -public class LogDespesasReceitasDivServiceImpl implements LogDespesasReceitasDivService{ - - @Autowired - private LogDespesaReceitaDivDAO logDespesaReceitaDivDAO; - - @Override - public List obtenerTodos() { - return logDespesaReceitaDivDAO.obtenerTodos(); - } - - public List obterPorPeriodo(Date inicio, Date fim){ - return logDespesaReceitaDivDAO.obterPorPeriodo(inicio, fim); - } - - @Override - public LogDespesaReceitaDiversa obtenerID(Long id) { - return logDespesaReceitaDivDAO.obtenerID(id); - } - - @Override - @Transactional - public LogDespesaReceitaDiversa suscribir(LogDespesaReceitaDiversa entidad) { - return logDespesaReceitaDivDAO.suscribir(entidad); - } - - @Override - @Transactional - public LogDespesaReceitaDiversa actualizacion(LogDespesaReceitaDiversa entidad) { - return logDespesaReceitaDivDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(LogDespesaReceitaDiversa entidad) { - logDespesaReceitaDivDAO.borrar(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.LogDespesaReceitaDivDAO; +import com.rjconsultores.ventaboletos.entidad.LogDespesaReceitaDiversa; +import com.rjconsultores.ventaboletos.service.LogDespesasReceitasDivService; + +@Service("logDespesasReceitasDivService") +public class LogDespesasReceitasDivServiceImpl implements LogDespesasReceitasDivService{ + + @Autowired + private LogDespesaReceitaDivDAO logDespesaReceitaDivDAO; + + @Override + public List obtenerTodos() { + return logDespesaReceitaDivDAO.obtenerTodos(); + } + + public List obterPorPeriodo(Date inicio, Date fim){ + return logDespesaReceitaDivDAO.obterPorPeriodo(inicio, fim); + } + + @Override + public LogDespesaReceitaDiversa obtenerID(Long id) { + return logDespesaReceitaDivDAO.obtenerID(id); + } + + @Override + @Transactional + public LogDespesaReceitaDiversa suscribir(LogDespesaReceitaDiversa entidad) { + return logDespesaReceitaDivDAO.suscribir(entidad); + } + + @Override + @Transactional + public LogDespesaReceitaDiversa actualizacion(LogDespesaReceitaDiversa entidad) { + return logDespesaReceitaDivDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(LogDespesaReceitaDiversa entidad) { + logDespesaReceitaDivDAO.borrar(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MarcaAutobusServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaAutobusServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/MarcaAutobusServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaAutobusServiceImpl.java index f20d26705..6bfbe2ae8 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MarcaAutobusServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaAutobusServiceImpl.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.MarcaAutobusDAO; -import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; -import com.rjconsultores.ventaboletos.service.MarcaAutobusService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("marcaAutobusService") -public class MarcaAutobusServiceImpl implements MarcaAutobusService { - - @Autowired - private MarcaAutobusDAO marcaAutobusDAO; - - public List obtenerTodos() { - return marcaAutobusDAO.obtenerTodos(); - } - - public MarcaAutobus obtenerID(Integer id) { - return marcaAutobusDAO.obtenerID(id); - } - - @Transactional - public MarcaAutobus suscribir(MarcaAutobus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return marcaAutobusDAO.suscribir(entidad); - } - - @Transactional - public MarcaAutobus actualizacion(MarcaAutobus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return marcaAutobusDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(MarcaAutobus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - marcaAutobusDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.MarcaAutobusDAO; +import com.rjconsultores.ventaboletos.entidad.MarcaAutobus; +import com.rjconsultores.ventaboletos.service.MarcaAutobusService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("marcaAutobusService") +public class MarcaAutobusServiceImpl implements MarcaAutobusService { + + @Autowired + private MarcaAutobusDAO marcaAutobusDAO; + + public List obtenerTodos() { + return marcaAutobusDAO.obtenerTodos(); + } + + public MarcaAutobus obtenerID(Integer id) { + return marcaAutobusDAO.obtenerID(id); + } + + @Transactional + public MarcaAutobus suscribir(MarcaAutobus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return marcaAutobusDAO.suscribir(entidad); + } + + @Transactional + public MarcaAutobus actualizacion(MarcaAutobus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return marcaAutobusDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(MarcaAutobus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + marcaAutobusDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MarcaClaseServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaClaseServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MarcaClaseServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaClaseServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MensagemRecusaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensagemRecusaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MensagemRecusaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensagemRecusaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MensajeEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajeEmpresaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MensajeEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajeEmpresaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MensajePuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajePuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MensajePuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajePuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MensajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajeServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MensajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajeServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MensajeUsuarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajeUsuarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MensajeUsuarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MensajeUsuarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MercadoCompetidoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MercadoCompetidoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MercadoCompetidoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MercadoCompetidoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MerchantBancarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MerchantBancarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MerchantBancarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MerchantBancarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MigracaoControleEstoqueServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MigracaoControleEstoqueServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/MigracaoControleEstoqueServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MigracaoControleEstoqueServiceImpl.java index 04e9ce251..89d9d1a6f 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MigracaoControleEstoqueServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MigracaoControleEstoqueServiceImpl.java @@ -1,152 +1,152 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AbastoBoletoDAO; -import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; -import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; -import com.rjconsultores.ventaboletos.dao.AidfDAO; -import com.rjconsultores.ventaboletos.dao.DetAbastoBoletoDAO; -import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; -import com.rjconsultores.ventaboletos.dao.TipoMovimentacionDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; -import com.rjconsultores.ventaboletos.service.MigracaoControleEstoqueService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("migracaoControleEstoqueService") -public class MigracaoControleEstoqueServiceImpl implements MigracaoControleEstoqueService { - - - @Autowired - private AbastoBoletoDAO abastoBoletoDAO; - - @Autowired - private DetAbastoBoletoDAO detAbastoBoletoDAO; - - @Autowired - private AidfDAO aidfDAO; - - @Autowired - private AbastoCentralDAO abastoCentralDAO; - - @Autowired - private AbastoHistoDAO abastoHistoDAO; - - @Autowired - private TipoMovimentacionDAO tipoMovimentacionDAO; - - @Autowired - private PuntoVentaDAO puntoVentaDAO; - - public MigracaoControleEstoqueServiceImpl() { - } - - @Transactional - public void migraDadosBoletosPuntoVenta(PuntoVenta puntoVenta){ - puntoVentaDAO.actualizacion(puntoVenta); - } - - @Transactional - public void migraDadosBoletosPuntoVentaAutomatico(PuntoVenta puntoVenta){ - - List abastoBoletos = abastoBoletoDAO.buscaAbastoBoletoPorPuntoVenta(puntoVenta); - - List empresas = new ArrayList(); - empresas.add(puntoVenta.getEmpresa()); - - List aidfs = aidfDAO.buscaAidfsPorEmpresas(empresas); - - Map> abastoBoletosPorAidf = new HashMap>(); - - for(AbastoBoleto abastoBoleto: abastoBoletos){ - - List detAbastoBoletos = detAbastoBoletoDAO.buscaDetAbastoBoletos(abastoBoleto); - - for(Aidf aidf : aidfs){ - - if(!abastoBoletosPorAidf.containsKey(aidf)) - abastoBoletosPorAidf.put(aidf, new ArrayList()); - - for(DetAbastoBoleto detAbastoBoleto : detAbastoBoletos){ - - String serieDetAbastoBoleto = detAbastoBoleto.getNumseriepreimpresa(); - Long numFolioInicialDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfolioinicial()); - Long numFolioFinalDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfoliofinal()); - - Long numFolioInicialAidf = Long.valueOf(aidf.getForminicial()); - Long numFolioFinalAidf = Long.valueOf(aidf.getFormfinal()); - - if(serieDetAbastoBoleto.equals(aidf.getSerie()) - && numFolioInicialDetAbastoBoleto >= numFolioInicialAidf - && numFolioFinalDetAbastoBoleto <= numFolioFinalAidf){ - - abastoBoletosPorAidf.get(aidf).add(detAbastoBoleto); - } - } - } - } - - Iterator>> boletosIt = abastoBoletosPorAidf.entrySet().iterator(); - - List boletosAMigrar = new ArrayList(); - - Integer usuarioId = UsuarioLogado.getUsuarioLogado().getUsuarioId(); - Date fecmodif = new Date(); - - while(boletosIt.hasNext()){ - - Entry> boletosPorAidf = boletosIt.next(); - - Aidf aidf = boletosPorAidf.getKey(); - List detAbastoBoletos = boletosPorAidf.getValue(); - - for(DetAbastoBoleto detAbastoBoleto : detAbastoBoletos){ - - String serieDetAbastoBoleto = detAbastoBoleto.getNumseriepreimpresa(); - Long numFolioInicialDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfolioinicial()); - Long numFolioFinalDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfoliofinal()); - - int numBoletos = (int)(numFolioFinalDetAbastoBoleto - numFolioInicialDetAbastoBoleto); - - Boolean activo = detAbastoBoleto.getActivo(); - String numsubseriepreimpreso = ""; - - for(int contBoletos = 0 ; contBoletos < numBoletos; contBoletos++ ){ - - String numfoliopreimpreso = (numFolioInicialDetAbastoBoleto + contBoletos)+""; - - AbastoCentral boletoAMigrar = new AbastoCentral( - aidf, serieDetAbastoBoleto, numfoliopreimpreso, numsubseriepreimpreso, - puntoVenta, activo, fecmodif, usuarioId); - - boletosAMigrar.add(boletoAMigrar); - } - } - } - - abastoCentralDAO.suscribirBilhetes(boletosAMigrar); - - TipoMovimentacion tipoMovMigracao = tipoMovimentacionDAO.buscarTipoMovimentacio(TipoMovimentacion.TIPO_MIGRACAO); - abastoHistoDAO.grabaHistoricoBilhetes(boletosAMigrar, tipoMovMigracao); - - - abastoCentralDAO.gravaControleEstoqueMigracao(puntoVenta, fecmodif, usuarioId); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AbastoBoletoDAO; +import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; +import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; +import com.rjconsultores.ventaboletos.dao.AidfDAO; +import com.rjconsultores.ventaboletos.dao.DetAbastoBoletoDAO; +import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; +import com.rjconsultores.ventaboletos.dao.TipoMovimentacionDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.DetAbastoBoleto; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; +import com.rjconsultores.ventaboletos.service.MigracaoControleEstoqueService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("migracaoControleEstoqueService") +public class MigracaoControleEstoqueServiceImpl implements MigracaoControleEstoqueService { + + + @Autowired + private AbastoBoletoDAO abastoBoletoDAO; + + @Autowired + private DetAbastoBoletoDAO detAbastoBoletoDAO; + + @Autowired + private AidfDAO aidfDAO; + + @Autowired + private AbastoCentralDAO abastoCentralDAO; + + @Autowired + private AbastoHistoDAO abastoHistoDAO; + + @Autowired + private TipoMovimentacionDAO tipoMovimentacionDAO; + + @Autowired + private PuntoVentaDAO puntoVentaDAO; + + public MigracaoControleEstoqueServiceImpl() { + } + + @Transactional + public void migraDadosBoletosPuntoVenta(PuntoVenta puntoVenta){ + puntoVentaDAO.actualizacion(puntoVenta); + } + + @Transactional + public void migraDadosBoletosPuntoVentaAutomatico(PuntoVenta puntoVenta){ + + List abastoBoletos = abastoBoletoDAO.buscaAbastoBoletoPorPuntoVenta(puntoVenta); + + List empresas = new ArrayList(); + empresas.add(puntoVenta.getEmpresa()); + + List aidfs = aidfDAO.buscaAidfsPorEmpresas(empresas); + + Map> abastoBoletosPorAidf = new HashMap>(); + + for(AbastoBoleto abastoBoleto: abastoBoletos){ + + List detAbastoBoletos = detAbastoBoletoDAO.buscaDetAbastoBoletos(abastoBoleto); + + for(Aidf aidf : aidfs){ + + if(!abastoBoletosPorAidf.containsKey(aidf)) + abastoBoletosPorAidf.put(aidf, new ArrayList()); + + for(DetAbastoBoleto detAbastoBoleto : detAbastoBoletos){ + + String serieDetAbastoBoleto = detAbastoBoleto.getNumseriepreimpresa(); + Long numFolioInicialDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfolioinicial()); + Long numFolioFinalDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfoliofinal()); + + Long numFolioInicialAidf = Long.valueOf(aidf.getForminicial()); + Long numFolioFinalAidf = Long.valueOf(aidf.getFormfinal()); + + if(serieDetAbastoBoleto.equals(aidf.getSerie()) + && numFolioInicialDetAbastoBoleto >= numFolioInicialAidf + && numFolioFinalDetAbastoBoleto <= numFolioFinalAidf){ + + abastoBoletosPorAidf.get(aidf).add(detAbastoBoleto); + } + } + } + } + + Iterator>> boletosIt = abastoBoletosPorAidf.entrySet().iterator(); + + List boletosAMigrar = new ArrayList(); + + Integer usuarioId = UsuarioLogado.getUsuarioLogado().getUsuarioId(); + Date fecmodif = new Date(); + + while(boletosIt.hasNext()){ + + Entry> boletosPorAidf = boletosIt.next(); + + Aidf aidf = boletosPorAidf.getKey(); + List detAbastoBoletos = boletosPorAidf.getValue(); + + for(DetAbastoBoleto detAbastoBoleto : detAbastoBoletos){ + + String serieDetAbastoBoleto = detAbastoBoleto.getNumseriepreimpresa(); + Long numFolioInicialDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfolioinicial()); + Long numFolioFinalDetAbastoBoleto = Long.valueOf(detAbastoBoleto.getNumfoliofinal()); + + int numBoletos = (int)(numFolioFinalDetAbastoBoleto - numFolioInicialDetAbastoBoleto); + + Boolean activo = detAbastoBoleto.getActivo(); + String numsubseriepreimpreso = ""; + + for(int contBoletos = 0 ; contBoletos < numBoletos; contBoletos++ ){ + + String numfoliopreimpreso = (numFolioInicialDetAbastoBoleto + contBoletos)+""; + + AbastoCentral boletoAMigrar = new AbastoCentral( + aidf, serieDetAbastoBoleto, numfoliopreimpreso, numsubseriepreimpreso, + puntoVenta, activo, fecmodif, usuarioId); + + boletosAMigrar.add(boletoAMigrar); + } + } + } + + abastoCentralDAO.suscribirBilhetes(boletosAMigrar); + + TipoMovimentacion tipoMovMigracao = tipoMovimentacionDAO.buscarTipoMovimentacio(TipoMovimentacion.TIPO_MIGRACAO); + abastoHistoDAO.grabaHistoricoBilhetes(boletosAMigrar, tipoMovMigracao); + + + abastoCentralDAO.gravaControleEstoqueMigracao(puntoVenta, fecmodif, usuarioId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java index b88b35e04..58a00aa75 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java @@ -1,114 +1,114 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.sql.DataSource; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.MonitoramentoCCFDAO; -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; -import com.rjconsultores.ventaboletos.service.MonitoramentoCCFService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("monitoramentoCCFService") -public class MonitoramentoCCFServiceImpl implements MonitoramentoCCFService{ - private static final Logger log = LogManager.getLogger(MonitoramentoCCFServiceImpl.class); - - @Autowired - private MonitoramentoCCFDAO monitoramentoCCFDAO; - @Autowired - private DataSource dataSource; - private Connection con; - - public List obtenerTodos() { - return monitoramentoCCFDAO.obtenerTodos(); - } - - public MonitoramentoCCF obtenerID(Integer id) { - return monitoramentoCCFDAO.obtenerID(id); - } - - @Override - public void openConnection(){ - try { - con = dataSource.getConnection(); - monitoramentoCCFDAO.setConnection(con); - log.debug("Abrindo conexão..."); - } catch (SQLException e) { - log.error("", e); - } - } - - @Override - public void closeConnection(){ - try { - this.con.close(); - log.debug("Conexão fechada!"); - } catch (SQLException e) { - log.error("", e); - } finally { - if (con != null){ - try { con.close(); } catch (SQLException e) { log.error("", e); } - } - } - } - - @Transactional - public MonitoramentoCCF suscribir(MonitoramentoCCF entidad) { - entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return monitoramentoCCFDAO.suscribir(entidad); - } - - @Transactional - public MonitoramentoCCF actualizacion(MonitoramentoCCF entidad) { - entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return monitoramentoCCFDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(MonitoramentoCCF entidad) { - entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - monitoramentoCCFDAO.actualizacion(entidad); - } - - @Override - public List buscaQuebraCCF(final String numserie20, final Date data, final Integer ccfInicial) { - return monitoramentoCCFDAO.buscaQuebraCCF(numserie20, data, ccfInicial); - } - - public void gravarListaCCFQuebrados(Map impressoras, Date data){ - try { - for (Entry imp : impressoras.entrySet()){ - for (MonitoramentoCCF m : buscaQuebraCCF(imp.getKey(), data, imp.getValue())){ - monitoramentoCCFDAO.suscribir(m); - } - } - } catch (Exception e) { - log.error("", e); - } - } - - public Map obterImpressorasComCCFInicial(Date data){ - return monitoramentoCCFDAO.obterImpressorasComCCFInicial(data); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.sql.DataSource; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.MonitoramentoCCFDAO; +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCCF; +import com.rjconsultores.ventaboletos.service.MonitoramentoCCFService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("monitoramentoCCFService") +public class MonitoramentoCCFServiceImpl implements MonitoramentoCCFService{ + private static final Logger log = LogManager.getLogger(MonitoramentoCCFServiceImpl.class); + + @Autowired + private MonitoramentoCCFDAO monitoramentoCCFDAO; + @Autowired + private DataSource dataSource; + private Connection con; + + public List obtenerTodos() { + return monitoramentoCCFDAO.obtenerTodos(); + } + + public MonitoramentoCCF obtenerID(Integer id) { + return monitoramentoCCFDAO.obtenerID(id); + } + + @Override + public void openConnection(){ + try { + con = dataSource.getConnection(); + monitoramentoCCFDAO.setConnection(con); + log.debug("Abrindo conexão..."); + } catch (SQLException e) { + log.error("", e); + } + } + + @Override + public void closeConnection(){ + try { + this.con.close(); + log.debug("Conexão fechada!"); + } catch (SQLException e) { + log.error("", e); + } finally { + if (con != null){ + try { con.close(); } catch (SQLException e) { log.error("", e); } + } + } + } + + @Transactional + public MonitoramentoCCF suscribir(MonitoramentoCCF entidad) { + entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return monitoramentoCCFDAO.suscribir(entidad); + } + + @Transactional + public MonitoramentoCCF actualizacion(MonitoramentoCCF entidad) { + entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return monitoramentoCCFDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(MonitoramentoCCF entidad) { + entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + monitoramentoCCFDAO.actualizacion(entidad); + } + + @Override + public List buscaQuebraCCF(final String numserie20, final Date data, final Integer ccfInicial) { + return monitoramentoCCFDAO.buscaQuebraCCF(numserie20, data, ccfInicial); + } + + public void gravarListaCCFQuebrados(Map impressoras, Date data){ + try { + for (Entry imp : impressoras.entrySet()){ + for (MonitoramentoCCF m : buscaQuebraCCF(imp.getKey(), data, imp.getValue())){ + monitoramentoCCFDAO.suscribir(m); + } + } + } catch (Exception e) { + log.error("", e); + } + } + + public Map obterImpressorasComCCFInicial(Date data){ + return monitoramentoCCFDAO.obterImpressorasComCCFInicial(data); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java index f20639d01..02556f472 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java @@ -1,69 +1,69 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.MonitoramentoCRZDAO; -import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; -import com.rjconsultores.ventaboletos.service.MonitoramentoCRZService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("monitoramentoCRZService") -public class MonitoramentoCRZServiceImpl implements MonitoramentoCRZService{ - private static final Logger log = LogManager.getLogger(MonitoramentoCRZServiceImpl.class); - - @Autowired - private MonitoramentoCRZDAO monitoramentoCRZDAO; - - public List obtenerTodos() { - return monitoramentoCRZDAO.obtenerTodos(); - } - - public MonitoramentoCRZ obtenerID(Integer id) { - return monitoramentoCRZDAO.obtenerID(id); - } - - @Transactional - public MonitoramentoCRZ suscribir(MonitoramentoCRZ entidad) { - entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - try{ - return monitoramentoCRZDAO.suscribir(entidad); - } catch (Exception e){ - log.error("", e); - return entidad; - } - } - - @Transactional - public MonitoramentoCRZ actualizacion(MonitoramentoCRZ entidad) { - entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return monitoramentoCRZDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(MonitoramentoCRZ entidad) { - entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - monitoramentoCRZDAO.actualizacion(entidad); - } - - @Override - public List buscaQuebraCRZ(Date data){ - return monitoramentoCRZDAO.buscaQuebraCRZ(data); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.MonitoramentoCRZDAO; +import com.rjconsultores.ventaboletos.entidad.MonitoramentoCRZ; +import com.rjconsultores.ventaboletos.service.MonitoramentoCRZService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("monitoramentoCRZService") +public class MonitoramentoCRZServiceImpl implements MonitoramentoCRZService{ + private static final Logger log = LogManager.getLogger(MonitoramentoCRZServiceImpl.class); + + @Autowired + private MonitoramentoCRZDAO monitoramentoCRZDAO; + + public List obtenerTodos() { + return monitoramentoCRZDAO.obtenerTodos(); + } + + public MonitoramentoCRZ obtenerID(Integer id) { + return monitoramentoCRZDAO.obtenerID(id); + } + + @Transactional + public MonitoramentoCRZ suscribir(MonitoramentoCRZ entidad) { + entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + try{ + return monitoramentoCRZDAO.suscribir(entidad); + } catch (Exception e){ + log.error("", e); + return entidad; + } + } + + @Transactional + public MonitoramentoCRZ actualizacion(MonitoramentoCRZ entidad) { + entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return monitoramentoCRZDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(MonitoramentoCRZ entidad) { + entidad.setUsuarioModif(UsuarioLogado.getUsuarioLogado()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + monitoramentoCRZDAO.actualizacion(entidad); + } + + @Override + public List buscaQuebraCRZ(Date data){ + return monitoramentoCRZDAO.buscaQuebraCRZ(data); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelVendaPacoteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelVendaPacoteServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelVendaPacoteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelVendaPacoteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoCancelacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MotivoDevolucaoBilheteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoDevolucaoBilheteServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MotivoDevolucaoBilheteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoDevolucaoBilheteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MotivoReimpresionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoReimpresionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MotivoReimpresionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoReimpresionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MotivoViajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoViajeServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MotivoViajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivoViajeServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MotivocancelacionEquivalenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivocancelacionEquivalenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MotivocancelacionEquivalenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MotivocancelacionEquivalenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MovimentacionBilhetesServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MovimentacionBilhetesServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/MovimentacionBilhetesServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MovimentacionBilhetesServiceImpl.java index 020741a9a..31f7e2055 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MovimentacionBilhetesServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MovimentacionBilhetesServiceImpl.java @@ -1,212 +1,212 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; -import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; -import com.rjconsultores.ventaboletos.dao.CajaDAO; -import com.rjconsultores.ventaboletos.dao.PtovtaTipoEstoqueDAO; -import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; -import com.rjconsultores.ventaboletos.dao.TipoMovimentacionDAO; -import com.rjconsultores.ventaboletos.entidad.AbastoCentral; -import com.rjconsultores.ventaboletos.entidad.AbastoHisto; -import com.rjconsultores.ventaboletos.entidad.Aidf; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.PtovtaTipoEstoque; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; -import com.rjconsultores.ventaboletos.service.AutorizaFolioService; -import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("movimentacioBilhetesService") -public class MovimentacionBilhetesServiceImpl implements MovimentacionBilhetesService { - - @Autowired - private AbastoCentralDAO abastoCentralDAO; - - @Autowired - private AbastoHistoDAO abastoHistoDAO; - - @Autowired - private TipoMovimentacionDAO tipoMovimentacionDAO; - - @Autowired - private PuntoVentaDAO puntoVentaDAO; - - @Autowired - private PtovtaTipoEstoqueDAO ptovtaTipoEstoqueDAO; - - @Autowired - private CajaDAO cajaDAO; - - @Autowired - private AutorizaFolioService autorizaFolioService; - - - @Override - public List obtenerHistoricoMovimetacion(String numBilhete) { - - return null; - } - - @Override - public List obtenerHistoricoMovimetacion(Aidf aidf) { - // TODO Auto-generated method stub - return null; - } - - @Override - public List obtenerHistoricoMovimetacion(Aidf aidf, Date fecInicial, Date fecFinal) { - // TODO Auto-generated method stub - return null; - } - - @Transactional - public void realizaAdquisicionBilhetes(Aidf aidf){ - - PuntoVenta suprimento = buscarAgSuprimento(); - - long formInicial = Long.valueOf(aidf.getForminicial()); - long formFinal = Long.valueOf(aidf.getFormfinal()); - - List bilhetes = new ArrayList(); - - for(long formCorrente = formInicial; formCorrente <= formFinal; formCorrente++){ - AbastoCentral nuevoBilhete = new AbastoCentral(); - nuevoBilhete.setAidf(aidf); - nuevoBilhete.setNumfoliopreimpreso(formCorrente+""); - nuevoBilhete.setNumseriepreimpresa(aidf.getSerie()); - nuevoBilhete.setNumsubseriepreimpreso(aidf.getSubserie()); - nuevoBilhete.setPuntoventa(suprimento); - nuevoBilhete.setFecmodif(Calendar.getInstance().getTime()); - nuevoBilhete.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - nuevoBilhete.setActivo(true); - - bilhetes.add(nuevoBilhete); - } - - abastoCentralDAO.suscribirBilhetes(bilhetes); - - TipoMovimentacion adquisicion = tipoMovimentacionDAO.buscarTipoMovimentacio(TipoMovimentacion.TIPO_ADQUISICION); - abastoHistoDAO.grabaHistoricoBilhetes(bilhetes, adquisicion); - - } - - @Transactional - public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, TipoMovimentacion tipoMovimentacion) { - - if(validaTipoMovimentacao(tipoMovimentacion)){ - List bilhetes = abastoCentralDAO.obtenerBilhetes(aidf, origem); - atualizaBilhetesEGrabaHistorico(bilhetes, destino, tipoMovimentacion); - } - } - - @Transactional - public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, Long cantidad, TipoMovimentacion tipoMovimentacion) { - - if(validaTipoMovimentacao(tipoMovimentacion)){ - Long formInicial = Long.valueOf(aidf.getForminicial()); - Long formFinal = formInicial + cantidad.longValue(); - - realizaMovimentacionBilhetes(aidf, origem, destino, formInicial.toString(), formFinal.toString(), tipoMovimentacion); - - } - } - - @Transactional - public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion) { - - if(validaTipoMovimentacao(tipoMovimentacion)){ - List bilhetes = abastoCentralDAO.obtenerBilhetes(aidf, formInicial, formFinal, origem); - atualizaBilhetesEGrabaHistorico(bilhetes, destino, tipoMovimentacion); - } - } - - private boolean validaTipoMovimentacao(TipoMovimentacion tipoMovimentacion){ - TipoMovimentacion adquisicion = tipoMovimentacionDAO.buscarTipoMovimentacio(TipoMovimentacion.TIPO_ADQUISICION); - return !tipoMovimentacion.equals(adquisicion); - } - - public List obtenerTiposMovimetacion() { - List tiposMovimentacion = tipoMovimentacionDAO.obtenerTodos(); - return tiposMovimentacion; - } - - public PuntoVenta buscarAgSuprimento() { - PtovtaTipoEstoque tipoSuprimento = ptovtaTipoEstoqueDAO.buscarTipoSuprimento(); - PuntoVenta suprimento = puntoVentaDAO.buscarPuntoVentaPorTipoEstoque(tipoSuprimento).get(0); - - return suprimento; - } - - - public PuntoVenta buscarAgContabilidade() { - PtovtaTipoEstoque tipoContabilidade = ptovtaTipoEstoqueDAO.buscarTipoContabilidade(); - PuntoVenta contabilidade = puntoVentaDAO.buscarPuntoVentaPorTipoEstoque(tipoContabilidade).get(0); - - return contabilidade; - } - - public List obtenerTiposMovimetacionPuntoVenta() { - List tipos = tipoMovimentacionDAO.obtenerTiposMovimetacionPuntoVenta(); - return tipos; - } - - @Transactional - public void realizaMovimentacionBilhetes(PuntoVenta puntoVentaBilhetes, Estacion origem, Estacion destino, String numSerie, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion) { - - List bilhetes = abastoCentralDAO.obtenerBilhetesPorPuntoVenta(numSerie, formInicial, formFinal, puntoVentaBilhetes, origem); - atualizaBilhetesEGrabaHistorico(bilhetes, destino, tipoMovimentacion); - trataRequisicionBilhetesEstacion(bilhetes, origem, destino, formInicial, formFinal, tipoMovimentacion); - } - - private void trataRequisicionBilhetesEstacion(List bilhetes, Estacion origem, Estacion destino, String numfolioinicial, String numfoliofinal, TipoMovimentacion tipoMovimentacion){ - - Aidf aidfCorrente = null; - - for(AbastoCentral bilhete : bilhetes){ - - if(aidfCorrente == null || (aidfCorrente != null && !aidfCorrente.equals(bilhete.getAidf()))){ - aidfCorrente = bilhete.getAidf(); - String numseriepreimpresa = aidfCorrente.getSerie(); - autorizaFolioService.noChequeFolioPreimpresos(aidfCorrente, origem, destino, numfolioinicial, numfoliofinal, numseriepreimpresa, aidfCorrente.getEmpresa(), tipoMovimentacion); - } - } - } - - private void atualizaBilhetesEGrabaHistorico(List bilhetes, Estacion destino, TipoMovimentacion tipoMovimentacion){ - - abastoCentralDAO.actualizaBilhetes(bilhetes, destino); - abastoHistoDAO.grabaHistoricoBilhetes(bilhetes, tipoMovimentacion); - } - - private void atualizaBilhetesEGrabaHistorico(List bilhetes, PuntoVenta destino, TipoMovimentacion tipoMovimentacion){ - - abastoCentralDAO.actualizaBilhetes(bilhetes, destino); - abastoHistoDAO.grabaHistoricoBilhetes(bilhetes, tipoMovimentacion); - } - - @Override - public List buscarSeriesBilhetesPorEstacion(Estacion estacion) { - List seriesEstacion = abastoCentralDAO.buscarSeriesBilhetesPorEstacion(estacion); - return seriesEstacion; - } - - @Override - public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal) { - String validarEstoqueUtilizado = cajaDAO.validarEstoqueUtilizado(aidf, folioInicial, folioFinal); - - return StringUtils.isBlank(validarEstoqueUtilizado)?"0":validarEstoqueUtilizado; - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.AbastoCentralDAO; +import com.rjconsultores.ventaboletos.dao.AbastoHistoDAO; +import com.rjconsultores.ventaboletos.dao.CajaDAO; +import com.rjconsultores.ventaboletos.dao.PtovtaTipoEstoqueDAO; +import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; +import com.rjconsultores.ventaboletos.dao.TipoMovimentacionDAO; +import com.rjconsultores.ventaboletos.entidad.AbastoCentral; +import com.rjconsultores.ventaboletos.entidad.AbastoHisto; +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PtovtaTipoEstoque; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.TipoMovimentacion; +import com.rjconsultores.ventaboletos.service.AutorizaFolioService; +import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("movimentacioBilhetesService") +public class MovimentacionBilhetesServiceImpl implements MovimentacionBilhetesService { + + @Autowired + private AbastoCentralDAO abastoCentralDAO; + + @Autowired + private AbastoHistoDAO abastoHistoDAO; + + @Autowired + private TipoMovimentacionDAO tipoMovimentacionDAO; + + @Autowired + private PuntoVentaDAO puntoVentaDAO; + + @Autowired + private PtovtaTipoEstoqueDAO ptovtaTipoEstoqueDAO; + + @Autowired + private CajaDAO cajaDAO; + + @Autowired + private AutorizaFolioService autorizaFolioService; + + + @Override + public List obtenerHistoricoMovimetacion(String numBilhete) { + + return null; + } + + @Override + public List obtenerHistoricoMovimetacion(Aidf aidf) { + // TODO Auto-generated method stub + return null; + } + + @Override + public List obtenerHistoricoMovimetacion(Aidf aidf, Date fecInicial, Date fecFinal) { + // TODO Auto-generated method stub + return null; + } + + @Transactional + public void realizaAdquisicionBilhetes(Aidf aidf){ + + PuntoVenta suprimento = buscarAgSuprimento(); + + long formInicial = Long.valueOf(aidf.getForminicial()); + long formFinal = Long.valueOf(aidf.getFormfinal()); + + List bilhetes = new ArrayList(); + + for(long formCorrente = formInicial; formCorrente <= formFinal; formCorrente++){ + AbastoCentral nuevoBilhete = new AbastoCentral(); + nuevoBilhete.setAidf(aidf); + nuevoBilhete.setNumfoliopreimpreso(formCorrente+""); + nuevoBilhete.setNumseriepreimpresa(aidf.getSerie()); + nuevoBilhete.setNumsubseriepreimpreso(aidf.getSubserie()); + nuevoBilhete.setPuntoventa(suprimento); + nuevoBilhete.setFecmodif(Calendar.getInstance().getTime()); + nuevoBilhete.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + nuevoBilhete.setActivo(true); + + bilhetes.add(nuevoBilhete); + } + + abastoCentralDAO.suscribirBilhetes(bilhetes); + + TipoMovimentacion adquisicion = tipoMovimentacionDAO.buscarTipoMovimentacio(TipoMovimentacion.TIPO_ADQUISICION); + abastoHistoDAO.grabaHistoricoBilhetes(bilhetes, adquisicion); + + } + + @Transactional + public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, TipoMovimentacion tipoMovimentacion) { + + if(validaTipoMovimentacao(tipoMovimentacion)){ + List bilhetes = abastoCentralDAO.obtenerBilhetes(aidf, origem); + atualizaBilhetesEGrabaHistorico(bilhetes, destino, tipoMovimentacion); + } + } + + @Transactional + public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, Long cantidad, TipoMovimentacion tipoMovimentacion) { + + if(validaTipoMovimentacao(tipoMovimentacion)){ + Long formInicial = Long.valueOf(aidf.getForminicial()); + Long formFinal = formInicial + cantidad.longValue(); + + realizaMovimentacionBilhetes(aidf, origem, destino, formInicial.toString(), formFinal.toString(), tipoMovimentacion); + + } + } + + @Transactional + public void realizaMovimentacionBilhetes(Aidf aidf, PuntoVenta origem, PuntoVenta destino, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion) { + + if(validaTipoMovimentacao(tipoMovimentacion)){ + List bilhetes = abastoCentralDAO.obtenerBilhetes(aidf, formInicial, formFinal, origem); + atualizaBilhetesEGrabaHistorico(bilhetes, destino, tipoMovimentacion); + } + } + + private boolean validaTipoMovimentacao(TipoMovimentacion tipoMovimentacion){ + TipoMovimentacion adquisicion = tipoMovimentacionDAO.buscarTipoMovimentacio(TipoMovimentacion.TIPO_ADQUISICION); + return !tipoMovimentacion.equals(adquisicion); + } + + public List obtenerTiposMovimetacion() { + List tiposMovimentacion = tipoMovimentacionDAO.obtenerTodos(); + return tiposMovimentacion; + } + + public PuntoVenta buscarAgSuprimento() { + PtovtaTipoEstoque tipoSuprimento = ptovtaTipoEstoqueDAO.buscarTipoSuprimento(); + PuntoVenta suprimento = puntoVentaDAO.buscarPuntoVentaPorTipoEstoque(tipoSuprimento).get(0); + + return suprimento; + } + + + public PuntoVenta buscarAgContabilidade() { + PtovtaTipoEstoque tipoContabilidade = ptovtaTipoEstoqueDAO.buscarTipoContabilidade(); + PuntoVenta contabilidade = puntoVentaDAO.buscarPuntoVentaPorTipoEstoque(tipoContabilidade).get(0); + + return contabilidade; + } + + public List obtenerTiposMovimetacionPuntoVenta() { + List tipos = tipoMovimentacionDAO.obtenerTiposMovimetacionPuntoVenta(); + return tipos; + } + + @Transactional + public void realizaMovimentacionBilhetes(PuntoVenta puntoVentaBilhetes, Estacion origem, Estacion destino, String numSerie, String formInicial, String formFinal, TipoMovimentacion tipoMovimentacion) { + + List bilhetes = abastoCentralDAO.obtenerBilhetesPorPuntoVenta(numSerie, formInicial, formFinal, puntoVentaBilhetes, origem); + atualizaBilhetesEGrabaHistorico(bilhetes, destino, tipoMovimentacion); + trataRequisicionBilhetesEstacion(bilhetes, origem, destino, formInicial, formFinal, tipoMovimentacion); + } + + private void trataRequisicionBilhetesEstacion(List bilhetes, Estacion origem, Estacion destino, String numfolioinicial, String numfoliofinal, TipoMovimentacion tipoMovimentacion){ + + Aidf aidfCorrente = null; + + for(AbastoCentral bilhete : bilhetes){ + + if(aidfCorrente == null || (aidfCorrente != null && !aidfCorrente.equals(bilhete.getAidf()))){ + aidfCorrente = bilhete.getAidf(); + String numseriepreimpresa = aidfCorrente.getSerie(); + autorizaFolioService.noChequeFolioPreimpresos(aidfCorrente, origem, destino, numfolioinicial, numfoliofinal, numseriepreimpresa, aidfCorrente.getEmpresa(), tipoMovimentacion); + } + } + } + + private void atualizaBilhetesEGrabaHistorico(List bilhetes, Estacion destino, TipoMovimentacion tipoMovimentacion){ + + abastoCentralDAO.actualizaBilhetes(bilhetes, destino); + abastoHistoDAO.grabaHistoricoBilhetes(bilhetes, tipoMovimentacion); + } + + private void atualizaBilhetesEGrabaHistorico(List bilhetes, PuntoVenta destino, TipoMovimentacion tipoMovimentacion){ + + abastoCentralDAO.actualizaBilhetes(bilhetes, destino); + abastoHistoDAO.grabaHistoricoBilhetes(bilhetes, tipoMovimentacion); + } + + @Override + public List buscarSeriesBilhetesPorEstacion(Estacion estacion) { + List seriesEstacion = abastoCentralDAO.buscarSeriesBilhetesPorEstacion(estacion); + return seriesEstacion; + } + + @Override + public String validarEstoqueUtilizado(Aidf aidf, String folioInicial, String folioFinal) { + String validarEstoqueUtilizado = cajaDAO.validarEstoqueUtilizado(aidf, folioInicial, folioFinal); + + return StringUtils.isBlank(validarEstoqueUtilizado)?"0":validarEstoqueUtilizado; + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MudancaMassivaContratoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MudancaMassivaContratoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/MudancaMassivaContratoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/MudancaMassivaContratoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/NodoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/NodoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/NodoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/NodoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/NotaCreditoVendaPacoteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/NotaCreditoVendaPacoteServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/NotaCreditoVendaPacoteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/NotaCreditoVendaPacoteServiceImpl.java index 0f85fda72..2b6f22ae9 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/NotaCreditoVendaPacoteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/NotaCreditoVendaPacoteServiceImpl.java @@ -1,25 +1,25 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.NotaCreditoVendaPacoteDAO; -import com.rjconsultores.ventaboletos.service.NotaCreditoVendaPacoteService; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -@Service("notaCreditoVendaPacoteService") -public class NotaCreditoVendaPacoteServiceImpl implements NotaCreditoVendaPacoteService { - - @Autowired - private NotaCreditoVendaPacoteDAO notaCreditoVendaPacoteDAO; - - @Override - public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { - return notaCreditoVendaPacoteDAO.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago); - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.NotaCreditoVendaPacoteDAO; +import com.rjconsultores.ventaboletos.service.NotaCreditoVendaPacoteService; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +@Service("notaCreditoVendaPacoteService") +public class NotaCreditoVendaPacoteServiceImpl implements NotaCreditoVendaPacoteService { + + @Autowired + private NotaCreditoVendaPacoteDAO notaCreditoVendaPacoteDAO; + + @Override + public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { + return notaCreditoVendaPacoteDAO.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java index 2fa80e963..f6b3e5922 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java @@ -1,81 +1,81 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.OCDParamDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OCDParam; -import com.rjconsultores.ventaboletos.service.OCDParamService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ocdParamService") -public class OCDParamServiceImpl implements OCDParamService { - - @Autowired - private OCDParamDAO ocdParamDAO; - - private void setUsuarioFecmodifActivoOCD(OCDParam entidad){ - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - } - - @Override - public List obtenerTodos() { - List params = ocdParamDAO.obtenerTodos(); - return params; - } - - @Override - public OCDParam obtenerID(Integer id) { - OCDParam param = ocdParamDAO.obtenerID(id); - return param; - } - - @Transactional - public OCDParam suscribirActualizar(OCDParam entidad){ - if (entidad.getOcdparamId() == null && ocdParamDAO.buscaOCDParamPorEmpresa(entidad.getEmpresa()) != null){ - return null; - } else{ - return ocdParamDAO.suscribirActualizar(entidad); - } - } - - @Transactional - public OCDParam suscribir(OCDParam entidad) { - setUsuarioFecmodifActivoOCD(entidad); - OCDParam param = ocdParamDAO.suscribir(entidad); - return param; - } - - @Transactional - public OCDParam actualizacion(OCDParam entidad) { - setUsuarioFecmodifActivoOCD(entidad); - OCDParam param = ocdParamDAO.actualizacion(entidad); - return param; - } - - @Transactional - public void borrar(OCDParam entidad) { - setUsuarioFecmodifActivoOCD(entidad); - entidad.setActivo(Boolean.FALSE); - ocdParamDAO.borrar(entidad); - } - - @Override - public OCDParam buscaOCDParamPorEmpresa(Empresa empresa) { - OCDParam param = ocdParamDAO.buscaOCDParamPorEmpresa(empresa); - return param; - } - - @Override - public List buscaOCDParams(Empresa empresa) { - List params = ocdParamDAO.buscaOCDParams(empresa); - return params; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.OCDParamDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OCDParam; +import com.rjconsultores.ventaboletos.service.OCDParamService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ocdParamService") +public class OCDParamServiceImpl implements OCDParamService { + + @Autowired + private OCDParamDAO ocdParamDAO; + + private void setUsuarioFecmodifActivoOCD(OCDParam entidad){ + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + } + + @Override + public List obtenerTodos() { + List params = ocdParamDAO.obtenerTodos(); + return params; + } + + @Override + public OCDParam obtenerID(Integer id) { + OCDParam param = ocdParamDAO.obtenerID(id); + return param; + } + + @Transactional + public OCDParam suscribirActualizar(OCDParam entidad){ + if (entidad.getOcdparamId() == null && ocdParamDAO.buscaOCDParamPorEmpresa(entidad.getEmpresa()) != null){ + return null; + } else{ + return ocdParamDAO.suscribirActualizar(entidad); + } + } + + @Transactional + public OCDParam suscribir(OCDParam entidad) { + setUsuarioFecmodifActivoOCD(entidad); + OCDParam param = ocdParamDAO.suscribir(entidad); + return param; + } + + @Transactional + public OCDParam actualizacion(OCDParam entidad) { + setUsuarioFecmodifActivoOCD(entidad); + OCDParam param = ocdParamDAO.actualizacion(entidad); + return param; + } + + @Transactional + public void borrar(OCDParam entidad) { + setUsuarioFecmodifActivoOCD(entidad); + entidad.setActivo(Boolean.FALSE); + ocdParamDAO.borrar(entidad); + } + + @Override + public OCDParam buscaOCDParamPorEmpresa(Empresa empresa) { + OCDParam param = ocdParamDAO.buscaOCDParamPorEmpresa(empresa); + return param; + } + + @Override + public List buscaOCDParams(Empresa empresa) { + List params = ocdParamDAO.buscaOCDParams(empresa); + return params; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OCDPtoVtaParamServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDPtoVtaParamServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/OCDPtoVtaParamServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDPtoVtaParamServiceImpl.java index f01a2c316..053d35d67 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OCDPtoVtaParamServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDPtoVtaParamServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.OCDPtoVtaParamDAO; -import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; -import com.rjconsultores.ventaboletos.service.OCDPtoVtaParamService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ocdPtoVtaParamService") -public class OCDPtoVtaParamServiceImpl implements OCDPtoVtaParamService { - - @Autowired - private OCDPtoVtaParamDAO ocdPtoVtaParamDAO; - - @Override - public List obtenerTodos() { - return ocdPtoVtaParamDAO.obtenerTodos(); - } - - @Override - public OCDPtoVtaParam obtenerID(Long id) { - return ocdPtoVtaParamDAO.obtenerID(id); - } - - @Override - @Transactional(readOnly = false) - public OCDPtoVtaParam suscribir(OCDPtoVtaParam entidad) { - return ocdPtoVtaParamDAO.suscribir(entidad); - } - - @Override - @Transactional(readOnly = false) - public OCDPtoVtaParam actualizacion(OCDPtoVtaParam entidad) { - return ocdPtoVtaParamDAO.actualizacion(entidad); - } - - @Override - @Transactional(readOnly = false) - public void borrar(OCDPtoVtaParam entidad) { - entidad.setActivo(Boolean.FALSE); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - ocdPtoVtaParamDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.OCDPtoVtaParamDAO; +import com.rjconsultores.ventaboletos.entidad.OCDPtoVtaParam; +import com.rjconsultores.ventaboletos.service.OCDPtoVtaParamService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ocdPtoVtaParamService") +public class OCDPtoVtaParamServiceImpl implements OCDPtoVtaParamService { + + @Autowired + private OCDPtoVtaParamDAO ocdPtoVtaParamDAO; + + @Override + public List obtenerTodos() { + return ocdPtoVtaParamDAO.obtenerTodos(); + } + + @Override + public OCDPtoVtaParam obtenerID(Long id) { + return ocdPtoVtaParamDAO.obtenerID(id); + } + + @Override + @Transactional(readOnly = false) + public OCDPtoVtaParam suscribir(OCDPtoVtaParam entidad) { + return ocdPtoVtaParamDAO.suscribir(entidad); + } + + @Override + @Transactional(readOnly = false) + public OCDPtoVtaParam actualizacion(OCDPtoVtaParam entidad) { + return ocdPtoVtaParamDAO.actualizacion(entidad); + } + + @Override + @Transactional(readOnly = false) + public void borrar(OCDPtoVtaParam entidad) { + entidad.setActivo(Boolean.FALSE); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + ocdPtoVtaParamDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OCDServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/OCDServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDServiceImpl.java index 86ee942c1..218dcb887 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OCDServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OCDServiceImpl.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.OCDDAO; -import com.rjconsultores.ventaboletos.entidad.OCD; -import com.rjconsultores.ventaboletos.service.OCDService; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; - -@Service("ocdService") -public class OCDServiceImpl implements OCDService { - - @Autowired - private OCDDAO ocdDAO; - - @Override - public List obtenerTodos() { - return null; - } - - @Override - public OCD obtenerID(Integer id) { - return null; - } - - @Override - public OCD suscribir(OCD entidad) { - return null; - } - - @Override - public OCD actualizacion(OCD entidad) { - return null; - } - - @Override - public void borrar(OCD entidad) { - } - - @Transactional(propagation = Propagation.REQUIRED) - @Override - public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { - return ocdDAO.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago); - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.OCDDAO; +import com.rjconsultores.ventaboletos.entidad.OCD; +import com.rjconsultores.ventaboletos.service.OCDService; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; + +@Service("ocdService") +public class OCDServiceImpl implements OCDService { + + @Autowired + private OCDDAO ocdDAO; + + @Override + public List obtenerTodos() { + return null; + } + + @Override + public OCD obtenerID(Integer id) { + return null; + } + + @Override + public OCD suscribir(OCD entidad) { + return null; + } + + @Override + public OCD actualizacion(OCD entidad) { + return null; + } + + @Override + public void borrar(OCD entidad) { + } + + @Transactional(propagation = Propagation.REQUIRED) + @Override + public List busquedaDatosReembolsoOcdNotaCreditoRS(Date fecInicial, Date fecFinal, Date fecPagamentoInicial, Date fecPagamentoFinal, Boolean indPago) { + return ocdDAO.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OperadorEmbarcadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OperadorEmbarcadaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/OperadorEmbarcadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OperadorEmbarcadaServiceImpl.java index f410aae5e..e0bbaf91b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OperadorEmbarcadaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OperadorEmbarcadaServiceImpl.java @@ -1,114 +1,114 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaDAO; -import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaLinhaDAO; -import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaServicoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; -import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.service.OperadorEmbarcadaService; -import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; - -@Service("operadorEmbarcadaService") -public class OperadorEmbarcadaServiceImpl implements OperadorEmbarcadaService { - - @Autowired - private OperadorEmbarcadaDAO operadorDAO; - @Autowired - private OperadorEmbarcadaServicoDAO opServicoDAO; - @Autowired - private OperadorEmbarcadaLinhaDAO opLinhaDAO; - - @Autowired - private LogAuditoriaService logAuditoriaService; - private static final Logger log = LogManager.getLogger(OperadorEmbarcadaServiceImpl.class); - - @Transactional(rollbackFor = BusinessException.class) - @Override - public OperadorEmbarcada suscribirActualizar(OperadorEmbarcada operador, List linhas, List listaServicos) throws BusinessException { - - if (operador.getOperadorEmbarcadaId() != null) { - List listaOpServico = opServicoDAO.buscarPorOperador(operador); - - List listaOpLinha = opLinhaDAO.buscarPorOperador(operador); - - for (OperadorEmbarcadaServico serv : listaOpServico) { - operador.getServicos().remove(serv); - serv.setOperadorEmbarcada(null); - opServicoDAO.borrar(serv); - } - - for (OperadorEmbarcadaLinha linha : listaOpLinha) { - operador.getLinhas().remove(linha); - linha.setOperadorEmbarcada(null); - opLinhaDAO.borrar(linha); - } - } - - operador.setLinhas(linhas); - operador.setServicos(listaServicos); - - if (operador.getOperadorEmbarcadaId() == null) { - operador = operadorDAO.suscribir(operador); - logAuditoriaService.auditar(null, operador, null); - } else { - OperadorEmbarcada operadorClone = null; - try { - operadorClone = operador.getCloneObject(); - } catch (CloneNotSupportedException e) { - log.error("Erro ao clonar oobjeto OperadorEmbarcada, erro: ",e); - } - - operador = operadorDAO.actualizacion(operador); - - logAuditoriaService.auditar(operadorClone, operador, null); - } - return operador; - } - - @Transactional - @Override - public void apagar(OperadorEmbarcada operador) throws BusinessException { - logAuditoriaService.auditarExclusao(operador, null); - operadorDAO.borrar(operador); - - } - - @Override - public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario) { - OperadorEmbarcada operador = operadorDAO.buscarOperadorEmbarcadaPorUsuario(idUsuario); - try { - if(operador != null) { - operador.clonar(); - } - } catch (CloneNotSupportedException e) { - } - - return operador; - } - - @Override - public PuntoVentaVO getPuntoVentaVO(Integer operador) { - return operadorDAO.getPuntoVentaVO(operador); - } - - @Override - public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta) { - return opServicoDAO.getListaCorridaVO(operador, empresa, dtIni, dtFim, puntoVenta); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaDAO; +import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaLinhaDAO; +import com.rjconsultores.ventaboletos.dao.OperadorEmbarcadaServicoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcada; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaLinha; +import com.rjconsultores.ventaboletos.entidad.OperadorEmbarcadaServico; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.service.OperadorEmbarcadaService; +import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; + +@Service("operadorEmbarcadaService") +public class OperadorEmbarcadaServiceImpl implements OperadorEmbarcadaService { + + @Autowired + private OperadorEmbarcadaDAO operadorDAO; + @Autowired + private OperadorEmbarcadaServicoDAO opServicoDAO; + @Autowired + private OperadorEmbarcadaLinhaDAO opLinhaDAO; + + @Autowired + private LogAuditoriaService logAuditoriaService; + private static final Logger log = LogManager.getLogger(OperadorEmbarcadaServiceImpl.class); + + @Transactional(rollbackFor = BusinessException.class) + @Override + public OperadorEmbarcada suscribirActualizar(OperadorEmbarcada operador, List linhas, List listaServicos) throws BusinessException { + + if (operador.getOperadorEmbarcadaId() != null) { + List listaOpServico = opServicoDAO.buscarPorOperador(operador); + + List listaOpLinha = opLinhaDAO.buscarPorOperador(operador); + + for (OperadorEmbarcadaServico serv : listaOpServico) { + operador.getServicos().remove(serv); + serv.setOperadorEmbarcada(null); + opServicoDAO.borrar(serv); + } + + for (OperadorEmbarcadaLinha linha : listaOpLinha) { + operador.getLinhas().remove(linha); + linha.setOperadorEmbarcada(null); + opLinhaDAO.borrar(linha); + } + } + + operador.setLinhas(linhas); + operador.setServicos(listaServicos); + + if (operador.getOperadorEmbarcadaId() == null) { + operador = operadorDAO.suscribir(operador); + logAuditoriaService.auditar(null, operador, null); + } else { + OperadorEmbarcada operadorClone = null; + try { + operadorClone = operador.getCloneObject(); + } catch (CloneNotSupportedException e) { + log.error("Erro ao clonar oobjeto OperadorEmbarcada, erro: ",e); + } + + operador = operadorDAO.actualizacion(operador); + + logAuditoriaService.auditar(operadorClone, operador, null); + } + return operador; + } + + @Transactional + @Override + public void apagar(OperadorEmbarcada operador) throws BusinessException { + logAuditoriaService.auditarExclusao(operador, null); + operadorDAO.borrar(operador); + + } + + @Override + public OperadorEmbarcada buscarOperadorEmbarcadaPorUsuario(Integer idUsuario) { + OperadorEmbarcada operador = operadorDAO.buscarOperadorEmbarcadaPorUsuario(idUsuario); + try { + if(operador != null) { + operador.clonar(); + } + } catch (CloneNotSupportedException e) { + } + + return operador; + } + + @Override + public PuntoVentaVO getPuntoVentaVO(Integer operador) { + return operadorDAO.getPuntoVentaVO(operador); + } + + @Override + public List getListaCorridaVO(Integer operador, Empresa empresa, Date dtIni, Date dtFim, PuntoVenta puntoVenta) { + return opServicoDAO.getListaCorridaVO(operador, empresa, dtIni, dtFim, puntoVenta); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoCancelacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoCancelacionServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/OrgaoCancelacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoCancelacionServiceImpl.java index f0ed89041..6b66fb499 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoCancelacionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoCancelacionServiceImpl.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.OrgaoCancelacionDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.service.OrgaoCancelacionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("orgaoCancelacionService") -public class OrgaoCancelacionServiceImpl implements OrgaoCancelacionService{ - - @Autowired - private OrgaoCancelacionDAO orgaoCancelacionDAO; - - public List obtenerTodos() { - return orgaoCancelacionDAO.obtenerTodos(); - } - - public OrgaoCancelacion obtenerID(Integer id) { - return orgaoCancelacionDAO.obtenerID(id); - } - - @Transactional - public OrgaoCancelacion suscribirActualizacion(OrgaoCancelacion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (entidad.getOrgaoCancelacionId() != null){ - return orgaoCancelacionDAO.actualizacion(entidad); - } else { - return orgaoCancelacionDAO.suscribir(entidad); - } - } - - @Transactional - public void borrar(OrgaoCancelacion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - orgaoCancelacionDAO.actualizacion(entidad); - } - - public List buscarPorOrgao(OrgaoConcedente orgaoConcedente) { - return orgaoCancelacionDAO.buscarPorOrgao(orgaoConcedente); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.OrgaoCancelacionDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.service.OrgaoCancelacionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("orgaoCancelacionService") +public class OrgaoCancelacionServiceImpl implements OrgaoCancelacionService{ + + @Autowired + private OrgaoCancelacionDAO orgaoCancelacionDAO; + + public List obtenerTodos() { + return orgaoCancelacionDAO.obtenerTodos(); + } + + public OrgaoCancelacion obtenerID(Integer id) { + return orgaoCancelacionDAO.obtenerID(id); + } + + @Transactional + public OrgaoCancelacion suscribirActualizacion(OrgaoCancelacion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (entidad.getOrgaoCancelacionId() != null){ + return orgaoCancelacionDAO.actualizacion(entidad); + } else { + return orgaoCancelacionDAO.suscribir(entidad); + } + } + + @Transactional + public void borrar(OrgaoCancelacion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + orgaoCancelacionDAO.actualizacion(entidad); + } + + public List buscarPorOrgao(OrgaoConcedente orgaoConcedente) { + return orgaoCancelacionDAO.buscarPorOrgao(orgaoConcedente); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoComprovanteCustomizadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoComprovanteCustomizadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/OrgaoComprovanteCustomizadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoComprovanteCustomizadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java index c4a16aeb6..abf7a08a6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java @@ -1,93 +1,93 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.OrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("orgaoConcedenteService") -public class OrgaoConcedenteServiceImpl implements OrgaoConcedenteService { - - @Autowired - private OrgaoConcedenteDAO orgaoConcedenteDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - private static final Logger log = LogManager.getLogger(OrgaoConcedenteServiceImpl.class); - - public List obtenerTodos() { - return orgaoConcedenteDAO.obtenerTodos(); - } - - public OrgaoConcedente obtenerID(Integer id) { - - OrgaoConcedente orgaoConcedente = orgaoConcedenteDAO.obtenerID(id); - try { - orgaoConcedente.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return orgaoConcedente; - - } - - @Transactional - public OrgaoConcedente suscribir(OrgaoConcedente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - orgaoConcedenteDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, null); - - return entidad; - } - - @Transactional - public OrgaoConcedente actualizacion(OrgaoConcedente entidad) { - - try { - OrgaoConcedente originalClone = entidad.getCloneObject(); - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - entidad = orgaoConcedenteDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, null); - } catch (Exception e) { - log.error(e); - } - - return entidad; - } - - @Transactional - public void borrar(OrgaoConcedente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - orgaoConcedenteDAO.actualizacion(entidad); - logAuditoriaService.auditarExclusao(entidad, null); - - } - - public List buscar(String desc) { - return orgaoConcedenteDAO.buscar(desc); - } - - @Override - public List obtenerTodosExceto(Integer... id) { - return orgaoConcedenteDAO.obtenerTodosExceto(id); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.OrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("orgaoConcedenteService") +public class OrgaoConcedenteServiceImpl implements OrgaoConcedenteService { + + @Autowired + private OrgaoConcedenteDAO orgaoConcedenteDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + private static final Logger log = LogManager.getLogger(OrgaoConcedenteServiceImpl.class); + + public List obtenerTodos() { + return orgaoConcedenteDAO.obtenerTodos(); + } + + public OrgaoConcedente obtenerID(Integer id) { + + OrgaoConcedente orgaoConcedente = orgaoConcedenteDAO.obtenerID(id); + try { + orgaoConcedente.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return orgaoConcedente; + + } + + @Transactional + public OrgaoConcedente suscribir(OrgaoConcedente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + orgaoConcedenteDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, null); + + return entidad; + } + + @Transactional + public OrgaoConcedente actualizacion(OrgaoConcedente entidad) { + + try { + OrgaoConcedente originalClone = entidad.getCloneObject(); + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + entidad = orgaoConcedenteDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, null); + } catch (Exception e) { + log.error(e); + } + + return entidad; + } + + @Transactional + public void borrar(OrgaoConcedente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + orgaoConcedenteDAO.actualizacion(entidad); + logAuditoriaService.auditarExclusao(entidad, null); + + } + + public List buscar(String desc) { + return orgaoConcedenteDAO.buscar(desc); + } + + @Override + public List obtenerTodosExceto(Integer... id) { + return orgaoConcedenteDAO.obtenerTodosExceto(id); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java index e1167e787..e60faaab9 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.OrgaoEmpParamDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; -import com.rjconsultores.ventaboletos.service.OrgaoEmpParamService; - -@Service("orgaoEmpParamService") -public class OrgaoEmpParamServiceImpl implements OrgaoEmpParamService { - - @Autowired - private OrgaoEmpParamDAO dao; - - @Override - public List obterPorOrgao(Integer orgaoConcedenteId) { - return dao.obterPorOrgao(orgaoConcedenteId); - } - - @Override - public List obterPorEmpresa(Integer empresaId) { - return dao.obterPorEmpresa(empresaId); - } - - @Override - public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId) { - return dao.obterPorOrgaoEmpresa(orgaoConcedenteId, empresaId); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.OrgaoEmpParamDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam; +import com.rjconsultores.ventaboletos.service.OrgaoEmpParamService; + +@Service("orgaoEmpParamService") +public class OrgaoEmpParamServiceImpl implements OrgaoEmpParamService { + + @Autowired + private OrgaoEmpParamDAO dao; + + @Override + public List obterPorOrgao(Integer orgaoConcedenteId) { + return dao.obterPorOrgao(orgaoConcedenteId); + } + + @Override + public List obterPorEmpresa(Integer empresaId) { + return dao.obterPorEmpresa(empresaId); + } + + @Override + public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId) { + return dao.obterPorOrgaoEmpresa(orgaoConcedenteId, empresaId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoTramoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoTramoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/OrgaoTramoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoTramoServiceImpl.java index 11002ce3a..840dfa904 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoTramoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/OrgaoTramoServiceImpl.java @@ -1,10 +1,10 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.service.OrgaoTramoService; - -@Service("orgaoTramoService") -public class OrgaoTramoServiceImpl implements OrgaoTramoService { - -} +package com.rjconsultores.ventaboletos.service.impl; + +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.service.OrgaoTramoService; + +@Service("orgaoTramoService") +public class OrgaoTramoServiceImpl implements OrgaoTramoService { + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PacoteConvenioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteConvenioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PacoteConvenioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteConvenioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PacoteDescontoBilheteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteDescontoBilheteServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PacoteDescontoBilheteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteDescontoBilheteServiceImpl.java index 68a8f09ba..413692e0a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PacoteDescontoBilheteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteDescontoBilheteServiceImpl.java @@ -1,60 +1,60 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PacoteDescontoBilheteDAO; -import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; -import com.rjconsultores.ventaboletos.service.PacoteDescontoBilheteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pacoteDescontoBilheteService") -public class PacoteDescontoBilheteServiceImpl implements PacoteDescontoBilheteService { - - @Autowired - PacoteDescontoBilheteDAO pacoteDescontoBilheteDAO; - - @Override - public List obtenerTodos() { - return pacoteDescontoBilheteDAO.obtenerTodos(); - } - - @Override - public PacoteDescontoBilhete obtenerID(Long id) { - return pacoteDescontoBilheteDAO.obtenerID(id); - } - - @Override - @Transactional - public PacoteDescontoBilhete suscribir(PacoteDescontoBilhete entidad) { - entidad.setActivo(true); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return pacoteDescontoBilheteDAO.suscribir(entidad); - } - - @Override - @Transactional - public PacoteDescontoBilhete actualizacion(PacoteDescontoBilhete entidad) { - entidad.setFecmodif(new Date()); - return pacoteDescontoBilheteDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PacoteDescontoBilhete entidad) { - entidad.setActivo(false); - entidad.setFecmodif(new Date()); - actualizacion(entidad); - } - - @Override - public List obtenerTodos(Integer pacoteId) { - return pacoteDescontoBilheteDAO.obtenerTodos(pacoteId); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PacoteDescontoBilheteDAO; +import com.rjconsultores.ventaboletos.entidad.PacoteDescontoBilhete; +import com.rjconsultores.ventaboletos.service.PacoteDescontoBilheteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pacoteDescontoBilheteService") +public class PacoteDescontoBilheteServiceImpl implements PacoteDescontoBilheteService { + + @Autowired + PacoteDescontoBilheteDAO pacoteDescontoBilheteDAO; + + @Override + public List obtenerTodos() { + return pacoteDescontoBilheteDAO.obtenerTodos(); + } + + @Override + public PacoteDescontoBilhete obtenerID(Long id) { + return pacoteDescontoBilheteDAO.obtenerID(id); + } + + @Override + @Transactional + public PacoteDescontoBilhete suscribir(PacoteDescontoBilhete entidad) { + entidad.setActivo(true); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return pacoteDescontoBilheteDAO.suscribir(entidad); + } + + @Override + @Transactional + public PacoteDescontoBilhete actualizacion(PacoteDescontoBilhete entidad) { + entidad.setFecmodif(new Date()); + return pacoteDescontoBilheteDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PacoteDescontoBilhete entidad) { + entidad.setActivo(false); + entidad.setFecmodif(new Date()); + actualizacion(entidad); + } + + @Override + public List obtenerTodos(Integer pacoteId) { + return pacoteDescontoBilheteDAO.obtenerTodos(pacoteId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PacoteItemServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteItemServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PacoteItemServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteItemServiceImpl.java index 1a7eb4c8f..662a6a813 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PacoteItemServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteItemServiceImpl.java @@ -1,91 +1,91 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PacoteItemDAO; -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteItem; -import com.rjconsultores.ventaboletos.service.PacoteItemService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pacoteItemService") -public class PacoteItemServiceImpl implements PacoteItemService { - - @Autowired - private PacoteItemDAO pacoteItemDAO; - - @Override - public List obtenerTodos() { - return pacoteItemDAO.obtenerTodos(); - } - - @Override - public PacoteItem obtenerID(Integer id) { - return pacoteItemDAO.obtenerID(id); - } - - @Transactional - @Override - public PacoteItem suscribir(PacoteItem entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pacoteItemDAO.suscribir(entidad); - } - - @Transactional - @Override - public PacoteItem actualizacion(PacoteItem entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pacoteItemDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(PacoteItem entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pacoteItemDAO.actualizacion(entidad); - } - - @Transactional(readOnly = false) - @Override - public PacoteItem vincularItemPacote(PacoteItem pacoteItem, Pacote pacote, ItemAdicional item) { - - if (pacoteItem == null) { - pacoteItem = new PacoteItem(); - } - - pacoteItem.setItemAdicional(item); - pacoteItem.setPacote(pacote); - - if (pacoteItem.getPacoteItemId() == null) { - return suscribir(pacoteItem); - } else { - return actualizacion(pacoteItem); - } - } - - @Override - public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item) { - return pacoteItemDAO.buscaPacoteItem(pacote, item); - } - - @Override - public List buscaItensPacote(Pacote pacote) { - return pacoteItemDAO.buscaItensPacote(pacote); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PacoteItemDAO; +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteItem; +import com.rjconsultores.ventaboletos.service.PacoteItemService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pacoteItemService") +public class PacoteItemServiceImpl implements PacoteItemService { + + @Autowired + private PacoteItemDAO pacoteItemDAO; + + @Override + public List obtenerTodos() { + return pacoteItemDAO.obtenerTodos(); + } + + @Override + public PacoteItem obtenerID(Integer id) { + return pacoteItemDAO.obtenerID(id); + } + + @Transactional + @Override + public PacoteItem suscribir(PacoteItem entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pacoteItemDAO.suscribir(entidad); + } + + @Transactional + @Override + public PacoteItem actualizacion(PacoteItem entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pacoteItemDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(PacoteItem entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pacoteItemDAO.actualizacion(entidad); + } + + @Transactional(readOnly = false) + @Override + public PacoteItem vincularItemPacote(PacoteItem pacoteItem, Pacote pacote, ItemAdicional item) { + + if (pacoteItem == null) { + pacoteItem = new PacoteItem(); + } + + pacoteItem.setItemAdicional(item); + pacoteItem.setPacote(pacote); + + if (pacoteItem.getPacoteItemId() == null) { + return suscribir(pacoteItem); + } else { + return actualizacion(pacoteItem); + } + } + + @Override + public PacoteItem buscaPacoteItem(Pacote pacote, ItemAdicional item) { + return pacoteItemDAO.buscaPacoteItem(pacote, item); + } + + @Override + public List buscaItensPacote(Pacote pacote) { + return pacoteItemDAO.buscaItensPacote(pacote); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PacoteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PacoteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteServiceImpl.java index 463644eea..fc9a7d929 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PacoteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteServiceImpl.java @@ -1,95 +1,95 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PacoteDAO; -import com.rjconsultores.ventaboletos.entidad.ItemAdicional; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteItem; -import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; -import com.rjconsultores.ventaboletos.service.PacoteItemService; -import com.rjconsultores.ventaboletos.service.PacoteService; -import com.rjconsultores.ventaboletos.service.PacoteTarifaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pacoteService") -public class PacoteServiceImpl implements PacoteService { - - @Autowired - private PacoteDAO pacoteDAO; - - @Autowired - private PacoteTarifaService pacoteTarifaService; - - @Autowired - private PacoteItemService pacoteItemService; - - @Override - public List obtenerTodos() { - return pacoteDAO.obtenerTodos(); - } - - @Override - public Pacote obtenerID(Integer id) { - return pacoteDAO.obtenerID(id); - } - - @Transactional - @Override - public Pacote suscribir(Pacote entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return pacoteDAO.suscribir(entidad); - } - - @Transactional - @Override - public Pacote actualizacion(Pacote entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return pacoteDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(Pacote entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pacoteDAO.actualizacion(entidad); - } - - @Override - public Boolean verificaCadastroTarifa(Pacote pacote, TipoTarifaPacote tarifa) { - - List pacoteTarifaLs = pacoteTarifaService.buscaTarifasPacote(pacote); - for (PacoteTarifa pacoteTarifa : pacoteTarifaLs) { - if (pacoteTarifa.getTipoTarifaPacote().equals(tarifa)) - return Boolean.FALSE; - } - - return Boolean.TRUE; - } - - @Override - public Boolean verificaCadastroItemAdicional(Pacote pacote, ItemAdicional item) { - List pacoteItemLs = pacoteItemService.buscaItensPacote(pacote); - - for (PacoteItem pacoteItem : pacoteItemLs) { - if (pacoteItem.getItemAdicional().equals(item)) - return Boolean.FALSE; - } - - return Boolean.TRUE; - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PacoteDAO; +import com.rjconsultores.ventaboletos.entidad.ItemAdicional; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteItem; +import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; +import com.rjconsultores.ventaboletos.service.PacoteItemService; +import com.rjconsultores.ventaboletos.service.PacoteService; +import com.rjconsultores.ventaboletos.service.PacoteTarifaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pacoteService") +public class PacoteServiceImpl implements PacoteService { + + @Autowired + private PacoteDAO pacoteDAO; + + @Autowired + private PacoteTarifaService pacoteTarifaService; + + @Autowired + private PacoteItemService pacoteItemService; + + @Override + public List obtenerTodos() { + return pacoteDAO.obtenerTodos(); + } + + @Override + public Pacote obtenerID(Integer id) { + return pacoteDAO.obtenerID(id); + } + + @Transactional + @Override + public Pacote suscribir(Pacote entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return pacoteDAO.suscribir(entidad); + } + + @Transactional + @Override + public Pacote actualizacion(Pacote entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return pacoteDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(Pacote entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pacoteDAO.actualizacion(entidad); + } + + @Override + public Boolean verificaCadastroTarifa(Pacote pacote, TipoTarifaPacote tarifa) { + + List pacoteTarifaLs = pacoteTarifaService.buscaTarifasPacote(pacote); + for (PacoteTarifa pacoteTarifa : pacoteTarifaLs) { + if (pacoteTarifa.getTipoTarifaPacote().equals(tarifa)) + return Boolean.FALSE; + } + + return Boolean.TRUE; + } + + @Override + public Boolean verificaCadastroItemAdicional(Pacote pacote, ItemAdicional item) { + List pacoteItemLs = pacoteItemService.buscaItensPacote(pacote); + + for (PacoteItem pacoteItem : pacoteItemLs) { + if (pacoteItem.getItemAdicional().equals(item)) + return Boolean.FALSE; + } + + return Boolean.TRUE; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PacoteTarifaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteTarifaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PacoteTarifaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteTarifaServiceImpl.java index 0350074c7..5ee52f1ad 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PacoteTarifaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PacoteTarifaServiceImpl.java @@ -1,95 +1,95 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PacoteTarifaDAO; -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; -import com.rjconsultores.ventaboletos.service.PacoteTarifaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pacoteTarifaService") -public class PacoteTarifaServiceImpl implements PacoteTarifaService { - - @Autowired - private PacoteTarifaDAO pacoteTarifaDAO; - - @Override - public List obtenerTodos() { - return pacoteTarifaDAO.obtenerTodos(); - } - - @Override - public PacoteTarifa obtenerID(Integer id) { - return pacoteTarifaDAO.obtenerID(id); - } - - @Transactional - @Override - public PacoteTarifa suscribir(PacoteTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pacoteTarifaDAO.suscribir(entidad); - } - - @Transactional - @Override - public PacoteTarifa actualizacion(PacoteTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pacoteTarifaDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(PacoteTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pacoteTarifaDAO.actualizacion(entidad); - } - - @Transactional(readOnly = false) - @Override - public PacoteTarifa vincularPacoteTarifa(PacoteTarifa pacoteTarifa, Pacote pacote, TipoTarifaPacote tipoTarifaPacote, BigDecimal tarifa, Boolean indvendaweb, Categoria categoria) { - - if (pacoteTarifa == null) { - pacoteTarifa = new PacoteTarifa(); - } - - pacoteTarifa.setIndvendaweb(indvendaweb); - pacoteTarifa.setTarifa(tarifa); - pacoteTarifa.setTipoTarifaPacote(tipoTarifaPacote); - pacoteTarifa.setPacote(pacote); - pacoteTarifa.setCategoria(categoria); - - if (pacoteTarifa.getPacotetarifaId() == null) { - return suscribir(pacoteTarifa); - } else { - return actualizacion(pacoteTarifa); - } - } - - @Override - public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote) { - return pacoteTarifaDAO.buscaPacoteTarifa(pacote, tipoTarifaPacote); - } - - @Override - public List buscaTarifasPacote(Pacote pacote) { - return pacoteTarifaDAO.buscaTarifasPacote(pacote); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PacoteTarifaDAO; +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; +import com.rjconsultores.ventaboletos.service.PacoteTarifaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pacoteTarifaService") +public class PacoteTarifaServiceImpl implements PacoteTarifaService { + + @Autowired + private PacoteTarifaDAO pacoteTarifaDAO; + + @Override + public List obtenerTodos() { + return pacoteTarifaDAO.obtenerTodos(); + } + + @Override + public PacoteTarifa obtenerID(Integer id) { + return pacoteTarifaDAO.obtenerID(id); + } + + @Transactional + @Override + public PacoteTarifa suscribir(PacoteTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pacoteTarifaDAO.suscribir(entidad); + } + + @Transactional + @Override + public PacoteTarifa actualizacion(PacoteTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pacoteTarifaDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(PacoteTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pacoteTarifaDAO.actualizacion(entidad); + } + + @Transactional(readOnly = false) + @Override + public PacoteTarifa vincularPacoteTarifa(PacoteTarifa pacoteTarifa, Pacote pacote, TipoTarifaPacote tipoTarifaPacote, BigDecimal tarifa, Boolean indvendaweb, Categoria categoria) { + + if (pacoteTarifa == null) { + pacoteTarifa = new PacoteTarifa(); + } + + pacoteTarifa.setIndvendaweb(indvendaweb); + pacoteTarifa.setTarifa(tarifa); + pacoteTarifa.setTipoTarifaPacote(tipoTarifaPacote); + pacoteTarifa.setPacote(pacote); + pacoteTarifa.setCategoria(categoria); + + if (pacoteTarifa.getPacotetarifaId() == null) { + return suscribir(pacoteTarifa); + } else { + return actualizacion(pacoteTarifa); + } + } + + @Override + public PacoteTarifa buscaPacoteTarifa(Pacote pacote, TipoTarifaPacote tipoTarifaPacote) { + return pacoteTarifaDAO.buscaPacoteTarifa(pacote, tipoTarifaPacote); + } + + @Override + public List buscaTarifasPacote(Pacote pacote) { + return pacoteTarifaDAO.buscaTarifasPacote(pacote); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PaisServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PaisServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PaisServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PaisServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java index fc73a4bf9..538aaa160 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaCodOrgaoConcedenteServiceImpl.java @@ -1,47 +1,47 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ParadaCodOrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.entidad.Pais; -import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; -import com.rjconsultores.ventaboletos.service.ParadaCodOrgaoConcedenteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("paradaCodOrgaoConcedenteService") -public class ParadaCodOrgaoConcedenteServiceImpl implements ParadaCodOrgaoConcedenteService { - - @Autowired - private ParadaCodOrgaoConcedenteDAO paradaCodOrgaoConcedenteDAO; - - @Override - public List obtenerTodos() { - return paradaCodOrgaoConcedenteDAO.obtenerTodos(); - } - - @Override - public ParadaCodOrgaoConcedente obtenerID(Integer id) { - return paradaCodOrgaoConcedenteDAO.obtenerID(id); - } - - @Transactional - public ParadaCodOrgaoConcedente suscribir(ParadaCodOrgaoConcedente entidad) { - return paradaCodOrgaoConcedenteDAO.suscribir(entidad); - } - - @Transactional - public ParadaCodOrgaoConcedente actualizacion(ParadaCodOrgaoConcedente entidad) { - return paradaCodOrgaoConcedenteDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ParadaCodOrgaoConcedente entidad) { - paradaCodOrgaoConcedenteDAO.borrar(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ParadaCodOrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.entidad.Pais; +import com.rjconsultores.ventaboletos.entidad.ParadaCodOrgaoConcedente; +import com.rjconsultores.ventaboletos.service.ParadaCodOrgaoConcedenteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("paradaCodOrgaoConcedenteService") +public class ParadaCodOrgaoConcedenteServiceImpl implements ParadaCodOrgaoConcedenteService { + + @Autowired + private ParadaCodOrgaoConcedenteDAO paradaCodOrgaoConcedenteDAO; + + @Override + public List obtenerTodos() { + return paradaCodOrgaoConcedenteDAO.obtenerTodos(); + } + + @Override + public ParadaCodOrgaoConcedente obtenerID(Integer id) { + return paradaCodOrgaoConcedenteDAO.obtenerID(id); + } + + @Transactional + public ParadaCodOrgaoConcedente suscribir(ParadaCodOrgaoConcedente entidad) { + return paradaCodOrgaoConcedenteDAO.suscribir(entidad); + } + + @Transactional + public ParadaCodOrgaoConcedente actualizacion(ParadaCodOrgaoConcedente entidad) { + return paradaCodOrgaoConcedenteDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ParadaCodOrgaoConcedente entidad) { + paradaCodOrgaoConcedenteDAO.borrar(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParadaEquivalenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaEquivalenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParadaEquivalenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaEquivalenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaMasivoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaMasivoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaMasivoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaMasivoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaPuntoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaPuntoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaPuntoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamAcumulaPuntoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamArticuloServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamArticuloServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamArticuloServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamArticuloServiceImpl.java index cc10e247c..df14bedc3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ParamArticuloServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamArticuloServiceImpl.java @@ -1,53 +1,53 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ParamArticuloDAO; -import com.rjconsultores.ventaboletos.entidad.ParamArticulo; -import com.rjconsultores.ventaboletos.service.ParamArticuloService; - -/** - * - * @author Administrador - */ -@Service("paramArticuloService") -public class ParamArticuloServiceImpl implements ParamArticuloService { - - @Autowired - private ParamArticuloDAO paramArticuloDAO; - - public List obtenerTodos() { - return paramArticuloDAO.obtenerTodos(); - } - - public ParamArticulo obtenerID(Integer id) { - return paramArticuloDAO.obtenerID(id); - } - - @Transactional - public ParamArticulo suscribir(ParamArticulo entidad) { - - return paramArticuloDAO.suscribir(entidad); - } - - @Transactional - public ParamArticulo actualizacion(ParamArticulo entidad) { - - return paramArticuloDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ParamArticulo entidad) { - - paramArticuloDAO.actualizacion(entidad); - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ParamArticuloDAO; +import com.rjconsultores.ventaboletos.entidad.ParamArticulo; +import com.rjconsultores.ventaboletos.service.ParamArticuloService; + +/** + * + * @author Administrador + */ +@Service("paramArticuloService") +public class ParamArticuloServiceImpl implements ParamArticuloService { + + @Autowired + private ParamArticuloDAO paramArticuloDAO; + + public List obtenerTodos() { + return paramArticuloDAO.obtenerTodos(); + } + + public ParamArticulo obtenerID(Integer id) { + return paramArticuloDAO.obtenerID(id); + } + + @Transactional + public ParamArticulo suscribir(ParamArticulo entidad) { + + return paramArticuloDAO.suscribir(entidad); + } + + @Transactional + public ParamArticulo actualizacion(ParamArticulo entidad) { + + return paramArticuloDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ParamArticulo entidad) { + + paramArticuloDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamCanjePuntoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamCanjePuntoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamCanjePuntoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamCanjePuntoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamCompraPuntoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamCompraPuntoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamCompraPuntoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamCompraPuntoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamConexionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamConexionServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamConexionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamConexionServiceImpl.java index e575e4496..37ec1809c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ParamConexionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamConexionServiceImpl.java @@ -1,26 +1,26 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ParamConexionDAO; -import com.rjconsultores.ventaboletos.entidad.ParamConexion; -import com.rjconsultores.ventaboletos.service.ParamConexionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("paramConexionService") -public class ParamConexionServiceImpl implements ParamConexionService { - - @Autowired - private ParamConexionDAO paramConexionDAO; - @Override - @Transactional - public ParamConexion actualizacion(ParamConexion paramConexion) { - paramConexion.setFecmodif(new java.util.Date()); - paramConexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - return paramConexionDAO.actualizacion(paramConexion); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ParamConexionDAO; +import com.rjconsultores.ventaboletos.entidad.ParamConexion; +import com.rjconsultores.ventaboletos.service.ParamConexionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("paramConexionService") +public class ParamConexionServiceImpl implements ParamConexionService { + + @Autowired + private ParamConexionDAO paramConexionDAO; + @Override + @Transactional + public ParamConexion actualizacion(ParamConexion paramConexion) { + paramConexion.setFecmodif(new java.util.Date()); + paramConexion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + return paramConexionDAO.actualizacion(paramConexion); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamCostoTarjetaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamCostoTarjetaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamCostoTarjetaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamCostoTarjetaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParamRecoleccionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamRecoleccionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ParamRecoleccionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ParamRecoleccionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PeajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PeajeServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PeajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PeajeServiceImpl.java index 364139ef5..0c75725a5 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PeajeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PeajeServiceImpl.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.PeajeDao; -import com.rjconsultores.ventaboletos.entidad.Peaje; -import com.rjconsultores.ventaboletos.service.PeajeService; - -@Service("peajeService") -public class PeajeServiceImpl implements PeajeService{ - - @Autowired - private PeajeDao peajeDao; - - - public Peaje buscarPeajePorId(Integer peajeId) { - return peajeDao.obtenerID(peajeId); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.PeajeDao; +import com.rjconsultores.ventaboletos.entidad.Peaje; +import com.rjconsultores.ventaboletos.service.PeajeService; + +@Service("peajeService") +public class PeajeServiceImpl implements PeajeService{ + + @Autowired + private PeajeDao peajeDao; + + + public Peaje buscarPeajePorId(Integer peajeId) { + return peajeDao.obtenerID(peajeId); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PerfilFuncionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PerfilFuncionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PerfilFuncionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PerfilFuncionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PerfilServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PerfilServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PerfilServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PerfilServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PeriodoVacacionalServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PeriodoVacacionalServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PeriodoVacacionalServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PeriodoVacacionalServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PlazaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PlazaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PlazaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PlazaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PrecioFixoPedagioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PrecioFixoPedagioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PrecioFixoPedagioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PrecioFixoPedagioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PrecioVentajaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PrecioVentajaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PrecioVentajaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PrecioVentajaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PrecoApanheServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PrecoApanheServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PrecoApanheServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PrecoApanheServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingAsientoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingAsientoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingAsientoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingAsientoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCategoriaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCategoriaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingClaseServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingClaseServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingClaseServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingClaseServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingClasseTarifariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingClasseTarifariaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingClasseTarifariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingClasseTarifariaServiceImpl.java index c19d998da..ea451f85c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingClasseTarifariaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingClasseTarifariaServiceImpl.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingClasseTarifariaDAO; -import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; -import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingClasseTarifariaService") -public class PricingClasseTarifariaServiceImpl implements PricingClasseTarifariaService { - - @Autowired - private PricingClasseTarifariaDAO pricingClasseTarifariaDAO; - - @Override - public List obtenerTodos() { - return pricingClasseTarifariaDAO.obtenerTodos(); - } - - @Override - public PricingClasseTarifaria obtenerID(Integer id) { - return pricingClasseTarifariaDAO.obtenerID(id); - } - - @Override - @Transactional - public PricingClasseTarifaria suscribir(PricingClasseTarifaria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return pricingClasseTarifariaDAO.suscribir(entidad); - } - - @Override - @Transactional - public PricingClasseTarifaria actualizacion(PricingClasseTarifaria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return pricingClasseTarifariaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PricingClasseTarifaria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - pricingClasseTarifariaDAO.actualizacion(entidad); - } - - public Boolean validacionSigla(String sigla) { - return pricingClasseTarifariaDAO.validacionSigla(sigla); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingClasseTarifariaDAO; +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; +import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingClasseTarifariaService") +public class PricingClasseTarifariaServiceImpl implements PricingClasseTarifariaService { + + @Autowired + private PricingClasseTarifariaDAO pricingClasseTarifariaDAO; + + @Override + public List obtenerTodos() { + return pricingClasseTarifariaDAO.obtenerTodos(); + } + + @Override + public PricingClasseTarifaria obtenerID(Integer id) { + return pricingClasseTarifariaDAO.obtenerID(id); + } + + @Override + @Transactional + public PricingClasseTarifaria suscribir(PricingClasseTarifaria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return pricingClasseTarifariaDAO.suscribir(entidad); + } + + @Override + @Transactional + public PricingClasseTarifaria actualizacion(PricingClasseTarifaria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return pricingClasseTarifariaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PricingClasseTarifaria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + pricingClasseTarifariaDAO.actualizacion(entidad); + } + + public Boolean validacionSigla(String sigla) { + return pricingClasseTarifariaDAO.validacionSigla(sigla); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingCorridaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCorridaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingCorridaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCorridaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCtrlServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCtrlServiceImpl.java index 07b31a41f..a05e29fa5 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingCtrlServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingCtrlServiceImpl.java @@ -1,73 +1,73 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.PricingCtrl; -import com.rjconsultores.ventaboletos.service.PricingCtrlService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingCtrlService") -public class PricingCtrlServiceImpl implements PricingCtrlService { - - @Autowired - private PricingCtrlDAO pricingCtrlDAO; - - @Override - public List obtenerTodos() { - return pricingCtrlDAO.obtenerTodos(); - } - - @Override - public PricingCtrl obtenerID(Integer id) { - return pricingCtrlDAO.obtenerID(id); - } - - @Override - @Transactional - public PricingCtrl suscribir(PricingCtrl entidad) { - entidad.setActivo(true); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(new Date()); - return pricingCtrlDAO.suscribir(entidad); - } - - @Override - @Transactional - public PricingCtrl actualizacion(PricingCtrl entidad) { - entidad.setActivo(true); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(new Date()); - return pricingCtrlDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PricingCtrl entidad) { - entidad.setActivo(false); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(new Date()); - pricingCtrlDAO.actualizacion(entidad); - } - - @Override - public PricingCtrl obtenerPricingCtrl() { - return pricingCtrlDAO.obtenerPricingCtrl(); - } - - @Override - @Transactional - public PricingCtrl suscribirOrActualizacion(PricingCtrl entidad) { - if(entidad.getPricingctrlId() == null) { - return suscribir(entidad); - } else { - return actualizacion(entidad); - } - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.PricingCtrl; +import com.rjconsultores.ventaboletos.service.PricingCtrlService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingCtrlService") +public class PricingCtrlServiceImpl implements PricingCtrlService { + + @Autowired + private PricingCtrlDAO pricingCtrlDAO; + + @Override + public List obtenerTodos() { + return pricingCtrlDAO.obtenerTodos(); + } + + @Override + public PricingCtrl obtenerID(Integer id) { + return pricingCtrlDAO.obtenerID(id); + } + + @Override + @Transactional + public PricingCtrl suscribir(PricingCtrl entidad) { + entidad.setActivo(true); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(new Date()); + return pricingCtrlDAO.suscribir(entidad); + } + + @Override + @Transactional + public PricingCtrl actualizacion(PricingCtrl entidad) { + entidad.setActivo(true); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(new Date()); + return pricingCtrlDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PricingCtrl entidad) { + entidad.setActivo(false); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(new Date()); + pricingCtrlDAO.actualizacion(entidad); + } + + @Override + public PricingCtrl obtenerPricingCtrl() { + return pricingCtrlDAO.obtenerPricingCtrl(); + } + + @Override + @Transactional + public PricingCtrl suscribirOrActualizacion(PricingCtrl entidad) { + if(entidad.getPricingctrlId() == null) { + return suscribir(entidad); + } else { + return actualizacion(entidad); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingDiaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingDiaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingDiaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingDiaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoAgenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoAgenciaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoAgenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoAgenciaServiceImpl.java index a04089b0f..e766367bd 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoAgenciaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoAgenciaServiceImpl.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoAgenciaDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; -import com.rjconsultores.ventaboletos.service.PricingEspecificoAgenciaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingEspecificoAgenciaService") -public class PricingEspecificoAgenciaServiceImpl implements PricingEspecificoAgenciaService { - @Autowired - private PricingEspecificoAgenciaDAO pricingEspecificoAgenciaDAO; - - @Override - public List obtenerTodos() { - return pricingEspecificoAgenciaDAO.obtenerTodos(); - } - - @Override - public PricingEspecificoAgencia obtenerID(Long id) { - return pricingEspecificoAgenciaDAO.obtenerID(id); - } - - @Override - @Transactional - public PricingEspecificoAgencia suscribir(PricingEspecificoAgencia entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pricingEspecificoAgenciaDAO.suscribir(entidad); - } - - @Override - @Transactional - public PricingEspecificoAgencia actualizacion(PricingEspecificoAgencia entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return pricingEspecificoAgenciaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PricingEspecificoAgencia entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pricingEspecificoAgenciaDAO.actualizacion(entidad); - } - @Override - public Boolean existeAgenciaPricing (PricingEspecificoAgencia entidad){ - return pricingEspecificoAgenciaDAO.isDuplicado(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoAgenciaDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; +import com.rjconsultores.ventaboletos.service.PricingEspecificoAgenciaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingEspecificoAgenciaService") +public class PricingEspecificoAgenciaServiceImpl implements PricingEspecificoAgenciaService { + @Autowired + private PricingEspecificoAgenciaDAO pricingEspecificoAgenciaDAO; + + @Override + public List obtenerTodos() { + return pricingEspecificoAgenciaDAO.obtenerTodos(); + } + + @Override + public PricingEspecificoAgencia obtenerID(Long id) { + return pricingEspecificoAgenciaDAO.obtenerID(id); + } + + @Override + @Transactional + public PricingEspecificoAgencia suscribir(PricingEspecificoAgencia entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); +// entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pricingEspecificoAgenciaDAO.suscribir(entidad); + } + + @Override + @Transactional + public PricingEspecificoAgencia actualizacion(PricingEspecificoAgencia entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return pricingEspecificoAgenciaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PricingEspecificoAgencia entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pricingEspecificoAgenciaDAO.actualizacion(entidad); + } + @Override + public Boolean existeAgenciaPricing (PricingEspecificoAgencia entidad){ + return pricingEspecificoAgenciaDAO.isDuplicado(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCanalVendasServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCanalVendasServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCanalVendasServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCanalVendasServiceImpl.java index 8bc5f78b7..12e48ad3d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCanalVendasServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCanalVendasServiceImpl.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoCanalVendasDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; -import com.rjconsultores.ventaboletos.service.PricingEspecificoCanalVendasService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingEspecificoCanalVendasService") -public class PricingEspecificoCanalVendasServiceImpl implements PricingEspecificoCanalVendasService { - @Autowired - private PricingEspecificoCanalVendasDAO pricingEspecificoCanalVendasDAO; - - @Override - public List obtenerTodos() { - return pricingEspecificoCanalVendasDAO.obtenerTodos(); - } - - @Override - public PricingEspecificoCanalVendas obtenerID(Long id) { - return pricingEspecificoCanalVendasDAO.obtenerID(id); - } - - @Override - @Transactional - public PricingEspecificoCanalVendas suscribir(PricingEspecificoCanalVendas entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pricingEspecificoCanalVendasDAO.suscribir(entidad); - } - - @Override - @Transactional - public PricingEspecificoCanalVendas actualizacion(PricingEspecificoCanalVendas entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return pricingEspecificoCanalVendasDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PricingEspecificoCanalVendas entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pricingEspecificoCanalVendasDAO.actualizacion(entidad); - } - @Override - public Boolean existeCanalVendasPricing (PricingEspecificoCanalVendas entidad){ - return pricingEspecificoCanalVendasDAO.isDuplicado(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoCanalVendasDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; +import com.rjconsultores.ventaboletos.service.PricingEspecificoCanalVendasService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingEspecificoCanalVendasService") +public class PricingEspecificoCanalVendasServiceImpl implements PricingEspecificoCanalVendasService { + @Autowired + private PricingEspecificoCanalVendasDAO pricingEspecificoCanalVendasDAO; + + @Override + public List obtenerTodos() { + return pricingEspecificoCanalVendasDAO.obtenerTodos(); + } + + @Override + public PricingEspecificoCanalVendas obtenerID(Long id) { + return pricingEspecificoCanalVendasDAO.obtenerID(id); + } + + @Override + @Transactional + public PricingEspecificoCanalVendas suscribir(PricingEspecificoCanalVendas entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); +// entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pricingEspecificoCanalVendasDAO.suscribir(entidad); + } + + @Override + @Transactional + public PricingEspecificoCanalVendas actualizacion(PricingEspecificoCanalVendas entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return pricingEspecificoCanalVendasDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PricingEspecificoCanalVendas entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pricingEspecificoCanalVendasDAO.actualizacion(entidad); + } + @Override + public Boolean existeCanalVendasPricing (PricingEspecificoCanalVendas entidad){ + return pricingEspecificoCanalVendasDAO.isDuplicado(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCategoriaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCategoriaServiceImpl.java index 61f19ca49..1ce746ba7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCategoriaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoCategoriaServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoCategoriaDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; -import com.rjconsultores.ventaboletos.service.PricingEspecificoCategoriaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingEspecificoCategoriaService") -public class PricingEspecificoCategoriaServiceImpl implements PricingEspecificoCategoriaService { - @Autowired - private PricingEspecificoCategoriaDAO pricingEspecificoCategoriaDAO; - - @Override - public List obtenerTodos() { - return pricingEspecificoCategoriaDAO.obtenerTodos(); - } - - @Override - public PricingEspecificoCategoria obtenerID(Long id) { - return pricingEspecificoCategoriaDAO.obtenerID(id); - } - - @Override - @Transactional - public PricingEspecificoCategoria suscribir(PricingEspecificoCategoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setActivo(Boolean.TRUE); - - return pricingEspecificoCategoriaDAO.suscribir(entidad); - } - - @Override - @Transactional - public PricingEspecificoCategoria actualizacion(PricingEspecificoCategoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return pricingEspecificoCategoriaDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PricingEspecificoCategoria entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pricingEspecificoCategoriaDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoCategoriaDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria; +import com.rjconsultores.ventaboletos.service.PricingEspecificoCategoriaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingEspecificoCategoriaService") +public class PricingEspecificoCategoriaServiceImpl implements PricingEspecificoCategoriaService { + @Autowired + private PricingEspecificoCategoriaDAO pricingEspecificoCategoriaDAO; + + @Override + public List obtenerTodos() { + return pricingEspecificoCategoriaDAO.obtenerTodos(); + } + + @Override + public PricingEspecificoCategoria obtenerID(Long id) { + return pricingEspecificoCategoriaDAO.obtenerID(id); + } + + @Override + @Transactional + public PricingEspecificoCategoria suscribir(PricingEspecificoCategoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setActivo(Boolean.TRUE); + + return pricingEspecificoCategoriaDAO.suscribir(entidad); + } + + @Override + @Transactional + public PricingEspecificoCategoria actualizacion(PricingEspecificoCategoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return pricingEspecificoCategoriaDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PricingEspecificoCategoria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pricingEspecificoCategoriaDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoOcupacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoOcupacionServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoOcupacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoOcupacionServiceImpl.java index 920b67728..e2f26b22b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoOcupacionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoOcupacionServiceImpl.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingEspecificoOcupacionDAO; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; -import com.rjconsultores.ventaboletos.service.PricingEspecificoOcupacionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingEspecificoOcupacionService") -public class PricingEspecificoOcupacionServiceImpl implements PricingEspecificoOcupacionService { - @Autowired - private PricingEspecificoOcupacionDAO pricingEspecificoOcupacionDAO; - - @Override - public List obtenerTodos() { - return pricingEspecificoOcupacionDAO.obtenerTodos(); - } - - @Override - public PricingEspecificoOcupacion obtenerID(Long id) { - return pricingEspecificoOcupacionDAO.obtenerID(id); - } - - @Override - public PricingEspecificoOcupacion suscribir(PricingEspecificoOcupacion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return pricingEspecificoOcupacionDAO.suscribir(entidad); - } - - @Override - @Transactional - public PricingEspecificoOcupacion actualizacion(PricingEspecificoOcupacion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - - return pricingEspecificoOcupacionDAO.actualizacion(entidad); - } - - @Override - public void borrar(PricingEspecificoOcupacion entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - pricingEspecificoOcupacionDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingEspecificoOcupacionDAO; +import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; +import com.rjconsultores.ventaboletos.service.PricingEspecificoOcupacionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingEspecificoOcupacionService") +public class PricingEspecificoOcupacionServiceImpl implements PricingEspecificoOcupacionService { + @Autowired + private PricingEspecificoOcupacionDAO pricingEspecificoOcupacionDAO; + + @Override + public List obtenerTodos() { + return pricingEspecificoOcupacionDAO.obtenerTodos(); + } + + @Override + public PricingEspecificoOcupacion obtenerID(Long id) { + return pricingEspecificoOcupacionDAO.obtenerID(id); + } + + @Override + public PricingEspecificoOcupacion suscribir(PricingEspecificoOcupacion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return pricingEspecificoOcupacionDAO.suscribir(entidad); + } + + @Override + @Transactional + public PricingEspecificoOcupacion actualizacion(PricingEspecificoOcupacion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + + return pricingEspecificoOcupacionDAO.actualizacion(entidad); + } + + @Override + public void borrar(PricingEspecificoOcupacion entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + pricingEspecificoOcupacionDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingFormapagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingFormapagoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingFormapagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingFormapagoServiceImpl.java index 2dc8b3e1d..83b7a5e0f 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingFormapagoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingFormapagoServiceImpl.java @@ -1,60 +1,60 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingFormapagoDAO; -import com.rjconsultores.ventaboletos.entidad.Pricing; -import com.rjconsultores.ventaboletos.entidad.PricingFormapago; -import com.rjconsultores.ventaboletos.service.PricingFormapagoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingFormapagoService") -public class PricingFormapagoServiceImpl implements PricingFormapagoService { - - @Autowired - private PricingFormapagoDAO pricingFormapagoDAO; - - @Override - public List obtenerTodos() { - return pricingFormapagoDAO.obtenerTodos(); - } - - @Override - public PricingFormapago obtenerID(Integer id) { - return pricingFormapagoDAO.obtenerID(id); - } - - @Transactional - public PricingFormapago suscribir(PricingFormapago entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Pricing.ATIVO); - - return pricingFormapagoDAO.suscribir(entidad); - - } - - @Transactional - public PricingFormapago actualizacion(PricingFormapago entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Pricing.ATIVO); - - return pricingFormapagoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PricingFormapago entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Pricing.EXCLUIDO); - - pricingFormapagoDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingFormapagoDAO; +import com.rjconsultores.ventaboletos.entidad.Pricing; +import com.rjconsultores.ventaboletos.entidad.PricingFormapago; +import com.rjconsultores.ventaboletos.service.PricingFormapagoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingFormapagoService") +public class PricingFormapagoServiceImpl implements PricingFormapagoService { + + @Autowired + private PricingFormapagoDAO pricingFormapagoDAO; + + @Override + public List obtenerTodos() { + return pricingFormapagoDAO.obtenerTodos(); + } + + @Override + public PricingFormapago obtenerID(Integer id) { + return pricingFormapagoDAO.obtenerID(id); + } + + @Transactional + public PricingFormapago suscribir(PricingFormapago entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Pricing.ATIVO); + + return pricingFormapagoDAO.suscribir(entidad); + + } + + @Transactional + public PricingFormapago actualizacion(PricingFormapago entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Pricing.ATIVO); + + return pricingFormapagoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PricingFormapago entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Pricing.EXCLUIDO); + + pricingFormapagoDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingImporteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingImporteServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingImporteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingImporteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingMarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingMarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingMarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingMarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingMercadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingMercadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingMercadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingMercadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java index 3f90a9295..5f030a97c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java @@ -1,134 +1,134 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PricingOcupaAntecipaDAO; -import com.rjconsultores.ventaboletos.entidad.Pricing; -import com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.PricingOcupaAntecipaService; -import com.rjconsultores.ventaboletos.utilerias.TraslaparUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("pricingOcupacionService") -public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaService { - - private static final Logger log = LogManager.getLogger(PricingOcupaAntecipaServiceImpl.class); - - @Autowired - private PricingOcupaAntecipaDAO pricingOcupacionDAO; - - @Transactional - public PricingOcupaAntecipa suscribir(PricingOcupaAntecipa entidad) throws BusinessException { - if (traslapa(entidad)) { - throw new BusinessException("pricingOcupaAntecipaServiceImpl.msg.traslapa"); - } - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Pricing.ATIVO); - - return pricingOcupacionDAO.suscribir(entidad); - } - - @Transactional(rollbackFor = BusinessException.class) - public PricingOcupaAntecipa actualizacion(PricingOcupaAntecipa entidad) throws BusinessException { - if (traslapa(entidad)) { - throw new BusinessException("pricingOcupaAntecipaServiceImpl.msg.traslapa"); - } - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Pricing.ATIVO); - - return pricingOcupacionDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PricingOcupaAntecipa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Pricing.EXCLUIDO); - - pricingOcupacionDAO.actualizacion(entidad); - } - - public List updateList(PricingOcupaAntecipa pricingOcupaAntecipa) { - List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); - return lsSalvos; - } - - private boolean traslapa(PricingOcupaAntecipa pricingOcupaAntecipa) { - - boolean traslapa = false; - List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); - - // removo o pricing que eu estou validando - lsSalvos.remove(pricingOcupaAntecipa); - - BigDecimal cantocupaini = pricingOcupaAntecipa.getOcupacioninicial(); - BigDecimal cantocupafin = pricingOcupaAntecipa.getOcupacionfinal(); - - boolean validaCantPorcentaje = ((cantocupaini != null) && (cantocupafin != null)); - - Integer cantasientosmin = pricingOcupaAntecipa.getCantasientosmin(); - Integer cantasientosmax = pricingOcupaAntecipa.getCantasientosmax(); - - boolean validaCantAsientos = ((cantasientosmin != null) && (cantasientosmax != null)); - - Integer cantdiasmin = pricingOcupaAntecipa.getCantdiasmin(); - Integer cantdiasmax = pricingOcupaAntecipa.getCantdiasmax(); - - boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null)); - - for (PricingOcupaAntecipa poa : lsSalvos) { - boolean traslapaCantPorcentaje = false; - if (validaCantPorcentaje) { - if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) { - traslapaCantPorcentaje = TraslaparUtil.intersectNum(poa.getOcupacioninicial(), poa.getOcupacionfinal(), cantocupaini, cantocupafin); - } - } - - boolean traslapaCantAsiento = false; - if (validaCantAsientos) { - if ((poa.getCantasientosmin() != null) && (poa.getCantasientosmax() != null)) { - traslapaCantAsiento = TraslaparUtil.intersectNum(poa.getCantasientosmin(), poa.getCantasientosmax(), cantasientosmin, cantasientosmax); - } - } - - boolean traslapaCantDias = false; - if (validaCantDias) { - if ((poa.getCantdiasmin() != null) && (poa.getCantdiasmax() != null)) { - traslapaCantDias = TraslaparUtil.intersectNum(poa.getCantdiasmin(), poa.getCantdiasmax(), cantdiasmin, cantdiasmax); - } - } - - if ((traslapaCantPorcentaje || traslapaCantAsiento ) && traslapaCantDias ){ - log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId()); - - traslapa = true; - - break; - } - - } - - return traslapa; - } - - @Override - @Transactional - public void borrar(List pricingOcupaAntecipas) { - if(pricingOcupaAntecipas != null && !pricingOcupaAntecipas.isEmpty()) { - for (PricingOcupaAntecipa pricingOcupaAntecipa : pricingOcupaAntecipas) { - borrar(pricingOcupaAntecipa); - } - } - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PricingOcupaAntecipaDAO; +import com.rjconsultores.ventaboletos.entidad.Pricing; +import com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.PricingOcupaAntecipaService; +import com.rjconsultores.ventaboletos.utilerias.TraslaparUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("pricingOcupacionService") +public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaService { + + private static final Logger log = LogManager.getLogger(PricingOcupaAntecipaServiceImpl.class); + + @Autowired + private PricingOcupaAntecipaDAO pricingOcupacionDAO; + + @Transactional + public PricingOcupaAntecipa suscribir(PricingOcupaAntecipa entidad) throws BusinessException { + if (traslapa(entidad)) { + throw new BusinessException("pricingOcupaAntecipaServiceImpl.msg.traslapa"); + } + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Pricing.ATIVO); + + return pricingOcupacionDAO.suscribir(entidad); + } + + @Transactional(rollbackFor = BusinessException.class) + public PricingOcupaAntecipa actualizacion(PricingOcupaAntecipa entidad) throws BusinessException { + if (traslapa(entidad)) { + throw new BusinessException("pricingOcupaAntecipaServiceImpl.msg.traslapa"); + } + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Pricing.ATIVO); + + return pricingOcupacionDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PricingOcupaAntecipa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Pricing.EXCLUIDO); + + pricingOcupacionDAO.actualizacion(entidad); + } + + public List updateList(PricingOcupaAntecipa pricingOcupaAntecipa) { + List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); + return lsSalvos; + } + + private boolean traslapa(PricingOcupaAntecipa pricingOcupaAntecipa) { + + boolean traslapa = false; + List lsSalvos = pricingOcupacionDAO.buscarOcupaAntecipaPricing(pricingOcupaAntecipa.getPricing().getPricingId()); + + // removo o pricing que eu estou validando + lsSalvos.remove(pricingOcupaAntecipa); + + BigDecimal cantocupaini = pricingOcupaAntecipa.getOcupacioninicial(); + BigDecimal cantocupafin = pricingOcupaAntecipa.getOcupacionfinal(); + + boolean validaCantPorcentaje = ((cantocupaini != null) && (cantocupafin != null)); + + Integer cantasientosmin = pricingOcupaAntecipa.getCantasientosmin(); + Integer cantasientosmax = pricingOcupaAntecipa.getCantasientosmax(); + + boolean validaCantAsientos = ((cantasientosmin != null) && (cantasientosmax != null)); + + Integer cantdiasmin = pricingOcupaAntecipa.getCantdiasmin(); + Integer cantdiasmax = pricingOcupaAntecipa.getCantdiasmax(); + + boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null)); + + for (PricingOcupaAntecipa poa : lsSalvos) { + boolean traslapaCantPorcentaje = false; + if (validaCantPorcentaje) { + if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) { + traslapaCantPorcentaje = TraslaparUtil.intersectNum(poa.getOcupacioninicial(), poa.getOcupacionfinal(), cantocupaini, cantocupafin); + } + } + + boolean traslapaCantAsiento = false; + if (validaCantAsientos) { + if ((poa.getCantasientosmin() != null) && (poa.getCantasientosmax() != null)) { + traslapaCantAsiento = TraslaparUtil.intersectNum(poa.getCantasientosmin(), poa.getCantasientosmax(), cantasientosmin, cantasientosmax); + } + } + + boolean traslapaCantDias = false; + if (validaCantDias) { + if ((poa.getCantdiasmin() != null) && (poa.getCantdiasmax() != null)) { + traslapaCantDias = TraslaparUtil.intersectNum(poa.getCantdiasmin(), poa.getCantdiasmax(), cantdiasmin, cantdiasmax); + } + } + + if ((traslapaCantPorcentaje || traslapaCantAsiento ) && traslapaCantDias ){ + log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId()); + + traslapa = true; + + break; + } + + } + + return traslapa; + } + + @Override + @Transactional + public void borrar(List pricingOcupaAntecipas) { + if(pricingOcupaAntecipas != null && !pricingOcupaAntecipas.isEmpty()) { + for (PricingOcupaAntecipa pricingOcupaAntecipa : pricingOcupaAntecipas) { + borrar(pricingOcupaAntecipa); + } + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingRutaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingRutaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingTipoPtoVtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingTipoPtoVtaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingTipoPtoVtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingTipoPtoVtaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingTipoServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingTipoServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingTipoServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingTipoServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingVigenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingVigenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PricingVigenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PricingVigenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdClaseServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdClaseServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdClaseServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdClaseServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdFormaPagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdFormaPagoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdFormaPagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdFormaPagoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdMarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdMarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdMarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdMarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdMercadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdMercadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdMercadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdMercadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdPrecioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdPrecioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdPrecioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdPrecioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdRutaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdRutaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdTipoptovtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdTipoptovtaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdTipoptovtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdTipoptovtaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProdVigenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdVigenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProdVigenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProdVigenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ProductoServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProductoServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ProductoServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ProductoServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaCheckinServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaCheckinServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtoVtaCheckinServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaCheckinServiceImpl.java index 2a5601d35..e28325a6b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaCheckinServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaCheckinServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtoVtaCheckinDAO; -import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; -import com.rjconsultores.ventaboletos.service.PtoVtaCheckinService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ptoVtaCheckinService") -public class PtoVtaCheckinServiceImpl implements PtoVtaCheckinService { - - @Autowired - private PtoVtaCheckinDAO ptovtaEmpresaBloqueadaServiceDAO; - - @Override - public List obtenerTodos() { - return ptovtaEmpresaBloqueadaServiceDAO.obtenerTodos(); - } - - @Override - public PtoVtaCheckin obtenerID(Integer id) { - return ptovtaEmpresaBloqueadaServiceDAO.obtenerID(id); - } - - @Override - @Transactional(readOnly = false) - public PtoVtaCheckin suscribir(PtoVtaCheckin entidad) { - return ptovtaEmpresaBloqueadaServiceDAO.suscribir(entidad); - } - - @Override - @Transactional(readOnly = false) - public PtoVtaCheckin actualizacion(PtoVtaCheckin entidad) { - return ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); - } - - @Override - @Transactional(readOnly = false) - public void borrar(PtoVtaCheckin entidad) { - entidad.setActivo(Boolean.FALSE); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtoVtaCheckinDAO; +import com.rjconsultores.ventaboletos.entidad.PtoVtaCheckin; +import com.rjconsultores.ventaboletos.service.PtoVtaCheckinService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ptoVtaCheckinService") +public class PtoVtaCheckinServiceImpl implements PtoVtaCheckinService { + + @Autowired + private PtoVtaCheckinDAO ptovtaEmpresaBloqueadaServiceDAO; + + @Override + public List obtenerTodos() { + return ptovtaEmpresaBloqueadaServiceDAO.obtenerTodos(); + } + + @Override + public PtoVtaCheckin obtenerID(Integer id) { + return ptovtaEmpresaBloqueadaServiceDAO.obtenerID(id); + } + + @Override + @Transactional(readOnly = false) + public PtoVtaCheckin suscribir(PtoVtaCheckin entidad) { + return ptovtaEmpresaBloqueadaServiceDAO.suscribir(entidad); + } + + @Override + @Transactional(readOnly = false) + public PtoVtaCheckin actualizacion(PtoVtaCheckin entidad) { + return ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); + } + + @Override + @Transactional(readOnly = false) + public void borrar(PtoVtaCheckin entidad) { + entidad.setActivo(Boolean.FALSE); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaSeguroServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaSeguroServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtoVtaSeguroServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaSeguroServiceImpl.java index 2c40fd09c..c228d5ee7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaSeguroServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaSeguroServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtoVtaSeguroDAO; -import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; -import com.rjconsultores.ventaboletos.service.PtoVtaSeguroService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ptoVtaSeguroService") -public class PtoVtaSeguroServiceImpl implements PtoVtaSeguroService { - - @Autowired - private PtoVtaSeguroDAO ptoVtaSeguroServiceDAO; - - @Override - public List obtenerTodos() { - return ptoVtaSeguroServiceDAO.obtenerTodos(); - } - - @Override - public PtoVtaSeguro obtenerID(Integer id) { - return ptoVtaSeguroServiceDAO.obtenerID(id); - } - - @Override - @Transactional(readOnly = false) - public PtoVtaSeguro suscribir(PtoVtaSeguro entidad) { - return ptoVtaSeguroServiceDAO.suscribir(entidad); - } - - @Override - @Transactional(readOnly = false) - public PtoVtaSeguro actualizacion(PtoVtaSeguro entidad) { - return ptoVtaSeguroServiceDAO.actualizacion(entidad); - } - - @Override - @Transactional(readOnly = false) - public void borrar(PtoVtaSeguro entidad) { - entidad.setActivo(Boolean.FALSE); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - ptoVtaSeguroServiceDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtoVtaSeguroDAO; +import com.rjconsultores.ventaboletos.entidad.PtoVtaSeguro; +import com.rjconsultores.ventaboletos.service.PtoVtaSeguroService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ptoVtaSeguroService") +public class PtoVtaSeguroServiceImpl implements PtoVtaSeguroService { + + @Autowired + private PtoVtaSeguroDAO ptoVtaSeguroServiceDAO; + + @Override + public List obtenerTodos() { + return ptoVtaSeguroServiceDAO.obtenerTodos(); + } + + @Override + public PtoVtaSeguro obtenerID(Integer id) { + return ptoVtaSeguroServiceDAO.obtenerID(id); + } + + @Override + @Transactional(readOnly = false) + public PtoVtaSeguro suscribir(PtoVtaSeguro entidad) { + return ptoVtaSeguroServiceDAO.suscribir(entidad); + } + + @Override + @Transactional(readOnly = false) + public PtoVtaSeguro actualizacion(PtoVtaSeguro entidad) { + return ptoVtaSeguroServiceDAO.actualizacion(entidad); + } + + @Override + @Transactional(readOnly = false) + public void borrar(PtoVtaSeguro entidad) { + entidad.setActivo(Boolean.FALSE); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + ptoVtaSeguroServiceDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaUsuarioBancarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaUsuarioBancarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PtoVtaUsuarioBancarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtoVtaUsuarioBancarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAgenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAgenciaServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaAgenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAgenciaServiceImpl.java index fc33e8195..fef2d0b3e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAgenciaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAgenciaServiceImpl.java @@ -1,75 +1,75 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.hibernate.Query; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaAgenciaDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; -import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresa; -import com.rjconsultores.ventaboletos.service.PtovtaAgenciaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaAgenciaBancariaService") -public class PtovtaAgenciaServiceImpl implements PtovtaAgenciaService { - - @Autowired - private PtovtaAgenciaDAO ptovtaBancoDAO; - - public List obtenerTodos() { - return ptovtaBancoDAO.obtenerTodos(); - } - - public PtovtaAgencia obtenerID(Integer id) { - return ptovtaBancoDAO.obtenerID(id); - } - - @Transactional - public PtovtaAgencia suscribir(PtovtaAgencia entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaBancoDAO.suscribir(entidad); - } - - @Transactional - public PtovtaAgencia actualizacion(PtovtaAgencia entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaBancoDAO.actualizacion(entidad); - } - - - @Transactional - public void borrar(PtovtaAgencia entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaBancoDAO.actualizacion(entidad); - } - - - public List buscar(String numagencia) { - return ptovtaBancoDAO.buscar(numagencia); - } - - public void borrarFisico(PtovtaAgencia pto) { - ptovtaBancoDAO.borrarFisico(pto); - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.hibernate.Query; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaAgenciaDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaAgencia; +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresa; +import com.rjconsultores.ventaboletos.service.PtovtaAgenciaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaAgenciaBancariaService") +public class PtovtaAgenciaServiceImpl implements PtovtaAgenciaService { + + @Autowired + private PtovtaAgenciaDAO ptovtaBancoDAO; + + public List obtenerTodos() { + return ptovtaBancoDAO.obtenerTodos(); + } + + public PtovtaAgencia obtenerID(Integer id) { + return ptovtaBancoDAO.obtenerID(id); + } + + @Transactional + public PtovtaAgencia suscribir(PtovtaAgencia entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaBancoDAO.suscribir(entidad); + } + + @Transactional + public PtovtaAgencia actualizacion(PtovtaAgencia entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaBancoDAO.actualizacion(entidad); + } + + + @Transactional + public void borrar(PtovtaAgencia entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaBancoDAO.actualizacion(entidad); + } + + + public List buscar(String numagencia) { + return ptovtaBancoDAO.buscar(numagencia); + } + + public void borrarFisico(PtovtaAgencia pto) { + ptovtaBancoDAO.borrarFisico(pto); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntecipacomissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntecipacomissaoServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntecipacomissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntecipacomissaoServiceImpl.java index 1d83962fa..84aafe079 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntecipacomissaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntecipacomissaoServiceImpl.java @@ -1,68 +1,68 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.dao.PtovtaAntecipacomissaoDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; -import com.rjconsultores.ventaboletos.service.PtovtaAntecipacomissaoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaAntecipacomissaoService") -public class PtovtaAntecipacomissaoServiceImpl implements PtovtaAntecipacomissaoService { - - @Autowired - private PtovtaAntecipacomissaoDAO ptovtaAntecipacomissaoDAO; - - public List obtenerTodos() { - return ptovtaAntecipacomissaoDAO.obtenerTodos(); - } - - public PtovtaAntecipacomissao obtenerID(Integer id) { - return ptovtaAntecipacomissaoDAO.obtenerID(id); - } - - @Transactional - public PtovtaAntecipacomissao suscribir(PtovtaAntecipacomissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaAntecipacomissaoDAO.suscribir(entidad); - } - - @Transactional - public PtovtaAntecipacomissao actualizacion(PtovtaAntecipacomissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaAntecipacomissaoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PtovtaAntecipacomissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaAntecipacomissaoDAO.actualizacion(entidad); - } - - public List buscar(int id) { - return ptovtaAntecipacomissaoDAO.buscar(id); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.dao.PtovtaAntecipacomissaoDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaAntecipacomissao; +import com.rjconsultores.ventaboletos.service.PtovtaAntecipacomissaoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaAntecipacomissaoService") +public class PtovtaAntecipacomissaoServiceImpl implements PtovtaAntecipacomissaoService { + + @Autowired + private PtovtaAntecipacomissaoDAO ptovtaAntecipacomissaoDAO; + + public List obtenerTodos() { + return ptovtaAntecipacomissaoDAO.obtenerTodos(); + } + + public PtovtaAntecipacomissao obtenerID(Integer id) { + return ptovtaAntecipacomissaoDAO.obtenerID(id); + } + + @Transactional + public PtovtaAntecipacomissao suscribir(PtovtaAntecipacomissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaAntecipacomissaoDAO.suscribir(entidad); + } + + @Transactional + public PtovtaAntecipacomissao actualizacion(PtovtaAntecipacomissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaAntecipacomissaoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PtovtaAntecipacomissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaAntecipacomissaoDAO.actualizacion(entidad); + } + + public List buscar(int id) { + return ptovtaAntecipacomissaoDAO.buscar(id); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntifraudeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntifraudeServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntifraudeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntifraudeServiceImpl.java index 4900d9cc4..f3cd533f6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntifraudeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaAntifraudeServiceImpl.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaAntifraudeDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; -import com.rjconsultores.ventaboletos.service.PtovtaAntifraudeService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ptovtaAntifraudeService") -public class PtovtaAntifraudeServiceImpl implements PtovtaAntifraudeService { - - @Autowired - PtovtaAntifraudeDAO ptovtaAntifraudeServiceDAO; - - @Override - public List obtenerTodos() { - return ptovtaAntifraudeServiceDAO.obtenerTodos(); - } - - @Override - public PtovtaAntifraude obtenerID(Integer id) { - return ptovtaAntifraudeServiceDAO.obtenerID(id); - } - - @Override - @Transactional - public PtovtaAntifraude suscribir(PtovtaAntifraude entidad) { - entidad.setActivo(true); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return ptovtaAntifraudeServiceDAO.suscribir(entidad); - } - - @Override - @Transactional - public PtovtaAntifraude actualizacion(PtovtaAntifraude entidad) { - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return ptovtaAntifraudeServiceDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PtovtaAntifraude entidad) { - entidad.setActivo(false); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - ptovtaAntifraudeServiceDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaAntifraudeDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; +import com.rjconsultores.ventaboletos.service.PtovtaAntifraudeService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ptovtaAntifraudeService") +public class PtovtaAntifraudeServiceImpl implements PtovtaAntifraudeService { + + @Autowired + PtovtaAntifraudeDAO ptovtaAntifraudeServiceDAO; + + @Override + public List obtenerTodos() { + return ptovtaAntifraudeServiceDAO.obtenerTodos(); + } + + @Override + public PtovtaAntifraude obtenerID(Integer id) { + return ptovtaAntifraudeServiceDAO.obtenerID(id); + } + + @Override + @Transactional + public PtovtaAntifraude suscribir(PtovtaAntifraude entidad) { + entidad.setActivo(true); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return ptovtaAntifraudeServiceDAO.suscribir(entidad); + } + + @Override + @Transactional + public PtovtaAntifraude actualizacion(PtovtaAntifraude entidad) { + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return ptovtaAntifraudeServiceDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PtovtaAntifraude entidad) { + entidad.setActivo(false); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + ptovtaAntifraudeServiceDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaCatIndServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaCatIndServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaCatIndServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaCatIndServiceImpl.java index cfdef1f35..148e51012 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaCatIndServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaCatIndServiceImpl.java @@ -1,59 +1,59 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaCatIndDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; -import com.rjconsultores.ventaboletos.service.PtovtaCatIndService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ptovtaCatIndService") -public class PtovtaCatIndServiceImpl implements PtovtaCatIndService { - - @Autowired - private PtovtaCatIndDAO ptovtaCatIndDAO; - - @Override - public List obtenerTodos() { - return ptovtaCatIndDAO.obtenerTodos(); - } - - @Override - public PtovtaCatInd obtenerID(Integer id) { - return ptovtaCatIndDAO.obtenerID(id); - } - - @Override - @Transactional - public PtovtaCatInd suscribir(PtovtaCatInd entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return ptovtaCatIndDAO.suscribir(entidad); - } - - @Override - @Transactional - public PtovtaCatInd actualizacion(PtovtaCatInd entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return ptovtaCatIndDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PtovtaCatInd entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - ptovtaCatIndDAO.actualizacion(entidad); - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaCatIndDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaCatInd; +import com.rjconsultores.ventaboletos.service.PtovtaCatIndService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ptovtaCatIndService") +public class PtovtaCatIndServiceImpl implements PtovtaCatIndService { + + @Autowired + private PtovtaCatIndDAO ptovtaCatIndDAO; + + @Override + public List obtenerTodos() { + return ptovtaCatIndDAO.obtenerTodos(); + } + + @Override + public PtovtaCatInd obtenerID(Integer id) { + return ptovtaCatIndDAO.obtenerID(id); + } + + @Override + @Transactional + public PtovtaCatInd suscribir(PtovtaCatInd entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return ptovtaCatIndDAO.suscribir(entidad); + } + + @Override + @Transactional + public PtovtaCatInd actualizacion(PtovtaCatInd entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return ptovtaCatIndDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PtovtaCatInd entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + ptovtaCatIndDAO.actualizacion(entidad); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaComissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaComissaoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaComissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaComissaoServiceImpl.java index 5ded7a161..aeeb9d375 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaComissaoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaComissaoServiceImpl.java @@ -1,111 +1,111 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaComissaoDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.service.PtovtaComissaoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaComissaoService") -public class PtovtaComissaoServiceImpl implements PtovtaComissaoService { - - private static Logger log = LogManager.getLogger(PtovtaComissaoServiceImpl.class); - - @Autowired - private PtovtaComissaoDAO ptovtaComissaoDAO; - @Autowired - private LogAuditoriaService logAuditoriaService; - - public List obtenerTodos() { - return ptovtaComissaoDAO.obtenerTodos(); - } - - public PtovtaComissao obtenerID(Integer id) { - - PtovtaComissao ptovtaComissao = ptovtaComissaoDAO.obtenerID(id); - try { - ptovtaComissao.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return ptovtaComissao; - } - - @Transactional - public PtovtaComissao suscribir(PtovtaComissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - ptovtaComissaoDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, entidad.getEmpresaId() != null ? entidad.getEmpresaId().getEmpresaId() : null); - - return entidad; - - - } - - @Transactional - public PtovtaComissao actualizacion(PtovtaComissao entidad) { - - - PtovtaComissao originalClone = null; - try { - originalClone = entidad.getCloneObject(); - } catch (Exception e) { - log.error("",e); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - ptovtaComissaoDAO.actualizacion(entidad); - - logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresaId() != null ? entidad.getEmpresaId().getEmpresaId() : null); - - return entidad; - - } - - @Transactional - public void borrar(PtovtaComissao entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaComissaoDAO.actualizacion(entidad); - } - - public List buscar(int id) { - return ptovtaComissaoDAO.buscar(id); - } - - public List buscarByPuntaVenta(PuntoVenta puntaVenta) { - return ptovtaComissaoDAO.buscarByPuntaVenta(puntaVenta); - } - - @Override - public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId) { - return ptovtaComissaoDAO.buscarPuntaVentaEmpresa(puntaVentaId, empresaId); - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaComissaoDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaComissao; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.service.PtovtaComissaoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaComissaoService") +public class PtovtaComissaoServiceImpl implements PtovtaComissaoService { + + private static Logger log = LogManager.getLogger(PtovtaComissaoServiceImpl.class); + + @Autowired + private PtovtaComissaoDAO ptovtaComissaoDAO; + @Autowired + private LogAuditoriaService logAuditoriaService; + + public List obtenerTodos() { + return ptovtaComissaoDAO.obtenerTodos(); + } + + public PtovtaComissao obtenerID(Integer id) { + + PtovtaComissao ptovtaComissao = ptovtaComissaoDAO.obtenerID(id); + try { + ptovtaComissao.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return ptovtaComissao; + } + + @Transactional + public PtovtaComissao suscribir(PtovtaComissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + ptovtaComissaoDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, entidad.getEmpresaId() != null ? entidad.getEmpresaId().getEmpresaId() : null); + + return entidad; + + + } + + @Transactional + public PtovtaComissao actualizacion(PtovtaComissao entidad) { + + + PtovtaComissao originalClone = null; + try { + originalClone = entidad.getCloneObject(); + } catch (Exception e) { + log.error("",e); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + ptovtaComissaoDAO.actualizacion(entidad); + + logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresaId() != null ? entidad.getEmpresaId().getEmpresaId() : null); + + return entidad; + + } + + @Transactional + public void borrar(PtovtaComissao entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaComissaoDAO.actualizacion(entidad); + } + + public List buscar(int id) { + return ptovtaComissaoDAO.buscar(id); + } + + public List buscarByPuntaVenta(PuntoVenta puntaVenta) { + return ptovtaComissaoDAO.buscarByPuntaVenta(puntaVenta); + } + + @Override + public PtovtaComissao buscarPuntaVentaEmpresa(Integer puntaVentaId, Integer empresaId) { + return ptovtaComissaoDAO.buscarPuntaVentaEmpresa(puntaVentaId, empresaId); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaContaMDServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaContaMDServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaContaMDServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaContaMDServiceImpl.java index b49786768..37f8cc5b2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaContaMDServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaContaMDServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaContaMDDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; -import com.rjconsultores.ventaboletos.service.PtovtaContaMDService; - -@Service("PtovtaContaMDService") -public class PtovtaContaMDServiceImpl implements PtovtaContaMDService { - - @Autowired - private PtovtaContaMDDAO ptovtaContaMDDAO; - - @Override - public List obtenerTodos() { - return ptovtaContaMDDAO.obtenerTodos(); - } - - @Override - public PtovtaContaMD obtenerID(Long id) { - return ptovtaContaMDDAO.obtenerID(id); - } - - @Transactional - @Override - public PtovtaContaMD suscribir(PtovtaContaMD entidad) { - return ptovtaContaMDDAO.suscribir(entidad); - } - - @Transactional - @Override - public PtovtaContaMD actualizacion(PtovtaContaMD entidad) { - return ptovtaContaMDDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(PtovtaContaMD entidad) { - ptovtaContaMDDAO.borrar(entidad); - } - - @Override - public boolean contemItem(PtovtaContaMD ptovtaContaMD) { - return ptovtaContaMDDAO.contemItem(ptovtaContaMD); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaContaMDDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaContaMD; +import com.rjconsultores.ventaboletos.service.PtovtaContaMDService; + +@Service("PtovtaContaMDService") +public class PtovtaContaMDServiceImpl implements PtovtaContaMDService { + + @Autowired + private PtovtaContaMDDAO ptovtaContaMDDAO; + + @Override + public List obtenerTodos() { + return ptovtaContaMDDAO.obtenerTodos(); + } + + @Override + public PtovtaContaMD obtenerID(Long id) { + return ptovtaContaMDDAO.obtenerID(id); + } + + @Transactional + @Override + public PtovtaContaMD suscribir(PtovtaContaMD entidad) { + return ptovtaContaMDDAO.suscribir(entidad); + } + + @Transactional + @Override + public PtovtaContaMD actualizacion(PtovtaContaMD entidad) { + return ptovtaContaMDDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(PtovtaContaMD entidad) { + ptovtaContaMDDAO.borrar(entidad); + } + + @Override + public boolean contemItem(PtovtaContaMD ptovtaContaMD) { + return ptovtaContaMDDAO.contemItem(ptovtaContaMD); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaDiversosServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaDiversosServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaDiversosServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaDiversosServiceImpl.java index 328f28523..55c0ac068 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaDiversosServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaDiversosServiceImpl.java @@ -1,68 +1,68 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.dao.PtovtaDiversosDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; -import com.rjconsultores.ventaboletos.service.PtovtaDiversosService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaDiversosService") -public class PtovtaDiversosServiceImpl implements PtovtaDiversosService { - - @Autowired - private PtovtaDiversosDAO ptovtaDiversosDAO; - - public List obtenerTodos() { - return ptovtaDiversosDAO.obtenerTodos(); - } - - public PtovtaDiversos obtenerID(Integer id) { - return ptovtaDiversosDAO.obtenerID(id); - } - - @Transactional - public PtovtaDiversos suscribir(PtovtaDiversos entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaDiversosDAO.suscribir(entidad); - } - - @Transactional - public PtovtaDiversos actualizacion(PtovtaDiversos entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaDiversosDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PtovtaDiversos entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaDiversosDAO.actualizacion(entidad); - } - - public List buscar(int id) { - return ptovtaDiversosDAO.buscar(id); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.dao.PtovtaDiversosDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaDiversos; +import com.rjconsultores.ventaboletos.service.PtovtaDiversosService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaDiversosService") +public class PtovtaDiversosServiceImpl implements PtovtaDiversosService { + + @Autowired + private PtovtaDiversosDAO ptovtaDiversosDAO; + + public List obtenerTodos() { + return ptovtaDiversosDAO.obtenerTodos(); + } + + public PtovtaDiversos obtenerID(Integer id) { + return ptovtaDiversosDAO.obtenerID(id); + } + + @Transactional + public PtovtaDiversos suscribir(PtovtaDiversos entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaDiversosDAO.suscribir(entidad); + } + + @Transactional + public PtovtaDiversos actualizacion(PtovtaDiversos entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaDiversosDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PtovtaDiversos entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaDiversosDAO.actualizacion(entidad); + } + + public List buscar(int id) { + return ptovtaDiversosDAO.buscar(id); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaBloqueadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaBloqueadaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaBloqueadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaBloqueadaServiceImpl.java index d76c30745..28f588069 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaBloqueadaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaBloqueadaServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaEmpresaBloqueadaDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; -import com.rjconsultores.ventaboletos.service.PtovtaEmpresaBloqueadaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ptovtaEmpresaBloqueadaService") -public class PtovtaEmpresaBloqueadaServiceImpl implements PtovtaEmpresaBloqueadaService { - - @Autowired - private PtovtaEmpresaBloqueadaDAO ptovtaEmpresaBloqueadaServiceDAO; - - @Override - public List obtenerTodos() { - return ptovtaEmpresaBloqueadaServiceDAO.obtenerTodos(); - } - - @Override - public PtovtaEmpresaBloqueada obtenerID(Integer id) { - return ptovtaEmpresaBloqueadaServiceDAO.obtenerID(id); - } - - @Override - @Transactional(readOnly=false) - public PtovtaEmpresaBloqueada suscribir(PtovtaEmpresaBloqueada entidad) { - return ptovtaEmpresaBloqueadaServiceDAO.suscribir(entidad); - } - - @Override - @Transactional(readOnly=false) - public PtovtaEmpresaBloqueada actualizacion(PtovtaEmpresaBloqueada entidad) { - return ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); - } - - @Override - @Transactional(readOnly=false) - public void borrar(PtovtaEmpresaBloqueada entidad) { - entidad.setActivo(Boolean.FALSE); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaEmpresaBloqueadaDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaBloqueada; +import com.rjconsultores.ventaboletos.service.PtovtaEmpresaBloqueadaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ptovtaEmpresaBloqueadaService") +public class PtovtaEmpresaBloqueadaServiceImpl implements PtovtaEmpresaBloqueadaService { + + @Autowired + private PtovtaEmpresaBloqueadaDAO ptovtaEmpresaBloqueadaServiceDAO; + + @Override + public List obtenerTodos() { + return ptovtaEmpresaBloqueadaServiceDAO.obtenerTodos(); + } + + @Override + public PtovtaEmpresaBloqueada obtenerID(Integer id) { + return ptovtaEmpresaBloqueadaServiceDAO.obtenerID(id); + } + + @Override + @Transactional(readOnly=false) + public PtovtaEmpresaBloqueada suscribir(PtovtaEmpresaBloqueada entidad) { + return ptovtaEmpresaBloqueadaServiceDAO.suscribir(entidad); + } + + @Override + @Transactional(readOnly=false) + public PtovtaEmpresaBloqueada actualizacion(PtovtaEmpresaBloqueada entidad) { + return ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); + } + + @Override + @Transactional(readOnly=false) + public void borrar(PtovtaEmpresaBloqueada entidad) { + entidad.setActivo(Boolean.FALSE); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + ptovtaEmpresaBloqueadaServiceDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEstoqueServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEstoqueServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaEstoqueServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEstoqueServiceImpl.java index ee8356790..17826789e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEstoqueServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEstoqueServiceImpl.java @@ -1,68 +1,68 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.dao.PtovtaEstoqueDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; -import com.rjconsultores.ventaboletos.service.PtovtaEstoqueService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaEstoqueService") -public class PtovtaEstoqueServiceImpl implements PtovtaEstoqueService { - - @Autowired - private PtovtaEstoqueDAO ptovtaEstoqueDAO; - - public List obtenerTodos() { - return ptovtaEstoqueDAO.obtenerTodos(); - } - - public PtovtaEstoque obtenerID(Integer id) { - return ptovtaEstoqueDAO.obtenerID(id); - } - - @Transactional - public PtovtaEstoque suscribir(PtovtaEstoque entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaEstoqueDAO.suscribir(entidad); - } - - @Transactional - public PtovtaEstoque actualizacion(PtovtaEstoque entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaEstoqueDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PtovtaEstoque entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaEstoqueDAO.actualizacion(entidad); - } - - public List buscar(int id) { - return ptovtaEstoqueDAO.buscar(id); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.dao.PtovtaEstoqueDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaEstoque; +import com.rjconsultores.ventaboletos.service.PtovtaEstoqueService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaEstoqueService") +public class PtovtaEstoqueServiceImpl implements PtovtaEstoqueService { + + @Autowired + private PtovtaEstoqueDAO ptovtaEstoqueDAO; + + public List obtenerTodos() { + return ptovtaEstoqueDAO.obtenerTodos(); + } + + public PtovtaEstoque obtenerID(Integer id) { + return ptovtaEstoqueDAO.obtenerID(id); + } + + @Transactional + public PtovtaEstoque suscribir(PtovtaEstoque entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaEstoqueDAO.suscribir(entidad); + } + + @Transactional + public PtovtaEstoque actualizacion(PtovtaEstoque entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaEstoqueDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PtovtaEstoque entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaEstoqueDAO.actualizacion(entidad); + } + + public List buscar(int id) { + return ptovtaEstoqueDAO.buscar(id); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaExcecaoMultaCancServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaExcecaoMultaCancServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaExcecaoMultaCancServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaExcecaoMultaCancServiceImpl.java index 819dd03cf..c747ccc7c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaExcecaoMultaCancServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaExcecaoMultaCancServiceImpl.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.PtovtaExcecaoMultaCancDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; -import com.rjconsultores.ventaboletos.service.PtovtaExcecaoMultaCancService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("ptovtaExcecaoMultaCancService") -public class PtovtaExcecaoMultaCancServiceImpl implements PtovtaExcecaoMultaCancService { - - @Autowired - PtovtaExcecaoMultaCancDAO ptovtaExcecaoMultaCancDAO; - - @Override - public List obtenerTodos() { - return ptovtaExcecaoMultaCancDAO.obtenerTodos(); - } - - @Override - public PtovtaExcecaoMultaCanc obtenerID(Integer id) { - return ptovtaExcecaoMultaCancDAO.obtenerID(id); - } - - @Override - @Transactional - public PtovtaExcecaoMultaCanc suscribir(PtovtaExcecaoMultaCanc entidad) { - entidad.setActivo(true); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return ptovtaExcecaoMultaCancDAO.suscribir(entidad); - } - - @Override - @Transactional - public PtovtaExcecaoMultaCanc actualizacion(PtovtaExcecaoMultaCanc entidad) { - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return ptovtaExcecaoMultaCancDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(PtovtaExcecaoMultaCanc entidad) { - entidad.setActivo(false); - entidad.setFecmodif(new Date()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - ptovtaExcecaoMultaCancDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaExcecaoMultaCancDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaExcecaoMultaCanc; +import com.rjconsultores.ventaboletos.service.PtovtaExcecaoMultaCancService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("ptovtaExcecaoMultaCancService") +public class PtovtaExcecaoMultaCancServiceImpl implements PtovtaExcecaoMultaCancService { + + @Autowired + PtovtaExcecaoMultaCancDAO ptovtaExcecaoMultaCancDAO; + + @Override + public List obtenerTodos() { + return ptovtaExcecaoMultaCancDAO.obtenerTodos(); + } + + @Override + public PtovtaExcecaoMultaCanc obtenerID(Integer id) { + return ptovtaExcecaoMultaCancDAO.obtenerID(id); + } + + @Override + @Transactional + public PtovtaExcecaoMultaCanc suscribir(PtovtaExcecaoMultaCanc entidad) { + entidad.setActivo(true); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return ptovtaExcecaoMultaCancDAO.suscribir(entidad); + } + + @Override + @Transactional + public PtovtaExcecaoMultaCanc actualizacion(PtovtaExcecaoMultaCanc entidad) { + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return ptovtaExcecaoMultaCancDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(PtovtaExcecaoMultaCanc entidad) { + entidad.setActivo(false); + entidad.setFecmodif(new Date()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + ptovtaExcecaoMultaCancDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaHorarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaHorarioServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaHorarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaHorarioServiceImpl.java index 9b66a5c87..1d6cf77f6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaHorarioServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaHorarioServiceImpl.java @@ -1,69 +1,69 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - - -import com.rjconsultores.ventaboletos.dao.PtovtaHorarioDAO; -import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; -import com.rjconsultores.ventaboletos.service.PtovtaHorarioService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaHorarioService") -public class PtovtaHorarioServiceImpl implements PtovtaHorarioService { - - @Autowired - private PtovtaHorarioDAO ptovtaHorarioDAO; - - public List obtenerTodos() { - return ptovtaHorarioDAO.obtenerTodos(); - } - - public PtovtaHorario obtenerID(Integer id) { - return ptovtaHorarioDAO.obtenerID(id); - } - - @Transactional - public PtovtaHorario suscribir(PtovtaHorario entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaHorarioDAO.suscribir(entidad); - } - - @Transactional - public PtovtaHorario actualizacion(PtovtaHorario entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaHorarioDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PtovtaHorario entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaHorarioDAO.actualizacion(entidad); - } - - public List buscar(int id) { - return ptovtaHorarioDAO.buscar(id); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + + +import com.rjconsultores.ventaboletos.dao.PtovtaHorarioDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaHorario; +import com.rjconsultores.ventaboletos.service.PtovtaHorarioService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaHorarioService") +public class PtovtaHorarioServiceImpl implements PtovtaHorarioService { + + @Autowired + private PtovtaHorarioDAO ptovtaHorarioDAO; + + public List obtenerTodos() { + return ptovtaHorarioDAO.obtenerTodos(); + } + + public PtovtaHorario obtenerID(Integer id) { + return ptovtaHorarioDAO.obtenerID(id); + } + + @Transactional + public PtovtaHorario suscribir(PtovtaHorario entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaHorarioDAO.suscribir(entidad); + } + + @Transactional + public PtovtaHorario actualizacion(PtovtaHorario entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaHorarioDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PtovtaHorario entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaHorarioDAO.actualizacion(entidad); + } + + public List buscar(int id) { + return ptovtaHorarioDAO.buscar(id); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaTitularServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaTitularServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/PtovtaTitularServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaTitularServiceImpl.java index 4eaa9d4cc..c89d55af2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaTitularServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PtovtaTitularServiceImpl.java @@ -1,77 +1,77 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - - -import com.rjconsultores.ventaboletos.dao.PtovtaTitularDAO; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; -import com.rjconsultores.ventaboletos.service.PtovtaTitularService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import org.springframework.transaction.annotation.Transactional; - -/** - * - * @author Desenvolvimento - */ -@Service("ptovtaTitularService") -public class PtovtaTitularServiceImpl implements PtovtaTitularService { - - @Autowired - private PtovtaTitularDAO ptovtaTitularDAO; - - public List obtenerTodos() { - return ptovtaTitularDAO.obtenerTodos(); - } - - public PtovtaTitular obtenerID(Integer id) { - - PtovtaTitular ptovtaTitular = ptovtaTitularDAO.obtenerID(id); - try { - ptovtaTitular.clonar(); - } catch (Exception e) { - e.printStackTrace(); - } - return ptovtaTitular; - } - - @Transactional - public PtovtaTitular suscribir(PtovtaTitular entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaTitularDAO.suscribir(entidad); - } - - @Transactional - public PtovtaTitular actualizacion(PtovtaTitular entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return ptovtaTitularDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(PtovtaTitular entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - ptovtaTitularDAO.actualizacion(entidad); - } - - public List buscar(int id) { - return ptovtaTitularDAO.buscar(id); - } - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + + +import com.rjconsultores.ventaboletos.dao.PtovtaTitularDAO; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.PtovtaTitular; +import com.rjconsultores.ventaboletos.service.PtovtaTitularService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import org.springframework.transaction.annotation.Transactional; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaTitularService") +public class PtovtaTitularServiceImpl implements PtovtaTitularService { + + @Autowired + private PtovtaTitularDAO ptovtaTitularDAO; + + public List obtenerTodos() { + return ptovtaTitularDAO.obtenerTodos(); + } + + public PtovtaTitular obtenerID(Integer id) { + + PtovtaTitular ptovtaTitular = ptovtaTitularDAO.obtenerID(id); + try { + ptovtaTitular.clonar(); + } catch (Exception e) { + e.printStackTrace(); + } + return ptovtaTitular; + } + + @Transactional + public PtovtaTitular suscribir(PtovtaTitular entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaTitularDAO.suscribir(entidad); + } + + @Transactional + public PtovtaTitular actualizacion(PtovtaTitular entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaTitularDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PtovtaTitular entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaTitularDAO.actualizacion(entidad); + } + + public List buscar(int id) { + return ptovtaTitularDAO.buscar(id); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java index 9f5df1f91..462851224 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java @@ -1,868 +1,868 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.net.URL; -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.SQLException; -import java.text.Normalizer; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import javax.sql.DataSource; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.brazilutils.br.cpfcnpj.CpfCnpj; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.datasource.DataSourceUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.tempuri.IAG; -import org.tempuri.IAGservice; -import org.tempuri.IAGserviceLocator; - -import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; -import com.rjconsultores.ventaboletos.dao.UsuarioUbicacionDAO; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estacion; -import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.IntegracionException; -import com.rjconsultores.ventaboletos.exception.ValidacionCampoException; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.EstacionService; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.service.PuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ws.totvs.service.TotvsService; -import com.rjconsultores.ws.utileria.Atributos; -import com.rjconsultores.ws.utileria.Atributos.CodPaisBanco; -import com.rjconsultores.ws.utileria.Atributos.ContribuinteICMS; -import com.rjconsultores.ws.utileria.Atributos.ContribuinteSimplesNacional; -import com.rjconsultores.ws.utileria.Atributos.InscricaoMunicipal; -import com.rjconsultores.ws.utileria.Atributos.TipoCliente; -import com.rjconsultores.ws.utileria.Atributos.TipoEntidade; -import com.rjconsultores.ws.utileria.Atributos.TipoFornecedor; -import com.rjconsultores.ws.utileria.Atributos.TipoPessoa; -import com.rjconsultores.ws.utileria.RetornoTotvs; -import com.rjconsultores.ws.utileria.RetornoTotvs.TipoRetorno; -import com.rjconsultores.wsag.Constantes; -import com.rjconsultores.wsag.dao.DaoAG; - -import AGIntf.TCliente; -import AGIntf.TComissaoServicosCliente; -import AGIntf.TFornecedor; -import AGIntf.TServicosCliente; - -/** - * - * @author Administrador - */ -@Service("puntoVentaService") -public class PuntoVentaServiceImpl implements PuntoVentaService { - - private static Logger log = LogManager.getLogger("com.rjconsultores.ws"); - - @Autowired - private PuntoVentaDAO puntoVentaDAO; - @Autowired - private ConstanteService constanteService; - @Autowired - private EstacionService estacionService; - @Autowired - private UsuarioUbicacionDAO usuarioUbicacionDAO; - @Autowired - private DataSource dataSource; - @Autowired - private LogAuditoriaService logAuditoriaService; - - // FIXME : Remover esse método de quem está usando. Esse método carrega muitos dados - @Deprecated - public List obtenerTodos() { - return puntoVentaDAO.obtenerTodos(); - } - - public PuntoVenta obtenerID(Integer id) { - - PuntoVenta puntoVenta = puntoVentaDAO.obtenerID(id); - - try { - puntoVenta.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return puntoVenta; - } - - @Transactional(noRollbackFor = { IntegracionException.class, ValidacionCampoException.class}) - public PuntoVenta suscribir(PuntoVenta entidad) throws IntegracionException, ValidacionCampoException { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - Exception respEx = null; - Constante constDesativaTotvs = constanteService.buscarPorNomeConstante("WS_TOTVS_DESATIVA_INTEGRACAO"); - Boolean desativaTotvs = constDesativaTotvs != null && constDesativaTotvs.getValorconstante().equals("1"); - - // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. - // integração AG - /* - * Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); if (entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { log.debug("iniciando integração com AG"); integraAG(entidad); log.debug("fim da integração com AG"); } - */ - - // integração Totvs - if (!desativaTotvs){ - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { - try { - - if (entidad.getIndIntegracion() == null || (entidad.getIndIntegracion().equals(TipoRetorno.PENDENTE.getValor()) - || entidad.getIndIntegracion().equals(TipoRetorno.ERRO.getValor()))) { - String resp = integracionTotvs(entidad); - - TipoRetorno retornoTotvs = RetornoTotvs.validaRetornoTotvs(resp); - - switch (retornoTotvs) { - case CONCLUIDA: - entidad.setIndIntegracion(TipoRetorno.CONCLUIDA.getValor()); - break; - - case JA_CADASTRADA: - entidad.setIndIntegracion(TipoRetorno.JA_CADASTRADA.getValor()); - respEx = new IntegracionException(Atributos.MSG_ERRO_JA_CADASTRADO); - break; - - case ERRO: - entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); - respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + resp); - break; - - default: - break; - } - } else { - respEx = new IntegracionException(Atributos.MSG_ERRO_NAO_ENVIO); - } - } catch (ValidacionCampoException ev) { - entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); - respEx = ev; - - } catch (Exception e) { - entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); - log.error(Atributos.MSG_ERRO_GENERICA, e); - respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + e.getMessage()); - } - - } - } - if (respEx != null) { - if (respEx instanceof ValidacionCampoException) { - throw (ValidacionCampoException) respEx; - } else if (respEx instanceof IntegracionException) { - entidad = puntoVentaDAO.suscribir(entidad); - throw (IntegracionException) respEx; - } - } - entidad = puntoVentaDAO.suscribir(entidad); - logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - - // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. - // integração AG - Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); - if (entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { - log.debug("iniciando integração com AG"); - integraAG(entidad); - log.debug("fim da integração com AG"); - } - - return entidad; - } - - - private void integraAG(PuntoVenta entidad) throws IntegracionException{ - Connection connection = null; - try { - String motivoNaoIntegrado = ""; - - connection = getConnection(); - DaoAG.getInstance().setDBConnection(connection); - - integrarClienteAG(entidad); - if (!entidad.getIndIntegradoAG()){ - motivoNaoIntegrado += "Cliente: " + entidad.getMotivoNaoIntegradoAG(); - } - integrarFornecedorAG(entidad); - if (!entidad.getIndIntegradoAG()){ - motivoNaoIntegrado += "\nFornecedor: " + entidad.getMotivoNaoIntegradoAG(); - - } - if (!motivoNaoIntegrado.isEmpty()){ - throw new IntegracionException(motivoNaoIntegrado); - } - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - log.error("error fechar conexão", e); - throw new RuntimeException(e); - } - } - } - - private void integrarFornecedorAG(PuntoVenta entidad) { - try { - IAGservice service = new IAGserviceLocator(); - IAG iag = DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG) == null ? null : service.getIAGPort(new URL(DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG))); - TFornecedor fornecedor = null; - String strFornecedor = ""; - try{ - strFornecedor = iag.getCodigoFornecedorWithIDWS(entidad.getNumPuntoVenta().toString()); - log.debug("Retorno consulta fornecedor ws: " + strFornecedor); - } catch (RemoteException e) { - log.error(e.toString()); - entidad.setIndIntegradoAG(false); - entidad.setMotivoNaoIntegradoAG("Erro ao conectar com o WS: " + e.toString()); - return; - } - if (!strFornecedor.contains("ERRO")){ - // retornar msg a informação de registro já cadastrado - entidad.setIndIntegradoAG(false); - entidad.setMotivoNaoIntegradoAG("Fornecedor já cadastrado"); - } else { - fornecedor = new TFornecedor(); - fornecedor.setNome(entidad.getRazonSocial()); - fornecedor.setNomeFantasia(entidad.getNombpuntoventa()); - fornecedor.setCNPJCPF(entidad.getNumDoCPuntoVenta()); - fornecedor.setGrupo(""); - fornecedor.setReceita(""); - fornecedor.setCodigo(""); - fornecedor.setCEP(entidad.getCep()); - fornecedor.setLogradouro(""+entidad.getLogradouro()); - fornecedor.setBairro(entidad.getBairro()); - fornecedor.setNumero(""+entidad.getNumero()); - fornecedor.setComplemento(""+entidad.getComplemento()); - fornecedor.setUF(entidad.getUF()); - fornecedor.setCidade(entidad.getCidade()); - fornecedor.setDDD(""); - fornecedor.setFone(""); - fornecedor.setFax(""); - fornecedor.setEmail(""); - fornecedor.setContato(""); - fornecedor.setSite(""); - fornecedor.setRG(""); - fornecedor.setIE(""); - fornecedor.setIM(""); - fornecedor.setReferencia(""); - fornecedor.setFinalidadeTED(""); - fornecedor.setFinalidadeDOC(""); - fornecedor.setCelular(""); - fornecedor.setLeiaute(""); - fornecedor.setBanco(""); - fornecedor.setBancoNumero(""); - fornecedor.setAgencia(""); - fornecedor.setCC(""); - fornecedor.setDVAg(""); - fornecedor.setDVCC(""); - fornecedor.setIDWS(entidad.getNumPuntoVenta()); - try{ - String retornoAG = iag.incluiFornecedor(fornecedor); - entidad.setIndIntegradoAG(true); - log.debug(retornoAG); - } catch (RemoteException e) { - entidad.setIndIntegradoAG(false); - entidad.setMotivoNaoIntegradoAG(e.getMessage()); - } - } - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - - private void integrarClienteAG(PuntoVenta entidad) { - - try { - - IAGservice service = new IAGserviceLocator(); - IAG iag = DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG) == null ? null : service.getIAGPort(new URL(DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG))); - TCliente cli = null; - String cliStr = ""; - try { - cliStr = iag.getClienteWithIDWS(entidad.getNumPuntoVenta().toString()); - log.debug("Retorno consulta cliente ws: " + cliStr); - } catch (RemoteException e) { - log.error(e.toString()); - entidad.setIndIntegradoAG(false); - entidad.setMotivoNaoIntegradoAG("Erro ao conectar com o WS: " + e.toString()); - return; - } - if (!cliStr.contains("ERRO")) { - // retornar msg a informação de registro já cadastrado - entidad.setIndIntegradoAG(false); - entidad.setMotivoNaoIntegradoAG("Cliente já cadastrado"); - } else { - cli = new TCliente(); - cli.setCodigo(""); - cli.setNome(entidad.getRazonSocial()); - cli.setNomeFantasia(entidad.getNombpuntoventa()); - cli.setCnpjcpf(entidad.getNumDoCPuntoVenta()); - cli.setGrupo(""); - cli.setAgenteCobrador(""); - cli.setVencimento(0); - cli.setContaContabil(""); - cli.setCep(entidad.getCep()); - cli.setLogradouro("" + entidad.getLogradouro()); - cli.setBairro(entidad.getBairro()); - cli.setNumero("" + entidad.getNumero()); - cli.setComplemento("" + entidad.getComplemento()); - cli.setUf(entidad.getUF()); - cli.setCidade(entidad.getCidade()); - cli.setDdd(""); - cli.setFone(""); - cli.setDddFax(""); - cli.setFax(""); - cli.setIdentificador(""); - cli.setDddCelular(""); - cli.setCelular(""); - cli.setEmail(""); - cli.setContato(""); - cli.setSite(""); - cli.setRg(""); - cli.setIe(""); - cli.setReceita(""); - cli.setRepresentante(""); - cli.setIM(""); - cli.setCampoExtra1(""); - cli.setCampoExtra10(""); - cli.setCampoExtra2(""); - cli.setCampoExtra3(""); - cli.setCampoExtra4(""); - cli.setCampoExtra5(""); - cli.setCampoExtra6(""); - cli.setCampoExtra7(""); - cli.setCampoExtra8(""); - cli.setCampoExtra9(""); - cli.setCliPagador(""); - cli.setIDWS(entidad.getNumPuntoVenta()); - cli.setServicosCliente(new TServicosCliente()); - cli.getServicosCliente().setServico(""); - cli.getServicosCliente().setEstabelecimento(""); - cli.getServicosCliente().setModalidade(""); - cli.getServicosCliente().setIndexador(""); - cli.getServicosCliente().setAnoMesPrimeiraCobranca(""); - cli.getServicosCliente().setAquisicao(Calendar.getInstance()); - cli.getServicosCliente().setAnoMesReajuste(""); - cli.getServicosCliente().setObservacao(""); - cli.getServicosCliente().setDescricaoNota(""); - cli.getServicosCliente().setComplementoDescricaoNota(""); - cli.getServicosCliente().setContrato(""); - cli.getServicosCliente().setDtCancelamento(Calendar.getInstance()); - cli.getServicosCliente().setObsCancelamento(""); - cli.getServicosCliente().setCRS_Codigo(""); - cli.getServicosCliente().setIDWS(entidad.getNumPuntoVenta()); - - cli.getServicosCliente().setAcessoSimultaneo(0); - cli.getServicosCliente().setAgrupaFat(0); - cli.getServicosCliente().setAnoMesPrimeiraCobranca(""); - cli.getServicosCliente().setAnoMesReajuste(""); - cli.getServicosCliente().setAquisicao(Calendar.getInstance()); - cli.getServicosCliente().setCliente(""); - cli.getServicosCliente().setComissaoServicosCliente(new TComissaoServicosCliente()); - cli.getServicosCliente().setComplementoDescricaoNota(""); - cli.getServicosCliente().setContrato(""); - cli.getServicosCliente().setCRD_Codigo(""); - cli.getServicosCliente().setCRS_Codigo(""); - cli.getServicosCliente().setDescPrevisto(0); - cli.getServicosCliente().setDescricaoNota(""); - cli.getServicosCliente().setDtCancelamento(Calendar.getInstance()); - cli.getServicosCliente().setEstabelecimento(""); - cli.getServicosCliente().setGrupoDeHoras(0); - cli.getServicosCliente().setIDWS(""); - cli.getServicosCliente().setIndexador(""); - cli.getServicosCliente().setMCS_Codigo(""); - cli.getServicosCliente().setModalidade(""); - cli.getServicosCliente().setNrLicencas(0); - cli.getServicosCliente().setObsCancelamento(""); - cli.getServicosCliente().setObservacao(""); - cli.getServicosCliente().setQtdIndexador(0); - cli.getServicosCliente().setSequencial(0); - cli.getServicosCliente().setServico(""); - cli.getServicosCliente().setStISS(""); - cli.getServicosCliente().setTamanhoEmpresa(0); - cli.getServicosCliente().setValorMaximoFortesDoc(0); - cli.getServicosCliente().setVencimento(0); - cli.getServicosCliente().setVRP_Codigo(""); - try { - -// StringWriter sw = new StringWriter(); -// JAXBContext jaxbContext = JAXBContext.newInstance(TCliente.class); -// Marshaller jaxbMarshaller = jaxbContext.createMarshaller(); -// jaxbMarshaller.marshal(cli, sw); -// String xmlString = sw.toString(); -// System.out.println(xmlString); - - String retornoAG = iag.incluiCliente(cli); - entidad.setIndIntegradoAG(true); - log.debug(retornoAG); - } catch (RemoteException e) { - entidad.setIndIntegradoAG(false); - entidad.setMotivoNaoIntegradoAG(e.getMessage()); - } - } - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - - private Connection getConnection() { - return DataSourceUtils.getConnection(dataSource); - } - - @Transactional(noRollbackFor = { IntegracionException.class, ValidacionCampoException.class}) - public PuntoVenta actualizacion(PuntoVenta entidad) throws IntegracionException, ValidacionCampoException { - - PuntoVenta originalClone = null; - try { - originalClone = entidad.getCloneObject(); - if(entidad.getTitularId()!=null && originalClone != null) { - originalClone.setTitularId(entidad.getTitularId().getCloneObject()); - } - } catch (Exception e) { - log.error("Erro ao clonar TitularId",e); - } - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - Exception respEx = null; - Constante constDesativaTotvs = constanteService.buscarPorNomeConstante("WS_TOTVS_DESATIVA_INTEGRACAO"); - Boolean desativaTotvs = constDesativaTotvs != null && constDesativaTotvs.getValorconstante().equals("1"); - - // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. - // integração AG - /* - * Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); if ( entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { log.debug("iniciando integração com AG"); integraAG(entidad); log.debug("fim da integração com AG"); } - */ - - // integração Totvs - if (!desativaTotvs){ - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { - - try { - if (entidad.getIndIntegracion() == null || (entidad.getIndIntegracion().equals(TipoRetorno.PENDENTE.getValor()) - || entidad.getIndIntegracion().equals(TipoRetorno.ERRO.getValor()))) { - String resp = integracionTotvs(entidad); - - TipoRetorno retornoTotvs = RetornoTotvs.validaRetornoTotvs(resp); - - switch (retornoTotvs) { - case CONCLUIDA: - entidad.setIndIntegracion(TipoRetorno.CONCLUIDA.getValor()); - break; - - case JA_CADASTRADA: - entidad.setIndIntegracion(TipoRetorno.JA_CADASTRADA.getValor()); - respEx = new IntegracionException(Atributos.MSG_ERRO_JA_CADASTRADO); - break; - - case ERRO: - entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); - respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + resp); - break; - - default: - break; - } - } else { - respEx = new IntegracionException(Atributos.MSG_ERRO_NAO_ENVIO); - } - } catch (ValidacionCampoException e) { - entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); - respEx = e; - - } catch (Exception e) { - entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); - log.error(Atributos.MSG_ERRO_GENERICA, e); - respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + e.getMessage()); - } - } - } - - entidad = puntoVentaDAO.actualizacion(entidad); - logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - if (respEx != null) { - if (respEx instanceof IntegracionException) { - throw (IntegracionException) respEx; - } else if (respEx instanceof ValidacionCampoException) { - throw (ValidacionCampoException) respEx; - } - } - - // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. - // integração AG - Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); - if (entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { - log.debug("iniciando integração com AG"); - integraAG(entidad); - log.debug("fim da integração com AG"); - } - - return entidad; - } - - private boolean tienesEstacionEnPuntoVta(PuntoVenta entidad) { - List lsEstaciones = estacionService.buscarEstaciones(entidad); - if (lsEstaciones != null && lsEstaciones.size() > 0) { - return true; - } - return false; - } - - @Transactional - public void borrar(PuntoVenta entidad) throws BusinessException { - - if (tienesEstacionEnPuntoVta(entidad)) { - throw new BusinessException("editarPuntoVentaController.MSG.estacionVinculadaAgenciaOnDelete"); - } - - for (FormaPagoDet forma : entidad.getLsFormaPagoDet()) { - forma.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - forma.setFecmodif(Calendar.getInstance().getTime()); - forma.setActivo(Boolean.FALSE); - } - - if (entidad.getAgenciaId() != null) { - - entidad.getAgenciaId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.getAgenciaId().setFecmodif(Calendar.getInstance().getTime()); - entidad.getAgenciaId().setActivo(Boolean.FALSE); - - } - - if (entidad.getComissaoId() != null) { - entidad.getComissaoId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.getComissaoId().setFecmodif(Calendar.getInstance().getTime()); - entidad.getComissaoId().setActivo(Boolean.FALSE); - } - - if (entidad.getDiversosId() != null) { - entidad.getDiversosId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.getDiversosId().setFecmodif(Calendar.getInstance().getTime()); - entidad.getDiversosId().setActivo(Boolean.FALSE); - } - - if (entidad.getTitularId() != null) { - entidad.getTitularId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.getTitularId().setFecmodif(Calendar.getInstance().getTime()); - entidad.getTitularId().setActivo(Boolean.FALSE); - } - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - puntoVentaDAO.actualizacion(entidad); - - logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); - - } - - public List buscaLike(String strEstacion, boolean sinTodos) { - return puntoVentaDAO.buscaLike(strEstacion, sinTodos); - } - - public List buscar(String nomPuntoVenta, String numPuntoVenta) { - return puntoVentaDAO.busca(nomPuntoVenta, numPuntoVenta); - } - - public List buscaPuntoVenta(String numPuntoVenta) { - return puntoVentaDAO.buscaPuntoVenta(numPuntoVenta); - } - - public List buscaPuntoVentaParada(Parada paradaId) { - return puntoVentaDAO.buscaPuntoVentaParada(paradaId); - } - - public List buscarPuntoVentaSubordinados(PuntoVenta puntoVenta) { - List lsPuntoVentaSubordinados = puntoVentaDAO.buscarPuntoVentaSubordinados(puntoVenta); - - return lsPuntoVentaSubordinados; - } - - public List buscarPuntosVentaMovimentacionBilhetes(List empresas) { - List puntosVenta = puntoVentaDAO.buscarPuntosVentaMovimentacionBilhetes(empresas); - return puntosVenta; - } - - public List buscarPuntosVentaPorUsuario(Usuario usuario) { - List puntosVenta = usuarioUbicacionDAO.buscarPuntoVentaPorUsuario(usuario); - return puntosVenta; - } - - private void validaCampos(PuntoVenta puntoVenta) throws ValidacionCampoException { - - if (puntoVenta.getNumDoCPuntoVenta() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.numDoCPuntoVenta"); - } - - String cpfOrCnpj = puntoVenta.getNumDoCPuntoVenta().replaceAll("[^0-9.]", ""); - - if (!CpfCnpj.isValid(cpfOrCnpj)) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.cpfCnpj"); - } - - if (puntoVenta.getNumIEPuntoVenta() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.numIEPuntoVenta"); - } - - if (puntoVenta.getColonia() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.colonia"); - } - - if (puntoVenta.getCodpostal() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.cep"); - } - - if (puntoVenta.getDireccioncalle() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.calle"); - } - - if (puntoVenta.getAgenciaId() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.agenciaId"); - } else { - - if (puntoVenta.getAgenciaId().getNumagencia() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.numagencia"); - } - if (puntoVenta.getAgenciaId().getNumconta() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.numconta"); - } - if (puntoVenta.getAgenciaId().getDigito() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.digito"); - } - - if (puntoVenta.getAgenciaId().getInstiFinanceiraId() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.instiFinanceiraId"); - } else { - if (puntoVenta.getAgenciaId().getInstiFinanceiraId().getCodigo() == null) { - throw new ValidacionCampoException("editarPuntoVentaController.erro.instiFinanceiraId.codigo"); - } - } - } - } - - private String integracionTotvs(PuntoVenta puntoVenta) throws Exception { - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { - - validaCampos(puntoVenta); - - String endpointFornecedor = getEndpointFornecedor(); - String endpointCliente = getEndpointCliente(); - - String xidsvp = puntoVenta.getNumPuntoVenta(); - - String cnpjEmpresaProtheus = Atributos.CNPJ_EMPRESA_PROTHEUS; - - String nome = puntoVenta.getNombpuntoventa(); - nome = removerAcentosCaracteresEspeciaisTotvs(nome); - - String cgc = puntoVenta.getNumDoCPuntoVenta(); - - String endereco = puntoVenta.getDireccioncalle() + "," + ((puntoVenta.getDireccionnumero() == null) ? "" : puntoVenta.getDireccionnumero()); - endereco = removerAcentosCaracteresEspeciaisTotvs(endereco); - - String complemen = puntoVenta.getCompl() == null ? "" : puntoVenta.getCompl(); - complemen = removerAcentosCaracteresEspeciaisTotvs(complemen); - - String bairro = puntoVenta.getColonia() == null ? null : puntoVenta.getColonia().getDesccolonia(); - bairro = removerAcentosCaracteresEspeciaisTotvs(bairro); - - String codmun = puntoVenta.getColonia() == null ? null : puntoVenta.getColonia().getCiudad().getCodmunicipio().toString(); - codmun = (codmun == null) ? "" : StringUtils.leftPad(codmun, 5, '0'); - - String est = puntoVenta.getColonia() == null ? null : puntoVenta.getColonia().getCiudad().getEstado().getCveestado(); - String codpais = CodPaisBanco.BRASIL.getValor(); - - String cep = puntoVenta.getCodpostal() != null ? puntoVenta.getCodpostal().toString() : null; - - String tel = puntoVenta.getNumtelefonouno(); - String ddd = null; - try { - String[] telefone = tel == null ? null : tel.split("\\)"); - ddd = tel == null ? null : telefone[0].replaceAll("\\(", ""); - tel = tel == null ? null : telefone[1].replaceAll("\\(", ""); - } catch (Exception e) { - tel = puntoVenta.getNumtelefonouno(); - } - - String email = puntoVenta.getDescCorreo() == null ? "" : puntoVenta.getDescCorreo(); - email = removerCaracteresInvalidosXml(email); - - String fax = puntoVenta.getNumfax() == null ? "" : puntoVenta.getNumfax(); - String inscr = puntoVenta.getNumIEPuntoVenta(); - String inscrm = InscricaoMunicipal.ISENTO.name(); - - String nreduz = puntoVenta.getRazonSocial() != null ? puntoVenta.getRazonSocial() : puntoVenta.getNombpuntoventa(); - nreduz = removerAcentosCaracteresEspeciaisTotvs(nreduz); - - String simpnac = ContribuinteSimplesNacional.NAO.getValor(); - - String tppessoa = TipoFornecedor.OS.name(); - String tppessoaCliente = TipoCliente.F.name(); - - String tipoPessoa = TipoPessoa.F.name(); - - if (isCNPJ(cgc)) { - tipoPessoa = TipoPessoa.J.name(); - } - - String obs = StringUtils.isBlank(puntoVenta.getComentarios()) ? "sem obs." : puntoVenta.getComentarios(); - - String contaFornecedor = Atributos.CONTA_FORNECEDOR_PROTHEUS; - String contaCliente = Atributos.CONTA_CLIENTE_PROTHEUS; - - String naturez = ""; - String cnae = ""; - String fator = ""; - - String agencia = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getNumagencia(); - String dgverag = ""; - try { - String[] agenciaComp = agencia == null ? null : agencia.split("-"); - agencia = agencia == null ? null : agenciaComp[0]; - dgverag = agencia == null ? null : agenciaComp[1]; - } catch (Exception e) { - agencia = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getNumagencia(); - } - - String banco = puntoVenta.getAgenciaId().getInstiFinanceiraId() == null ? "" : puntoVenta.getAgenciaId().getInstiFinanceiraId().getCodigo(); - String ctacorr = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getNumconta(); - String dgverct = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getDigito(); - - String resp = null; - Exception respEx = null; - - try { - resp = TotvsService.cadastrarFornecedor(endpointFornecedor, bairro, cep, cgc, cnae, codmun, codpais, complemen, contaFornecedor, ddd, email, endereco, - est, inscr, inscrm, naturez, nreduz, nome, simpnac, tel, tipoPessoa, tppessoa, cnpjEmpresaProtheus, xidsvp, agencia, banco, - dgverag, ctacorr, dgverct); - } catch (Exception e) { - log.error("", e); - respEx = e; - } - - String contrib = ContribuinteICMS.NAO.getValor(); - String entid = TipoEntidade.TRANSPORTE_PASSAGEIRO.getValor(); - String pais = "";// segundo orientação da TOTVS, passar em branco - - try { - resp = TotvsService.cadastrarCliente(endpointCliente, bairro, cep, cgc, codmun, codpais, complemen, contaCliente, contrib, ddd, email, cnpjEmpresaProtheus, - endereco, entid, fator, fax, inscr, inscrm, naturez, nreduz, nome, obs, pais, tppessoaCliente, tel, tipoPessoa, est, xidsvp); - } catch (Exception e) { - log.error("", e); - respEx = e; - } - - if (respEx != null) { - throw respEx; - } - - return resp; - } - return null; - } - - private String getEndpointFornecedor() { - Constante constante = constanteService.buscarPorNomeConstante("WS_TOTVS_FORNECEDOR_ENDPOINT"); - if (constante == null) { - return ""; - } - return constante.getValorconstante(); - } - - private String getEndpointCliente() { - Constante constante = constanteService.buscarPorNomeConstante("WS_TOTVS_CLIENTE_ENDPOINT"); - if (constante == null) { - return ""; - } - return constante.getValorconstante(); - } - - private String somenteNumeros(String s) { - if (s == null || StringUtils.isBlank(s)) { - return ""; - } - - s = StringUtils.trim(s); - - return s.replaceAll("[^0-9]", ""); - } - - private boolean isCNPJ(String vlr) { - vlr = somenteNumeros(vlr); - return vlr.length() > 11; - } - - /** - * From xml spec valid chars:
- * #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
- * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
- * - * link artigo:http://stackoverflow.com/questions/9710185/how-to-deal-with-invalid-characters-in-a-ws-output-when-using-cxf - * - * @param text - * The String to clean - * @param replacement - * The string to be substituted for each match - * @return The resulting String - */ - private String removerCaracteresInvalidosXml(String s) { - if (s == null) { - return s; - } - - String re = "[^\\x09\\x0A\\x0D\\x20-\\xD7FF\\xE000-\\xFFFD\\x10000-x10FFFF]"; - return s.replaceAll(re, ""); - } - - private String removerAcentosCaracteresEspeciaisTotvs(String s) { - if (StringUtils.isBlank(s)) { - return s; - } - s = StringUtils.trim(s); - s = removerCaracteresInvalidosXml(s); - return Normalizer.normalize(s, Normalizer.Form.NFD).replaceAll("[^\\p{ASCII}]", "").replaceAll("\\W", " "); - } - - @Override - public List buscaPuntoVentaEmpresaSemECF(Empresa empresa) { - return puntoVentaDAO.buscaPuntoVentaEmpresaSemECF(empresa); - } - - @Override - public List buscarPuntoVentaPtoVtaComissao(List empresas) { - List empresasId = new ArrayList(); - if(empresas != null) { - for (Empresa empresa : empresas) { - empresasId.add(empresa.getEmpresaId()); - } - } - if(!empresasId.isEmpty()) { - return puntoVentaDAO.buscarPuntoVentaPtoVtaComissao(empresasId); - } - - return null; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.net.URL; +import java.rmi.RemoteException; +import java.sql.Connection; +import java.sql.SQLException; +import java.text.Normalizer; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import javax.sql.DataSource; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.brazilutils.br.cpfcnpj.CpfCnpj; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.datasource.DataSourceUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.tempuri.IAG; +import org.tempuri.IAGservice; +import org.tempuri.IAGserviceLocator; + +import com.rjconsultores.ventaboletos.dao.PuntoVentaDAO; +import com.rjconsultores.ventaboletos.dao.UsuarioUbicacionDAO; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVentaVO; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.IntegracionException; +import com.rjconsultores.ventaboletos.exception.ValidacionCampoException; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.service.EstacionService; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.service.PuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ws.totvs.service.TotvsService; +import com.rjconsultores.ws.utileria.Atributos; +import com.rjconsultores.ws.utileria.Atributos.CodPaisBanco; +import com.rjconsultores.ws.utileria.Atributos.ContribuinteICMS; +import com.rjconsultores.ws.utileria.Atributos.ContribuinteSimplesNacional; +import com.rjconsultores.ws.utileria.Atributos.InscricaoMunicipal; +import com.rjconsultores.ws.utileria.Atributos.TipoCliente; +import com.rjconsultores.ws.utileria.Atributos.TipoEntidade; +import com.rjconsultores.ws.utileria.Atributos.TipoFornecedor; +import com.rjconsultores.ws.utileria.Atributos.TipoPessoa; +import com.rjconsultores.ws.utileria.RetornoTotvs; +import com.rjconsultores.ws.utileria.RetornoTotvs.TipoRetorno; +import com.rjconsultores.wsag.Constantes; +import com.rjconsultores.wsag.dao.DaoAG; + +import AGIntf.TCliente; +import AGIntf.TComissaoServicosCliente; +import AGIntf.TFornecedor; +import AGIntf.TServicosCliente; + +/** + * + * @author Administrador + */ +@Service("puntoVentaService") +public class PuntoVentaServiceImpl implements PuntoVentaService { + + private static Logger log = LogManager.getLogger("com.rjconsultores.ws"); + + @Autowired + private PuntoVentaDAO puntoVentaDAO; + @Autowired + private ConstanteService constanteService; + @Autowired + private EstacionService estacionService; + @Autowired + private UsuarioUbicacionDAO usuarioUbicacionDAO; + @Autowired + private DataSource dataSource; + @Autowired + private LogAuditoriaService logAuditoriaService; + + // FIXME : Remover esse método de quem está usando. Esse método carrega muitos dados + @Deprecated + public List obtenerTodos() { + return puntoVentaDAO.obtenerTodos(); + } + + public PuntoVenta obtenerID(Integer id) { + + PuntoVenta puntoVenta = puntoVentaDAO.obtenerID(id); + + try { + puntoVenta.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return puntoVenta; + } + + @Transactional(noRollbackFor = { IntegracionException.class, ValidacionCampoException.class}) + public PuntoVenta suscribir(PuntoVenta entidad) throws IntegracionException, ValidacionCampoException { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + Exception respEx = null; + Constante constDesativaTotvs = constanteService.buscarPorNomeConstante("WS_TOTVS_DESATIVA_INTEGRACAO"); + Boolean desativaTotvs = constDesativaTotvs != null && constDesativaTotvs.getValorconstante().equals("1"); + + // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. + // integração AG + /* + * Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); if (entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { log.debug("iniciando integração com AG"); integraAG(entidad); log.debug("fim da integração com AG"); } + */ + + // integração Totvs + if (!desativaTotvs){ + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { + try { + + if (entidad.getIndIntegracion() == null || (entidad.getIndIntegracion().equals(TipoRetorno.PENDENTE.getValor()) + || entidad.getIndIntegracion().equals(TipoRetorno.ERRO.getValor()))) { + String resp = integracionTotvs(entidad); + + TipoRetorno retornoTotvs = RetornoTotvs.validaRetornoTotvs(resp); + + switch (retornoTotvs) { + case CONCLUIDA: + entidad.setIndIntegracion(TipoRetorno.CONCLUIDA.getValor()); + break; + + case JA_CADASTRADA: + entidad.setIndIntegracion(TipoRetorno.JA_CADASTRADA.getValor()); + respEx = new IntegracionException(Atributos.MSG_ERRO_JA_CADASTRADO); + break; + + case ERRO: + entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); + respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + resp); + break; + + default: + break; + } + } else { + respEx = new IntegracionException(Atributos.MSG_ERRO_NAO_ENVIO); + } + } catch (ValidacionCampoException ev) { + entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); + respEx = ev; + + } catch (Exception e) { + entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); + log.error(Atributos.MSG_ERRO_GENERICA, e); + respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + e.getMessage()); + } + + } + } + if (respEx != null) { + if (respEx instanceof ValidacionCampoException) { + throw (ValidacionCampoException) respEx; + } else if (respEx instanceof IntegracionException) { + entidad = puntoVentaDAO.suscribir(entidad); + throw (IntegracionException) respEx; + } + } + entidad = puntoVentaDAO.suscribir(entidad); + logAuditoriaService.auditar(null, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + + // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. + // integração AG + Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); + if (entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { + log.debug("iniciando integração com AG"); + integraAG(entidad); + log.debug("fim da integração com AG"); + } + + return entidad; + } + + + private void integraAG(PuntoVenta entidad) throws IntegracionException{ + Connection connection = null; + try { + String motivoNaoIntegrado = ""; + + connection = getConnection(); + DaoAG.getInstance().setDBConnection(connection); + + integrarClienteAG(entidad); + if (!entidad.getIndIntegradoAG()){ + motivoNaoIntegrado += "Cliente: " + entidad.getMotivoNaoIntegradoAG(); + } + integrarFornecedorAG(entidad); + if (!entidad.getIndIntegradoAG()){ + motivoNaoIntegrado += "\nFornecedor: " + entidad.getMotivoNaoIntegradoAG(); + + } + if (!motivoNaoIntegrado.isEmpty()){ + throw new IntegracionException(motivoNaoIntegrado); + } + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + log.error("error fechar conexão", e); + throw new RuntimeException(e); + } + } + } + + private void integrarFornecedorAG(PuntoVenta entidad) { + try { + IAGservice service = new IAGserviceLocator(); + IAG iag = DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG) == null ? null : service.getIAGPort(new URL(DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG))); + TFornecedor fornecedor = null; + String strFornecedor = ""; + try{ + strFornecedor = iag.getCodigoFornecedorWithIDWS(entidad.getNumPuntoVenta().toString()); + log.debug("Retorno consulta fornecedor ws: " + strFornecedor); + } catch (RemoteException e) { + log.error(e.toString()); + entidad.setIndIntegradoAG(false); + entidad.setMotivoNaoIntegradoAG("Erro ao conectar com o WS: " + e.toString()); + return; + } + if (!strFornecedor.contains("ERRO")){ + // retornar msg a informação de registro já cadastrado + entidad.setIndIntegradoAG(false); + entidad.setMotivoNaoIntegradoAG("Fornecedor já cadastrado"); + } else { + fornecedor = new TFornecedor(); + fornecedor.setNome(entidad.getRazonSocial()); + fornecedor.setNomeFantasia(entidad.getNombpuntoventa()); + fornecedor.setCNPJCPF(entidad.getNumDoCPuntoVenta()); + fornecedor.setGrupo(""); + fornecedor.setReceita(""); + fornecedor.setCodigo(""); + fornecedor.setCEP(entidad.getCep()); + fornecedor.setLogradouro(""+entidad.getLogradouro()); + fornecedor.setBairro(entidad.getBairro()); + fornecedor.setNumero(""+entidad.getNumero()); + fornecedor.setComplemento(""+entidad.getComplemento()); + fornecedor.setUF(entidad.getUF()); + fornecedor.setCidade(entidad.getCidade()); + fornecedor.setDDD(""); + fornecedor.setFone(""); + fornecedor.setFax(""); + fornecedor.setEmail(""); + fornecedor.setContato(""); + fornecedor.setSite(""); + fornecedor.setRG(""); + fornecedor.setIE(""); + fornecedor.setIM(""); + fornecedor.setReferencia(""); + fornecedor.setFinalidadeTED(""); + fornecedor.setFinalidadeDOC(""); + fornecedor.setCelular(""); + fornecedor.setLeiaute(""); + fornecedor.setBanco(""); + fornecedor.setBancoNumero(""); + fornecedor.setAgencia(""); + fornecedor.setCC(""); + fornecedor.setDVAg(""); + fornecedor.setDVCC(""); + fornecedor.setIDWS(entidad.getNumPuntoVenta()); + try{ + String retornoAG = iag.incluiFornecedor(fornecedor); + entidad.setIndIntegradoAG(true); + log.debug(retornoAG); + } catch (RemoteException e) { + entidad.setIndIntegradoAG(false); + entidad.setMotivoNaoIntegradoAG(e.getMessage()); + } + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + private void integrarClienteAG(PuntoVenta entidad) { + + try { + + IAGservice service = new IAGserviceLocator(); + IAG iag = DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG) == null ? null : service.getIAGPort(new URL(DaoAG.getInstance().obterConstante(Constantes.URL_WS_AG))); + TCliente cli = null; + String cliStr = ""; + try { + cliStr = iag.getClienteWithIDWS(entidad.getNumPuntoVenta().toString()); + log.debug("Retorno consulta cliente ws: " + cliStr); + } catch (RemoteException e) { + log.error(e.toString()); + entidad.setIndIntegradoAG(false); + entidad.setMotivoNaoIntegradoAG("Erro ao conectar com o WS: " + e.toString()); + return; + } + if (!cliStr.contains("ERRO")) { + // retornar msg a informação de registro já cadastrado + entidad.setIndIntegradoAG(false); + entidad.setMotivoNaoIntegradoAG("Cliente já cadastrado"); + } else { + cli = new TCliente(); + cli.setCodigo(""); + cli.setNome(entidad.getRazonSocial()); + cli.setNomeFantasia(entidad.getNombpuntoventa()); + cli.setCnpjcpf(entidad.getNumDoCPuntoVenta()); + cli.setGrupo(""); + cli.setAgenteCobrador(""); + cli.setVencimento(0); + cli.setContaContabil(""); + cli.setCep(entidad.getCep()); + cli.setLogradouro("" + entidad.getLogradouro()); + cli.setBairro(entidad.getBairro()); + cli.setNumero("" + entidad.getNumero()); + cli.setComplemento("" + entidad.getComplemento()); + cli.setUf(entidad.getUF()); + cli.setCidade(entidad.getCidade()); + cli.setDdd(""); + cli.setFone(""); + cli.setDddFax(""); + cli.setFax(""); + cli.setIdentificador(""); + cli.setDddCelular(""); + cli.setCelular(""); + cli.setEmail(""); + cli.setContato(""); + cli.setSite(""); + cli.setRg(""); + cli.setIe(""); + cli.setReceita(""); + cli.setRepresentante(""); + cli.setIM(""); + cli.setCampoExtra1(""); + cli.setCampoExtra10(""); + cli.setCampoExtra2(""); + cli.setCampoExtra3(""); + cli.setCampoExtra4(""); + cli.setCampoExtra5(""); + cli.setCampoExtra6(""); + cli.setCampoExtra7(""); + cli.setCampoExtra8(""); + cli.setCampoExtra9(""); + cli.setCliPagador(""); + cli.setIDWS(entidad.getNumPuntoVenta()); + cli.setServicosCliente(new TServicosCliente()); + cli.getServicosCliente().setServico(""); + cli.getServicosCliente().setEstabelecimento(""); + cli.getServicosCliente().setModalidade(""); + cli.getServicosCliente().setIndexador(""); + cli.getServicosCliente().setAnoMesPrimeiraCobranca(""); + cli.getServicosCliente().setAquisicao(Calendar.getInstance()); + cli.getServicosCliente().setAnoMesReajuste(""); + cli.getServicosCliente().setObservacao(""); + cli.getServicosCliente().setDescricaoNota(""); + cli.getServicosCliente().setComplementoDescricaoNota(""); + cli.getServicosCliente().setContrato(""); + cli.getServicosCliente().setDtCancelamento(Calendar.getInstance()); + cli.getServicosCliente().setObsCancelamento(""); + cli.getServicosCliente().setCRS_Codigo(""); + cli.getServicosCliente().setIDWS(entidad.getNumPuntoVenta()); + + cli.getServicosCliente().setAcessoSimultaneo(0); + cli.getServicosCliente().setAgrupaFat(0); + cli.getServicosCliente().setAnoMesPrimeiraCobranca(""); + cli.getServicosCliente().setAnoMesReajuste(""); + cli.getServicosCliente().setAquisicao(Calendar.getInstance()); + cli.getServicosCliente().setCliente(""); + cli.getServicosCliente().setComissaoServicosCliente(new TComissaoServicosCliente()); + cli.getServicosCliente().setComplementoDescricaoNota(""); + cli.getServicosCliente().setContrato(""); + cli.getServicosCliente().setCRD_Codigo(""); + cli.getServicosCliente().setCRS_Codigo(""); + cli.getServicosCliente().setDescPrevisto(0); + cli.getServicosCliente().setDescricaoNota(""); + cli.getServicosCliente().setDtCancelamento(Calendar.getInstance()); + cli.getServicosCliente().setEstabelecimento(""); + cli.getServicosCliente().setGrupoDeHoras(0); + cli.getServicosCliente().setIDWS(""); + cli.getServicosCliente().setIndexador(""); + cli.getServicosCliente().setMCS_Codigo(""); + cli.getServicosCliente().setModalidade(""); + cli.getServicosCliente().setNrLicencas(0); + cli.getServicosCliente().setObsCancelamento(""); + cli.getServicosCliente().setObservacao(""); + cli.getServicosCliente().setQtdIndexador(0); + cli.getServicosCliente().setSequencial(0); + cli.getServicosCliente().setServico(""); + cli.getServicosCliente().setStISS(""); + cli.getServicosCliente().setTamanhoEmpresa(0); + cli.getServicosCliente().setValorMaximoFortesDoc(0); + cli.getServicosCliente().setVencimento(0); + cli.getServicosCliente().setVRP_Codigo(""); + try { + +// StringWriter sw = new StringWriter(); +// JAXBContext jaxbContext = JAXBContext.newInstance(TCliente.class); +// Marshaller jaxbMarshaller = jaxbContext.createMarshaller(); +// jaxbMarshaller.marshal(cli, sw); +// String xmlString = sw.toString(); +// System.out.println(xmlString); + + String retornoAG = iag.incluiCliente(cli); + entidad.setIndIntegradoAG(true); + log.debug(retornoAG); + } catch (RemoteException e) { + entidad.setIndIntegradoAG(false); + entidad.setMotivoNaoIntegradoAG(e.getMessage()); + } + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + private Connection getConnection() { + return DataSourceUtils.getConnection(dataSource); + } + + @Transactional(noRollbackFor = { IntegracionException.class, ValidacionCampoException.class}) + public PuntoVenta actualizacion(PuntoVenta entidad) throws IntegracionException, ValidacionCampoException { + + PuntoVenta originalClone = null; + try { + originalClone = entidad.getCloneObject(); + if(entidad.getTitularId()!=null && originalClone != null) { + originalClone.setTitularId(entidad.getTitularId().getCloneObject()); + } + } catch (Exception e) { + log.error("Erro ao clonar TitularId",e); + } + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + Exception respEx = null; + Constante constDesativaTotvs = constanteService.buscarPorNomeConstante("WS_TOTVS_DESATIVA_INTEGRACAO"); + Boolean desativaTotvs = constDesativaTotvs != null && constDesativaTotvs.getValorconstante().equals("1"); + + // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. + // integração AG + /* + * Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); if ( entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { log.debug("iniciando integração com AG"); integraAG(entidad); log.debug("fim da integração com AG"); } + */ + + // integração Totvs + if (!desativaTotvs){ + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { + + try { + if (entidad.getIndIntegracion() == null || (entidad.getIndIntegracion().equals(TipoRetorno.PENDENTE.getValor()) + || entidad.getIndIntegracion().equals(TipoRetorno.ERRO.getValor()))) { + String resp = integracionTotvs(entidad); + + TipoRetorno retornoTotvs = RetornoTotvs.validaRetornoTotvs(resp); + + switch (retornoTotvs) { + case CONCLUIDA: + entidad.setIndIntegracion(TipoRetorno.CONCLUIDA.getValor()); + break; + + case JA_CADASTRADA: + entidad.setIndIntegracion(TipoRetorno.JA_CADASTRADA.getValor()); + respEx = new IntegracionException(Atributos.MSG_ERRO_JA_CADASTRADO); + break; + + case ERRO: + entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); + respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + resp); + break; + + default: + break; + } + } else { + respEx = new IntegracionException(Atributos.MSG_ERRO_NAO_ENVIO); + } + } catch (ValidacionCampoException e) { + entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); + respEx = e; + + } catch (Exception e) { + entidad.setIndIntegracion(TipoRetorno.ERRO.getValor()); + log.error(Atributos.MSG_ERRO_GENERICA, e); + respEx = new IntegracionException(Atributos.MSG_ERRO_GENERICA + e.getMessage()); + } + } + } + + entidad = puntoVentaDAO.actualizacion(entidad); + logAuditoriaService.auditar(originalClone, entidad, entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + if (respEx != null) { + if (respEx instanceof IntegracionException) { + throw (IntegracionException) respEx; + } else if (respEx instanceof ValidacionCampoException) { + throw (ValidacionCampoException) respEx; + } + } + + // Mantis 15739 - A integração AG deve ser acionada após a persistência dos dados com sucesso. + // integração AG + Constante empresasIntegraAG = constanteService.buscarPorNomeConstante("EMPRESAS_INTEGRACAO_AG"); + if (entidad.getStatusaprobacion().equals("A") && empresasIntegraAG != null && empresasIntegraAG.getValorconstante() != null && empresasIntegraAG.getValorconstante().contains(entidad.getEmpresa().getEmpresaId().toString())) { + log.debug("iniciando integração com AG"); + integraAG(entidad); + log.debug("fim da integração com AG"); + } + + return entidad; + } + + private boolean tienesEstacionEnPuntoVta(PuntoVenta entidad) { + List lsEstaciones = estacionService.buscarEstaciones(entidad); + if (lsEstaciones != null && lsEstaciones.size() > 0) { + return true; + } + return false; + } + + @Transactional + public void borrar(PuntoVenta entidad) throws BusinessException { + + if (tienesEstacionEnPuntoVta(entidad)) { + throw new BusinessException("editarPuntoVentaController.MSG.estacionVinculadaAgenciaOnDelete"); + } + + for (FormaPagoDet forma : entidad.getLsFormaPagoDet()) { + forma.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + forma.setFecmodif(Calendar.getInstance().getTime()); + forma.setActivo(Boolean.FALSE); + } + + if (entidad.getAgenciaId() != null) { + + entidad.getAgenciaId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.getAgenciaId().setFecmodif(Calendar.getInstance().getTime()); + entidad.getAgenciaId().setActivo(Boolean.FALSE); + + } + + if (entidad.getComissaoId() != null) { + entidad.getComissaoId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.getComissaoId().setFecmodif(Calendar.getInstance().getTime()); + entidad.getComissaoId().setActivo(Boolean.FALSE); + } + + if (entidad.getDiversosId() != null) { + entidad.getDiversosId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.getDiversosId().setFecmodif(Calendar.getInstance().getTime()); + entidad.getDiversosId().setActivo(Boolean.FALSE); + } + + if (entidad.getTitularId() != null) { + entidad.getTitularId().setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.getTitularId().setFecmodif(Calendar.getInstance().getTime()); + entidad.getTitularId().setActivo(Boolean.FALSE); + } + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + puntoVentaDAO.actualizacion(entidad); + + logAuditoriaService.auditarExclusao(entidad, entidad.getEmpresa() != null && entidad.getEmpresa() != null ? entidad.getEmpresa().getEmpresaId() : null); + + } + + public List buscaLike(String strEstacion, boolean sinTodos) { + return puntoVentaDAO.buscaLike(strEstacion, sinTodos); + } + + public List buscar(String nomPuntoVenta, String numPuntoVenta) { + return puntoVentaDAO.busca(nomPuntoVenta, numPuntoVenta); + } + + public List buscaPuntoVenta(String numPuntoVenta) { + return puntoVentaDAO.buscaPuntoVenta(numPuntoVenta); + } + + public List buscaPuntoVentaParada(Parada paradaId) { + return puntoVentaDAO.buscaPuntoVentaParada(paradaId); + } + + public List buscarPuntoVentaSubordinados(PuntoVenta puntoVenta) { + List lsPuntoVentaSubordinados = puntoVentaDAO.buscarPuntoVentaSubordinados(puntoVenta); + + return lsPuntoVentaSubordinados; + } + + public List buscarPuntosVentaMovimentacionBilhetes(List empresas) { + List puntosVenta = puntoVentaDAO.buscarPuntosVentaMovimentacionBilhetes(empresas); + return puntosVenta; + } + + public List buscarPuntosVentaPorUsuario(Usuario usuario) { + List puntosVenta = usuarioUbicacionDAO.buscarPuntoVentaPorUsuario(usuario); + return puntosVenta; + } + + private void validaCampos(PuntoVenta puntoVenta) throws ValidacionCampoException { + + if (puntoVenta.getNumDoCPuntoVenta() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.numDoCPuntoVenta"); + } + + String cpfOrCnpj = puntoVenta.getNumDoCPuntoVenta().replaceAll("[^0-9.]", ""); + + if (!CpfCnpj.isValid(cpfOrCnpj)) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.cpfCnpj"); + } + + if (puntoVenta.getNumIEPuntoVenta() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.numIEPuntoVenta"); + } + + if (puntoVenta.getColonia() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.colonia"); + } + + if (puntoVenta.getCodpostal() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.cep"); + } + + if (puntoVenta.getDireccioncalle() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.calle"); + } + + if (puntoVenta.getAgenciaId() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.agenciaId"); + } else { + + if (puntoVenta.getAgenciaId().getNumagencia() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.numagencia"); + } + if (puntoVenta.getAgenciaId().getNumconta() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.numconta"); + } + if (puntoVenta.getAgenciaId().getDigito() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.digito"); + } + + if (puntoVenta.getAgenciaId().getInstiFinanceiraId() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.instiFinanceiraId"); + } else { + if (puntoVenta.getAgenciaId().getInstiFinanceiraId().getCodigo() == null) { + throw new ValidacionCampoException("editarPuntoVentaController.erro.instiFinanceiraId.codigo"); + } + } + } + } + + private String integracionTotvs(PuntoVenta puntoVenta) throws Exception { + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { + + validaCampos(puntoVenta); + + String endpointFornecedor = getEndpointFornecedor(); + String endpointCliente = getEndpointCliente(); + + String xidsvp = puntoVenta.getNumPuntoVenta(); + + String cnpjEmpresaProtheus = Atributos.CNPJ_EMPRESA_PROTHEUS; + + String nome = puntoVenta.getNombpuntoventa(); + nome = removerAcentosCaracteresEspeciaisTotvs(nome); + + String cgc = puntoVenta.getNumDoCPuntoVenta(); + + String endereco = puntoVenta.getDireccioncalle() + "," + ((puntoVenta.getDireccionnumero() == null) ? "" : puntoVenta.getDireccionnumero()); + endereco = removerAcentosCaracteresEspeciaisTotvs(endereco); + + String complemen = puntoVenta.getCompl() == null ? "" : puntoVenta.getCompl(); + complemen = removerAcentosCaracteresEspeciaisTotvs(complemen); + + String bairro = puntoVenta.getColonia() == null ? null : puntoVenta.getColonia().getDesccolonia(); + bairro = removerAcentosCaracteresEspeciaisTotvs(bairro); + + String codmun = puntoVenta.getColonia() == null ? null : puntoVenta.getColonia().getCiudad().getCodmunicipio().toString(); + codmun = (codmun == null) ? "" : StringUtils.leftPad(codmun, 5, '0'); + + String est = puntoVenta.getColonia() == null ? null : puntoVenta.getColonia().getCiudad().getEstado().getCveestado(); + String codpais = CodPaisBanco.BRASIL.getValor(); + + String cep = puntoVenta.getCodpostal() != null ? puntoVenta.getCodpostal().toString() : null; + + String tel = puntoVenta.getNumtelefonouno(); + String ddd = null; + try { + String[] telefone = tel == null ? null : tel.split("\\)"); + ddd = tel == null ? null : telefone[0].replaceAll("\\(", ""); + tel = tel == null ? null : telefone[1].replaceAll("\\(", ""); + } catch (Exception e) { + tel = puntoVenta.getNumtelefonouno(); + } + + String email = puntoVenta.getDescCorreo() == null ? "" : puntoVenta.getDescCorreo(); + email = removerCaracteresInvalidosXml(email); + + String fax = puntoVenta.getNumfax() == null ? "" : puntoVenta.getNumfax(); + String inscr = puntoVenta.getNumIEPuntoVenta(); + String inscrm = InscricaoMunicipal.ISENTO.name(); + + String nreduz = puntoVenta.getRazonSocial() != null ? puntoVenta.getRazonSocial() : puntoVenta.getNombpuntoventa(); + nreduz = removerAcentosCaracteresEspeciaisTotvs(nreduz); + + String simpnac = ContribuinteSimplesNacional.NAO.getValor(); + + String tppessoa = TipoFornecedor.OS.name(); + String tppessoaCliente = TipoCliente.F.name(); + + String tipoPessoa = TipoPessoa.F.name(); + + if (isCNPJ(cgc)) { + tipoPessoa = TipoPessoa.J.name(); + } + + String obs = StringUtils.isBlank(puntoVenta.getComentarios()) ? "sem obs." : puntoVenta.getComentarios(); + + String contaFornecedor = Atributos.CONTA_FORNECEDOR_PROTHEUS; + String contaCliente = Atributos.CONTA_CLIENTE_PROTHEUS; + + String naturez = ""; + String cnae = ""; + String fator = ""; + + String agencia = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getNumagencia(); + String dgverag = ""; + try { + String[] agenciaComp = agencia == null ? null : agencia.split("-"); + agencia = agencia == null ? null : agenciaComp[0]; + dgverag = agencia == null ? null : agenciaComp[1]; + } catch (Exception e) { + agencia = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getNumagencia(); + } + + String banco = puntoVenta.getAgenciaId().getInstiFinanceiraId() == null ? "" : puntoVenta.getAgenciaId().getInstiFinanceiraId().getCodigo(); + String ctacorr = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getNumconta(); + String dgverct = puntoVenta.getAgenciaId() == null ? "" : puntoVenta.getAgenciaId().getDigito(); + + String resp = null; + Exception respEx = null; + + try { + resp = TotvsService.cadastrarFornecedor(endpointFornecedor, bairro, cep, cgc, cnae, codmun, codpais, complemen, contaFornecedor, ddd, email, endereco, + est, inscr, inscrm, naturez, nreduz, nome, simpnac, tel, tipoPessoa, tppessoa, cnpjEmpresaProtheus, xidsvp, agencia, banco, + dgverag, ctacorr, dgverct); + } catch (Exception e) { + log.error("", e); + respEx = e; + } + + String contrib = ContribuinteICMS.NAO.getValor(); + String entid = TipoEntidade.TRANSPORTE_PASSAGEIRO.getValor(); + String pais = "";// segundo orientação da TOTVS, passar em branco + + try { + resp = TotvsService.cadastrarCliente(endpointCliente, bairro, cep, cgc, codmun, codpais, complemen, contaCliente, contrib, ddd, email, cnpjEmpresaProtheus, + endereco, entid, fator, fax, inscr, inscrm, naturez, nreduz, nome, obs, pais, tppessoaCliente, tel, tipoPessoa, est, xidsvp); + } catch (Exception e) { + log.error("", e); + respEx = e; + } + + if (respEx != null) { + throw respEx; + } + + return resp; + } + return null; + } + + private String getEndpointFornecedor() { + Constante constante = constanteService.buscarPorNomeConstante("WS_TOTVS_FORNECEDOR_ENDPOINT"); + if (constante == null) { + return ""; + } + return constante.getValorconstante(); + } + + private String getEndpointCliente() { + Constante constante = constanteService.buscarPorNomeConstante("WS_TOTVS_CLIENTE_ENDPOINT"); + if (constante == null) { + return ""; + } + return constante.getValorconstante(); + } + + private String somenteNumeros(String s) { + if (s == null || StringUtils.isBlank(s)) { + return ""; + } + + s = StringUtils.trim(s); + + return s.replaceAll("[^0-9]", ""); + } + + private boolean isCNPJ(String vlr) { + vlr = somenteNumeros(vlr); + return vlr.length() > 11; + } + + /** + * From xml spec valid chars:
+ * #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+ * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
+ * + * link artigo:http://stackoverflow.com/questions/9710185/how-to-deal-with-invalid-characters-in-a-ws-output-when-using-cxf + * + * @param text + * The String to clean + * @param replacement + * The string to be substituted for each match + * @return The resulting String + */ + private String removerCaracteresInvalidosXml(String s) { + if (s == null) { + return s; + } + + String re = "[^\\x09\\x0A\\x0D\\x20-\\xD7FF\\xE000-\\xFFFD\\x10000-x10FFFF]"; + return s.replaceAll(re, ""); + } + + private String removerAcentosCaracteresEspeciaisTotvs(String s) { + if (StringUtils.isBlank(s)) { + return s; + } + s = StringUtils.trim(s); + s = removerCaracteresInvalidosXml(s); + return Normalizer.normalize(s, Normalizer.Form.NFD).replaceAll("[^\\p{ASCII}]", "").replaceAll("\\W", " "); + } + + @Override + public List buscaPuntoVentaEmpresaSemECF(Empresa empresa) { + return puntoVentaDAO.buscaPuntoVentaEmpresaSemECF(empresa); + } + + @Override + public List buscarPuntoVentaPtoVtaComissao(List empresas) { + List empresasId = new ArrayList(); + if(empresas != null) { + for (Empresa empresa : empresas) { + empresasId.add(empresa.getEmpresaId()); + } + } + if(!empresasId.isEmpty()) { + return puntoVentaDAO.buscarPuntoVentaPtoVtaComissao(empresasId); + } + + return null; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReceitaDespesaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReceitaDespesaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/ReceitaDespesaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReceitaDespesaServiceImpl.java index 2a9c4dd2b..6320cbe1b 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ReceitaDespesaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReceitaDespesaServiceImpl.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import com.rjconsultores.ventaboletos.dao.ReceitaDespesaDAO; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; -import com.rjconsultores.ventaboletos.service.ReceitaDespesaService; - -@Repository("receitaDespesaService") -public class ReceitaDespesaServiceImpl implements ReceitaDespesaService { - - @Autowired - ReceitaDespesaDAO receitaDespesaoDAO; - - @Override - public List getRelatorioDetalhado(Map parametros) throws BusinessException { - return receitaDespesaoDAO.getRelatorioDetalhado(parametros); - } - - @Override - public List getRelatorioSintetico(Map parametros) throws BusinessException { - return receitaDespesaoDAO.getRelatorioSintetico(parametros); - } - - @Override - public List getRelatorioAgencia(Map parametros) throws BusinessException { - return receitaDespesaoDAO.getRelatorioAgencia(parametros); - } - - @Override - public List getRelatorioEvento(Map parametros) throws BusinessException { - return receitaDespesaoDAO.getRelatorioEvento(parametros); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.ReceitaDespesaDAO; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.relatorios.receitaDespesa.RelatorioFinanceiroReceitasDespesasBean; +import com.rjconsultores.ventaboletos.service.ReceitaDespesaService; + +@Repository("receitaDespesaService") +public class ReceitaDespesaServiceImpl implements ReceitaDespesaService { + + @Autowired + ReceitaDespesaDAO receitaDespesaoDAO; + + @Override + public List getRelatorioDetalhado(Map parametros) throws BusinessException { + return receitaDespesaoDAO.getRelatorioDetalhado(parametros); + } + + @Override + public List getRelatorioSintetico(Map parametros) throws BusinessException { + return receitaDespesaoDAO.getRelatorioSintetico(parametros); + } + + @Override + public List getRelatorioAgencia(Map parametros) throws BusinessException { + return receitaDespesaoDAO.getRelatorioAgencia(parametros); + } + + @Override + public List getRelatorioEvento(Map parametros) throws BusinessException { + return receitaDespesaoDAO.getRelatorioEvento(parametros); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RedondeoMarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RedondeoMarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RedondeoMarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RedondeoMarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RedondeoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RedondeoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RedondeoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RedondeoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RegionMetropolitanaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RegionMetropolitanaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/RegionMetropolitanaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RegionMetropolitanaServiceImpl.java index 68bf5c06b..3b37e70c3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RegionMetropolitanaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RegionMetropolitanaServiceImpl.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.RegionMetropolitanaDAO; -import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; -import com.rjconsultores.ventaboletos.service.RegionMetropolitanaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("regionMetropolitanaService") -public class RegionMetropolitanaServiceImpl implements RegionMetropolitanaService { - - @Autowired - private RegionMetropolitanaDAO regionMetropolitanaDAO; - - @Override - public List obtenerTodos() { - return regionMetropolitanaDAO.obtenerTodos(); - } - - @Override - public RegionMetropolitana obtenerID(Long id) { - return regionMetropolitanaDAO.obtenerID(id); - } - - @Transactional - public RegionMetropolitana suscribir(RegionMetropolitana entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return regionMetropolitanaDAO.suscribir(entidad); - } - - @Transactional - public RegionMetropolitana actualizacion(RegionMetropolitana entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return regionMetropolitanaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(RegionMetropolitana entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - regionMetropolitanaDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.RegionMetropolitanaDAO; +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; +import com.rjconsultores.ventaboletos.service.RegionMetropolitanaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("regionMetropolitanaService") +public class RegionMetropolitanaServiceImpl implements RegionMetropolitanaService { + + @Autowired + private RegionMetropolitanaDAO regionMetropolitanaDAO; + + @Override + public List obtenerTodos() { + return regionMetropolitanaDAO.obtenerTodos(); + } + + @Override + public RegionMetropolitana obtenerID(Long id) { + return regionMetropolitanaDAO.obtenerID(id); + } + + @Transactional + public RegionMetropolitana suscribir(RegionMetropolitana entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return regionMetropolitanaDAO.suscribir(entidad); + } + + @Transactional + public RegionMetropolitana actualizacion(RegionMetropolitana entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return regionMetropolitanaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(RegionMetropolitana entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + regionMetropolitanaDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RelatorioAgepanServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RelatorioAgepanServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/RelatorioAgepanServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RelatorioAgepanServiceImpl.java index 73efd0270..da3f7f5a8 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RelatorioAgepanServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RelatorioAgepanServiceImpl.java @@ -1,242 +1,242 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.EstadoDAO; -import com.rjconsultores.ventaboletos.dao.RelatorioAgepanDAO; -import com.rjconsultores.ventaboletos.enums.TipoDescontoBPe; -import com.rjconsultores.ventaboletos.enums.TipoIdentificacionDoc; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.RelatorioAgepanService; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.TimeZoneUtil; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; - -@Service("relatorioAgepanService") -public class RelatorioAgepanServiceImpl implements RelatorioAgepanService { - - @Autowired - RelatorioAgepanDAO relatorioAgepanDAO; - - @Autowired - EstadoDAO estadoDAO; - - @Override - public List listar(Map parametros) throws BusinessException { - return relatorioAgepanDAO.listar(parametros); - } - - @Override - public InputStream gerarArquivoGratuidadeAgepan(Map parametros) throws IOException, BusinessException { - InputStream arquivo = null; - - List retorno = listar(parametros); - - arquivo = gerarArquivo(retorno); - - return arquivo; - } - - private InputStream gerarArquivo(List retorno) throws IOException { - HSSFWorkbook wb = new HSSFWorkbook(); - - criarArquivoExcel(wb, retorno); - - String nomeArquivo = UsuarioLogado.getUsuarioLogado().getNombusuario() - + "_" + Calendar.getInstance().getTime().getTime() - + "_" + "arquivoAgepan"; - - File fNomeArquivo = File.createTempFile(nomeArquivo, ".tmp"); - - FileOutputStream stream = new FileOutputStream(fNomeArquivo); - stream.flush(); - wb.write(stream); - stream.close(); - - InputStream is = new FileInputStream(fNomeArquivo); - - return is; - } - - private void criarArquivoExcel(HSSFWorkbook wb, List dados) { - HSSFSheet sheet = wb.createSheet("dados"); - int contRow = 0; - String[] cabecalho1 = new String[] {"nBP","dhEmi","xLocOrig","xLocDest","dhEmb","xNome","CPF","tpDoc","nDoc","xDoc","tpViagem","tpServico","dhViagem","prefixo","poltrona","vBP","vDesconto","tpDesconto","xDesconto","qrCodBPe"}; - String[] cabecalho2 = new String[] {"[9]","[13]","[85]","[87]","[88]","[91]","[92]","[93]","[94]","[95]","[102]","[103]","[106]","[108]","[109]","[115]","[116]","[119]","[120]","[189]"}; - criarRow(contRow++, sheet, cabecalho1); - criarRow(contRow++, sheet, cabecalho2); - - for (RelatorioGratuidadeAgepanVO vo : dados) { - String[] vetVO = transformarVOToVetor(vo); - criarRow(contRow++, sheet, vetVO); - } - - for (int i = 0; i < cabecalho1.length; i++) { - sheet.autoSizeColumn(i); - } - } - - private String[] transformarVOToVetor(RelatorioGratuidadeAgepanVO vo) { - Map dadosTimezoneParada = estadoDAO.getConfiguracoesFusoVeraoParada(vo.getOrigenId(), vo.getFechorventa()); - Map dadosTimezonePuntoventa = estadoDAO.getConfiguracoesFusoVeraoPuntoventa(vo.getPuntoventaId(), vo.getFechorventa()); - - List retorno = new ArrayList(); - - //"nBP", - retorno.add(vo.getNumBpe()); - - //"dhEmi", - String dataEmissao = TimeZoneUtil.ajustarPuntoVentaEmissaoOrigemViagemTimeZone(dadosTimezoneParada, dadosTimezonePuntoventa, vo.getFechorventa()); - retorno.add(dataEmissao); - - //"xLocOrig", - retorno.add(vo.getOrigem()); - - //"xLocDest", - retorno.add(vo.getDestino()); - - //"dhEmb", - String dhEmbarque = TimeZoneUtil.ajustarTimeZone(dadosTimezoneParada, vo.getFechorviaje()); - retorno.add(dhEmbarque); - - //"xNome", - retorno.add(StringUtils.isNotBlank(vo.getNombpasajero()) ? vo.getNombpasajero() : ""); - - //"CPF", - String cpf = carregarCpfBpe(vo.getDesctipodoc(), vo.getDesctipodoc2(), vo.getDescnumdoc(), vo.getDescnumdoc2()); - retorno.add(cpf); - - //"tpDoc", - String descTipoDoc = carregarDescTipoDoc(vo.getDesctipodoc(), vo.getDesctipodoc2()); - TipoIdentificacionDoc identificacionDoc = TipoIdentificacionDoc.getTipo(descTipoDoc); - String tpDoc = "5"; - if(identificacionDoc != null) { - if (identificacionDoc.equals(TipoIdentificacionDoc.RG)) { - tpDoc = "1"; - } else if (identificacionDoc.equals(TipoIdentificacionDoc.PASPT)) { - tpDoc = "3"; - } else if (identificacionDoc.equals(TipoIdentificacionDoc.CN)) { - tpDoc = "4"; - } - } - retorno.add(tpDoc); - - //"nDoc", - String nDoc = carregarNumDoc(vo.getDescnumdoc(), vo.getDescnumdoc2()); - retorno.add(nDoc); - - //"xDoc", - retorno.add(""); - - //"tpViagem", - retorno.add(vo.getCorridaextra()); - - //"tpServico", - retorno.add(vo.getTiposervicobpe()); - - //"dhViagem", - String dhViagem = TimeZoneUtil.ajustarTimeZone(dadosTimezoneParada, vo.getFechorviaje()); - retorno.add(dhViagem); - - //"prefixo", - retorno.add(vo.getPrefixo()); - - //"poltrona", - retorno.add(vo.getNumasiento()); - - //"vBP", - retorno.add(MoneyHelper.arredondar(vo.getTotalbase()).toString()); - - if(MoneyHelper.isMaior(vo.getDesconto(), BigDecimal.ZERO)) { - //"vDesconto", - retorno.add(MoneyHelper.arredondar(vo.getDesconto()).toString()); - - //"tpDesconto", - TipoDescontoBPe tipoDescontoBPe = null; - if(StringUtils.isNotBlank(vo.getDescontobpe())) { - tipoDescontoBPe = TipoDescontoBPe.valueOf(vo.getDescontobpe()); - } - if(tipoDescontoBPe == null) { - tipoDescontoBPe = TipoDescontoBPe.TARIFA_PROMOCIONAL; - } - retorno.add(tipoDescontoBPe.getValor()); - - //"xDesconto", - retorno.add(tipoDescontoBPe.getDescricao()); - - } else { - retorno.add(""); - retorno.add(""); - retorno.add(""); - } - - //"qrCodBPe" - retorno.add(vo.getChbpe()); - - return retorno.toArray(new String[retorno.size()]); - } - - private void criarRow(int numRow, HSSFSheet sheet, String[] dados) { - int numColumn = 0; - HSSFRow row = sheet.createRow(numRow); - for (String dado : dados) { - HSSFCell cell = row.createCell(numColumn++); - cell.setCellValue(dado); - } - } - - private String carregarCpfBpe(String desctipodoc, String desctipodoc2, String descnumdoc, String descnumdoc2) { - String cpfBpe = null; - TipoIdentificacionDoc identificacionDoc = TipoIdentificacionDoc.getTipo(desctipodoc); - if(identificacionDoc != null && (TipoIdentificacionDoc.CPF.equals(identificacionDoc) || TipoIdentificacionDoc.CNPJ.equals(identificacionDoc))) { - cpfBpe = descnumdoc; - } - identificacionDoc = TipoIdentificacionDoc.getTipo(desctipodoc2); - if(identificacionDoc != null && (TipoIdentificacionDoc.CPF.equals(identificacionDoc) || TipoIdentificacionDoc.CNPJ.equals(identificacionDoc))) { - cpfBpe = descnumdoc2; - } - cpfBpe = cpfBpe == null ? "" : cpfBpe.trim().replaceAll("\\D", ""); - - return cpfBpe; - } - - private String carregarNumDoc(String descnumdoc, String descnumdoc2) { - String lDescDoc = null; - if(StringUtils.isNotBlank(descnumdoc)){ - lDescDoc = descnumdoc; - } - if(StringUtils.isBlank(lDescDoc)){ - lDescDoc = descnumdoc2; - } - return lDescDoc == null ? "" : lDescDoc.trim().replaceAll("\\D", ""); - } - - private String carregarDescTipoDoc(String desctipodoc, String desctipodoc2) { - String lDescTipoDoc = null; - if(StringUtils.isNotBlank(desctipodoc)){ - lDescTipoDoc = desctipodoc; - } - if(StringUtils.isBlank(lDescTipoDoc)) { - lDescTipoDoc = desctipodoc2; - } - return lDescTipoDoc != null ? lDescTipoDoc.trim() : ""; - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.EstadoDAO; +import com.rjconsultores.ventaboletos.dao.RelatorioAgepanDAO; +import com.rjconsultores.ventaboletos.enums.TipoDescontoBPe; +import com.rjconsultores.ventaboletos.enums.TipoIdentificacionDoc; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.RelatorioAgepanService; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.utilerias.TimeZoneUtil; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; + +@Service("relatorioAgepanService") +public class RelatorioAgepanServiceImpl implements RelatorioAgepanService { + + @Autowired + RelatorioAgepanDAO relatorioAgepanDAO; + + @Autowired + EstadoDAO estadoDAO; + + @Override + public List listar(Map parametros) throws BusinessException { + return relatorioAgepanDAO.listar(parametros); + } + + @Override + public InputStream gerarArquivoGratuidadeAgepan(Map parametros) throws IOException, BusinessException { + InputStream arquivo = null; + + List retorno = listar(parametros); + + arquivo = gerarArquivo(retorno); + + return arquivo; + } + + private InputStream gerarArquivo(List retorno) throws IOException { + HSSFWorkbook wb = new HSSFWorkbook(); + + criarArquivoExcel(wb, retorno); + + String nomeArquivo = UsuarioLogado.getUsuarioLogado().getNombusuario() + + "_" + Calendar.getInstance().getTime().getTime() + + "_" + "arquivoAgepan"; + + File fNomeArquivo = File.createTempFile(nomeArquivo, ".tmp"); + + FileOutputStream stream = new FileOutputStream(fNomeArquivo); + stream.flush(); + wb.write(stream); + stream.close(); + + InputStream is = new FileInputStream(fNomeArquivo); + + return is; + } + + private void criarArquivoExcel(HSSFWorkbook wb, List dados) { + HSSFSheet sheet = wb.createSheet("dados"); + int contRow = 0; + String[] cabecalho1 = new String[] {"nBP","dhEmi","xLocOrig","xLocDest","dhEmb","xNome","CPF","tpDoc","nDoc","xDoc","tpViagem","tpServico","dhViagem","prefixo","poltrona","vBP","vDesconto","tpDesconto","xDesconto","qrCodBPe"}; + String[] cabecalho2 = new String[] {"[9]","[13]","[85]","[87]","[88]","[91]","[92]","[93]","[94]","[95]","[102]","[103]","[106]","[108]","[109]","[115]","[116]","[119]","[120]","[189]"}; + criarRow(contRow++, sheet, cabecalho1); + criarRow(contRow++, sheet, cabecalho2); + + for (RelatorioGratuidadeAgepanVO vo : dados) { + String[] vetVO = transformarVOToVetor(vo); + criarRow(contRow++, sheet, vetVO); + } + + for (int i = 0; i < cabecalho1.length; i++) { + sheet.autoSizeColumn(i); + } + } + + private String[] transformarVOToVetor(RelatorioGratuidadeAgepanVO vo) { + Map dadosTimezoneParada = estadoDAO.getConfiguracoesFusoVeraoParada(vo.getOrigenId(), vo.getFechorventa()); + Map dadosTimezonePuntoventa = estadoDAO.getConfiguracoesFusoVeraoPuntoventa(vo.getPuntoventaId(), vo.getFechorventa()); + + List retorno = new ArrayList(); + + //"nBP", + retorno.add(vo.getNumBpe()); + + //"dhEmi", + String dataEmissao = TimeZoneUtil.ajustarPuntoVentaEmissaoOrigemViagemTimeZone(dadosTimezoneParada, dadosTimezonePuntoventa, vo.getFechorventa()); + retorno.add(dataEmissao); + + //"xLocOrig", + retorno.add(vo.getOrigem()); + + //"xLocDest", + retorno.add(vo.getDestino()); + + //"dhEmb", + String dhEmbarque = TimeZoneUtil.ajustarTimeZone(dadosTimezoneParada, vo.getFechorviaje()); + retorno.add(dhEmbarque); + + //"xNome", + retorno.add(StringUtils.isNotBlank(vo.getNombpasajero()) ? vo.getNombpasajero() : ""); + + //"CPF", + String cpf = carregarCpfBpe(vo.getDesctipodoc(), vo.getDesctipodoc2(), vo.getDescnumdoc(), vo.getDescnumdoc2()); + retorno.add(cpf); + + //"tpDoc", + String descTipoDoc = carregarDescTipoDoc(vo.getDesctipodoc(), vo.getDesctipodoc2()); + TipoIdentificacionDoc identificacionDoc = TipoIdentificacionDoc.getTipo(descTipoDoc); + String tpDoc = "5"; + if(identificacionDoc != null) { + if (identificacionDoc.equals(TipoIdentificacionDoc.RG)) { + tpDoc = "1"; + } else if (identificacionDoc.equals(TipoIdentificacionDoc.PASPT)) { + tpDoc = "3"; + } else if (identificacionDoc.equals(TipoIdentificacionDoc.CN)) { + tpDoc = "4"; + } + } + retorno.add(tpDoc); + + //"nDoc", + String nDoc = carregarNumDoc(vo.getDescnumdoc(), vo.getDescnumdoc2()); + retorno.add(nDoc); + + //"xDoc", + retorno.add(""); + + //"tpViagem", + retorno.add(vo.getCorridaextra()); + + //"tpServico", + retorno.add(vo.getTiposervicobpe()); + + //"dhViagem", + String dhViagem = TimeZoneUtil.ajustarTimeZone(dadosTimezoneParada, vo.getFechorviaje()); + retorno.add(dhViagem); + + //"prefixo", + retorno.add(vo.getPrefixo()); + + //"poltrona", + retorno.add(vo.getNumasiento()); + + //"vBP", + retorno.add(MoneyHelper.arredondar(vo.getTotalbase()).toString()); + + if(MoneyHelper.isMaior(vo.getDesconto(), BigDecimal.ZERO)) { + //"vDesconto", + retorno.add(MoneyHelper.arredondar(vo.getDesconto()).toString()); + + //"tpDesconto", + TipoDescontoBPe tipoDescontoBPe = null; + if(StringUtils.isNotBlank(vo.getDescontobpe())) { + tipoDescontoBPe = TipoDescontoBPe.valueOf(vo.getDescontobpe()); + } + if(tipoDescontoBPe == null) { + tipoDescontoBPe = TipoDescontoBPe.TARIFA_PROMOCIONAL; + } + retorno.add(tipoDescontoBPe.getValor()); + + //"xDesconto", + retorno.add(tipoDescontoBPe.getDescricao()); + + } else { + retorno.add(""); + retorno.add(""); + retorno.add(""); + } + + //"qrCodBPe" + retorno.add(vo.getChbpe()); + + return retorno.toArray(new String[retorno.size()]); + } + + private void criarRow(int numRow, HSSFSheet sheet, String[] dados) { + int numColumn = 0; + HSSFRow row = sheet.createRow(numRow); + for (String dado : dados) { + HSSFCell cell = row.createCell(numColumn++); + cell.setCellValue(dado); + } + } + + private String carregarCpfBpe(String desctipodoc, String desctipodoc2, String descnumdoc, String descnumdoc2) { + String cpfBpe = null; + TipoIdentificacionDoc identificacionDoc = TipoIdentificacionDoc.getTipo(desctipodoc); + if(identificacionDoc != null && (TipoIdentificacionDoc.CPF.equals(identificacionDoc) || TipoIdentificacionDoc.CNPJ.equals(identificacionDoc))) { + cpfBpe = descnumdoc; + } + identificacionDoc = TipoIdentificacionDoc.getTipo(desctipodoc2); + if(identificacionDoc != null && (TipoIdentificacionDoc.CPF.equals(identificacionDoc) || TipoIdentificacionDoc.CNPJ.equals(identificacionDoc))) { + cpfBpe = descnumdoc2; + } + cpfBpe = cpfBpe == null ? "" : cpfBpe.trim().replaceAll("\\D", ""); + + return cpfBpe; + } + + private String carregarNumDoc(String descnumdoc, String descnumdoc2) { + String lDescDoc = null; + if(StringUtils.isNotBlank(descnumdoc)){ + lDescDoc = descnumdoc; + } + if(StringUtils.isBlank(lDescDoc)){ + lDescDoc = descnumdoc2; + } + return lDescDoc == null ? "" : lDescDoc.trim().replaceAll("\\D", ""); + } + + private String carregarDescTipoDoc(String desctipodoc, String desctipodoc2) { + String lDescTipoDoc = null; + if(StringUtils.isNotBlank(desctipodoc)){ + lDescTipoDoc = desctipodoc; + } + if(StringUtils.isBlank(lDescTipoDoc)) { + lDescTipoDoc = desctipodoc2; + } + return lDescTipoDoc != null ? lDescTipoDoc.trim() : ""; + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RequisicionBoletoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RequisicionBoletoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/RequisicionBoletoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RequisicionBoletoServiceImpl.java index 20e84f921..0c2026e01 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RequisicionBoletoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RequisicionBoletoServiceImpl.java @@ -1,59 +1,59 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.RequisicionBoletoDAO; -import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; -import com.rjconsultores.ventaboletos.service.RequisicionBoletoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("requisicionBoletoService") -public class RequisicionBoletoServiceImpl implements RequisicionBoletoService { - - @Autowired - private RequisicionBoletoDAO requisicionBoletoDAO; - - @Override - public List obtenerTodos() { - return requisicionBoletoDAO.obtenerTodos(); - } - - @Override - public RequisicionBoleto obtenerID(Integer id) { - return requisicionBoletoDAO.obtenerID(id); - } - - @Transactional - public RequisicionBoleto suscribir(RequisicionBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return requisicionBoletoDAO.suscribir(entidad); - } - - @Transactional - public RequisicionBoleto actualizacion(RequisicionBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return requisicionBoletoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(RequisicionBoleto entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - requisicionBoletoDAO.actualizacion(entidad); - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.RequisicionBoletoDAO; +import com.rjconsultores.ventaboletos.entidad.RequisicionBoleto; +import com.rjconsultores.ventaboletos.service.RequisicionBoletoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("requisicionBoletoService") +public class RequisicionBoletoServiceImpl implements RequisicionBoletoService { + + @Autowired + private RequisicionBoletoDAO requisicionBoletoDAO; + + @Override + public List obtenerTodos() { + return requisicionBoletoDAO.obtenerTodos(); + } + + @Override + public RequisicionBoleto obtenerID(Integer id) { + return requisicionBoletoDAO.obtenerID(id); + } + + @Transactional + public RequisicionBoleto suscribir(RequisicionBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return requisicionBoletoDAO.suscribir(entidad); + } + + @Transactional + public RequisicionBoleto actualizacion(RequisicionBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return requisicionBoletoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(RequisicionBoleto entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + requisicionBoletoDAO.actualizacion(entidad); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservaEspecialClienteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservaEspecialClienteServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservaEspecialClienteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservaEspecialClienteServiceImpl.java index c51390ad7..f824d30f8 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ReservaEspecialClienteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservaEspecialClienteServiceImpl.java @@ -1,78 +1,78 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ReservaEspecialClienteDAO; -import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; -import com.rjconsultores.ventaboletos.service.ReservaEspecialClienteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - - -/** - * @author valde - * - */ -@Service("reservaEspecialClienteService") -public class ReservaEspecialClienteServiceImpl implements ReservaEspecialClienteService { - - @Autowired - private ReservaEspecialClienteDAO reservaEspecialClienteDAO; - - public List obtenerTodos() { - return reservaEspecialClienteDAO.obtenerTodos(); - } - - public ReservaEspecialCliente obtenerID(Integer id) { - return reservaEspecialClienteDAO.obtenerID(id); - } - - @Transactional - public ReservaEspecialCliente suscribir(ReservaEspecialCliente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return reservaEspecialClienteDAO.suscribir(entidad); - } - - @Transactional - public ReservaEspecialCliente actualizacion(ReservaEspecialCliente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return reservaEspecialClienteDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(ReservaEspecialCliente entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - reservaEspecialClienteDAO.actualizacion(entidad); - } - - @Override - public List bucarReservaEspecialByClienteId(Long clienteId) { - return reservaEspecialClienteDAO.bucarReservaEspecialByClienteId(clienteId); - } - - @Override - public List bucarReservaEspecialByCorridaId(Long corridaId) { - return reservaEspecialClienteDAO.bucarReservaEspecialByCorridaId(corridaId); - } - - - - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ReservaEspecialClienteDAO; +import com.rjconsultores.ventaboletos.entidad.ReservaEspecialCliente; +import com.rjconsultores.ventaboletos.service.ReservaEspecialClienteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + + +/** + * @author valde + * + */ +@Service("reservaEspecialClienteService") +public class ReservaEspecialClienteServiceImpl implements ReservaEspecialClienteService { + + @Autowired + private ReservaEspecialClienteDAO reservaEspecialClienteDAO; + + public List obtenerTodos() { + return reservaEspecialClienteDAO.obtenerTodos(); + } + + public ReservaEspecialCliente obtenerID(Integer id) { + return reservaEspecialClienteDAO.obtenerID(id); + } + + @Transactional + public ReservaEspecialCliente suscribir(ReservaEspecialCliente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return reservaEspecialClienteDAO.suscribir(entidad); + } + + @Transactional + public ReservaEspecialCliente actualizacion(ReservaEspecialCliente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return reservaEspecialClienteDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(ReservaEspecialCliente entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + reservaEspecialClienteDAO.actualizacion(entidad); + } + + @Override + public List bucarReservaEspecialByClienteId(Long clienteId) { + return reservaEspecialClienteDAO.bucarReservaEspecialByClienteId(clienteId); + } + + @Override + public List bucarReservaEspecialByCorridaId(Long corridaId) { + return reservaEspecialClienteDAO.bucarReservaEspecialByCorridaId(corridaId); + } + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservacionCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionCategoriaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservacionCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionCategoriaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservacionClaseServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionClaseServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservacionClaseServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionClaseServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservacionCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionCtrlServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservacionCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionCtrlServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservacionMarcaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionMarcaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservacionMarcaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionMarcaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservacionMercadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionMercadoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservacionMercadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionMercadoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ReservacionPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ReservacionPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ReservacionPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RestriccionPagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RestriccionPagoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RestriccionPagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RestriccionPagoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RevenueConfigServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RevenueConfigServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RevenueConfigServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RevenueConfigServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RhPagoConductorServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RhPagoConductorServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RhPagoConductorServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RhPagoConductorServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RolOperativoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RolOperativoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RolOperativoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RolOperativoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaCasetaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaCasetaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaCasetaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaCasetaServiceImpl.java index 01d970b9c..dbe2037f2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaCasetaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaCasetaServiceImpl.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.RutaCasetaDAO; -import com.rjconsultores.ventaboletos.entidad.RutaCaseta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.RutaCasetaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("rutaCasetaService") -public class RutaCasetaServiceImpl implements RutaCasetaService{ - - @Autowired - private RutaCasetaDAO rutaCasetaDAO; - - @Transactional(rollbackFor = BusinessException.class) - public RutaCaseta suscribir(RutaCaseta entidad) throws BusinessException { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - entidad = rutaCasetaDAO.suscribir(entidad); - - return entidad; - } - - @Transactional(rollbackFor = BusinessException.class) - public void deletarRutaCasetasFromRutaSecuenciaId(Integer id) throws BusinessException { - rutaCasetaDAO.deletarRutaCasetasFromRutaSecuenciaId(id); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.RutaCasetaDAO; +import com.rjconsultores.ventaboletos.entidad.RutaCaseta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.RutaCasetaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("rutaCasetaService") +public class RutaCasetaServiceImpl implements RutaCasetaService{ + + @Autowired + private RutaCasetaDAO rutaCasetaDAO; + + @Transactional(rollbackFor = BusinessException.class) + public RutaCaseta suscribir(RutaCaseta entidad) throws BusinessException { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + entidad = rutaCasetaDAO.suscribir(entidad); + + return entidad; + } + + @Transactional(rollbackFor = BusinessException.class) + public void deletarRutaCasetasFromRutaSecuenciaId(Integer id) throws BusinessException { + rutaCasetaDAO.deletarRutaCasetasFromRutaSecuenciaId(id); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaEmbarqueDesembarqueServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaEmbarqueDesembarqueServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaEmbarqueDesembarqueServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaEmbarqueDesembarqueServiceImpl.java index d22c6ee92..6f53d1ce7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaEmbarqueDesembarqueServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaEmbarqueDesembarqueServiceImpl.java @@ -1,54 +1,54 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.RutaEmbarqueDesembarqueDAO; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaEmbarqueDesembarque; -import com.rjconsultores.ventaboletos.service.RutaEmbarqueDesembarqueService; - -@Service("rutaEmbarqueDesembarqueService") -public class RutaEmbarqueDesembarqueServiceImpl implements RutaEmbarqueDesembarqueService { - - @Autowired - private RutaEmbarqueDesembarqueDAO rutaEmbarqueDesembarqueDAO; - - @Override - public List obtenerTodos() { - return rutaEmbarqueDesembarqueDAO.obtenerTodos(); - } - - @Override - public RutaEmbarqueDesembarque obtenerID(Integer id) { - return rutaEmbarqueDesembarqueDAO.obtenerID(id); - } - - @Transactional - @Override - public RutaEmbarqueDesembarque suscribir(RutaEmbarqueDesembarque entidad) { - return rutaEmbarqueDesembarqueDAO.suscribir(entidad); - } - - @Transactional - @Override - public RutaEmbarqueDesembarque actualizacion(RutaEmbarqueDesembarque entidad) { - return rutaEmbarqueDesembarqueDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(RutaEmbarqueDesembarque entidad) { - rutaEmbarqueDesembarqueDAO.borrar(entidad); - } - - @Override - public List obtenerPorRuta(Ruta ruta) { - return rutaEmbarqueDesembarqueDAO.obtenerPorRuta(ruta); - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.RutaEmbarqueDesembarqueDAO; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaEmbarqueDesembarque; +import com.rjconsultores.ventaboletos.service.RutaEmbarqueDesembarqueService; + +@Service("rutaEmbarqueDesembarqueService") +public class RutaEmbarqueDesembarqueServiceImpl implements RutaEmbarqueDesembarqueService { + + @Autowired + private RutaEmbarqueDesembarqueDAO rutaEmbarqueDesembarqueDAO; + + @Override + public List obtenerTodos() { + return rutaEmbarqueDesembarqueDAO.obtenerTodos(); + } + + @Override + public RutaEmbarqueDesembarque obtenerID(Integer id) { + return rutaEmbarqueDesembarqueDAO.obtenerID(id); + } + + @Transactional + @Override + public RutaEmbarqueDesembarque suscribir(RutaEmbarqueDesembarque entidad) { + return rutaEmbarqueDesembarqueDAO.suscribir(entidad); + } + + @Transactional + @Override + public RutaEmbarqueDesembarque actualizacion(RutaEmbarqueDesembarque entidad) { + return rutaEmbarqueDesembarqueDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(RutaEmbarqueDesembarque entidad) { + rutaEmbarqueDesembarqueDAO.borrar(entidad); + } + + @Override + public List obtenerPorRuta(Ruta ruta) { + return rutaEmbarqueDesembarqueDAO.obtenerPorRuta(ruta); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaEmpresaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaEmpresaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaIcmsExcepcionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaIcmsExcepcionServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaIcmsExcepcionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaIcmsExcepcionServiceImpl.java index 8bd09bab9..07b7ae032 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaIcmsExcepcionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaIcmsExcepcionServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.RutaIcmsExcepcionDAO; -import com.rjconsultores.ventaboletos.entidad.RutaIcmsExcepcion; -import com.rjconsultores.ventaboletos.service.RutaIcmsExcepcionService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("rutaIcmsExcepcionService") -public class RutaIcmsExcepcionServiceImpl implements RutaIcmsExcepcionService { - - @Autowired - private RutaIcmsExcepcionDAO rutaIcmsExcepcionDAO; - - @Override - public List obtenerTodos() { - return rutaIcmsExcepcionDAO.obtenerTodos(); - } - - @Override - public RutaIcmsExcepcion obtenerID(Integer id) { - return rutaIcmsExcepcionDAO.obtenerID(id); - } - - @Override - @Transactional - public RutaIcmsExcepcion suscribir(RutaIcmsExcepcion entidad) { - entidad.setActivo(Boolean.TRUE); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return rutaIcmsExcepcionDAO.suscribir(entidad); - } - - @Override - @Transactional - public RutaIcmsExcepcion actualizacion(RutaIcmsExcepcion entidad) { - entidad.setActivo(Boolean.TRUE); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return rutaIcmsExcepcionDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(RutaIcmsExcepcion entidad) { - entidad.setActivo(Boolean.FALSE); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - rutaIcmsExcepcionDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.RutaIcmsExcepcionDAO; +import com.rjconsultores.ventaboletos.entidad.RutaIcmsExcepcion; +import com.rjconsultores.ventaboletos.service.RutaIcmsExcepcionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("rutaIcmsExcepcionService") +public class RutaIcmsExcepcionServiceImpl implements RutaIcmsExcepcionService { + + @Autowired + private RutaIcmsExcepcionDAO rutaIcmsExcepcionDAO; + + @Override + public List obtenerTodos() { + return rutaIcmsExcepcionDAO.obtenerTodos(); + } + + @Override + public RutaIcmsExcepcion obtenerID(Integer id) { + return rutaIcmsExcepcionDAO.obtenerID(id); + } + + @Override + @Transactional + public RutaIcmsExcepcion suscribir(RutaIcmsExcepcion entidad) { + entidad.setActivo(Boolean.TRUE); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return rutaIcmsExcepcionDAO.suscribir(entidad); + } + + @Override + @Transactional + public RutaIcmsExcepcion actualizacion(RutaIcmsExcepcion entidad) { + entidad.setActivo(Boolean.TRUE); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return rutaIcmsExcepcionDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(RutaIcmsExcepcion entidad) { + entidad.setActivo(Boolean.FALSE); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + rutaIcmsExcepcionDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaSecuenciaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaSecuenciaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaSecuenciaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaSecuenciaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java index e0a34d8c4..d25f739e7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java @@ -1,138 +1,138 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.codehaus.jettison.json.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.ConstanteDAO; -import com.rjconsultores.ventaboletos.dao.SapDAO; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.enums.StatusIntegracaoSap; -import com.rjconsultores.ventaboletos.exception.BusinessRuntimeException; -import com.rjconsultores.ventaboletos.rest.IntegracaoSapRest; -import com.rjconsultores.ventaboletos.service.SapService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; - -@Service("sapService") -public class SapServiceImpl implements SapService{ - - private static final String INTEGRACAO_SAP_URL = "INTEGRACAO_SAP_URL"; - private static final String INTEGRACAO_SAP_CREDENCIAL = "INTEGRACAO_SAP_CREDENCIAL"; - private static final Logger log = LogManager.getLogger(SapServiceImpl.class); - - @Autowired - private SapDAO sapDAO; - - @Autowired - private ConstanteDAO constanteDAO; - - @Override - public List obtenerTodos() { - return sapDAO.obtenerTodos(); - } - - @Override - public FechamentoCntcorrente obtenerID(Long id) { - return sapDAO.obtenerID(id); - } - - @Override - @Transactional - public FechamentoCntcorrente suscribir(FechamentoCntcorrente entidad) { - return sapDAO.suscribir(entidad); - } - - @Override - @Transactional - public FechamentoCntcorrente actualizacion(FechamentoCntcorrente entidad) { - return sapDAO.actualizacion(entidad); - } - - @Override - @Transactional - public void borrar(FechamentoCntcorrente entidad) { - sapDAO.borrar(entidad); - - } - - @Override - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status) { - return sapDAO.obtenerTodosParaRemessa(empresa, dataDe, dataAte, status, null); - } - - @Override - public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status, PuntoVenta puntoVenta) { - return sapDAO.obtenerTodosParaRemessa(empresa, dataDe, dataAte, status, puntoVenta); - } - - @Override - public int remessa(List fechamentos, boolean processoManual) throws BusinessRuntimeException, Exception { - int contador = 0; - IntegracaoSapRest integracaoSapRest = IntegracaoSapRest.getInstance(); - String credenciais = buscaConstante(INTEGRACAO_SAP_CREDENCIAL); - String url = buscaConstante(INTEGRACAO_SAP_URL); - - for (FechamentoCntCorrenteVO fechamentoCntcorrente : fechamentos) { - if( fechamentoCntcorrente.isEnviar()) { - log.debug("Enviando fechamento:"+ fechamentoCntcorrente.getFechamentocntcorrenteId()); - JSONObject integrado = integracaoSapRest.enviarIntegracaoSap(fechamentoCntcorrente, url, credenciais); - - if(integrado == null) { - atualizaFechamento(fechamentoCntcorrente.getFechamentocntcorrenteId(), StatusIntegracaoSap.NAO_ENVIADO.ordinal()); - log.error("Erro no envio/retorno da requisicao para integracao SAP do fechamentoID: "+fechamentoCntcorrente.getFechamentocntcorrenteId()); - tratarProcessoManual(processoManual, "Erro no envio/retorno da requisicao para integracao SAP do fechamentoID: %s", fechamentoCntcorrente); - }else if(integrado.getString("Integration").equals("S")) { - atualizaFechamento(fechamentoCntcorrente.getFechamentocntcorrenteId(), StatusIntegracaoSap.INTEGRADO.ordinal()); - contador++; - }else if(integrado.getString("Integration").equals("E")) { - atualizaFechamento(fechamentoCntcorrente.getFechamentocntcorrenteId(), StatusIntegracaoSap.RECUSADO.ordinal()); - log.warn("Retorno enviado pelo SAP: \r\n"+integrado.getString("Message")); - tratarProcessoManual(processoManual, "Fechamento: "+fechamentoCntcorrente.getFechamentocntcorrenteId()+"\r\nRetorno enviado pelo SAP: \r\n"+integrado.getString("Message"), fechamentoCntcorrente); - } - } - } - - return contador; - } - - private void tratarProcessoManual(boolean processoManual, String mensagem, FechamentoCntCorrenteVO fechamentoCntcorrente) { - if(processoManual) { - throw new BusinessRuntimeException( String.format(mensagem, fechamentoCntcorrente.getFechamentocntcorrenteId()) ); - } - } - - private boolean atualizaFechamento(Long fechamentocntcorrenteId, int status) throws Exception { - return sapDAO.atualizaFechamento( fechamentocntcorrenteId, status); - } - - private String buscaConstante(String constanteString) { - Constante constante = constanteDAO.buscarPorNomeConstante(constanteString); - - if( constante == null || constante.getValorconstante() == null || constante.getValorconstante().isEmpty() ) { - throw new BusinessRuntimeException("Constante %s não cadastrada", constanteString); - } - - return constante.getValorconstante(); - } - - @Override - public void integracaoSapAutomatica() throws Exception { - List listaPendente = obtenerTodosParaRemessa(null, DateUtil.getYesterdayDate(), new Date(), "2"); - - while(!listaPendente.isEmpty()) { - log.info("IntegracaoSap: Registro a enviar:"+listaPendente.size()); - remessa(listaPendente, false); - listaPendente = obtenerTodosParaRemessa(null, DateUtil.getYesterdayDate(), new Date(), "2"); - } - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.codehaus.jettison.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.ConstanteDAO; +import com.rjconsultores.ventaboletos.dao.SapDAO; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.enums.StatusIntegracaoSap; +import com.rjconsultores.ventaboletos.exception.BusinessRuntimeException; +import com.rjconsultores.ventaboletos.rest.IntegracaoSapRest; +import com.rjconsultores.ventaboletos.service.SapService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; + +@Service("sapService") +public class SapServiceImpl implements SapService{ + + private static final String INTEGRACAO_SAP_URL = "INTEGRACAO_SAP_URL"; + private static final String INTEGRACAO_SAP_CREDENCIAL = "INTEGRACAO_SAP_CREDENCIAL"; + private static final Logger log = LogManager.getLogger(SapServiceImpl.class); + + @Autowired + private SapDAO sapDAO; + + @Autowired + private ConstanteDAO constanteDAO; + + @Override + public List obtenerTodos() { + return sapDAO.obtenerTodos(); + } + + @Override + public FechamentoCntcorrente obtenerID(Long id) { + return sapDAO.obtenerID(id); + } + + @Override + @Transactional + public FechamentoCntcorrente suscribir(FechamentoCntcorrente entidad) { + return sapDAO.suscribir(entidad); + } + + @Override + @Transactional + public FechamentoCntcorrente actualizacion(FechamentoCntcorrente entidad) { + return sapDAO.actualizacion(entidad); + } + + @Override + @Transactional + public void borrar(FechamentoCntcorrente entidad) { + sapDAO.borrar(entidad); + + } + + @Override + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status) { + return sapDAO.obtenerTodosParaRemessa(empresa, dataDe, dataAte, status, null); + } + + @Override + public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, String status, PuntoVenta puntoVenta) { + return sapDAO.obtenerTodosParaRemessa(empresa, dataDe, dataAte, status, puntoVenta); + } + + @Override + public int remessa(List fechamentos, boolean processoManual) throws BusinessRuntimeException, Exception { + int contador = 0; + IntegracaoSapRest integracaoSapRest = IntegracaoSapRest.getInstance(); + String credenciais = buscaConstante(INTEGRACAO_SAP_CREDENCIAL); + String url = buscaConstante(INTEGRACAO_SAP_URL); + + for (FechamentoCntCorrenteVO fechamentoCntcorrente : fechamentos) { + if( fechamentoCntcorrente.isEnviar()) { + log.debug("Enviando fechamento:"+ fechamentoCntcorrente.getFechamentocntcorrenteId()); + JSONObject integrado = integracaoSapRest.enviarIntegracaoSap(fechamentoCntcorrente, url, credenciais); + + if(integrado == null) { + atualizaFechamento(fechamentoCntcorrente.getFechamentocntcorrenteId(), StatusIntegracaoSap.NAO_ENVIADO.ordinal()); + log.error("Erro no envio/retorno da requisicao para integracao SAP do fechamentoID: "+fechamentoCntcorrente.getFechamentocntcorrenteId()); + tratarProcessoManual(processoManual, "Erro no envio/retorno da requisicao para integracao SAP do fechamentoID: %s", fechamentoCntcorrente); + }else if(integrado.getString("Integration").equals("S")) { + atualizaFechamento(fechamentoCntcorrente.getFechamentocntcorrenteId(), StatusIntegracaoSap.INTEGRADO.ordinal()); + contador++; + }else if(integrado.getString("Integration").equals("E")) { + atualizaFechamento(fechamentoCntcorrente.getFechamentocntcorrenteId(), StatusIntegracaoSap.RECUSADO.ordinal()); + log.warn("Retorno enviado pelo SAP: \r\n"+integrado.getString("Message")); + tratarProcessoManual(processoManual, "Fechamento: "+fechamentoCntcorrente.getFechamentocntcorrenteId()+"\r\nRetorno enviado pelo SAP: \r\n"+integrado.getString("Message"), fechamentoCntcorrente); + } + } + } + + return contador; + } + + private void tratarProcessoManual(boolean processoManual, String mensagem, FechamentoCntCorrenteVO fechamentoCntcorrente) { + if(processoManual) { + throw new BusinessRuntimeException( String.format(mensagem, fechamentoCntcorrente.getFechamentocntcorrenteId()) ); + } + } + + private boolean atualizaFechamento(Long fechamentocntcorrenteId, int status) throws Exception { + return sapDAO.atualizaFechamento( fechamentocntcorrenteId, status); + } + + private String buscaConstante(String constanteString) { + Constante constante = constanteDAO.buscarPorNomeConstante(constanteString); + + if( constante == null || constante.getValorconstante() == null || constante.getValorconstante().isEmpty() ) { + throw new BusinessRuntimeException("Constante %s não cadastrada", constanteString); + } + + return constante.getValorconstante(); + } + + @Override + public void integracaoSapAutomatica() throws Exception { + List listaPendente = obtenerTodosParaRemessa(null, DateUtil.getYesterdayDate(), new Date(), "2"); + + while(!listaPendente.isEmpty()) { + log.info("IntegracaoSap: Registro a enviar:"+listaPendente.size()); + remessa(listaPendente, false); + listaPendente = obtenerTodosParaRemessa(null, DateUtil.getYesterdayDate(), new Date(), "2"); + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SecretariaEmpresaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/SecretariaEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SecretariaEmpresaServiceImpl.java index df68a6782..2bac75c29 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaEmpresaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SecretariaEmpresaServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.SecretariaEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.Secretaria; -import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; -import com.rjconsultores.ventaboletos.service.SecretariaEmpresaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("secretariaEmpresaService") -public class SecretariaEmpresaServiceImpl implements SecretariaEmpresaService { - - @Autowired - private SecretariaEmpresaDAO secretariaEmpresaDAO; - - public List obtenerTodos() { - return secretariaEmpresaDAO.obtenerTodos(); - } - - public SecretariaEmpresa obtenerID(Integer id) { - return secretariaEmpresaDAO.obtenerID(id); - } - - @Transactional - public SecretariaEmpresa suscribir(SecretariaEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return secretariaEmpresaDAO.suscribir(entidad); - } - - @Transactional - public SecretariaEmpresa actualizacion(SecretariaEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return secretariaEmpresaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(SecretariaEmpresa entidad) { - secretariaEmpresaDAO.borrar(entidad); - } - - - @Override - public List buscarPorSecretaria(Secretaria secretaria){ - return secretariaEmpresaDAO.buscarPorSecretaria(secretaria); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.SecretariaEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.Secretaria; +import com.rjconsultores.ventaboletos.entidad.SecretariaEmpresa; +import com.rjconsultores.ventaboletos.service.SecretariaEmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("secretariaEmpresaService") +public class SecretariaEmpresaServiceImpl implements SecretariaEmpresaService { + + @Autowired + private SecretariaEmpresaDAO secretariaEmpresaDAO; + + public List obtenerTodos() { + return secretariaEmpresaDAO.obtenerTodos(); + } + + public SecretariaEmpresa obtenerID(Integer id) { + return secretariaEmpresaDAO.obtenerID(id); + } + + @Transactional + public SecretariaEmpresa suscribir(SecretariaEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return secretariaEmpresaDAO.suscribir(entidad); + } + + @Transactional + public SecretariaEmpresa actualizacion(SecretariaEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return secretariaEmpresaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(SecretariaEmpresa entidad) { + secretariaEmpresaDAO.borrar(entidad); + } + + + @Override + public List buscarPorSecretaria(Secretaria secretaria){ + return secretariaEmpresaDAO.buscarPorSecretaria(secretaria); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SegVKMServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SegVKMServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/SegVKMServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SegVKMServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SeguradoraEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguradoraEmpresaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/SeguradoraEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguradoraEmpresaServiceImpl.java index deb650616..521d0e327 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SeguradoraEmpresaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguradoraEmpresaServiceImpl.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.SeguradoraEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; -import com.rjconsultores.ventaboletos.service.SeguradoraEmpresaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("seguradoraEmpresaService") -public class SeguradoraEmpresaServiceImpl implements SeguradoraEmpresaService { - - @Autowired - private SeguradoraEmpresaDAO seguradoraEmpresaDAO; - - public List obtenerTodos() { - return seguradoraEmpresaDAO.obtenerTodos(); - } - - public SeguradoraEmpresa obtenerID(Integer id) { - return seguradoraEmpresaDAO.obtenerID(id); - } - - public boolean existe(Empresa empresa, String serie){ - return seguradoraEmpresaDAO.existe(empresa, serie); - } - - @Transactional - public SeguradoraEmpresa suscribir(SeguradoraEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return seguradoraEmpresaDAO.suscribir(entidad); - } - - @Transactional - public SeguradoraEmpresa actualizacion(SeguradoraEmpresa entidad) { - return seguradoraEmpresaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(SeguradoraEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - seguradoraEmpresaDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.SeguradoraEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; +import com.rjconsultores.ventaboletos.service.SeguradoraEmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("seguradoraEmpresaService") +public class SeguradoraEmpresaServiceImpl implements SeguradoraEmpresaService { + + @Autowired + private SeguradoraEmpresaDAO seguradoraEmpresaDAO; + + public List obtenerTodos() { + return seguradoraEmpresaDAO.obtenerTodos(); + } + + public SeguradoraEmpresa obtenerID(Integer id) { + return seguradoraEmpresaDAO.obtenerID(id); + } + + public boolean existe(Empresa empresa, String serie){ + return seguradoraEmpresaDAO.existe(empresa, serie); + } + + @Transactional + public SeguradoraEmpresa suscribir(SeguradoraEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return seguradoraEmpresaDAO.suscribir(entidad); + } + + @Transactional + public SeguradoraEmpresa actualizacion(SeguradoraEmpresa entidad) { + return seguradoraEmpresaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(SeguradoraEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + seguradoraEmpresaDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SeguroKmServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguroKmServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/SeguroKmServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguroKmServiceImpl.java index 8f61c2858..2b87a073d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SeguroKmServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguroKmServiceImpl.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroKm; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.SeguroKmDAO; -import com.rjconsultores.ventaboletos.service.SeguroKmService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import org.springframework.transaction.annotation.Transactional; - -@Service("seguroKmService") -public class SeguroKmServiceImpl implements SeguroKmService { - - @Autowired - private SeguroKmDAO seguroKmDAO; - - public List buscarPorOrgao(OrgaoConcedente orgao) { - return seguroKmDAO.buscarPorOrgao(orgao); - } - - public List obtenerTodos() { - return seguroKmDAO.obtenerTodos(); - } - - public SeguroKm obtenerID(Integer id) { - return seguroKmDAO.obtenerID(id); - } - - @Transactional - public SeguroKm suscribir(SeguroKm entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return seguroKmDAO.suscribir(entidad); - } - - @Transactional - public SeguroKm actualizacion(SeguroKm entidad) { - return seguroKmDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(SeguroKm entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - seguroKmDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroKm; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.SeguroKmDAO; +import com.rjconsultores.ventaboletos.service.SeguroKmService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import org.springframework.transaction.annotation.Transactional; + +@Service("seguroKmService") +public class SeguroKmServiceImpl implements SeguroKmService { + + @Autowired + private SeguroKmDAO seguroKmDAO; + + public List buscarPorOrgao(OrgaoConcedente orgao) { + return seguroKmDAO.buscarPorOrgao(orgao); + } + + public List obtenerTodos() { + return seguroKmDAO.obtenerTodos(); + } + + public SeguroKm obtenerID(Integer id) { + return seguroKmDAO.obtenerID(id); + } + + @Transactional + public SeguroKm suscribir(SeguroKm entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return seguroKmDAO.suscribir(entidad); + } + + @Transactional + public SeguroKm actualizacion(SeguroKm entidad) { + return seguroKmDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(SeguroKm entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + seguroKmDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SeguroTarifaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguroTarifaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/SeguroTarifaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguroTarifaServiceImpl.java index 82c3bf558..8ec64362c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SeguroTarifaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SeguroTarifaServiceImpl.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.SeguroTarifaDAO; -import com.rjconsultores.ventaboletos.service.SeguroTarifaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import java.util.Calendar; -import org.springframework.transaction.annotation.Transactional; - -@Service("seguroTarifaService") -public class SeguroTarifaServiceImpl implements SeguroTarifaService { - - @Autowired - private SeguroTarifaDAO seguroTarifaDAO; - - public List obtenerTodos() { - return seguroTarifaDAO.obtenerTodos(); - } - - public SeguroTarifa obtenerID(Integer id) { - return seguroTarifaDAO.obtenerID(id); - } - - @Transactional - public SeguroTarifa suscribir(SeguroTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return seguroTarifaDAO.suscribir(entidad); - } - - @Transactional - public SeguroTarifa actualizacion(SeguroTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - return seguroTarifaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(SeguroTarifa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - seguroTarifaDAO.actualizacion(entidad); - } - - public List buscarPorOrgao(OrgaoConcedente orgao) { - return seguroTarifaDAO.buscarPorOrgao(orgao); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.SeguroTarifaDAO; +import com.rjconsultores.ventaboletos.service.SeguroTarifaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import java.util.Calendar; +import org.springframework.transaction.annotation.Transactional; + +@Service("seguroTarifaService") +public class SeguroTarifaServiceImpl implements SeguroTarifaService { + + @Autowired + private SeguroTarifaDAO seguroTarifaDAO; + + public List obtenerTodos() { + return seguroTarifaDAO.obtenerTodos(); + } + + public SeguroTarifa obtenerID(Integer id) { + return seguroTarifaDAO.obtenerID(id); + } + + @Transactional + public SeguroTarifa suscribir(SeguroTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return seguroTarifaDAO.suscribir(entidad); + } + + @Transactional + public SeguroTarifa actualizacion(SeguroTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + return seguroTarifaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(SeguroTarifa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + seguroTarifaDAO.actualizacion(entidad); + } + + public List buscarPorOrgao(OrgaoConcedente orgao) { + return seguroTarifaDAO.buscarPorOrgao(orgao); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SisdapServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SisdapServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/SisdapServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SisdapServiceImpl.java index 1a3df3f99..5e9a52d35 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SisdapServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SisdapServiceImpl.java @@ -1,36 +1,36 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.SisdapDAO; -import com.rjconsultores.ventaboletos.service.SisdapService; - -@Service("sisdapService") -public class SisdapServiceImpl implements SisdapService{ - - @Autowired - private SisdapDAO sisdapDAO; - - @Override - public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId) { - return sisdapDAO.getMovimentoLinhas(fecInicio, fecFinal, empresaId); - } - - @Override - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem) { - return sisdapDAO.getMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaGratuidadeIdoso, pesquisaDescontoIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem); - } - - @Override - public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, - List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, - List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, - List pesquisaGratuidadeProfessor, List pesquisaGratuidadeEstudante) { - return sisdapDAO.getMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaGratuidadeIdoso, pesquisaDescontoIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem, pesquisaGratuidadeProfessor, pesquisaGratuidadeEstudante); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.SisdapDAO; +import com.rjconsultores.ventaboletos.service.SisdapService; + +@Service("sisdapService") +public class SisdapServiceImpl implements SisdapService{ + + @Autowired + private SisdapDAO sisdapDAO; + + @Override + public List getMovimentoLinhas(Date fecInicio, Date fecFinal, Integer empresaId) { + return sisdapDAO.getMovimentoLinhas(fecInicio, fecFinal, empresaId); + } + + @Override + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, List pesquisaDescontoJovem, List pesquisaGratuidadeJovem) { + return sisdapDAO.getMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaGratuidadeIdoso, pesquisaDescontoIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem); + } + + @Override + public List getMovimentoSecoes(Date fecInicio, Date fecFinal, Integer empresaId, + List pesquisaGratuidade, List pesquisaDescontoIdoso, List pesquisaGratuidadeIdoso, + List pesquisaDescontoJovem, List pesquisaGratuidadeJovem, + List pesquisaGratuidadeProfessor, List pesquisaGratuidadeEstudante) { + return sisdapDAO.getMovimentoSecoes(fecInicio, fecFinal, empresaId, pesquisaGratuidade, pesquisaGratuidadeIdoso, pesquisaDescontoIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem, pesquisaGratuidadeProfessor, pesquisaGratuidadeEstudante); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SistemaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SistemaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/SistemaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SistemaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SolicitudExpresosServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SolicitudExpresosServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/SolicitudExpresosServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/SolicitudExpresosServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/StatusSolicitudExpresosServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/StatusSolicitudExpresosServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/StatusSolicitudExpresosServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/StatusSolicitudExpresosServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaCategoriaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaCategoriaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaCategoriaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaCategoriaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaHistServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaHistServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaHistServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaHistServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaHistServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaHistServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaHistServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaHistServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaKmServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaKmServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaKmServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaKmServiceImpl.java index 9ec6ddb26..8dc9974a6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaKmServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaKmServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TarifaKmDAO; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.TarifaKm; -import com.rjconsultores.ventaboletos.service.TarifaKmService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tarifaKmService") -public class TarifaKmServiceImpl implements TarifaKmService { - - @Autowired - private TarifaKmDAO tarifaKmDAO; - - public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId) { - return tarifaKmDAO.buscarPorOrgaoAndClasse( orgaoconcedenteId, claseId); - - } - - public List obtenerTodos() { - return tarifaKmDAO.obtenerTodos(); - } - - public TarifaKm obtenerID(Integer id) { - return tarifaKmDAO.obtenerID(id); - } - - @Transactional - public TarifaKm actualizacion(TarifaKm entidad) { - return tarifaKmDAO.actualizacion(entidad); - } - - @Transactional - public TarifaKm suscribir(TarifaKm entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tarifaKmDAO.suscribir(entidad); - } - - @Transactional - public void borrar(TarifaKm entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - tarifaKmDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TarifaKmDAO; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.TarifaKm; +import com.rjconsultores.ventaboletos.service.TarifaKmService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tarifaKmService") +public class TarifaKmServiceImpl implements TarifaKmService { + + @Autowired + private TarifaKmDAO tarifaKmDAO; + + public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId) { + return tarifaKmDAO.buscarPorOrgaoAndClasse( orgaoconcedenteId, claseId); + + } + + public List obtenerTodos() { + return tarifaKmDAO.obtenerTodos(); + } + + public TarifaKm obtenerID(Integer id) { + return tarifaKmDAO.obtenerID(id); + } + + @Transactional + public TarifaKm actualizacion(TarifaKm entidad) { + return tarifaKmDAO.actualizacion(entidad); + } + + @Transactional + public TarifaKm suscribir(TarifaKm entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tarifaKmDAO.suscribir(entidad); + } + + @Transactional + public void borrar(TarifaKm entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + tarifaKmDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaMinimaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaMinimaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaMinimaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaMinimaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java index 0c1782a5e..f60786478 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java @@ -1,471 +1,471 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.dao.OrgaoConcedenteDAO; -import com.rjconsultores.ventaboletos.dao.SeguroKmDAO; -import com.rjconsultores.ventaboletos.dao.SeguroTarifaDAO; -import com.rjconsultores.ventaboletos.dao.TarifaOficialDAO; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Peaje; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TarifaOficial; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.entidad.Via; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.LogAuditoriaService; -import com.rjconsultores.ventaboletos.service.PeajeService; -import com.rjconsultores.ventaboletos.service.TarifaOficialService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialComComposicaoDoPedagioVo; -import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialVO; - -@Service("tarifaOficialService") -public class TarifaOficialServiceImpl implements TarifaOficialService { - - private static Logger log = LogManager.getLogger(TarifaOficialServiceImpl.class); - - @Autowired - private TarifaOficialDAO tarifaOficialDAO; - @Autowired - private SeguroKmDAO seguroKmDAO; - @Autowired - private SeguroTarifaDAO seguroTarifaDAO; - @Autowired - private OrgaoConcedenteDAO orgaoConcedenteDAO; - - @Autowired - private LogAuditoriaService logAuditoriaService; - - - @Autowired - private PeajeService peajeService; - - @Override - @Transactional - public Integer gerarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente, List idsEmpresas,Integer[] lsCasetaPeaje) { - return tarifaOficialDAO.gerarTarifaPorCoeficiente(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedente, idsEmpresas,lsCasetaPeaje ); - } - - @Override - @Transactional - public Integer atualizarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente) { - return tarifaOficialDAO.atualizarTarifaCoeficiente(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedente); - } - - @Override - @Transactional - public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente) { - tarifaOficialDAO.copiarParaTarifa(vigenciaTarifa, UsuarioLogado.getUsuarioLogado().getUsuarioId(), - calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP, calculaEmbarcada, empresa, orgaoConcedente); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void gerarAtualizarTarifa(List lsRuta, OrgaoConcedente orgaoConcedente, List lsEmpresaSelected, Integer[] lsCasetaPeaje) throws BusinessException { - - // Limpando a tabela de TARIFA_OFICIAL - tarifaOficialDAO.limparTarifasOficiais(lsEmpresaSelected); - - int x = 0; - if(lsRuta != null && !lsRuta.isEmpty()){ - x = lsRuta.size(); - } - - List idsEmpresas = new ArrayList(); - for(Empresa e : lsEmpresaSelected){ - idsEmpresas.add(e.getEmpresaId()); - } - - do{ - Integer rutaId = null; - if(lsRuta != null && !lsRuta.isEmpty()){ - Ruta r = lsRuta.get(x-1); - rutaId = r.getRutaId(); - } - - log.info("gerarAtualizarTarifa= rudaId:" + rutaId + ";orgaoConcedenteId:" + (orgaoConcedente != null ? orgaoConcedente.getOrgaoConcedenteId() : "null") + ";empresaId:" + idsEmpresas); - - // Gerando as tarifas pelo coeficiente - if (orgaoConcedente == null || - (orgaoConcedente.getOrgaoConcedenteId() == null || orgaoConcedente.getOrgaoConcedenteId() != OrgaoConcedente.CODIGO_ARTESP)) { - Integer qtdTarifaCoeficiente = gerarTarifaPorCoeficiente(rutaId, orgaoConcedente, idsEmpresas,lsCasetaPeaje); - log.info("qtdTarifaCoeficiente=" + qtdTarifaCoeficiente); - } - - // Gerando as tarifas para ARTESP - if (orgaoConcedente == null || - (orgaoConcedente.getOrgaoConcedenteId() == null || orgaoConcedente.getOrgaoConcedenteId() == OrgaoConcedente.CODIGO_ARTESP)) { - Integer qtdTarifaArtesp = tarifaOficialDAO.gerarTarifaArtesp(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), - orgaoConcedente != null ? orgaoConcedente.getOrgaoConcedenteId() : null, idsEmpresas); - log.info("qtdTarifaArtesp=" + qtdTarifaArtesp); - } - x--; - }while(x > 0); - - tarifaOficialDAO.removerDuplicidadeNaTarifaOficial(); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void gerarAtualizarTabelaZerada(List lsRuta, Integer orgaoConcedenteId, List lsEmpresaSelected,List lsParadaIds) throws BusinessException { - // Limpando a tabela de TARIFA_OFICIAL - tarifaOficialDAO.limparTarifasOficiais(lsEmpresaSelected); - - int x =0; - if(lsRuta != null && !lsRuta.isEmpty()){ - x = lsRuta.size(); - } - - List idsEmpresas = new ArrayList(); - for(Empresa e : lsEmpresaSelected){ - idsEmpresas.add(e.getEmpresaId()); - } - - do{ - Integer rutaId =null; - if(lsRuta != null && !lsRuta.isEmpty()){ - rutaId = lsRuta.get(x-1).getRutaId(); - } - - //Gerando as tarifas - tarifaOficialDAO.gerarTabelaZerada(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedenteId, idsEmpresas,lsParadaIds); - - x--; - }while(x > 0); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void atualizarTaxaEmbarque(List lsRuta, Integer orgaoConcedenteId,boolean gerarTabelaZerada, List lsEmpresaSelected, List lsParadaIds) throws BusinessException{ - - if (gerarTabelaZerada){ - gerarAtualizarTabelaZerada(lsRuta, orgaoConcedenteId, lsEmpresaSelected,lsParadaIds); - } - - List idsEmpresas = new ArrayList(); - for(Empresa e : lsEmpresaSelected){ - idsEmpresas.add(e.getEmpresaId()); - } - - tarifaOficialDAO.atualizarTaxaEmbarque(lsRuta, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedenteId, idsEmpresas,lsParadaIds); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { - tarifaOficialDAO.atualizarSeguroPorKm(rutaId, orgaoId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), tipoSeguro); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void atualizarSeguroPorKmTPP(Integer rutaId, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { - tarifaOficialDAO.atualizarPrecioPorTPP(rutaId, orgaoId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), tipoSeguro); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId) throws BusinessException { - tarifaOficialDAO.atualizarSeguroPorTarifa(rutaId, orgaoId, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void atualizarSeguro(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { - - List lsOrgaoId = new ArrayList(); - - if (orgaoId == null) { - lsOrgaoId.addAll(orgaoConcedenteDAO.obtenerTodosIds()); - } else { - lsOrgaoId.add(orgaoId); - } - - int x = 0; - if(lsRuta != null && !lsRuta.isEmpty()){ - x = lsRuta.size(); - } - - do{ - Integer rutaId = null; - if(lsRuta != null && !lsRuta.isEmpty()){ - rutaId = lsRuta.get(x-1).getRutaId(); - } - // O seguro por km é preferencial em relação ao por tarifa. - for (Integer orgaoConcedenteId : lsOrgaoId) { - if (seguroKmDAO.existe(orgaoConcedenteId)) { - atualizarSeguroPorKm(rutaId, orgaoConcedenteId, tipoSeguro); - } else if (seguroTarifaDAO.existe(orgaoConcedenteId)) { - atualizarSeguroPorTarifa(rutaId, orgaoConcedenteId); - } - } - x--; - }while(x > 0); - } - - @Override - @Transactional(rollbackFor = BusinessException.class) - public void atualizarSeguroTPP(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { - - List lsOrgaoId = new ArrayList(); - - if (orgaoId == null) { - lsOrgaoId.addAll(orgaoConcedenteDAO.obtenerTodosIds()); - } else { - lsOrgaoId.add(orgaoId); - } - - int x = 0; - if(lsRuta != null && !lsRuta.isEmpty()){ - x = lsRuta.size(); - } - - do{ - Integer rutaId = null; - if(lsRuta != null && !lsRuta.isEmpty()){ - rutaId = lsRuta.get(x-1).getRutaId(); - } - //O seguro por km é preferencial em relação ao por tarifa. - for (Integer orgaoConcedenteId : lsOrgaoId) { - if (seguroKmDAO.existe(orgaoConcedenteId)) { - atualizarSeguroPorKmTPP(rutaId, orgaoConcedenteId, tipoSeguro); - } - } - x--; - } while (x > 0); - } - - @Override - @Transactional - public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Boolean taxaEmbarque) { - tarifaOficialDAO.aplicarArredondamentoTarifa(orgaoConcedenteId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), taxaEmbarque); - } - - @Override - @Transactional - public void actualizacion(TarifaOficial tarifaOficial) { - try { - TarifaOficial originalClone = tarifaOficial.getCloneObject(); - tarifaOficialDAO.actualizacion(tarifaOficial); - logAuditoriaService.auditar(originalClone, tarifaOficial, tarifaOficial.getMarca() != null && tarifaOficial.getMarca().getEmpresa() != null ? tarifaOficial.getMarca().getEmpresa().getEmpresaId() : null); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new RuntimeException(e.getMessage(), e); - } - } - - @Override - public TarifaOficial obtenerID(Integer tarifaOficialId) { - TarifaOficial tarifaOficial = tarifaOficialDAO.obtenerID(tarifaOficialId); - try { - tarifaOficial.clonar(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return tarifaOficial; - } - - @Override - @Transactional - public void borrar(TarifaOficial tarifaOficial) { - tarifaOficialDAO.borrar(tarifaOficial); - logAuditoriaService.auditarExclusao(tarifaOficial, tarifaOficial.getMarca() != null && tarifaOficial.getMarca().getEmpresa() != null ? tarifaOficial.getMarca().getEmpresa().getEmpresaId() : null); - } - - @Override - public long obtenerCount(List lstEmpresas){ - return tarifaOficialDAO.obtenerCount(lstEmpresas); - } - - @Override - @Transactional - public void atualizarPedagio() { - tarifaOficialDAO.atualizarPedagio(); - } - - @Override - public List obterTarifaOficialPorFiltro(Moneda moneda, Marca marca,List lsMarcas,Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende){ - return converterVo(tarifaOficialDAO.obterTarifaOficialPorFiltroVO(moneda, marca, lsMarcas, origem, destino, claseServicio, ruta, numRuta, vende)); - } - public List converterVo(List lsTarifaOficialVo){ - List lsTarifa= new ArrayList(); - TarifaOficial ta; - Parada origem; - Parada destino; - Tramo tramo; - Marca marca; - Via via; - - for(TarifaOficialVO t:lsTarifaOficialVo){ - ta= new TarifaOficial(); - ta.setTarifaOficialId(t.getTarifaoficialid()); - ta.setPrecio(t.getPrecio()); - ta.setPreciooriginal(t.getPreciooriginal()); - ta.setImportepedagio(t.getImportepedagio()); - ta.setImporteseguro(t.getImporteseguro()); - ta.setImportetaxaembarque(t.getImportetaxaembarque()); - ta.setImporteoutros(t.getImporteoutros()); - ta.setImportetpp(t.getImportetpp()); - origem = new Parada(); - origem.setDescparada(t.getDescparadaorigem()); - destino = new Parada(); - destino.setDescparada(t.getDescparadadestino()); - via =new Via(); - via.setNombvia(t.getNomevia()); - tramo = new Tramo(); - tramo.setOrigem(origem); - tramo.setDestino(destino); - tramo.setVia(via); - ta.setTramo(tramo); - marca= new Marca(); - marca.setDescmarca(t.getDescmarca()); - ta.setMarca(marca); - OrgaoConcedente or = new OrgaoConcedente(); - or.setDescOrgao(t.getDescorgao()); - ta.setOrgaoConcedente(or); - ClaseServicio cl = new ClaseServicio(); - cl.setDescclase(t.getDescclasse()); - ta.setClaseServicio(cl); - Ruta r = new Ruta(); - r.setPrefixo(t.getRutaprefixo()); - r.setNumRuta(t.getNumruta()); - ta.setRuta(r); - lsTarifa.add(ta); - - } - return lsTarifa; - } - - - public void atualizarPedagioPorListaDePracaDePagio(List lsCasetaPeaje,Integer empresaId) { - try { - List lsTarifaOficialComComposicaoDoPedagioVo = tarifaOficialDAO.oberTarifaOficialComComposicaoDoPedagioVo(empresaId); - - if (!lsTarifaOficialComComposicaoDoPedagioVo.isEmpty()) { - log.info("tamanho da lsTarifaOficialComComposicaoDoPedagioVo: " + lsTarifaOficialComComposicaoDoPedagioVo.size()); - - - for (TarifaOficialComComposicaoDoPedagioVo tarifaOficialComComposicaoDoPedagioVo : lsTarifaOficialComComposicaoDoPedagioVo) { - log.info("tarifaOficiald:" + tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId() + " | composicao do pedágio no cálculo:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje() + " | composicao do pedágio na tarifa:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa()); - - if (StringUtils.isBlank(tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa())|| tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa().equalsIgnoreCase("null") ) { - HashMap mapComposicaoDoPedagioNaTarifaOficialComPeaje = new HashMap(); - String[] parDeChavePeajeMaisCasetaPeaje1 = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje().replace(" ", "").split(","); - montaMapComposicao(mapComposicaoDoPedagioNaTarifaOficialComPeaje, parDeChavePeajeMaisCasetaPeaje1); - BigDecimal valorPedagio = montarObterValorImportePedagio(mapComposicaoDoPedagioNaTarifaOficialComPeaje); - String stringComposicaoDoPedagio = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje(); - - atualizarPedagioComFiltroDePracaDePedagio(tarifaOficialComComposicaoDoPedagioVo, valorPedagio, stringComposicaoDoPedagio); - - } else { - HashMap mapComposicaoDoPedagioNaTarifa = new HashMap(); - String[] parDeChavePeajeMaisCasetaPeaje = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa().replace(" ", "").split(","); - montaMapComposicao(mapComposicaoDoPedagioNaTarifa, parDeChavePeajeMaisCasetaPeaje); - - HashMap mapComposicaoDoPedagioNaTarifaOficialComPeaje = new HashMap(); - String[] parDeChavePeajeMaisCasetaPeaje1 = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje().replace(" ", "").split(","); - montaMapComposicao(mapComposicaoDoPedagioNaTarifaOficialComPeaje, parDeChavePeajeMaisCasetaPeaje1); - - atualizarComposicaoDoPedagioNaTarifa(lsCasetaPeaje, mapComposicaoDoPedagioNaTarifa, mapComposicaoDoPedagioNaTarifaOficialComPeaje); - - BigDecimal valorPedagio = montarObterValorImportePedagio(mapComposicaoDoPedagioNaTarifa); - - String stringComposicaoDoPedagio = ""; - stringComposicaoDoPedagio = remontarAStringDeComposicaoDoPedagio(mapComposicaoDoPedagioNaTarifa, stringComposicaoDoPedagio); - - atualizarPedagioComFiltroDePracaDePedagio(tarifaOficialComComposicaoDoPedagioVo, valorPedagio, stringComposicaoDoPedagio); - - } - - } - } else { - log.info("NÃO retornou nenhum registro da consulta oberTarifaOficialComComposicaoDoPedagioVo "); - } - }catch (Exception e) { - // TODO: handle exception - e.printStackTrace(); - } - - } - - private void atualizarPedagioComFiltroDePracaDePedagio(TarifaOficialComComposicaoDoPedagioVo tarifaOficialComComposicaoDoPedagioVo, BigDecimal valorPedagio, String stringComposicaoDoPedagio) { - log.info("tarifaOficiald:"+tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId()+" | composicao do pedágio na tarifa oficial:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje() +" | importePedagio:"+valorPedagio); - - tarifaOficialDAO.atualizarPedagioComFiltroDePracaDePedagio(tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId(), valorPedagio, stringComposicaoDoPedagio); - } - - private String remontarAStringDeComposicaoDoPedagio(HashMap mapComposicaoDoPedagioNaTarifa, String stringComposicaoDoPedagio) { - Boolean inicio =true; - - for(Entry map : mapComposicaoDoPedagioNaTarifa.entrySet()) { - if(!inicio) { - stringComposicaoDoPedagio += ","; - } - stringComposicaoDoPedagio += map.getKey()+";"+map.getValue(); - inicio=false; - } - return stringComposicaoDoPedagio; - } - - private BigDecimal montarObterValorImportePedagio(HashMap mapComposicaoDoPedagioNaTarifa) { - BigDecimal valorPedagio = new BigDecimal("0.0"); - for(Entry map : mapComposicaoDoPedagioNaTarifa.entrySet()) { - Peaje peaje = peajeService.buscarPeajePorId(map.getValue()); - valorPedagio=valorPedagio.add(peaje.getImportePeaje().setScale(2,RoundingMode.HALF_UP)); - - } - return valorPedagio.setScale(2,RoundingMode.HALF_UP); - - } - - private void atualizarComposicaoDoPedagioNaTarifa(List lsCasetaPeaje, HashMap mapComposicaoDoPedagioNaTarifa, Map mapComposicaoDoPedagioNaTarifaOficialComPeaje) { - for(CasetaPeaje casetaPeaje : lsCasetaPeaje) { - if(mapComposicaoDoPedagioNaTarifa.containsKey(casetaPeaje.getCasetaPeajeId())) { - mapComposicaoDoPedagioNaTarifa.remove(casetaPeaje.getCasetaPeajeId()); - } - - if(mapComposicaoDoPedagioNaTarifaOficialComPeaje.containsKey(casetaPeaje.getCasetaPeajeId())) { - mapComposicaoDoPedagioNaTarifa.put(casetaPeaje.getCasetaPeajeId(),mapComposicaoDoPedagioNaTarifaOficialComPeaje.get(casetaPeaje.getCasetaPeajeId())); - } - - } - } - - private void montaMapComposicao(Map mapComposicaoDoPedagioNaTarifa, String[] parDeChavePeajeMaisCasetaPeaje) { - for(String chavePeajeMaisCasetaPeaje:parDeChavePeajeMaisCasetaPeaje) { - String[] composicao = chavePeajeMaisCasetaPeaje.split(";"); - Integer casetaPeaje = Integer.parseInt(composicao[0].trim()); - Integer peaje = Integer.parseInt(composicao[1].trim()); - mapComposicaoDoPedagioNaTarifa.put(casetaPeaje,peaje); - } - } - - public static void main(String[] args) { - BigDecimal valorPedagio = new BigDecimal("0.0"); - - valorPedagio=valorPedagio.add(new BigDecimal("100.005")); - System.out.println(valorPedagio.setScale(2,RoundingMode.HALF_UP)); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.dao.OrgaoConcedenteDAO; +import com.rjconsultores.ventaboletos.dao.SeguroKmDAO; +import com.rjconsultores.ventaboletos.dao.SeguroTarifaDAO; +import com.rjconsultores.ventaboletos.dao.TarifaOficialDAO; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Moneda; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Peaje; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TarifaOficial; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.entidad.Via; +import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.LogAuditoriaService; +import com.rjconsultores.ventaboletos.service.PeajeService; +import com.rjconsultores.ventaboletos.service.TarifaOficialService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialComComposicaoDoPedagioVo; +import com.rjconsultores.ventaboletos.vo.comissao.TarifaOficialVO; + +@Service("tarifaOficialService") +public class TarifaOficialServiceImpl implements TarifaOficialService { + + private static Logger log = LogManager.getLogger(TarifaOficialServiceImpl.class); + + @Autowired + private TarifaOficialDAO tarifaOficialDAO; + @Autowired + private SeguroKmDAO seguroKmDAO; + @Autowired + private SeguroTarifaDAO seguroTarifaDAO; + @Autowired + private OrgaoConcedenteDAO orgaoConcedenteDAO; + + @Autowired + private LogAuditoriaService logAuditoriaService; + + + @Autowired + private PeajeService peajeService; + + @Override + @Transactional + public Integer gerarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente, List idsEmpresas,Integer[] lsCasetaPeaje) { + return tarifaOficialDAO.gerarTarifaPorCoeficiente(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedente, idsEmpresas,lsCasetaPeaje ); + } + + @Override + @Transactional + public Integer atualizarTarifaPorCoeficiente(Integer rutaId, OrgaoConcedente orgaoConcedente) { + return tarifaOficialDAO.atualizarTarifaCoeficiente(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedente); + } + + @Override + @Transactional + public void copiarParaTarifa(VigenciaTarifa vigenciaTarifa, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP, Boolean calculaEmbarcada, Empresa empresa, OrgaoConcedente orgaoConcedente) { + tarifaOficialDAO.copiarParaTarifa(vigenciaTarifa, UsuarioLogado.getUsuarioLogado().getUsuarioId(), + calculaPegagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro, calculaTPP, calculaEmbarcada, empresa, orgaoConcedente); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void gerarAtualizarTarifa(List lsRuta, OrgaoConcedente orgaoConcedente, List lsEmpresaSelected, Integer[] lsCasetaPeaje) throws BusinessException { + + // Limpando a tabela de TARIFA_OFICIAL + tarifaOficialDAO.limparTarifasOficiais(lsEmpresaSelected); + + int x = 0; + if(lsRuta != null && !lsRuta.isEmpty()){ + x = lsRuta.size(); + } + + List idsEmpresas = new ArrayList(); + for(Empresa e : lsEmpresaSelected){ + idsEmpresas.add(e.getEmpresaId()); + } + + do{ + Integer rutaId = null; + if(lsRuta != null && !lsRuta.isEmpty()){ + Ruta r = lsRuta.get(x-1); + rutaId = r.getRutaId(); + } + + log.info("gerarAtualizarTarifa= rudaId:" + rutaId + ";orgaoConcedenteId:" + (orgaoConcedente != null ? orgaoConcedente.getOrgaoConcedenteId() : "null") + ";empresaId:" + idsEmpresas); + + // Gerando as tarifas pelo coeficiente + if (orgaoConcedente == null || + (orgaoConcedente.getOrgaoConcedenteId() == null || orgaoConcedente.getOrgaoConcedenteId() != OrgaoConcedente.CODIGO_ARTESP)) { + Integer qtdTarifaCoeficiente = gerarTarifaPorCoeficiente(rutaId, orgaoConcedente, idsEmpresas,lsCasetaPeaje); + log.info("qtdTarifaCoeficiente=" + qtdTarifaCoeficiente); + } + + // Gerando as tarifas para ARTESP + if (orgaoConcedente == null || + (orgaoConcedente.getOrgaoConcedenteId() == null || orgaoConcedente.getOrgaoConcedenteId() == OrgaoConcedente.CODIGO_ARTESP)) { + Integer qtdTarifaArtesp = tarifaOficialDAO.gerarTarifaArtesp(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), + orgaoConcedente != null ? orgaoConcedente.getOrgaoConcedenteId() : null, idsEmpresas); + log.info("qtdTarifaArtesp=" + qtdTarifaArtesp); + } + x--; + }while(x > 0); + + tarifaOficialDAO.removerDuplicidadeNaTarifaOficial(); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void gerarAtualizarTabelaZerada(List lsRuta, Integer orgaoConcedenteId, List lsEmpresaSelected,List lsParadaIds) throws BusinessException { + // Limpando a tabela de TARIFA_OFICIAL + tarifaOficialDAO.limparTarifasOficiais(lsEmpresaSelected); + + int x =0; + if(lsRuta != null && !lsRuta.isEmpty()){ + x = lsRuta.size(); + } + + List idsEmpresas = new ArrayList(); + for(Empresa e : lsEmpresaSelected){ + idsEmpresas.add(e.getEmpresaId()); + } + + do{ + Integer rutaId =null; + if(lsRuta != null && !lsRuta.isEmpty()){ + rutaId = lsRuta.get(x-1).getRutaId(); + } + + //Gerando as tarifas + tarifaOficialDAO.gerarTabelaZerada(rutaId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedenteId, idsEmpresas,lsParadaIds); + + x--; + }while(x > 0); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void atualizarTaxaEmbarque(List lsRuta, Integer orgaoConcedenteId,boolean gerarTabelaZerada, List lsEmpresaSelected, List lsParadaIds) throws BusinessException{ + + if (gerarTabelaZerada){ + gerarAtualizarTabelaZerada(lsRuta, orgaoConcedenteId, lsEmpresaSelected,lsParadaIds); + } + + List idsEmpresas = new ArrayList(); + for(Empresa e : lsEmpresaSelected){ + idsEmpresas.add(e.getEmpresaId()); + } + + tarifaOficialDAO.atualizarTaxaEmbarque(lsRuta, UsuarioLogado.getUsuarioLogado().getUsuarioId(), orgaoConcedenteId, idsEmpresas,lsParadaIds); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void atualizarSeguroPorKm(Integer rutaId, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { + tarifaOficialDAO.atualizarSeguroPorKm(rutaId, orgaoId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), tipoSeguro); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void atualizarSeguroPorKmTPP(Integer rutaId, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { + tarifaOficialDAO.atualizarPrecioPorTPP(rutaId, orgaoId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), tipoSeguro); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void atualizarSeguroPorTarifa(Integer rutaId, Integer orgaoId) throws BusinessException { + tarifaOficialDAO.atualizarSeguroPorTarifa(rutaId, orgaoId, UsuarioLogado.getUsuarioLogado().getUsuarioId()); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void atualizarSeguro(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { + + List lsOrgaoId = new ArrayList(); + + if (orgaoId == null) { + lsOrgaoId.addAll(orgaoConcedenteDAO.obtenerTodosIds()); + } else { + lsOrgaoId.add(orgaoId); + } + + int x = 0; + if(lsRuta != null && !lsRuta.isEmpty()){ + x = lsRuta.size(); + } + + do{ + Integer rutaId = null; + if(lsRuta != null && !lsRuta.isEmpty()){ + rutaId = lsRuta.get(x-1).getRutaId(); + } + // O seguro por km é preferencial em relação ao por tarifa. + for (Integer orgaoConcedenteId : lsOrgaoId) { + if (seguroKmDAO.existe(orgaoConcedenteId)) { + atualizarSeguroPorKm(rutaId, orgaoConcedenteId, tipoSeguro); + } else if (seguroTarifaDAO.existe(orgaoConcedenteId)) { + atualizarSeguroPorTarifa(rutaId, orgaoConcedenteId); + } + } + x--; + }while(x > 0); + } + + @Override + @Transactional(rollbackFor = BusinessException.class) + public void atualizarSeguroTPP(List lsRuta, Integer orgaoId, TipoSeguro tipoSeguro) throws BusinessException { + + List lsOrgaoId = new ArrayList(); + + if (orgaoId == null) { + lsOrgaoId.addAll(orgaoConcedenteDAO.obtenerTodosIds()); + } else { + lsOrgaoId.add(orgaoId); + } + + int x = 0; + if(lsRuta != null && !lsRuta.isEmpty()){ + x = lsRuta.size(); + } + + do{ + Integer rutaId = null; + if(lsRuta != null && !lsRuta.isEmpty()){ + rutaId = lsRuta.get(x-1).getRutaId(); + } + //O seguro por km é preferencial em relação ao por tarifa. + for (Integer orgaoConcedenteId : lsOrgaoId) { + if (seguroKmDAO.existe(orgaoConcedenteId)) { + atualizarSeguroPorKmTPP(rutaId, orgaoConcedenteId, tipoSeguro); + } + } + x--; + } while (x > 0); + } + + @Override + @Transactional + public void aplicarArredondamentoTarifa(Integer orgaoConcedenteId, Boolean taxaEmbarque) { + tarifaOficialDAO.aplicarArredondamentoTarifa(orgaoConcedenteId, UsuarioLogado.getUsuarioLogado().getUsuarioId(), taxaEmbarque); + } + + @Override + @Transactional + public void actualizacion(TarifaOficial tarifaOficial) { + try { + TarifaOficial originalClone = tarifaOficial.getCloneObject(); + tarifaOficialDAO.actualizacion(tarifaOficial); + logAuditoriaService.auditar(originalClone, tarifaOficial, tarifaOficial.getMarca() != null && tarifaOficial.getMarca().getEmpresa() != null ? tarifaOficial.getMarca().getEmpresa().getEmpresaId() : null); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new RuntimeException(e.getMessage(), e); + } + } + + @Override + public TarifaOficial obtenerID(Integer tarifaOficialId) { + TarifaOficial tarifaOficial = tarifaOficialDAO.obtenerID(tarifaOficialId); + try { + tarifaOficial.clonar(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return tarifaOficial; + } + + @Override + @Transactional + public void borrar(TarifaOficial tarifaOficial) { + tarifaOficialDAO.borrar(tarifaOficial); + logAuditoriaService.auditarExclusao(tarifaOficial, tarifaOficial.getMarca() != null && tarifaOficial.getMarca().getEmpresa() != null ? tarifaOficial.getMarca().getEmpresa().getEmpresaId() : null); + } + + @Override + public long obtenerCount(List lstEmpresas){ + return tarifaOficialDAO.obtenerCount(lstEmpresas); + } + + @Override + @Transactional + public void atualizarPedagio() { + tarifaOficialDAO.atualizarPedagio(); + } + + @Override + public List obterTarifaOficialPorFiltro(Moneda moneda, Marca marca,List lsMarcas,Parada origem, Parada destino, ClaseServicio claseServicio, Ruta ruta, String numRuta, Boolean vende){ + return converterVo(tarifaOficialDAO.obterTarifaOficialPorFiltroVO(moneda, marca, lsMarcas, origem, destino, claseServicio, ruta, numRuta, vende)); + } + public List converterVo(List lsTarifaOficialVo){ + List lsTarifa= new ArrayList(); + TarifaOficial ta; + Parada origem; + Parada destino; + Tramo tramo; + Marca marca; + Via via; + + for(TarifaOficialVO t:lsTarifaOficialVo){ + ta= new TarifaOficial(); + ta.setTarifaOficialId(t.getTarifaoficialid()); + ta.setPrecio(t.getPrecio()); + ta.setPreciooriginal(t.getPreciooriginal()); + ta.setImportepedagio(t.getImportepedagio()); + ta.setImporteseguro(t.getImporteseguro()); + ta.setImportetaxaembarque(t.getImportetaxaembarque()); + ta.setImporteoutros(t.getImporteoutros()); + ta.setImportetpp(t.getImportetpp()); + origem = new Parada(); + origem.setDescparada(t.getDescparadaorigem()); + destino = new Parada(); + destino.setDescparada(t.getDescparadadestino()); + via =new Via(); + via.setNombvia(t.getNomevia()); + tramo = new Tramo(); + tramo.setOrigem(origem); + tramo.setDestino(destino); + tramo.setVia(via); + ta.setTramo(tramo); + marca= new Marca(); + marca.setDescmarca(t.getDescmarca()); + ta.setMarca(marca); + OrgaoConcedente or = new OrgaoConcedente(); + or.setDescOrgao(t.getDescorgao()); + ta.setOrgaoConcedente(or); + ClaseServicio cl = new ClaseServicio(); + cl.setDescclase(t.getDescclasse()); + ta.setClaseServicio(cl); + Ruta r = new Ruta(); + r.setPrefixo(t.getRutaprefixo()); + r.setNumRuta(t.getNumruta()); + ta.setRuta(r); + lsTarifa.add(ta); + + } + return lsTarifa; + } + + + public void atualizarPedagioPorListaDePracaDePagio(List lsCasetaPeaje,Integer empresaId) { + try { + List lsTarifaOficialComComposicaoDoPedagioVo = tarifaOficialDAO.oberTarifaOficialComComposicaoDoPedagioVo(empresaId); + + if (!lsTarifaOficialComComposicaoDoPedagioVo.isEmpty()) { + log.info("tamanho da lsTarifaOficialComComposicaoDoPedagioVo: " + lsTarifaOficialComComposicaoDoPedagioVo.size()); + + + for (TarifaOficialComComposicaoDoPedagioVo tarifaOficialComComposicaoDoPedagioVo : lsTarifaOficialComComposicaoDoPedagioVo) { + log.info("tarifaOficiald:" + tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId() + " | composicao do pedágio no cálculo:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje() + " | composicao do pedágio na tarifa:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa()); + + if (StringUtils.isBlank(tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa())|| tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa().equalsIgnoreCase("null") ) { + HashMap mapComposicaoDoPedagioNaTarifaOficialComPeaje = new HashMap(); + String[] parDeChavePeajeMaisCasetaPeaje1 = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje().replace(" ", "").split(","); + montaMapComposicao(mapComposicaoDoPedagioNaTarifaOficialComPeaje, parDeChavePeajeMaisCasetaPeaje1); + BigDecimal valorPedagio = montarObterValorImportePedagio(mapComposicaoDoPedagioNaTarifaOficialComPeaje); + String stringComposicaoDoPedagio = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje(); + + atualizarPedagioComFiltroDePracaDePedagio(tarifaOficialComComposicaoDoPedagioVo, valorPedagio, stringComposicaoDoPedagio); + + } else { + HashMap mapComposicaoDoPedagioNaTarifa = new HashMap(); + String[] parDeChavePeajeMaisCasetaPeaje = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifa().replace(" ", "").split(","); + montaMapComposicao(mapComposicaoDoPedagioNaTarifa, parDeChavePeajeMaisCasetaPeaje); + + HashMap mapComposicaoDoPedagioNaTarifaOficialComPeaje = new HashMap(); + String[] parDeChavePeajeMaisCasetaPeaje1 = tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje().replace(" ", "").split(","); + montaMapComposicao(mapComposicaoDoPedagioNaTarifaOficialComPeaje, parDeChavePeajeMaisCasetaPeaje1); + + atualizarComposicaoDoPedagioNaTarifa(lsCasetaPeaje, mapComposicaoDoPedagioNaTarifa, mapComposicaoDoPedagioNaTarifaOficialComPeaje); + + BigDecimal valorPedagio = montarObterValorImportePedagio(mapComposicaoDoPedagioNaTarifa); + + String stringComposicaoDoPedagio = ""; + stringComposicaoDoPedagio = remontarAStringDeComposicaoDoPedagio(mapComposicaoDoPedagioNaTarifa, stringComposicaoDoPedagio); + + atualizarPedagioComFiltroDePracaDePedagio(tarifaOficialComComposicaoDoPedagioVo, valorPedagio, stringComposicaoDoPedagio); + + } + + } + } else { + log.info("NÃO retornou nenhum registro da consulta oberTarifaOficialComComposicaoDoPedagioVo "); + } + }catch (Exception e) { + // TODO: handle exception + e.printStackTrace(); + } + + } + + private void atualizarPedagioComFiltroDePracaDePedagio(TarifaOficialComComposicaoDoPedagioVo tarifaOficialComComposicaoDoPedagioVo, BigDecimal valorPedagio, String stringComposicaoDoPedagio) { + log.info("tarifaOficiald:"+tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId()+" | composicao do pedágio na tarifa oficial:" + tarifaOficialComComposicaoDoPedagioVo.getComposicaoDoPedagioNaTarifaOficialComPeaje() +" | importePedagio:"+valorPedagio); + + tarifaOficialDAO.atualizarPedagioComFiltroDePracaDePedagio(tarifaOficialComComposicaoDoPedagioVo.getTarifaOficialId(), valorPedagio, stringComposicaoDoPedagio); + } + + private String remontarAStringDeComposicaoDoPedagio(HashMap mapComposicaoDoPedagioNaTarifa, String stringComposicaoDoPedagio) { + Boolean inicio =true; + + for(Entry map : mapComposicaoDoPedagioNaTarifa.entrySet()) { + if(!inicio) { + stringComposicaoDoPedagio += ","; + } + stringComposicaoDoPedagio += map.getKey()+";"+map.getValue(); + inicio=false; + } + return stringComposicaoDoPedagio; + } + + private BigDecimal montarObterValorImportePedagio(HashMap mapComposicaoDoPedagioNaTarifa) { + BigDecimal valorPedagio = new BigDecimal("0.0"); + for(Entry map : mapComposicaoDoPedagioNaTarifa.entrySet()) { + Peaje peaje = peajeService.buscarPeajePorId(map.getValue()); + valorPedagio=valorPedagio.add(peaje.getImportePeaje().setScale(2,RoundingMode.HALF_UP)); + + } + return valorPedagio.setScale(2,RoundingMode.HALF_UP); + + } + + private void atualizarComposicaoDoPedagioNaTarifa(List lsCasetaPeaje, HashMap mapComposicaoDoPedagioNaTarifa, Map mapComposicaoDoPedagioNaTarifaOficialComPeaje) { + for(CasetaPeaje casetaPeaje : lsCasetaPeaje) { + if(mapComposicaoDoPedagioNaTarifa.containsKey(casetaPeaje.getCasetaPeajeId())) { + mapComposicaoDoPedagioNaTarifa.remove(casetaPeaje.getCasetaPeajeId()); + } + + if(mapComposicaoDoPedagioNaTarifaOficialComPeaje.containsKey(casetaPeaje.getCasetaPeajeId())) { + mapComposicaoDoPedagioNaTarifa.put(casetaPeaje.getCasetaPeajeId(),mapComposicaoDoPedagioNaTarifaOficialComPeaje.get(casetaPeaje.getCasetaPeajeId())); + } + + } + } + + private void montaMapComposicao(Map mapComposicaoDoPedagioNaTarifa, String[] parDeChavePeajeMaisCasetaPeaje) { + for(String chavePeajeMaisCasetaPeaje:parDeChavePeajeMaisCasetaPeaje) { + String[] composicao = chavePeajeMaisCasetaPeaje.split(";"); + Integer casetaPeaje = Integer.parseInt(composicao[0].trim()); + Integer peaje = Integer.parseInt(composicao[1].trim()); + mapComposicaoDoPedagioNaTarifa.put(casetaPeaje,peaje); + } + } + + public static void main(String[] args) { + BigDecimal valorPedagio = new BigDecimal("0.0"); + + valorPedagio=valorPedagio.add(new BigDecimal("100.005")); + System.out.println(valorPedagio.setScale(2,RoundingMode.HALF_UP)); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaTipoptovtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaTipoptovtaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarifaTipoptovtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarifaTipoptovtaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaCreditoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaCreditoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/TarjetaCreditoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaCreditoServiceImpl.java index 28b9c10fa..9326b507a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaCreditoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaCreditoServiceImpl.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TarjetaCreditoDAO; -import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; -import com.rjconsultores.ventaboletos.service.TarjetaCreditoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tarjetaCreditoService") -public class TarjetaCreditoServiceImpl implements TarjetaCreditoService { - - @Autowired - private TarjetaCreditoDAO tarjetaCreditoDAO; - - public List obtenerTodos() { - return tarjetaCreditoDAO.obtenerTodos(); - } - - public TarjetaCredito obtenerID(Integer id) { - return tarjetaCreditoDAO.obtenerID(id); - } - - @Transactional - public TarjetaCredito suscribir(TarjetaCredito entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tarjetaCreditoDAO.suscribir(entidad); - } - - @Transactional - public TarjetaCredito actualizacion(TarjetaCredito entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tarjetaCreditoDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(TarjetaCredito entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - tarjetaCreditoDAO.actualizacion(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TarjetaCreditoDAO; +import com.rjconsultores.ventaboletos.entidad.TarjetaCredito; +import com.rjconsultores.ventaboletos.service.TarjetaCreditoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tarjetaCreditoService") +public class TarjetaCreditoServiceImpl implements TarjetaCreditoService { + + @Autowired + private TarjetaCreditoDAO tarjetaCreditoDAO; + + public List obtenerTodos() { + return tarjetaCreditoDAO.obtenerTodos(); + } + + public TarjetaCredito obtenerID(Integer id) { + return tarjetaCreditoDAO.obtenerID(id); + } + + @Transactional + public TarjetaCredito suscribir(TarjetaCredito entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tarjetaCreditoDAO.suscribir(entidad); + } + + @Transactional + public TarjetaCredito actualizacion(TarjetaCredito entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tarjetaCreditoDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(TarjetaCredito entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + tarjetaCreditoDAO.actualizacion(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaFidelidadServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaFidelidadServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarjetaFidelidadServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaFidelidadServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaRecaudacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaRecaudacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TarjetaRecaudacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaRecaudacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java index cd63ef392..81ee6e187 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java @@ -1,266 +1,266 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.zkoss.zul.Comboitem; - -import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; -import com.rjconsultores.ventaboletos.dao.TarjetaViajeDAO; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.CorridaTramo; -import com.rjconsultores.ventaboletos.entidad.RhPagoConductor; -import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; -import com.rjconsultores.ventaboletos.service.CorridaService; -import com.rjconsultores.ventaboletos.service.RhPagoConductorService; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.service.TarjetaViajeService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tarjetaViajeService") -public class TarjetaViajeServiceImpl implements TarjetaViajeService { - - @Autowired - private TarjetaViajeDAO tarjetaViajeDAO; - @Autowired - private CorridaTramoDAO corridaTramoDAO; - @Autowired - private CorridaService corridaService; - @Autowired - private RhPagoConductorService rhPagoConductorService; - @Autowired - private RutaService rutaService; - private static final Logger log = LogManager.getLogger(TarjetaViajeServiceImpl.class); - - @Override - public List obtenerTodos() { - return tarjetaViajeDAO.obtenerTodos(); - } - - @Override - public TarjetaViaje obtenerID(Integer id) { - return tarjetaViajeDAO.obtenerID(id); - } - - @Transactional - public TarjetaViaje suscribir(TarjetaViaje entidad) { - entidad.setActivo(true); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return tarjetaViajeDAO.suscribir(entidad); - } - - @Transactional - public TarjetaViaje actualizacion(TarjetaViaje entidad) { - entidad.setActivo(true); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - return tarjetaViajeDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(TarjetaViaje entidad) { - if (entidad.getIndstatustarjeta().equals("M")) { - tarjetaViajeDAO.borrar(entidad); - } else { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(false); - entidad.setIndstatustarjeta("B"); - tarjetaViajeDAO.actualizacion(entidad); - } - } - - @Transactional - public void grabarTarjetaViaje(List lsCorridaTramo) { - try { - TarjetaViaje tarjeta = null; - for (CorridaTramo ct : lsCorridaTramo) { - - if (ct.getCorrida() == null) { - log.debug("Corrida Tramo sem Corrida: " + ct.getCorridatramoId()); - continue; - } - - tarjeta = new TarjetaViaje(); - tarjeta.setActivo(true); - if (ct.getCorrida().getCorridaRebote() != null) { - tarjeta.setIndRebote(1); - } else { - tarjeta.setIndRebote(0); - } - tarjeta.setFecenvionomina(null); - tarjeta.setFecmodif(new Date()); - tarjeta.setFoliotarjetaviaje(ct.getFolioTarjeta() == null ? null : ct.getFolioTarjeta().toString());// checar - tarjeta.setIndstatustarjeta("N"); - tarjeta.setNumsecuencia(ct.getNumsecuencia() != null ? Integer.getInteger(ct.getNumsecuencia().toString()) : null); - tarjeta.setUsuarioId(ct.getUsuarioId()); - tarjeta.setAutobus(ct.getAutobus()); - tarjeta.setClaseServicio(ct.getCorrida().getClaseServicio()); - tarjeta.setConductor(ct.getConductor()); - tarjeta.setConductor1(ct.getConductor1()); - tarjeta.setEmpresa(ct.getCorrida().getEmpresa()); - tarjeta.setMarca(ct.getCorrida().getMarca()); - - tarjeta.setFecInicial(ct.getCorrida().getId().getFeccorrida()); - tarjeta.setFecHorSalida(ct.getCorrida().getFechorsalida()); - - tarjeta.setNumCorrida(ct.getCorrida().getId().getCorridaId()); - - BigDecimal kmPagoCondutor = new BigDecimal(BigInteger.ZERO); - BigDecimal kmReal = new BigDecimal(BigInteger.ZERO); -// BigDecimal teste = corridaTramoDAO.buscarSumTarjetaMesmaCorrida(ct); -// tarjeta.setKmPagoConductor(teste); -// tarjeta.setKmReal(teste); -// - List lsCorridasAdicionais = corridaTramoDAO.buscarTarjetaMesmaCorrida(ct); - if (!lsCorridasAdicionais.isEmpty()) { - for (CorridaTramo ct2 : lsCorridasAdicionais) { - if (ct2.getTramo() == null) { - log.debug("Corrida Tramo Sem Tramo: " + ct2.getCorridatramoId().toString()); - continue; - } - if (ct2.getTramo().getKmPagoConductor() != null) { - - log.debug("Corrida Tramo Id: " + ct2.getCorridatramoId().toString()); - kmPagoCondutor = kmPagoCondutor.add(ct2.getTramo().getKmPagoConductor()); - kmReal = kmReal.add(ct2.getTramo().getKmReal()); - } - } - } - - tarjeta.setKmPagoConductor(kmPagoCondutor); - tarjeta.setKmReal(kmReal); - - //Origem Destino Inicial e Final da Corrida - Corrida corrida = ct.getCorrida(); - tarjeta.setOrigen(corrida.getOrigem().getCveparada()); - tarjeta.setDestino(corrida.getDestino().getCveparada()); - - tarjetaViajeDAO.suscribir(tarjeta); - ct.setIndmanttarjeta(true); - corridaTramoDAO.actualizacion(ct); - - } - } catch (Exception e) { - log.error("Geracao de Tarjetas"); - log.error(e); - } - } - - @Override - public void verificaCorridaDuplicada(List lsTarjetaViaje, boolean todasTarjetas) { - - for (TarjetaViaje t : lsTarjetaViaje) { - List ls = tarjetaViajeDAO.buscarTarjetaPorFiltros(t); - if (ls.size() > 1) { - //Vermelho - t.seteCorridaDuplicada(true); - - //Esse teste checa se houve uma volta para o autobus/condutor, - //Se teve volta a TarjetaViaje tem que ser preta - boolean existeCorridaVolta = tarjetaViajeDAO.buscarTarjetaExisteVolta(t); - - //Se não existe corrida de volta Vermelho - t.seteCorridaDuplicada(!existeCorridaVolta); - } - } - - } - - @Override - public List buscarTarjetaPorFiltros(Integer autoIni, - Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa) { - - return tarjetaViajeDAO.buscarTarjetaPorFiltros(autoIni, autoFin, - dataIni, dataFin, empresa); - } - - @Override - public List generarArchivoNomina(Date fecIni, Date fecFin) { - Calendar c = Calendar.getInstance(); - c.setTime(fecFin); - c.add(Calendar.HOUR, 23); - c.add(Calendar.MINUTE, 59); - c.add(Calendar.SECOND, 59); - fecFin = c.getTime(); - List lsTarjetas = tarjetaViajeDAO.buscarTarjetasParaEnvioNomina(fecIni, fecFin); - - try { - for (TarjetaViaje tv : lsTarjetas) { - RhPagoConductor rh = new RhPagoConductor(); - - Corrida.Id id = new Corrida.Id(); - id.setCorridaId(tv.getNumCorrida()); - id.setFeccorrida(tv.getFecInicial()); - Corrida corrida = corridaService.obtenerID(id); - - if (tv.getAutobus() != null) { - rh.setNumautobus(Integer.parseInt(tv.getAutobus().getNumautobus())); - } - rh.setNumcorrida(tv.getNumCorrida()); - rh.setFechorsalida(tv.getFecHorSalida()); - - rh.setCantkmsoperador1(tv.getKmPagoConductor()); - rh.setCantkmsoperador2(tv.getKmPagoConductor()); - - if (tv.getConductor() != null) { - if (tv.getConductor().getEmpleado() != null) { - rh.setCveoperador1(tv.getConductor().getEmpleado().getCveEmpleado()); - rh.setNombreoperador1(tv.getConductor().getEmpleado().getNombEmpleado()); - } - } - if (tv.getConductor1() != null) { - if (tv.getConductor1().getEmpleado() != null) { - rh.setCveoperador2(tv.getConductor1().getEmpleado().getCveEmpleado()); - rh.setNombreoperador2(tv.getConductor1().getEmpleado().getNombEmpleado()); - } - } - if (tv.getMarca() != null) { - rh.setMarca(tv.getMarca().getMarcaId()); - } - if (corrida != null) { - if (corrida.getRuta() != null) { - rh.setRuta(corrida.getRuta().getRutaId()); - String descRuta = corrida.getRuta().getDescruta(); - rh.setDescruta(descRuta.length() > 29 ? descRuta.substring(0, 30) : descRuta); - rh.setCveOrigen(rutaService.getOrigem(corrida.getRuta()).getCveparada()); - rh.setCveDestino(rutaService.getDestino(corrida.getRuta()).getCveparada()); - } - - boolean pisoExtra = (corrida.getNumPiso() == null) ? false - : corrida.getNumPiso() == 2 ? true : false; - rh.setIndextra(pisoExtra); - } - log.debug("RH_SALIDAS: NUMAUTOBUS: " + rh.getNumautobus() + " NUMCORRIDA: " + rh.getNumcorrida() - + " DESCRUTA: " + rh.getDescruta() + " FECHORSALIDA: " + rh.getFechorsalida() - + " CVEOPERADOR1: " + rh.getCveoperador1() + " NOMBREOPERADOR1: " + rh.getNombreoperador1() + " CANTKMSOPERADOR1: " + rh.getCantkmsoperador1() - + " CVEOPERADOR2: " + rh.getCveoperador2() + " NOMBREOPERADOR2: " + rh.getNombreoperador2() + " CANTKMSOPERADOR2: " + rh.getCantkmsoperador2() - + " INDEXTRA: " + rh.getIndextra() + " CVEORIGEN: " + rh.getCveOrigen() + " CVEDESTINO: " + rh.getCveDestino() + " RUTA_ID: " + rh.getRuta()); - rhPagoConductorService.suscribir(rh); - } - - } catch (Exception e) { - log.error(e); - return null; - } - - return lsTarjetas; - } - - @Transactional - public void actulizarTarjetasEnviadas(List lsTarjetas) { - for (TarjetaViaje tarjeta : lsTarjetas) { - tarjeta.setFecenvionomina(new Date()); - tarjetaViajeDAO.actualizacion(tarjeta); - } - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.zkoss.zul.Comboitem; + +import com.rjconsultores.ventaboletos.dao.CorridaTramoDAO; +import com.rjconsultores.ventaboletos.dao.TarjetaViajeDAO; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.CorridaTramo; +import com.rjconsultores.ventaboletos.entidad.RhPagoConductor; +import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; +import com.rjconsultores.ventaboletos.service.CorridaService; +import com.rjconsultores.ventaboletos.service.RhPagoConductorService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.service.TarjetaViajeService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tarjetaViajeService") +public class TarjetaViajeServiceImpl implements TarjetaViajeService { + + @Autowired + private TarjetaViajeDAO tarjetaViajeDAO; + @Autowired + private CorridaTramoDAO corridaTramoDAO; + @Autowired + private CorridaService corridaService; + @Autowired + private RhPagoConductorService rhPagoConductorService; + @Autowired + private RutaService rutaService; + private static final Logger log = LogManager.getLogger(TarjetaViajeServiceImpl.class); + + @Override + public List obtenerTodos() { + return tarjetaViajeDAO.obtenerTodos(); + } + + @Override + public TarjetaViaje obtenerID(Integer id) { + return tarjetaViajeDAO.obtenerID(id); + } + + @Transactional + public TarjetaViaje suscribir(TarjetaViaje entidad) { + entidad.setActivo(true); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return tarjetaViajeDAO.suscribir(entidad); + } + + @Transactional + public TarjetaViaje actualizacion(TarjetaViaje entidad) { + entidad.setActivo(true); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + return tarjetaViajeDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(TarjetaViaje entidad) { + if (entidad.getIndstatustarjeta().equals("M")) { + tarjetaViajeDAO.borrar(entidad); + } else { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(false); + entidad.setIndstatustarjeta("B"); + tarjetaViajeDAO.actualizacion(entidad); + } + } + + @Transactional + public void grabarTarjetaViaje(List lsCorridaTramo) { + try { + TarjetaViaje tarjeta = null; + for (CorridaTramo ct : lsCorridaTramo) { + + if (ct.getCorrida() == null) { + log.debug("Corrida Tramo sem Corrida: " + ct.getCorridatramoId()); + continue; + } + + tarjeta = new TarjetaViaje(); + tarjeta.setActivo(true); + if (ct.getCorrida().getCorridaRebote() != null) { + tarjeta.setIndRebote(1); + } else { + tarjeta.setIndRebote(0); + } + tarjeta.setFecenvionomina(null); + tarjeta.setFecmodif(new Date()); + tarjeta.setFoliotarjetaviaje(ct.getFolioTarjeta() == null ? null : ct.getFolioTarjeta().toString());// checar + tarjeta.setIndstatustarjeta("N"); + tarjeta.setNumsecuencia(ct.getNumsecuencia() != null ? Integer.getInteger(ct.getNumsecuencia().toString()) : null); + tarjeta.setUsuarioId(ct.getUsuarioId()); + tarjeta.setAutobus(ct.getAutobus()); + tarjeta.setClaseServicio(ct.getCorrida().getClaseServicio()); + tarjeta.setConductor(ct.getConductor()); + tarjeta.setConductor1(ct.getConductor1()); + tarjeta.setEmpresa(ct.getCorrida().getEmpresa()); + tarjeta.setMarca(ct.getCorrida().getMarca()); + + tarjeta.setFecInicial(ct.getCorrida().getId().getFeccorrida()); + tarjeta.setFecHorSalida(ct.getCorrida().getFechorsalida()); + + tarjeta.setNumCorrida(ct.getCorrida().getId().getCorridaId()); + + BigDecimal kmPagoCondutor = new BigDecimal(BigInteger.ZERO); + BigDecimal kmReal = new BigDecimal(BigInteger.ZERO); +// BigDecimal teste = corridaTramoDAO.buscarSumTarjetaMesmaCorrida(ct); +// tarjeta.setKmPagoConductor(teste); +// tarjeta.setKmReal(teste); +// + List lsCorridasAdicionais = corridaTramoDAO.buscarTarjetaMesmaCorrida(ct); + if (!lsCorridasAdicionais.isEmpty()) { + for (CorridaTramo ct2 : lsCorridasAdicionais) { + if (ct2.getTramo() == null) { + log.debug("Corrida Tramo Sem Tramo: " + ct2.getCorridatramoId().toString()); + continue; + } + if (ct2.getTramo().getKmPagoConductor() != null) { + + log.debug("Corrida Tramo Id: " + ct2.getCorridatramoId().toString()); + kmPagoCondutor = kmPagoCondutor.add(ct2.getTramo().getKmPagoConductor()); + kmReal = kmReal.add(ct2.getTramo().getKmReal()); + } + } + } + + tarjeta.setKmPagoConductor(kmPagoCondutor); + tarjeta.setKmReal(kmReal); + + //Origem Destino Inicial e Final da Corrida + Corrida corrida = ct.getCorrida(); + tarjeta.setOrigen(corrida.getOrigem().getCveparada()); + tarjeta.setDestino(corrida.getDestino().getCveparada()); + + tarjetaViajeDAO.suscribir(tarjeta); + ct.setIndmanttarjeta(true); + corridaTramoDAO.actualizacion(ct); + + } + } catch (Exception e) { + log.error("Geracao de Tarjetas"); + log.error(e); + } + } + + @Override + public void verificaCorridaDuplicada(List lsTarjetaViaje, boolean todasTarjetas) { + + for (TarjetaViaje t : lsTarjetaViaje) { + List ls = tarjetaViajeDAO.buscarTarjetaPorFiltros(t); + if (ls.size() > 1) { + //Vermelho + t.seteCorridaDuplicada(true); + + //Esse teste checa se houve uma volta para o autobus/condutor, + //Se teve volta a TarjetaViaje tem que ser preta + boolean existeCorridaVolta = tarjetaViajeDAO.buscarTarjetaExisteVolta(t); + + //Se não existe corrida de volta Vermelho + t.seteCorridaDuplicada(!existeCorridaVolta); + } + } + + } + + @Override + public List buscarTarjetaPorFiltros(Integer autoIni, + Integer autoFin, Date dataIni, Date dataFin, Comboitem empresa) { + + return tarjetaViajeDAO.buscarTarjetaPorFiltros(autoIni, autoFin, + dataIni, dataFin, empresa); + } + + @Override + public List generarArchivoNomina(Date fecIni, Date fecFin) { + Calendar c = Calendar.getInstance(); + c.setTime(fecFin); + c.add(Calendar.HOUR, 23); + c.add(Calendar.MINUTE, 59); + c.add(Calendar.SECOND, 59); + fecFin = c.getTime(); + List lsTarjetas = tarjetaViajeDAO.buscarTarjetasParaEnvioNomina(fecIni, fecFin); + + try { + for (TarjetaViaje tv : lsTarjetas) { + RhPagoConductor rh = new RhPagoConductor(); + + Corrida.Id id = new Corrida.Id(); + id.setCorridaId(tv.getNumCorrida()); + id.setFeccorrida(tv.getFecInicial()); + Corrida corrida = corridaService.obtenerID(id); + + if (tv.getAutobus() != null) { + rh.setNumautobus(Integer.parseInt(tv.getAutobus().getNumautobus())); + } + rh.setNumcorrida(tv.getNumCorrida()); + rh.setFechorsalida(tv.getFecHorSalida()); + + rh.setCantkmsoperador1(tv.getKmPagoConductor()); + rh.setCantkmsoperador2(tv.getKmPagoConductor()); + + if (tv.getConductor() != null) { + if (tv.getConductor().getEmpleado() != null) { + rh.setCveoperador1(tv.getConductor().getEmpleado().getCveEmpleado()); + rh.setNombreoperador1(tv.getConductor().getEmpleado().getNombEmpleado()); + } + } + if (tv.getConductor1() != null) { + if (tv.getConductor1().getEmpleado() != null) { + rh.setCveoperador2(tv.getConductor1().getEmpleado().getCveEmpleado()); + rh.setNombreoperador2(tv.getConductor1().getEmpleado().getNombEmpleado()); + } + } + if (tv.getMarca() != null) { + rh.setMarca(tv.getMarca().getMarcaId()); + } + if (corrida != null) { + if (corrida.getRuta() != null) { + rh.setRuta(corrida.getRuta().getRutaId()); + String descRuta = corrida.getRuta().getDescruta(); + rh.setDescruta(descRuta.length() > 29 ? descRuta.substring(0, 30) : descRuta); + rh.setCveOrigen(rutaService.getOrigem(corrida.getRuta()).getCveparada()); + rh.setCveDestino(rutaService.getDestino(corrida.getRuta()).getCveparada()); + } + + boolean pisoExtra = (corrida.getNumPiso() == null) ? false + : corrida.getNumPiso() == 2 ? true : false; + rh.setIndextra(pisoExtra); + } + log.debug("RH_SALIDAS: NUMAUTOBUS: " + rh.getNumautobus() + " NUMCORRIDA: " + rh.getNumcorrida() + + " DESCRUTA: " + rh.getDescruta() + " FECHORSALIDA: " + rh.getFechorsalida() + + " CVEOPERADOR1: " + rh.getCveoperador1() + " NOMBREOPERADOR1: " + rh.getNombreoperador1() + " CANTKMSOPERADOR1: " + rh.getCantkmsoperador1() + + " CVEOPERADOR2: " + rh.getCveoperador2() + " NOMBREOPERADOR2: " + rh.getNombreoperador2() + " CANTKMSOPERADOR2: " + rh.getCantkmsoperador2() + + " INDEXTRA: " + rh.getIndextra() + " CVEORIGEN: " + rh.getCveOrigen() + " CVEDESTINO: " + rh.getCveDestino() + " RUTA_ID: " + rh.getRuta()); + rhPagoConductorService.suscribir(rh); + } + + } catch (Exception e) { + log.error(e); + return null; + } + + return lsTarjetas; + } + + @Transactional + public void actulizarTarjetasEnviadas(List lsTarjetas) { + for (TarjetaViaje tarjeta : lsTarjetas) { + tarjeta.setFecenvionomina(new Date()); + tarjetaViajeDAO.actualizacion(tarjeta); + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbLevanteCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbLevanteCtrlServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbLevanteCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbLevanteCtrlServiceImpl.java index 83ad221c9..7319bbc96 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbLevanteCtrlServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbLevanteCtrlServiceImpl.java @@ -1,61 +1,61 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TaxaEmbLevanteCtrlDAO; -import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; -import com.rjconsultores.ventaboletos.service.TaxaEmbLevanteCtrlService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("taxaEmbLevanteCtrlService") -public class TaxaEmbLevanteCtrlServiceImpl implements TaxaEmbLevanteCtrlService { - - @Autowired - private TaxaEmbLevanteCtrlDAO taxaEmbLevanteCtrlDAO; - - @Override - public List obtenerTodos() { - return taxaEmbLevanteCtrlDAO.obtenerTodos(); - } - - @Override - public TaxaEmbLevanteCtrl obtenerID(Integer id) { - return taxaEmbLevanteCtrlDAO.obtenerID(id); - } - - @Transactional - public TaxaEmbLevanteCtrl suscribir(TaxaEmbLevanteCtrl entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return taxaEmbLevanteCtrlDAO.suscribir(entidad); - } - - @Transactional - public TaxaEmbLevanteCtrl actualizacion(TaxaEmbLevanteCtrl entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return taxaEmbLevanteCtrlDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(TaxaEmbLevanteCtrl entidad) { - - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - taxaEmbLevanteCtrlDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TaxaEmbLevanteCtrlDAO; +import com.rjconsultores.ventaboletos.entidad.TaxaEmbLevanteCtrl; +import com.rjconsultores.ventaboletos.service.TaxaEmbLevanteCtrlService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("taxaEmbLevanteCtrlService") +public class TaxaEmbLevanteCtrlServiceImpl implements TaxaEmbLevanteCtrlService { + + @Autowired + private TaxaEmbLevanteCtrlDAO taxaEmbLevanteCtrlDAO; + + @Override + public List obtenerTodos() { + return taxaEmbLevanteCtrlDAO.obtenerTodos(); + } + + @Override + public TaxaEmbLevanteCtrl obtenerID(Integer id) { + return taxaEmbLevanteCtrlDAO.obtenerID(id); + } + + @Transactional + public TaxaEmbLevanteCtrl suscribir(TaxaEmbLevanteCtrl entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return taxaEmbLevanteCtrlDAO.suscribir(entidad); + } + + @Transactional + public TaxaEmbLevanteCtrl actualizacion(TaxaEmbLevanteCtrl entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return taxaEmbLevanteCtrlDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(TaxaEmbLevanteCtrl entidad) { + + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + taxaEmbLevanteCtrlDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueKmServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueKmServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueKmServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueKmServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueParadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueParadaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueParadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TaxaEmbarqueParadaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCiudadServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCiudadServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCiudadServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCiudadServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCtrlServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCtrlServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCtrlServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCambioCtrlServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoConvenioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoConvenioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoConvenioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoConvenioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoCorteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCorteServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoCorteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCorteServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaDescuentoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaDescuentoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaDescuentoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaDescuentoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoCortesiaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoDocAutobusServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoDocAutobusServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoDocAutobusServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoDocAutobusServiceImpl.java index 0cc3136a1..9e6248c3a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoDocAutobusServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoDocAutobusServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TipoDocAutobusDAO; -import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; -import com.rjconsultores.ventaboletos.service.TipoDocAutobusService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tipoDocAutobusService") -public class TipoDocAutobusServiceImpl implements TipoDocAutobusService { - - @Autowired - private TipoDocAutobusDAO tipoDocAutobusDAO; - - @Override - public List obtenerTodos() { - return tipoDocAutobusDAO.obtenerTodos(); - } - - @Override - public TipoDocAutobus obtenerID(Integer id) { - return tipoDocAutobusDAO.obtenerID(id); - } - - @Transactional - public TipoDocAutobus suscribir(TipoDocAutobus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoDocAutobusDAO.suscribir(entidad); - } - - @Transactional - public TipoDocAutobus actualizacion(TipoDocAutobus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoDocAutobusDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(TipoDocAutobus entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - tipoDocAutobusDAO.actualizacion(entidad); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TipoDocAutobusDAO; +import com.rjconsultores.ventaboletos.entidad.TipoDocAutobus; +import com.rjconsultores.ventaboletos.service.TipoDocAutobusService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tipoDocAutobusService") +public class TipoDocAutobusServiceImpl implements TipoDocAutobusService { + + @Autowired + private TipoDocAutobusDAO tipoDocAutobusDAO; + + @Override + public List obtenerTodos() { + return tipoDocAutobusDAO.obtenerTodos(); + } + + @Override + public TipoDocAutobus obtenerID(Integer id) { + return tipoDocAutobusDAO.obtenerID(id); + } + + @Transactional + public TipoDocAutobus suscribir(TipoDocAutobus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoDocAutobusDAO.suscribir(entidad); + } + + @Transactional + public TipoDocAutobus actualizacion(TipoDocAutobus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoDocAutobusDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(TipoDocAutobus entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + tipoDocAutobusDAO.actualizacion(entidad); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoDomicilioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoDomicilioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoDomicilioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoDomicilioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoEmpleadoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEmpleadoServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoEmpleadoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEmpleadoServiceImpl.java index 91433f7a0..8f38e27d7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoEmpleadoServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEmpleadoServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.TipoEmpleadoDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEmpleado; -import com.rjconsultores.ventaboletos.service.TipoEmpleadoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tipoEmpleadoService") -public class TipoEmpleadoServiceImpl implements TipoEmpleadoService { - - @Autowired - private TipoEmpleadoDAO tipoEmpleadoDAO; - - @Override - public List obtenerTodos() { - return tipoEmpleadoDAO.obtenerTodos(); - } - - @Override - public TipoEmpleado obtenerID(Integer id) { - return tipoEmpleadoDAO.obtenerID(id); - } - - @Override - public TipoEmpleado suscribir(TipoEmpleado entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoEmpleadoDAO.suscribir(entidad); - } - - @Override - public TipoEmpleado actualizacion(TipoEmpleado entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoEmpleadoDAO.actualizacion(entidad); - } - - @Override - public void borrar(TipoEmpleado entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - tipoEmpleadoDAO.actualizacion(entidad); - } - - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.TipoEmpleadoDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEmpleado; +import com.rjconsultores.ventaboletos.service.TipoEmpleadoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tipoEmpleadoService") +public class TipoEmpleadoServiceImpl implements TipoEmpleadoService { + + @Autowired + private TipoEmpleadoDAO tipoEmpleadoDAO; + + @Override + public List obtenerTodos() { + return tipoEmpleadoDAO.obtenerTodos(); + } + + @Override + public TipoEmpleado obtenerID(Integer id) { + return tipoEmpleadoDAO.obtenerID(id); + } + + @Override + public TipoEmpleado suscribir(TipoEmpleado entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoEmpleadoDAO.suscribir(entidad); + } + + @Override + public TipoEmpleado actualizacion(TipoEmpleado entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoEmpleadoDAO.actualizacion(entidad); + } + + @Override + public void borrar(TipoEmpleado entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + tipoEmpleadoDAO.actualizacion(entidad); + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraEmpresaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraEmpresaServiceImpl.java index 2325d60aa..ff2c4f443 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraEmpresaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraEmpresaServiceImpl.java @@ -1,58 +1,58 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TipoEventoExtraEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; -import com.rjconsultores.ventaboletos.service.TipoEventoExtraEmpresaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tipoEventoExtraEmpresaService") -public class TipoEventoExtraEmpresaServiceImpl implements TipoEventoExtraEmpresaService { - @Autowired - private TipoEventoExtraEmpresaDAO tipoEventoExtraEmpresaDAO; - - @Override - public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra) { - return tipoEventoExtraEmpresaDAO.buscarPorTipoEventoExtra(tipoeventoextra); - } - - @Transactional - public TipoEventoExtraEmpresa suscribir(TipoEventoExtraEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoEventoExtraEmpresaDAO.suscribir(entidad); - } - - @Override - public List obtenerTodos() { - return tipoEventoExtraEmpresaDAO.obtenerTodos(); - } - - @Override - public TipoEventoExtraEmpresa obtenerID(Integer id) { - return tipoEventoExtraEmpresaDAO.obtenerID(id); - } - - @Transactional - public TipoEventoExtraEmpresa actualizacion(TipoEventoExtraEmpresa entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoEventoExtraEmpresaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(TipoEventoExtraEmpresa entidad) { - tipoEventoExtraEmpresaDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TipoEventoExtraEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; +import com.rjconsultores.ventaboletos.service.TipoEventoExtraEmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tipoEventoExtraEmpresaService") +public class TipoEventoExtraEmpresaServiceImpl implements TipoEventoExtraEmpresaService { + @Autowired + private TipoEventoExtraEmpresaDAO tipoEventoExtraEmpresaDAO; + + @Override + public List buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra) { + return tipoEventoExtraEmpresaDAO.buscarPorTipoEventoExtra(tipoeventoextra); + } + + @Transactional + public TipoEventoExtraEmpresa suscribir(TipoEventoExtraEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoEventoExtraEmpresaDAO.suscribir(entidad); + } + + @Override + public List obtenerTodos() { + return tipoEventoExtraEmpresaDAO.obtenerTodos(); + } + + @Override + public TipoEventoExtraEmpresa obtenerID(Integer id) { + return tipoEventoExtraEmpresaDAO.obtenerID(id); + } + + @Transactional + public TipoEventoExtraEmpresa actualizacion(TipoEventoExtraEmpresa entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoEventoExtraEmpresaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(TipoEventoExtraEmpresa entidad) { + tipoEventoExtraEmpresaDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraFormaPagoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraFormaPagoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraFormaPagoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraFormaPagoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraPtovtaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraPtovtaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraPtovtaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraPtovtaServiceImpl.java index 9a8eefb3d..98ce84799 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraPtovtaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraPtovtaServiceImpl.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TipoEventoExtraPtovtaDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; -import com.rjconsultores.ventaboletos.service.TipoEventoExtraPtovtaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tipoEventoExtraPtovtaService") -public class TipoEventoExtraPtovtaServiceImpl implements TipoEventoExtraPtovtaService { - @Autowired - private TipoEventoExtraPtovtaDAO TipoEventoExtraPtovtaDAO; - - - @Transactional - public TipoEventoExtraPtoVta suscribir(TipoEventoExtraPtoVta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return TipoEventoExtraPtovtaDAO.suscribir(entidad); - } - - @Override - public List obtenerTodos() { - return TipoEventoExtraPtovtaDAO.obtenerTodos(); - } - - @Override - public TipoEventoExtraPtoVta obtenerID(Integer id) { - return TipoEventoExtraPtovtaDAO.obtenerID(id); - } - - @Transactional - public TipoEventoExtraPtoVta actualizacion(TipoEventoExtraPtoVta entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return TipoEventoExtraPtovtaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(TipoEventoExtraPtoVta entidad) { - TipoEventoExtraPtovtaDAO.borrar(entidad); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TipoEventoExtraPtovtaDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraPtoVta; +import com.rjconsultores.ventaboletos.service.TipoEventoExtraPtovtaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tipoEventoExtraPtovtaService") +public class TipoEventoExtraPtovtaServiceImpl implements TipoEventoExtraPtovtaService { + @Autowired + private TipoEventoExtraPtovtaDAO TipoEventoExtraPtovtaDAO; + + + @Transactional + public TipoEventoExtraPtoVta suscribir(TipoEventoExtraPtoVta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return TipoEventoExtraPtovtaDAO.suscribir(entidad); + } + + @Override + public List obtenerTodos() { + return TipoEventoExtraPtovtaDAO.obtenerTodos(); + } + + @Override + public TipoEventoExtraPtoVta obtenerID(Integer id) { + return TipoEventoExtraPtovtaDAO.obtenerID(id); + } + + @Transactional + public TipoEventoExtraPtoVta actualizacion(TipoEventoExtraPtoVta entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return TipoEventoExtraPtovtaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(TipoEventoExtraPtoVta entidad) { + TipoEventoExtraPtovtaDAO.borrar(entidad); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraServiceImpl.java index c7f9203c5..6d78ab0b0 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoEventoExtraServiceImpl.java @@ -1,105 +1,105 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TipoEventoExtraDAO; -import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.ValidacionCampoException; -import com.rjconsultores.ventaboletos.service.EventoExtraService; -import com.rjconsultores.ventaboletos.service.TipoEventoExtraService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -/** - * - * @author Administrador - */ -@Service("tipoEventoExtraService") -public class TipoEventoExtraServiceImpl implements TipoEventoExtraService { - - @Autowired - private TipoEventoExtraDAO tipoEventoExtraDAO; - @Autowired - private EventoExtraService eventoExtraService; - - public List obtenerTodos() { - return tipoEventoExtraDAO.obtenerTodos(); - } - - public TipoEventoExtra obtenerID(Integer id) { - return tipoEventoExtraDAO.obtenerID(id); - } - - @Transactional - public TipoEventoExtra suscribir(TipoEventoExtra entidad) throws ValidacionCampoException { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { - validaCampos(entidad); - } - - return tipoEventoExtraDAO.suscribir(entidad); - } - - @Transactional - public TipoEventoExtra actualizacion(TipoEventoExtra entidad) throws ValidacionCampoException { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { - validaCampos(entidad); - } - - return tipoEventoExtraDAO.actualizacion(entidad); - } - - @Transactional(rollbackFor = BusinessException.class) - public void borrar(TipoEventoExtra entidad) throws BusinessException { - - if (!eventoExtraService.obtenerPorTipo(entidad).isEmpty()) { - throw new BusinessException("editarTipoEventoExtraController.MSG.evento"); - } - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - tipoEventoExtraDAO.actualizacion(entidad); - } - - @Override - public List buscar(String descingreso) { - return tipoEventoExtraDAO.buscar(descingreso); - } - - @Override - public List buscarLike(String descingreso) { - return tipoEventoExtraDAO.buscarLike(descingreso); - } - - private void validaCampos(TipoEventoExtra entidad) throws ValidacionCampoException { - - if (entidad.getNatureza() == null) { - throw new ValidacionCampoException("editarTipoEventoExtraController.MSG.natureza"); - } - - // o campo contacontabil não é obrigatório -// if (entidad.getContaContabil() == null) { -// throw new ValidacionCampoException("editarTipoEventoExtraController.MSG.contaContabil"); -// } - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TipoEventoExtraDAO; +import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.ValidacionCampoException; +import com.rjconsultores.ventaboletos.service.EventoExtraService; +import com.rjconsultores.ventaboletos.service.TipoEventoExtraService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Administrador + */ +@Service("tipoEventoExtraService") +public class TipoEventoExtraServiceImpl implements TipoEventoExtraService { + + @Autowired + private TipoEventoExtraDAO tipoEventoExtraDAO; + @Autowired + private EventoExtraService eventoExtraService; + + public List obtenerTodos() { + return tipoEventoExtraDAO.obtenerTodos(); + } + + public TipoEventoExtra obtenerID(Integer id) { + return tipoEventoExtraDAO.obtenerID(id); + } + + @Transactional + public TipoEventoExtra suscribir(TipoEventoExtra entidad) throws ValidacionCampoException { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { + validaCampos(entidad); + } + + return tipoEventoExtraDAO.suscribir(entidad); + } + + @Transactional + public TipoEventoExtra actualizacion(TipoEventoExtra entidad) throws ValidacionCampoException { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + if (ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.INTEGRACION_TOTVS.getDescricao())) { + validaCampos(entidad); + } + + return tipoEventoExtraDAO.actualizacion(entidad); + } + + @Transactional(rollbackFor = BusinessException.class) + public void borrar(TipoEventoExtra entidad) throws BusinessException { + + if (!eventoExtraService.obtenerPorTipo(entidad).isEmpty()) { + throw new BusinessException("editarTipoEventoExtraController.MSG.evento"); + } + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + tipoEventoExtraDAO.actualizacion(entidad); + } + + @Override + public List buscar(String descingreso) { + return tipoEventoExtraDAO.buscar(descingreso); + } + + @Override + public List buscarLike(String descingreso) { + return tipoEventoExtraDAO.buscarLike(descingreso); + } + + private void validaCampos(TipoEventoExtra entidad) throws ValidacionCampoException { + + if (entidad.getNatureza() == null) { + throw new ValidacionCampoException("editarTipoEventoExtraController.MSG.natureza"); + } + + // o campo contacontabil não é obrigatório +// if (entidad.getContaContabil() == null) { +// throw new ValidacionCampoException("editarTipoEventoExtraController.MSG.contaContabil"); +// } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoIdentificacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoIdentificacionServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoIdentificacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoIdentificacionServiceImpl.java index 6c533bc88..52627dd2c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoIdentificacionServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoIdentificacionServiceImpl.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TipoIdentificacionDAO; -import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; -import com.rjconsultores.ventaboletos.service.TipoIdentificacionService; - -@Service("tipoIdentificacionService") -public class TipoIdentificacionServiceImpl implements TipoIdentificacionService { - - @Autowired - private TipoIdentificacionDAO tipoIdentificacionDAO; - - @Override - public List obtenerTodos() { - return tipoIdentificacionDAO.obtenerTodos(); - } - - @Override - public TipoIdentificacion obtenerID(Integer id) { - return tipoIdentificacionDAO.obtenerID(id); - } - - @Override - @Transactional - public TipoIdentificacion suscribir(TipoIdentificacion tipoDocumento) { - return tipoIdentificacionDAO.suscribir(tipoDocumento); - } - - @Override - @Transactional - public void borrar(TipoIdentificacion tipoDocumento) { - tipoIdentificacionDAO.borrar(tipoDocumento); - - } - - @Override - @Transactional - public TipoIdentificacion actualizacion(TipoIdentificacion tipoDocumento) { - return tipoIdentificacionDAO.actualizacion(tipoDocumento); - } - - @Override - public TipoIdentificacion buscarPorNome(String descTipoDoc) { - return tipoIdentificacionDAO.buscarPorNome(descTipoDoc); - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TipoIdentificacionDAO; +import com.rjconsultores.ventaboletos.entidad.TipoIdentificacion; +import com.rjconsultores.ventaboletos.service.TipoIdentificacionService; + +@Service("tipoIdentificacionService") +public class TipoIdentificacionServiceImpl implements TipoIdentificacionService { + + @Autowired + private TipoIdentificacionDAO tipoIdentificacionDAO; + + @Override + public List obtenerTodos() { + return tipoIdentificacionDAO.obtenerTodos(); + } + + @Override + public TipoIdentificacion obtenerID(Integer id) { + return tipoIdentificacionDAO.obtenerID(id); + } + + @Override + @Transactional + public TipoIdentificacion suscribir(TipoIdentificacion tipoDocumento) { + return tipoIdentificacionDAO.suscribir(tipoDocumento); + } + + @Override + @Transactional + public void borrar(TipoIdentificacion tipoDocumento) { + tipoIdentificacionDAO.borrar(tipoDocumento); + + } + + @Override + @Transactional + public TipoIdentificacion actualizacion(TipoIdentificacion tipoDocumento) { + return tipoIdentificacionDAO.actualizacion(tipoDocumento); + } + + @Override + public TipoIdentificacion buscarPorNome(String descTipoDoc) { + return tipoIdentificacionDAO.buscarPorNome(descTipoDoc); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoInformativoComissaoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoInformativoComissaoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoInformativoComissaoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoInformativoComissaoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoMovimientoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoMovimientoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoMovimientoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoMovimientoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoOcupacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoOcupacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoOcupacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoOcupacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoParadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoParadaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoParadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoParadaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoPuntoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoPuntoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoPuntoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoPuntoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoTarifaPacoteServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoTarifaPacoteServiceImpl.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoTarifaPacoteServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoTarifaPacoteServiceImpl.java index d98797aec..f816e5987 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoTarifaPacoteServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoTarifaPacoteServiceImpl.java @@ -1,66 +1,66 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.TipoTarifaPacoteDAO; -import com.rjconsultores.ventaboletos.entidad.Pacote; -import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; -import com.rjconsultores.ventaboletos.service.TipoTarifaPacoteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("tipoTarifaPacoteService") -public class TipoTarifaPacoteServiceImpl implements TipoTarifaPacoteService { - - @Autowired - private TipoTarifaPacoteDAO tipoTarifaPacoteDAO; - - @Override - public List obtenerTodos() { - return tipoTarifaPacoteDAO.obtenerTodos(); - } - - @Override - public TipoTarifaPacote obtenerID(Integer id) { - return tipoTarifaPacoteDAO.obtenerID(id); - } - - @Transactional - @Override - public TipoTarifaPacote suscribir(TipoTarifaPacote entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoTarifaPacoteDAO.suscribir(entidad); - } - - @Transactional - @Override - public TipoTarifaPacote actualizacion(TipoTarifaPacote entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return tipoTarifaPacoteDAO.actualizacion(entidad); - } - - @Transactional - @Override - public void borrar(TipoTarifaPacote entidad) { - entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - tipoTarifaPacoteDAO.actualizacion(entidad); - } - - @Override - public List buscaTipoTarifaPacote(Pacote pacote) { - return tipoTarifaPacoteDAO.buscaTipoTarifaPacote(pacote); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.TipoTarifaPacoteDAO; +import com.rjconsultores.ventaboletos.entidad.Pacote; +import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; +import com.rjconsultores.ventaboletos.service.TipoTarifaPacoteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("tipoTarifaPacoteService") +public class TipoTarifaPacoteServiceImpl implements TipoTarifaPacoteService { + + @Autowired + private TipoTarifaPacoteDAO tipoTarifaPacoteDAO; + + @Override + public List obtenerTodos() { + return tipoTarifaPacoteDAO.obtenerTodos(); + } + + @Override + public TipoTarifaPacote obtenerID(Integer id) { + return tipoTarifaPacoteDAO.obtenerID(id); + } + + @Transactional + @Override + public TipoTarifaPacote suscribir(TipoTarifaPacote entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoTarifaPacoteDAO.suscribir(entidad); + } + + @Transactional + @Override + public TipoTarifaPacote actualizacion(TipoTarifaPacote entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return tipoTarifaPacoteDAO.actualizacion(entidad); + } + + @Transactional + @Override + public void borrar(TipoTarifaPacote entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + tipoTarifaPacoteDAO.actualizacion(entidad); + } + + @Override + public List buscaTipoTarifaPacote(Pacote pacote) { + return tipoTarifaPacoteDAO.buscaTipoTarifaPacote(pacote); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoKmServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoKmServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TramoKmServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoKmServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java index b2b2de3ca..88d769511 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java @@ -1,693 +1,693 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.dao.OrgaoTramoDAO; -import com.rjconsultores.ventaboletos.dao.RutaDAO; -import com.rjconsultores.ventaboletos.dao.TramoDAO; -import com.rjconsultores.ventaboletos.dao.TramoServicioDAO; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.OrgaoTramo; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.ParadaSecuencia; -import com.rjconsultores.ventaboletos.entidad.ParadaSecuenciaCombinacaoLinha; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaCombinacion; -import com.rjconsultores.ventaboletos.entidad.RutaEmpresa; -import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.entidad.TramoServicio; -import com.rjconsultores.ventaboletos.entidad.Via; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.RutaCombinacionService; -import com.rjconsultores.ventaboletos.service.RutaEmpresaService; -import com.rjconsultores.ventaboletos.service.RutaSecuenciaService; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.service.TramoRutaService; -import com.rjconsultores.ventaboletos.service.TramoService; -import com.rjconsultores.ventaboletos.service.TramoServicioService; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.HoraSistema; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.esquemaoperacional.RutaTramoVO; -import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoCoeficienteVO; -import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoVO; - -@Service("tramoRutaService") -public class TramoRutaServiceImpl implements TramoRutaService { - - private static final Logger log = LogManager.getLogger(TramoRutaServiceImpl.class); - @Autowired - private RutaCombinacionService rutaCombinacionService; - @Autowired - private RutaSecuenciaService rutaSecuenciaService; - @Autowired - private RutaEmpresaService rutaEmpresaService; - @Autowired - private RutaService rutaService; - @Autowired - private TramoService tramoService; - @Autowired - private TramoServicioService tramoServicioService; - @Autowired - private RutaDAO rutaDAO; - @Autowired - private OrgaoTramoDAO orgaoTramoDAO; - @Autowired - private TramoServicioDAO tramoServicioDAO; - @Autowired - private TramoDAO tramoDAO; - - /** - * Hace la validación de los datos del rutaTramoVO - * - * @param rutaTramoVO - * @throws BusinessException - */ - private void validarGenerarTramosRutas(RutaTramoVO rutaTramoVO) throws BusinessException { - if (rutaTramoVO.getLsSecuenciaRutaTramoVO().isEmpty()) { - throw new BusinessException("tramoRutaServiceImpl.msg.secuenciaObligatorio"); - } - if ((rutaTramoVO.getPrefixo() == null) || (rutaTramoVO.getPrefixo().isEmpty())) { - throw new BusinessException("tramoRutaServiceImpl.msg.prefixoObligatorio"); - } - if (rutaTramoVO.getLsEmpresa().isEmpty()) { - throw new BusinessException("tramoRutaServiceImpl.msg.empresaObligatoria"); - } - - if (rutaTramoVO.getLsCombinacionRutaTramoVO().isEmpty()) { - throw new BusinessException("tramoRutaServiceImpl.msg.combinacionObligatorio"); - } - for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { - if (s.getTramoId() != null) { - continue; - } - if ((s.getOrigen() == null) || (s.getDestino() == null) || (s.getVia() == null) - || (s.getKmReal() == null) || (s.getSecuencia() == null) || (s.getTiempoRecorrido() == null) - || ((rutaTramoVO.getOrgaoConcedente() == null || !rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId().equals(21) - && ((s.getCoeficienteTarifa1() == null) || (s.getKmCoeficiente1() == null) || (s.getKmCoeficiente1() == BigDecimal.ZERO))))) { - - throw new BusinessException("tramoRutaServiceImpl.msg.cambosObligatoriosCombinacion", new Object[] { s.getOrigen(), s.getDestino() }); - } - } - for (SecuenciaRutaTramoVO s : rutaTramoVO.getLsSecuenciaRutaTramoVO()) { - if (s.getTramoId() != null) { - continue; - } - if ((s.getOrigen() == null) || (s.getDestino() == null) || (s.getVia() == null) - || (s.getKmReal() == null) || (s.getSecuencia() == null) || (s.getTiempoRecorrido() == null)) { - throw new BusinessException("tramoRutaServiceImpl.msg.cambosObligatoriosSecuencia", new Object[] { s.getOrigen(), - s.getDestino() }); - } - } - } - - @Transactional(rollbackFor = BusinessException.class) - @Override - public Ruta generarTramosRutas(RutaTramoVO rutaTramoVO, Boolean isRegreso) throws BusinessException { - - this.validarGenerarTramosRutas(rutaTramoVO); - - // Genero los tramos y tramos servicios de la combinacion que no existen - // Aqui si genera tambien los tramos de la secuencia - for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { - log.debug("Origen:" + s.getOrigen() + ";Destino:" + s.getDestino() + ";Via:" + s.getVia()); - boolean fueGenerado = generarDatos(s, rutaTramoVO.getClaseServicio(), rutaTramoVO.getOrgaoConcedente()); - log.debug("Fue Generado:" + fueGenerado); - } - - // Genero la ruta - Ruta ruta = new Ruta(); - ruta.setDescruta(rutaTramoVO.getDescRuta()); - ruta.setClaseServicio(rutaTramoVO.getClaseServicio()); - ruta.setOrgaoConcedente(rutaTramoVO.getOrgaoConcedente()); - ruta.setIndNombreObligatorio(rutaTramoVO.getSolicitaNombrePasajero()); - ruta.setIndSentidoIda(rutaTramoVO.getIndSentidoIda()); - ruta.setIndTelefoneObrigatorio(false); - if (rutaTramoVO.getVentaHandHeld() == null) { - ruta.setVentaOffLine(false); - } else { - ruta.setVentaOffLine(rutaTramoVO.getVentaHandHeld()); - } - - ruta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - ruta.setActivo(Boolean.TRUE); - ruta.setFecmodif(new java.util.Date()); - ruta.setPrefixo(rutaTramoVO.getPrefixo()); - ruta.setNumRuta(rutaTramoVO.getNumRuta()); - //valores de tributação para ecf - ruta.setIndTribPedagio(Boolean.FALSE); - ruta.setIndTribTarifa(Boolean.TRUE); - ruta.setIndTribTaxaEmbarque(Boolean.FALSE); - ruta.setIndRutaInternacional(Boolean.FALSE); - - ruta = rutaDAO.suscribir(ruta); - - // Genero la secuencia de la ruta - for (SecuenciaRutaTramoVO s : rutaTramoVO.getLsSecuenciaRutaTramoVO()) { - RutaSecuencia rutaSecuencia = new RutaSecuencia(); - rutaSecuencia.setNumsecuencia(s.getSecuencia().shortValue()); - rutaSecuencia.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); - rutaSecuencia.setCantKmEntradaSaida(s.getKmEntradaSaida()); - rutaSecuencia.setKmOriginal(s.getKmOriginal()); - - - if(rutaSecuencia.getTramo() == null ){ - Tramo tramo = new Tramo(); - tramo.setDesctramo(tramoService.gerarDescripcionTramo(s.getOrigen(), s.getDestino(), s.getVia())); - tramo.setOrigem(s.getOrigen()); - tramo.setDestino(s.getDestino()); - tramo.setKmReal(s.getKmReal()); - tramo.setKmEntradaSaida(s.getKmSaidaOrigen()); - tramo.setKmEntradaSaidaDestino(s.getKmEntradaDestino()); - tramo.setVia(s.getVia()); - tramo.setActivo(Boolean.TRUE); - tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - tramo.setFecmodif(new java.util.Date()); - - tramo = tramoDAO.suscribir(tramo); - rutaSecuencia.setTramo(tramo); - } else { - Tramo tramo = rutaSecuencia.getTramo(); - tramo.setKmEntradaSaida(s.getKmSaidaOrigen()); - tramo.setKmEntradaSaidaDestino(s.getKmEntradaDestino()); - tramo = tramoDAO.actualizacion(tramo); - } - rutaSecuencia.setRuta(ruta); - rutaSecuencia = rutaSecuenciaService.suscribir(rutaSecuencia); - } - - for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { - RutaCombinacion rutaCombinacion = new RutaCombinacion(); - rutaCombinacion.setIndventa(s.getPermiteVenda() == null ? true : s.getPermiteVenda()); - rutaCombinacion.setRuta(ruta); - rutaCombinacion.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); - - rutaCombinacion = rutaCombinacionService.suscribir(rutaCombinacion); - } - - for (Empresa e : rutaTramoVO.getLsEmpresa()) { - RutaEmpresa rutaEmpresa = new RutaEmpresa(); - rutaEmpresa.setEmpresa(e); - rutaEmpresa.setActivo(Boolean.TRUE); - rutaEmpresa.setFecmodif(Calendar.getInstance().getTime()); - rutaEmpresa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - rutaEmpresa.setRuta(ruta); - - rutaEmpresa = rutaEmpresaService.suscribir(rutaEmpresa); - } - - return ruta; - } - - @Override - public RutaTramoVO generarRutaRegreso(RutaTramoVO rutaTramoVO) { - RutaTramoVO rutaTramoRegresoVO = new RutaTramoVO(); - rutaTramoRegresoVO.setClaseServicio(rutaTramoVO.getClaseServicio()); - rutaTramoRegresoVO.setOrgaoConcedente(rutaTramoVO.getOrgaoConcedente()); - rutaTramoRegresoVO.setSolicitaNombrePasajero(rutaTramoVO.getSolicitaNombrePasajero()); - rutaTramoRegresoVO.setVentaHandHeld(rutaTramoVO.getVentaHandHeld() == null ? true : rutaTramoVO.getVentaHandHeld()); - rutaTramoRegresoVO.setLsEmpresa(rutaTramoVO.getLsEmpresa()); - - if (rutaTramoVO.getIndSentidoIda()) { - rutaTramoRegresoVO.setIndSentidoIda(Boolean.FALSE); - } else { - rutaTramoRegresoVO.setIndSentidoIda(Boolean.TRUE); - } - rutaTramoRegresoVO.setNumRuta(rutaTramoVO.getNumRuta()); - rutaTramoRegresoVO.setPrefixo(rutaTramoVO.getPrefixo()); - if (rutaTramoVO.getDescRuta() != null) { - rutaTramoRegresoVO.setDescRuta(rutaTramoVO.getDescRuta()); - } else { - rutaTramoRegresoVO.setDescRuta("-"); - } - - List lsSecuenciaRutaTramoRegresoVO = new ArrayList(); - List lsSecuenciaRutaTramoIdaVO = new ArrayList(rutaTramoVO.getLsSecuenciaRutaTramoVO()); - // Reordena a lista - Collections.reverse(lsSecuenciaRutaTramoIdaVO); - - int secuencia = 0; - - Map kmEntradaSaida = rutaTramoVO.getParadasComKmEntradaSaida(); - - for (SecuenciaRutaTramoVO s : lsSecuenciaRutaTramoIdaVO) { - TramoServicio tramoServicio = tramoServicioService.buscar(s.getDestino(), s.getOrigen(), s.getVia(), rutaTramoVO.getClaseServicio()); - if (tramoServicio != null) { - s.setTramoId(tramoServicio.getTramo().getTramoId()); - s.setTramoServicioId(tramoServicio.getTramoservicioId()); - - lsSecuenciaRutaTramoRegresoVO.add(new SecuenciaRutaTramoVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), - s.getTramoId(), s.getTramoServicioId(), rutaTramoRegresoVO.getNumRuta(), rutaTramoRegresoVO.getIndSentidoIda(), kmEntradaSaida.containsKey(s.getDestino()) ? kmEntradaSaida.get(s.getDestino()) : BigDecimal.ZERO )); - } else { - lsSecuenciaRutaTramoRegresoVO.add(new SecuenciaRutaTramoVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), rutaTramoRegresoVO.getNumRuta(), rutaTramoRegresoVO.getIndSentidoIda(),kmEntradaSaida.containsKey(s.getDestino()) ? kmEntradaSaida.get(s.getDestino()) : BigDecimal.ZERO )); - } - } - rutaTramoRegresoVO.setLsSecuenciaRutaTramoVO(lsSecuenciaRutaTramoRegresoVO); - - List lsCombinacionRutaTramoRegresoVO = new ArrayList(); - List lsCombinacionTramoIdaVO = new ArrayList(rutaTramoVO.getLsCombinacionRutaTramoVO()); - Collections.sort(lsCombinacionTramoIdaVO, new Comparator() { - - @Override - public int compare(SecuenciaRutaTramoCoeficienteVO o1, SecuenciaRutaTramoCoeficienteVO o2) { - return o2.getSecuencia().compareTo(o1.getSecuencia()); - } - }); - - secuencia = 0; - for (SecuenciaRutaTramoCoeficienteVO s : lsCombinacionTramoIdaVO) { - TramoServicio tramoServicio = tramoServicioService.buscar(s.getDestino(), s.getOrigen(), s.getVia(), rutaTramoVO.getClaseServicio()); - if (tramoServicio != null) { - s.setTramoId(tramoServicio.getTramo().getTramoId()); - s.setTramoServicioId(tramoServicio.getTramoservicioId()); - - SecuenciaRutaTramoCoeficienteVO secuenciaRutaTramoCoeficienteVO = new SecuenciaRutaTramoCoeficienteVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), - s.getTramoId(), s.getTramoServicioId(), rutaTramoRegresoVO.getNumRuta(), s.getKmSaidaOrigen()); - - OrgaoTramo orgaoTramo = orgaoTramoDAO.buscar(s.getDestino().getParadaId(), s.getOrigen().getParadaId(), s.getVia().getViaId(), rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId(), rutaTramoVO.getClaseServicio().getClaseservicioId()); - - if (orgaoTramo != null) { - secuenciaRutaTramoCoeficienteVO.setOrgaoTramoId(orgaoTramo.getOrgaoTramoId()); - - secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa1(s.getCoeficienteTarifa1()); - secuenciaRutaTramoCoeficienteVO.setKmCoeficiente1(s.getKmCoeficiente1()); - - if (s.getCoeficienteTarifa2() != null) { - secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa2(s.getCoeficienteTarifa2()); - secuenciaRutaTramoCoeficienteVO.setKmCoeficiente2(s.getKmCoeficiente2()); - } - - if (s.getCoeficienteTarifa3() != null) { - secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa3(s.getCoeficienteTarifa3()); - secuenciaRutaTramoCoeficienteVO.setKmCoeficiente3(s.getKmCoeficiente3()); - } - } - - secuenciaRutaTramoCoeficienteVO.setPermiteVenda(s.getPermiteVenda()); - lsCombinacionRutaTramoRegresoVO.add(secuenciaRutaTramoCoeficienteVO); - } else { - SecuenciaRutaTramoCoeficienteVO secuenciaRutaTramoCoeficienteVO = new SecuenciaRutaTramoCoeficienteVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), rutaTramoRegresoVO.getNumRuta(), s.getKmSaidaOrigen()); - - secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa1(s.getCoeficienteTarifa1()); - secuenciaRutaTramoCoeficienteVO.setKmCoeficiente1(s.getKmCoeficiente1()); - - secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa2(s.getCoeficienteTarifa2()); - secuenciaRutaTramoCoeficienteVO.setKmCoeficiente2(s.getKmCoeficiente2()); - - secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa3(s.getCoeficienteTarifa3()); - secuenciaRutaTramoCoeficienteVO.setKmCoeficiente3(s.getKmCoeficiente3()); - secuenciaRutaTramoCoeficienteVO.setPermiteVenda(s.getPermiteVenda()); - - lsCombinacionRutaTramoRegresoVO.add(secuenciaRutaTramoCoeficienteVO); - } - - } - rutaTramoRegresoVO.setLsCombinacionRutaTramoVO(lsCombinacionRutaTramoRegresoVO); - - return rutaTramoRegresoVO; - } - - @Override - public List generarCombinacion(RutaTramoVO rutaTramoVO) { - List lsSecuenciaRutaTramoVO = new ArrayList(rutaTramoVO.getLsSecuenciaRutaTramoVO()); - List lsSecuenciaCombinacionRutaTramoVO = new ArrayList(); - - Collections.sort(lsSecuenciaRutaTramoVO); - - int secuencia = 0; - List listSecuenciaCalculada = new ArrayList(lsSecuenciaRutaTramoVO); - - for (SecuenciaRutaTramoVO secuenciaInicial : lsSecuenciaRutaTramoVO) { - Parada origen = secuenciaInicial.getOrigen(); - Parada destino = secuenciaInicial.getDestino(); - - listSecuenciaCalculada.remove(secuenciaInicial); - - BigDecimal totalKmsReal = secuenciaInicial.getKmReal(); - totalKmsReal = totalKmsReal.add(secuenciaInicial.getKmSaidaOrigen().add(secuenciaInicial.getKmEntradaDestino())); - - HoraSistema totalTiempoRecorrido = secuenciaInicial.getTiempoRecorrido(); - - Via via = secuenciaInicial.getVia(); - - secuencia = criaSecuenciaRutaTramoCoeficienteVO(rutaTramoVO, lsSecuenciaCombinacionRutaTramoVO, secuencia, totalKmsReal, origen, destino, secuenciaInicial.getKmSaidaOrigen(), secuenciaInicial.getKmEntradaDestino(), totalTiempoRecorrido, via); - - for (SecuenciaRutaTramoVO secuenciaInterna : listSecuenciaCalculada) { - destino = secuenciaInterna.getDestino(); - totalKmsReal = totalKmsReal.add(secuenciaInterna.getKmReal()); - totalKmsReal = totalKmsReal.add(secuenciaInterna.getKmEntradaDestino()); - totalKmsReal = totalKmsReal.add(secuenciaInterna.getKmSaidaOrigen()); - totalTiempoRecorrido = totalTiempoRecorrido.sumar(secuenciaInterna.getTiempoRecorrido()); - - secuencia = criaSecuenciaRutaTramoCoeficienteVO(rutaTramoVO, lsSecuenciaCombinacionRutaTramoVO, secuencia, totalKmsReal, origen, destino, secuenciaInicial.getKmSaidaOrigen(), secuenciaInterna.getKmEntradaDestino(), totalTiempoRecorrido, via); - } - } - - return lsSecuenciaCombinacionRutaTramoVO; - } - - private int criaSecuenciaRutaTramoCoeficienteVO(RutaTramoVO rutaTramoVO, List lsSecuenciaCombinacionRutaTramoVO, int secuencia, BigDecimal totalKmsReal, Parada origen, Parada destino, BigDecimal kmSaidaOrigen, BigDecimal kmEntradaDestino, HoraSistema totalTiempoRecorrido, Via via) { - SecuenciaRutaTramoCoeficienteVO nuevaSecuencia = new SecuenciaRutaTramoCoeficienteVO(origen, destino, via, ++secuencia, - totalKmsReal, totalTiempoRecorrido, rutaTramoVO.getNumRuta()); - - atualizandoSecuenciaPorViaExistente(rutaTramoVO, origen, destino, via, nuevaSecuencia); - - nuevaSecuencia.setKmSaidaOrigen(kmSaidaOrigen); - nuevaSecuencia.setKmEntradaDestino(kmEntradaDestino); - nuevaSecuencia.setNumRuta(rutaTramoVO.getNumRuta()); - lsSecuenciaCombinacionRutaTramoVO.add(nuevaSecuencia); - - log.debug("Origen:" + nuevaSecuencia.getOrigen() + ";Destino:" + nuevaSecuencia.getDestino() + ";Via:" - + nuevaSecuencia.getVia() + ";KmsReal:" + nuevaSecuencia.getKmReal() + ";hora:" + nuevaSecuencia.getTiempoRecorrido()); - return secuencia; - } - - private void atualizandoSecuenciaPorViaExistente(RutaTramoVO rutaTramoVO, Parada origen, Parada destino, Via via, SecuenciaRutaTramoCoeficienteVO nuevaSecuencia) { - if (via != null) { - atualizandoSecuenciaPorTramosExistente(rutaTramoVO, origen, destino, via, nuevaSecuencia); - atualizandoSecuenciaPorOrgaoTramosExistentes(rutaTramoVO, origen, destino, via, nuevaSecuencia); - } - } - - private void atualizandoSecuenciaPorOrgaoTramosExistentes(RutaTramoVO rutaTramoVO, Parada origen, Parada destino, Via via, SecuenciaRutaTramoCoeficienteVO nuevaSecuencia) { - OrgaoTramo orgaoTramo = orgaoTramoDAO.buscar(origen.getParadaId(), destino.getParadaId(), via.getViaId(), rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId(), rutaTramoVO.getClaseServicio().getClaseservicioId()); - if (orgaoTramo != null) { - nuevaSecuencia.setCoeficienteTarifa1(orgaoTramo.getCoeficienteTarifa1()); - nuevaSecuencia.setKmCoeficiente1(orgaoTramo.getKmCoeficiente1()); - nuevaSecuencia.setCoeficienteTarifa2(orgaoTramo.getCoeficienteTarifa2()); - nuevaSecuencia.setKmCoeficiente2(orgaoTramo.getKmCoeficiente2()); - nuevaSecuencia.setCoeficienteTarifa3(orgaoTramo.getCoeficienteTarifa3()); - nuevaSecuencia.setKmCoeficiente3(orgaoTramo.getKmCoeficiente3()); - nuevaSecuencia.setOrgaoTramoId(orgaoTramo.getOrgaoTramoId()); - } else if (IsClasseAlterada(rutaTramoVO)) { - orgaoTramo = orgaoTramoDAO.buscar(origen.getParadaId(), destino.getParadaId(), via.getViaId(), rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId(), rutaTramoVO.getClaseServicioRutaOrigem().getClaseservicioId()); - if (orgaoTramo != null) { - nuevaSecuencia.setKmCoeficiente1(orgaoTramo.getKmCoeficiente1()); - nuevaSecuencia.setKmCoeficiente2(orgaoTramo.getKmCoeficiente2()); - nuevaSecuencia.setKmCoeficiente3(orgaoTramo.getKmCoeficiente3()); - nuevaSecuencia.setOrgaoTramoId(orgaoTramo.getOrgaoTramoId()); - nuevaSecuencia.setClaseServicioRutaOrigemUtilizadaNaPesquisa(true); - } - } - incluirCoeficiente(nuevaSecuencia, rutaTramoVO); - } - - private void atualizandoSecuenciaPorTramosExistente(RutaTramoVO rutaTramoVO, Parada origen, Parada destino, Via via, SecuenciaRutaTramoCoeficienteVO nuevaSecuencia) { - TramoServicio tramoServicio = tramoServicioService.buscar(origen, destino, via, rutaTramoVO.getClaseServicio()); - if (tramoServicio != null) { - nuevaSecuencia.setKmReal(tramoServicio.getTramo().getKmReal()); - nuevaSecuencia.setTiempoRecorrido(new HoraSistema(tramoServicio.getTiemporecorrido())); - nuevaSecuencia.setTramoId(tramoServicio.getTramo().getTramoId()); - nuevaSecuencia.setTramoServicioId(tramoServicio.getTramoservicioId()); - } else if (IsClasseAlterada(rutaTramoVO)) { - tramoServicio = tramoServicioService.buscar(origen, destino, via, rutaTramoVO.getClaseServicioRutaOrigem()); - if (tramoServicio != null) { - nuevaSecuencia.setKmReal(tramoServicio.getTramo().getKmReal()); - nuevaSecuencia.setTiempoRecorrido(new HoraSistema(tramoServicio.getTiemporecorrido())); - nuevaSecuencia.setTramoId(tramoServicio.getTramo().getTramoId()); - nuevaSecuencia.setTramoServicioId(tramoServicio.getTramoservicioId()); - } - } - } - - private boolean IsClasseAlterada(RutaTramoVO rutaTramoVO) { - return rutaTramoVO.getClaseServicioRutaOrigem() != null && rutaTramoVO.getClaseServicio().getClaseservicioId()!=rutaTramoVO.getClaseServicioRutaOrigem().getClaseservicioId(); - } - - private void incluirCoeficiente(SecuenciaRutaTramoCoeficienteVO nuevaSecuencia, RutaTramoVO rutaTramoVO) { - if (nuevaSecuencia.getKmCoeficiente1() == null && rutaTramoVO.getCoeficienteDefault1() != null) { - nuevaSecuencia.setKmCoeficiente1(nuevaSecuencia.getKmReal()); - } - if (nuevaSecuencia.getKmCoeficiente2() == null && rutaTramoVO.getCoeficienteDefault2() != null) { - nuevaSecuencia.setKmCoeficiente2(nuevaSecuencia.getKmReal()); - } - if (nuevaSecuencia.getKmCoeficiente3() == null && rutaTramoVO.getCoeficienteDefault3() != null) { - nuevaSecuencia.setKmCoeficiente3(nuevaSecuencia.getKmReal()); - } - } - - @Override - public List generarCombinacionTrechoRuta(RutaTramoVO rutaTramoVO, List secuenciasDestino) { - // una nueva lista que va a ser ordenada. Con eso, no afecta la lista original - - List lsSecuenciaCombinacionRutaTramoVO = new ArrayList(); - - List secuencias = rutaTramoVO.getLsParadaSecuenciaCombinacaoLinhas(); - - for (ParadaSecuenciaCombinacaoLinha secuencia: secuencias){ - Parada origem = secuencia.getOrigem().getParada(); - Via via = secuencia.getVia(); - - BigDecimal totalKmsReal = BigDecimal.ZERO; - - BigDecimal kmsRealOrigem = secuencia.getKmReal() == null || secuencia.getKmReal().isEmpty() ? BigDecimal.ZERO : - new BigDecimal(secuencia.getKmReal()); - - totalKmsReal = totalKmsReal.add(kmsRealOrigem); - HoraSistema tempoTotalOrigemDestino = secuencia.getTempoReal().isEmpty() ? new HoraSistema() : new HoraSistema(DateUtil.getDataTempoDecorrido(secuencia.getTempoReal()));; - - for (ParadaSecuencia secuenciaDestino : secuenciasDestino) { - - //O processo não é realizado na ordem inversa (em que a sequencia da origem é maior que a sequencia de seus destinos), considerando que esse é o processo inversa a ida ou a volta. - if (secuencia.getOrigem().getSecuencia() >= secuenciaDestino.getSecuencia()){ - continue; - } - - Parada destino = secuenciaDestino.getParada(); - - //A primeira seguencia sempre será a origem - //A segunda sequencia sempre recebe a km e o tempo da origem - if (secuenciaDestino.getSecuencia() > 2) { - tempoTotalOrigemDestino = calcularTempoTotalDestino(secuencia, secuenciaDestino.getSecuencia()); - totalKmsReal = calcularKmDestino(secuencia, secuenciaDestino.getSecuencia()); - } - - SecuenciaRutaTramoCoeficienteVO nuevaSecuencia = new SecuenciaRutaTramoCoeficienteVO(origem, destino, via, - secuencia.getOrigem().getSecuencia().intValue(), totalKmsReal, tempoTotalOrigemDestino, rutaTramoVO.getNumRuta()); - - atualizandoSecuenciaPorViaExistente(rutaTramoVO, origem, destino, via, nuevaSecuencia); - - - nuevaSecuencia.setNumRuta(rutaTramoVO.getNumRuta()); - - lsSecuenciaCombinacionRutaTramoVO.add(nuevaSecuencia); - } - } - - return lsSecuenciaCombinacionRutaTramoVO; - } - - /** - * Genera los datos de tramo, tramo tiempo e coeficiente tarifa sino existen los datos - * - * @param secuencia - * @param claseServicio - * @param orgaoConcedente - * @return - */ - private boolean generarDatos(SecuenciaRutaTramoCoeficienteVO secuencia, ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente) { - TramoServicio tramoServicio = tramoServicioDAO.buscar(secuencia.getOrigen(), secuencia.getDestino(), secuencia.getVia(), claseServicio); - - Tramo tramo = null; - if (tramoServicio == null) { - tramo = tramoService.buscar(secuencia.getOrigen(), secuencia.getDestino(), secuencia.getVia()); - if (tramo == null) { - if(secuencia.getTramoId() != null){ - tramo = tramoService.obtenerID(secuencia.getTramoId()); - }else{ - tramo = new Tramo(); - tramo.setDesctramo(tramoService.gerarDescripcionTramo(secuencia.getOrigen(), secuencia.getDestino(), secuencia.getVia())); - tramo.setOrigem(secuencia.getOrigen()); - tramo.setDestino(secuencia.getDestino()); - tramo.setKmReal(secuencia.getKmReal()); - tramo.setKmEntradaSaida(secuencia.getKmSaidaOrigen() == null ? BigDecimal.ZERO : secuencia.getKmSaidaOrigen()); - tramo.setKmEntradaSaidaDestino(secuencia.getKmEntradaDestino() == null ? BigDecimal.ZERO : secuencia.getKmEntradaDestino()); - tramo.setVia(secuencia.getVia()); - tramo.setActivo(Boolean.TRUE); - tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - tramo.setFecmodif(new java.util.Date()); - - tramo = tramoDAO.suscribir(tramo); - } - } - tramoServicio = new TramoServicio(); - tramoServicio.setClaseServicio(claseServicio); - tramoServicio.setTramo(tramo); - tramoServicio.setTiemporecorrido(secuencia.getTiempoRecorrido().getFecha()); - - tramoServicio = tramoServicioService.suscribir(tramoServicio); - - susCribrirOrgaoTramo(secuencia, claseServicio, orgaoConcedente, tramo); - - return true; - } - - susCribrirOrgaoTramo(secuencia, claseServicio, orgaoConcedente, tramo); - - return false; - } - - private void susCribrirOrgaoTramo(SecuenciaRutaTramoCoeficienteVO secuencia, ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente, Tramo tramo) { - - if(tramo == null) { - if(secuencia.getTramoId() != null){ - tramo = tramoService.obtenerID(secuencia.getTramoId()); - } - } - - if ((secuencia.getClaseServicioRutaOrigemUtilizadaNaPesquisa() || secuencia.getOrgaoTramoId() == null ) - && secuencia.getCoeficienteTarifa1() != null) { - OrgaoTramo orgaoTramo = new OrgaoTramo(); - orgaoTramo.setClaseServicio(claseServicio); - orgaoTramo.setOrgaoConcedente(orgaoConcedente); - orgaoTramo.setTramo(tramo); - - orgaoTramo.setActivo(Boolean.TRUE); - orgaoTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - orgaoTramo.setFecmodif(new java.util.Date()); - orgaoTramo.setCoeficienteTarifa1(secuencia.getCoeficienteTarifa1()); - orgaoTramo.setKmCoeficiente1(secuencia.getKmCoeficiente1()); - - if (secuencia.getCoeficienteTarifa2() != null) { - orgaoTramo.setCoeficienteTarifa2(secuencia.getCoeficienteTarifa2()); - orgaoTramo.setKmCoeficiente2(secuencia.getKmCoeficiente2()); - } - - if (secuencia.getCoeficienteTarifa3() != null) { - orgaoTramo.setCoeficienteTarifa3(secuencia.getCoeficienteTarifa3()); - orgaoTramo.setKmCoeficiente3(secuencia.getKmCoeficiente3()); - } - - orgaoTramoDAO.suscribir(orgaoTramo); - } - } - - @Transactional(rollbackFor = BusinessException.class) - @Override - public void generarTramosRutaExistente(RutaTramoVO rutaTramoVO, Ruta ruta) throws BusinessException { - - this.validarGenerarTramosRutas(rutaTramoVO); - - // Genero los tramos y tramos servicios de la combinacion que no existen - // Aqui si genera tambien los tramos de la secuencia - for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { - log.debug("Origen:" + s.getOrigen() + ";Destino:" + s.getDestino() + ";Via:" + s.getVia()); - boolean fueGenerado = generarDatos(s, rutaTramoVO.getClaseServicio(), rutaTramoVO.getOrgaoConcedente()); - log.debug("Fue Generado:" + fueGenerado); - } - - // Genero la secuencia de la ruta - for (SecuenciaRutaTramoVO s : rutaTramoVO.getLsSecuenciaRutaTramoVO()) { - RutaSecuencia rutaSecuencia = new RutaSecuencia(); - rutaSecuencia.setNumsecuencia(s.getSecuencia().shortValue()); - rutaSecuencia.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); - rutaSecuencia.setRuta(ruta); - rutaSecuencia.setKmOriginal(rutaSecuencia.getTramo().getKmRealSemKmEntradaSaida()); - - if (rutaSecuencia.getRuta() == null && rutaSecuencia.getRuta().getRutaId() == null) { - rutaService.suscribir(rutaSecuencia.getRuta(), null); - } - rutaSecuencia = rutaSecuenciaService.suscribir(rutaSecuencia); - - if (rutaSecuencia.getRutasecuenciaId() == null){ - throw new BusinessException(Labels.getLabel("gerarCombinacionTramoRutaController.MSG.error.rutaSecuencia")); - } - } - - for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { - RutaCombinacion rutaCombinacion = new RutaCombinacion(); - rutaCombinacion.setIndventa(s.getPermiteVenda() == null ? true : s.getPermiteVenda()); - if (ruta.getIsClone() ) { - Tramo tramoAtual = tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia()); - for (RutaCombinacion rcRuta : ruta.getRutaCombinacionList()) { - if (rcRuta.getTramo() != null && tramoAtual != null && rcRuta.getTramo().getTramoId() == tramoAtual.getTramoId()) { - rutaCombinacion.setIndventa(rcRuta.getIndventa() == null ? true : rcRuta.getIndventa()); - } - } - } - - - rutaCombinacion.setRuta(ruta); - rutaCombinacion.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); - - rutaCombinacion = rutaCombinacionService.suscribir(rutaCombinacion); - - if (rutaCombinacion.getRutacombinacionId() == null){ - throw new BusinessException(Labels.getLabel("gerarCombinacionTramoRutaController.MSG.error.rutaCombinacion")); - } - } - } - - //calculo do tempo sempre considerando que o calculo deve ser feito desconsiderando o valor do tempo, - //inicializando com o tempo da origem e incrementando as sequencias anteriores - private HoraSistema calcularTempoTotalDestino(ParadaSecuenciaCombinacaoLinha sequenciaOrigem, int numSeqAtual) { - HoraSistema horaSistema = sequenciaOrigem.getTempoReal().isEmpty() ? new HoraSistema() : new HoraSistema(DateUtil.getDataTempoDecorrido(sequenciaOrigem.getTempoReal())); - - for (ParadaSecuencia destino: sequenciaOrigem.getDestinos()) { - HoraSistema horaSistemaDestino = destino.getTempoReal().isEmpty() ? new HoraSistema() : - new HoraSistema(DateUtil.getDataTempoDecorrido(destino.getTempoReal())); - - //desconsidera o tempo para os destinos com sequencia inferior a origem, já que estes já foram calculados - if (sequenciaOrigem.getOrigem().getSecuencia() > destino.getSecuencia()) { - continue; - } - - //faz o calculo para a sequencia do destino para qual o tempo está sendo calculado - if (destino.getSecuencia() == numSeqAtual){ - break; - } - - horaSistema = horaSistema.sumar(horaSistemaDestino); - } - - return horaSistema; - - } - - //calculo da km sempre considerando que o calculo deve ser feito desconsiderando o valor da km, - //inicializando com o valor da km da origem e incrementando as sequencias anteriores - private BigDecimal calcularKmDestino(ParadaSecuenciaCombinacaoLinha sequenciaOrigem, int numSeqAtual) { - BigDecimal kmTotal= sequenciaOrigem.getKmReal() == null || sequenciaOrigem.getKmReal().isEmpty() ? BigDecimal.ZERO : - new BigDecimal(sequenciaOrigem.getKmReal()); - - for (ParadaSecuencia destino: sequenciaOrigem.getDestinos()) { - //desconsidera a km para os destinos com sequencia inferior a origem, já que estes já foram calculados - if (sequenciaOrigem.getOrigem().getSecuencia() > destino.getSecuencia()) { - continue; - } - - //faz o calculo para a sequencia do destino para qual a km está sendo calculada - if (destino.getSecuencia() == numSeqAtual){ - break; - } - - BigDecimal kmDestino= destino.getKmReal() == null || destino.getKmReal().isEmpty() ? BigDecimal.ZERO : - new BigDecimal(destino.getKmReal()); - - kmTotal = kmTotal.add(kmDestino); - } - - return kmTotal; - } - - @Transactional - public void limparInconsistenciasTramo() { - tramoServicioDAO.limparInconsistenciasTramo(); - } -} +package com.rjconsultores.ventaboletos.service.impl; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.dao.OrgaoTramoDAO; +import com.rjconsultores.ventaboletos.dao.RutaDAO; +import com.rjconsultores.ventaboletos.dao.TramoDAO; +import com.rjconsultores.ventaboletos.dao.TramoServicioDAO; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.OrgaoTramo; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.ParadaSecuencia; +import com.rjconsultores.ventaboletos.entidad.ParadaSecuenciaCombinacaoLinha; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaCombinacion; +import com.rjconsultores.ventaboletos.entidad.RutaEmpresa; +import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.entidad.TramoServicio; +import com.rjconsultores.ventaboletos.entidad.Via; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.RutaCombinacionService; +import com.rjconsultores.ventaboletos.service.RutaEmpresaService; +import com.rjconsultores.ventaboletos.service.RutaSecuenciaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.service.TramoRutaService; +import com.rjconsultores.ventaboletos.service.TramoService; +import com.rjconsultores.ventaboletos.service.TramoServicioService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.HoraSistema; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.vo.esquemaoperacional.RutaTramoVO; +import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoCoeficienteVO; +import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoVO; + +@Service("tramoRutaService") +public class TramoRutaServiceImpl implements TramoRutaService { + + private static final Logger log = LogManager.getLogger(TramoRutaServiceImpl.class); + @Autowired + private RutaCombinacionService rutaCombinacionService; + @Autowired + private RutaSecuenciaService rutaSecuenciaService; + @Autowired + private RutaEmpresaService rutaEmpresaService; + @Autowired + private RutaService rutaService; + @Autowired + private TramoService tramoService; + @Autowired + private TramoServicioService tramoServicioService; + @Autowired + private RutaDAO rutaDAO; + @Autowired + private OrgaoTramoDAO orgaoTramoDAO; + @Autowired + private TramoServicioDAO tramoServicioDAO; + @Autowired + private TramoDAO tramoDAO; + + /** + * Hace la validación de los datos del rutaTramoVO + * + * @param rutaTramoVO + * @throws BusinessException + */ + private void validarGenerarTramosRutas(RutaTramoVO rutaTramoVO) throws BusinessException { + if (rutaTramoVO.getLsSecuenciaRutaTramoVO().isEmpty()) { + throw new BusinessException("tramoRutaServiceImpl.msg.secuenciaObligatorio"); + } + if ((rutaTramoVO.getPrefixo() == null) || (rutaTramoVO.getPrefixo().isEmpty())) { + throw new BusinessException("tramoRutaServiceImpl.msg.prefixoObligatorio"); + } + if (rutaTramoVO.getLsEmpresa().isEmpty()) { + throw new BusinessException("tramoRutaServiceImpl.msg.empresaObligatoria"); + } + + if (rutaTramoVO.getLsCombinacionRutaTramoVO().isEmpty()) { + throw new BusinessException("tramoRutaServiceImpl.msg.combinacionObligatorio"); + } + for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { + if (s.getTramoId() != null) { + continue; + } + if ((s.getOrigen() == null) || (s.getDestino() == null) || (s.getVia() == null) + || (s.getKmReal() == null) || (s.getSecuencia() == null) || (s.getTiempoRecorrido() == null) + || ((rutaTramoVO.getOrgaoConcedente() == null || !rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId().equals(21) + && ((s.getCoeficienteTarifa1() == null) || (s.getKmCoeficiente1() == null) || (s.getKmCoeficiente1() == BigDecimal.ZERO))))) { + + throw new BusinessException("tramoRutaServiceImpl.msg.cambosObligatoriosCombinacion", new Object[] { s.getOrigen(), s.getDestino() }); + } + } + for (SecuenciaRutaTramoVO s : rutaTramoVO.getLsSecuenciaRutaTramoVO()) { + if (s.getTramoId() != null) { + continue; + } + if ((s.getOrigen() == null) || (s.getDestino() == null) || (s.getVia() == null) + || (s.getKmReal() == null) || (s.getSecuencia() == null) || (s.getTiempoRecorrido() == null)) { + throw new BusinessException("tramoRutaServiceImpl.msg.cambosObligatoriosSecuencia", new Object[] { s.getOrigen(), + s.getDestino() }); + } + } + } + + @Transactional(rollbackFor = BusinessException.class) + @Override + public Ruta generarTramosRutas(RutaTramoVO rutaTramoVO, Boolean isRegreso) throws BusinessException { + + this.validarGenerarTramosRutas(rutaTramoVO); + + // Genero los tramos y tramos servicios de la combinacion que no existen + // Aqui si genera tambien los tramos de la secuencia + for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { + log.debug("Origen:" + s.getOrigen() + ";Destino:" + s.getDestino() + ";Via:" + s.getVia()); + boolean fueGenerado = generarDatos(s, rutaTramoVO.getClaseServicio(), rutaTramoVO.getOrgaoConcedente()); + log.debug("Fue Generado:" + fueGenerado); + } + + // Genero la ruta + Ruta ruta = new Ruta(); + ruta.setDescruta(rutaTramoVO.getDescRuta()); + ruta.setClaseServicio(rutaTramoVO.getClaseServicio()); + ruta.setOrgaoConcedente(rutaTramoVO.getOrgaoConcedente()); + ruta.setIndNombreObligatorio(rutaTramoVO.getSolicitaNombrePasajero()); + ruta.setIndSentidoIda(rutaTramoVO.getIndSentidoIda()); + ruta.setIndTelefoneObrigatorio(false); + if (rutaTramoVO.getVentaHandHeld() == null) { + ruta.setVentaOffLine(false); + } else { + ruta.setVentaOffLine(rutaTramoVO.getVentaHandHeld()); + } + + ruta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + ruta.setActivo(Boolean.TRUE); + ruta.setFecmodif(new java.util.Date()); + ruta.setPrefixo(rutaTramoVO.getPrefixo()); + ruta.setNumRuta(rutaTramoVO.getNumRuta()); + //valores de tributação para ecf + ruta.setIndTribPedagio(Boolean.FALSE); + ruta.setIndTribTarifa(Boolean.TRUE); + ruta.setIndTribTaxaEmbarque(Boolean.FALSE); + ruta.setIndRutaInternacional(Boolean.FALSE); + + ruta = rutaDAO.suscribir(ruta); + + // Genero la secuencia de la ruta + for (SecuenciaRutaTramoVO s : rutaTramoVO.getLsSecuenciaRutaTramoVO()) { + RutaSecuencia rutaSecuencia = new RutaSecuencia(); + rutaSecuencia.setNumsecuencia(s.getSecuencia().shortValue()); + rutaSecuencia.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); + rutaSecuencia.setCantKmEntradaSaida(s.getKmEntradaSaida()); + rutaSecuencia.setKmOriginal(s.getKmOriginal()); + + + if(rutaSecuencia.getTramo() == null ){ + Tramo tramo = new Tramo(); + tramo.setDesctramo(tramoService.gerarDescripcionTramo(s.getOrigen(), s.getDestino(), s.getVia())); + tramo.setOrigem(s.getOrigen()); + tramo.setDestino(s.getDestino()); + tramo.setKmReal(s.getKmReal()); + tramo.setKmEntradaSaida(s.getKmSaidaOrigen()); + tramo.setKmEntradaSaidaDestino(s.getKmEntradaDestino()); + tramo.setVia(s.getVia()); + tramo.setActivo(Boolean.TRUE); + tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + tramo.setFecmodif(new java.util.Date()); + + tramo = tramoDAO.suscribir(tramo); + rutaSecuencia.setTramo(tramo); + } else { + Tramo tramo = rutaSecuencia.getTramo(); + tramo.setKmEntradaSaida(s.getKmSaidaOrigen()); + tramo.setKmEntradaSaidaDestino(s.getKmEntradaDestino()); + tramo = tramoDAO.actualizacion(tramo); + } + rutaSecuencia.setRuta(ruta); + rutaSecuencia = rutaSecuenciaService.suscribir(rutaSecuencia); + } + + for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { + RutaCombinacion rutaCombinacion = new RutaCombinacion(); + rutaCombinacion.setIndventa(s.getPermiteVenda() == null ? true : s.getPermiteVenda()); + rutaCombinacion.setRuta(ruta); + rutaCombinacion.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); + + rutaCombinacion = rutaCombinacionService.suscribir(rutaCombinacion); + } + + for (Empresa e : rutaTramoVO.getLsEmpresa()) { + RutaEmpresa rutaEmpresa = new RutaEmpresa(); + rutaEmpresa.setEmpresa(e); + rutaEmpresa.setActivo(Boolean.TRUE); + rutaEmpresa.setFecmodif(Calendar.getInstance().getTime()); + rutaEmpresa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + rutaEmpresa.setRuta(ruta); + + rutaEmpresa = rutaEmpresaService.suscribir(rutaEmpresa); + } + + return ruta; + } + + @Override + public RutaTramoVO generarRutaRegreso(RutaTramoVO rutaTramoVO) { + RutaTramoVO rutaTramoRegresoVO = new RutaTramoVO(); + rutaTramoRegresoVO.setClaseServicio(rutaTramoVO.getClaseServicio()); + rutaTramoRegresoVO.setOrgaoConcedente(rutaTramoVO.getOrgaoConcedente()); + rutaTramoRegresoVO.setSolicitaNombrePasajero(rutaTramoVO.getSolicitaNombrePasajero()); + rutaTramoRegresoVO.setVentaHandHeld(rutaTramoVO.getVentaHandHeld() == null ? true : rutaTramoVO.getVentaHandHeld()); + rutaTramoRegresoVO.setLsEmpresa(rutaTramoVO.getLsEmpresa()); + + if (rutaTramoVO.getIndSentidoIda()) { + rutaTramoRegresoVO.setIndSentidoIda(Boolean.FALSE); + } else { + rutaTramoRegresoVO.setIndSentidoIda(Boolean.TRUE); + } + rutaTramoRegresoVO.setNumRuta(rutaTramoVO.getNumRuta()); + rutaTramoRegresoVO.setPrefixo(rutaTramoVO.getPrefixo()); + if (rutaTramoVO.getDescRuta() != null) { + rutaTramoRegresoVO.setDescRuta(rutaTramoVO.getDescRuta()); + } else { + rutaTramoRegresoVO.setDescRuta("-"); + } + + List lsSecuenciaRutaTramoRegresoVO = new ArrayList(); + List lsSecuenciaRutaTramoIdaVO = new ArrayList(rutaTramoVO.getLsSecuenciaRutaTramoVO()); + // Reordena a lista + Collections.reverse(lsSecuenciaRutaTramoIdaVO); + + int secuencia = 0; + + Map kmEntradaSaida = rutaTramoVO.getParadasComKmEntradaSaida(); + + for (SecuenciaRutaTramoVO s : lsSecuenciaRutaTramoIdaVO) { + TramoServicio tramoServicio = tramoServicioService.buscar(s.getDestino(), s.getOrigen(), s.getVia(), rutaTramoVO.getClaseServicio()); + if (tramoServicio != null) { + s.setTramoId(tramoServicio.getTramo().getTramoId()); + s.setTramoServicioId(tramoServicio.getTramoservicioId()); + + lsSecuenciaRutaTramoRegresoVO.add(new SecuenciaRutaTramoVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), + s.getTramoId(), s.getTramoServicioId(), rutaTramoRegresoVO.getNumRuta(), rutaTramoRegresoVO.getIndSentidoIda(), kmEntradaSaida.containsKey(s.getDestino()) ? kmEntradaSaida.get(s.getDestino()) : BigDecimal.ZERO )); + } else { + lsSecuenciaRutaTramoRegresoVO.add(new SecuenciaRutaTramoVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), rutaTramoRegresoVO.getNumRuta(), rutaTramoRegresoVO.getIndSentidoIda(),kmEntradaSaida.containsKey(s.getDestino()) ? kmEntradaSaida.get(s.getDestino()) : BigDecimal.ZERO )); + } + } + rutaTramoRegresoVO.setLsSecuenciaRutaTramoVO(lsSecuenciaRutaTramoRegresoVO); + + List lsCombinacionRutaTramoRegresoVO = new ArrayList(); + List lsCombinacionTramoIdaVO = new ArrayList(rutaTramoVO.getLsCombinacionRutaTramoVO()); + Collections.sort(lsCombinacionTramoIdaVO, new Comparator() { + + @Override + public int compare(SecuenciaRutaTramoCoeficienteVO o1, SecuenciaRutaTramoCoeficienteVO o2) { + return o2.getSecuencia().compareTo(o1.getSecuencia()); + } + }); + + secuencia = 0; + for (SecuenciaRutaTramoCoeficienteVO s : lsCombinacionTramoIdaVO) { + TramoServicio tramoServicio = tramoServicioService.buscar(s.getDestino(), s.getOrigen(), s.getVia(), rutaTramoVO.getClaseServicio()); + if (tramoServicio != null) { + s.setTramoId(tramoServicio.getTramo().getTramoId()); + s.setTramoServicioId(tramoServicio.getTramoservicioId()); + + SecuenciaRutaTramoCoeficienteVO secuenciaRutaTramoCoeficienteVO = new SecuenciaRutaTramoCoeficienteVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), + s.getTramoId(), s.getTramoServicioId(), rutaTramoRegresoVO.getNumRuta(), s.getKmSaidaOrigen()); + + OrgaoTramo orgaoTramo = orgaoTramoDAO.buscar(s.getDestino().getParadaId(), s.getOrigen().getParadaId(), s.getVia().getViaId(), rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId(), rutaTramoVO.getClaseServicio().getClaseservicioId()); + + if (orgaoTramo != null) { + secuenciaRutaTramoCoeficienteVO.setOrgaoTramoId(orgaoTramo.getOrgaoTramoId()); + + secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa1(s.getCoeficienteTarifa1()); + secuenciaRutaTramoCoeficienteVO.setKmCoeficiente1(s.getKmCoeficiente1()); + + if (s.getCoeficienteTarifa2() != null) { + secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa2(s.getCoeficienteTarifa2()); + secuenciaRutaTramoCoeficienteVO.setKmCoeficiente2(s.getKmCoeficiente2()); + } + + if (s.getCoeficienteTarifa3() != null) { + secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa3(s.getCoeficienteTarifa3()); + secuenciaRutaTramoCoeficienteVO.setKmCoeficiente3(s.getKmCoeficiente3()); + } + } + + secuenciaRutaTramoCoeficienteVO.setPermiteVenda(s.getPermiteVenda()); + lsCombinacionRutaTramoRegresoVO.add(secuenciaRutaTramoCoeficienteVO); + } else { + SecuenciaRutaTramoCoeficienteVO secuenciaRutaTramoCoeficienteVO = new SecuenciaRutaTramoCoeficienteVO(s.getDestino(), s.getOrigen(), s.getVia(), ++secuencia, s.getKmReal(), s.getTiempoRecorrido(), rutaTramoRegresoVO.getNumRuta(), s.getKmSaidaOrigen()); + + secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa1(s.getCoeficienteTarifa1()); + secuenciaRutaTramoCoeficienteVO.setKmCoeficiente1(s.getKmCoeficiente1()); + + secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa2(s.getCoeficienteTarifa2()); + secuenciaRutaTramoCoeficienteVO.setKmCoeficiente2(s.getKmCoeficiente2()); + + secuenciaRutaTramoCoeficienteVO.setCoeficienteTarifa3(s.getCoeficienteTarifa3()); + secuenciaRutaTramoCoeficienteVO.setKmCoeficiente3(s.getKmCoeficiente3()); + secuenciaRutaTramoCoeficienteVO.setPermiteVenda(s.getPermiteVenda()); + + lsCombinacionRutaTramoRegresoVO.add(secuenciaRutaTramoCoeficienteVO); + } + + } + rutaTramoRegresoVO.setLsCombinacionRutaTramoVO(lsCombinacionRutaTramoRegresoVO); + + return rutaTramoRegresoVO; + } + + @Override + public List generarCombinacion(RutaTramoVO rutaTramoVO) { + List lsSecuenciaRutaTramoVO = new ArrayList(rutaTramoVO.getLsSecuenciaRutaTramoVO()); + List lsSecuenciaCombinacionRutaTramoVO = new ArrayList(); + + Collections.sort(lsSecuenciaRutaTramoVO); + + int secuencia = 0; + List listSecuenciaCalculada = new ArrayList(lsSecuenciaRutaTramoVO); + + for (SecuenciaRutaTramoVO secuenciaInicial : lsSecuenciaRutaTramoVO) { + Parada origen = secuenciaInicial.getOrigen(); + Parada destino = secuenciaInicial.getDestino(); + + listSecuenciaCalculada.remove(secuenciaInicial); + + BigDecimal totalKmsReal = secuenciaInicial.getKmReal(); + totalKmsReal = totalKmsReal.add(secuenciaInicial.getKmSaidaOrigen().add(secuenciaInicial.getKmEntradaDestino())); + + HoraSistema totalTiempoRecorrido = secuenciaInicial.getTiempoRecorrido(); + + Via via = secuenciaInicial.getVia(); + + secuencia = criaSecuenciaRutaTramoCoeficienteVO(rutaTramoVO, lsSecuenciaCombinacionRutaTramoVO, secuencia, totalKmsReal, origen, destino, secuenciaInicial.getKmSaidaOrigen(), secuenciaInicial.getKmEntradaDestino(), totalTiempoRecorrido, via); + + for (SecuenciaRutaTramoVO secuenciaInterna : listSecuenciaCalculada) { + destino = secuenciaInterna.getDestino(); + totalKmsReal = totalKmsReal.add(secuenciaInterna.getKmReal()); + totalKmsReal = totalKmsReal.add(secuenciaInterna.getKmEntradaDestino()); + totalKmsReal = totalKmsReal.add(secuenciaInterna.getKmSaidaOrigen()); + totalTiempoRecorrido = totalTiempoRecorrido.sumar(secuenciaInterna.getTiempoRecorrido()); + + secuencia = criaSecuenciaRutaTramoCoeficienteVO(rutaTramoVO, lsSecuenciaCombinacionRutaTramoVO, secuencia, totalKmsReal, origen, destino, secuenciaInicial.getKmSaidaOrigen(), secuenciaInterna.getKmEntradaDestino(), totalTiempoRecorrido, via); + } + } + + return lsSecuenciaCombinacionRutaTramoVO; + } + + private int criaSecuenciaRutaTramoCoeficienteVO(RutaTramoVO rutaTramoVO, List lsSecuenciaCombinacionRutaTramoVO, int secuencia, BigDecimal totalKmsReal, Parada origen, Parada destino, BigDecimal kmSaidaOrigen, BigDecimal kmEntradaDestino, HoraSistema totalTiempoRecorrido, Via via) { + SecuenciaRutaTramoCoeficienteVO nuevaSecuencia = new SecuenciaRutaTramoCoeficienteVO(origen, destino, via, ++secuencia, + totalKmsReal, totalTiempoRecorrido, rutaTramoVO.getNumRuta()); + + atualizandoSecuenciaPorViaExistente(rutaTramoVO, origen, destino, via, nuevaSecuencia); + + nuevaSecuencia.setKmSaidaOrigen(kmSaidaOrigen); + nuevaSecuencia.setKmEntradaDestino(kmEntradaDestino); + nuevaSecuencia.setNumRuta(rutaTramoVO.getNumRuta()); + lsSecuenciaCombinacionRutaTramoVO.add(nuevaSecuencia); + + log.debug("Origen:" + nuevaSecuencia.getOrigen() + ";Destino:" + nuevaSecuencia.getDestino() + ";Via:" + + nuevaSecuencia.getVia() + ";KmsReal:" + nuevaSecuencia.getKmReal() + ";hora:" + nuevaSecuencia.getTiempoRecorrido()); + return secuencia; + } + + private void atualizandoSecuenciaPorViaExistente(RutaTramoVO rutaTramoVO, Parada origen, Parada destino, Via via, SecuenciaRutaTramoCoeficienteVO nuevaSecuencia) { + if (via != null) { + atualizandoSecuenciaPorTramosExistente(rutaTramoVO, origen, destino, via, nuevaSecuencia); + atualizandoSecuenciaPorOrgaoTramosExistentes(rutaTramoVO, origen, destino, via, nuevaSecuencia); + } + } + + private void atualizandoSecuenciaPorOrgaoTramosExistentes(RutaTramoVO rutaTramoVO, Parada origen, Parada destino, Via via, SecuenciaRutaTramoCoeficienteVO nuevaSecuencia) { + OrgaoTramo orgaoTramo = orgaoTramoDAO.buscar(origen.getParadaId(), destino.getParadaId(), via.getViaId(), rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId(), rutaTramoVO.getClaseServicio().getClaseservicioId()); + if (orgaoTramo != null) { + nuevaSecuencia.setCoeficienteTarifa1(orgaoTramo.getCoeficienteTarifa1()); + nuevaSecuencia.setKmCoeficiente1(orgaoTramo.getKmCoeficiente1()); + nuevaSecuencia.setCoeficienteTarifa2(orgaoTramo.getCoeficienteTarifa2()); + nuevaSecuencia.setKmCoeficiente2(orgaoTramo.getKmCoeficiente2()); + nuevaSecuencia.setCoeficienteTarifa3(orgaoTramo.getCoeficienteTarifa3()); + nuevaSecuencia.setKmCoeficiente3(orgaoTramo.getKmCoeficiente3()); + nuevaSecuencia.setOrgaoTramoId(orgaoTramo.getOrgaoTramoId()); + } else if (IsClasseAlterada(rutaTramoVO)) { + orgaoTramo = orgaoTramoDAO.buscar(origen.getParadaId(), destino.getParadaId(), via.getViaId(), rutaTramoVO.getOrgaoConcedente().getOrgaoConcedenteId(), rutaTramoVO.getClaseServicioRutaOrigem().getClaseservicioId()); + if (orgaoTramo != null) { + nuevaSecuencia.setKmCoeficiente1(orgaoTramo.getKmCoeficiente1()); + nuevaSecuencia.setKmCoeficiente2(orgaoTramo.getKmCoeficiente2()); + nuevaSecuencia.setKmCoeficiente3(orgaoTramo.getKmCoeficiente3()); + nuevaSecuencia.setOrgaoTramoId(orgaoTramo.getOrgaoTramoId()); + nuevaSecuencia.setClaseServicioRutaOrigemUtilizadaNaPesquisa(true); + } + } + incluirCoeficiente(nuevaSecuencia, rutaTramoVO); + } + + private void atualizandoSecuenciaPorTramosExistente(RutaTramoVO rutaTramoVO, Parada origen, Parada destino, Via via, SecuenciaRutaTramoCoeficienteVO nuevaSecuencia) { + TramoServicio tramoServicio = tramoServicioService.buscar(origen, destino, via, rutaTramoVO.getClaseServicio()); + if (tramoServicio != null) { + nuevaSecuencia.setKmReal(tramoServicio.getTramo().getKmReal()); + nuevaSecuencia.setTiempoRecorrido(new HoraSistema(tramoServicio.getTiemporecorrido())); + nuevaSecuencia.setTramoId(tramoServicio.getTramo().getTramoId()); + nuevaSecuencia.setTramoServicioId(tramoServicio.getTramoservicioId()); + } else if (IsClasseAlterada(rutaTramoVO)) { + tramoServicio = tramoServicioService.buscar(origen, destino, via, rutaTramoVO.getClaseServicioRutaOrigem()); + if (tramoServicio != null) { + nuevaSecuencia.setKmReal(tramoServicio.getTramo().getKmReal()); + nuevaSecuencia.setTiempoRecorrido(new HoraSistema(tramoServicio.getTiemporecorrido())); + nuevaSecuencia.setTramoId(tramoServicio.getTramo().getTramoId()); + nuevaSecuencia.setTramoServicioId(tramoServicio.getTramoservicioId()); + } + } + } + + private boolean IsClasseAlterada(RutaTramoVO rutaTramoVO) { + return rutaTramoVO.getClaseServicioRutaOrigem() != null && rutaTramoVO.getClaseServicio().getClaseservicioId()!=rutaTramoVO.getClaseServicioRutaOrigem().getClaseservicioId(); + } + + private void incluirCoeficiente(SecuenciaRutaTramoCoeficienteVO nuevaSecuencia, RutaTramoVO rutaTramoVO) { + if (nuevaSecuencia.getKmCoeficiente1() == null && rutaTramoVO.getCoeficienteDefault1() != null) { + nuevaSecuencia.setKmCoeficiente1(nuevaSecuencia.getKmReal()); + } + if (nuevaSecuencia.getKmCoeficiente2() == null && rutaTramoVO.getCoeficienteDefault2() != null) { + nuevaSecuencia.setKmCoeficiente2(nuevaSecuencia.getKmReal()); + } + if (nuevaSecuencia.getKmCoeficiente3() == null && rutaTramoVO.getCoeficienteDefault3() != null) { + nuevaSecuencia.setKmCoeficiente3(nuevaSecuencia.getKmReal()); + } + } + + @Override + public List generarCombinacionTrechoRuta(RutaTramoVO rutaTramoVO, List secuenciasDestino) { + // una nueva lista que va a ser ordenada. Con eso, no afecta la lista original + + List lsSecuenciaCombinacionRutaTramoVO = new ArrayList(); + + List secuencias = rutaTramoVO.getLsParadaSecuenciaCombinacaoLinhas(); + + for (ParadaSecuenciaCombinacaoLinha secuencia: secuencias){ + Parada origem = secuencia.getOrigem().getParada(); + Via via = secuencia.getVia(); + + BigDecimal totalKmsReal = BigDecimal.ZERO; + + BigDecimal kmsRealOrigem = secuencia.getKmReal() == null || secuencia.getKmReal().isEmpty() ? BigDecimal.ZERO : + new BigDecimal(secuencia.getKmReal()); + + totalKmsReal = totalKmsReal.add(kmsRealOrigem); + HoraSistema tempoTotalOrigemDestino = secuencia.getTempoReal().isEmpty() ? new HoraSistema() : new HoraSistema(DateUtil.getDataTempoDecorrido(secuencia.getTempoReal()));; + + for (ParadaSecuencia secuenciaDestino : secuenciasDestino) { + + //O processo não é realizado na ordem inversa (em que a sequencia da origem é maior que a sequencia de seus destinos), considerando que esse é o processo inversa a ida ou a volta. + if (secuencia.getOrigem().getSecuencia() >= secuenciaDestino.getSecuencia()){ + continue; + } + + Parada destino = secuenciaDestino.getParada(); + + //A primeira seguencia sempre será a origem + //A segunda sequencia sempre recebe a km e o tempo da origem + if (secuenciaDestino.getSecuencia() > 2) { + tempoTotalOrigemDestino = calcularTempoTotalDestino(secuencia, secuenciaDestino.getSecuencia()); + totalKmsReal = calcularKmDestino(secuencia, secuenciaDestino.getSecuencia()); + } + + SecuenciaRutaTramoCoeficienteVO nuevaSecuencia = new SecuenciaRutaTramoCoeficienteVO(origem, destino, via, + secuencia.getOrigem().getSecuencia().intValue(), totalKmsReal, tempoTotalOrigemDestino, rutaTramoVO.getNumRuta()); + + atualizandoSecuenciaPorViaExistente(rutaTramoVO, origem, destino, via, nuevaSecuencia); + + + nuevaSecuencia.setNumRuta(rutaTramoVO.getNumRuta()); + + lsSecuenciaCombinacionRutaTramoVO.add(nuevaSecuencia); + } + } + + return lsSecuenciaCombinacionRutaTramoVO; + } + + /** + * Genera los datos de tramo, tramo tiempo e coeficiente tarifa sino existen los datos + * + * @param secuencia + * @param claseServicio + * @param orgaoConcedente + * @return + */ + private boolean generarDatos(SecuenciaRutaTramoCoeficienteVO secuencia, ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente) { + TramoServicio tramoServicio = tramoServicioDAO.buscar(secuencia.getOrigen(), secuencia.getDestino(), secuencia.getVia(), claseServicio); + + Tramo tramo = null; + if (tramoServicio == null) { + tramo = tramoService.buscar(secuencia.getOrigen(), secuencia.getDestino(), secuencia.getVia()); + if (tramo == null) { + if(secuencia.getTramoId() != null){ + tramo = tramoService.obtenerID(secuencia.getTramoId()); + }else{ + tramo = new Tramo(); + tramo.setDesctramo(tramoService.gerarDescripcionTramo(secuencia.getOrigen(), secuencia.getDestino(), secuencia.getVia())); + tramo.setOrigem(secuencia.getOrigen()); + tramo.setDestino(secuencia.getDestino()); + tramo.setKmReal(secuencia.getKmReal()); + tramo.setKmEntradaSaida(secuencia.getKmSaidaOrigen() == null ? BigDecimal.ZERO : secuencia.getKmSaidaOrigen()); + tramo.setKmEntradaSaidaDestino(secuencia.getKmEntradaDestino() == null ? BigDecimal.ZERO : secuencia.getKmEntradaDestino()); + tramo.setVia(secuencia.getVia()); + tramo.setActivo(Boolean.TRUE); + tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + tramo.setFecmodif(new java.util.Date()); + + tramo = tramoDAO.suscribir(tramo); + } + } + tramoServicio = new TramoServicio(); + tramoServicio.setClaseServicio(claseServicio); + tramoServicio.setTramo(tramo); + tramoServicio.setTiemporecorrido(secuencia.getTiempoRecorrido().getFecha()); + + tramoServicio = tramoServicioService.suscribir(tramoServicio); + + susCribrirOrgaoTramo(secuencia, claseServicio, orgaoConcedente, tramo); + + return true; + } + + susCribrirOrgaoTramo(secuencia, claseServicio, orgaoConcedente, tramo); + + return false; + } + + private void susCribrirOrgaoTramo(SecuenciaRutaTramoCoeficienteVO secuencia, ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente, Tramo tramo) { + + if(tramo == null) { + if(secuencia.getTramoId() != null){ + tramo = tramoService.obtenerID(secuencia.getTramoId()); + } + } + + if ((secuencia.getClaseServicioRutaOrigemUtilizadaNaPesquisa() || secuencia.getOrgaoTramoId() == null ) + && secuencia.getCoeficienteTarifa1() != null) { + OrgaoTramo orgaoTramo = new OrgaoTramo(); + orgaoTramo.setClaseServicio(claseServicio); + orgaoTramo.setOrgaoConcedente(orgaoConcedente); + orgaoTramo.setTramo(tramo); + + orgaoTramo.setActivo(Boolean.TRUE); + orgaoTramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + orgaoTramo.setFecmodif(new java.util.Date()); + orgaoTramo.setCoeficienteTarifa1(secuencia.getCoeficienteTarifa1()); + orgaoTramo.setKmCoeficiente1(secuencia.getKmCoeficiente1()); + + if (secuencia.getCoeficienteTarifa2() != null) { + orgaoTramo.setCoeficienteTarifa2(secuencia.getCoeficienteTarifa2()); + orgaoTramo.setKmCoeficiente2(secuencia.getKmCoeficiente2()); + } + + if (secuencia.getCoeficienteTarifa3() != null) { + orgaoTramo.setCoeficienteTarifa3(secuencia.getCoeficienteTarifa3()); + orgaoTramo.setKmCoeficiente3(secuencia.getKmCoeficiente3()); + } + + orgaoTramoDAO.suscribir(orgaoTramo); + } + } + + @Transactional(rollbackFor = BusinessException.class) + @Override + public void generarTramosRutaExistente(RutaTramoVO rutaTramoVO, Ruta ruta) throws BusinessException { + + this.validarGenerarTramosRutas(rutaTramoVO); + + // Genero los tramos y tramos servicios de la combinacion que no existen + // Aqui si genera tambien los tramos de la secuencia + for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { + log.debug("Origen:" + s.getOrigen() + ";Destino:" + s.getDestino() + ";Via:" + s.getVia()); + boolean fueGenerado = generarDatos(s, rutaTramoVO.getClaseServicio(), rutaTramoVO.getOrgaoConcedente()); + log.debug("Fue Generado:" + fueGenerado); + } + + // Genero la secuencia de la ruta + for (SecuenciaRutaTramoVO s : rutaTramoVO.getLsSecuenciaRutaTramoVO()) { + RutaSecuencia rutaSecuencia = new RutaSecuencia(); + rutaSecuencia.setNumsecuencia(s.getSecuencia().shortValue()); + rutaSecuencia.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); + rutaSecuencia.setRuta(ruta); + rutaSecuencia.setKmOriginal(rutaSecuencia.getTramo().getKmRealSemKmEntradaSaida()); + + if (rutaSecuencia.getRuta() == null && rutaSecuencia.getRuta().getRutaId() == null) { + rutaService.suscribir(rutaSecuencia.getRuta(), null); + } + rutaSecuencia = rutaSecuenciaService.suscribir(rutaSecuencia); + + if (rutaSecuencia.getRutasecuenciaId() == null){ + throw new BusinessException(Labels.getLabel("gerarCombinacionTramoRutaController.MSG.error.rutaSecuencia")); + } + } + + for (SecuenciaRutaTramoCoeficienteVO s : rutaTramoVO.getLsCombinacionRutaTramoVO()) { + RutaCombinacion rutaCombinacion = new RutaCombinacion(); + rutaCombinacion.setIndventa(s.getPermiteVenda() == null ? true : s.getPermiteVenda()); + if (ruta.getIsClone() ) { + Tramo tramoAtual = tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia()); + for (RutaCombinacion rcRuta : ruta.getRutaCombinacionList()) { + if (rcRuta.getTramo() != null && tramoAtual != null && rcRuta.getTramo().getTramoId() == tramoAtual.getTramoId()) { + rutaCombinacion.setIndventa(rcRuta.getIndventa() == null ? true : rcRuta.getIndventa()); + } + } + } + + + rutaCombinacion.setRuta(ruta); + rutaCombinacion.setTramo(tramoService.obtenerTramotPorOrigemDestinoVia(s.getOrigen(), s.getDestino(), s.getVia())); + + rutaCombinacion = rutaCombinacionService.suscribir(rutaCombinacion); + + if (rutaCombinacion.getRutacombinacionId() == null){ + throw new BusinessException(Labels.getLabel("gerarCombinacionTramoRutaController.MSG.error.rutaCombinacion")); + } + } + } + + //calculo do tempo sempre considerando que o calculo deve ser feito desconsiderando o valor do tempo, + //inicializando com o tempo da origem e incrementando as sequencias anteriores + private HoraSistema calcularTempoTotalDestino(ParadaSecuenciaCombinacaoLinha sequenciaOrigem, int numSeqAtual) { + HoraSistema horaSistema = sequenciaOrigem.getTempoReal().isEmpty() ? new HoraSistema() : new HoraSistema(DateUtil.getDataTempoDecorrido(sequenciaOrigem.getTempoReal())); + + for (ParadaSecuencia destino: sequenciaOrigem.getDestinos()) { + HoraSistema horaSistemaDestino = destino.getTempoReal().isEmpty() ? new HoraSistema() : + new HoraSistema(DateUtil.getDataTempoDecorrido(destino.getTempoReal())); + + //desconsidera o tempo para os destinos com sequencia inferior a origem, já que estes já foram calculados + if (sequenciaOrigem.getOrigem().getSecuencia() > destino.getSecuencia()) { + continue; + } + + //faz o calculo para a sequencia do destino para qual o tempo está sendo calculado + if (destino.getSecuencia() == numSeqAtual){ + break; + } + + horaSistema = horaSistema.sumar(horaSistemaDestino); + } + + return horaSistema; + + } + + //calculo da km sempre considerando que o calculo deve ser feito desconsiderando o valor da km, + //inicializando com o valor da km da origem e incrementando as sequencias anteriores + private BigDecimal calcularKmDestino(ParadaSecuenciaCombinacaoLinha sequenciaOrigem, int numSeqAtual) { + BigDecimal kmTotal= sequenciaOrigem.getKmReal() == null || sequenciaOrigem.getKmReal().isEmpty() ? BigDecimal.ZERO : + new BigDecimal(sequenciaOrigem.getKmReal()); + + for (ParadaSecuencia destino: sequenciaOrigem.getDestinos()) { + //desconsidera a km para os destinos com sequencia inferior a origem, já que estes já foram calculados + if (sequenciaOrigem.getOrigem().getSecuencia() > destino.getSecuencia()) { + continue; + } + + //faz o calculo para a sequencia do destino para qual a km está sendo calculada + if (destino.getSecuencia() == numSeqAtual){ + break; + } + + BigDecimal kmDestino= destino.getKmReal() == null || destino.getKmReal().isEmpty() ? BigDecimal.ZERO : + new BigDecimal(destino.getKmReal()); + + kmTotal = kmTotal.add(kmDestino); + } + + return kmTotal; + } + + @Transactional + public void limparInconsistenciasTramo() { + tramoServicioDAO.limparInconsistenciasTramo(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TramoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoServicioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoServicioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TramoServicioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoServicioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoTiempoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoTiempoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TramoTiempoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TramoTiempoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TransportadoraServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TransportadoraServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TransportadoraServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TransportadoraServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TrayectosExpresosServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TrayectosExpresosServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TrayectosExpresosServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TrayectosExpresosServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TurnoServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TurnoServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/TurnoServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/TurnoServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioBancarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioBancarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/UsuarioBancarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioBancarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioEmpresaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioEmpresaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/UsuarioEmpresaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioEmpresaServiceImpl.java index ba9c60a55..bf299c5d6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioEmpresaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioEmpresaServiceImpl.java @@ -1,71 +1,71 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import java.util.Calendar; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.rjconsultores.ventaboletos.dao.UsuarioEmpresaDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; -import com.rjconsultores.ventaboletos.service.UsuarioEmpresaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; - -@Service("usuarioEmpresaService") -public class UsuarioEmpresaServiceImpl implements UsuarioEmpresaService { - - @Autowired - private UsuarioEmpresaDAO usuarioEmpresaDAO; - - public List obtenerTodos() { - return usuarioEmpresaDAO.obtenerTodos(); - } - - public UsuarioEmpresa obtenerID(Integer id) { - return usuarioEmpresaDAO.obtenerID(id); - } - - @Transactional - public UsuarioEmpresa suscribir(UsuarioEmpresa entidad) { - entidad.setUsuariomodifId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return usuarioEmpresaDAO.suscribir(entidad); - } - - @Transactional - public UsuarioEmpresa actualizacion(UsuarioEmpresa entidad) { - entidad.setUsuariomodifId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.TRUE); - - return usuarioEmpresaDAO.actualizacion(entidad); - } - - @Transactional - public void borrar(UsuarioEmpresa entidad) { - entidad.setUsuariomodifId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - entidad.setFecmodif(Calendar.getInstance().getTime()); - entidad.setActivo(Boolean.FALSE); - - usuarioEmpresaDAO.actualizacion(entidad); - } - - public List obtenerPorUsuario(Usuario usuario) { - return usuarioEmpresaDAO.obtenerPorUsuario(usuario); - } - - public List obtenerEmpresa(Usuario usuario) { - return usuarioEmpresaDAO.obtenerEmpresa(usuario); - } - - public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario) { - return usuarioEmpresaDAO.obtenerPorEmpresaUsuario( empresa, usuario); - } - -} - +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.UsuarioEmpresaDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.entidad.UsuarioEmpresa; +import com.rjconsultores.ventaboletos.service.UsuarioEmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +@Service("usuarioEmpresaService") +public class UsuarioEmpresaServiceImpl implements UsuarioEmpresaService { + + @Autowired + private UsuarioEmpresaDAO usuarioEmpresaDAO; + + public List obtenerTodos() { + return usuarioEmpresaDAO.obtenerTodos(); + } + + public UsuarioEmpresa obtenerID(Integer id) { + return usuarioEmpresaDAO.obtenerID(id); + } + + @Transactional + public UsuarioEmpresa suscribir(UsuarioEmpresa entidad) { + entidad.setUsuariomodifId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return usuarioEmpresaDAO.suscribir(entidad); + } + + @Transactional + public UsuarioEmpresa actualizacion(UsuarioEmpresa entidad) { + entidad.setUsuariomodifId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return usuarioEmpresaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(UsuarioEmpresa entidad) { + entidad.setUsuariomodifId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + usuarioEmpresaDAO.actualizacion(entidad); + } + + public List obtenerPorUsuario(Usuario usuario) { + return usuarioEmpresaDAO.obtenerPorUsuario(usuario); + } + + public List obtenerEmpresa(Usuario usuario) { + return usuarioEmpresaDAO.obtenerEmpresa(usuario); + } + + public Boolean obtenerPorEmpresaUsuario(Empresa empresa, Usuario usuario) { + return usuarioEmpresaDAO.obtenerPorEmpresaUsuario( empresa, usuario); + } + +} + diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioPerfilServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioPerfilServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/UsuarioPerfilServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioPerfilServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioSesionImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioSesionImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/UsuarioSesionImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioSesionImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioUbicacionServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioUbicacionServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/UsuarioUbicacionServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/UsuarioUbicacionServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/VendaEmbarcadaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VendaEmbarcadaServiceImpl.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/service/impl/VendaEmbarcadaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VendaEmbarcadaServiceImpl.java index bbdb39875..7076b57ee 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/VendaEmbarcadaServiceImpl.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VendaEmbarcadaServiceImpl.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.service.impl; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.constantes.ConstantesVendaEmbarcada; -import com.rjconsultores.ventaboletos.dao.CajaDAO; -import com.rjconsultores.ventaboletos.dao.hibernate.CajaHibernateDAO; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoFormapagoException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaException; -import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaFormapagoException; -import com.rjconsultores.ventaboletos.service.VendaEmbarcadaService; -import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; - -@Service("VendaEmbarcadaService") -public class VendaEmbarcadaServiceImpl implements VendaEmbarcadaService { - - private static Logger log = LogManager.getLogger(CajaHibernateDAO.class); - - @Autowired - CajaDAO cajaDao; - - @Override - public int gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws BusinessException { - try { - cajaDao.gerarVendaEmbarcada(vendaEmbarcada); - - return ConstantesVendaEmbarcada.VENDA_GERADA; - } catch (VendaEmbarcadaBoletoException e) { - log.error(e.getMessage(), e); - return ConstantesVendaEmbarcada.VENDA_BOLETO_ERROR; - } catch (VendaEmbarcadaBoletoFormapagoException e) { - log.error(e.getMessage(), e); - return ConstantesVendaEmbarcada.VENDA_BOLETO_FORMAPAGO_ERROR; - } catch (VendaEmbarcadaCajaException e) { - log.error(e.getMessage(), e); - return ConstantesVendaEmbarcada.VENDA_CAJA_ERROR; - } catch (VendaEmbarcadaCajaFormapagoException e) { - log.error(e.getMessage(), e); - return ConstantesVendaEmbarcada.VENDA_CAJA_FORMAPAGO_ERROR; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - - } - -} +package com.rjconsultores.ventaboletos.service.impl; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.constantes.ConstantesVendaEmbarcada; +import com.rjconsultores.ventaboletos.dao.CajaDAO; +import com.rjconsultores.ventaboletos.dao.hibernate.CajaHibernateDAO; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaBoletoFormapagoException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaException; +import com.rjconsultores.ventaboletos.exception.VendaEmbarcadaCajaFormapagoException; +import com.rjconsultores.ventaboletos.service.VendaEmbarcadaService; +import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; + +@Service("VendaEmbarcadaService") +public class VendaEmbarcadaServiceImpl implements VendaEmbarcadaService { + + private static Logger log = LogManager.getLogger(CajaHibernateDAO.class); + + @Autowired + CajaDAO cajaDao; + + @Override + public int gerarVendaEmbarcada(VendaEmbarcadaVO vendaEmbarcada) throws BusinessException { + try { + cajaDao.gerarVendaEmbarcada(vendaEmbarcada); + + return ConstantesVendaEmbarcada.VENDA_GERADA; + } catch (VendaEmbarcadaBoletoException e) { + log.error(e.getMessage(), e); + return ConstantesVendaEmbarcada.VENDA_BOLETO_ERROR; + } catch (VendaEmbarcadaBoletoFormapagoException e) { + log.error(e.getMessage(), e); + return ConstantesVendaEmbarcada.VENDA_BOLETO_FORMAPAGO_ERROR; + } catch (VendaEmbarcadaCajaException e) { + log.error(e.getMessage(), e); + return ConstantesVendaEmbarcada.VENDA_CAJA_ERROR; + } catch (VendaEmbarcadaCajaFormapagoException e) { + log.error(e.getMessage(), e); + return ConstantesVendaEmbarcada.VENDA_CAJA_FORMAPAGO_ERROR; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ViaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ViaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/ViaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/ViaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/VigenciaTarifaServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VigenciaTarifaServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/VigenciaTarifaServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VigenciaTarifaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/service/impl/VoucherServiceImpl.java b/ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VoucherServiceImpl.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/service/impl/VoucherServiceImpl.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/service/impl/VoucherServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ActivoUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ActivoUtil.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/ActivoUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ActivoUtil.java index d9d1d44a9..414f8e7c9 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ActivoUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ActivoUtil.java @@ -1,9 +1,9 @@ -package com.rjconsultores.ventaboletos.utilerias; - -public class ActivoUtil { - - public static final Integer ATIVO = 1; - public static final Integer INATIVO = 2; - public static final Integer EXCLUIDO = 0; - -} +package com.rjconsultores.ventaboletos.utilerias; + +public class ActivoUtil { + + public static final Integer ATIVO = 1; + public static final Integer INATIVO = 2; + public static final Integer EXCLUIDO = 0; + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/Application.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/Application.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/utilerias/Application.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/Application.java index 39c481d54..68f7125e2 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/Application.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/Application.java @@ -1,17 +1,17 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import com.rjconsultores.ventaboletos.entidad.Imagem; - -public class Application { - - private Imagem image; - - public Imagem getImage() { - return image; - } - - public void setImage(Imagem image) { - this.image = image; - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import com.rjconsultores.ventaboletos.entidad.Imagem; + +public class Application { + + private Imagem image; + + public Imagem getImage() { + return image; + } + + public void setImage(Imagem image) { + this.image = image; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java diff --git a/src/com/rjconsultores/ventaboletos/utilerias/BigDecimalUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/BigDecimalUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/BigDecimalUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/BigDecimalUtil.java index bbb4335a1..9c51ea89c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/BigDecimalUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/BigDecimalUtil.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.ParseException; -import java.util.Locale; - -import org.apache.commons.lang.StringUtils; - -/** - * - * @author Wilian - * - */ -public class BigDecimalUtil { - - public static BigDecimal getStringToBigDecimal(String value, Locale locale) throws ParseException { - if(value != null && StringUtils.isNotBlank(value)) { - NumberFormat nf = NumberFormat.getInstance(locale); - return new BigDecimal(nf.parse(value).toString()); - } - - return null; - } - - public static String getBigDecimalToStringDouble2CasasDecimaisFormatado(BigDecimal value, Locale locale) { - if(value != null) { - NumberFormat nf = NumberFormat.getInstance(locale); - nf.setMinimumFractionDigits(2); - nf.setMaximumFractionDigits(2); - nf.setRoundingMode(RoundingMode.HALF_UP); - return nf.format(value.doubleValue()); - } - - return null; - } - - public static BigDecimal getStringToBigDecimal(String value, int qtdeCasasDecimais, Locale locale) throws ParseException { - if(value != null && StringUtils.isNotBlank(value)) { - DecimalFormat df = (DecimalFormat) NumberFormat.getInstance(locale); - df.setMinimumFractionDigits(qtdeCasasDecimais); - df.setMaximumFractionDigits(qtdeCasasDecimais); - value = value.substring(0, value.length() - qtdeCasasDecimais).concat(df.getDecimalFormatSymbols().getDecimalSeparator()+"").concat(value.substring(value.length() - qtdeCasasDecimais, value.length())); - return new BigDecimal(df.parse(value).toString()); - } - - return null; - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.text.ParseException; +import java.util.Locale; + +import org.apache.commons.lang.StringUtils; + +/** + * + * @author Wilian + * + */ +public class BigDecimalUtil { + + public static BigDecimal getStringToBigDecimal(String value, Locale locale) throws ParseException { + if(value != null && StringUtils.isNotBlank(value)) { + NumberFormat nf = NumberFormat.getInstance(locale); + return new BigDecimal(nf.parse(value).toString()); + } + + return null; + } + + public static String getBigDecimalToStringDouble2CasasDecimaisFormatado(BigDecimal value, Locale locale) { + if(value != null) { + NumberFormat nf = NumberFormat.getInstance(locale); + nf.setMinimumFractionDigits(2); + nf.setMaximumFractionDigits(2); + nf.setRoundingMode(RoundingMode.HALF_UP); + return nf.format(value.doubleValue()); + } + + return null; + } + + public static BigDecimal getStringToBigDecimal(String value, int qtdeCasasDecimais, Locale locale) throws ParseException { + if(value != null && StringUtils.isNotBlank(value)) { + DecimalFormat df = (DecimalFormat) NumberFormat.getInstance(locale); + df.setMinimumFractionDigits(qtdeCasasDecimais); + df.setMaximumFractionDigits(qtdeCasasDecimais); + value = value.substring(0, value.length() - qtdeCasasDecimais).concat(df.getDecimalFormatSymbols().getDecimalSeparator()+"").concat(value.substring(value.length() - qtdeCasasDecimais, value.length())); + return new BigDecimal(df.parse(value).toString()); + } + + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java index 0d82f6c31..183cf7217 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java @@ -1,188 +1,188 @@ -package com.rjconsultores.ventaboletos.utilerias; - -public enum CustomEnum { - - /** - * Indica se la informacion de equivalencia es visible - * - * @return - */ - MOSTRAR_EQUIVALENCIA("equivalencia.mostrar"), - - /** - * Indica se o campo empresa é obrigatório - * @return - */ - EMPRESA_OBRIGATORIA("empresa.obrigatoria"), - - /** - * Indica se es gerado o campo equivalencia corrida na tabela de corrida - * - * @return - */ - GERAR_CAMPO_EQUIVALENCIA_CORRIDA("corrida.gerarCampoEquivalencia"), - - /** - * Indica exibe o combo de Division na geração de Corridas do Esquema Operacional. - * - * @return - */ - EXIBIR_DIVISION_CONFIGURACION_CORRIDA("esquemaOperacional.configuracionCorrida.exibeDivision"), - - /** - * Indica se va a exhibir la cuenta contable en el catalogo de tipos de eventos - * - * @return - */ - EXHIBIR_CUENTA_CONTABLE_TIPOS_EVENTOS("eventosExtras.tiposEventos.exhibirCuentaContable"), - - /** - * Indica se va a exhibir la "aba" de excepciones de tramo_km en la pantalla de tramos - * - * @return - */ - EXHIBIR_EXCEPCIONES_TRAMO_KM("tramos.exhibirExcepcionesTramoKm"), - - /** - * Indica se vai exibir botão na modificação massiva de tarifa de geração automatica de tarifas - * - * @return - */ - GENERAR_TARIFAS_AUTOMATICA("tarifa.generarTarifasAutomatica"), - - GENERAR_ROTINA_FOLIOS("no.cheque.folio"), - - HABILITAR_PRICING_CATEGORIA("pricing.categoria.habilitar"), - - RUTA_CON_MAS_DE_UNA_CLASE("ruta.masdeunaclase"), - - DIAGRAMA_AUTOBUS_DOS_PESTANA("diagramaautobus.dospestana"), - - CONTRASENA_VALIDA_COMPLEJIDAD("contrasena.validaComplejidad"), - - HABILITAR_CUSTOM_SEQUENCE("custom.sequence"), - - INTEGRACION_TOTVS("integracion.totvs"), - - INTEGRACION_AG("integracion.AG"), - - INTEGRACION_AGWS("integracion.agws"), - - INTEGRACION_RIOCARD("integracion.riocard"), - - DIAGRAMA_AUTOBUS_TREM("layoutdiagramaautobus.trem"), - - VALIDA_ESTADO_NO_NOME_LOCALIDADE("validaEstadoNomeLocalidade"), - - PODE_EDITAR_CLIENTE_FIDELIDADE("podeEditarClienteFidelidade"), - - VALIDA_SOBREPOSICAO_VIGENCIA("validaSobreposicaoVigencia"), - - USA_CPF_COMO_FIDELIDADE("usaCPFComoFidelidade"), - - USA_PADRAO_PRICING_TIPO_PASSAGEM_PET("usaPadroPricingEspecificoTipoPassagemPET"), - - EXIBE_TPP("exibeTpp"), - - COD_ANTT_NAO_OBRIGATORIO("codAnttNaoObrigatorio"), - - ARTESP_PEDAGIO_IDA_VOLTA_DIV_POR2("artespPedagioIdaVoltaDivPor2"), - - CALCULO_PEAJE_REUNIDAS_ANTT("calculoPeajeReunidasANTT"), - - MAX_SIZE_NUM_CORRIDA("maxSizeNumCorrida"), - - CRIAR_TARIFA_APENAS_TRECHO_VENDIDO("criarTarifaApenasTrechoVendido"), - - EXIBIR_ESTACAO_CADASTRO_USUARIO("exibirEstacaoCadastroUsuario"), - - UTILLIZA_CARTAO_LIBERCARD("utilizaLibercard"), - - /** - * - * Indica se ao salvar um ponto de venda será validado se para todas as empresas informadas para venda também será necessário informar o fechamento. - * - * @return - */ - VALIDA_CONTA_CORRENTE_EMPESA_PTOVTA("puntoVenta.validaCtaCteEmpresa"), - - IS_DATASOURCE_COMISSAO_BANCO_PRODUCAO("datasource.conferencia.comissao"), - - IS_PERMITE_VARIAS_IMPRESSORAS_MESMA_EMPRESA("permiteVariasImpressorasMesmaEmpresa"), - - IS_FORMAPAGO_PRICING_INATIVO("formaPagoPricingInativo"), - - EXIBIR_PUNTO_VENTA_CADASTRO_AIDF("exibirPuntoVentaCadastroAIDF"), - - IS_PUNTOVENTA_CADASTRO_AIDF_OBRIGATORIO("isPuntoVentaCadastroAIDFObrigatorio"), - - ENDERECO_CLIENTE_OBRIGATORIO("cliente.enderecoObrigatorio"), - - IS_PERMITE_LAYOUT_INTERNACIONAL("permiteLayoutInternacional"), - - RELATORIO_TAXAS_LINHA_TXT_DOWNLOAD_VISIBLE("taxasLinhaTxtDownloadVisible"), - - IS_PERMITE_CALCULO_COMISSAO_PERIODO("permiteCalculoComissaoPeriodo"), - - IS_INCLUI_TIPO_PAGAMENTO_TURISMO_BGM("incluiTipoPagamentoTurismoBGM"), - - IS_GERAR_TRECHO_AUTOMATICO_DEFAULT_NAO("gerarTrechoAutomaticoDefaultNao"), - - IS_VALIDA_DOCUMENTACAO_MONITRIP("validaDocumentacaoMonitrip"), - - IS_RECEITA_DESPESAS_COMPORTE("isReceitasDespesasComporte"), - - IS_RECEITA_DESPESAS_OURO_PRATA("isReceitasDespesasOuroPrata"), - - IS_COD_RECEITA_FIXO_BGM("isCodReceitaFixoBgm"), - - HABILITAR_EXCLUIR_SEQUENCIA_LINHA("habilitarExcluirSequenciaLinha"), - - /** - * Indica se a taxa de embarque será impressa como QRCode ou Codigo de barras - * - * @return - */ - IS_TAXA_EMBARQUE_IMPRESSA_QRCODE("isTxEmbarqueImpressaEmQrcode"), - - IS_DESCONSIDERA_CLIENTE_NA_BASE("isDesconsideraClienteNaBase"), - - IS_HABILITA_IE_DESCENTRALIZADA("isHabilitaIEDescentralizada"), - - IS_VALIDAR_CONSTANTE_REMESSA("isValidarConstanteRemessa"), - - IS_DESABILITA_USUARIO_ADMINISTRADORES_PERFIL("dasabilitaUsuarioAdministradoresPerfil"), - - INTEGRACION_SAFER("integracion.safer"), - - VALIDA_ESTOQUE_SIMPLIFICADO("MODCLI_ValidaEstoqueSimplificado"), - - IS_VENDA_SAFTAO("isVendaSaftao"), - - /** - * Ativa o Bloqueio de trecho por conexao. - * - * @return - */ - USA_BLOQUEIO_TRECHO_CONEXAO("usaBloqueioTrechoConexao"), - - IS_PERMITE_ALTERAR_HORARIO_CORRIDA_COM_VENDAS("isPermiteAlterarHorarioCorridaComVendas"), - - PADRAO_CODIGO_BARRA_TRECHO("padraoCodigoBarraTrecho"); - - private String descricao; - - private CustomEnum(String descricao) { - this.descricao = descricao; - } - - public String getDescricao() { - return descricao; - } - - @Override - public String toString() { - return this.descricao; - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +public enum CustomEnum { + + /** + * Indica se la informacion de equivalencia es visible + * + * @return + */ + MOSTRAR_EQUIVALENCIA("equivalencia.mostrar"), + + /** + * Indica se o campo empresa é obrigatório + * @return + */ + EMPRESA_OBRIGATORIA("empresa.obrigatoria"), + + /** + * Indica se es gerado o campo equivalencia corrida na tabela de corrida + * + * @return + */ + GERAR_CAMPO_EQUIVALENCIA_CORRIDA("corrida.gerarCampoEquivalencia"), + + /** + * Indica exibe o combo de Division na geração de Corridas do Esquema Operacional. + * + * @return + */ + EXIBIR_DIVISION_CONFIGURACION_CORRIDA("esquemaOperacional.configuracionCorrida.exibeDivision"), + + /** + * Indica se va a exhibir la cuenta contable en el catalogo de tipos de eventos + * + * @return + */ + EXHIBIR_CUENTA_CONTABLE_TIPOS_EVENTOS("eventosExtras.tiposEventos.exhibirCuentaContable"), + + /** + * Indica se va a exhibir la "aba" de excepciones de tramo_km en la pantalla de tramos + * + * @return + */ + EXHIBIR_EXCEPCIONES_TRAMO_KM("tramos.exhibirExcepcionesTramoKm"), + + /** + * Indica se vai exibir botão na modificação massiva de tarifa de geração automatica de tarifas + * + * @return + */ + GENERAR_TARIFAS_AUTOMATICA("tarifa.generarTarifasAutomatica"), + + GENERAR_ROTINA_FOLIOS("no.cheque.folio"), + + HABILITAR_PRICING_CATEGORIA("pricing.categoria.habilitar"), + + RUTA_CON_MAS_DE_UNA_CLASE("ruta.masdeunaclase"), + + DIAGRAMA_AUTOBUS_DOS_PESTANA("diagramaautobus.dospestana"), + + CONTRASENA_VALIDA_COMPLEJIDAD("contrasena.validaComplejidad"), + + HABILITAR_CUSTOM_SEQUENCE("custom.sequence"), + + INTEGRACION_TOTVS("integracion.totvs"), + + INTEGRACION_AG("integracion.AG"), + + INTEGRACION_AGWS("integracion.agws"), + + INTEGRACION_RIOCARD("integracion.riocard"), + + DIAGRAMA_AUTOBUS_TREM("layoutdiagramaautobus.trem"), + + VALIDA_ESTADO_NO_NOME_LOCALIDADE("validaEstadoNomeLocalidade"), + + PODE_EDITAR_CLIENTE_FIDELIDADE("podeEditarClienteFidelidade"), + + VALIDA_SOBREPOSICAO_VIGENCIA("validaSobreposicaoVigencia"), + + USA_CPF_COMO_FIDELIDADE("usaCPFComoFidelidade"), + + USA_PADRAO_PRICING_TIPO_PASSAGEM_PET("usaPadroPricingEspecificoTipoPassagemPET"), + + EXIBE_TPP("exibeTpp"), + + COD_ANTT_NAO_OBRIGATORIO("codAnttNaoObrigatorio"), + + ARTESP_PEDAGIO_IDA_VOLTA_DIV_POR2("artespPedagioIdaVoltaDivPor2"), + + CALCULO_PEAJE_REUNIDAS_ANTT("calculoPeajeReunidasANTT"), + + MAX_SIZE_NUM_CORRIDA("maxSizeNumCorrida"), + + CRIAR_TARIFA_APENAS_TRECHO_VENDIDO("criarTarifaApenasTrechoVendido"), + + EXIBIR_ESTACAO_CADASTRO_USUARIO("exibirEstacaoCadastroUsuario"), + + UTILLIZA_CARTAO_LIBERCARD("utilizaLibercard"), + + /** + * + * Indica se ao salvar um ponto de venda será validado se para todas as empresas informadas para venda também será necessário informar o fechamento. + * + * @return + */ + VALIDA_CONTA_CORRENTE_EMPESA_PTOVTA("puntoVenta.validaCtaCteEmpresa"), + + IS_DATASOURCE_COMISSAO_BANCO_PRODUCAO("datasource.conferencia.comissao"), + + IS_PERMITE_VARIAS_IMPRESSORAS_MESMA_EMPRESA("permiteVariasImpressorasMesmaEmpresa"), + + IS_FORMAPAGO_PRICING_INATIVO("formaPagoPricingInativo"), + + EXIBIR_PUNTO_VENTA_CADASTRO_AIDF("exibirPuntoVentaCadastroAIDF"), + + IS_PUNTOVENTA_CADASTRO_AIDF_OBRIGATORIO("isPuntoVentaCadastroAIDFObrigatorio"), + + ENDERECO_CLIENTE_OBRIGATORIO("cliente.enderecoObrigatorio"), + + IS_PERMITE_LAYOUT_INTERNACIONAL("permiteLayoutInternacional"), + + RELATORIO_TAXAS_LINHA_TXT_DOWNLOAD_VISIBLE("taxasLinhaTxtDownloadVisible"), + + IS_PERMITE_CALCULO_COMISSAO_PERIODO("permiteCalculoComissaoPeriodo"), + + IS_INCLUI_TIPO_PAGAMENTO_TURISMO_BGM("incluiTipoPagamentoTurismoBGM"), + + IS_GERAR_TRECHO_AUTOMATICO_DEFAULT_NAO("gerarTrechoAutomaticoDefaultNao"), + + IS_VALIDA_DOCUMENTACAO_MONITRIP("validaDocumentacaoMonitrip"), + + IS_RECEITA_DESPESAS_COMPORTE("isReceitasDespesasComporte"), + + IS_RECEITA_DESPESAS_OURO_PRATA("isReceitasDespesasOuroPrata"), + + IS_COD_RECEITA_FIXO_BGM("isCodReceitaFixoBgm"), + + HABILITAR_EXCLUIR_SEQUENCIA_LINHA("habilitarExcluirSequenciaLinha"), + + /** + * Indica se a taxa de embarque será impressa como QRCode ou Codigo de barras + * + * @return + */ + IS_TAXA_EMBARQUE_IMPRESSA_QRCODE("isTxEmbarqueImpressaEmQrcode"), + + IS_DESCONSIDERA_CLIENTE_NA_BASE("isDesconsideraClienteNaBase"), + + IS_HABILITA_IE_DESCENTRALIZADA("isHabilitaIEDescentralizada"), + + IS_VALIDAR_CONSTANTE_REMESSA("isValidarConstanteRemessa"), + + IS_DESABILITA_USUARIO_ADMINISTRADORES_PERFIL("dasabilitaUsuarioAdministradoresPerfil"), + + INTEGRACION_SAFER("integracion.safer"), + + VALIDA_ESTOQUE_SIMPLIFICADO("MODCLI_ValidaEstoqueSimplificado"), + + IS_VENDA_SAFTAO("isVendaSaftao"), + + /** + * Ativa o Bloqueio de trecho por conexao. + * + * @return + */ + USA_BLOQUEIO_TRECHO_CONEXAO("usaBloqueioTrechoConexao"), + + IS_PERMITE_ALTERAR_HORARIO_CORRIDA_COM_VENDAS("isPermiteAlterarHorarioCorridaComVendas"), + + PADRAO_CODIGO_BARRA_TRECHO("padraoCodigoBarraTrecho"); + + private String descricao; + + private CustomEnum(String descricao) { + this.descricao = descricao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return this.descricao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java index c567f3aa5..b80472406 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java @@ -1,917 +1,917 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.utilerias; - -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; - -public final class DateUtil { - - public static Integer DIA = Integer.valueOf(1000 * 60 * 60 * 24); - public static Integer UM_DIA = Integer.valueOf(1); - - /** - * Formato 24Hs - */ - public static String ddMMaaHH24mm = "dd/MM/yyyy HH:mm"; - public static String ddMMaaHH24mmss = "dd/MM/yyyy HH:mm:ss"; - - /** - * Formato 12hs - */ - public static String ddMMaaHHmm = "dd/MM/yyyy hh:mm"; - public static String ddMMaaaa = "dd/MM/yyyy"; - public static String ddMMaa_anodoisdigitos = "dd/MM/yy"; - public static String ddMMaa_sembarra = "ddMMyy"; - public static String HHmm = "HH:mm"; - public static String formatGMT = "yyyy-MM-dd'T'HH:mm:ss"; - public static String formatJson = "yyyy-MM-dd'T'HH:mm:ss.SSS"; - public static String formatExp = "yyyyMMdd"; - public static String YYYY_MM_DD_T_HH_MM_SS_Z = "yyyy-MM-dd'T'HH:mm:ssZ"; - - /** - * No need for an instance - */ - private DateUtil() { - } - - /** - * Elapsed days based on current time - * - * @param date - * Date - * - * @return int number of days - */ - public static int getElapsedDias(Date date) { - return elapsed(date, Calendar.DATE); - } - - /** - * Elapsed days based on two Date objects - * - * @param d1 - * Date - * @param d2 - * Date - * - * @return int number of days - */ - public static int getElapsedDias(Date d1, Date d2) { - return elapsed(d1, d2, Calendar.DATE); - } - - /** - * Elapsed months based on current time - * - * @param date - * Date - * - * @return int number of months - */ - public static int getElapsedMeses(Date date) { - return elapsed(date, Calendar.MONTH); - } - - /** - * Elapsed months based on two Date objects - * - * @param d1 - * Date - * @param d2 - * Date - * - * @return int number of months - */ - public static int getElapsedMeses(Date d1, Date d2) { - return elapsed(d1, d2, Calendar.MONTH); - } - - /** - * Elapsed years based on current time - * - * @param date - * Date - * - * @return int number of years - */ - public static int getElapsedAnos(Date date) { - return elapsed(date, Calendar.YEAR); - } - - /** - * Elapsed years based on two Date objects - * - * @param d1 - * Date - * @param d2 - * Date - * - * @return int number of years - */ - public static int getElapsedAnos(Date d1, Date d2) { - return elapsed(d1, d2, Calendar.YEAR); - } - - /** - * All elaspsed types - * - * @param g1 - * GregorianCalendar - * @param g2 - * GregorianCalendar - * @param type - * int (Calendar.FIELD_NAME) - * - * @return int number of elapsed "type" - */ - private static int elapsed(GregorianCalendar g1, GregorianCalendar g2, int type) { - GregorianCalendar gc1, gc2; - int elapsed = 0; - // Create copies since we will be clearing/adding - if (g2.after(g1)) { - gc2 = (GregorianCalendar) g2.clone(); - gc1 = (GregorianCalendar) g1.clone(); - } else { - gc2 = (GregorianCalendar) g1.clone(); - gc1 = (GregorianCalendar) g2.clone(); - } - if (type == Calendar.MONTH || type == Calendar.YEAR) { - gc1.clear(Calendar.DATE); - gc2.clear(Calendar.DATE); - } - if (type == Calendar.YEAR) { - gc1.clear(Calendar.MONTH); - gc2.clear(Calendar.MONTH); - } - while (gc1.before(gc2)) { - gc1.add(type, 1); - elapsed++; - } - return elapsed; - } - - /** - * All elaspsed types based on date and current Date - * - * @param date - * Date - * @param type - * int (Calendar.FIELD_NAME) - * - * @return int number of elapsed "type" - */ - private static int elapsed(Date date, int type) { - return elapsed(date, new Date(), type); - } - - /** - * All elaspsed types - * - * @param d1 - * Date - * @param d2 - * Date - * @param type - * int (Calendar.FIELD_NAME) - * - * @return int number of elapsed "type" - */ - private static int elapsed(Date d1, Date d2, int type) { - Calendar cal = Calendar.getInstance(); - cal.setTime(d1); - GregorianCalendar g1 = new GregorianCalendar(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE)); - cal.setTime(d2); - GregorianCalendar g2 = new GregorianCalendar(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE)); - return elapsed(g1, g2, type); - } - - public static Date getDateFromString(String data, String formato) throws java.text.ParseException { - Date d = new Date(); - DateFormat df = new SimpleDateFormat(formato); - - d = df.parse(data); - return d; - } - - public static java.sql.Timestamp getTimestampFromString(String data, String formato) throws java.text.ParseException { - Date d = new Date(); - DateFormat df = new SimpleDateFormat(formato); - - d = df.parse(data); - return new java.sql.Timestamp(d.getTime()); - } - - - - public static int compareDate(java.util.Date d1) { - return compareDate(d1, new java.util.Date()); - } - - /** - * Compara a data atual com d1 de forma que a chama fica compareOnlyDate(d1, new java.util.Date()); - * - * {@link #compareOnlyDate(Date, Date)} - */ - public static int compareOnlyDate(java.util.Date d1) { - return compareOnlyDate(d1, new java.util.Date()); - } - - /** - * não leva em consideração os segundos/minutos. Só é considerado o dia/mes/ano
- * - * Retorno igual a {@link #compareDate(Date, Date)} - */ - public static int compareOnlyDate(java.util.Date d1, java.util.Date d2) { - java.util.Calendar cal = Calendar.getInstance(); - cal.setTime(d1); - GregorianCalendar g1 = new GregorianCalendar(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE)); - - java.util.Calendar cal2 = Calendar.getInstance(); - cal2.setTime(d2); - GregorianCalendar g2 = new GregorianCalendar(cal2.get(Calendar.YEAR), cal2.get(Calendar.MONTH), cal2.get(Calendar.DATE)); - return g1.compareTo(g2); - // return cal.compareTo(cal2); - } - - /** - * Retorna : - 0 se igual
- * - < 0 se d1 < d2
- * - > 0 se d1 > d2
- */ - public static int compareDate(java.util.Date d1, java.util.Date d2) { - java.util.Calendar cal = Calendar.getInstance(); - cal.setTime(d1); - java.util.Calendar cal2 = Calendar.getInstance(); - cal2.setTime(d2); - - return cal.compareTo(cal2); - } - - public static Integer getIntegerDate(java.util.Date d, String formato) { - if (formato.contains("/")) { - throw new IllegalArgumentException("O formato não deve conter o simbolo \\ "); - } - - String s = getStringDate(d, formato); - return Integer.parseInt(s); - } - - public static String getStringDate(java.util.Date d, String formato) { - if (d != null) { - DateFormat df = new SimpleDateFormat(formato); - return df.format(d); - } - return null; - } - - /** - * Formato 12 horas - * @param d - * @return - */ - public static String getStringDateHour(java.util.Date d) { - if (d != null) { - DateFormat df = new SimpleDateFormat(ddMMaaHHmm); - return df.format(d); - } - return null; - } - - /** - * Formato 12 horas - * @param d - * @return - */ - public static Date getDateStringHour(String d) { - try { - if (d != null) { - DateFormat df = new SimpleDateFormat(ddMMaaHHmm); - return df.parse(d); - } - } catch (ParseException e) { - } - - return null; - } - - /** - * Formato 24 horas - * @param d - * @return - */ - public static String getStringDate24Hour(java.util.Date d) { - if (d != null) { - DateFormat df = new SimpleDateFormat(ddMMaaHH24mm); - return df.format(d); - } - return null; - } - - /** - * Formato 24 horas - * @param d - * @return - */ - public static Date getDateString24Hour(String d) { - try { - if (d != null) { - DateFormat df = new SimpleDateFormat(ddMMaaHH24mm); - return df.parse(d); - } - } catch (ParseException e) { - } - - return null; - } - - public static String getStringDate(java.util.Date d) { - try { - return getStringDate(d, "dd/MM/yyyy"); - }catch(Exception e) { - return null; - } - } - - public static String getStringDate(java.sql.Date d) { - return getStringDate(new java.util.Date(d.getTime())); - } - - public static String getStringCurrentDate(String formato) { - return getStringDate(new java.util.Date(), formato); - } - - public static String changeFormatStringDate(String date, String currentFormat, String newFormat) { - - try { - return DateUtil.getStringDate(DateUtil.getDateFromString(date, currentFormat), newFormat); - } catch (ParseException ex) { - LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); - } - return null; - } - - public static Integer changeFormatIntDate(Integer date, String currentFormat, String newFormat) { - - try { - return DateUtil.getIntegerDate(DateUtil.getDateFromString(String.valueOf(date), currentFormat), newFormat); - } catch (ParseException ex) { - LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); - } - return null; - } - - /** - * Retorna uma array onde [0] é hora, [1] é minuto - * - * @param hora - * @return - */ - private static int[] getArrayHora(Integer hora) { - - String strHora = String.valueOf(hora); - - int[] array = new int[2]; - - if (strHora.length() <= 2) { - array[0] = 0; - array[1] = Integer.parseInt(strHora); - } else if (strHora.length() == 3) { - array[0] = Integer.parseInt(strHora.substring(0, 1)); - array[1] = Integer.parseInt(strHora.substring(1)); - } else if (strHora.length() == 4) { - array[0] = Integer.parseInt(strHora.substring(0, 2)); - array[1] = Integer.parseInt(strHora.substring(2)); - } - - return array; - } - - public static java.util.Date changeFormatIntDate(Integer date, String currentFormat, Integer hora) { - - try { - if (currentFormat.equals("yMMdd") || currentFormat.equals("yyMMdd")) { - - currentFormat = "yyyyMMdd"; - String strData = String.valueOf(date); - - if (strData.length() == 5) { - strData = "200" + strData; - } else if (strData.length() == 6) { - strData = "20" + strData; - } - - date = Integer.parseInt(strData); - } - Date data = DateUtil.getDateFromString(String.valueOf(date), currentFormat); - - if (hora == null) { - return data; - } - - int horaArray[] = DateUtil.getArrayHora(hora); - Calendar c = Calendar.getInstance(); - c.setTime(data); - c.set(Calendar.HOUR_OF_DAY, horaArray[0]); - c.set(Calendar.MINUTE, horaArray[1]); - - return c.getTime(); - - } catch (ParseException ex) { - LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); - } - return null; - } - - public static java.util.Date changeFormatStringDate(String date, String currentFormat, Integer hora) { - - try { - if (currentFormat.equals("yMMdd") || currentFormat.equals("yyMMdd")) { - - currentFormat = "yyyyMMdd"; - - if (date.length() == 5) { - date = "200" + date; - } else if (date.length() == 6) { - date = "20" + date; - } - } - Date data = DateUtil.getDateFromString(String.valueOf(date), currentFormat); - - if (hora == null) { - return data; - } - - int horaArray[] = DateUtil.getArrayHora(hora); - Calendar c = Calendar.getInstance(); - c.setTime(data); - c.set(Calendar.HOUR_OF_DAY, horaArray[0]); - c.set(Calendar.MINUTE, horaArray[1]); - - return c.getTime(); - - } catch (ParseException ex) { - LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); - } - return null; - } - - public static int getIntHoraSRVP(Date data) { - Calendar c = Calendar.getInstance(); - c.setTime(data); - - String hora = String.valueOf(c.get(Calendar.HOUR_OF_DAY)); - hora = (hora.length() < 2) ? "0" + hora : hora; - - String minuto = String.valueOf(c.get(Calendar.MINUTE)); - minuto = (minuto.length() < 2) ? "0" + minuto : minuto; - - return Integer.parseInt(hora + minuto); - } - - public static long getElapsedHoras(Date dtInic, Date dtFim) { - return (dtFim.getTime() - dtInic.getTime()) / (1000 * 60 * 60); - } - - public static long getElapsedMinutos(Date dtInic, Date dtFim) { - return (dtFim.getTime() - dtInic.getTime()) / (1000 * 60); - } - - /** - * Regresa los minutos pela hora inicial del sistema - * - * @param dtInic - * @param dtFim - * @return - */ - public static HoraSistema getHorasMinutosByInicio(Date dtFim) { - return new HoraSistema(dtFim); - } - - /** - * Verifica se o intervalo de datas dtStartCompare e dtEndCompare estão dentro do intervalo dtStart dtEnd - * - * @param dtStart - * @param dtEnd - * @param dtStartCompare - * @param dtEndCompare - * @return - */ - public static boolean intersectDate(Date dtStart, Date dtEnd, Date dtStartCompare, Date dtEndCompare) { - return TraslaparUtil.intersectDate(dtStart, dtEnd, dtStartCompare, dtEndCompare); - } - - public static void main(String ar[]) { - System.out.println(Arrays.asList(1,2,3,4,5).toString().replaceAll("[\\]\\[]", "")); - } - - public static void main2(String args[]) { - java.util.Date agora = new java.util.Date(); - - System.out.println(agora); - - Calendar c = Calendar.getInstance(); - c.setTime(agora); - - System.out.println(DateUtil.getIntHoraSRVP(agora)); - // c.add(Calendar.MINUTE, 60); - - System.out.println("final " + c.getTime()); - System.out.println("1 " + c.get(Calendar.HOUR_OF_DAY)); - - } - - /** - * Es la fecInicial del sistema para campos de horas - * - * @return - */ - public static Calendar getFecInicio() { - Calendar c = Calendar.getInstance(); - c.set(Calendar.YEAR, 1970); - c.set(Calendar.DAY_OF_MONTH, 1); - c.set(Calendar.MONTH, 0); - c.set(Calendar.HOUR_OF_DAY, 0); - c.set(Calendar.MINUTE, 0); - c.set(Calendar.MILLISECOND, 0); - c.set(Calendar.SECOND, 0); - - return c; - } - - /** - * Es la fecInicial del sistema con los campos de hora y minutos del parametro informado - * - * @return - */ - public static Calendar getFecInicio(Date horaMinuto) { - Calendar tmp = Calendar.getInstance(); - tmp.setTime(horaMinuto); - Calendar c = getFecInicio(); - c.set(Calendar.HOUR_OF_DAY, tmp.get(Calendar.HOUR_OF_DAY)); - c.set(Calendar.MINUTE, tmp.get(Calendar.MINUTE)); - - return c; - } - - /** - * Es la fecInicial del sistema con los campos de hora y minutos del parametro informado - * - * @return - */ - public static Calendar getFecInicio(Integer hora, Integer minuto) { - - Calendar c = getFecInicio(); - c.add(Calendar.HOUR_OF_DAY, hora); - c.add(Calendar.MINUTE, minuto); - - return c; - } - - /** - * Quita los segundos y milesegundos de la fecha - * - * @param fecha - * @return - */ - public static Date normalizar(Date fecha) { - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(fecha); - gcalendar.set(Calendar.SECOND, 0); - gcalendar.set(Calendar.MILLISECOND, 0); - - return gcalendar.getTime(); - } - - /** - * Quita los segundos, milesegundos, hora y minuto de la fecha - * - * @param fecha - * @return - */ - public static Date normalizarToFecha(Date fecha) { - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(fecha); - gcalendar.set(Calendar.SECOND, 0); - gcalendar.set(Calendar.MILLISECOND, 0); - gcalendar.set(Calendar.HOUR_OF_DAY, 0); - gcalendar.set(Calendar.MINUTE, 0); - - return gcalendar.getTime(); - } - - public static Date inicioFechaPeriodoMeses(Date periodo) { - return inicioFecha(periodo, true); - } - - public static Date fimFechaPeriodoMeses(Date periodo) { - return fimFecha(periodo, true); - } - - private static Date inicioFecha(Date fecha, boolean diaInicial) { - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(fecha); - int date = gcalendar.get(Calendar.DATE); - if (diaInicial) { - date = gcalendar.getActualMinimum(Calendar.DAY_OF_MONTH); - } - int month = gcalendar.get(Calendar.MONTH); - int year = gcalendar.get(Calendar.YEAR); - int hourOfDay = 00; - int minute = 00; - int second = 00; - - gcalendar.set(year, month, date, hourOfDay, minute, second); - return gcalendar.getTime(); - } - - private static Date fimFecha(Date fecha, boolean diaFinal) { - GregorianCalendar gcalendar = new GregorianCalendar(); - gcalendar.setTime(fecha); - - int date = gcalendar.get(Calendar.DATE); - if (diaFinal) { - date = gcalendar.getActualMaximum(Calendar.DAY_OF_MONTH); - } - int month = gcalendar.get(Calendar.MONTH); - int year = gcalendar.get(Calendar.YEAR); - int hourOfDay = 23; - int minute = 59; - int second = 59; - - gcalendar.set(year, month, date, hourOfDay, minute, second); - return gcalendar.getTime(); - } - - public static Date inicioFecha(Date fecha) { - return inicioFecha(fecha, false); - } - - public static Date fimFecha(Date fecha) { - return fimFecha(fecha, false); - } - - public static java.sql.Date inicioFechaSql(Date fecha) { - return new java.sql.Date(inicioFecha(fecha, false).getTime()); - } - - public static java.sql.Date fimFechaSql(Date fecha) { - return new java.sql.Date(fimFecha(fecha, false).getTime()); - } - - public static Date somarDias(Date data, int quantidadeDias) { - Integer dias = UM_DIA * quantidadeDias; - Calendar c = Calendar.getInstance(); - c.setTime(data); - c.add(Calendar.DAY_OF_MONTH, dias); - return c.getTime(); - } - - public static Date somarMinutos(Date data, int quantidadeMinutos) { - Calendar c = Calendar.getInstance(); - c.setTime(data); - c.add(Calendar.MINUTE, quantidadeMinutos); - return c.getTime(); - } - - /** - * Formato competencia: MM/YYYY - * - * @param competencia - * @return - */ - public static Set carregarDiasCompetencia(String competencia, Date dataMovimento) { - Set diasCompetencia = new TreeSet(); - if (competencia == null && dataMovimento != null) { - Integer diaInteger = new Integer(getStringDate(dataMovimento).split("/")[0]); - diasCompetencia.add(diaInteger); - } else { - String[] vetCompetencia = competencia.split("/"); - Calendar cal = Calendar.getInstance(); - cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1); - cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1])); - - for (int i = 1; i <= cal.getActualMaximum(Calendar.DAY_OF_MONTH); i++) { - diasCompetencia.add(i); - } - } - return diasCompetencia; - } - - public static Set carregarDiasCompetencia(Date dataInicial, Date dataFinal) { - Set diasCompetencia = new TreeSet(); - - Calendar cal = Calendar.getInstance(); - - cal.setTime(dataInicial); - Integer diaInicial = cal.get(Calendar.DAY_OF_MONTH); - - cal.setTime(dataFinal); - Integer diaFinal = cal.get(Calendar.DAY_OF_MONTH); - - for (int i = diaInicial; i <= diaFinal; i++) { - diasCompetencia.add(i); - } - - return diasCompetencia; - } - - public static boolean isCompetenciaValida(String competencia) { - if (StringUtils.isNotBlank(competencia)) { - String mesString = competencia.split("/")[0].replaceAll("_", ""); - if (StringUtils.isNotBlank(mesString)) { - Integer mes = Integer.valueOf(competencia.split("/")[0]); - Integer minMes = Calendar.JANUARY + 1; - Integer maxMes = Calendar.DECEMBER + 1; - return mes >= minMes && mes <= maxMes; - } - } - - return false; - } - - public static Date getDataFinalCompetencia(String competencia) throws ParseException { - if (isCompetenciaValida(competencia)) { - Date dataInicio = getDateFromString("01/" + competencia, "dd/MM/yyyy"); - Calendar cal = Calendar.getInstance(LocaleUtil.getLocale()); - cal.setTime(dataInicio); - return getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"); - } - return null; - } - - public static Date getDataInicialCompetencia(String competencia) throws ParseException { - if (isCompetenciaValida(competencia)) { - return getDateFromString("01/" + competencia, "dd/MM/yyyy"); - } - return null; - } - - public static Date getYesterdayDate() { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DATE, -1); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.SECOND, 0); - Date yesterday = calendar.getTime(); - return yesterday; - } - - public static String getYesterdayDateString() { - DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DATE, -1); - return dateFormat.format(cal.getTime()); - } - - public static Date getDataTempoDecorrido(String tempo) { - String[] tempoDecorrido = tempo.split(":"); - - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR, Integer.parseInt(tempoDecorrido[0].isEmpty() ? "0" : tempoDecorrido[0])); - calendar.set(Calendar.MINUTE, Integer.parseInt(tempoDecorrido[1].isEmpty() ? "0" : tempoDecorrido[1])); - - return calendar.getTime(); - } - - public static int diferencaEntreDatasEmdias(Date inicio, Date fim) { - long quantidadeHoras = ((fim.getTime() - inicio.getTime())); - return (int) (quantidadeHoras / DIA); - } - - public static String dataFormatoBPe(Date data){ - SimpleDateFormat dateFormat = new SimpleDateFormat(YYYY_MM_DD_T_HH_MM_SS_Z) { - private static final long serialVersionUID = 1L; - public StringBuffer format(Date date, StringBuffer toAppendTo, java.text.FieldPosition pos) { - StringBuffer toFix = super.format(date, toAppendTo, pos); - return toFix.insert(toFix.length()-2, ':'); - }; - }; - - return dateFormat.format(data); - } - - public static Date dateFormatBPe(final String data) { - try { - SimpleDateFormat sdf = new SimpleDateFormat(YYYY_MM_DD_T_HH_MM_SS_Z); - - String value = data; - - if (value.substring(value.length()-3,value.length()-2).equals(":")) { - StringBuilder dx = new StringBuilder(value); - dx = dx.delete(dx.length() - 3, dx.length() - 2); - value = dx.toString(); - } - - return sdf.parse(value); - } catch (ParseException e) { - return null; - } - } - - /** - * Verifica se a data1 é igual a data2 - * @param data1 - * @param data2 - * @return - */ - public static boolean isIgual(final Date data1, final Date data2) { - if(data1 == null || data2 == null) { - return false; - } - - Calendar c1 = Calendar.getInstance(); - c1.setTime(data1); - - Calendar c2 = Calendar.getInstance(); - c2.setTime(data2); - - return c1.equals(c2); - } - - /** - * Verifica se a data1 é igual ou menor que a data2 - * @param data1 - * @param data2 - * @return - */ - public static boolean isIgualORMenor(final Date data1, final Date data2) { - return isIgual(data1, data2) || isMenor(data1, data2); - } - - /** - * Verifica se a data1 é menor que a data2 - * @param data1 - * @param data2 - * @return - */ - public static boolean isMenor(final Date data1, final Date data2) { - if(data1 == null || data2 == null) { - return false; - } - - Calendar c1 = Calendar.getInstance(); - c1.setTime(data1); - - Calendar c2 = Calendar.getInstance(); - c2.setTime(data2); - - return c1.before(c2); - } - - /** - * Verifica se a data1 é igual ou maior que a data2 - * @param data1 - * @param data2 - * @return - */ - public static boolean isIgualORMaior(final Date data1, final Date data2) { - return isIgual(data1, data2) || isMaior(data1, data2); - } - - /** - * Verifica se a data1 é maior que a data2 - * @param data1 - * @param data2 - * @return - */ - public static boolean isMaior(final Date data1, final Date data2) { - if(data1 == null || data2 == null) { - return false; - } - - Calendar c1 = Calendar.getInstance(); - c1.setTime(data1); - - Calendar c2 = Calendar.getInstance(); - c2.setTime(data2); - - return c1.after(c2); - } - - /*** - * retorna dia da semana da data Domingo 1, até sábado 7 - * - * @param dataCobranca - * @return - */ - public static int getDiaDaSemana(Date dataCobranca) { - Calendar cal = Calendar.getInstance(); - cal.setTime(dataCobranca); - - return cal.get(Calendar.DAY_OF_WEEK); - } - +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.utilerias; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; + +public final class DateUtil { + + public static Integer DIA = Integer.valueOf(1000 * 60 * 60 * 24); + public static Integer UM_DIA = Integer.valueOf(1); + + /** + * Formato 24Hs + */ + public static String ddMMaaHH24mm = "dd/MM/yyyy HH:mm"; + public static String ddMMaaHH24mmss = "dd/MM/yyyy HH:mm:ss"; + + /** + * Formato 12hs + */ + public static String ddMMaaHHmm = "dd/MM/yyyy hh:mm"; + public static String ddMMaaaa = "dd/MM/yyyy"; + public static String ddMMaa_anodoisdigitos = "dd/MM/yy"; + public static String ddMMaa_sembarra = "ddMMyy"; + public static String HHmm = "HH:mm"; + public static String formatGMT = "yyyy-MM-dd'T'HH:mm:ss"; + public static String formatJson = "yyyy-MM-dd'T'HH:mm:ss.SSS"; + public static String formatExp = "yyyyMMdd"; + public static String YYYY_MM_DD_T_HH_MM_SS_Z = "yyyy-MM-dd'T'HH:mm:ssZ"; + + /** + * No need for an instance + */ + private DateUtil() { + } + + /** + * Elapsed days based on current time + * + * @param date + * Date + * + * @return int number of days + */ + public static int getElapsedDias(Date date) { + return elapsed(date, Calendar.DATE); + } + + /** + * Elapsed days based on two Date objects + * + * @param d1 + * Date + * @param d2 + * Date + * + * @return int number of days + */ + public static int getElapsedDias(Date d1, Date d2) { + return elapsed(d1, d2, Calendar.DATE); + } + + /** + * Elapsed months based on current time + * + * @param date + * Date + * + * @return int number of months + */ + public static int getElapsedMeses(Date date) { + return elapsed(date, Calendar.MONTH); + } + + /** + * Elapsed months based on two Date objects + * + * @param d1 + * Date + * @param d2 + * Date + * + * @return int number of months + */ + public static int getElapsedMeses(Date d1, Date d2) { + return elapsed(d1, d2, Calendar.MONTH); + } + + /** + * Elapsed years based on current time + * + * @param date + * Date + * + * @return int number of years + */ + public static int getElapsedAnos(Date date) { + return elapsed(date, Calendar.YEAR); + } + + /** + * Elapsed years based on two Date objects + * + * @param d1 + * Date + * @param d2 + * Date + * + * @return int number of years + */ + public static int getElapsedAnos(Date d1, Date d2) { + return elapsed(d1, d2, Calendar.YEAR); + } + + /** + * All elaspsed types + * + * @param g1 + * GregorianCalendar + * @param g2 + * GregorianCalendar + * @param type + * int (Calendar.FIELD_NAME) + * + * @return int number of elapsed "type" + */ + private static int elapsed(GregorianCalendar g1, GregorianCalendar g2, int type) { + GregorianCalendar gc1, gc2; + int elapsed = 0; + // Create copies since we will be clearing/adding + if (g2.after(g1)) { + gc2 = (GregorianCalendar) g2.clone(); + gc1 = (GregorianCalendar) g1.clone(); + } else { + gc2 = (GregorianCalendar) g1.clone(); + gc1 = (GregorianCalendar) g2.clone(); + } + if (type == Calendar.MONTH || type == Calendar.YEAR) { + gc1.clear(Calendar.DATE); + gc2.clear(Calendar.DATE); + } + if (type == Calendar.YEAR) { + gc1.clear(Calendar.MONTH); + gc2.clear(Calendar.MONTH); + } + while (gc1.before(gc2)) { + gc1.add(type, 1); + elapsed++; + } + return elapsed; + } + + /** + * All elaspsed types based on date and current Date + * + * @param date + * Date + * @param type + * int (Calendar.FIELD_NAME) + * + * @return int number of elapsed "type" + */ + private static int elapsed(Date date, int type) { + return elapsed(date, new Date(), type); + } + + /** + * All elaspsed types + * + * @param d1 + * Date + * @param d2 + * Date + * @param type + * int (Calendar.FIELD_NAME) + * + * @return int number of elapsed "type" + */ + private static int elapsed(Date d1, Date d2, int type) { + Calendar cal = Calendar.getInstance(); + cal.setTime(d1); + GregorianCalendar g1 = new GregorianCalendar(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE)); + cal.setTime(d2); + GregorianCalendar g2 = new GregorianCalendar(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE)); + return elapsed(g1, g2, type); + } + + public static Date getDateFromString(String data, String formato) throws java.text.ParseException { + Date d = new Date(); + DateFormat df = new SimpleDateFormat(formato); + + d = df.parse(data); + return d; + } + + public static java.sql.Timestamp getTimestampFromString(String data, String formato) throws java.text.ParseException { + Date d = new Date(); + DateFormat df = new SimpleDateFormat(formato); + + d = df.parse(data); + return new java.sql.Timestamp(d.getTime()); + } + + + + public static int compareDate(java.util.Date d1) { + return compareDate(d1, new java.util.Date()); + } + + /** + * Compara a data atual com d1 de forma que a chama fica compareOnlyDate(d1, new java.util.Date()); + * + * {@link #compareOnlyDate(Date, Date)} + */ + public static int compareOnlyDate(java.util.Date d1) { + return compareOnlyDate(d1, new java.util.Date()); + } + + /** + * não leva em consideração os segundos/minutos. Só é considerado o dia/mes/ano
+ * + * Retorno igual a {@link #compareDate(Date, Date)} + */ + public static int compareOnlyDate(java.util.Date d1, java.util.Date d2) { + java.util.Calendar cal = Calendar.getInstance(); + cal.setTime(d1); + GregorianCalendar g1 = new GregorianCalendar(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE)); + + java.util.Calendar cal2 = Calendar.getInstance(); + cal2.setTime(d2); + GregorianCalendar g2 = new GregorianCalendar(cal2.get(Calendar.YEAR), cal2.get(Calendar.MONTH), cal2.get(Calendar.DATE)); + return g1.compareTo(g2); + // return cal.compareTo(cal2); + } + + /** + * Retorna : - 0 se igual
+ * - < 0 se d1 < d2
+ * - > 0 se d1 > d2
+ */ + public static int compareDate(java.util.Date d1, java.util.Date d2) { + java.util.Calendar cal = Calendar.getInstance(); + cal.setTime(d1); + java.util.Calendar cal2 = Calendar.getInstance(); + cal2.setTime(d2); + + return cal.compareTo(cal2); + } + + public static Integer getIntegerDate(java.util.Date d, String formato) { + if (formato.contains("/")) { + throw new IllegalArgumentException("O formato não deve conter o simbolo \\ "); + } + + String s = getStringDate(d, formato); + return Integer.parseInt(s); + } + + public static String getStringDate(java.util.Date d, String formato) { + if (d != null) { + DateFormat df = new SimpleDateFormat(formato); + return df.format(d); + } + return null; + } + + /** + * Formato 12 horas + * @param d + * @return + */ + public static String getStringDateHour(java.util.Date d) { + if (d != null) { + DateFormat df = new SimpleDateFormat(ddMMaaHHmm); + return df.format(d); + } + return null; + } + + /** + * Formato 12 horas + * @param d + * @return + */ + public static Date getDateStringHour(String d) { + try { + if (d != null) { + DateFormat df = new SimpleDateFormat(ddMMaaHHmm); + return df.parse(d); + } + } catch (ParseException e) { + } + + return null; + } + + /** + * Formato 24 horas + * @param d + * @return + */ + public static String getStringDate24Hour(java.util.Date d) { + if (d != null) { + DateFormat df = new SimpleDateFormat(ddMMaaHH24mm); + return df.format(d); + } + return null; + } + + /** + * Formato 24 horas + * @param d + * @return + */ + public static Date getDateString24Hour(String d) { + try { + if (d != null) { + DateFormat df = new SimpleDateFormat(ddMMaaHH24mm); + return df.parse(d); + } + } catch (ParseException e) { + } + + return null; + } + + public static String getStringDate(java.util.Date d) { + try { + return getStringDate(d, "dd/MM/yyyy"); + }catch(Exception e) { + return null; + } + } + + public static String getStringDate(java.sql.Date d) { + return getStringDate(new java.util.Date(d.getTime())); + } + + public static String getStringCurrentDate(String formato) { + return getStringDate(new java.util.Date(), formato); + } + + public static String changeFormatStringDate(String date, String currentFormat, String newFormat) { + + try { + return DateUtil.getStringDate(DateUtil.getDateFromString(date, currentFormat), newFormat); + } catch (ParseException ex) { + LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); + } + return null; + } + + public static Integer changeFormatIntDate(Integer date, String currentFormat, String newFormat) { + + try { + return DateUtil.getIntegerDate(DateUtil.getDateFromString(String.valueOf(date), currentFormat), newFormat); + } catch (ParseException ex) { + LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); + } + return null; + } + + /** + * Retorna uma array onde [0] é hora, [1] é minuto + * + * @param hora + * @return + */ + private static int[] getArrayHora(Integer hora) { + + String strHora = String.valueOf(hora); + + int[] array = new int[2]; + + if (strHora.length() <= 2) { + array[0] = 0; + array[1] = Integer.parseInt(strHora); + } else if (strHora.length() == 3) { + array[0] = Integer.parseInt(strHora.substring(0, 1)); + array[1] = Integer.parseInt(strHora.substring(1)); + } else if (strHora.length() == 4) { + array[0] = Integer.parseInt(strHora.substring(0, 2)); + array[1] = Integer.parseInt(strHora.substring(2)); + } + + return array; + } + + public static java.util.Date changeFormatIntDate(Integer date, String currentFormat, Integer hora) { + + try { + if (currentFormat.equals("yMMdd") || currentFormat.equals("yyMMdd")) { + + currentFormat = "yyyyMMdd"; + String strData = String.valueOf(date); + + if (strData.length() == 5) { + strData = "200" + strData; + } else if (strData.length() == 6) { + strData = "20" + strData; + } + + date = Integer.parseInt(strData); + } + Date data = DateUtil.getDateFromString(String.valueOf(date), currentFormat); + + if (hora == null) { + return data; + } + + int horaArray[] = DateUtil.getArrayHora(hora); + Calendar c = Calendar.getInstance(); + c.setTime(data); + c.set(Calendar.HOUR_OF_DAY, horaArray[0]); + c.set(Calendar.MINUTE, horaArray[1]); + + return c.getTime(); + + } catch (ParseException ex) { + LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); + } + return null; + } + + public static java.util.Date changeFormatStringDate(String date, String currentFormat, Integer hora) { + + try { + if (currentFormat.equals("yMMdd") || currentFormat.equals("yyMMdd")) { + + currentFormat = "yyyyMMdd"; + + if (date.length() == 5) { + date = "200" + date; + } else if (date.length() == 6) { + date = "20" + date; + } + } + Date data = DateUtil.getDateFromString(String.valueOf(date), currentFormat); + + if (hora == null) { + return data; + } + + int horaArray[] = DateUtil.getArrayHora(hora); + Calendar c = Calendar.getInstance(); + c.setTime(data); + c.set(Calendar.HOUR_OF_DAY, horaArray[0]); + c.set(Calendar.MINUTE, horaArray[1]); + + return c.getTime(); + + } catch (ParseException ex) { + LogManager.getLogger(DateUtil.class.getName()).log(Level.ERROR, "", ex); + } + return null; + } + + public static int getIntHoraSRVP(Date data) { + Calendar c = Calendar.getInstance(); + c.setTime(data); + + String hora = String.valueOf(c.get(Calendar.HOUR_OF_DAY)); + hora = (hora.length() < 2) ? "0" + hora : hora; + + String minuto = String.valueOf(c.get(Calendar.MINUTE)); + minuto = (minuto.length() < 2) ? "0" + minuto : minuto; + + return Integer.parseInt(hora + minuto); + } + + public static long getElapsedHoras(Date dtInic, Date dtFim) { + return (dtFim.getTime() - dtInic.getTime()) / (1000 * 60 * 60); + } + + public static long getElapsedMinutos(Date dtInic, Date dtFim) { + return (dtFim.getTime() - dtInic.getTime()) / (1000 * 60); + } + + /** + * Regresa los minutos pela hora inicial del sistema + * + * @param dtInic + * @param dtFim + * @return + */ + public static HoraSistema getHorasMinutosByInicio(Date dtFim) { + return new HoraSistema(dtFim); + } + + /** + * Verifica se o intervalo de datas dtStartCompare e dtEndCompare estão dentro do intervalo dtStart dtEnd + * + * @param dtStart + * @param dtEnd + * @param dtStartCompare + * @param dtEndCompare + * @return + */ + public static boolean intersectDate(Date dtStart, Date dtEnd, Date dtStartCompare, Date dtEndCompare) { + return TraslaparUtil.intersectDate(dtStart, dtEnd, dtStartCompare, dtEndCompare); + } + + public static void main(String ar[]) { + System.out.println(Arrays.asList(1,2,3,4,5).toString().replaceAll("[\\]\\[]", "")); + } + + public static void main2(String args[]) { + java.util.Date agora = new java.util.Date(); + + System.out.println(agora); + + Calendar c = Calendar.getInstance(); + c.setTime(agora); + + System.out.println(DateUtil.getIntHoraSRVP(agora)); + // c.add(Calendar.MINUTE, 60); + + System.out.println("final " + c.getTime()); + System.out.println("1 " + c.get(Calendar.HOUR_OF_DAY)); + + } + + /** + * Es la fecInicial del sistema para campos de horas + * + * @return + */ + public static Calendar getFecInicio() { + Calendar c = Calendar.getInstance(); + c.set(Calendar.YEAR, 1970); + c.set(Calendar.DAY_OF_MONTH, 1); + c.set(Calendar.MONTH, 0); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.MILLISECOND, 0); + c.set(Calendar.SECOND, 0); + + return c; + } + + /** + * Es la fecInicial del sistema con los campos de hora y minutos del parametro informado + * + * @return + */ + public static Calendar getFecInicio(Date horaMinuto) { + Calendar tmp = Calendar.getInstance(); + tmp.setTime(horaMinuto); + Calendar c = getFecInicio(); + c.set(Calendar.HOUR_OF_DAY, tmp.get(Calendar.HOUR_OF_DAY)); + c.set(Calendar.MINUTE, tmp.get(Calendar.MINUTE)); + + return c; + } + + /** + * Es la fecInicial del sistema con los campos de hora y minutos del parametro informado + * + * @return + */ + public static Calendar getFecInicio(Integer hora, Integer minuto) { + + Calendar c = getFecInicio(); + c.add(Calendar.HOUR_OF_DAY, hora); + c.add(Calendar.MINUTE, minuto); + + return c; + } + + /** + * Quita los segundos y milesegundos de la fecha + * + * @param fecha + * @return + */ + public static Date normalizar(Date fecha) { + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(fecha); + gcalendar.set(Calendar.SECOND, 0); + gcalendar.set(Calendar.MILLISECOND, 0); + + return gcalendar.getTime(); + } + + /** + * Quita los segundos, milesegundos, hora y minuto de la fecha + * + * @param fecha + * @return + */ + public static Date normalizarToFecha(Date fecha) { + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(fecha); + gcalendar.set(Calendar.SECOND, 0); + gcalendar.set(Calendar.MILLISECOND, 0); + gcalendar.set(Calendar.HOUR_OF_DAY, 0); + gcalendar.set(Calendar.MINUTE, 0); + + return gcalendar.getTime(); + } + + public static Date inicioFechaPeriodoMeses(Date periodo) { + return inicioFecha(periodo, true); + } + + public static Date fimFechaPeriodoMeses(Date periodo) { + return fimFecha(periodo, true); + } + + private static Date inicioFecha(Date fecha, boolean diaInicial) { + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(fecha); + int date = gcalendar.get(Calendar.DATE); + if (diaInicial) { + date = gcalendar.getActualMinimum(Calendar.DAY_OF_MONTH); + } + int month = gcalendar.get(Calendar.MONTH); + int year = gcalendar.get(Calendar.YEAR); + int hourOfDay = 00; + int minute = 00; + int second = 00; + + gcalendar.set(year, month, date, hourOfDay, minute, second); + return gcalendar.getTime(); + } + + private static Date fimFecha(Date fecha, boolean diaFinal) { + GregorianCalendar gcalendar = new GregorianCalendar(); + gcalendar.setTime(fecha); + + int date = gcalendar.get(Calendar.DATE); + if (diaFinal) { + date = gcalendar.getActualMaximum(Calendar.DAY_OF_MONTH); + } + int month = gcalendar.get(Calendar.MONTH); + int year = gcalendar.get(Calendar.YEAR); + int hourOfDay = 23; + int minute = 59; + int second = 59; + + gcalendar.set(year, month, date, hourOfDay, minute, second); + return gcalendar.getTime(); + } + + public static Date inicioFecha(Date fecha) { + return inicioFecha(fecha, false); + } + + public static Date fimFecha(Date fecha) { + return fimFecha(fecha, false); + } + + public static java.sql.Date inicioFechaSql(Date fecha) { + return new java.sql.Date(inicioFecha(fecha, false).getTime()); + } + + public static java.sql.Date fimFechaSql(Date fecha) { + return new java.sql.Date(fimFecha(fecha, false).getTime()); + } + + public static Date somarDias(Date data, int quantidadeDias) { + Integer dias = UM_DIA * quantidadeDias; + Calendar c = Calendar.getInstance(); + c.setTime(data); + c.add(Calendar.DAY_OF_MONTH, dias); + return c.getTime(); + } + + public static Date somarMinutos(Date data, int quantidadeMinutos) { + Calendar c = Calendar.getInstance(); + c.setTime(data); + c.add(Calendar.MINUTE, quantidadeMinutos); + return c.getTime(); + } + + /** + * Formato competencia: MM/YYYY + * + * @param competencia + * @return + */ + public static Set carregarDiasCompetencia(String competencia, Date dataMovimento) { + Set diasCompetencia = new TreeSet(); + if (competencia == null && dataMovimento != null) { + Integer diaInteger = new Integer(getStringDate(dataMovimento).split("/")[0]); + diasCompetencia.add(diaInteger); + } else { + String[] vetCompetencia = competencia.split("/"); + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1); + cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1])); + + for (int i = 1; i <= cal.getActualMaximum(Calendar.DAY_OF_MONTH); i++) { + diasCompetencia.add(i); + } + } + return diasCompetencia; + } + + public static Set carregarDiasCompetencia(Date dataInicial, Date dataFinal) { + Set diasCompetencia = new TreeSet(); + + Calendar cal = Calendar.getInstance(); + + cal.setTime(dataInicial); + Integer diaInicial = cal.get(Calendar.DAY_OF_MONTH); + + cal.setTime(dataFinal); + Integer diaFinal = cal.get(Calendar.DAY_OF_MONTH); + + for (int i = diaInicial; i <= diaFinal; i++) { + diasCompetencia.add(i); + } + + return diasCompetencia; + } + + public static boolean isCompetenciaValida(String competencia) { + if (StringUtils.isNotBlank(competencia)) { + String mesString = competencia.split("/")[0].replaceAll("_", ""); + if (StringUtils.isNotBlank(mesString)) { + Integer mes = Integer.valueOf(competencia.split("/")[0]); + Integer minMes = Calendar.JANUARY + 1; + Integer maxMes = Calendar.DECEMBER + 1; + return mes >= minMes && mes <= maxMes; + } + } + + return false; + } + + public static Date getDataFinalCompetencia(String competencia) throws ParseException { + if (isCompetenciaValida(competencia)) { + Date dataInicio = getDateFromString("01/" + competencia, "dd/MM/yyyy"); + Calendar cal = Calendar.getInstance(LocaleUtil.getLocale()); + cal.setTime(dataInicio); + return getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"); + } + return null; + } + + public static Date getDataInicialCompetencia(String competencia) throws ParseException { + if (isCompetenciaValida(competencia)) { + return getDateFromString("01/" + competencia, "dd/MM/yyyy"); + } + return null; + } + + public static Date getYesterdayDate() { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE, -1); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + Date yesterday = calendar.getTime(); + return yesterday; + } + + public static String getYesterdayDateString() { + DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.DATE, -1); + return dateFormat.format(cal.getTime()); + } + + public static Date getDataTempoDecorrido(String tempo) { + String[] tempoDecorrido = tempo.split(":"); + + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR, Integer.parseInt(tempoDecorrido[0].isEmpty() ? "0" : tempoDecorrido[0])); + calendar.set(Calendar.MINUTE, Integer.parseInt(tempoDecorrido[1].isEmpty() ? "0" : tempoDecorrido[1])); + + return calendar.getTime(); + } + + public static int diferencaEntreDatasEmdias(Date inicio, Date fim) { + long quantidadeHoras = ((fim.getTime() - inicio.getTime())); + return (int) (quantidadeHoras / DIA); + } + + public static String dataFormatoBPe(Date data){ + SimpleDateFormat dateFormat = new SimpleDateFormat(YYYY_MM_DD_T_HH_MM_SS_Z) { + private static final long serialVersionUID = 1L; + public StringBuffer format(Date date, StringBuffer toAppendTo, java.text.FieldPosition pos) { + StringBuffer toFix = super.format(date, toAppendTo, pos); + return toFix.insert(toFix.length()-2, ':'); + }; + }; + + return dateFormat.format(data); + } + + public static Date dateFormatBPe(final String data) { + try { + SimpleDateFormat sdf = new SimpleDateFormat(YYYY_MM_DD_T_HH_MM_SS_Z); + + String value = data; + + if (value.substring(value.length()-3,value.length()-2).equals(":")) { + StringBuilder dx = new StringBuilder(value); + dx = dx.delete(dx.length() - 3, dx.length() - 2); + value = dx.toString(); + } + + return sdf.parse(value); + } catch (ParseException e) { + return null; + } + } + + /** + * Verifica se a data1 é igual a data2 + * @param data1 + * @param data2 + * @return + */ + public static boolean isIgual(final Date data1, final Date data2) { + if(data1 == null || data2 == null) { + return false; + } + + Calendar c1 = Calendar.getInstance(); + c1.setTime(data1); + + Calendar c2 = Calendar.getInstance(); + c2.setTime(data2); + + return c1.equals(c2); + } + + /** + * Verifica se a data1 é igual ou menor que a data2 + * @param data1 + * @param data2 + * @return + */ + public static boolean isIgualORMenor(final Date data1, final Date data2) { + return isIgual(data1, data2) || isMenor(data1, data2); + } + + /** + * Verifica se a data1 é menor que a data2 + * @param data1 + * @param data2 + * @return + */ + public static boolean isMenor(final Date data1, final Date data2) { + if(data1 == null || data2 == null) { + return false; + } + + Calendar c1 = Calendar.getInstance(); + c1.setTime(data1); + + Calendar c2 = Calendar.getInstance(); + c2.setTime(data2); + + return c1.before(c2); + } + + /** + * Verifica se a data1 é igual ou maior que a data2 + * @param data1 + * @param data2 + * @return + */ + public static boolean isIgualORMaior(final Date data1, final Date data2) { + return isIgual(data1, data2) || isMaior(data1, data2); + } + + /** + * Verifica se a data1 é maior que a data2 + * @param data1 + * @param data2 + * @return + */ + public static boolean isMaior(final Date data1, final Date data2) { + if(data1 == null || data2 == null) { + return false; + } + + Calendar c1 = Calendar.getInstance(); + c1.setTime(data1); + + Calendar c2 = Calendar.getInstance(); + c2.setTime(data2); + + return c1.after(c2); + } + + /*** + * retorna dia da semana da data Domingo 1, até sábado 7 + * + * @param dataCobranca + * @return + */ + public static int getDiaDaSemana(Date dataCobranca) { + Calendar cal = Calendar.getInstance(); + cal.setTime(dataCobranca); + + return cal.get(Calendar.DAY_OF_WEEK); + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/utilerias/DocumentosUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/DocumentosUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/DocumentosUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/DocumentosUtil.java index 918b427b7..cab68c730 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/DocumentosUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/DocumentosUtil.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.text.ParseException; - -import javax.swing.text.MaskFormatter; - -import org.apache.commons.lang.StringUtils; - -public class DocumentosUtil { - - private static final String CPF_MASK = "###.###.###-##"; - private static final String CNPJ_MASK = "##.###.###/####-##"; - - public static String formataCpf(String cpf) { - try { - if(StringUtils.isNotBlank(cpf)) { - cpf = StringHelper.preencherZeroEsquerda(cpf.replace("[^0-9]", ""), 11); - MaskFormatter mask = new MaskFormatter(CPF_MASK); - mask.setValueContainsLiteralCharacters(false); - return mask.valueToString(cpf); - } - } catch (ParseException e) { - e.printStackTrace(); - } - return null; - } - - public static String formataCnpj(String cnpj) { - try { - if(StringUtils.isNotBlank(cnpj)) { - cnpj = StringHelper.preencherZeroEsquerda(cnpj.replace("[^0-9]", ""), 14); - MaskFormatter mask = new MaskFormatter(CNPJ_MASK); - mask.setValueContainsLiteralCharacters(false); - return mask.valueToString(cnpj); - } - } catch (ParseException e) { - e.printStackTrace(); - } - return null; - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.text.ParseException; + +import javax.swing.text.MaskFormatter; + +import org.apache.commons.lang.StringUtils; + +public class DocumentosUtil { + + private static final String CPF_MASK = "###.###.###-##"; + private static final String CNPJ_MASK = "##.###.###/####-##"; + + public static String formataCpf(String cpf) { + try { + if(StringUtils.isNotBlank(cpf)) { + cpf = StringHelper.preencherZeroEsquerda(cpf.replace("[^0-9]", ""), 11); + MaskFormatter mask = new MaskFormatter(CPF_MASK); + mask.setValueContainsLiteralCharacters(false); + return mask.valueToString(cpf); + } + } catch (ParseException e) { + e.printStackTrace(); + } + return null; + } + + public static String formataCnpj(String cnpj) { + try { + if(StringUtils.isNotBlank(cnpj)) { + cnpj = StringHelper.preencherZeroEsquerda(cnpj.replace("[^0-9]", ""), 14); + MaskFormatter mask = new MaskFormatter(CNPJ_MASK); + mask.setValueContainsLiteralCharacters(false); + return mask.valueToString(cnpj); + } + } catch (ParseException e) { + e.printStackTrace(); + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/FeriadoCache.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/FeriadoCache.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/FeriadoCache.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/FeriadoCache.java index a07fd432e..32e9688b3 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/FeriadoCache.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/FeriadoCache.java @@ -1,129 +1,129 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.dao.FeriadoDAO; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Estado; - -@Service("feriadoCache") -@Scope(value = "prototype") -public class FeriadoCache { - - private static Logger log = LogManager.getLogger(FeriadoCache.class); - - @Autowired - private FeriadoDAO feriadoDAO; - private Map mapFeriado; - - public FeriadoCache() { - mapFeriado = new LinkedHashMap(); - } - - public boolean ehFeriado(Date dataFeriado, Empresa empresa, Estado estadoOrigem) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - String strDataFeriado = sdf.format(dataFeriado); - KeyFeriadoMap key = new KeyFeriadoMap(strDataFeriado, empresa.getEmpresaId(), estadoOrigem.getEstadoId()); - - Boolean ehFeriado = mapFeriado.get(key); - - log.debug("ehFeriado="+ehFeriado); - - if (ehFeriado == null) { - ehFeriado = feriadoDAO.ehFeriado(new java.sql.Date(dataFeriado.getTime()), empresa, estadoOrigem); - - mapFeriado.put(key, ehFeriado); - } - - log.debug("data feriado = " + strDataFeriado + "; empresa = " + empresa.getNombempresa() + "; estado = " + estadoOrigem.getNombestado() + "; eh feriado = " + ehFeriado); - - return ehFeriado; - } - - public void limpar() { - log.debug("limpeza de cache de feriados"); - - mapFeriado.clear(); - } - - public void limparData(Date dataFeriado, Integer empresaId, Integer estadoId) { - try { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - String strDataFeriado = sdf.format(dataFeriado); - - log.info(String.format("Removendo feriado, data: "+ strDataFeriado +", empresaId: "+ empresaId+", estadoId: " + estadoId)); - - KeyFeriadoMap key = new KeyFeriadoMap(strDataFeriado, empresaId, estadoId); - - mapFeriado.remove(key); - } catch (Exception e) { - log.error("Erro ao remover Deriado de cache: ", e); - } - } - - class KeyFeriadoMap { - private String dataFeriado; - private Integer empresaId; - private Integer estadoOrigemId; - - public KeyFeriadoMap(String dataFeriado, Integer empresaId, Integer estadoOrigemId) { - super(); - this.dataFeriado = dataFeriado; - this.empresaId = empresaId; - this.estadoOrigemId = estadoOrigemId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + getOuterType().hashCode(); - result = prime * result + ((dataFeriado == null) ? 0 : dataFeriado.hashCode()); - result = prime * result + ((empresaId == null) ? 0 : empresaId.hashCode()); - result = prime * result + ((estadoOrigemId == null) ? 0 : estadoOrigemId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - KeyFeriadoMap other = (KeyFeriadoMap) obj; - if (!getOuterType().equals(other.getOuterType())) - return false; - if (dataFeriado == null) { - if (other.dataFeriado != null) - return false; - } else if (!dataFeriado.equals(other.dataFeriado)) - return false; - if (empresaId == null) { - if (other.empresaId != null) - return false; - } else if (!empresaId.equals(other.empresaId)) - return false; - if (estadoOrigemId == null) { - if (other.estadoOrigemId != null) - return false; - } else if (!estadoOrigemId.equals(other.estadoOrigemId)) - return false; - return true; - } - - private FeriadoCache getOuterType() { - return FeriadoCache.this; - } - } -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.dao.FeriadoDAO; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; + +@Service("feriadoCache") +@Scope(value = "prototype") +public class FeriadoCache { + + private static Logger log = LogManager.getLogger(FeriadoCache.class); + + @Autowired + private FeriadoDAO feriadoDAO; + private Map mapFeriado; + + public FeriadoCache() { + mapFeriado = new LinkedHashMap(); + } + + public boolean ehFeriado(Date dataFeriado, Empresa empresa, Estado estadoOrigem) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + String strDataFeriado = sdf.format(dataFeriado); + KeyFeriadoMap key = new KeyFeriadoMap(strDataFeriado, empresa.getEmpresaId(), estadoOrigem.getEstadoId()); + + Boolean ehFeriado = mapFeriado.get(key); + + log.debug("ehFeriado="+ehFeriado); + + if (ehFeriado == null) { + ehFeriado = feriadoDAO.ehFeriado(new java.sql.Date(dataFeriado.getTime()), empresa, estadoOrigem); + + mapFeriado.put(key, ehFeriado); + } + + log.debug("data feriado = " + strDataFeriado + "; empresa = " + empresa.getNombempresa() + "; estado = " + estadoOrigem.getNombestado() + "; eh feriado = " + ehFeriado); + + return ehFeriado; + } + + public void limpar() { + log.debug("limpeza de cache de feriados"); + + mapFeriado.clear(); + } + + public void limparData(Date dataFeriado, Integer empresaId, Integer estadoId) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + String strDataFeriado = sdf.format(dataFeriado); + + log.info(String.format("Removendo feriado, data: "+ strDataFeriado +", empresaId: "+ empresaId+", estadoId: " + estadoId)); + + KeyFeriadoMap key = new KeyFeriadoMap(strDataFeriado, empresaId, estadoId); + + mapFeriado.remove(key); + } catch (Exception e) { + log.error("Erro ao remover Deriado de cache: ", e); + } + } + + class KeyFeriadoMap { + private String dataFeriado; + private Integer empresaId; + private Integer estadoOrigemId; + + public KeyFeriadoMap(String dataFeriado, Integer empresaId, Integer estadoOrigemId) { + super(); + this.dataFeriado = dataFeriado; + this.empresaId = empresaId; + this.estadoOrigemId = estadoOrigemId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + getOuterType().hashCode(); + result = prime * result + ((dataFeriado == null) ? 0 : dataFeriado.hashCode()); + result = prime * result + ((empresaId == null) ? 0 : empresaId.hashCode()); + result = prime * result + ((estadoOrigemId == null) ? 0 : estadoOrigemId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + KeyFeriadoMap other = (KeyFeriadoMap) obj; + if (!getOuterType().equals(other.getOuterType())) + return false; + if (dataFeriado == null) { + if (other.dataFeriado != null) + return false; + } else if (!dataFeriado.equals(other.dataFeriado)) + return false; + if (empresaId == null) { + if (other.empresaId != null) + return false; + } else if (!empresaId.equals(other.empresaId)) + return false; + if (estadoOrigemId == null) { + if (other.estadoOrigemId != null) + return false; + } else if (!estadoOrigemId.equals(other.estadoOrigemId)) + return false; + return true; + } + + private FeriadoCache getOuterType() { + return FeriadoCache.this; + } + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/HoraSistema.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/HoraSistema.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/HoraSistema.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/HoraSistema.java index b33c1aed3..36a447a75 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/HoraSistema.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/HoraSistema.java @@ -1,101 +1,101 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.util.Calendar; -import java.util.Date; - -/** - * Classe criada para realizar operações sobre a hora inicial do sistema.
- * - * A hora inicial do sistema pode ser obtida pelo método DateUtil.getFecInicio() e retorna : YEAR, 1970; DAY_OF_MONTH, 1; MONTH, 0; HOUR_OF_DAY, 0;MINUTE, 0;
- * MILLISECOND, 0; SECOND, 0.
- * - * - * Assim é possível armazenar e somar tempos como 24:30 + 36:00 = 60 horas e 30 minutos - * - * @author gleimar - * - */ -public class HoraSistema { - private Integer hora; - private Integer minuto; - - public HoraSistema() { - this.hora = 0; - this.minuto = 0; - } - - public HoraSistema(Date fecha) { - conf(fecha); - } - - private void conf(Date fecha) { - Long tempo = DateUtil.getElapsedMinutos(DateUtil.getFecInicio().getTime(), fecha); - - long minutos = (tempo % 60); - int horas = (tempo.intValue() / 60); - - hora = horas; - minuto = (int) minutos; - - } - - @Override - public String toString() { - - return (hora + ":" + ((String.valueOf(minuto).length() < 2) ? "0" + minuto : minuto)); - } - - public Integer getHora() { - return hora; - } - - public Integer getMinuto() { - return minuto; - } - - public void setMinuto(Integer minuto) { - this.minuto = minuto; - } - - public void setHora(Integer hora) { - this.hora = hora; - } - - public Date getFecha() { - Calendar c = DateUtil.getFecInicio(); - c.add(Calendar.HOUR_OF_DAY, hora); - c.add(Calendar.MINUTE, minuto); - - return c.getTime(); - } - - /** - * Realiza a soma da hora/minuto atual com o informado no parametro - * - * @param horaAdicao - * @return - */ - public HoraSistema sumar(HoraSistema horaAdicao) { - Calendar horaAtual = Calendar.getInstance(); - horaAtual.setTime(getFecha()); - - Calendar horaSomar = Calendar.getInstance(); - horaSomar.setTime(horaAdicao.getFecha()); - - int horaTotal = horaAtual.get(Calendar.HOUR_OF_DAY) + horaSomar.get(Calendar.HOUR_OF_DAY); - int minutoTotal = horaAtual.get(Calendar.MINUTE) + horaSomar.get(Calendar.MINUTE); - - int cantDiasAtual = DateUtil.getElapsedDias(DateUtil.getFecInicio().getTime(), horaAtual.getTime()); - int cantDiasSumar = DateUtil.getElapsedDias(DateUtil.getFecInicio().getTime(), horaSomar.getTime()); - - Calendar fecInicio = DateUtil.getFecInicio(); - fecInicio.add(Calendar.HOUR_OF_DAY, horaTotal); - fecInicio.add(Calendar.MINUTE, minutoTotal); - - fecInicio.add(Calendar.DATE, cantDiasAtual); - fecInicio.add(Calendar.DATE, cantDiasSumar); - - return new HoraSistema(fecInicio.getTime()); - } - +package com.rjconsultores.ventaboletos.utilerias; + +import java.util.Calendar; +import java.util.Date; + +/** + * Classe criada para realizar operações sobre a hora inicial do sistema.
+ * + * A hora inicial do sistema pode ser obtida pelo método DateUtil.getFecInicio() e retorna : YEAR, 1970; DAY_OF_MONTH, 1; MONTH, 0; HOUR_OF_DAY, 0;MINUTE, 0;
+ * MILLISECOND, 0; SECOND, 0.
+ * + * + * Assim é possível armazenar e somar tempos como 24:30 + 36:00 = 60 horas e 30 minutos + * + * @author gleimar + * + */ +public class HoraSistema { + private Integer hora; + private Integer minuto; + + public HoraSistema() { + this.hora = 0; + this.minuto = 0; + } + + public HoraSistema(Date fecha) { + conf(fecha); + } + + private void conf(Date fecha) { + Long tempo = DateUtil.getElapsedMinutos(DateUtil.getFecInicio().getTime(), fecha); + + long minutos = (tempo % 60); + int horas = (tempo.intValue() / 60); + + hora = horas; + minuto = (int) minutos; + + } + + @Override + public String toString() { + + return (hora + ":" + ((String.valueOf(minuto).length() < 2) ? "0" + minuto : minuto)); + } + + public Integer getHora() { + return hora; + } + + public Integer getMinuto() { + return minuto; + } + + public void setMinuto(Integer minuto) { + this.minuto = minuto; + } + + public void setHora(Integer hora) { + this.hora = hora; + } + + public Date getFecha() { + Calendar c = DateUtil.getFecInicio(); + c.add(Calendar.HOUR_OF_DAY, hora); + c.add(Calendar.MINUTE, minuto); + + return c.getTime(); + } + + /** + * Realiza a soma da hora/minuto atual com o informado no parametro + * + * @param horaAdicao + * @return + */ + public HoraSistema sumar(HoraSistema horaAdicao) { + Calendar horaAtual = Calendar.getInstance(); + horaAtual.setTime(getFecha()); + + Calendar horaSomar = Calendar.getInstance(); + horaSomar.setTime(horaAdicao.getFecha()); + + int horaTotal = horaAtual.get(Calendar.HOUR_OF_DAY) + horaSomar.get(Calendar.HOUR_OF_DAY); + int minutoTotal = horaAtual.get(Calendar.MINUTE) + horaSomar.get(Calendar.MINUTE); + + int cantDiasAtual = DateUtil.getElapsedDias(DateUtil.getFecInicio().getTime(), horaAtual.getTime()); + int cantDiasSumar = DateUtil.getElapsedDias(DateUtil.getFecInicio().getTime(), horaSomar.getTime()); + + Calendar fecInicio = DateUtil.getFecInicio(); + fecInicio.add(Calendar.HOUR_OF_DAY, horaTotal); + fecInicio.add(Calendar.MINUTE, minutoTotal); + + fecInicio.add(Calendar.DATE, cantDiasAtual); + fecInicio.add(Calendar.DATE, cantDiasSumar); + + return new HoraSistema(fecInicio.getTime()); + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/utilerias/LocaleUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/LocaleUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/LocaleUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/LocaleUtil.java index ee9143c28..c71dc0c47 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/LocaleUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/LocaleUtil.java @@ -1,36 +1,36 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.util.Locale; - -import org.zkoss.util.Locales; - -/** - * Retorna o locale atual, caso o locale não seja suportado pelo sistema,
- * será retornado o locale pt_br - * @author Wilian - */ -public class LocaleUtil { - - - private static Locale LOCALE_PT_BR = new Locale("pt", "br"); - private static Locale LOCALE_ES_MX = new Locale("es", "mx"); - - private static Locale [] LOCALES = new Locale[]{LOCALE_PT_BR, LOCALE_ES_MX}; - - /** - * Retorna o locale atual, caso o locale não seja suportado pelo sistema,
- * será retornado o locale pt_br - * @return - */ - public static Locale getLocale() { - Locale localeCurrent = Locales.getCurrent(); - for (Locale locale : LOCALES) { - if(localeCurrent.getLanguage().equals(locale.getLanguage())) { - return localeCurrent; - } - } - - return LOCALE_PT_BR; - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.util.Locale; + +import org.zkoss.util.Locales; + +/** + * Retorna o locale atual, caso o locale não seja suportado pelo sistema,
+ * será retornado o locale pt_br + * @author Wilian + */ +public class LocaleUtil { + + + private static Locale LOCALE_PT_BR = new Locale("pt", "br"); + private static Locale LOCALE_ES_MX = new Locale("es", "mx"); + + private static Locale [] LOCALES = new Locale[]{LOCALE_PT_BR, LOCALE_ES_MX}; + + /** + * Retorna o locale atual, caso o locale não seja suportado pelo sistema,
+ * será retornado o locale pt_br + * @return + */ + public static Locale getLocale() { + Locale localeCurrent = Locales.getCurrent(); + for (Locale locale : LOCALES) { + if(localeCurrent.getLanguage().equals(locale.getLanguage())) { + return localeCurrent; + } + } + + return LOCALE_PT_BR; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/LocalizadorHelper.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/LocalizadorHelper.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/LocalizadorHelper.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/LocalizadorHelper.java index 1c4a496f3..0dfb7f554 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/LocalizadorHelper.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/LocalizadorHelper.java @@ -1,156 +1,156 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.util.HashMap; -import java.util.Map; -import java.util.Random; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class LocalizadorHelper { - private static Logger log = LogManager.getLogger(LocalizadorHelper.class); - - private Map mapa = new HashMap(0); - - public LocalizadorHelper() { - mapa.put("1", "GO"); - mapa.put("2", "JM"); - mapa.put("3", "LQ"); - mapa.put("4", "HU"); - mapa.put("5", "NS"); - mapa.put("6", "RV"); - mapa.put("7", "XP"); - mapa.put("8", "IY"); - mapa.put("9", "KZ"); - mapa.put("0", "WT"); - } - - public String getLocalizadorAlfa(final String localizador) { - String valor = localizador.substring(2, localizador.length()); - String alfa = Long.toHexString(Integer.valueOf(valor)).toUpperCase(); - - String novo = ""; - - Random gerador = new Random(); - - for (int idx = 0; idx < alfa.length(); idx++) { - String digito = alfa.substring(idx, idx + 1); - - if (mapa.containsKey(digito)) { - String mascara = mapa.get(digito); - - int r = gerador.nextInt(2); - - novo += mascara.substring(r, r + 1); - } else { - novo += digito; - } - } - - return novo; - } - - public String getLocalizadorReal(final String localizador) { - - if (StringUtils.isBlank(localizador)) { - return localizador; - } - - try { - String novo = ""; - - for (int idx = 0; idx < localizador.length(); idx++) { - String digito = localizador.substring(idx, idx + 1); - digito = digito.toUpperCase(); - - if (!"ABCDEF1234567890".contains(digito)) { - for (Map.Entry entry : mapa.entrySet()) { - String chave = entry.getKey(); - String valor = entry.getValue(); - - if (valor.contains(digito)) { - novo += chave; - break; - } - } - } else { - novo += digito; - } - } - - return "01" + String.format("%010d", Long.parseLong(novo, 16)); - - } catch (Exception e) { - log.error("Localizador invalido: " + localizador, e); - - return "010000000000"; - } - } - - public String getLocalizadorRealEmbarcada(final String localizador) { - - if (StringUtils.isBlank(localizador)) { - return localizador; - } - - try { - String novo = ""; - - for (int idx = 0; idx < localizador.length(); idx++) { - String digito = localizador.substring(idx, idx + 1); - digito = digito.toUpperCase(); - - if (!"ABCDEF1234567890".contains(digito)) { - for (Map.Entry entry : mapa.entrySet()) { - String chave = entry.getKey(); - String valor = entry.getValue(); - - if (valor.contains(digito)) { - novo += chave; - break; - } - } - } else { - novo += digito; - } - } - - return String.format("%010d", Long.parseLong(novo, 16)); - - } catch (Exception e) { - log.error("Localizador invalido: " + localizador, e); - - return "010000000000"; - } - } - - public String getLocalizadorAlfaEmbarcada(final String localizador) { - if (StringUtils.isBlank(localizador) || StringUtils.isAlpha(localizador)) { - return localizador; - } - - String valor = localizador.substring(0, localizador.length()); - String alfa = Long.toHexString(Integer.valueOf(valor)).toUpperCase(); - - String novo = ""; - - Random gerador = new Random(); - - for (int idx = 0; idx < alfa.length(); idx++) { - String digito = alfa.substring(idx, idx + 1); - - if (mapa.containsKey(digito)) { - String mascara = mapa.get(digito); - - int r = gerador.nextInt(2); - - novo += mascara.substring(r, r + 1); - } else { - novo += digito; - } - } - - return novo; - } -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class LocalizadorHelper { + private static Logger log = LogManager.getLogger(LocalizadorHelper.class); + + private Map mapa = new HashMap(0); + + public LocalizadorHelper() { + mapa.put("1", "GO"); + mapa.put("2", "JM"); + mapa.put("3", "LQ"); + mapa.put("4", "HU"); + mapa.put("5", "NS"); + mapa.put("6", "RV"); + mapa.put("7", "XP"); + mapa.put("8", "IY"); + mapa.put("9", "KZ"); + mapa.put("0", "WT"); + } + + public String getLocalizadorAlfa(final String localizador) { + String valor = localizador.substring(2, localizador.length()); + String alfa = Long.toHexString(Integer.valueOf(valor)).toUpperCase(); + + String novo = ""; + + Random gerador = new Random(); + + for (int idx = 0; idx < alfa.length(); idx++) { + String digito = alfa.substring(idx, idx + 1); + + if (mapa.containsKey(digito)) { + String mascara = mapa.get(digito); + + int r = gerador.nextInt(2); + + novo += mascara.substring(r, r + 1); + } else { + novo += digito; + } + } + + return novo; + } + + public String getLocalizadorReal(final String localizador) { + + if (StringUtils.isBlank(localizador)) { + return localizador; + } + + try { + String novo = ""; + + for (int idx = 0; idx < localizador.length(); idx++) { + String digito = localizador.substring(idx, idx + 1); + digito = digito.toUpperCase(); + + if (!"ABCDEF1234567890".contains(digito)) { + for (Map.Entry entry : mapa.entrySet()) { + String chave = entry.getKey(); + String valor = entry.getValue(); + + if (valor.contains(digito)) { + novo += chave; + break; + } + } + } else { + novo += digito; + } + } + + return "01" + String.format("%010d", Long.parseLong(novo, 16)); + + } catch (Exception e) { + log.error("Localizador invalido: " + localizador, e); + + return "010000000000"; + } + } + + public String getLocalizadorRealEmbarcada(final String localizador) { + + if (StringUtils.isBlank(localizador)) { + return localizador; + } + + try { + String novo = ""; + + for (int idx = 0; idx < localizador.length(); idx++) { + String digito = localizador.substring(idx, idx + 1); + digito = digito.toUpperCase(); + + if (!"ABCDEF1234567890".contains(digito)) { + for (Map.Entry entry : mapa.entrySet()) { + String chave = entry.getKey(); + String valor = entry.getValue(); + + if (valor.contains(digito)) { + novo += chave; + break; + } + } + } else { + novo += digito; + } + } + + return String.format("%010d", Long.parseLong(novo, 16)); + + } catch (Exception e) { + log.error("Localizador invalido: " + localizador, e); + + return "010000000000"; + } + } + + public String getLocalizadorAlfaEmbarcada(final String localizador) { + if (StringUtils.isBlank(localizador) || StringUtils.isAlpha(localizador)) { + return localizador; + } + + String valor = localizador.substring(0, localizador.length()); + String alfa = Long.toHexString(Integer.valueOf(valor)).toUpperCase(); + + String novo = ""; + + Random gerador = new Random(); + + for (int idx = 0; idx < alfa.length(); idx++) { + String digito = alfa.substring(idx, idx + 1); + + if (mapa.containsKey(digito)) { + String mascara = mapa.get(digito); + + int r = gerador.nextInt(2); + + novo += mascara.substring(r, r + 1); + } else { + novo += digito; + } + } + + return novo; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java index ec90de5fb..372c1d9ed 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/MoneyHelper.java @@ -1,226 +1,226 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.math.BigDecimal; -import java.math.MathContext; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.ParseException; -import java.util.Locale; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -/** - * Clase MoneyHelper - * - * Referência: http://www.javapractices.com/topic/TopicAction.do?Id=13 - * - * @author RJ Consultores - */ -public class MoneyHelper { - private static Logger log = LogManager.getLogger(MoneyHelper.class); - - private static int DECIMALS = 2; - private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_EVEN; - public static BigDecimal HUNDRED = new BigDecimal("100"); - private static int MATH_CONTEXT = 2; - - public MoneyHelper() { - - } - - public static BigDecimal instanciar(String aValor) { - return arredondar(BigDecimal.valueOf(Float.valueOf(aValor))); - } - - public static BigDecimal instanciar(BigDecimal aValor) { - return arredondar(aValor); - } - - public static BigDecimal somar(BigDecimal... aAmount) { - BigDecimal total = BigDecimal.ZERO; - for (BigDecimal value : aAmount) { - BigDecimal fAmountOne = value == null ? BigDecimal.ZERO : arredondar(value); - total = total.add(fAmountOne); - } - return total.setScale(DECIMALS, ROUNDING_MODE); - } - - public static BigDecimal somar(int customScale, BigDecimal... aAmount) { - BigDecimal total = BigDecimal.ZERO; - for (BigDecimal value : aAmount) { - BigDecimal fAmountOne = value == null ? BigDecimal.ZERO : arredondar(value, customScale); - total = total.add(fAmountOne); - } - return total.setScale(customScale, ROUNDING_MODE); - } - - public static BigDecimal somar(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = aAmountOne == null ? BigDecimal.ZERO : arredondar(aAmountOne); - BigDecimal fAmountTwo = aAmountTwo == null ? BigDecimal.ZERO : arredondar(aAmountTwo); - - return fAmountOne.add(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); - } - - public static BigDecimal somar(BigDecimal aAmountOne, BigDecimal aAmountTwo, int customScale) { - BigDecimal fAmountOne = aAmountOne == null ? BigDecimal.ZERO : arredondar(aAmountOne, customScale); - BigDecimal fAmountTwo = aAmountTwo == null ? BigDecimal.ZERO : arredondar(aAmountTwo, customScale); - - return fAmountOne.add(fAmountTwo).setScale(customScale, ROUNDING_MODE); - } - - public static BigDecimal subtrair(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = arredondar(aAmountOne); - BigDecimal fAmountTwo = arredondar(aAmountTwo); - - return fAmountOne.subtract(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); - } - - public static BigDecimal subtrair(BigDecimal aAmountOne, BigDecimal aAmountTwo, int customScale) { - BigDecimal fAmountOne = arredondar(aAmountOne, customScale); - BigDecimal fAmountTwo = arredondar(aAmountTwo, customScale); - - return fAmountOne.subtract(fAmountTwo).setScale(customScale, ROUNDING_MODE); - } - - public static BigDecimal dividir(BigDecimal aAmount, BigDecimal aDivisor) { - BigDecimal fAmount = arredondar(aAmount); - BigDecimal fDivisor = arredondar(aDivisor); - - return fAmount.divide(fDivisor, DECIMALS, ROUNDING_MODE); - } - - public static BigDecimal dividir(BigDecimal aAmount, BigDecimal aDivisor, int customScale) { - BigDecimal fAmount = arredondar(aAmount, customScale); - BigDecimal fDivisor = arredondar(aDivisor, customScale); - - return fAmount.divide(fDivisor, customScale, ROUNDING_MODE); - } - - public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand) { - BigDecimal fAmount = arredondar(aAmount); - BigDecimal fMultiplicand = arredondar(aMultiplicand); - - return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)).setScale(DECIMALS, ROUNDING_MODE); - } - - public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand, int customScale) { - BigDecimal fAmount = arredondar(aAmount, customScale); - BigDecimal fMultiplicand = arredondar(aMultiplicand, customScale); - - return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)).setScale(customScale, ROUNDING_MODE); - } - - public static BigDecimal arredondar(BigDecimal aNumber) { - if (aNumber != null) { - return aNumber.setScale(DECIMALS, ROUNDING_MODE); - } else { - return null; - } - } - - public static BigDecimal arredondar(BigDecimal aNumber, int decimals, int rounding_mode) { - if (aNumber != null) { - return aNumber.setScale(decimals, rounding_mode); - } else { - return null; - } - } - - public static BigDecimal arredondar(Float aNumber) { - return BigDecimal.valueOf(aNumber).setScale(DECIMALS, ROUNDING_MODE); - } - - public static boolean isMaior(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = arredondar(aAmountOne); - BigDecimal fAmountTwo = arredondar(aAmountTwo); - - return fAmountOne.compareTo(fAmountTwo) > 0; - } - - public static boolean isMaiorIgual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = arredondar(aAmountOne); - BigDecimal fAmountTwo = arredondar(aAmountTwo); - - return fAmountOne.compareTo(fAmountTwo) >= 0; - } - - public static boolean isMenor(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = arredondar(aAmountOne); - BigDecimal fAmountTwo = arredondar(aAmountTwo); - - return fAmountOne.compareTo(fAmountTwo) < 0; - } - - public static boolean isMenorIgual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = arredondar(aAmountOne); - BigDecimal fAmountTwo = arredondar(aAmountTwo); - - return fAmountOne.compareTo(fAmountTwo) <= 0; - } - - public static boolean isIgual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - BigDecimal fAmountOne = arredondar(aAmountOne); - BigDecimal fAmountTwo = arredondar(aAmountTwo); - - return fAmountOne.compareTo(fAmountTwo) == 0; - } - - public static BigDecimal getDiferenca(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - return aAmountTwo.subtract(aAmountOne); - } - - public static BigDecimal getPercentual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { - - BigDecimal diferenca = getDiferenca(aAmountOne, aAmountTwo); - BigDecimal fractionalChange = BigDecimal.ZERO; - - if (diferenca != null && (diferenca.compareTo(BigDecimal.ZERO) != 0) && (aAmountOne.compareTo(BigDecimal.ZERO) != 0)) { - fractionalChange = diferenca.divide(aAmountOne, new MathContext(MATH_CONTEXT)); - } - return arredondar(fractionalChange.multiply(HUNDRED)).abs(); - } - - public static BigDecimal getValorDescontadoPercentual(BigDecimal valor, BigDecimal percdesconto) { - BigDecimal valorDescontado = multiplicar(valor, percdesconto).divide(HUNDRED); - return arredondar(subtrair(valor, valorDescontado)); - } - - public static BigDecimal getPercentualValor(BigDecimal valorTotal, BigDecimal valorPercentual) { - if (valorTotal != null && valorPercentual != null) { - return dividir(dividir(multiplicar(valorTotal, valorPercentual), HUNDRED), HUNDRED); - } - return BigDecimal.ZERO; - } - - /** - * Converte uma string no formato de moeda em um {@link BigDecimal} - * - * @param valor - * @return - */ - public static BigDecimal getValor(String valor) { - try { - if (StringUtils.isNotBlank(valor)) { - NumberFormat nf = DecimalFormat.getCurrencyInstance(Locale.getDefault()); - nf.setMinimumFractionDigits(DECIMALS); - nf.setMaximumFractionDigits(DECIMALS); - return arredondar(nf.parse(valor).floatValue()); - } - } catch (ParseException e) { - log.error(e.getMessage(), e); - } - return null; - } - - public static String getValor(BigDecimal valor) { - NumberFormat nf = NumberFormat.getInstance(Locale.getDefault()); - return nf.format(valor); - } - - public static BigDecimal arredondar(BigDecimal aNumber, int customScale) { - return aNumber.setScale(customScale, ROUNDING_MODE); - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.text.ParseException; +import java.util.Locale; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * Clase MoneyHelper + * + * Referência: http://www.javapractices.com/topic/TopicAction.do?Id=13 + * + * @author RJ Consultores + */ +public class MoneyHelper { + private static Logger log = LogManager.getLogger(MoneyHelper.class); + + private static int DECIMALS = 2; + private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_EVEN; + public static BigDecimal HUNDRED = new BigDecimal("100"); + private static int MATH_CONTEXT = 2; + + public MoneyHelper() { + + } + + public static BigDecimal instanciar(String aValor) { + return arredondar(BigDecimal.valueOf(Float.valueOf(aValor))); + } + + public static BigDecimal instanciar(BigDecimal aValor) { + return arredondar(aValor); + } + + public static BigDecimal somar(BigDecimal... aAmount) { + BigDecimal total = BigDecimal.ZERO; + for (BigDecimal value : aAmount) { + BigDecimal fAmountOne = value == null ? BigDecimal.ZERO : arredondar(value); + total = total.add(fAmountOne); + } + return total.setScale(DECIMALS, ROUNDING_MODE); + } + + public static BigDecimal somar(int customScale, BigDecimal... aAmount) { + BigDecimal total = BigDecimal.ZERO; + for (BigDecimal value : aAmount) { + BigDecimal fAmountOne = value == null ? BigDecimal.ZERO : arredondar(value, customScale); + total = total.add(fAmountOne); + } + return total.setScale(customScale, ROUNDING_MODE); + } + + public static BigDecimal somar(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = aAmountOne == null ? BigDecimal.ZERO : arredondar(aAmountOne); + BigDecimal fAmountTwo = aAmountTwo == null ? BigDecimal.ZERO : arredondar(aAmountTwo); + + return fAmountOne.add(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); + } + + public static BigDecimal somar(BigDecimal aAmountOne, BigDecimal aAmountTwo, int customScale) { + BigDecimal fAmountOne = aAmountOne == null ? BigDecimal.ZERO : arredondar(aAmountOne, customScale); + BigDecimal fAmountTwo = aAmountTwo == null ? BigDecimal.ZERO : arredondar(aAmountTwo, customScale); + + return fAmountOne.add(fAmountTwo).setScale(customScale, ROUNDING_MODE); + } + + public static BigDecimal subtrair(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = arredondar(aAmountOne); + BigDecimal fAmountTwo = arredondar(aAmountTwo); + + return fAmountOne.subtract(fAmountTwo).setScale(DECIMALS, ROUNDING_MODE); + } + + public static BigDecimal subtrair(BigDecimal aAmountOne, BigDecimal aAmountTwo, int customScale) { + BigDecimal fAmountOne = arredondar(aAmountOne, customScale); + BigDecimal fAmountTwo = arredondar(aAmountTwo, customScale); + + return fAmountOne.subtract(fAmountTwo).setScale(customScale, ROUNDING_MODE); + } + + public static BigDecimal dividir(BigDecimal aAmount, BigDecimal aDivisor) { + BigDecimal fAmount = arredondar(aAmount); + BigDecimal fDivisor = arredondar(aDivisor); + + return fAmount.divide(fDivisor, DECIMALS, ROUNDING_MODE); + } + + public static BigDecimal dividir(BigDecimal aAmount, BigDecimal aDivisor, int customScale) { + BigDecimal fAmount = arredondar(aAmount, customScale); + BigDecimal fDivisor = arredondar(aDivisor, customScale); + + return fAmount.divide(fDivisor, customScale, ROUNDING_MODE); + } + + public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand) { + BigDecimal fAmount = arredondar(aAmount); + BigDecimal fMultiplicand = arredondar(aMultiplicand); + + return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)).setScale(DECIMALS, ROUNDING_MODE); + } + + public static BigDecimal multiplicar(BigDecimal aAmount, BigDecimal aMultiplicand, int customScale) { + BigDecimal fAmount = arredondar(aAmount, customScale); + BigDecimal fMultiplicand = arredondar(aMultiplicand, customScale); + + return fAmount.multiply(fMultiplicand, new MathContext(ROUNDING_MODE)).setScale(customScale, ROUNDING_MODE); + } + + public static BigDecimal arredondar(BigDecimal aNumber) { + if (aNumber != null) { + return aNumber.setScale(DECIMALS, ROUNDING_MODE); + } else { + return null; + } + } + + public static BigDecimal arredondar(BigDecimal aNumber, int decimals, int rounding_mode) { + if (aNumber != null) { + return aNumber.setScale(decimals, rounding_mode); + } else { + return null; + } + } + + public static BigDecimal arredondar(Float aNumber) { + return BigDecimal.valueOf(aNumber).setScale(DECIMALS, ROUNDING_MODE); + } + + public static boolean isMaior(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = arredondar(aAmountOne); + BigDecimal fAmountTwo = arredondar(aAmountTwo); + + return fAmountOne.compareTo(fAmountTwo) > 0; + } + + public static boolean isMaiorIgual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = arredondar(aAmountOne); + BigDecimal fAmountTwo = arredondar(aAmountTwo); + + return fAmountOne.compareTo(fAmountTwo) >= 0; + } + + public static boolean isMenor(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = arredondar(aAmountOne); + BigDecimal fAmountTwo = arredondar(aAmountTwo); + + return fAmountOne.compareTo(fAmountTwo) < 0; + } + + public static boolean isMenorIgual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = arredondar(aAmountOne); + BigDecimal fAmountTwo = arredondar(aAmountTwo); + + return fAmountOne.compareTo(fAmountTwo) <= 0; + } + + public static boolean isIgual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + BigDecimal fAmountOne = arredondar(aAmountOne); + BigDecimal fAmountTwo = arredondar(aAmountTwo); + + return fAmountOne.compareTo(fAmountTwo) == 0; + } + + public static BigDecimal getDiferenca(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + return aAmountTwo.subtract(aAmountOne); + } + + public static BigDecimal getPercentual(BigDecimal aAmountOne, BigDecimal aAmountTwo) { + + BigDecimal diferenca = getDiferenca(aAmountOne, aAmountTwo); + BigDecimal fractionalChange = BigDecimal.ZERO; + + if (diferenca != null && (diferenca.compareTo(BigDecimal.ZERO) != 0) && (aAmountOne.compareTo(BigDecimal.ZERO) != 0)) { + fractionalChange = diferenca.divide(aAmountOne, new MathContext(MATH_CONTEXT)); + } + return arredondar(fractionalChange.multiply(HUNDRED)).abs(); + } + + public static BigDecimal getValorDescontadoPercentual(BigDecimal valor, BigDecimal percdesconto) { + BigDecimal valorDescontado = multiplicar(valor, percdesconto).divide(HUNDRED); + return arredondar(subtrair(valor, valorDescontado)); + } + + public static BigDecimal getPercentualValor(BigDecimal valorTotal, BigDecimal valorPercentual) { + if (valorTotal != null && valorPercentual != null) { + return dividir(dividir(multiplicar(valorTotal, valorPercentual), HUNDRED), HUNDRED); + } + return BigDecimal.ZERO; + } + + /** + * Converte uma string no formato de moeda em um {@link BigDecimal} + * + * @param valor + * @return + */ + public static BigDecimal getValor(String valor) { + try { + if (StringUtils.isNotBlank(valor)) { + NumberFormat nf = DecimalFormat.getCurrencyInstance(Locale.getDefault()); + nf.setMinimumFractionDigits(DECIMALS); + nf.setMaximumFractionDigits(DECIMALS); + return arredondar(nf.parse(valor).floatValue()); + } + } catch (ParseException e) { + log.error(e.getMessage(), e); + } + return null; + } + + public static String getValor(BigDecimal valor) { + NumberFormat nf = NumberFormat.getInstance(Locale.getDefault()); + return nf.format(valor); + } + + public static BigDecimal arredondar(BigDecimal aNumber, int customScale) { + return aNumber.setScale(customScale, ROUNDING_MODE); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/OcdUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/OcdUtil.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/OcdUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/OcdUtil.java index 1ba6f148f..b2c917de9 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/OcdUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/OcdUtil.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import com.rjconsultores.ventaboletos.entidad.OCD; - -public class OcdUtil { - - private static final String REGEX = "([0-9]+)([A-Za-z]{3})([0-9]+)"; - - public static String generaLocalizadorOCD(OCD ocd) { - return generaLocalizadorOCD(ocd.getNumoperacion(), ocd.getOcdId()); - } - - public static String generaLocalizadorOCD(String numoperacion, Long ocdId) { - char letraPosicao1 = (char) (numoperacion.charAt(numoperacion.length() - 1) + 25); - char letraPosicao2 = (char) (numoperacion.charAt(numoperacion.length() - 2) + 25); - char letraPosicao3 = (char) (numoperacion.charAt(numoperacion.length() - 3) + 25); - String localizador = String.format("%s%s%s%s%d", numoperacion, letraPosicao1, letraPosicao2, letraPosicao3, ocdId).toLowerCase(); - return localizador; - } - - public static boolean validarLocalizadorOcd(String localizador) { - Pattern localizadorPattern = Pattern.compile(REGEX); - Matcher localizadorMatcher = localizadorPattern.matcher(localizador); - return localizadorMatcher.matches(); - } - - public static Long getOcdIdByLocalizadorOcd(String localizador) { - Pattern localizadorPattern = Pattern.compile(REGEX); - Matcher localizadorMatcher = localizadorPattern.matcher(localizador); - localizadorMatcher.matches(); - return Long.valueOf(localizadorMatcher.group(3)); - } - - public static String getNumOcdByLocalizadorOcd(String localizador) { - Pattern localizadorPattern = Pattern.compile(REGEX); - Matcher localizadorMatcher = localizadorPattern.matcher(localizador); - localizadorMatcher.matches(); - return localizadorMatcher.group(1); - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.rjconsultores.ventaboletos.entidad.OCD; + +public class OcdUtil { + + private static final String REGEX = "([0-9]+)([A-Za-z]{3})([0-9]+)"; + + public static String generaLocalizadorOCD(OCD ocd) { + return generaLocalizadorOCD(ocd.getNumoperacion(), ocd.getOcdId()); + } + + public static String generaLocalizadorOCD(String numoperacion, Long ocdId) { + char letraPosicao1 = (char) (numoperacion.charAt(numoperacion.length() - 1) + 25); + char letraPosicao2 = (char) (numoperacion.charAt(numoperacion.length() - 2) + 25); + char letraPosicao3 = (char) (numoperacion.charAt(numoperacion.length() - 3) + 25); + String localizador = String.format("%s%s%s%s%d", numoperacion, letraPosicao1, letraPosicao2, letraPosicao3, ocdId).toLowerCase(); + return localizador; + } + + public static boolean validarLocalizadorOcd(String localizador) { + Pattern localizadorPattern = Pattern.compile(REGEX); + Matcher localizadorMatcher = localizadorPattern.matcher(localizador); + return localizadorMatcher.matches(); + } + + public static Long getOcdIdByLocalizadorOcd(String localizador) { + Pattern localizadorPattern = Pattern.compile(REGEX); + Matcher localizadorMatcher = localizadorPattern.matcher(localizador); + localizadorMatcher.matches(); + return Long.valueOf(localizadorMatcher.group(3)); + } + + public static String getNumOcdByLocalizadorOcd(String localizador) { + Pattern localizadorPattern = Pattern.compile(REGEX); + Matcher localizadorMatcher = localizadorPattern.matcher(localizador); + localizadorMatcher.matches(); + return localizadorMatcher.group(1); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/PasswordHelper.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/PasswordHelper.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/PasswordHelper.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/PasswordHelper.java index 8d503a52a..be1e49cda 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/PasswordHelper.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/PasswordHelper.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.util.Date; -import java.util.Random; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - - - - -public class PasswordHelper { - - private static Logger log = LogManager.getLogger(PasswordHelper.class); - - private static PasswordHelper instance; - private final int MM_MAX = 10; - - private String password = ""; - private Date passwordCreated; - - public static PasswordHelper getInstance() { - if (instance == null) - instance = new PasswordHelper(); - return instance; - } - - public String generateRandomPassword() { - int size = 8; - String capLetter = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - String numbers = "01234567890123456789"; - String finalString = capLetter + numbers; - - Random random = new Random(); - char[] charPassword = new char[size]; - for (int i = 0; i < size; i++) { - charPassword[i] = finalString.charAt(random.nextInt(finalString.length())); - } - password = String.valueOf(charPassword); - passwordCreated = DateUtil.somarMinutos(new Date(), MM_MAX); - log.info("Gerada Senha de Instalação Valida até: " + passwordCreated.toString()); - return password; - } - - public boolean isValidPassword(String myPassword) { - return !StringUtils.isBlank(myPassword) && - !StringUtils.isBlank(password) && - password.equals(myPassword) && - DateUtil.compareDate(new Date(), passwordCreated) < 0; - } -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.util.Date; +import java.util.Random; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + + + + +public class PasswordHelper { + + private static Logger log = LogManager.getLogger(PasswordHelper.class); + + private static PasswordHelper instance; + private final int MM_MAX = 10; + + private String password = ""; + private Date passwordCreated; + + public static PasswordHelper getInstance() { + if (instance == null) + instance = new PasswordHelper(); + return instance; + } + + public String generateRandomPassword() { + int size = 8; + String capLetter = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + String numbers = "01234567890123456789"; + String finalString = capLetter + numbers; + + Random random = new Random(); + char[] charPassword = new char[size]; + for (int i = 0; i < size; i++) { + charPassword[i] = finalString.charAt(random.nextInt(finalString.length())); + } + password = String.valueOf(charPassword); + passwordCreated = DateUtil.somarMinutos(new Date(), MM_MAX); + log.info("Gerada Senha de Instalação Valida até: " + passwordCreated.toString()); + return password; + } + + public boolean isValidPassword(String myPassword) { + return !StringUtils.isBlank(myPassword) && + !StringUtils.isBlank(password) && + password.equals(myPassword) && + DateUtil.compareDate(new Date(), passwordCreated) < 0; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java index 1e51a7102..8ae372829 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java @@ -1,429 +1,429 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.CorridaCtrl; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Pricing; -import com.rjconsultores.ventaboletos.entidad.PricingClase; -import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; -import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; -import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TipoServicio; -import com.rjconsultores.ventaboletos.vo.pricing.PricingAsiento; -import com.rjconsultores.ventaboletos.vo.pricing.PricingCanalVenta; -import com.rjconsultores.ventaboletos.vo.pricing.PricingCategoria; -import com.rjconsultores.ventaboletos.vo.pricing.PricingClasse; -import com.rjconsultores.ventaboletos.vo.pricing.PricingCorrida; -import com.rjconsultores.ventaboletos.vo.pricing.PricingDia; -import com.rjconsultores.ventaboletos.vo.pricing.PricingMarca; -import com.rjconsultores.ventaboletos.vo.pricing.PricingMercado; -import com.rjconsultores.ventaboletos.vo.pricing.PricingOcupaAntecipa; -import com.rjconsultores.ventaboletos.vo.pricing.PricingPuntoVenta; -import com.rjconsultores.ventaboletos.vo.pricing.PricingRuta; -import com.rjconsultores.ventaboletos.vo.pricing.PricingTipoCorrida; -import com.rjconsultores.ventaboletos.vo.pricing.PricingVigencia; - -public class PricingConverterVOToEntidad { - - private static final Logger log = LogManager.getLogger(PricingConverterVOToEntidad.class); - - private static PricingConverterVOToEntidad INSTANCE; - - private PricingConverterVOToEntidad() { - super(); - } - - public synchronized static PricingConverterVOToEntidad getInstance() { - if(INSTANCE == null) { - INSTANCE = new PricingConverterVOToEntidad(); - } - return INSTANCE; - } - - public Pricing convertVOToEntidad(com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - try { - Pricing retorno = new Pricing(); - retorno.setPricingId(pricingVO.getPricingId()); - retorno.setNombPricing(pricingVO.getNomePricing()); - retorno.setCantboleto(pricingVO.getQtdePoltronas() != null ? pricingVO.getQtdePoltronas().shortValue() : null); - retorno.setDescuentoporcentaje(pricingVO.getPorcentagemIda()); - retorno.setDescuentoporcredondo(pricingVO.getPorcentagemIdaVolta()); - retorno.setIndtransferible(pricingVO.getPodeTransferir() != null ? pricingVO.getPodeTransferir().equals(1) : true); - retorno.setIndreservable(pricingVO.getPodeReservar() != null ? pricingVO.getPodeReservar().equals(1): true); - retorno.setExibeVenda(pricingVO.getExibirVenda() != null ? pricingVO.getExibirVenda().equals(1) : true); - retorno.setIndcancelable(pricingVO.getPodeCancelar() != null ? pricingVO.getPodeCancelar().equals(1) : true); - retorno.setActivo(Pricing.ATIVO); - retorno.setFecmodif(new Date()); - retorno.setCantdiasanticipacion(pricingVO.getDiasAtencipacao()); - retorno.setEmpresa(new Empresa(pricingVO.getEmpresaId())); - retorno.setIndGeneraFeriadoViaje(StringUtils.isNotBlank(pricingVO.getAplicaFeriadoDtViagem()) ? pricingVO.getAplicaFeriadoDtViagem() : "S"); - retorno.setIndGeneraFeriadoVenta(StringUtils.isNotBlank(pricingVO.getAplicaFeriadoDtVenda()) ? pricingVO.getAplicaFeriadoDtVenda() : "S"); - - convertVOToEntidadPoltronas(retorno, pricingVO); - convertVOToEntidadCanalVendas(retorno, pricingVO); - convertVOToEntidadCategorias(retorno, pricingVO); - convertVOToEntidadClasses(retorno, pricingVO); - convertVOToEntidadServicos(retorno, pricingVO); - convertVOToEntidadDias(retorno, pricingVO); - convertVOToEntidadOcupacoes(retorno, pricingVO); - convertVOToEntidadPuntoventas(retorno, pricingVO); - convertVOToEntidadLinhas(retorno, pricingVO); - convertVOToEntidadTiposervicos(retorno, pricingVO); - convertVOToEntidadMercados(retorno, pricingVO); - convertVOToEntidadVigencias(retorno, pricingVO); - convertVOToEntidadMarcas(retorno, pricingVO); - - return retorno; - } catch (Exception e) { - log.error(e.getMessage(), e); - } - return null; - } - - public void convertVOToEntidadPoltronas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getPoltronas() != null && !pricingVO.getPoltronas().isEmpty()) { - List asientos = new ArrayList(); - for (PricingAsiento pricingAsientoVO : pricingVO.getPoltronas()) { - com.rjconsultores.ventaboletos.entidad.PricingAsiento pricingAsiento = new com.rjconsultores.ventaboletos.entidad.PricingAsiento(); - pricingAsiento.setPricing(retorno); - pricingAsiento.setActivo(Pricing.ATIVO); - pricingAsiento.setFecmodif(new Date()); - pricingAsiento.setUsuarioId(retorno.getUsuarioId()); - pricingAsiento.setNombImagen(pricingAsientoVO.getNombImagen()); - pricingAsiento.setNumeasiento(pricingAsientoVO.getNumeasiento()); - pricingAsiento.setPorcentaje(pricingAsientoVO.getPorcentaje()); - - asientos.add(pricingAsiento); - } - retorno.setPricingAsientoList(asientos); - } - } - - public void convertVOToEntidadCanalVendas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getCanalvendas() != null && !pricingVO.getCanalvendas().isEmpty()) { - List tipoPtoVtas = new ArrayList(); - for (PricingCanalVenta pricingCanalVentaVO : pricingVO.getCanalvendas()) { - com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta pricingTipoPtoVta = new com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta(); - pricingTipoPtoVta.setPricing(retorno); - pricingTipoPtoVta.setActivo(Pricing.ATIVO); - pricingTipoPtoVta.setFecmodif(new Date()); - pricingTipoPtoVta.setUsuarioId(retorno.getUsuarioId()); - pricingTipoPtoVta.setTipoPtovta(new TipoPuntoVenta(pricingCanalVentaVO.getCanalventaId().shortValue())); - - tipoPtoVtas.add(pricingTipoPtoVta); - } - - if(tipoPtoVtas.isEmpty()) { - com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta pricingTipoPtoVta = new com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta(); - pricingTipoPtoVta.setPricing(retorno); - pricingTipoPtoVta.setActivo(Pricing.ATIVO); - pricingTipoPtoVta.setFecmodif(new Date()); - pricingTipoPtoVta.setUsuarioId(retorno.getUsuarioId()); - pricingTipoPtoVta.setTipoPtovta(new TipoPuntoVenta(Short.valueOf("-1"))); - - tipoPtoVtas.add(pricingTipoPtoVta); - } - retorno.setPricingTipoptovtaList(tipoPtoVtas); - } - } - - public void convertVOToEntidadCategorias(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getCategorias() != null && !pricingVO.getCategorias().isEmpty()) { - List categorias = new ArrayList(); - for (PricingCategoria pricingCategoriaVO : pricingVO.getCategorias()) { - com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria = new com.rjconsultores.ventaboletos.entidad.PricingCategoria(); - pricingCategoria.setPricing(retorno); - pricingCategoria.setActivo(Pricing.ATIVO); - pricingCategoria.setFecmodif(new Date()); - pricingCategoria.setUsuarioId(retorno.getUsuarioId()); - pricingCategoria.setCategoria(new Categoria(pricingCategoriaVO.getCategoriaId())); - - categorias.add(pricingCategoria); - } - - if(categorias.isEmpty()) { - com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria = new com.rjconsultores.ventaboletos.entidad.PricingCategoria(); - pricingCategoria.setPricing(retorno); - pricingCategoria.setActivo(Pricing.ATIVO); - pricingCategoria.setFecmodif(new Date()); - pricingCategoria.setUsuarioId(retorno.getUsuarioId()); - pricingCategoria.setCategoria(new Categoria(1)); - - categorias.add(pricingCategoria); - - pricingCategoria = new com.rjconsultores.ventaboletos.entidad.PricingCategoria(); - pricingCategoria.setPricing(retorno); - pricingCategoria.setActivo(Pricing.ATIVO); - pricingCategoria.setFecmodif(new Date()); - pricingCategoria.setUsuarioId(retorno.getUsuarioId()); - pricingCategoria.setCategoria(new Categoria(48)); - - categorias.add(pricingCategoria); - } - - retorno.setPricingCategoriaList(categorias); - } - } - - public void convertVOToEntidadClasses(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getClasses() != null && !pricingVO.getClasses().isEmpty()) { - List clases = new ArrayList(); - for (PricingClasse pricingClasseVO : pricingVO.getClasses()) { - com.rjconsultores.ventaboletos.entidad.PricingClase pricingClase = new com.rjconsultores.ventaboletos.entidad.PricingClase(); - pricingClase.setPricing(retorno); - pricingClase.setActivo(Pricing.ATIVO); - pricingClase.setFecmodif(new Date()); - pricingClase.setUsuarioId(retorno.getUsuarioId()); - pricingClase.setClaseServicio(new ClaseServicio(pricingClasseVO.getClasseservicioId())); - - clases.add(pricingClase); - } - - if(clases.isEmpty()) { - com.rjconsultores.ventaboletos.entidad.PricingClase pricingClase = new com.rjconsultores.ventaboletos.entidad.PricingClase(); - pricingClase.setPricing(retorno); - pricingClase.setActivo(Pricing.ATIVO); - pricingClase.setFecmodif(new Date()); - pricingClase.setUsuarioId(retorno.getUsuarioId()); - pricingClase.setClaseServicio(new ClaseServicio(1)); - - clases.add(pricingClase); - } - retorno.setPricingClaseList(clases); - } - } - - public void convertVOToEntidadServicos(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getServicos() != null && !pricingVO.getServicos().isEmpty()) { - List corridas = new ArrayList(); - for (PricingCorrida pricingServicoVO : pricingVO.getServicos()) { - com.rjconsultores.ventaboletos.entidad.PricingCorrida pricingCorrida = new com.rjconsultores.ventaboletos.entidad.PricingCorrida(); - pricingCorrida.setPricing(retorno); - pricingCorrida.setActivo(Pricing.ATIVO); - pricingCorrida.setFecmodif(new Date()); - pricingCorrida.setUsuarioId(retorno.getUsuarioId()); - pricingCorrida.setCorridaCtrl(new CorridaCtrl(pricingServicoVO.getNumservico())); - - corridas.add(pricingCorrida); - } - retorno.setPricingCorridaList(corridas); - } - } - - public void convertVOToEntidadDias(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) throws ParseException { - if(pricingVO.getDias() != null && !pricingVO.getDias().isEmpty()) { - List dias = new ArrayList(); - for (PricingDia pricingDiaVO : pricingVO.getDias()) { - com.rjconsultores.ventaboletos.entidad.PricingDia pricingDia = new com.rjconsultores.ventaboletos.entidad.PricingDia(); - pricingDia.setPricing(retorno); - pricingDia.setActivo(Pricing.ATIVO); - pricingDia.setFecmodif(new Date()); - pricingDia.setUsuarioId(retorno.getUsuarioId()); - - if(StringUtils.isNotBlank(pricingDiaVO.getHorariofim())) { - pricingDia.setHorariofin(DateUtil.getFecInicio(DateUtil.getDateFromString(pricingDiaVO.getHorariofim(), "HH:mm")).getTime()); - } - - if(StringUtils.isNotBlank(pricingDiaVO.getHorarioinicio())) { - pricingDia.setHorarioinicio(DateUtil.getFecInicio(DateUtil.getDateFromString(pricingDiaVO.getHorarioinicio(), "HH:mm")).getTime()); - } - - pricingDia.setIndlunes(pricingDiaVO.getSegunda() != null ? pricingDiaVO.getSegunda().equals(1) : false); - pricingDia.setIndmartes(pricingDiaVO.getTerca() != null ? pricingDiaVO.getTerca().equals(1) : false); - pricingDia.setIndmiercoles(pricingDiaVO.getQuarta() != null ? pricingDiaVO.getQuarta().equals(1) : false); - pricingDia.setIndjueves(pricingDiaVO.getQuinta() != null ? pricingDiaVO.getQuinta().equals(1) : false); - pricingDia.setIndviernes(pricingDiaVO.getSexta() != null ? pricingDiaVO.getSexta().equals(1) : false); - pricingDia.setIndsabado(pricingDiaVO.getSabado() != null ? pricingDiaVO.getSabado().equals(1) : false); - pricingDia.setIndfecventa(pricingDiaVO.getDataviagem() == null || !pricingDiaVO.getDataviagem().equals(1)); - pricingDia.setIndfecviaje(!pricingDia.getIndfecventa()); - - dias.add(pricingDia); - } - retorno.setPricingDiaList(dias); - } - } - - public void convertVOToEntidadOcupacoes(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getOcupacoes() != null && !pricingVO.getOcupacoes().isEmpty()) { - List ocupacoes = new ArrayList(); - for (PricingOcupaAntecipa pricingOcupaAntecipaVO : pricingVO.getOcupacoes()) { - com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa pricingOcupaAntecipa = new com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa(); - pricingOcupaAntecipa.setPricing(retorno); - pricingOcupaAntecipa.setActivo(Pricing.ATIVO); - pricingOcupaAntecipa.setFecmodif(new Date()); - pricingOcupaAntecipa.setUsuarioId(retorno.getUsuarioId()); - pricingOcupaAntecipa.setCantasientosmax(pricingOcupaAntecipaVO.getCantasientosmax()); - pricingOcupaAntecipa.setCantasientosmin(pricingOcupaAntecipaVO.getCantasientosmin()); - pricingOcupaAntecipa.setCantdiasmax(pricingOcupaAntecipaVO.getCantdiasmax()); - pricingOcupaAntecipa.setCantdiasmin(pricingOcupaAntecipaVO.getCantdiasmin()); - pricingOcupaAntecipa.setImporte(pricingOcupaAntecipaVO.getImporte()); - pricingOcupaAntecipa.setOcupacionfinal(pricingOcupaAntecipaVO.getOcupacionfinal()); - pricingOcupaAntecipa.setOcupacioninicial(pricingOcupaAntecipaVO.getOcupacioninicial()); - pricingOcupaAntecipa.setPorcentaje(pricingOcupaAntecipaVO.getPorcentaje()); - if(pricingOcupaAntecipaVO.getClasseId() != null) { - pricingOcupaAntecipa.setPricingClasseTarifaria(new PricingClasseTarifaria(pricingOcupaAntecipaVO.getClasseId())); - } - - ocupacoes.add(pricingOcupaAntecipa); - } - retorno.setPricingOcupaAntecipaList(ocupacoes); - } - } - - public void convertVOToEntidadPuntoventas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getPuntoventas() != null && !pricingVO.getPuntoventas().isEmpty()) { - List puntoventas = new ArrayList(); - for (PricingPuntoVenta pricingPuntoVentaVO : pricingVO.getPuntoventas()) { - com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta = new com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta(); - pricingPuntoVenta.setPricing(retorno); - pricingPuntoVenta.setActivo(Pricing.ATIVO); - pricingPuntoVenta.setFecmodif(new Date()); - pricingPuntoVenta.setUsuarioId(retorno.getUsuarioId()); - pricingPuntoVenta.setPuntoVenta(new PuntoVenta(pricingPuntoVentaVO.getPuntoventaId())); - - puntoventas.add(pricingPuntoVenta); - } - - if(puntoventas.isEmpty()) { - com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta = new com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta(); - pricingPuntoVenta.setPricing(retorno); - pricingPuntoVenta.setActivo(Pricing.ATIVO); - pricingPuntoVenta.setFecmodif(new Date()); - pricingPuntoVenta.setUsuarioId(retorno.getUsuarioId()); - pricingPuntoVenta.setPuntoVenta(new PuntoVenta(-1)); - - puntoventas.add(pricingPuntoVenta); - } - - retorno.setPricingPuntoventaList(puntoventas); - } - } - - public void convertVOToEntidadLinhas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getLinhas() != null && !pricingVO.getLinhas().isEmpty()) { - List rutas = new ArrayList(); - for (PricingRuta pricingLinhaVO : pricingVO.getLinhas()) { - com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta = new com.rjconsultores.ventaboletos.entidad.PricingRuta(); - pricingRuta.setPricing(retorno); - pricingRuta.setActivo(Pricing.ATIVO); - pricingRuta.setFecmodif(new Date()); - pricingRuta.setUsuarioId(retorno.getUsuarioId()); - pricingRuta.setRuta(new Ruta(pricingLinhaVO.getRutaId())); - - rutas.add(pricingRuta); - } - - if(rutas.isEmpty()) { - com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta = new com.rjconsultores.ventaboletos.entidad.PricingRuta(); - pricingRuta.setPricing(retorno); - pricingRuta.setActivo(Pricing.ATIVO); - pricingRuta.setFecmodif(new Date()); - pricingRuta.setUsuarioId(retorno.getUsuarioId()); - pricingRuta.setRuta(new Ruta(-1)); - - rutas.add(pricingRuta); - } - retorno.setPricingRutaList(rutas); - } - } - - public void convertVOToEntidadTiposervicos(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getTiposervicos() != null && !pricingVO.getTiposervicos().isEmpty()) { - List tipoServicios = new ArrayList(); - for (PricingTipoCorrida pricingTipoCorridaVO : pricingVO.getTiposervicos()) { - com.rjconsultores.ventaboletos.entidad.PricingTipoServicio pricingTipoServicio = new com.rjconsultores.ventaboletos.entidad.PricingTipoServicio(); - pricingTipoServicio.setPricing(retorno); - pricingTipoServicio.setActivo(Pricing.ATIVO); - pricingTipoServicio.setFecmodif(new Date()); - pricingTipoServicio.setUsuarioId(retorno.getUsuarioId()); - pricingTipoServicio.setTipoServicio(new TipoServicio(pricingTipoCorridaVO.getTipocorridaId())); - - tipoServicios.add(pricingTipoServicio); - } - retorno.setPricingTipoServicioList(tipoServicios); - } - } - - public void convertVOToEntidadMercados(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getMercados() != null && !pricingVO.getMercados().isEmpty()) { - List mercados = new ArrayList(); - for (PricingMercado pricingMercadoVO : pricingVO.getMercados()) { - com.rjconsultores.ventaboletos.entidad.PricingMercado pricingMercado = new com.rjconsultores.ventaboletos.entidad.PricingMercado(); - pricingMercado.setPricing(retorno); - pricingMercado.setActivo(Pricing.ATIVO); - pricingMercado.setFecmodif(new Date()); - pricingMercado.setUsuarioId(retorno.getUsuarioId()); - pricingMercado.setOrigen(new Parada(pricingMercadoVO.getOrigemId())); - pricingMercado.setDestino(new Parada(pricingMercadoVO.getDestinoId())); - - mercados.add(pricingMercado); - } - retorno.setPricingMercadoList(mercados); - } - } - - public void convertVOToEntidadVigencias(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) throws ParseException { - if(pricingVO.getVigencias() != null && !pricingVO.getVigencias().isEmpty()) { - List vigencias = new ArrayList(); - for (PricingVigencia pricingVigenciaVO : pricingVO.getVigencias()) { - com.rjconsultores.ventaboletos.entidad.PricingVigencia pricingVigencia = new com.rjconsultores.ventaboletos.entidad.PricingVigencia(); - pricingVigencia.setPricing(retorno); - pricingVigencia.setActivo(Pricing.ATIVO); - pricingVigencia.setFecmodif(new Date()); - pricingVigencia.setUsuarioId(retorno.getUsuarioId()); - - if(StringUtils.isNotBlank(pricingVigenciaVO.getInicioDataVenda())) { - pricingVigencia.setFecinicioventa(DateUtil.getDateFromString(pricingVigenciaVO.getInicioDataVenda(), "dd/MM/yyyy HH:mm")); - } - - if(StringUtils.isNotBlank(pricingVigenciaVO.getFimDataVenda())) { - pricingVigencia.setFecfinventa(DateUtil.getDateFromString(pricingVigenciaVO.getFimDataVenda(), "dd/MM/yyyy HH:mm")); - } - - if(StringUtils.isNotBlank(pricingVigenciaVO.getInicioDataViagem())) { - pricingVigencia.setFecinicioviaje(DateUtil.getDateFromString(pricingVigenciaVO.getInicioDataViagem(), "dd/MM/yyyy HH:mm")); - } - - if(StringUtils.isNotBlank(pricingVigenciaVO.getFimDataViagem())) { - pricingVigencia.setFecfinviaje(DateUtil.getDateFromString(pricingVigenciaVO.getFimDataViagem(), "dd/MM/yyyy HH:mm")); - } - - vigencias.add(pricingVigencia); - } - retorno.setPricingVigenciaList(vigencias); - } - } - - public void convertVOToEntidadMarcas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { - if(pricingVO.getMarcas() != null && !pricingVO.getMarcas().isEmpty()) { - List marcas = new ArrayList(); - for (PricingMarca pricingMarcaVO : pricingVO.getMarcas()) { - com.rjconsultores.ventaboletos.entidad.PricingMarca pricingMarca = new com.rjconsultores.ventaboletos.entidad.PricingMarca(); - pricingMarca.setPricing(retorno); - pricingMarca.setActivo(Pricing.ATIVO); - pricingMarca.setFecmodif(new Date()); - pricingMarca.setUsuarioId(retorno.getUsuarioId()); - pricingMarca.setMarca(new Marca(pricingMarcaVO.getMarcaId().shortValue())); - - marcas.add(pricingMarca); - } - retorno.setPricingMarcaList(marcas); - } - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.CorridaCtrl; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Pricing; +import com.rjconsultores.ventaboletos.entidad.PricingClase; +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; +import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; +import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.TipoServicio; +import com.rjconsultores.ventaboletos.vo.pricing.PricingAsiento; +import com.rjconsultores.ventaboletos.vo.pricing.PricingCanalVenta; +import com.rjconsultores.ventaboletos.vo.pricing.PricingCategoria; +import com.rjconsultores.ventaboletos.vo.pricing.PricingClasse; +import com.rjconsultores.ventaboletos.vo.pricing.PricingCorrida; +import com.rjconsultores.ventaboletos.vo.pricing.PricingDia; +import com.rjconsultores.ventaboletos.vo.pricing.PricingMarca; +import com.rjconsultores.ventaboletos.vo.pricing.PricingMercado; +import com.rjconsultores.ventaboletos.vo.pricing.PricingOcupaAntecipa; +import com.rjconsultores.ventaboletos.vo.pricing.PricingPuntoVenta; +import com.rjconsultores.ventaboletos.vo.pricing.PricingRuta; +import com.rjconsultores.ventaboletos.vo.pricing.PricingTipoCorrida; +import com.rjconsultores.ventaboletos.vo.pricing.PricingVigencia; + +public class PricingConverterVOToEntidad { + + private static final Logger log = LogManager.getLogger(PricingConverterVOToEntidad.class); + + private static PricingConverterVOToEntidad INSTANCE; + + private PricingConverterVOToEntidad() { + super(); + } + + public synchronized static PricingConverterVOToEntidad getInstance() { + if(INSTANCE == null) { + INSTANCE = new PricingConverterVOToEntidad(); + } + return INSTANCE; + } + + public Pricing convertVOToEntidad(com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + try { + Pricing retorno = new Pricing(); + retorno.setPricingId(pricingVO.getPricingId()); + retorno.setNombPricing(pricingVO.getNomePricing()); + retorno.setCantboleto(pricingVO.getQtdePoltronas() != null ? pricingVO.getQtdePoltronas().shortValue() : null); + retorno.setDescuentoporcentaje(pricingVO.getPorcentagemIda()); + retorno.setDescuentoporcredondo(pricingVO.getPorcentagemIdaVolta()); + retorno.setIndtransferible(pricingVO.getPodeTransferir() != null ? pricingVO.getPodeTransferir().equals(1) : true); + retorno.setIndreservable(pricingVO.getPodeReservar() != null ? pricingVO.getPodeReservar().equals(1): true); + retorno.setExibeVenda(pricingVO.getExibirVenda() != null ? pricingVO.getExibirVenda().equals(1) : true); + retorno.setIndcancelable(pricingVO.getPodeCancelar() != null ? pricingVO.getPodeCancelar().equals(1) : true); + retorno.setActivo(Pricing.ATIVO); + retorno.setFecmodif(new Date()); + retorno.setCantdiasanticipacion(pricingVO.getDiasAtencipacao()); + retorno.setEmpresa(new Empresa(pricingVO.getEmpresaId())); + retorno.setIndGeneraFeriadoViaje(StringUtils.isNotBlank(pricingVO.getAplicaFeriadoDtViagem()) ? pricingVO.getAplicaFeriadoDtViagem() : "S"); + retorno.setIndGeneraFeriadoVenta(StringUtils.isNotBlank(pricingVO.getAplicaFeriadoDtVenda()) ? pricingVO.getAplicaFeriadoDtVenda() : "S"); + + convertVOToEntidadPoltronas(retorno, pricingVO); + convertVOToEntidadCanalVendas(retorno, pricingVO); + convertVOToEntidadCategorias(retorno, pricingVO); + convertVOToEntidadClasses(retorno, pricingVO); + convertVOToEntidadServicos(retorno, pricingVO); + convertVOToEntidadDias(retorno, pricingVO); + convertVOToEntidadOcupacoes(retorno, pricingVO); + convertVOToEntidadPuntoventas(retorno, pricingVO); + convertVOToEntidadLinhas(retorno, pricingVO); + convertVOToEntidadTiposervicos(retorno, pricingVO); + convertVOToEntidadMercados(retorno, pricingVO); + convertVOToEntidadVigencias(retorno, pricingVO); + convertVOToEntidadMarcas(retorno, pricingVO); + + return retorno; + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return null; + } + + public void convertVOToEntidadPoltronas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getPoltronas() != null && !pricingVO.getPoltronas().isEmpty()) { + List asientos = new ArrayList(); + for (PricingAsiento pricingAsientoVO : pricingVO.getPoltronas()) { + com.rjconsultores.ventaboletos.entidad.PricingAsiento pricingAsiento = new com.rjconsultores.ventaboletos.entidad.PricingAsiento(); + pricingAsiento.setPricing(retorno); + pricingAsiento.setActivo(Pricing.ATIVO); + pricingAsiento.setFecmodif(new Date()); + pricingAsiento.setUsuarioId(retorno.getUsuarioId()); + pricingAsiento.setNombImagen(pricingAsientoVO.getNombImagen()); + pricingAsiento.setNumeasiento(pricingAsientoVO.getNumeasiento()); + pricingAsiento.setPorcentaje(pricingAsientoVO.getPorcentaje()); + + asientos.add(pricingAsiento); + } + retorno.setPricingAsientoList(asientos); + } + } + + public void convertVOToEntidadCanalVendas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getCanalvendas() != null && !pricingVO.getCanalvendas().isEmpty()) { + List tipoPtoVtas = new ArrayList(); + for (PricingCanalVenta pricingCanalVentaVO : pricingVO.getCanalvendas()) { + com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta pricingTipoPtoVta = new com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta(); + pricingTipoPtoVta.setPricing(retorno); + pricingTipoPtoVta.setActivo(Pricing.ATIVO); + pricingTipoPtoVta.setFecmodif(new Date()); + pricingTipoPtoVta.setUsuarioId(retorno.getUsuarioId()); + pricingTipoPtoVta.setTipoPtovta(new TipoPuntoVenta(pricingCanalVentaVO.getCanalventaId().shortValue())); + + tipoPtoVtas.add(pricingTipoPtoVta); + } + + if(tipoPtoVtas.isEmpty()) { + com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta pricingTipoPtoVta = new com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta(); + pricingTipoPtoVta.setPricing(retorno); + pricingTipoPtoVta.setActivo(Pricing.ATIVO); + pricingTipoPtoVta.setFecmodif(new Date()); + pricingTipoPtoVta.setUsuarioId(retorno.getUsuarioId()); + pricingTipoPtoVta.setTipoPtovta(new TipoPuntoVenta(Short.valueOf("-1"))); + + tipoPtoVtas.add(pricingTipoPtoVta); + } + retorno.setPricingTipoptovtaList(tipoPtoVtas); + } + } + + public void convertVOToEntidadCategorias(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getCategorias() != null && !pricingVO.getCategorias().isEmpty()) { + List categorias = new ArrayList(); + for (PricingCategoria pricingCategoriaVO : pricingVO.getCategorias()) { + com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria = new com.rjconsultores.ventaboletos.entidad.PricingCategoria(); + pricingCategoria.setPricing(retorno); + pricingCategoria.setActivo(Pricing.ATIVO); + pricingCategoria.setFecmodif(new Date()); + pricingCategoria.setUsuarioId(retorno.getUsuarioId()); + pricingCategoria.setCategoria(new Categoria(pricingCategoriaVO.getCategoriaId())); + + categorias.add(pricingCategoria); + } + + if(categorias.isEmpty()) { + com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria = new com.rjconsultores.ventaboletos.entidad.PricingCategoria(); + pricingCategoria.setPricing(retorno); + pricingCategoria.setActivo(Pricing.ATIVO); + pricingCategoria.setFecmodif(new Date()); + pricingCategoria.setUsuarioId(retorno.getUsuarioId()); + pricingCategoria.setCategoria(new Categoria(1)); + + categorias.add(pricingCategoria); + + pricingCategoria = new com.rjconsultores.ventaboletos.entidad.PricingCategoria(); + pricingCategoria.setPricing(retorno); + pricingCategoria.setActivo(Pricing.ATIVO); + pricingCategoria.setFecmodif(new Date()); + pricingCategoria.setUsuarioId(retorno.getUsuarioId()); + pricingCategoria.setCategoria(new Categoria(48)); + + categorias.add(pricingCategoria); + } + + retorno.setPricingCategoriaList(categorias); + } + } + + public void convertVOToEntidadClasses(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getClasses() != null && !pricingVO.getClasses().isEmpty()) { + List clases = new ArrayList(); + for (PricingClasse pricingClasseVO : pricingVO.getClasses()) { + com.rjconsultores.ventaboletos.entidad.PricingClase pricingClase = new com.rjconsultores.ventaboletos.entidad.PricingClase(); + pricingClase.setPricing(retorno); + pricingClase.setActivo(Pricing.ATIVO); + pricingClase.setFecmodif(new Date()); + pricingClase.setUsuarioId(retorno.getUsuarioId()); + pricingClase.setClaseServicio(new ClaseServicio(pricingClasseVO.getClasseservicioId())); + + clases.add(pricingClase); + } + + if(clases.isEmpty()) { + com.rjconsultores.ventaboletos.entidad.PricingClase pricingClase = new com.rjconsultores.ventaboletos.entidad.PricingClase(); + pricingClase.setPricing(retorno); + pricingClase.setActivo(Pricing.ATIVO); + pricingClase.setFecmodif(new Date()); + pricingClase.setUsuarioId(retorno.getUsuarioId()); + pricingClase.setClaseServicio(new ClaseServicio(1)); + + clases.add(pricingClase); + } + retorno.setPricingClaseList(clases); + } + } + + public void convertVOToEntidadServicos(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getServicos() != null && !pricingVO.getServicos().isEmpty()) { + List corridas = new ArrayList(); + for (PricingCorrida pricingServicoVO : pricingVO.getServicos()) { + com.rjconsultores.ventaboletos.entidad.PricingCorrida pricingCorrida = new com.rjconsultores.ventaboletos.entidad.PricingCorrida(); + pricingCorrida.setPricing(retorno); + pricingCorrida.setActivo(Pricing.ATIVO); + pricingCorrida.setFecmodif(new Date()); + pricingCorrida.setUsuarioId(retorno.getUsuarioId()); + pricingCorrida.setCorridaCtrl(new CorridaCtrl(pricingServicoVO.getNumservico())); + + corridas.add(pricingCorrida); + } + retorno.setPricingCorridaList(corridas); + } + } + + public void convertVOToEntidadDias(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) throws ParseException { + if(pricingVO.getDias() != null && !pricingVO.getDias().isEmpty()) { + List dias = new ArrayList(); + for (PricingDia pricingDiaVO : pricingVO.getDias()) { + com.rjconsultores.ventaboletos.entidad.PricingDia pricingDia = new com.rjconsultores.ventaboletos.entidad.PricingDia(); + pricingDia.setPricing(retorno); + pricingDia.setActivo(Pricing.ATIVO); + pricingDia.setFecmodif(new Date()); + pricingDia.setUsuarioId(retorno.getUsuarioId()); + + if(StringUtils.isNotBlank(pricingDiaVO.getHorariofim())) { + pricingDia.setHorariofin(DateUtil.getFecInicio(DateUtil.getDateFromString(pricingDiaVO.getHorariofim(), "HH:mm")).getTime()); + } + + if(StringUtils.isNotBlank(pricingDiaVO.getHorarioinicio())) { + pricingDia.setHorarioinicio(DateUtil.getFecInicio(DateUtil.getDateFromString(pricingDiaVO.getHorarioinicio(), "HH:mm")).getTime()); + } + + pricingDia.setIndlunes(pricingDiaVO.getSegunda() != null ? pricingDiaVO.getSegunda().equals(1) : false); + pricingDia.setIndmartes(pricingDiaVO.getTerca() != null ? pricingDiaVO.getTerca().equals(1) : false); + pricingDia.setIndmiercoles(pricingDiaVO.getQuarta() != null ? pricingDiaVO.getQuarta().equals(1) : false); + pricingDia.setIndjueves(pricingDiaVO.getQuinta() != null ? pricingDiaVO.getQuinta().equals(1) : false); + pricingDia.setIndviernes(pricingDiaVO.getSexta() != null ? pricingDiaVO.getSexta().equals(1) : false); + pricingDia.setIndsabado(pricingDiaVO.getSabado() != null ? pricingDiaVO.getSabado().equals(1) : false); + pricingDia.setIndfecventa(pricingDiaVO.getDataviagem() == null || !pricingDiaVO.getDataviagem().equals(1)); + pricingDia.setIndfecviaje(!pricingDia.getIndfecventa()); + + dias.add(pricingDia); + } + retorno.setPricingDiaList(dias); + } + } + + public void convertVOToEntidadOcupacoes(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getOcupacoes() != null && !pricingVO.getOcupacoes().isEmpty()) { + List ocupacoes = new ArrayList(); + for (PricingOcupaAntecipa pricingOcupaAntecipaVO : pricingVO.getOcupacoes()) { + com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa pricingOcupaAntecipa = new com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa(); + pricingOcupaAntecipa.setPricing(retorno); + pricingOcupaAntecipa.setActivo(Pricing.ATIVO); + pricingOcupaAntecipa.setFecmodif(new Date()); + pricingOcupaAntecipa.setUsuarioId(retorno.getUsuarioId()); + pricingOcupaAntecipa.setCantasientosmax(pricingOcupaAntecipaVO.getCantasientosmax()); + pricingOcupaAntecipa.setCantasientosmin(pricingOcupaAntecipaVO.getCantasientosmin()); + pricingOcupaAntecipa.setCantdiasmax(pricingOcupaAntecipaVO.getCantdiasmax()); + pricingOcupaAntecipa.setCantdiasmin(pricingOcupaAntecipaVO.getCantdiasmin()); + pricingOcupaAntecipa.setImporte(pricingOcupaAntecipaVO.getImporte()); + pricingOcupaAntecipa.setOcupacionfinal(pricingOcupaAntecipaVO.getOcupacionfinal()); + pricingOcupaAntecipa.setOcupacioninicial(pricingOcupaAntecipaVO.getOcupacioninicial()); + pricingOcupaAntecipa.setPorcentaje(pricingOcupaAntecipaVO.getPorcentaje()); + if(pricingOcupaAntecipaVO.getClasseId() != null) { + pricingOcupaAntecipa.setPricingClasseTarifaria(new PricingClasseTarifaria(pricingOcupaAntecipaVO.getClasseId())); + } + + ocupacoes.add(pricingOcupaAntecipa); + } + retorno.setPricingOcupaAntecipaList(ocupacoes); + } + } + + public void convertVOToEntidadPuntoventas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getPuntoventas() != null && !pricingVO.getPuntoventas().isEmpty()) { + List puntoventas = new ArrayList(); + for (PricingPuntoVenta pricingPuntoVentaVO : pricingVO.getPuntoventas()) { + com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta = new com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta(); + pricingPuntoVenta.setPricing(retorno); + pricingPuntoVenta.setActivo(Pricing.ATIVO); + pricingPuntoVenta.setFecmodif(new Date()); + pricingPuntoVenta.setUsuarioId(retorno.getUsuarioId()); + pricingPuntoVenta.setPuntoVenta(new PuntoVenta(pricingPuntoVentaVO.getPuntoventaId())); + + puntoventas.add(pricingPuntoVenta); + } + + if(puntoventas.isEmpty()) { + com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta = new com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta(); + pricingPuntoVenta.setPricing(retorno); + pricingPuntoVenta.setActivo(Pricing.ATIVO); + pricingPuntoVenta.setFecmodif(new Date()); + pricingPuntoVenta.setUsuarioId(retorno.getUsuarioId()); + pricingPuntoVenta.setPuntoVenta(new PuntoVenta(-1)); + + puntoventas.add(pricingPuntoVenta); + } + + retorno.setPricingPuntoventaList(puntoventas); + } + } + + public void convertVOToEntidadLinhas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getLinhas() != null && !pricingVO.getLinhas().isEmpty()) { + List rutas = new ArrayList(); + for (PricingRuta pricingLinhaVO : pricingVO.getLinhas()) { + com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta = new com.rjconsultores.ventaboletos.entidad.PricingRuta(); + pricingRuta.setPricing(retorno); + pricingRuta.setActivo(Pricing.ATIVO); + pricingRuta.setFecmodif(new Date()); + pricingRuta.setUsuarioId(retorno.getUsuarioId()); + pricingRuta.setRuta(new Ruta(pricingLinhaVO.getRutaId())); + + rutas.add(pricingRuta); + } + + if(rutas.isEmpty()) { + com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta = new com.rjconsultores.ventaboletos.entidad.PricingRuta(); + pricingRuta.setPricing(retorno); + pricingRuta.setActivo(Pricing.ATIVO); + pricingRuta.setFecmodif(new Date()); + pricingRuta.setUsuarioId(retorno.getUsuarioId()); + pricingRuta.setRuta(new Ruta(-1)); + + rutas.add(pricingRuta); + } + retorno.setPricingRutaList(rutas); + } + } + + public void convertVOToEntidadTiposervicos(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getTiposervicos() != null && !pricingVO.getTiposervicos().isEmpty()) { + List tipoServicios = new ArrayList(); + for (PricingTipoCorrida pricingTipoCorridaVO : pricingVO.getTiposervicos()) { + com.rjconsultores.ventaboletos.entidad.PricingTipoServicio pricingTipoServicio = new com.rjconsultores.ventaboletos.entidad.PricingTipoServicio(); + pricingTipoServicio.setPricing(retorno); + pricingTipoServicio.setActivo(Pricing.ATIVO); + pricingTipoServicio.setFecmodif(new Date()); + pricingTipoServicio.setUsuarioId(retorno.getUsuarioId()); + pricingTipoServicio.setTipoServicio(new TipoServicio(pricingTipoCorridaVO.getTipocorridaId())); + + tipoServicios.add(pricingTipoServicio); + } + retorno.setPricingTipoServicioList(tipoServicios); + } + } + + public void convertVOToEntidadMercados(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getMercados() != null && !pricingVO.getMercados().isEmpty()) { + List mercados = new ArrayList(); + for (PricingMercado pricingMercadoVO : pricingVO.getMercados()) { + com.rjconsultores.ventaboletos.entidad.PricingMercado pricingMercado = new com.rjconsultores.ventaboletos.entidad.PricingMercado(); + pricingMercado.setPricing(retorno); + pricingMercado.setActivo(Pricing.ATIVO); + pricingMercado.setFecmodif(new Date()); + pricingMercado.setUsuarioId(retorno.getUsuarioId()); + pricingMercado.setOrigen(new Parada(pricingMercadoVO.getOrigemId())); + pricingMercado.setDestino(new Parada(pricingMercadoVO.getDestinoId())); + + mercados.add(pricingMercado); + } + retorno.setPricingMercadoList(mercados); + } + } + + public void convertVOToEntidadVigencias(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) throws ParseException { + if(pricingVO.getVigencias() != null && !pricingVO.getVigencias().isEmpty()) { + List vigencias = new ArrayList(); + for (PricingVigencia pricingVigenciaVO : pricingVO.getVigencias()) { + com.rjconsultores.ventaboletos.entidad.PricingVigencia pricingVigencia = new com.rjconsultores.ventaboletos.entidad.PricingVigencia(); + pricingVigencia.setPricing(retorno); + pricingVigencia.setActivo(Pricing.ATIVO); + pricingVigencia.setFecmodif(new Date()); + pricingVigencia.setUsuarioId(retorno.getUsuarioId()); + + if(StringUtils.isNotBlank(pricingVigenciaVO.getInicioDataVenda())) { + pricingVigencia.setFecinicioventa(DateUtil.getDateFromString(pricingVigenciaVO.getInicioDataVenda(), "dd/MM/yyyy HH:mm")); + } + + if(StringUtils.isNotBlank(pricingVigenciaVO.getFimDataVenda())) { + pricingVigencia.setFecfinventa(DateUtil.getDateFromString(pricingVigenciaVO.getFimDataVenda(), "dd/MM/yyyy HH:mm")); + } + + if(StringUtils.isNotBlank(pricingVigenciaVO.getInicioDataViagem())) { + pricingVigencia.setFecinicioviaje(DateUtil.getDateFromString(pricingVigenciaVO.getInicioDataViagem(), "dd/MM/yyyy HH:mm")); + } + + if(StringUtils.isNotBlank(pricingVigenciaVO.getFimDataViagem())) { + pricingVigencia.setFecfinviaje(DateUtil.getDateFromString(pricingVigenciaVO.getFimDataViagem(), "dd/MM/yyyy HH:mm")); + } + + vigencias.add(pricingVigencia); + } + retorno.setPricingVigenciaList(vigencias); + } + } + + public void convertVOToEntidadMarcas(Pricing retorno, com.rjconsultores.ventaboletos.vo.pricing.Pricing pricingVO) { + if(pricingVO.getMarcas() != null && !pricingVO.getMarcas().isEmpty()) { + List marcas = new ArrayList(); + for (PricingMarca pricingMarcaVO : pricingVO.getMarcas()) { + com.rjconsultores.ventaboletos.entidad.PricingMarca pricingMarca = new com.rjconsultores.ventaboletos.entidad.PricingMarca(); + pricingMarca.setPricing(retorno); + pricingMarca.setActivo(Pricing.ATIVO); + pricingMarca.setFecmodif(new Date()); + pricingMarca.setUsuarioId(retorno.getUsuarioId()); + pricingMarca.setMarca(new Marca(pricingMarcaVO.getMarcaId().shortValue())); + + marcas.add(pricingMarca); + } + retorno.setPricingMarcaList(marcas); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/RegistroConDependenciaException.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/RegistroConDependenciaException.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/utilerias/RegistroConDependenciaException.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/RegistroConDependenciaException.java diff --git a/src/com/rjconsultores/ventaboletos/utilerias/SendMail.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/SendMail.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/SendMail.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/SendMail.java index df5835b98..fddc1bfe6 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/SendMail.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/SendMail.java @@ -1,426 +1,426 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; - -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.mail.AuthenticationFailedException; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.SendFailedException; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.util.ByteArrayDataSource; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.enums.MimeType; -import com.rjconsultores.ventaboletos.enums.TypeContentEmail; - - -public class SendMail implements java.io.Serializable { - private static final String ENCODE_UTF_8 = "UTF-8"; - - private static final long serialVersionUID = 2067442255080001075L; - - public enum AuthType {TLS,SSL,SMTPS,NONE} - - private String smtpHost; - private String smtpUser; - private String smtpPassword; - private String smtpPort; - private String emailFrom; - private String emailTo; - private String emailToCO; - private List emailCopy = new ArrayList(); - private String localhost; - private Boolean auth; - private String subject; - private String text; - private Map anexosBytes; - private Map anexosArquivos; - private Map mimeTypes; - private AuthType authType; - - public SendMail(){ - this.smtpHost = ""; - this.smtpUser = ""; - this.smtpPassword = ""; - this.smtpPort = ""; - this.emailFrom = ""; - this.localhost = ""; - this.auth = true; - this.authType = AuthType.TLS; - this.emailTo = ""; - this.emailToCO = ""; - } - - public SendMail(String smtpHost, String smtpUser, String smtpPassword, String smtpPort, - String emailFrom, String emailTo, List emailCopy, String localhost, - Boolean auth, String subject, String text) { - this.smtpHost = smtpHost; - this.smtpUser = smtpUser; - this.smtpPassword = smtpPassword; - this.smtpPort = smtpPort; - this.emailFrom = emailFrom; - this.emailTo = emailTo; - this.emailCopy = emailCopy; - this.localhost = localhost; - this.auth = auth; - this.subject = subject; - this.text = text; - } - - public String[] removeNull(String[] a) { - List removed = new ArrayList(); - for (String str : a) - if (!StringUtils.isBlank(str) && !str.equals("null")) - removed.add(str); - return removed.toArray(new String[0]); - } - - public void send() throws SendFailedException { - send(null); - } - - public void send(TypeContentEmail type) throws SendFailedException { - try { - if(emailTo==null) { - throw new SendFailedException("Email de envio não foi corretamente configurado"); - } - String[] to = removeNull(getArrayEnderecoEmail(emailTo)); - String[] bcc = removeNull(getArrayEnderecoEmail(emailToCO)); - - Session session = Session.getInstance(getProperties(), null); - - Message message = new MimeMessage(session); - message.setFrom(new InternetAddress(emailFrom)); - message.setRecipients(Message.RecipientType.TO, getInternetAddress(to)); - message.setRecipients(Message.RecipientType.BCC, getInternetAddress(bcc)); - InternetAddress[] copyAddress = getInternetAddress(new String[emailCopy.size()]); - if (copyAddress.length > 0) { - message.setRecipients(Message.RecipientType.CC, copyAddress); - } - - ((MimeMessage) message).setSubject(subject, ENCODE_UTF_8); - - Multipart multipart = new MimeMultipart(); - multipart.addBodyPart(type == null ? getMimeBodyPart() : getMimeBodyPart(type)); - message.setContent(multipart); - - adicionarAnexos(multipart); - - Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp"); - if (auth) { - t.connect(smtpUser, smtpPassword); - } else { - t.connect(); - - } - t.sendMessage(message, message.getAllRecipients()); - t.close(); - } catch (Exception e) { - throw new SendFailedException("Ocorreu um erro no envio do email.", e); - } - } - - public void sendEmail(TypeContentEmail type) throws AuthenticationFailedException, MessagingException, Exception { - String[] to = removeNull(getArrayEnderecoEmail(emailTo)); - String[] bcc = removeNull(getArrayEnderecoEmail(emailToCO)); - - Session session = Session.getInstance(getProperties(), null); - - Message message = new MimeMessage(session); - message.setFrom(new InternetAddress(emailFrom)); - message.setRecipients(Message.RecipientType.TO, getInternetAddress(to)); - message.setRecipients(Message.RecipientType.BCC, getInternetAddress(bcc)); - InternetAddress[] copyAddress = getInternetAddress(new String[emailCopy.size()]); - if (copyAddress.length > 0) { - message.setRecipients(Message.RecipientType.CC, copyAddress); - } - - ((MimeMessage) message).setSubject(subject, ENCODE_UTF_8); - - Multipart multipart = new MimeMultipart(); - multipart.addBodyPart(type == null ? getMimeBodyPart() : getMimeBodyPart(type)); - message.setContent(multipart); - - adicionarAnexos(multipart); - - Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp"); - if (auth) { - t.connect(smtpUser, smtpPassword); - } else { - t.connect(); - - } - t.sendMessage(message, message.getAllRecipients()); - t.close(); - } - - public boolean testConfiguration() throws AuthenticationFailedException, MessagingException, Exception { - boolean result = false; - - Session session = Session.getInstance(getProperties(), null); - - Message message = new MimeMessage(session); - - ((MimeMessage) message).setSubject(subject, ENCODE_UTF_8); - - Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp"); - if (auth) { - t.connect(smtpUser, smtpPassword); - } else { - t.connect(); - - } - t.close(); - result = true; - - return result; - } - - private String[] getArrayEnderecoEmail(String emailValue) { - String[] arrayEmail = {}; - if (emailValue.contains(";")){ - arrayEmail = emailValue.split(";"); - } else if (!StringUtils.isBlank(emailValue)){ - arrayEmail = new String[1]; - arrayEmail[0] = emailValue; - } - return arrayEmail; - } - - public void addAnexo(String nome, ByteArrayOutputStream anexo, MimeType mimeType) { - if(anexosBytes == null) { - anexosBytes = new HashMap(); - } - if(mimeTypes == null) { - mimeTypes = new HashMap(); - } - anexosBytes.put(nome, anexo); - mimeTypes.put(nome, mimeType); - } - - public void addAnexo(String nome, String anexo) { - if(anexosArquivos== null) { - anexosArquivos = new HashMap(); - } - anexosArquivos.put(nome, anexo); - } - - private BodyPart getMimeBodyPart() throws MessagingException { - BodyPart messageBodyPart = new MimeBodyPart(); - ((MimeBodyPart)messageBodyPart).setText(text, ENCODE_UTF_8); - return messageBodyPart; - } - - private BodyPart getMimeBodyPart(TypeContentEmail type) throws MessagingException { - BodyPart messageBodyPart = new MimeBodyPart(); - messageBodyPart.setContent(text, type.valor); - return messageBodyPart; - } - - private InternetAddress[] getInternetAddress(String[] address) throws AddressException { - InternetAddress[] toAddress = new InternetAddress[address.length]; - for (int i = 0; i < address.length; i++) { - toAddress[i] = new InternetAddress(address[i]); - } - return toAddress; - } - - private Properties getProperties() { - Properties props = System.getProperties(); - props.put("mail.smtp.host", smtpHost); - props.put("mail.smtp.ssl.trust", smtpHost); - - if (localhost != null) { - props.put("mail.smtp.localhost", localhost); - } - - if (auth) { - props.setProperty("mail.smtp.user", smtpUser); - } - - if (authType.equals(AuthType.TLS)) { - props.setProperty("mail.smtp.starttls.enable", "true"); - props.setProperty("mail.smtp.starttls.required", "true"); - } else if (authType.equals(AuthType.SSL)) { - props.put("mail.smtp.socketFactory.port", smtpPort); - props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); - } else if (authType.equals(AuthType.SMTPS)) { - props.setProperty("mail.smtps.ssl.checkserveridentity", "true"); - props.setProperty("mail.smtps.quitwait", "false"); - } else if (authType.equals(AuthType.NONE)) { - props.setProperty("mail.smtp.starttls.enable", "true"); - props.setProperty("mail.smtp.starttls.required", "false"); - props.setProperty("mail.smtp.ssl.trust", "*"); - props.setProperty("mail.smtp.ssl.checkserveridentity", "false"); - props.setProperty("mail.smtp.ssl.enable", "false"); - } - - props.setProperty("mail.smtp.auth", auth.toString()); - props.setProperty("mail.smtp.port", smtpPort); - return props; - } - - private void adicionarAnexos(Multipart multipart) throws MessagingException, IOException { - anexarArquivosBytes(multipart); - anexarArquivos(multipart); - } - - private void anexarArquivosBytes(Multipart multipart) throws MessagingException, IOException { - if(anexosBytes != null) { - for (Entry anexo : anexosBytes.entrySet()) { - BodyPart bodyPart = new MimeBodyPart(); - MimeType mimeType = mimeTypes.get(anexo.getKey()); - DataSource bds = new ByteArrayDataSource(new ByteArrayInputStream(anexo.getValue().toByteArray()), mimeType.toString()); - bodyPart.setDataHandler(new DataHandler(bds)); - bodyPart.setFileName(anexo.getKey()); - - multipart.addBodyPart(bodyPart); - } - } - } - - private void anexarArquivos(Multipart multipart) throws MessagingException { - if(anexosArquivos != null) { - for (Entry anexo : anexosArquivos.entrySet()) { - BodyPart bodyPart = new MimeBodyPart(); - DataSource bds = new FileDataSource(anexo.getValue()); - bodyPart.setDataHandler(new DataHandler(bds)); - bodyPart.setFileName(anexo.getKey()); - multipart.addBodyPart(bodyPart); - } - } - } - - public String getSmtpHost() { - return smtpHost; - } - - public void setSmtpHost(String smtpHost) { - this.smtpHost = smtpHost; - } - - public String getSmtpUser() { - return smtpUser; - } - - public void setSmtpUser(String smtpUser) { - this.smtpUser = smtpUser; - } - - public String getSmtpPassword() { - return smtpPassword; - } - - public void setSmtpPassword(String smtpPassword) { - this.smtpPassword = smtpPassword; - } - - public String getSmtpPort() { - return smtpPort; - } - - public void setSmtpPort(String smtpPort) { - this.smtpPort = smtpPort; - } - - public String getEmailFrom() { - return emailFrom; - } - - public void setEmailFrom(String emailFrom) { - this.emailFrom = emailFrom; - } - - public String getEmailTo() { - return emailTo; - } - - public void setEmailTo(String emailTo) { - this.emailTo = emailTo; - } - - public List getEmailCopy() { - return emailCopy; - } - - public void setEmailCopy(List emailCopy) { - this.emailCopy = emailCopy; - } - - public String getLocalhost() { - return localhost; - } - - public void setLocalhost(String localhost) { - this.localhost = localhost; - } - - public String getSubject() { - return subject; - } - - public void setSubject(String subject) { - this.subject = subject; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - public String getEmailToCO() { - return emailToCO; - } - - public void setEmailToCO(String emailToCO) { - this.emailToCO = emailToCO; - } - - public Boolean getAuth() { - return auth; - } - - public void setAuth(Boolean auth) { - this.auth = auth; - } - - public Map getAnexosArquivos() { - return anexosArquivos; - } - - public void setAnexosArquivos(Map anexosArquivos) { - this.anexosArquivos = anexosArquivos; - } - - public AuthType getAuthType() { - return authType; - } - - public void setAuthType(AuthType authType) { - this.authType = authType; - } - +package com.rjconsultores.ventaboletos.utilerias; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Properties; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.mail.AuthenticationFailedException; +import javax.mail.BodyPart; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.SendFailedException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; +import javax.mail.util.ByteArrayDataSource; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.enums.MimeType; +import com.rjconsultores.ventaboletos.enums.TypeContentEmail; + + +public class SendMail implements java.io.Serializable { + private static final String ENCODE_UTF_8 = "UTF-8"; + + private static final long serialVersionUID = 2067442255080001075L; + + public enum AuthType {TLS,SSL,SMTPS,NONE} + + private String smtpHost; + private String smtpUser; + private String smtpPassword; + private String smtpPort; + private String emailFrom; + private String emailTo; + private String emailToCO; + private List emailCopy = new ArrayList(); + private String localhost; + private Boolean auth; + private String subject; + private String text; + private Map anexosBytes; + private Map anexosArquivos; + private Map mimeTypes; + private AuthType authType; + + public SendMail(){ + this.smtpHost = ""; + this.smtpUser = ""; + this.smtpPassword = ""; + this.smtpPort = ""; + this.emailFrom = ""; + this.localhost = ""; + this.auth = true; + this.authType = AuthType.TLS; + this.emailTo = ""; + this.emailToCO = ""; + } + + public SendMail(String smtpHost, String smtpUser, String smtpPassword, String smtpPort, + String emailFrom, String emailTo, List emailCopy, String localhost, + Boolean auth, String subject, String text) { + this.smtpHost = smtpHost; + this.smtpUser = smtpUser; + this.smtpPassword = smtpPassword; + this.smtpPort = smtpPort; + this.emailFrom = emailFrom; + this.emailTo = emailTo; + this.emailCopy = emailCopy; + this.localhost = localhost; + this.auth = auth; + this.subject = subject; + this.text = text; + } + + public String[] removeNull(String[] a) { + List removed = new ArrayList(); + for (String str : a) + if (!StringUtils.isBlank(str) && !str.equals("null")) + removed.add(str); + return removed.toArray(new String[0]); + } + + public void send() throws SendFailedException { + send(null); + } + + public void send(TypeContentEmail type) throws SendFailedException { + try { + if(emailTo==null) { + throw new SendFailedException("Email de envio não foi corretamente configurado"); + } + String[] to = removeNull(getArrayEnderecoEmail(emailTo)); + String[] bcc = removeNull(getArrayEnderecoEmail(emailToCO)); + + Session session = Session.getInstance(getProperties(), null); + + Message message = new MimeMessage(session); + message.setFrom(new InternetAddress(emailFrom)); + message.setRecipients(Message.RecipientType.TO, getInternetAddress(to)); + message.setRecipients(Message.RecipientType.BCC, getInternetAddress(bcc)); + InternetAddress[] copyAddress = getInternetAddress(new String[emailCopy.size()]); + if (copyAddress.length > 0) { + message.setRecipients(Message.RecipientType.CC, copyAddress); + } + + ((MimeMessage) message).setSubject(subject, ENCODE_UTF_8); + + Multipart multipart = new MimeMultipart(); + multipart.addBodyPart(type == null ? getMimeBodyPart() : getMimeBodyPart(type)); + message.setContent(multipart); + + adicionarAnexos(multipart); + + Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp"); + if (auth) { + t.connect(smtpUser, smtpPassword); + } else { + t.connect(); + + } + t.sendMessage(message, message.getAllRecipients()); + t.close(); + } catch (Exception e) { + throw new SendFailedException("Ocorreu um erro no envio do email.", e); + } + } + + public void sendEmail(TypeContentEmail type) throws AuthenticationFailedException, MessagingException, Exception { + String[] to = removeNull(getArrayEnderecoEmail(emailTo)); + String[] bcc = removeNull(getArrayEnderecoEmail(emailToCO)); + + Session session = Session.getInstance(getProperties(), null); + + Message message = new MimeMessage(session); + message.setFrom(new InternetAddress(emailFrom)); + message.setRecipients(Message.RecipientType.TO, getInternetAddress(to)); + message.setRecipients(Message.RecipientType.BCC, getInternetAddress(bcc)); + InternetAddress[] copyAddress = getInternetAddress(new String[emailCopy.size()]); + if (copyAddress.length > 0) { + message.setRecipients(Message.RecipientType.CC, copyAddress); + } + + ((MimeMessage) message).setSubject(subject, ENCODE_UTF_8); + + Multipart multipart = new MimeMultipart(); + multipart.addBodyPart(type == null ? getMimeBodyPart() : getMimeBodyPart(type)); + message.setContent(multipart); + + adicionarAnexos(multipart); + + Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp"); + if (auth) { + t.connect(smtpUser, smtpPassword); + } else { + t.connect(); + + } + t.sendMessage(message, message.getAllRecipients()); + t.close(); + } + + public boolean testConfiguration() throws AuthenticationFailedException, MessagingException, Exception { + boolean result = false; + + Session session = Session.getInstance(getProperties(), null); + + Message message = new MimeMessage(session); + + ((MimeMessage) message).setSubject(subject, ENCODE_UTF_8); + + Transport t = session.getTransport(authType.equals(AuthType.SMTPS) ? "smtps" : "smtp"); + if (auth) { + t.connect(smtpUser, smtpPassword); + } else { + t.connect(); + + } + t.close(); + result = true; + + return result; + } + + private String[] getArrayEnderecoEmail(String emailValue) { + String[] arrayEmail = {}; + if (emailValue.contains(";")){ + arrayEmail = emailValue.split(";"); + } else if (!StringUtils.isBlank(emailValue)){ + arrayEmail = new String[1]; + arrayEmail[0] = emailValue; + } + return arrayEmail; + } + + public void addAnexo(String nome, ByteArrayOutputStream anexo, MimeType mimeType) { + if(anexosBytes == null) { + anexosBytes = new HashMap(); + } + if(mimeTypes == null) { + mimeTypes = new HashMap(); + } + anexosBytes.put(nome, anexo); + mimeTypes.put(nome, mimeType); + } + + public void addAnexo(String nome, String anexo) { + if(anexosArquivos== null) { + anexosArquivos = new HashMap(); + } + anexosArquivos.put(nome, anexo); + } + + private BodyPart getMimeBodyPart() throws MessagingException { + BodyPart messageBodyPart = new MimeBodyPart(); + ((MimeBodyPart)messageBodyPart).setText(text, ENCODE_UTF_8); + return messageBodyPart; + } + + private BodyPart getMimeBodyPart(TypeContentEmail type) throws MessagingException { + BodyPart messageBodyPart = new MimeBodyPart(); + messageBodyPart.setContent(text, type.valor); + return messageBodyPart; + } + + private InternetAddress[] getInternetAddress(String[] address) throws AddressException { + InternetAddress[] toAddress = new InternetAddress[address.length]; + for (int i = 0; i < address.length; i++) { + toAddress[i] = new InternetAddress(address[i]); + } + return toAddress; + } + + private Properties getProperties() { + Properties props = System.getProperties(); + props.put("mail.smtp.host", smtpHost); + props.put("mail.smtp.ssl.trust", smtpHost); + + if (localhost != null) { + props.put("mail.smtp.localhost", localhost); + } + + if (auth) { + props.setProperty("mail.smtp.user", smtpUser); + } + + if (authType.equals(AuthType.TLS)) { + props.setProperty("mail.smtp.starttls.enable", "true"); + props.setProperty("mail.smtp.starttls.required", "true"); + } else if (authType.equals(AuthType.SSL)) { + props.put("mail.smtp.socketFactory.port", smtpPort); + props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); + } else if (authType.equals(AuthType.SMTPS)) { + props.setProperty("mail.smtps.ssl.checkserveridentity", "true"); + props.setProperty("mail.smtps.quitwait", "false"); + } else if (authType.equals(AuthType.NONE)) { + props.setProperty("mail.smtp.starttls.enable", "true"); + props.setProperty("mail.smtp.starttls.required", "false"); + props.setProperty("mail.smtp.ssl.trust", "*"); + props.setProperty("mail.smtp.ssl.checkserveridentity", "false"); + props.setProperty("mail.smtp.ssl.enable", "false"); + } + + props.setProperty("mail.smtp.auth", auth.toString()); + props.setProperty("mail.smtp.port", smtpPort); + return props; + } + + private void adicionarAnexos(Multipart multipart) throws MessagingException, IOException { + anexarArquivosBytes(multipart); + anexarArquivos(multipart); + } + + private void anexarArquivosBytes(Multipart multipart) throws MessagingException, IOException { + if(anexosBytes != null) { + for (Entry anexo : anexosBytes.entrySet()) { + BodyPart bodyPart = new MimeBodyPart(); + MimeType mimeType = mimeTypes.get(anexo.getKey()); + DataSource bds = new ByteArrayDataSource(new ByteArrayInputStream(anexo.getValue().toByteArray()), mimeType.toString()); + bodyPart.setDataHandler(new DataHandler(bds)); + bodyPart.setFileName(anexo.getKey()); + + multipart.addBodyPart(bodyPart); + } + } + } + + private void anexarArquivos(Multipart multipart) throws MessagingException { + if(anexosArquivos != null) { + for (Entry anexo : anexosArquivos.entrySet()) { + BodyPart bodyPart = new MimeBodyPart(); + DataSource bds = new FileDataSource(anexo.getValue()); + bodyPart.setDataHandler(new DataHandler(bds)); + bodyPart.setFileName(anexo.getKey()); + multipart.addBodyPart(bodyPart); + } + } + } + + public String getSmtpHost() { + return smtpHost; + } + + public void setSmtpHost(String smtpHost) { + this.smtpHost = smtpHost; + } + + public String getSmtpUser() { + return smtpUser; + } + + public void setSmtpUser(String smtpUser) { + this.smtpUser = smtpUser; + } + + public String getSmtpPassword() { + return smtpPassword; + } + + public void setSmtpPassword(String smtpPassword) { + this.smtpPassword = smtpPassword; + } + + public String getSmtpPort() { + return smtpPort; + } + + public void setSmtpPort(String smtpPort) { + this.smtpPort = smtpPort; + } + + public String getEmailFrom() { + return emailFrom; + } + + public void setEmailFrom(String emailFrom) { + this.emailFrom = emailFrom; + } + + public String getEmailTo() { + return emailTo; + } + + public void setEmailTo(String emailTo) { + this.emailTo = emailTo; + } + + public List getEmailCopy() { + return emailCopy; + } + + public void setEmailCopy(List emailCopy) { + this.emailCopy = emailCopy; + } + + public String getLocalhost() { + return localhost; + } + + public void setLocalhost(String localhost) { + this.localhost = localhost; + } + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getEmailToCO() { + return emailToCO; + } + + public void setEmailToCO(String emailToCO) { + this.emailToCO = emailToCO; + } + + public Boolean getAuth() { + return auth; + } + + public void setAuth(Boolean auth) { + this.auth = auth; + } + + public Map getAnexosArquivos() { + return anexosArquivos; + } + + public void setAnexosArquivos(Map anexosArquivos) { + this.anexosArquivos = anexosArquivos; + } + + public AuthType getAuthType() { + return authType; + } + + public void setAuthType(AuthType authType) { + this.authType = authType; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/utilerias/StringHelper.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/StringHelper.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/StringHelper.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/StringHelper.java index 84a4d3338..c1001cc5e 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/StringHelper.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/StringHelper.java @@ -1,154 +1,154 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang.StringUtils; - -public class StringHelper { - - public static final String QUEBRA_LINHA = "\r\n"; - - private static String[] REPLACES = { "a", "e", "i", "o", "u", "c", "A", "E", "I", "O", "U", "C" }; - private static Pattern[] PATTERNS = null; - - private StringHelper() { - } - - private static void compilePatterns() { - PATTERNS = new Pattern[REPLACES.length]; - PATTERNS[0] = Pattern.compile("[âãáàä]"); - PATTERNS[1] = Pattern.compile("[éèêë]"); - PATTERNS[2] = Pattern.compile("[íìîï]"); - PATTERNS[3] = Pattern.compile("[óòôõö]"); - PATTERNS[4] = Pattern.compile("[úùûü]"); - PATTERNS[5] = Pattern.compile("[ç]"); - PATTERNS[6] = Pattern.compile("[ÂÃÁÀÄ]"); - PATTERNS[7] = Pattern.compile("[ÉÈÊË]"); - PATTERNS[8] = Pattern.compile("[ÍÌÎÏ]"); - PATTERNS[9] = Pattern.compile("[ÓÒÔÕÖ]"); - PATTERNS[10] = Pattern.compile("[ÚÙÛÜ]"); - PATTERNS[11] = Pattern.compile("[Ç]"); - } - - public static String replaceAcento(String text) { - if (PATTERNS == null) { - compilePatterns(); - } - - String result = text; - for (int i = 0; i < PATTERNS.length; i++) { - Matcher matcher = PATTERNS[i].matcher(result); - result = matcher.replaceAll(REPLACES[i]); - } - return result; - } - - public static String retornaSomenteNumeros(String str) { - if (str != null) { - return str.replaceAll("[^0123456789]", ""); - } else { - return ""; - } - } - - public static String removeStringEsquerda(String str, String strRemover) { - if (str != null) { - str = StringUtils.stripStart(str, strRemover); - return str; - } else { - return ""; - } - } - - public static String preencherStringEspacoDireita(String str, int tamanho) { - return preencherStringDireita(str, tamanho, StringUtils.EMPTY); - } - - public static String preencherStringEspacoEsquerda(String str, int tamanho) { - return preencherStringEsquerda(str, tamanho, StringUtils.EMPTY); - } - - public static String preencherZeroDireita(String str, int tamanho) { - return preencherStringDireita(str, tamanho, "0"); - } - - public static String preencherZeroEsquerda(String str, int tamanho) { - return preencherStringEsquerda(str, tamanho, "0"); - } - - public static String preencherZeroEsquerda(Integer val, int tamanho) { - String value = val == null ? "" : val.toString(); - - return preencherStringEsquerda(value, tamanho, "0"); - } - - public static String preencherStringDireita(String str, int tamanho, String preenchimento) { - if (str != null) { - if (str.length() > tamanho) { - str = str.substring(0, tamanho); - } else { - str = StringUtils.rightPad(str, tamanho, preenchimento); - } - return str; - } else { - return StringUtils.rightPad(StringUtils.EMPTY, tamanho, preenchimento); - } - } - - public static String preencherStringEsquerda(String str, int tamanho, String preenchimento) { - if (str != null) { - if (str.length() > tamanho) { - str = str.substring(0, tamanho); - } else { - str = StringUtils.leftPad(str, tamanho, preenchimento); - } - return str; - } else { - return StringUtils.leftPad(StringUtils.EMPTY, tamanho, preenchimento); - } - } - - public static String preencherPipeDireita(String str, int tamanho) { - if (str != null && !StringUtils.isEmpty(str)) { - if (str.length() > tamanho) { - str = str.substring(0, tamanho); - } - str = StringUtils.rightPad(str, str.length() + 1, "|"); - return str; - } else { - return "|"; - } - } - - public static String preencherPipeDireita(String str) { - if (str != null && !StringUtils.isEmpty(str)) { - str = StringUtils.rightPad(str, str.length() + 1, "|"); - return str; - } else { - return "|"; - } - } - - public static String divideEFormata(String str) { - - DecimalFormatSymbols symbols = new DecimalFormatSymbols(); - symbols.setDecimalSeparator(','); - DecimalFormat formatador = new DecimalFormat("0.00", symbols); - - String valor = "0"; - if (str != null) { - valor = new BigDecimal(str).divide(new BigDecimal(100)).toString(); - } - return formatador.format(new BigDecimal(valor)); - - } - - public static Boolean isNumeric(String str) { - return StringUtils.isNumeric(str); - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; + +public class StringHelper { + + public static final String QUEBRA_LINHA = "\r\n"; + + private static String[] REPLACES = { "a", "e", "i", "o", "u", "c", "A", "E", "I", "O", "U", "C" }; + private static Pattern[] PATTERNS = null; + + private StringHelper() { + } + + private static void compilePatterns() { + PATTERNS = new Pattern[REPLACES.length]; + PATTERNS[0] = Pattern.compile("[âãáàä]"); + PATTERNS[1] = Pattern.compile("[éèêë]"); + PATTERNS[2] = Pattern.compile("[íìîï]"); + PATTERNS[3] = Pattern.compile("[óòôõö]"); + PATTERNS[4] = Pattern.compile("[úùûü]"); + PATTERNS[5] = Pattern.compile("[ç]"); + PATTERNS[6] = Pattern.compile("[ÂÃÁÀÄ]"); + PATTERNS[7] = Pattern.compile("[ÉÈÊË]"); + PATTERNS[8] = Pattern.compile("[ÍÌÎÏ]"); + PATTERNS[9] = Pattern.compile("[ÓÒÔÕÖ]"); + PATTERNS[10] = Pattern.compile("[ÚÙÛÜ]"); + PATTERNS[11] = Pattern.compile("[Ç]"); + } + + public static String replaceAcento(String text) { + if (PATTERNS == null) { + compilePatterns(); + } + + String result = text; + for (int i = 0; i < PATTERNS.length; i++) { + Matcher matcher = PATTERNS[i].matcher(result); + result = matcher.replaceAll(REPLACES[i]); + } + return result; + } + + public static String retornaSomenteNumeros(String str) { + if (str != null) { + return str.replaceAll("[^0123456789]", ""); + } else { + return ""; + } + } + + public static String removeStringEsquerda(String str, String strRemover) { + if (str != null) { + str = StringUtils.stripStart(str, strRemover); + return str; + } else { + return ""; + } + } + + public static String preencherStringEspacoDireita(String str, int tamanho) { + return preencherStringDireita(str, tamanho, StringUtils.EMPTY); + } + + public static String preencherStringEspacoEsquerda(String str, int tamanho) { + return preencherStringEsquerda(str, tamanho, StringUtils.EMPTY); + } + + public static String preencherZeroDireita(String str, int tamanho) { + return preencherStringDireita(str, tamanho, "0"); + } + + public static String preencherZeroEsquerda(String str, int tamanho) { + return preencherStringEsquerda(str, tamanho, "0"); + } + + public static String preencherZeroEsquerda(Integer val, int tamanho) { + String value = val == null ? "" : val.toString(); + + return preencherStringEsquerda(value, tamanho, "0"); + } + + public static String preencherStringDireita(String str, int tamanho, String preenchimento) { + if (str != null) { + if (str.length() > tamanho) { + str = str.substring(0, tamanho); + } else { + str = StringUtils.rightPad(str, tamanho, preenchimento); + } + return str; + } else { + return StringUtils.rightPad(StringUtils.EMPTY, tamanho, preenchimento); + } + } + + public static String preencherStringEsquerda(String str, int tamanho, String preenchimento) { + if (str != null) { + if (str.length() > tamanho) { + str = str.substring(0, tamanho); + } else { + str = StringUtils.leftPad(str, tamanho, preenchimento); + } + return str; + } else { + return StringUtils.leftPad(StringUtils.EMPTY, tamanho, preenchimento); + } + } + + public static String preencherPipeDireita(String str, int tamanho) { + if (str != null && !StringUtils.isEmpty(str)) { + if (str.length() > tamanho) { + str = str.substring(0, tamanho); + } + str = StringUtils.rightPad(str, str.length() + 1, "|"); + return str; + } else { + return "|"; + } + } + + public static String preencherPipeDireita(String str) { + if (str != null && !StringUtils.isEmpty(str)) { + str = StringUtils.rightPad(str, str.length() + 1, "|"); + return str; + } else { + return "|"; + } + } + + public static String divideEFormata(String str) { + + DecimalFormatSymbols symbols = new DecimalFormatSymbols(); + symbols.setDecimalSeparator(','); + DecimalFormat formatador = new DecimalFormat("0.00", symbols); + + String valor = "0"; + if (str != null) { + valor = new BigDecimal(str).divide(new BigDecimal(100)).toString(); + } + return formatador.format(new BigDecimal(valor)); + + } + + public static Boolean isNumeric(String str) { + return StringUtils.isNumeric(str); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/TimeZoneUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/TimeZoneUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/TimeZoneUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/TimeZoneUtil.java index a73748ee7..b2aebc956 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/TimeZoneUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/TimeZoneUtil.java @@ -1,130 +1,130 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.Date; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class TimeZoneUtil { - - private static Logger log = LogManager.getLogger(TimeZoneUtil.class); - - /** - * Ajusta o timezone conforme a origem ou ponto de venda informado de acordo com o horario de verao e fuso horario, - * nao alterando a data informada, apenas o GMT - * - * Retorna a data formatada para envio do BPe - * - * @param puntoventaId - * @param paradaId - * @param data - * @return - */ - public static String ajustarTimeZone(Map mConfiguracoesFusoHorario, Date data) { - try { - Integer gmtBrasil = -3; - - if(mConfiguracoesFusoHorario != null) { - StringBuilder sDataBpeFormatada = new StringBuilder(DateUtil.getStringDate(data, "yyyy-MM-dd'T'HH:mm:ss")); - Integer tiempohorhuso = mConfiguracoesFusoHorario.get("tiempohorhuso"); - - if (tiempohorhuso != null) { - gmtBrasil += tiempohorhuso; - } - Integer tiempohorverano = mConfiguracoesFusoHorario.get("tiempohorverano"); - - if (tiempohorverano != null) { - gmtBrasil += tiempohorverano; - } - - StringBuilder sGmtBrasil = new StringBuilder(); - if(gmtBrasil >= 0) { - sGmtBrasil.append("+"); - } - sGmtBrasil.append(gmtBrasil.toString()); - - if(gmtBrasil.toString().length() <= 2) { - sGmtBrasil.insert(1, "0"); - } - sDataBpeFormatada.append(sGmtBrasil).append(":00"); - - return sDataBpeFormatada.toString(); - } - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return DateUtil.dataFormatoBPe(data); - } - - /** - * Ajusta o timezone da data de acordo com a diferença da agencia de venda com a origem da viagem. - * @param puntoventaId - * @param paradaId - * @param data - * @return - */ - public static String ajustarPuntoVentaEmissaoOrigemViagemTimeZone(Map mConfiguracoesFusoHorarioParada, Map mConfiguracoesFusoHorarioPuntoVenta, Date data) { - try { - Integer gmtParada = -3; - Integer gmtPuntoventa = -3; - - if(mConfiguracoesFusoHorarioParada != null) { - Integer tiempohorhuso = mConfiguracoesFusoHorarioParada.get("tiempohorhuso"); - - if (tiempohorhuso != null) { - gmtParada += tiempohorhuso; - } - Integer tiempohorverano = mConfiguracoesFusoHorarioParada.get("tiempohorverano"); - - if (tiempohorverano != null) { - gmtParada += tiempohorverano; - } - } - - if(mConfiguracoesFusoHorarioPuntoVenta != null) { - Integer tiempohorhuso = mConfiguracoesFusoHorarioPuntoVenta.get("tiempohorhuso"); - - if (tiempohorhuso != null) { - gmtPuntoventa += tiempohorhuso; - } - Integer tiempohorverano = mConfiguracoesFusoHorarioPuntoVenta.get("tiempohorverano"); - - if (tiempohorverano != null) { - gmtPuntoventa += tiempohorverano; - } - } - - Integer qtdHoraAjustaData = new BigDecimal(gmtPuntoventa).abs().intValue() - new BigDecimal(gmtParada).abs().intValue(); - Calendar cal = Calendar.getInstance(); - cal.setTime(data); - cal.add(Calendar.HOUR_OF_DAY, qtdHoraAjustaData); - - StringBuilder sDataBpeFormatada = new StringBuilder(DateUtil.getStringDate(cal.getTime(), "yyyy-MM-dd'T'HH:mm:ss")); - - StringBuilder sGmtData = new StringBuilder(); - if(gmtParada >= 0) { - sGmtData.append("+"); - } - sGmtData.append(gmtParada.toString()); - - if(gmtParada.toString().length() <= 2) { - sGmtData.insert(1, "0"); - } - - sDataBpeFormatada.append(sGmtData).append(":00"); - - return sDataBpeFormatada.toString(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return DateUtil.dataFormatoBPe(data); - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.Date; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class TimeZoneUtil { + + private static Logger log = LogManager.getLogger(TimeZoneUtil.class); + + /** + * Ajusta o timezone conforme a origem ou ponto de venda informado de acordo com o horario de verao e fuso horario, + * nao alterando a data informada, apenas o GMT + * + * Retorna a data formatada para envio do BPe + * + * @param puntoventaId + * @param paradaId + * @param data + * @return + */ + public static String ajustarTimeZone(Map mConfiguracoesFusoHorario, Date data) { + try { + Integer gmtBrasil = -3; + + if(mConfiguracoesFusoHorario != null) { + StringBuilder sDataBpeFormatada = new StringBuilder(DateUtil.getStringDate(data, "yyyy-MM-dd'T'HH:mm:ss")); + Integer tiempohorhuso = mConfiguracoesFusoHorario.get("tiempohorhuso"); + + if (tiempohorhuso != null) { + gmtBrasil += tiempohorhuso; + } + Integer tiempohorverano = mConfiguracoesFusoHorario.get("tiempohorverano"); + + if (tiempohorverano != null) { + gmtBrasil += tiempohorverano; + } + + StringBuilder sGmtBrasil = new StringBuilder(); + if(gmtBrasil >= 0) { + sGmtBrasil.append("+"); + } + sGmtBrasil.append(gmtBrasil.toString()); + + if(gmtBrasil.toString().length() <= 2) { + sGmtBrasil.insert(1, "0"); + } + sDataBpeFormatada.append(sGmtBrasil).append(":00"); + + return sDataBpeFormatada.toString(); + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return DateUtil.dataFormatoBPe(data); + } + + /** + * Ajusta o timezone da data de acordo com a diferença da agencia de venda com a origem da viagem. + * @param puntoventaId + * @param paradaId + * @param data + * @return + */ + public static String ajustarPuntoVentaEmissaoOrigemViagemTimeZone(Map mConfiguracoesFusoHorarioParada, Map mConfiguracoesFusoHorarioPuntoVenta, Date data) { + try { + Integer gmtParada = -3; + Integer gmtPuntoventa = -3; + + if(mConfiguracoesFusoHorarioParada != null) { + Integer tiempohorhuso = mConfiguracoesFusoHorarioParada.get("tiempohorhuso"); + + if (tiempohorhuso != null) { + gmtParada += tiempohorhuso; + } + Integer tiempohorverano = mConfiguracoesFusoHorarioParada.get("tiempohorverano"); + + if (tiempohorverano != null) { + gmtParada += tiempohorverano; + } + } + + if(mConfiguracoesFusoHorarioPuntoVenta != null) { + Integer tiempohorhuso = mConfiguracoesFusoHorarioPuntoVenta.get("tiempohorhuso"); + + if (tiempohorhuso != null) { + gmtPuntoventa += tiempohorhuso; + } + Integer tiempohorverano = mConfiguracoesFusoHorarioPuntoVenta.get("tiempohorverano"); + + if (tiempohorverano != null) { + gmtPuntoventa += tiempohorverano; + } + } + + Integer qtdHoraAjustaData = new BigDecimal(gmtPuntoventa).abs().intValue() - new BigDecimal(gmtParada).abs().intValue(); + Calendar cal = Calendar.getInstance(); + cal.setTime(data); + cal.add(Calendar.HOUR_OF_DAY, qtdHoraAjustaData); + + StringBuilder sDataBpeFormatada = new StringBuilder(DateUtil.getStringDate(cal.getTime(), "yyyy-MM-dd'T'HH:mm:ss")); + + StringBuilder sGmtData = new StringBuilder(); + if(gmtParada >= 0) { + sGmtData.append("+"); + } + sGmtData.append(gmtParada.toString()); + + if(gmtParada.toString().length() <= 2) { + sGmtData.insert(1, "0"); + } + + sDataBpeFormatada.append(sGmtData).append(":00"); + + return sDataBpeFormatada.toString(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return DateUtil.dataFormatoBPe(data); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/TraslaparUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/TraslaparUtil.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/utilerias/TraslaparUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/TraslaparUtil.java diff --git a/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java diff --git a/src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java index 411430420..accb5eb6c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/UtiliteriasFiscal.java @@ -1,285 +1,285 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.NumberFormat; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; - -public class UtiliteriasFiscal { - - private static int DECIMALS = 2; - private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_EVEN; - - public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; - public static final BigDecimal CEM = BigDecimal.valueOf(100); - public static final String QUEBRA_LINHA = "\r\n"; - - public static BigDecimal divideEFormata(BigDecimal valor) { - String vlrFormatado = StringHelper.divideEFormata(valor.toString()); - return new BigDecimal(vlrFormatado); - } - - public static String defineCodigoProduto(Integer idOrigemCorrida, Integer idDestinoCorrida, Integer idLinha) { - int tamanhoMaximo = 12; - - String codOrigem = Integer.toHexString(idOrigemCorrida); - String codDestino = Integer.toHexString(idDestinoCorrida); - String codLinha = Integer.toHexString(idLinha); - - codOrigem = codOrigem.toUpperCase() + StringUtils.repeat("X", 4 - codOrigem.length()); - codDestino = codDestino.toUpperCase() + StringUtils.repeat("X", 4 - codDestino.length()); - codLinha = codLinha.toUpperCase() + StringUtils.repeat("X", 3 - codLinha.length()); - - String codProduto = codOrigem + codDestino + codLinha + "-"; - - if (codProduto.length() > tamanhoMaximo) { - codProduto = codProduto.substring(1, tamanhoMaximo + 1); - } - - return codProduto; - } - - public static void main(String args[]) { - System.out.println(formataZeroDecimal(new BigDecimal("3870.00"), 2, 14)); - } - - public static String formataNumerico(final String valor, final int tamanho) { - return formataNumerico(valor, false, tamanho); - } - - public static String formataNumerico(final String valor, final boolean removeMascara, final int tamanho) { - String retorno = StringUtils.trim(valor); - - if (retorno == null) { - retorno = ""; - } - - if (removeMascara) { - retorno = retorno.replace("-", "").replace(".", "").replace("/", ""); - } - - retorno = retorno.replace(".", "").replace(",", ""); - - if (tamanho > 0) { - if (retorno.length() > tamanho) { - retorno = retorno.substring(retorno.length() - tamanho, retorno.length()); - } - - return StringUtils.leftPad(retorno, tamanho, "0"); - } - - return retorno; - } - - public static String formataZeroDecimal(final BigDecimal valor, final int tamanho) { - String valorFommat = valor == null ? "" : valor.toString(); - valorFommat = valorFommat.toString().replace(".", "").replace(",", ""); - valorFommat = formataNumerico(valorFommat, valorFommat.length()); - valorFommat = StringUtils.leftPad(valorFommat, (tamanho), "0"); - return valorFommat; - } - - public static String formataEspacosDecimalEsquerda(final BigDecimal valor, final int tamanho) { - String valorFommat = valor == null ? "" : valor.toString(); - valorFommat = valorFommat.toString().replace(".", "").replace(",", ""); - valorFommat = UtiliteriasFiscal.formataNumerico(valorFommat, valorFommat.length()); - valorFommat = StringUtils.leftPad(valorFommat, (tamanho), " "); - return valorFommat; - } - - public static String formataEspacosDecimalDireita(final BigDecimal valor, final int tamanho) { - String valorFommat = valor == null ? "" : valor.toString(); - valorFommat = valorFommat.toString().replace(".", "").replace(",", ""); - valorFommat = UtiliteriasFiscal.formataNumerico(valorFommat, valorFommat.length()); - valorFommat = StringUtils.rightPad(valorFommat, (tamanho), " "); - return valorFommat; - } - - public static BigDecimal arredondar(BigDecimal aNumber) { - return aNumber.setScale(DECIMALS, ROUNDING_MODE); - } - - public static String formataZeroDecimal(final BigDecimal valor, final int casasDecimais, final int tamanho) { - NumberFormat df = DecimalFormat.getInstance(); - df.setMinimumFractionDigits(casasDecimais); - df.setMaximumFractionDigits(casasDecimais); - - String valorFommat = valor == null ? "" : df.format(valor).replaceAll("[^0-9]", ""); - valorFommat = formataNumerico(valorFommat, tamanho); - return valorFommat; - } - - public static BigDecimal valorTotalItensECF(ImportacionFiscalVO item) { - BigDecimal valorTotal = BigDecimal.ZERO; - - BigDecimal valorPedagio = item.getValorPedagio() == null ? BigDecimal.ZERO : item.getValorPedagio(); - BigDecimal valorEmbarque = item.getValorEmbarque() == null ? BigDecimal.ZERO : item.getValorEmbarque(); - BigDecimal valorTarifa = item.getValorTarifa() == null ? BigDecimal.ZERO : item.getValorTarifa(); - BigDecimal valorSeguro = item.getValorSeguro() == null ? BigDecimal.ZERO : item.getValorSeguro(); - if (valorTarifa.equals(BigDecimal.ZERO)) - valorTarifa = BigDecimal.ONE.divide(CEM); - - valorTotal = valorTotal.add(valorTarifa).add(valorPedagio).add(valorEmbarque).add(valorSeguro); - - return valorTotal; - } - - public static String aberturaDeArquivo(String identificador, String data, String cnpjFilial, String brancos372, - String sequencial) { - - StringBuilder abertura = new StringBuilder(); - abertura.append(identificador); - abertura.append(data); - abertura.append(cnpjFilial); - abertura.append(brancos372); - abertura.append(sequencial); - - return abertura.toString(); - } - - public static String headerDocumentoFiscal(String identificador, String data, String cnpjImpressora, String coo, - String serie, String especie, String codigoCliente, String filialCliente, String condicaoPagamento, - String valorTotalDocumanto, String valorItens, String aliquota, String imposto, String valorPIS, - String valorCofins, String valorCSLL, String totalICMSIsento, String totalICMSNaotributado, String origenUf, - String origen, String destinoUf, String destino, String subSerie, String aidf, String status, - String motivocancelacion, String valorMulta, String brancos, String claseServicio, String sequencial) { - - StringBuilder header = new StringBuilder(); - header.append(identificador); - header.append(data); - header.append(cnpjImpressora); - header.append(coo); - header.append(serie); - header.append(especie); - header.append(codigoCliente); - header.append(filialCliente); - header.append(condicaoPagamento); - header.append(valorTotalDocumanto); - header.append(valorItens); - header.append(aliquota); - header.append(imposto); - header.append(valorPIS); - header.append(valorCofins); - header.append(valorCSLL); - header.append(totalICMSIsento); - header.append(totalICMSNaotributado); - header.append(origenUf); - header.append(origen); - header.append(destinoUf); - header.append(destino); - header.append(subSerie == null ? "" : subSerie); - header.append(aidf == null ? "" : aidf); - header.append(status); - header.append(motivocancelacion == null ? "" : motivocancelacion); - header.append(valorMulta == null ? "" : valorMulta); - header.append(brancos); - header.replace(226, 256, claseServicio); - - header.append(sequencial); - - return header.toString(); - } - - public static String itensDocumentoFiscal(String identificador, String numItem, String cfop, String codigoTES, - String codProduto, String unidade, String quantidade, String valorUnitario, String valorTotal, - String aliquotaItem, String impostoItem, String valorPIS, String aliquotaPIS, String aliquotaCofins, - String valorCofins, String aliquotaCSLL, String valorCSLL, String aliquotaISS, String valorISS, - String totalICMSIsentoItem, String totalICMSNaotributadoItem, String numeroPDV, String numeroSeriePDV, - String modeloImpressora, String numCaixa, String status, String coo, String serie, - String brancos, String sequencial) { - - StringBuilder item = new StringBuilder(); - item.append(identificador); - item.append(numItem); - item.append(cfop); - item.append(codigoTES); - item.append(codProduto); - item.append(unidade); - item.append(quantidade); - item.append(valorUnitario); - item.append(valorTotal); - item.append(aliquotaItem); - item.append(impostoItem); - item.append(aliquotaPIS); - item.append(valorPIS); - item.append(aliquotaCofins); - item.append(valorCofins); - item.append(aliquotaCSLL); - item.append(valorCSLL); - item.append(aliquotaISS); - item.append(valorISS); - item.append(totalICMSIsentoItem); - item.append(totalICMSNaotributadoItem); - item.append(numeroPDV == null ? "" : numeroPDV); - item.append(numeroSeriePDV == null ? "" : numeroSeriePDV); - item.append(modeloImpressora); - item.append(numCaixa); - item.append(status); - item.append(coo == null ? "" : coo); - item.append(serie == null ? "" : serie); - item.append(brancos); - item.append(sequencial); - - return item.toString(); - } - - public static String fechamentoDeArquivo(String identificador, String qtdeDocGerados, String qtdeItensDocGerados, - String brancos, String sequencial) { - - StringBuilder fechamento = new StringBuilder(); - fechamento.append(identificador); - fechamento.append(qtdeDocGerados == null ? "" : qtdeDocGerados); - fechamento.append(qtdeItensDocGerados == null ? "" : qtdeItensDocGerados); - fechamento.append(brancos); - fechamento.append(sequencial); - - return fechamento.toString(); - } - - public static String reducaoZ(String identificador, String dataMovimento, String cnpj, String numRelatorio, String numPDV, - String numSeriePDV, String numReducaoZ, String gtInicial, String gtFinal, String docFiscalInic, - String docFiscalFinal, String valorCancel, String valorContabil, String subtributaria, String descontos, - String isento, String naoTributado, String aliquota, String aliquota2, String aliquota3, String aliquota4, - String coo, String outrosRecebimentos, String impostoDebitado, String dataReducaoZ, String horaReducaoZ, - String valorDocFiscal, String cro, String status, String brancos, String sequencial) { - - StringBuilder reducaoZ = new StringBuilder(); - reducaoZ.append(identificador); - reducaoZ.append(dataMovimento); - reducaoZ.append(cnpj); - reducaoZ.append(numRelatorio); - reducaoZ.append(numPDV); - reducaoZ.append(numSeriePDV); - reducaoZ.append(numReducaoZ); - reducaoZ.append(gtInicial); - reducaoZ.append(gtFinal); - reducaoZ.append(docFiscalInic); - reducaoZ.append(docFiscalFinal); - reducaoZ.append(valorCancel); - reducaoZ.append(valorContabil); - reducaoZ.append(subtributaria); - reducaoZ.append(descontos); - reducaoZ.append(isento); - reducaoZ.append(naoTributado); - reducaoZ.append(aliquota); - reducaoZ.append(aliquota2); - reducaoZ.append(aliquota3); - reducaoZ.append(aliquota4); - reducaoZ.append(coo); - reducaoZ.append(outrosRecebimentos); - reducaoZ.append(impostoDebitado); - reducaoZ.append(dataReducaoZ); - reducaoZ.append(horaReducaoZ); - reducaoZ.append(valorDocFiscal); - reducaoZ.append(cro); - reducaoZ.append(status); - reducaoZ.append(brancos); - reducaoZ.append(sequencial); - - return reducaoZ.toString(); - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.NumberFormat; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; + +public class UtiliteriasFiscal { + + private static int DECIMALS = 2; + private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_EVEN; + + public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; + public static final BigDecimal CEM = BigDecimal.valueOf(100); + public static final String QUEBRA_LINHA = "\r\n"; + + public static BigDecimal divideEFormata(BigDecimal valor) { + String vlrFormatado = StringHelper.divideEFormata(valor.toString()); + return new BigDecimal(vlrFormatado); + } + + public static String defineCodigoProduto(Integer idOrigemCorrida, Integer idDestinoCorrida, Integer idLinha) { + int tamanhoMaximo = 12; + + String codOrigem = Integer.toHexString(idOrigemCorrida); + String codDestino = Integer.toHexString(idDestinoCorrida); + String codLinha = Integer.toHexString(idLinha); + + codOrigem = codOrigem.toUpperCase() + StringUtils.repeat("X", 4 - codOrigem.length()); + codDestino = codDestino.toUpperCase() + StringUtils.repeat("X", 4 - codDestino.length()); + codLinha = codLinha.toUpperCase() + StringUtils.repeat("X", 3 - codLinha.length()); + + String codProduto = codOrigem + codDestino + codLinha + "-"; + + if (codProduto.length() > tamanhoMaximo) { + codProduto = codProduto.substring(1, tamanhoMaximo + 1); + } + + return codProduto; + } + + public static void main(String args[]) { + System.out.println(formataZeroDecimal(new BigDecimal("3870.00"), 2, 14)); + } + + public static String formataNumerico(final String valor, final int tamanho) { + return formataNumerico(valor, false, tamanho); + } + + public static String formataNumerico(final String valor, final boolean removeMascara, final int tamanho) { + String retorno = StringUtils.trim(valor); + + if (retorno == null) { + retorno = ""; + } + + if (removeMascara) { + retorno = retorno.replace("-", "").replace(".", "").replace("/", ""); + } + + retorno = retorno.replace(".", "").replace(",", ""); + + if (tamanho > 0) { + if (retorno.length() > tamanho) { + retorno = retorno.substring(retorno.length() - tamanho, retorno.length()); + } + + return StringUtils.leftPad(retorno, tamanho, "0"); + } + + return retorno; + } + + public static String formataZeroDecimal(final BigDecimal valor, final int tamanho) { + String valorFommat = valor == null ? "" : valor.toString(); + valorFommat = valorFommat.toString().replace(".", "").replace(",", ""); + valorFommat = formataNumerico(valorFommat, valorFommat.length()); + valorFommat = StringUtils.leftPad(valorFommat, (tamanho), "0"); + return valorFommat; + } + + public static String formataEspacosDecimalEsquerda(final BigDecimal valor, final int tamanho) { + String valorFommat = valor == null ? "" : valor.toString(); + valorFommat = valorFommat.toString().replace(".", "").replace(",", ""); + valorFommat = UtiliteriasFiscal.formataNumerico(valorFommat, valorFommat.length()); + valorFommat = StringUtils.leftPad(valorFommat, (tamanho), " "); + return valorFommat; + } + + public static String formataEspacosDecimalDireita(final BigDecimal valor, final int tamanho) { + String valorFommat = valor == null ? "" : valor.toString(); + valorFommat = valorFommat.toString().replace(".", "").replace(",", ""); + valorFommat = UtiliteriasFiscal.formataNumerico(valorFommat, valorFommat.length()); + valorFommat = StringUtils.rightPad(valorFommat, (tamanho), " "); + return valorFommat; + } + + public static BigDecimal arredondar(BigDecimal aNumber) { + return aNumber.setScale(DECIMALS, ROUNDING_MODE); + } + + public static String formataZeroDecimal(final BigDecimal valor, final int casasDecimais, final int tamanho) { + NumberFormat df = DecimalFormat.getInstance(); + df.setMinimumFractionDigits(casasDecimais); + df.setMaximumFractionDigits(casasDecimais); + + String valorFommat = valor == null ? "" : df.format(valor).replaceAll("[^0-9]", ""); + valorFommat = formataNumerico(valorFommat, tamanho); + return valorFommat; + } + + public static BigDecimal valorTotalItensECF(ImportacionFiscalVO item) { + BigDecimal valorTotal = BigDecimal.ZERO; + + BigDecimal valorPedagio = item.getValorPedagio() == null ? BigDecimal.ZERO : item.getValorPedagio(); + BigDecimal valorEmbarque = item.getValorEmbarque() == null ? BigDecimal.ZERO : item.getValorEmbarque(); + BigDecimal valorTarifa = item.getValorTarifa() == null ? BigDecimal.ZERO : item.getValorTarifa(); + BigDecimal valorSeguro = item.getValorSeguro() == null ? BigDecimal.ZERO : item.getValorSeguro(); + if (valorTarifa.equals(BigDecimal.ZERO)) + valorTarifa = BigDecimal.ONE.divide(CEM); + + valorTotal = valorTotal.add(valorTarifa).add(valorPedagio).add(valorEmbarque).add(valorSeguro); + + return valorTotal; + } + + public static String aberturaDeArquivo(String identificador, String data, String cnpjFilial, String brancos372, + String sequencial) { + + StringBuilder abertura = new StringBuilder(); + abertura.append(identificador); + abertura.append(data); + abertura.append(cnpjFilial); + abertura.append(brancos372); + abertura.append(sequencial); + + return abertura.toString(); + } + + public static String headerDocumentoFiscal(String identificador, String data, String cnpjImpressora, String coo, + String serie, String especie, String codigoCliente, String filialCliente, String condicaoPagamento, + String valorTotalDocumanto, String valorItens, String aliquota, String imposto, String valorPIS, + String valorCofins, String valorCSLL, String totalICMSIsento, String totalICMSNaotributado, String origenUf, + String origen, String destinoUf, String destino, String subSerie, String aidf, String status, + String motivocancelacion, String valorMulta, String brancos, String claseServicio, String sequencial) { + + StringBuilder header = new StringBuilder(); + header.append(identificador); + header.append(data); + header.append(cnpjImpressora); + header.append(coo); + header.append(serie); + header.append(especie); + header.append(codigoCliente); + header.append(filialCliente); + header.append(condicaoPagamento); + header.append(valorTotalDocumanto); + header.append(valorItens); + header.append(aliquota); + header.append(imposto); + header.append(valorPIS); + header.append(valorCofins); + header.append(valorCSLL); + header.append(totalICMSIsento); + header.append(totalICMSNaotributado); + header.append(origenUf); + header.append(origen); + header.append(destinoUf); + header.append(destino); + header.append(subSerie == null ? "" : subSerie); + header.append(aidf == null ? "" : aidf); + header.append(status); + header.append(motivocancelacion == null ? "" : motivocancelacion); + header.append(valorMulta == null ? "" : valorMulta); + header.append(brancos); + header.replace(226, 256, claseServicio); + + header.append(sequencial); + + return header.toString(); + } + + public static String itensDocumentoFiscal(String identificador, String numItem, String cfop, String codigoTES, + String codProduto, String unidade, String quantidade, String valorUnitario, String valorTotal, + String aliquotaItem, String impostoItem, String valorPIS, String aliquotaPIS, String aliquotaCofins, + String valorCofins, String aliquotaCSLL, String valorCSLL, String aliquotaISS, String valorISS, + String totalICMSIsentoItem, String totalICMSNaotributadoItem, String numeroPDV, String numeroSeriePDV, + String modeloImpressora, String numCaixa, String status, String coo, String serie, + String brancos, String sequencial) { + + StringBuilder item = new StringBuilder(); + item.append(identificador); + item.append(numItem); + item.append(cfop); + item.append(codigoTES); + item.append(codProduto); + item.append(unidade); + item.append(quantidade); + item.append(valorUnitario); + item.append(valorTotal); + item.append(aliquotaItem); + item.append(impostoItem); + item.append(aliquotaPIS); + item.append(valorPIS); + item.append(aliquotaCofins); + item.append(valorCofins); + item.append(aliquotaCSLL); + item.append(valorCSLL); + item.append(aliquotaISS); + item.append(valorISS); + item.append(totalICMSIsentoItem); + item.append(totalICMSNaotributadoItem); + item.append(numeroPDV == null ? "" : numeroPDV); + item.append(numeroSeriePDV == null ? "" : numeroSeriePDV); + item.append(modeloImpressora); + item.append(numCaixa); + item.append(status); + item.append(coo == null ? "" : coo); + item.append(serie == null ? "" : serie); + item.append(brancos); + item.append(sequencial); + + return item.toString(); + } + + public static String fechamentoDeArquivo(String identificador, String qtdeDocGerados, String qtdeItensDocGerados, + String brancos, String sequencial) { + + StringBuilder fechamento = new StringBuilder(); + fechamento.append(identificador); + fechamento.append(qtdeDocGerados == null ? "" : qtdeDocGerados); + fechamento.append(qtdeItensDocGerados == null ? "" : qtdeItensDocGerados); + fechamento.append(brancos); + fechamento.append(sequencial); + + return fechamento.toString(); + } + + public static String reducaoZ(String identificador, String dataMovimento, String cnpj, String numRelatorio, String numPDV, + String numSeriePDV, String numReducaoZ, String gtInicial, String gtFinal, String docFiscalInic, + String docFiscalFinal, String valorCancel, String valorContabil, String subtributaria, String descontos, + String isento, String naoTributado, String aliquota, String aliquota2, String aliquota3, String aliquota4, + String coo, String outrosRecebimentos, String impostoDebitado, String dataReducaoZ, String horaReducaoZ, + String valorDocFiscal, String cro, String status, String brancos, String sequencial) { + + StringBuilder reducaoZ = new StringBuilder(); + reducaoZ.append(identificador); + reducaoZ.append(dataMovimento); + reducaoZ.append(cnpj); + reducaoZ.append(numRelatorio); + reducaoZ.append(numPDV); + reducaoZ.append(numSeriePDV); + reducaoZ.append(numReducaoZ); + reducaoZ.append(gtInicial); + reducaoZ.append(gtFinal); + reducaoZ.append(docFiscalInic); + reducaoZ.append(docFiscalFinal); + reducaoZ.append(valorCancel); + reducaoZ.append(valorContabil); + reducaoZ.append(subtributaria); + reducaoZ.append(descontos); + reducaoZ.append(isento); + reducaoZ.append(naoTributado); + reducaoZ.append(aliquota); + reducaoZ.append(aliquota2); + reducaoZ.append(aliquota3); + reducaoZ.append(aliquota4); + reducaoZ.append(coo); + reducaoZ.append(outrosRecebimentos); + reducaoZ.append(impostoDebitado); + reducaoZ.append(dataReducaoZ); + reducaoZ.append(horaReducaoZ); + reducaoZ.append(valorDocFiscal); + reducaoZ.append(cro); + reducaoZ.append(status); + reducaoZ.append(brancos); + reducaoZ.append(sequencial); + + return reducaoZ.toString(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java index 6a1eea797..ada0962ed 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.io.BufferedReader; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.math.BigDecimal; - -public class ValidadorImportacaoEcf { - - public static void main(String[] args) { - BufferedReader br; - int linha = 1; - - BigDecimal soma = BigDecimal.ZERO; - try { - br = new BufferedReader(new FileReader("c:\\Users\\rjgw\\Downloads\\fiscal_cancel_201604060542.txt")); - try { - // int linha = 1; - String line = br.readLine(); - Integer l1 = null; - Integer l2 = null; - try { - while (line != null) { - if (line.startsWith("1")) { - l1 = Integer.valueOf(line.substring(51, 65).trim()); - System.out.println("Linha: " + linha + " -- " + "Valor: " + l1); - soma = soma.add(new BigDecimal(l1).divide(new BigDecimal(100))); - l2 = 0; - } - if (line.startsWith("2")) { - l2 += Integer.valueOf(line.substring(47, 62).trim()); - } - line = br.readLine(); - if (line.startsWith("1") && l1 != null && l2 != null) { - if (l1.compareTo(l2) != 0) { - System.out.println("Linha: " + linha); - } - } - linha++; - } - } catch (NullPointerException e) { - } - - System.out.println("Soma: " + soma); - - } catch (IOException e) { - e.printStackTrace(); - } catch (Exception e) { - System.out.println("Linha: " + linha); - e.printStackTrace(); - } finally { - try { - br.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } catch (FileNotFoundException e) { - } - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.math.BigDecimal; + +public class ValidadorImportacaoEcf { + + public static void main(String[] args) { + BufferedReader br; + int linha = 1; + + BigDecimal soma = BigDecimal.ZERO; + try { + br = new BufferedReader(new FileReader("c:\\Users\\rjgw\\Downloads\\fiscal_cancel_201604060542.txt")); + try { + // int linha = 1; + String line = br.readLine(); + Integer l1 = null; + Integer l2 = null; + try { + while (line != null) { + if (line.startsWith("1")) { + l1 = Integer.valueOf(line.substring(51, 65).trim()); + System.out.println("Linha: " + linha + " -- " + "Valor: " + l1); + soma = soma.add(new BigDecimal(l1).divide(new BigDecimal(100))); + l2 = 0; + } + if (line.startsWith("2")) { + l2 += Integer.valueOf(line.substring(47, 62).trim()); + } + line = br.readLine(); + if (line.startsWith("1") && l1 != null && l2 != null) { + if (l1.compareTo(l2) != 0) { + System.out.println("Linha: " + linha); + } + } + linha++; + } + } catch (NullPointerException e) { + } + + System.out.println("Soma: " + soma); + + } catch (IOException e) { + e.printStackTrace(); + } catch (Exception e) { + System.out.println("Linha: " + linha); + e.printStackTrace(); + } finally { + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } catch (FileNotFoundException e) { + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ZipUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ZipUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/ZipUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ZipUtil.java index 83f3e944d..179891112 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ZipUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/ZipUtil.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.utilerias; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -public class ZipUtil { - - public static void compactarArquivos(File arquivoDeSaida, File... arquivosEOuPastas) throws IOException { - if (arquivosEOuPastas != null && arquivoDeSaida != null) { - byte[] buf = new byte[1024]; - ZipOutputStream out = new ZipOutputStream(new FileOutputStream(arquivoDeSaida)); - - for (File f : arquivosEOuPastas) { - FileInputStream in = new FileInputStream(f.getPath()); - out.putNextEntry(new ZipEntry(f.getName())); - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.closeEntry(); - in.close(); - f.delete(); - } - out.close(); - } - } - - public static void compactarArquivos(File arquivoDeSaida, List arquivosEOuPastas) throws IOException { - if (arquivosEOuPastas != null && arquivoDeSaida != null) { - byte[] buf = new byte[1024]; - ZipOutputStream out = new ZipOutputStream(new FileOutputStream(arquivoDeSaida)); - - for (File f : arquivosEOuPastas) { - FileInputStream in = new FileInputStream(f.getPath()); - out.putNextEntry(new ZipEntry(f.getName())); - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.closeEntry(); - in.close(); - f.delete(); - } - out.close(); - } - } - -} +package com.rjconsultores.ventaboletos.utilerias; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class ZipUtil { + + public static void compactarArquivos(File arquivoDeSaida, File... arquivosEOuPastas) throws IOException { + if (arquivosEOuPastas != null && arquivoDeSaida != null) { + byte[] buf = new byte[1024]; + ZipOutputStream out = new ZipOutputStream(new FileOutputStream(arquivoDeSaida)); + + for (File f : arquivosEOuPastas) { + FileInputStream in = new FileInputStream(f.getPath()); + out.putNextEntry(new ZipEntry(f.getName())); + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.closeEntry(); + in.close(); + f.delete(); + } + out.close(); + } + } + + public static void compactarArquivos(File arquivoDeSaida, List arquivosEOuPastas) throws IOException { + if (arquivosEOuPastas != null && arquivoDeSaida != null) { + byte[] buf = new byte[1024]; + ZipOutputStream out = new ZipOutputStream(new FileOutputStream(arquivoDeSaida)); + + for (File f : arquivosEOuPastas) { + FileInputStream in = new FileInputStream(f.getPath()); + out.putNextEntry(new ZipEntry(f.getName())); + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.closeEntry(); + in.close(); + f.delete(); + } + out.close(); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java index 8b984f68a..205ffcd26 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java @@ -1,473 +1,473 @@ -package com.rjconsultores.ventaboletos.utilerias.archivointegracion; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.StringHelper; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.SiglaMotivoCancelacion; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; - -public class ArchivoIntegracionECF { - - private static final Logger log = LogManager.getLogger(ArchivoIntegracionECF.class); - - public File importacionFiscalECFGenerico(Date inicio, Date fim, Empresa empresa, boolean isNormal, boolean isCancelados, boolean isPendencias, List list) { - - try { - String nomeArquivo = "fiscal_ecf_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - if (isCancelados) { - nomeArquivo = "fiscal_ecf_cancel_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - } else if (isPendencias) { - nomeArquivo = "fiscal_ecf_pendencias_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - } - - File arquivo = File.createTempFile(nomeArquivo, ".txt"); - - PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); - - Integer seq = 1; - - String cnpjFilial = empresa.getCnpj(); - String brancos371 = StringHelper.preencherStringEspacoEsquerda(null, 371); - String dataAgora = DateUtil.getStringDate(Calendar.getInstance().getTime(), UtiliteriasFiscal.DATE_FORMAT_FISCAL); - String seqAbertura = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String abertura = UtiliteriasFiscal.aberturaDeArquivo("0", dataAgora, cnpjFilial, brancos371, seqAbertura); - gravarArq.print(abertura + UtiliteriasFiscal.QUEBRA_LINHA); - - Integer qtdDoc = 0; - Integer qtdItens = 0; - - String header = null; - List itensDocs = new ArrayList(); - - for (ImportacionFiscalVO item : list) { - - qtdDoc++; - header = null; - itensDocs = new ArrayList(); - - String data = item.getDataEmissao(); - String brancos = StringHelper.preencherStringEspacoEsquerda(null, 202); - String cnpjEcf = item.getCnpjEcf() == null ? cnpjFilial : item.getCnpjEcf(); - - String serie = item.getNumImpressora(); - if (serie.length() >= 20) { - serie = serie.substring(17); - serie = StringHelper.preencherStringEspacoEsquerda(serie, 3); - } else { - serie = StringHelper.preencherStringEspacoEsquerda(null, 3); - } - - String especie = StringHelper.preencherStringEspacoDireita("CF", 5); - - String codigoCliente = StringHelper.preencherStringEsquerda(null, 6, "9"); - String filialCliente = StringHelper.preencherStringEsquerda(null, 2, "9"); - String condicaoPagamento = StringHelper.preencherStringEsquerda(null, 3, "9"); - - String valorPIS = StringHelper.preencherZeroEsquerda("", 14); - String valorCofins = StringHelper.preencherZeroEsquerda("", 14); - String valorCSLL = StringHelper.preencherZeroEsquerda("", 14); - - String coo = StringHelper.preencherStringEspacoDireita(item.getCoo(), 9); - - BigDecimal valorTotal = UtiliteriasFiscal.arredondar(UtiliteriasFiscal.valorTotalItensECF(item)); - String valorTotalDocumanto = UtiliteriasFiscal.formataEspacosDecimalDireita(valorTotal, 14); - String valorItens = valorTotalDocumanto; - - HashMap aliquotaBaseCalculo = getAliquotaBaseCalculo(item); - String aliquota = aliquotaBaseCalculo.get("aliquota"); - String imposto = aliquotaBaseCalculo.get("imposto"); - String totalICMSIsento = aliquotaBaseCalculo.get("totalICMSIsento"); - String totalICMSNaotributado = aliquotaBaseCalculo.get("totalICMSNaotributado"); - - String origenUf = StringHelper.preencherStringEspacoEsquerda(item.getOrigenUf(), 2); - String origen = item.getOrigenId() == null ? StringUtils.EMPTY : item.getOrigenId().toString(); - if (origen.length() > 2) { - origen = origen.substring(2); - origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); - } else { - origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); - } - - String destinoUf = StringHelper.preencherStringEspacoEsquerda(item.getDestinoUf(), 2); - String destino = item.getDestinoId() == null ? StringUtils.EMPTY : item.getDestinoId().toString(); - if (destino.length() > 2) { - destino = destino.substring(2); - destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); - } else { - destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); - } - - String motivocancelacion = null; - String valorMulta = null; - if (isCancelados) { - SiglaMotivoCancelacion sigla = SiglaMotivoCancelacion.valueOf(item.getMotivocancelacion()); - motivocancelacion = StringHelper.preencherStringEspacoEsquerda(sigla.toString(), 20); - valorMulta = UtiliteriasFiscal.formataZeroDecimal(item.getValorMulta(), 15); - brancos = StringHelper.preencherStringEspacoEsquerda(null, 167); - } - - seq++; - String status = StringHelper.preencherStringEspacoEsquerda(item.getStatus(), 1); - String claseServicio = StringHelper.preencherStringEspacoDireita(item.getClaseServicio(), 30); - String seqHeader = StringHelper.preencherZeroEsquerda(Integer.valueOf(seq).toString(), 6); - - header = UtiliteriasFiscal.headerDocumentoFiscal("1", data, cnpjEcf, coo, serie, especie, codigoCliente, - filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, aliquota, imposto, - valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origenUf, origen, - destinoUf, destino, null, null, status, motivocancelacion, valorMulta, brancos, claseServicio, seqHeader); - - /* - * Item da importacion Fiscal ECF - */ - int seqItem = 1; - for (ItemFiscalVO subItens : item.getItensFiscais()) { - String itemDoc = montarItensFiscais(subItens, seq++, seqItem); - itensDocs.add(itemDoc); - qtdItens++; - seqItem++; - } - - grabarHeaderItens(gravarArq, header, itensDocs); - - } - - seq++; - String qtdeDocGerados = StringHelper.preencherZeroEsquerda(qtdDoc.toString(), 6); - String qtdeItensDocGerados = StringHelper.preencherZeroEsquerda(qtdItens.toString(), 6); - String brancos381 = StringHelper.preencherStringEspacoEsquerda(null, 381); - String seqFechamento = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String fechamento = UtiliteriasFiscal.fechamentoDeArquivo("3", qtdeDocGerados, qtdeItensDocGerados, brancos381, seqFechamento); - gravarArq.print(fechamento + UtiliteriasFiscal.QUEBRA_LINHA); - - gravarArq.close(); - return arquivo; - - } catch (IOException e) { - log.error("", e); - } - - return null; - } - - private HashMap getAliquotaBaseCalculo(ImportacionFiscalVO fiscal) { - - HashMap resp = new HashMap(); - - String aliquota = null; - String imposto = null; - String totalICMSIsento = null; - String totalICMSNaotributado = null; - - for (ItemFiscalVO item : fiscal.getItensFiscais()) { - - BigDecimal valorItem = BigDecimal.ZERO; - String codProduto = StringHelper.preencherStringEspacoEsquerda(item.getCodProduto(), 15); - // VALIDA TARIFA - if (codProduto.indexOf("TA") >= 0) { - valorItem = item.getValorTarifa() == null ? valorItem : item.getValorTarifa(); - if (valorItem.equals(BigDecimal.ZERO)) - valorItem = BigDecimal.ONE; - - // TAXA DE EMBARQUE - } else if (codProduto.indexOf("TX") >= 0) { - valorItem = item.getValorEmbarque() == null ? valorItem : item.getValorEmbarque(); - - // PEDAGIO - } else if (codProduto.indexOf("PE") >= 0) { - valorItem = item.getValorPedagio() == null ? valorItem : item.getValorPedagio(); - - // SEGURO - } else if (codProduto.indexOf("SE") >= 0) { - valorItem = item.getValorSeguro() == null ? valorItem : item.getValorSeguro(); - } - - try { - valorItem = UtiliteriasFiscal.arredondar(valorItem); - item.setValorItem(new BigDecimal(UtiliteriasFiscal.formataZeroDecimal(valorItem, 15))); - } catch (Exception e) { - log.error("ERROR: " + item.toString(), e); - item.setValorItem(new BigDecimal(UtiliteriasFiscal.formataZeroDecimal(BigDecimal.ZERO, 15))); - } - - HashMap aliquotaBaseCalculo = new HashMap(0); - - // Verificando se é um produto tributável. Formato: XXTYYYY (XX - Posicao / YYYY - Aliquota) - String repTributado = item.getRepTributado() == null ? SituacaoTributaria.NAO_TRIBUTADO.getValue() : item.getRepTributado(); - if (repTributado.length() == 7 && repTributado.substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { - - String tipoPassagem = item.getTipoPassagem(); - - if (tipoPassagem == null) { - tipoPassagem = "E"; - } - - String key = tipoPassagem + item.getRepTributado().substring(3, 7); - - if (!aliquotaBaseCalculo.containsKey(key)) { - aliquotaBaseCalculo.put(key, BigDecimal.ZERO); - } - - BigDecimal soma = item.getValorItem().divide(BigDecimal.TEN.multiply(BigDecimal.TEN)); - aliquotaBaseCalculo.put(key, soma.add(aliquotaBaseCalculo.get(key))); - - } else if (repTributado.equals(SituacaoTributaria.NAO_TRIBUTADO.getValue())) { - - BigDecimal soma = item.getValorItem(); - totalICMSNaotributado = soma.toString(); - - if (totalICMSNaotributado.length() < 14) { - totalICMSNaotributado = StringHelper.preencherZeroEsquerda(totalICMSNaotributado, 14); - } - - } - - for (String key : aliquotaBaseCalculo.keySet()) { - aliquota = key.substring(1, 5); - - BigDecimal aliquotaCalc = BigDecimal.valueOf(Double.valueOf(aliquota) / UtiliteriasFiscal.CEM.doubleValue()); - aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); - - BigDecimal baseCalculo = aliquotaBaseCalculo.get(key); - baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); - - BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); - valorImposto = UtiliteriasFiscal.arredondar(valorImposto); - - imposto = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 14); - aliquota = UtiliteriasFiscal.formataZeroDecimal(aliquotaCalc, 14); - } - - boolean inconsistente = item.getInconsistencia() == null ? false : item.getInconsistencia(); - if (inconsistente) { - if (codProduto.indexOf("TA") >= 0) { - BigDecimal aliquotaCalc = item.getImpostoEstado() == null ? BigDecimal.ZERO : item.getImpostoEstado(); - aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); - - BigDecimal baseCalculo = valorItem; - baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); - - BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); - valorImposto = UtiliteriasFiscal.arredondar(valorImposto); - - imposto = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 14); - aliquota = UtiliteriasFiscal.formataZeroDecimal(aliquotaCalc, 14); - totalICMSIsento = null; - totalICMSNaotributado = null; - } - } - - } - if (StringUtils.isBlank(aliquota)) - aliquota = StringHelper.preencherZeroEsquerda("", 14); - - if (StringUtils.isBlank(imposto)) - imposto = StringHelper.preencherZeroEsquerda("", 14); - - if (StringUtils.isBlank(totalICMSIsento)) - totalICMSIsento = StringHelper.preencherZeroEsquerda("", 14); - - if (StringUtils.isBlank(totalICMSNaotributado)) - totalICMSNaotributado = StringHelper.preencherZeroEsquerda("", 14); - - resp.put("aliquota", aliquota); - resp.put("imposto", imposto); - resp.put("totalICMSIsento", totalICMSIsento); - resp.put("totalICMSNaotributado", totalICMSNaotributado); - - return resp; - } - - private String montarItensFiscais(ItemFiscalVO item, Integer seq, Integer seqItem) { - - String tipoPassagem = null; - - String repTributado = item.getRepTributado() == null ? SituacaoTributaria.NAO_TRIBUTADO.getValue() : item.getRepTributado(); - if (repTributado.length() == 7 && repTributado.substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { - tipoPassagem = item.getTipoPassagem(); - - if (tipoPassagem == null) - tipoPassagem = "E"; - - } else { - tipoPassagem = "E"; - } - - String numItem = StringHelper.preencherZeroEsquerda(seqItem.toString(), 3); - - String cfop = null; - if (tipoPassagem.equals("E")) { - cfop = StringHelper.preencherStringEspacoDireita("6357", 5); - } else if (tipoPassagem.equals("M")) { - cfop = StringHelper.preencherStringEspacoDireita("5357", 5); - } - - String codigoTES = StringHelper.preencherStringEsquerda(null, 3, "9"); - String codProduto = StringHelper.preencherStringEspacoEsquerda(item.getCodProduto(), 15); - String unidade = "UN"; - String quantidade = "001"; - - // TODO: A forma de enviar o valor do item é baseada no codProduto, pelo fato da FISCAL_R5 estar gravando os registros de tarifa errado - BigDecimal valorItem = BigDecimal.ZERO; - // VALIDA TARIFA - if (codProduto.indexOf("TA") >= 0) { - valorItem = item.getValorTarifa() == null ? valorItem : item.getValorTarifa(); - if (valorItem.equals(BigDecimal.ZERO)) - valorItem = BigDecimal.ONE.divide(UtiliteriasFiscal.CEM); - - // TAXA DE EMBARQUE - } else if (codProduto.indexOf("TX") >= 0) { - valorItem = item.getValorEmbarque() == null ? valorItem : item.getValorEmbarque(); - - // PEDAGIO - } else if (codProduto.indexOf("PE") >= 0) { - valorItem = item.getValorPedagio() == null ? valorItem : item.getValorPedagio(); - - // SEGURO - } else if (codProduto.indexOf("SE") >= 0) { - valorItem = item.getValorSeguro() == null ? valorItem : item.getValorSeguro(); - } - - String valorUnitario = null; - try { - valorItem = UtiliteriasFiscal.arredondar(valorItem); - valorUnitario = UtiliteriasFiscal.formataZeroDecimal(valorItem, 15); - item.setValorItem(new BigDecimal(valorUnitario)); - } catch (Exception e) { - log.error("ERROR: " + item.toString(), e); - valorUnitario = UtiliteriasFiscal.formataZeroDecimal(BigDecimal.ZERO, 15); - item.setValorItem(new BigDecimal(valorUnitario)); - } - - String valorTotal = valorUnitario; - String aliquotaItem = StringHelper.preencherZeroEsquerda("", 7); - String impostoItem = StringHelper.preencherZeroEsquerda("", 15); - String totalICMSIsentoItem = StringHelper.preencherZeroEsquerda("", 15); - String totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda("", 15); - - HashMap aliquotaItens = new HashMap(0); - - // Verificando se é um produto tributável. Formato: XXTYYYY (XX - Posicao / YYYY - Aliquota) - if (repTributado.length() == 7 && repTributado.substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { - - String key = tipoPassagem + item.getRepTributado().substring(3, 7); - - if (!aliquotaItens.containsKey(key)) { - aliquotaItens.put(key, BigDecimal.ZERO); - } - - BigDecimal soma = item.getValorItem().divide(BigDecimal.TEN.multiply(BigDecimal.TEN)); - aliquotaItens.put(key, soma.add(aliquotaItens.get(key))); - - } else if (repTributado.equals(SituacaoTributaria.NAO_TRIBUTADO.getValue())) { - - BigDecimal soma = item.getValorItem(); - totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda(soma.toString(), 15); - } - - for (String key : aliquotaItens.keySet()) { - aliquotaItem = key.substring(1, 5); - - BigDecimal aliquotaCalc = BigDecimal.valueOf(Double.valueOf(aliquotaItem) / UtiliteriasFiscal.CEM.doubleValue()); - aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); - - BigDecimal baseCalculo = aliquotaItens.get(key); - baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); - - BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); - valorImposto = UtiliteriasFiscal.arredondar(valorImposto); - - impostoItem = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 15); - aliquotaItem = UtiliteriasFiscal.formataZeroDecimal(null, 7); - } - - boolean inconsistente = item.getInconsistencia() == null ? false : item.getInconsistencia(); - if (inconsistente) { - if (codProduto.indexOf("TA") >= 0) { - BigDecimal aliquotaCalc = item.getImpostoEstado() == null ? BigDecimal.ZERO : item.getImpostoEstado(); - aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); - - BigDecimal baseCalculo = valorItem; - baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); - - BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); - valorImposto = UtiliteriasFiscal.arredondar(valorImposto); - - impostoItem = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 15); - aliquotaItem = UtiliteriasFiscal.formataZeroDecimal(null, 7); - totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda("", 15); - } - } - - String aliquotaPIS = StringHelper.preencherZeroEsquerda("", 7); - String valorPIS = StringHelper.preencherZeroEsquerda("", 15); - String aliquotaCofins = StringHelper.preencherZeroEsquerda("", 7); - String valorCofins = StringHelper.preencherZeroEsquerda("", 15); - String aliquotaCSLL = StringHelper.preencherZeroEsquerda("", 7); - String valorCSLL = StringHelper.preencherZeroEsquerda("", 15); - String aliquotaISS = StringHelper.preencherZeroEsquerda("", 7); - String valorISS = StringHelper.preencherZeroEsquerda("", 15); - - String numeroPDV = StringHelper.preencherStringEspacoDireita(item.getNumpdv(), 10); - String numeroSeriePDV = StringHelper.preencherStringEspacoDireita(item.getNumImpressora(), 20); - String modeloImpressora = StringHelper.preencherStringEspacoDireita(item.getModeloImpressora(), 40); - String numCaixa = StringHelper.preencherStringEspacoDireita(item.getNumCaixa(), 10); - String status = StringHelper.preencherStringEspacoEsquerda(item.getStatus(), 1); - - String coo = null; - String serie = null; - - coo = StringHelper.preencherStringEspacoDireita(item.getCoo(), 9); - serie = item.getNumImpressora(); - if (serie.length() >= 20) { - serie = serie.substring(17); - serie = StringHelper.preencherStringEspacoEsquerda(serie, 3); - } else { - serie = StringHelper.preencherStringEspacoEsquerda(null, 3); - } - - String brancos99 = StringHelper.preencherStringEspacoEsquerda(null, 99); - - seq++; - String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String itemDoc = UtiliteriasFiscal.itensDocumentoFiscal("2", numItem, cfop, codigoTES, codProduto, - unidade, quantidade, valorUnitario, valorTotal, aliquotaItem, impostoItem, - aliquotaPIS, valorPIS, aliquotaCofins, valorCofins, aliquotaCSLL, valorCSLL, - aliquotaISS, valorISS, totalICMSIsentoItem, totalICMSNaotributadoItem, - numeroPDV, numeroSeriePDV, modeloImpressora, numCaixa, status, coo, serie, - brancos99, sequencial); - return itemDoc; - - } - - private void grabarHeaderItens(PrintWriter gravarArq, String header, List itensDocs) { - gravarArq.print(header + UtiliteriasFiscal.QUEBRA_LINHA); - - for (String doc : itensDocs) { - gravarArq.print(doc + UtiliteriasFiscal.QUEBRA_LINHA); - } - } - -} +package com.rjconsultores.ventaboletos.utilerias.archivointegracion; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.StringHelper; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.SiglaMotivoCancelacion; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; + +public class ArchivoIntegracionECF { + + private static final Logger log = LogManager.getLogger(ArchivoIntegracionECF.class); + + public File importacionFiscalECFGenerico(Date inicio, Date fim, Empresa empresa, boolean isNormal, boolean isCancelados, boolean isPendencias, List list) { + + try { + String nomeArquivo = "fiscal_ecf_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + if (isCancelados) { + nomeArquivo = "fiscal_ecf_cancel_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + } else if (isPendencias) { + nomeArquivo = "fiscal_ecf_pendencias_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + } + + File arquivo = File.createTempFile(nomeArquivo, ".txt"); + + PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); + + Integer seq = 1; + + String cnpjFilial = empresa.getCnpj(); + String brancos371 = StringHelper.preencherStringEspacoEsquerda(null, 371); + String dataAgora = DateUtil.getStringDate(Calendar.getInstance().getTime(), UtiliteriasFiscal.DATE_FORMAT_FISCAL); + String seqAbertura = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String abertura = UtiliteriasFiscal.aberturaDeArquivo("0", dataAgora, cnpjFilial, brancos371, seqAbertura); + gravarArq.print(abertura + UtiliteriasFiscal.QUEBRA_LINHA); + + Integer qtdDoc = 0; + Integer qtdItens = 0; + + String header = null; + List itensDocs = new ArrayList(); + + for (ImportacionFiscalVO item : list) { + + qtdDoc++; + header = null; + itensDocs = new ArrayList(); + + String data = item.getDataEmissao(); + String brancos = StringHelper.preencherStringEspacoEsquerda(null, 202); + String cnpjEcf = item.getCnpjEcf() == null ? cnpjFilial : item.getCnpjEcf(); + + String serie = item.getNumImpressora(); + if (serie.length() >= 20) { + serie = serie.substring(17); + serie = StringHelper.preencherStringEspacoEsquerda(serie, 3); + } else { + serie = StringHelper.preencherStringEspacoEsquerda(null, 3); + } + + String especie = StringHelper.preencherStringEspacoDireita("CF", 5); + + String codigoCliente = StringHelper.preencherStringEsquerda(null, 6, "9"); + String filialCliente = StringHelper.preencherStringEsquerda(null, 2, "9"); + String condicaoPagamento = StringHelper.preencherStringEsquerda(null, 3, "9"); + + String valorPIS = StringHelper.preencherZeroEsquerda("", 14); + String valorCofins = StringHelper.preencherZeroEsquerda("", 14); + String valorCSLL = StringHelper.preencherZeroEsquerda("", 14); + + String coo = StringHelper.preencherStringEspacoDireita(item.getCoo(), 9); + + BigDecimal valorTotal = UtiliteriasFiscal.arredondar(UtiliteriasFiscal.valorTotalItensECF(item)); + String valorTotalDocumanto = UtiliteriasFiscal.formataEspacosDecimalDireita(valorTotal, 14); + String valorItens = valorTotalDocumanto; + + HashMap aliquotaBaseCalculo = getAliquotaBaseCalculo(item); + String aliquota = aliquotaBaseCalculo.get("aliquota"); + String imposto = aliquotaBaseCalculo.get("imposto"); + String totalICMSIsento = aliquotaBaseCalculo.get("totalICMSIsento"); + String totalICMSNaotributado = aliquotaBaseCalculo.get("totalICMSNaotributado"); + + String origenUf = StringHelper.preencherStringEspacoEsquerda(item.getOrigenUf(), 2); + String origen = item.getOrigenId() == null ? StringUtils.EMPTY : item.getOrigenId().toString(); + if (origen.length() > 2) { + origen = origen.substring(2); + origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); + } else { + origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); + } + + String destinoUf = StringHelper.preencherStringEspacoEsquerda(item.getDestinoUf(), 2); + String destino = item.getDestinoId() == null ? StringUtils.EMPTY : item.getDestinoId().toString(); + if (destino.length() > 2) { + destino = destino.substring(2); + destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); + } else { + destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); + } + + String motivocancelacion = null; + String valorMulta = null; + if (isCancelados) { + SiglaMotivoCancelacion sigla = SiglaMotivoCancelacion.valueOf(item.getMotivocancelacion()); + motivocancelacion = StringHelper.preencherStringEspacoEsquerda(sigla.toString(), 20); + valorMulta = UtiliteriasFiscal.formataZeroDecimal(item.getValorMulta(), 15); + brancos = StringHelper.preencherStringEspacoEsquerda(null, 167); + } + + seq++; + String status = StringHelper.preencherStringEspacoEsquerda(item.getStatus(), 1); + String claseServicio = StringHelper.preencherStringEspacoDireita(item.getClaseServicio(), 30); + String seqHeader = StringHelper.preencherZeroEsquerda(Integer.valueOf(seq).toString(), 6); + + header = UtiliteriasFiscal.headerDocumentoFiscal("1", data, cnpjEcf, coo, serie, especie, codigoCliente, + filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, aliquota, imposto, + valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origenUf, origen, + destinoUf, destino, null, null, status, motivocancelacion, valorMulta, brancos, claseServicio, seqHeader); + + /* + * Item da importacion Fiscal ECF + */ + int seqItem = 1; + for (ItemFiscalVO subItens : item.getItensFiscais()) { + String itemDoc = montarItensFiscais(subItens, seq++, seqItem); + itensDocs.add(itemDoc); + qtdItens++; + seqItem++; + } + + grabarHeaderItens(gravarArq, header, itensDocs); + + } + + seq++; + String qtdeDocGerados = StringHelper.preencherZeroEsquerda(qtdDoc.toString(), 6); + String qtdeItensDocGerados = StringHelper.preencherZeroEsquerda(qtdItens.toString(), 6); + String brancos381 = StringHelper.preencherStringEspacoEsquerda(null, 381); + String seqFechamento = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String fechamento = UtiliteriasFiscal.fechamentoDeArquivo("3", qtdeDocGerados, qtdeItensDocGerados, brancos381, seqFechamento); + gravarArq.print(fechamento + UtiliteriasFiscal.QUEBRA_LINHA); + + gravarArq.close(); + return arquivo; + + } catch (IOException e) { + log.error("", e); + } + + return null; + } + + private HashMap getAliquotaBaseCalculo(ImportacionFiscalVO fiscal) { + + HashMap resp = new HashMap(); + + String aliquota = null; + String imposto = null; + String totalICMSIsento = null; + String totalICMSNaotributado = null; + + for (ItemFiscalVO item : fiscal.getItensFiscais()) { + + BigDecimal valorItem = BigDecimal.ZERO; + String codProduto = StringHelper.preencherStringEspacoEsquerda(item.getCodProduto(), 15); + // VALIDA TARIFA + if (codProduto.indexOf("TA") >= 0) { + valorItem = item.getValorTarifa() == null ? valorItem : item.getValorTarifa(); + if (valorItem.equals(BigDecimal.ZERO)) + valorItem = BigDecimal.ONE; + + // TAXA DE EMBARQUE + } else if (codProduto.indexOf("TX") >= 0) { + valorItem = item.getValorEmbarque() == null ? valorItem : item.getValorEmbarque(); + + // PEDAGIO + } else if (codProduto.indexOf("PE") >= 0) { + valorItem = item.getValorPedagio() == null ? valorItem : item.getValorPedagio(); + + // SEGURO + } else if (codProduto.indexOf("SE") >= 0) { + valorItem = item.getValorSeguro() == null ? valorItem : item.getValorSeguro(); + } + + try { + valorItem = UtiliteriasFiscal.arredondar(valorItem); + item.setValorItem(new BigDecimal(UtiliteriasFiscal.formataZeroDecimal(valorItem, 15))); + } catch (Exception e) { + log.error("ERROR: " + item.toString(), e); + item.setValorItem(new BigDecimal(UtiliteriasFiscal.formataZeroDecimal(BigDecimal.ZERO, 15))); + } + + HashMap aliquotaBaseCalculo = new HashMap(0); + + // Verificando se é um produto tributável. Formato: XXTYYYY (XX - Posicao / YYYY - Aliquota) + String repTributado = item.getRepTributado() == null ? SituacaoTributaria.NAO_TRIBUTADO.getValue() : item.getRepTributado(); + if (repTributado.length() == 7 && repTributado.substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { + + String tipoPassagem = item.getTipoPassagem(); + + if (tipoPassagem == null) { + tipoPassagem = "E"; + } + + String key = tipoPassagem + item.getRepTributado().substring(3, 7); + + if (!aliquotaBaseCalculo.containsKey(key)) { + aliquotaBaseCalculo.put(key, BigDecimal.ZERO); + } + + BigDecimal soma = item.getValorItem().divide(BigDecimal.TEN.multiply(BigDecimal.TEN)); + aliquotaBaseCalculo.put(key, soma.add(aliquotaBaseCalculo.get(key))); + + } else if (repTributado.equals(SituacaoTributaria.NAO_TRIBUTADO.getValue())) { + + BigDecimal soma = item.getValorItem(); + totalICMSNaotributado = soma.toString(); + + if (totalICMSNaotributado.length() < 14) { + totalICMSNaotributado = StringHelper.preencherZeroEsquerda(totalICMSNaotributado, 14); + } + + } + + for (String key : aliquotaBaseCalculo.keySet()) { + aliquota = key.substring(1, 5); + + BigDecimal aliquotaCalc = BigDecimal.valueOf(Double.valueOf(aliquota) / UtiliteriasFiscal.CEM.doubleValue()); + aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); + + BigDecimal baseCalculo = aliquotaBaseCalculo.get(key); + baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); + + BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); + valorImposto = UtiliteriasFiscal.arredondar(valorImposto); + + imposto = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 14); + aliquota = UtiliteriasFiscal.formataZeroDecimal(aliquotaCalc, 14); + } + + boolean inconsistente = item.getInconsistencia() == null ? false : item.getInconsistencia(); + if (inconsistente) { + if (codProduto.indexOf("TA") >= 0) { + BigDecimal aliquotaCalc = item.getImpostoEstado() == null ? BigDecimal.ZERO : item.getImpostoEstado(); + aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); + + BigDecimal baseCalculo = valorItem; + baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); + + BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); + valorImposto = UtiliteriasFiscal.arredondar(valorImposto); + + imposto = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 14); + aliquota = UtiliteriasFiscal.formataZeroDecimal(aliquotaCalc, 14); + totalICMSIsento = null; + totalICMSNaotributado = null; + } + } + + } + if (StringUtils.isBlank(aliquota)) + aliquota = StringHelper.preencherZeroEsquerda("", 14); + + if (StringUtils.isBlank(imposto)) + imposto = StringHelper.preencherZeroEsquerda("", 14); + + if (StringUtils.isBlank(totalICMSIsento)) + totalICMSIsento = StringHelper.preencherZeroEsquerda("", 14); + + if (StringUtils.isBlank(totalICMSNaotributado)) + totalICMSNaotributado = StringHelper.preencherZeroEsquerda("", 14); + + resp.put("aliquota", aliquota); + resp.put("imposto", imposto); + resp.put("totalICMSIsento", totalICMSIsento); + resp.put("totalICMSNaotributado", totalICMSNaotributado); + + return resp; + } + + private String montarItensFiscais(ItemFiscalVO item, Integer seq, Integer seqItem) { + + String tipoPassagem = null; + + String repTributado = item.getRepTributado() == null ? SituacaoTributaria.NAO_TRIBUTADO.getValue() : item.getRepTributado(); + if (repTributado.length() == 7 && repTributado.substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { + tipoPassagem = item.getTipoPassagem(); + + if (tipoPassagem == null) + tipoPassagem = "E"; + + } else { + tipoPassagem = "E"; + } + + String numItem = StringHelper.preencherZeroEsquerda(seqItem.toString(), 3); + + String cfop = null; + if (tipoPassagem.equals("E")) { + cfop = StringHelper.preencherStringEspacoDireita("6357", 5); + } else if (tipoPassagem.equals("M")) { + cfop = StringHelper.preencherStringEspacoDireita("5357", 5); + } + + String codigoTES = StringHelper.preencherStringEsquerda(null, 3, "9"); + String codProduto = StringHelper.preencherStringEspacoEsquerda(item.getCodProduto(), 15); + String unidade = "UN"; + String quantidade = "001"; + + // TODO: A forma de enviar o valor do item é baseada no codProduto, pelo fato da FISCAL_R5 estar gravando os registros de tarifa errado + BigDecimal valorItem = BigDecimal.ZERO; + // VALIDA TARIFA + if (codProduto.indexOf("TA") >= 0) { + valorItem = item.getValorTarifa() == null ? valorItem : item.getValorTarifa(); + if (valorItem.equals(BigDecimal.ZERO)) + valorItem = BigDecimal.ONE.divide(UtiliteriasFiscal.CEM); + + // TAXA DE EMBARQUE + } else if (codProduto.indexOf("TX") >= 0) { + valorItem = item.getValorEmbarque() == null ? valorItem : item.getValorEmbarque(); + + // PEDAGIO + } else if (codProduto.indexOf("PE") >= 0) { + valorItem = item.getValorPedagio() == null ? valorItem : item.getValorPedagio(); + + // SEGURO + } else if (codProduto.indexOf("SE") >= 0) { + valorItem = item.getValorSeguro() == null ? valorItem : item.getValorSeguro(); + } + + String valorUnitario = null; + try { + valorItem = UtiliteriasFiscal.arredondar(valorItem); + valorUnitario = UtiliteriasFiscal.formataZeroDecimal(valorItem, 15); + item.setValorItem(new BigDecimal(valorUnitario)); + } catch (Exception e) { + log.error("ERROR: " + item.toString(), e); + valorUnitario = UtiliteriasFiscal.formataZeroDecimal(BigDecimal.ZERO, 15); + item.setValorItem(new BigDecimal(valorUnitario)); + } + + String valorTotal = valorUnitario; + String aliquotaItem = StringHelper.preencherZeroEsquerda("", 7); + String impostoItem = StringHelper.preencherZeroEsquerda("", 15); + String totalICMSIsentoItem = StringHelper.preencherZeroEsquerda("", 15); + String totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda("", 15); + + HashMap aliquotaItens = new HashMap(0); + + // Verificando se é um produto tributável. Formato: XXTYYYY (XX - Posicao / YYYY - Aliquota) + if (repTributado.length() == 7 && repTributado.substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { + + String key = tipoPassagem + item.getRepTributado().substring(3, 7); + + if (!aliquotaItens.containsKey(key)) { + aliquotaItens.put(key, BigDecimal.ZERO); + } + + BigDecimal soma = item.getValorItem().divide(BigDecimal.TEN.multiply(BigDecimal.TEN)); + aliquotaItens.put(key, soma.add(aliquotaItens.get(key))); + + } else if (repTributado.equals(SituacaoTributaria.NAO_TRIBUTADO.getValue())) { + + BigDecimal soma = item.getValorItem(); + totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda(soma.toString(), 15); + } + + for (String key : aliquotaItens.keySet()) { + aliquotaItem = key.substring(1, 5); + + BigDecimal aliquotaCalc = BigDecimal.valueOf(Double.valueOf(aliquotaItem) / UtiliteriasFiscal.CEM.doubleValue()); + aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); + + BigDecimal baseCalculo = aliquotaItens.get(key); + baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); + + BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); + valorImposto = UtiliteriasFiscal.arredondar(valorImposto); + + impostoItem = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 15); + aliquotaItem = UtiliteriasFiscal.formataZeroDecimal(null, 7); + } + + boolean inconsistente = item.getInconsistencia() == null ? false : item.getInconsistencia(); + if (inconsistente) { + if (codProduto.indexOf("TA") >= 0) { + BigDecimal aliquotaCalc = item.getImpostoEstado() == null ? BigDecimal.ZERO : item.getImpostoEstado(); + aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); + + BigDecimal baseCalculo = valorItem; + baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); + + BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); + valorImposto = UtiliteriasFiscal.arredondar(valorImposto); + + impostoItem = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 15); + aliquotaItem = UtiliteriasFiscal.formataZeroDecimal(null, 7); + totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda("", 15); + } + } + + String aliquotaPIS = StringHelper.preencherZeroEsquerda("", 7); + String valorPIS = StringHelper.preencherZeroEsquerda("", 15); + String aliquotaCofins = StringHelper.preencherZeroEsquerda("", 7); + String valorCofins = StringHelper.preencherZeroEsquerda("", 15); + String aliquotaCSLL = StringHelper.preencherZeroEsquerda("", 7); + String valorCSLL = StringHelper.preencherZeroEsquerda("", 15); + String aliquotaISS = StringHelper.preencherZeroEsquerda("", 7); + String valorISS = StringHelper.preencherZeroEsquerda("", 15); + + String numeroPDV = StringHelper.preencherStringEspacoDireita(item.getNumpdv(), 10); + String numeroSeriePDV = StringHelper.preencherStringEspacoDireita(item.getNumImpressora(), 20); + String modeloImpressora = StringHelper.preencherStringEspacoDireita(item.getModeloImpressora(), 40); + String numCaixa = StringHelper.preencherStringEspacoDireita(item.getNumCaixa(), 10); + String status = StringHelper.preencherStringEspacoEsquerda(item.getStatus(), 1); + + String coo = null; + String serie = null; + + coo = StringHelper.preencherStringEspacoDireita(item.getCoo(), 9); + serie = item.getNumImpressora(); + if (serie.length() >= 20) { + serie = serie.substring(17); + serie = StringHelper.preencherStringEspacoEsquerda(serie, 3); + } else { + serie = StringHelper.preencherStringEspacoEsquerda(null, 3); + } + + String brancos99 = StringHelper.preencherStringEspacoEsquerda(null, 99); + + seq++; + String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String itemDoc = UtiliteriasFiscal.itensDocumentoFiscal("2", numItem, cfop, codigoTES, codProduto, + unidade, quantidade, valorUnitario, valorTotal, aliquotaItem, impostoItem, + aliquotaPIS, valorPIS, aliquotaCofins, valorCofins, aliquotaCSLL, valorCSLL, + aliquotaISS, valorISS, totalICMSIsentoItem, totalICMSNaotributadoItem, + numeroPDV, numeroSeriePDV, modeloImpressora, numCaixa, status, coo, serie, + brancos99, sequencial); + return itemDoc; + + } + + private void grabarHeaderItens(PrintWriter gravarArq, String header, List itensDocs) { + gravarArq.print(header + UtiliteriasFiscal.QUEBRA_LINHA); + + for (String doc : itensDocs) { + gravarArq.print(doc + UtiliteriasFiscal.QUEBRA_LINHA); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java index eb78a893f..c8e08681b 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java @@ -1,261 +1,261 @@ -package com.rjconsultores.ventaboletos.utilerias.archivointegracion; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.StringHelper; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.SubItens; - -public class ArchivoIntegracionECFManual { - - private static final Logger log = LogManager.getLogger(ArchivoIntegracionECFManual.class); - - public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, List listManual) { - - try { - String nomeArquivo = "fiscal_ecf_manual_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - File arquivo = File.createTempFile(nomeArquivo, ".txt"); - - PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); - - Integer seq = 1; - - String cnpjFilial = empresa.getCnpj(); - String brancos371 = StringHelper.preencherStringEspacoEsquerda(null, 371); - String dataAgora = DateUtil.getStringDate(Calendar.getInstance().getTime(), UtiliteriasFiscal.DATE_FORMAT_FISCAL); - String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String abertura = UtiliteriasFiscal.aberturaDeArquivo("0", dataAgora, cnpjFilial, brancos371, sequencial); - gravarArq.print(abertura + UtiliteriasFiscal.QUEBRA_LINHA); - - Integer qtdDoc = 0; - Integer qtdItens = 0; - - inicio = DateUtil.inicioFecha(inicio); - fim = DateUtil.fimFecha(fim); - - List list = agruparItensFiscaisManual(listManual); - for (ImportacionManualFiscalVO imf : list) { - - qtdDoc++; - - String data = imf.getDataEmissao(); - - String coo = StringHelper.preencherZeroEsquerda(imf.getCoo(), 9); - String serie = StringHelper.preencherStringEspacoEsquerda(imf.getSerie(), 3); - String especie = StringHelper.preencherStringEspacoDireita("RMD", 5); - - String codigoCliente = StringHelper.preencherStringEsquerda(null, 6, "9"); - String filialCliente = StringHelper.preencherStringEsquerda(null, 2, "9"); - String condicaoPagamento = StringHelper.preencherStringEsquerda(null, 3, "9"); - - BigDecimal valorTotal = UtiliteriasFiscal.arredondar(calculaValorTotalECFManual(imf)); - String valorTotalDocumanto = UtiliteriasFiscal.formataEspacosDecimalDireita(valorTotal, 14); - String valorItens = valorTotalDocumanto; - - BigDecimal valorICMS = imf.getIcms() == null ? BigDecimal.ZERO : UtiliteriasFiscal.arredondar(imf.getIcms()); - String baseCalICMS = UtiliteriasFiscal.formataZeroDecimal(valorICMS, 14); - - BigDecimal aliquotaCalc = imf.getIcms() == null ? BigDecimal.ZERO : UtiliteriasFiscal.arredondar(imf.getIcms()); - BigDecimal baseCalculo = UtiliteriasFiscal.arredondar(imf.getValorTotal()); - BigDecimal valorImposto = UtiliteriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM))); - String valorTotalICMS = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 14); - - String valorPIS = StringHelper.preencherZeroEsquerda("", 14); - String valorCofins = StringHelper.preencherZeroEsquerda("", 14); - String valorCSLL = StringHelper.preencherZeroEsquerda("", 14); - String totalICMSIsento = StringHelper.preencherZeroEsquerda("", 14); - String totalICMSNaotributado = StringHelper.preencherZeroEsquerda("", 14); - - String origenUf = StringHelper.preencherStringEspacoEsquerda(imf.getOrigenUf(), 2); - String origen = imf.getOrigenId().toString(); - if (origen.length() > 2) { - origen = origen.substring(2); - origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); - } else { - origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); - } - - String destinoUf = StringHelper.preencherStringEspacoEsquerda(imf.getDestinoUf(), 2); - String destino = imf.getDestinoId().toString(); - if (destino.length() > 2) { - destino = destino.substring(2); - destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); - } else { - destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); - } - - String subSerie = StringHelper.preencherStringEspacoEsquerda(imf.getSubSerie(), 2); - String aidf = StringHelper.preencherStringEspacoEsquerda(imf.getAidf(), 30); - String status = StringHelper.preencherStringEspacoEsquerda(imf.getStatus(), 1); - String claseServicio = StringHelper.preencherStringEspacoDireita(imf.getClaseServicio(), 30); - String brancos170 = StringHelper.preencherStringEspacoEsquerda(null, 170); - - seq++; - sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String header = UtiliteriasFiscal.headerDocumentoFiscal("1", data, cnpjFilial, coo, serie, especie, codigoCliente, - filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, baseCalICMS, valorTotalICMS, - valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origenUf, origen, - destinoUf, destino, subSerie, - aidf, status, null, null, brancos170, claseServicio, sequencial); - gravarArq.print(header + UtiliteriasFiscal.QUEBRA_LINHA); - - for (String itemDoc : montarItensFiscaisManual(imf, imf.getSubItens(), seq)) { - - qtdItens++; - gravarArq.print(itemDoc + UtiliteriasFiscal.QUEBRA_LINHA); - seq++; - } - } - - seq++; - - String qtdeDocGerados = StringHelper.preencherZeroEsquerda(qtdDoc.toString(), 6); - String qtdeItensDocGerados = StringHelper.preencherZeroEsquerda(qtdItens.toString(), 6); - String brancos381 = StringHelper.preencherStringEspacoEsquerda(null, 381); - sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String fechamento = UtiliteriasFiscal.fechamentoDeArquivo("3", qtdeDocGerados, qtdeItensDocGerados, brancos381, sequencial); - gravarArq.print(fechamento + UtiliteriasFiscal.QUEBRA_LINHA); - - gravarArq.close(); - return arquivo; - - } catch (IOException e) { - log.error("", e); - } - - return null; - } - - private BigDecimal calculaValorTotalECFManual(ImportacionManualFiscalVO imf) { - BigDecimal valorTotal = BigDecimal.ZERO; - valorTotal = valorTotal.add(imf.getValorTotal()); - valorTotal = valorTotal.add(imf.getImporteoutros() == null ? BigDecimal.ZERO : imf.getImporteoutros()); - valorTotal = valorTotal.add(imf.getImportepedagio() == null ? BigDecimal.ZERO : imf.getImportepedagio()); - valorTotal = valorTotal.add(imf.getImporteseguro() == null ? BigDecimal.ZERO : imf.getImporteseguro()); - valorTotal = valorTotal.add(imf.getImportetaxaembarque() == null ? BigDecimal.ZERO : imf.getImportetaxaembarque()); - return valorTotal; - } - - private List montarItensFiscaisManual(ImportacionManualFiscalVO imf, List itensFiscais, Integer seq) { - - List itensDocs = new ArrayList(); - Integer num = 0; - - for (SubItens item : itensFiscais) { - - num++; - String numItem = StringHelper.preencherZeroEsquerda(num.toString(), 3); - - String cfop = null; - if (imf.getEstadoIdOrigen() != imf.getEstadoIdDestino()) { - cfop = StringHelper.preencherStringEspacoDireita("6357", 5); - } else { - cfop = StringHelper.preencherStringEspacoDireita("5357", 5); - } - - String codigoTES = StringHelper.preencherStringEsquerda(null, 3, "9"); - String prod = imf.getCodProduto() == null ? item.getCodProduto() : imf.getCodProduto(); - String codProduto = StringHelper.preencherStringEspacoEsquerda(prod, 15); - - String unidade = "UN"; - String quantidade = "001"; - - BigDecimal valorItem = UtiliteriasFiscal.arredondar(item.getValor()); - String valorUnitario = UtiliteriasFiscal.formataZeroDecimal(valorItem, 15); - String valorTotal = UtiliteriasFiscal.formataZeroDecimal(valorItem, 15); - - String aliquotaItem = UtiliteriasFiscal.formataZeroDecimal(null, 7); - String impostoItem = UtiliteriasFiscal.formataZeroDecimal(null, 15); - String totalICMSIsentoItem = StringHelper.preencherZeroEsquerda("", 15); - String totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda("", 15); - - if (codProduto.indexOf("TA") >= 0) { - BigDecimal aliquotaCalc = UtiliteriasFiscal.arredondar(imf.getIcms() == null ? BigDecimal.ZERO : imf.getIcms()); - BigDecimal baseCalculo = UtiliteriasFiscal.arredondar(imf.getValorTotal() == null ? BigDecimal.ZERO : imf.getValorTotal()); - BigDecimal valorImposto = UtiliteriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM))); - impostoItem = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 15); - } else { - totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda(valorTotal, 15); - } - - String aliquotaPIS = StringHelper.preencherZeroEsquerda("", 7); - String valorPIS = StringHelper.preencherZeroEsquerda("", 15); - String aliquotaCofins = StringHelper.preencherZeroEsquerda("", 7); - String valorCofins = StringHelper.preencherZeroEsquerda("", 15); - String aliquotaCSLL = StringHelper.preencherZeroEsquerda("", 7); - String valorCSLL = StringHelper.preencherZeroEsquerda("", 15); - String aliquotaISS = StringHelper.preencherZeroEsquerda("", 7); - String valorISS = StringHelper.preencherZeroEsquerda("", 15); - - String numeroPDV = StringHelper.preencherStringEspacoDireita(imf.getNumpdv(), 10); - String numeroSeriePDV = StringHelper.preencherStringEspacoDireita(imf.getNumImpressora(), 20); - String modeloImpressora = StringHelper.preencherStringEspacoDireita(imf.getModeloImpressora(), 40); - String numCaixa = StringHelper.preencherStringEspacoDireita(imf.getNumCaixa(), 10); - String status = StringHelper.preencherStringEspacoEsquerda(imf.getStatus(), 1); - - seq++; - String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - String brancos111 = StringHelper.preencherStringEspacoDireita(null, 111); - - String itemDoc = UtiliteriasFiscal.itensDocumentoFiscal("2", numItem, cfop, codigoTES, codProduto, - unidade, quantidade, valorUnitario, valorTotal, aliquotaItem, impostoItem, - aliquotaPIS, valorPIS, aliquotaCofins, valorCofins, aliquotaCSLL, valorCSLL, - aliquotaISS, valorISS, totalICMSIsentoItem, totalICMSNaotributadoItem, - numeroPDV, numeroSeriePDV, modeloImpressora, numCaixa, status, null, null, - brancos111, sequencial); - itensDocs.add(itemDoc); - } - - return itensDocs; - } - - private List agruparItensFiscaisManual(List list) { - - List aux = new ArrayList(); - - for (ImportacionManualFiscalVO imf : list) { - - List itens = new ArrayList(); - if (imf.getImportepedagio() != null) { - itens.add(new SubItens(imf.getImportepedagio(), "00000000000-PE")); - } - - if (imf.getImporteseguro() != null) { - if (imf.getImporteseguro().signum() > BigDecimal.ZERO.intValue()) - itens.add(new SubItens(imf.getImporteseguro(), "00000000000-SE")); - } - - if (imf.getImportetaxaembarque() != null) { - itens.add(new SubItens(imf.getImportetaxaembarque(), "00000000000-TX")); - } - - if (imf.getValorTotal() != null) { - itens.add(new SubItens(imf.getValorTotal(), "00000000000-TA")); - } - - imf.setSubItens(itens); - aux.add(imf); - } - - return aux; - } -} +package com.rjconsultores.ventaboletos.utilerias.archivointegracion; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.StringHelper; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionManualFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.SubItens; + +public class ArchivoIntegracionECFManual { + + private static final Logger log = LogManager.getLogger(ArchivoIntegracionECFManual.class); + + public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, List listManual) { + + try { + String nomeArquivo = "fiscal_ecf_manual_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + File arquivo = File.createTempFile(nomeArquivo, ".txt"); + + PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); + + Integer seq = 1; + + String cnpjFilial = empresa.getCnpj(); + String brancos371 = StringHelper.preencherStringEspacoEsquerda(null, 371); + String dataAgora = DateUtil.getStringDate(Calendar.getInstance().getTime(), UtiliteriasFiscal.DATE_FORMAT_FISCAL); + String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String abertura = UtiliteriasFiscal.aberturaDeArquivo("0", dataAgora, cnpjFilial, brancos371, sequencial); + gravarArq.print(abertura + UtiliteriasFiscal.QUEBRA_LINHA); + + Integer qtdDoc = 0; + Integer qtdItens = 0; + + inicio = DateUtil.inicioFecha(inicio); + fim = DateUtil.fimFecha(fim); + + List list = agruparItensFiscaisManual(listManual); + for (ImportacionManualFiscalVO imf : list) { + + qtdDoc++; + + String data = imf.getDataEmissao(); + + String coo = StringHelper.preencherZeroEsquerda(imf.getCoo(), 9); + String serie = StringHelper.preencherStringEspacoEsquerda(imf.getSerie(), 3); + String especie = StringHelper.preencherStringEspacoDireita("RMD", 5); + + String codigoCliente = StringHelper.preencherStringEsquerda(null, 6, "9"); + String filialCliente = StringHelper.preencherStringEsquerda(null, 2, "9"); + String condicaoPagamento = StringHelper.preencherStringEsquerda(null, 3, "9"); + + BigDecimal valorTotal = UtiliteriasFiscal.arredondar(calculaValorTotalECFManual(imf)); + String valorTotalDocumanto = UtiliteriasFiscal.formataEspacosDecimalDireita(valorTotal, 14); + String valorItens = valorTotalDocumanto; + + BigDecimal valorICMS = imf.getIcms() == null ? BigDecimal.ZERO : UtiliteriasFiscal.arredondar(imf.getIcms()); + String baseCalICMS = UtiliteriasFiscal.formataZeroDecimal(valorICMS, 14); + + BigDecimal aliquotaCalc = imf.getIcms() == null ? BigDecimal.ZERO : UtiliteriasFiscal.arredondar(imf.getIcms()); + BigDecimal baseCalculo = UtiliteriasFiscal.arredondar(imf.getValorTotal()); + BigDecimal valorImposto = UtiliteriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM))); + String valorTotalICMS = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 14); + + String valorPIS = StringHelper.preencherZeroEsquerda("", 14); + String valorCofins = StringHelper.preencherZeroEsquerda("", 14); + String valorCSLL = StringHelper.preencherZeroEsquerda("", 14); + String totalICMSIsento = StringHelper.preencherZeroEsquerda("", 14); + String totalICMSNaotributado = StringHelper.preencherZeroEsquerda("", 14); + + String origenUf = StringHelper.preencherStringEspacoEsquerda(imf.getOrigenUf(), 2); + String origen = imf.getOrigenId().toString(); + if (origen.length() > 2) { + origen = origen.substring(2); + origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); + } else { + origen = StringHelper.preencherStringEspacoEsquerda(origen, 5); + } + + String destinoUf = StringHelper.preencherStringEspacoEsquerda(imf.getDestinoUf(), 2); + String destino = imf.getDestinoId().toString(); + if (destino.length() > 2) { + destino = destino.substring(2); + destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); + } else { + destino = StringHelper.preencherStringEspacoEsquerda(destino, 5); + } + + String subSerie = StringHelper.preencherStringEspacoEsquerda(imf.getSubSerie(), 2); + String aidf = StringHelper.preencherStringEspacoEsquerda(imf.getAidf(), 30); + String status = StringHelper.preencherStringEspacoEsquerda(imf.getStatus(), 1); + String claseServicio = StringHelper.preencherStringEspacoDireita(imf.getClaseServicio(), 30); + String brancos170 = StringHelper.preencherStringEspacoEsquerda(null, 170); + + seq++; + sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String header = UtiliteriasFiscal.headerDocumentoFiscal("1", data, cnpjFilial, coo, serie, especie, codigoCliente, + filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, baseCalICMS, valorTotalICMS, + valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origenUf, origen, + destinoUf, destino, subSerie, + aidf, status, null, null, brancos170, claseServicio, sequencial); + gravarArq.print(header + UtiliteriasFiscal.QUEBRA_LINHA); + + for (String itemDoc : montarItensFiscaisManual(imf, imf.getSubItens(), seq)) { + + qtdItens++; + gravarArq.print(itemDoc + UtiliteriasFiscal.QUEBRA_LINHA); + seq++; + } + } + + seq++; + + String qtdeDocGerados = StringHelper.preencherZeroEsquerda(qtdDoc.toString(), 6); + String qtdeItensDocGerados = StringHelper.preencherZeroEsquerda(qtdItens.toString(), 6); + String brancos381 = StringHelper.preencherStringEspacoEsquerda(null, 381); + sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String fechamento = UtiliteriasFiscal.fechamentoDeArquivo("3", qtdeDocGerados, qtdeItensDocGerados, brancos381, sequencial); + gravarArq.print(fechamento + UtiliteriasFiscal.QUEBRA_LINHA); + + gravarArq.close(); + return arquivo; + + } catch (IOException e) { + log.error("", e); + } + + return null; + } + + private BigDecimal calculaValorTotalECFManual(ImportacionManualFiscalVO imf) { + BigDecimal valorTotal = BigDecimal.ZERO; + valorTotal = valorTotal.add(imf.getValorTotal()); + valorTotal = valorTotal.add(imf.getImporteoutros() == null ? BigDecimal.ZERO : imf.getImporteoutros()); + valorTotal = valorTotal.add(imf.getImportepedagio() == null ? BigDecimal.ZERO : imf.getImportepedagio()); + valorTotal = valorTotal.add(imf.getImporteseguro() == null ? BigDecimal.ZERO : imf.getImporteseguro()); + valorTotal = valorTotal.add(imf.getImportetaxaembarque() == null ? BigDecimal.ZERO : imf.getImportetaxaembarque()); + return valorTotal; + } + + private List montarItensFiscaisManual(ImportacionManualFiscalVO imf, List itensFiscais, Integer seq) { + + List itensDocs = new ArrayList(); + Integer num = 0; + + for (SubItens item : itensFiscais) { + + num++; + String numItem = StringHelper.preencherZeroEsquerda(num.toString(), 3); + + String cfop = null; + if (imf.getEstadoIdOrigen() != imf.getEstadoIdDestino()) { + cfop = StringHelper.preencherStringEspacoDireita("6357", 5); + } else { + cfop = StringHelper.preencherStringEspacoDireita("5357", 5); + } + + String codigoTES = StringHelper.preencherStringEsquerda(null, 3, "9"); + String prod = imf.getCodProduto() == null ? item.getCodProduto() : imf.getCodProduto(); + String codProduto = StringHelper.preencherStringEspacoEsquerda(prod, 15); + + String unidade = "UN"; + String quantidade = "001"; + + BigDecimal valorItem = UtiliteriasFiscal.arredondar(item.getValor()); + String valorUnitario = UtiliteriasFiscal.formataZeroDecimal(valorItem, 15); + String valorTotal = UtiliteriasFiscal.formataZeroDecimal(valorItem, 15); + + String aliquotaItem = UtiliteriasFiscal.formataZeroDecimal(null, 7); + String impostoItem = UtiliteriasFiscal.formataZeroDecimal(null, 15); + String totalICMSIsentoItem = StringHelper.preencherZeroEsquerda("", 15); + String totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda("", 15); + + if (codProduto.indexOf("TA") >= 0) { + BigDecimal aliquotaCalc = UtiliteriasFiscal.arredondar(imf.getIcms() == null ? BigDecimal.ZERO : imf.getIcms()); + BigDecimal baseCalculo = UtiliteriasFiscal.arredondar(imf.getValorTotal() == null ? BigDecimal.ZERO : imf.getValorTotal()); + BigDecimal valorImposto = UtiliteriasFiscal.arredondar(baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM))); + impostoItem = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 15); + } else { + totalICMSNaotributadoItem = StringHelper.preencherZeroEsquerda(valorTotal, 15); + } + + String aliquotaPIS = StringHelper.preencherZeroEsquerda("", 7); + String valorPIS = StringHelper.preencherZeroEsquerda("", 15); + String aliquotaCofins = StringHelper.preencherZeroEsquerda("", 7); + String valorCofins = StringHelper.preencherZeroEsquerda("", 15); + String aliquotaCSLL = StringHelper.preencherZeroEsquerda("", 7); + String valorCSLL = StringHelper.preencherZeroEsquerda("", 15); + String aliquotaISS = StringHelper.preencherZeroEsquerda("", 7); + String valorISS = StringHelper.preencherZeroEsquerda("", 15); + + String numeroPDV = StringHelper.preencherStringEspacoDireita(imf.getNumpdv(), 10); + String numeroSeriePDV = StringHelper.preencherStringEspacoDireita(imf.getNumImpressora(), 20); + String modeloImpressora = StringHelper.preencherStringEspacoDireita(imf.getModeloImpressora(), 40); + String numCaixa = StringHelper.preencherStringEspacoDireita(imf.getNumCaixa(), 10); + String status = StringHelper.preencherStringEspacoEsquerda(imf.getStatus(), 1); + + seq++; + String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + String brancos111 = StringHelper.preencherStringEspacoDireita(null, 111); + + String itemDoc = UtiliteriasFiscal.itensDocumentoFiscal("2", numItem, cfop, codigoTES, codProduto, + unidade, quantidade, valorUnitario, valorTotal, aliquotaItem, impostoItem, + aliquotaPIS, valorPIS, aliquotaCofins, valorCofins, aliquotaCSLL, valorCSLL, + aliquotaISS, valorISS, totalICMSIsentoItem, totalICMSNaotributadoItem, + numeroPDV, numeroSeriePDV, modeloImpressora, numCaixa, status, null, null, + brancos111, sequencial); + itensDocs.add(itemDoc); + } + + return itensDocs; + } + + private List agruparItensFiscaisManual(List list) { + + List aux = new ArrayList(); + + for (ImportacionManualFiscalVO imf : list) { + + List itens = new ArrayList(); + if (imf.getImportepedagio() != null) { + itens.add(new SubItens(imf.getImportepedagio(), "00000000000-PE")); + } + + if (imf.getImporteseguro() != null) { + if (imf.getImporteseguro().signum() > BigDecimal.ZERO.intValue()) + itens.add(new SubItens(imf.getImporteseguro(), "00000000000-SE")); + } + + if (imf.getImportetaxaembarque() != null) { + itens.add(new SubItens(imf.getImportetaxaembarque(), "00000000000-TX")); + } + + if (imf.getValorTotal() != null) { + itens.add(new SubItens(imf.getValorTotal(), "00000000000-TA")); + } + + imf.setSubItens(itens); + aux.add(imf); + } + + return aux; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFReducaoZ.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFReducaoZ.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFReducaoZ.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFReducaoZ.java index 70c86c409..9bca0d5c6 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFReducaoZ.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFReducaoZ.java @@ -1,221 +1,221 @@ -package com.rjconsultores.ventaboletos.utilerias.archivointegracion; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.AgpImpressoraEcfVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.AgpImpressoraReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.TipoPendencia; - -public class ArchivoIntegracionECFReducaoZ { - - private List listAgpEcf; - private List listAgpRedZ; - - private List listEcfValidos; - private List listRedZValidos; - - private List listEcfInvalidos; - private List listRedZInvalidos; - - public ArchivoIntegracionECFReducaoZ() { - listAgpEcf = new ArrayList(); - listAgpRedZ = new ArrayList(); - - listEcfValidos = new ArrayList(); - listRedZValidos = new ArrayList(); - - listEcfInvalidos = new ArrayList(); - listRedZInvalidos = new ArrayList(); - } - - public void importacionFiscalECFValidaReducaoZ(List listEcf, List listRedZ) { - - listAgpEcf = agruparEcf(listEcf); - listAgpRedZ = agruparReducaoZ(listRedZ); - - for (AgpImpressoraReducaoZVO agpRedZ : listAgpRedZ) { - - AgpImpressoraEcfVO agpEcf = buscaRegistroEcf(agpRedZ.getNumserie20(), agpRedZ.getDatamov()); - if (agpEcf == null) { - - for (ImportacionFiscalReducaoZVO reZ : agpRedZ.getItens()) { - reZ.setInconsistente(true); - listRedZInvalidos.add(reZ); - } - continue; - } - - BigDecimal valorEcf = BigDecimal.ZERO; - for (ImportacionFiscalVO ecf : agpEcf.getItens()) { - BigDecimal valorBoleto = UtiliteriasFiscal.arredondar(UtiliteriasFiscal.valorTotalItensECF(ecf)); - valorEcf = valorEcf.add(valorBoleto); - } - - String valorFormatado = UtiliteriasFiscal.formataZeroDecimal(valorEcf, 0); - valorEcf = new BigDecimal(valorFormatado); - - BigDecimal valorRedZ = agpRedZ.getItens().get(0).getVendabrutadiaria(); - for (ImportacionFiscalReducaoZVO reZ : agpRedZ.getItens()) { - - String tipoMovimento = reZ.getAliquota(); - if (tipoMovimento.equals(SituacaoTributaria.CANCELADO.getValue()) || - tipoMovimento.equals(SituacaoTributaria.DESCONTO.getValue())) { - BigDecimal valorTrib = reZ.getImposto(); - valorRedZ = valorRedZ.subtract(valorTrib); - } - } - - if (valorRedZ.compareTo(valorEcf) == 0) { - for (ImportacionFiscalVO ecf : agpEcf.getItens()) { - listEcfValidos.add(ecf); - } - - for (ImportacionFiscalReducaoZVO reZ : agpRedZ.getItens()) { - listRedZValidos.add(reZ); - } - - } else { - - if (valorRedZ.compareTo(valorEcf) > 0) { - - for (ImportacionFiscalVO ecf : agpEcf.getItens()) { - listEcfValidos.add(ecf); - } - - BigDecimal dif = valorRedZ.subtract(valorEcf); - for (ImportacionFiscalReducaoZVO reZv : agpRedZ.getItens()) { - BigDecimal vendabrutadiaria = reZv.getVendabrutadiaria().subtract(dif); - reZv.setVendabrutadiaria(vendabrutadiaria); - listRedZValidos.add(reZv); - } - - ImportacionFiscalReducaoZVO reZ = new ImportacionFiscalReducaoZVO(agpRedZ.getItens().get(0)); - reZ.setStatus(TipoPendencia.DIF_RED_Z.toString()); - reZ.setAliquota("01"); - reZ.setImposto(dif); - reZ.setVendabrutadiaria(dif); - reZ.setInconsistente(true); - - listRedZInvalidos.add(reZ); - - } else if (valorRedZ.compareTo(valorEcf) < 0) { - - for (ImportacionFiscalVO ecf : agpEcf.getItens()) { - listEcfValidos.add(ecf); - } - - BigDecimal dif = valorEcf.subtract(valorRedZ); - for (ImportacionFiscalReducaoZVO reZv : agpRedZ.getItens()) { - BigDecimal vendabrutadiaria = reZv.getVendabrutadiaria().add(dif); - reZv.setVendabrutadiaria(vendabrutadiaria); - listRedZValidos.add(reZv); - } - - ImportacionFiscalReducaoZVO reZ = new ImportacionFiscalReducaoZVO(agpRedZ.getItens().get(0)); - reZ.setStatus(TipoPendencia.DIF_ECF.toString()); - reZ.setAliquota("01"); - reZ.setImposto(dif); - reZ.setVendabrutadiaria(dif); - reZ.setInconsistente(true); - listRedZInvalidos.add(reZ); - } - } - } - } - - private AgpImpressoraEcfVO buscaRegistroEcf(String numserie20, String datamov) { - try { - int index = listAgpEcf.indexOf(new AgpImpressoraEcfVO(numserie20, datamov)); - return listAgpEcf.get(index); - } catch (ArrayIndexOutOfBoundsException e) { - } - return null; - } - - private List agruparReducaoZ(List list) { - - List agps = new ArrayList(); - - AgpImpressoraReducaoZVO atual = null; - for (ImportacionFiscalReducaoZVO redz : list) { - AgpImpressoraReducaoZVO novo = new AgpImpressoraReducaoZVO(redz.getNumserie20(), redz.getDatamov()); - - if (atual == null) { - atual = novo; - atual.getItens().add(redz); - - } else if (atual.equals(novo)) { - atual.getItens().add(redz); - - } else { - agps.add(atual); - atual = novo; - atual.getItens().add(redz); - } - } - - if (atual != null) - agps.add(atual); - - return agps; - } - - private List agruparEcf(List list) { - - List agps = new ArrayList(); - - AgpImpressoraEcfVO atual = null; - for (ImportacionFiscalVO ecf : list) { - AgpImpressoraEcfVO novo = new AgpImpressoraEcfVO(ecf.getNumImpressora(), ecf.getDataEmissao()); - - if (atual == null) { - atual = novo; - atual.getItens().add(ecf); - - } else if (atual.equals(novo)) { - atual.getItens().add(ecf); - - } else { - agps.add(atual); - atual = novo; - atual.getItens().add(ecf); - } - } - - if (atual != null) - agps.add(atual); - - return agps; - } - - public List getListAgpEcf() { - return listAgpEcf; - } - - public List getListAgpRedZ() { - return listAgpRedZ; - } - - public List getListEcfValidos() { - return listEcfValidos; - } - - public List getListRedZValidos() { - return listRedZValidos; - } - - public List getListEcfInvalidos() { - return listEcfInvalidos; - } - - public List getListRedZInvalidos() { - return listRedZInvalidos; - } - -} +package com.rjconsultores.ventaboletos.utilerias.archivointegracion; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.AgpImpressoraEcfVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.AgpImpressoraReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.TipoPendencia; + +public class ArchivoIntegracionECFReducaoZ { + + private List listAgpEcf; + private List listAgpRedZ; + + private List listEcfValidos; + private List listRedZValidos; + + private List listEcfInvalidos; + private List listRedZInvalidos; + + public ArchivoIntegracionECFReducaoZ() { + listAgpEcf = new ArrayList(); + listAgpRedZ = new ArrayList(); + + listEcfValidos = new ArrayList(); + listRedZValidos = new ArrayList(); + + listEcfInvalidos = new ArrayList(); + listRedZInvalidos = new ArrayList(); + } + + public void importacionFiscalECFValidaReducaoZ(List listEcf, List listRedZ) { + + listAgpEcf = agruparEcf(listEcf); + listAgpRedZ = agruparReducaoZ(listRedZ); + + for (AgpImpressoraReducaoZVO agpRedZ : listAgpRedZ) { + + AgpImpressoraEcfVO agpEcf = buscaRegistroEcf(agpRedZ.getNumserie20(), agpRedZ.getDatamov()); + if (agpEcf == null) { + + for (ImportacionFiscalReducaoZVO reZ : agpRedZ.getItens()) { + reZ.setInconsistente(true); + listRedZInvalidos.add(reZ); + } + continue; + } + + BigDecimal valorEcf = BigDecimal.ZERO; + for (ImportacionFiscalVO ecf : agpEcf.getItens()) { + BigDecimal valorBoleto = UtiliteriasFiscal.arredondar(UtiliteriasFiscal.valorTotalItensECF(ecf)); + valorEcf = valorEcf.add(valorBoleto); + } + + String valorFormatado = UtiliteriasFiscal.formataZeroDecimal(valorEcf, 0); + valorEcf = new BigDecimal(valorFormatado); + + BigDecimal valorRedZ = agpRedZ.getItens().get(0).getVendabrutadiaria(); + for (ImportacionFiscalReducaoZVO reZ : agpRedZ.getItens()) { + + String tipoMovimento = reZ.getAliquota(); + if (tipoMovimento.equals(SituacaoTributaria.CANCELADO.getValue()) || + tipoMovimento.equals(SituacaoTributaria.DESCONTO.getValue())) { + BigDecimal valorTrib = reZ.getImposto(); + valorRedZ = valorRedZ.subtract(valorTrib); + } + } + + if (valorRedZ.compareTo(valorEcf) == 0) { + for (ImportacionFiscalVO ecf : agpEcf.getItens()) { + listEcfValidos.add(ecf); + } + + for (ImportacionFiscalReducaoZVO reZ : agpRedZ.getItens()) { + listRedZValidos.add(reZ); + } + + } else { + + if (valorRedZ.compareTo(valorEcf) > 0) { + + for (ImportacionFiscalVO ecf : agpEcf.getItens()) { + listEcfValidos.add(ecf); + } + + BigDecimal dif = valorRedZ.subtract(valorEcf); + for (ImportacionFiscalReducaoZVO reZv : agpRedZ.getItens()) { + BigDecimal vendabrutadiaria = reZv.getVendabrutadiaria().subtract(dif); + reZv.setVendabrutadiaria(vendabrutadiaria); + listRedZValidos.add(reZv); + } + + ImportacionFiscalReducaoZVO reZ = new ImportacionFiscalReducaoZVO(agpRedZ.getItens().get(0)); + reZ.setStatus(TipoPendencia.DIF_RED_Z.toString()); + reZ.setAliquota("01"); + reZ.setImposto(dif); + reZ.setVendabrutadiaria(dif); + reZ.setInconsistente(true); + + listRedZInvalidos.add(reZ); + + } else if (valorRedZ.compareTo(valorEcf) < 0) { + + for (ImportacionFiscalVO ecf : agpEcf.getItens()) { + listEcfValidos.add(ecf); + } + + BigDecimal dif = valorEcf.subtract(valorRedZ); + for (ImportacionFiscalReducaoZVO reZv : agpRedZ.getItens()) { + BigDecimal vendabrutadiaria = reZv.getVendabrutadiaria().add(dif); + reZv.setVendabrutadiaria(vendabrutadiaria); + listRedZValidos.add(reZv); + } + + ImportacionFiscalReducaoZVO reZ = new ImportacionFiscalReducaoZVO(agpRedZ.getItens().get(0)); + reZ.setStatus(TipoPendencia.DIF_ECF.toString()); + reZ.setAliquota("01"); + reZ.setImposto(dif); + reZ.setVendabrutadiaria(dif); + reZ.setInconsistente(true); + listRedZInvalidos.add(reZ); + } + } + } + } + + private AgpImpressoraEcfVO buscaRegistroEcf(String numserie20, String datamov) { + try { + int index = listAgpEcf.indexOf(new AgpImpressoraEcfVO(numserie20, datamov)); + return listAgpEcf.get(index); + } catch (ArrayIndexOutOfBoundsException e) { + } + return null; + } + + private List agruparReducaoZ(List list) { + + List agps = new ArrayList(); + + AgpImpressoraReducaoZVO atual = null; + for (ImportacionFiscalReducaoZVO redz : list) { + AgpImpressoraReducaoZVO novo = new AgpImpressoraReducaoZVO(redz.getNumserie20(), redz.getDatamov()); + + if (atual == null) { + atual = novo; + atual.getItens().add(redz); + + } else if (atual.equals(novo)) { + atual.getItens().add(redz); + + } else { + agps.add(atual); + atual = novo; + atual.getItens().add(redz); + } + } + + if (atual != null) + agps.add(atual); + + return agps; + } + + private List agruparEcf(List list) { + + List agps = new ArrayList(); + + AgpImpressoraEcfVO atual = null; + for (ImportacionFiscalVO ecf : list) { + AgpImpressoraEcfVO novo = new AgpImpressoraEcfVO(ecf.getNumImpressora(), ecf.getDataEmissao()); + + if (atual == null) { + atual = novo; + atual.getItens().add(ecf); + + } else if (atual.equals(novo)) { + atual.getItens().add(ecf); + + } else { + agps.add(atual); + atual = novo; + atual.getItens().add(ecf); + } + } + + if (atual != null) + agps.add(atual); + + return agps; + } + + public List getListAgpEcf() { + return listAgpEcf; + } + + public List getListAgpRedZ() { + return listAgpRedZ; + } + + public List getListEcfValidos() { + return listEcfValidos; + } + + public List getListRedZValidos() { + return listRedZValidos; + } + + public List getListEcfInvalidos() { + return listEcfInvalidos; + } + + public List getListRedZInvalidos() { + return listRedZInvalidos; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java similarity index 98% rename from src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java index 2eae952c0..f247c5af3 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java @@ -1,95 +1,95 @@ -package com.rjconsultores.ventaboletos.utilerias.archivointegracion; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.util.Calendar; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.StringHelper; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; - -public class ArchivoIntegracionNaoFiscal { - - private static final Logger log = LogManager.getLogger(ArchivoIntegracionNaoFiscal.class); - - private String cnpjFilial; - private Integer sequencial = 0; - - private List importacionNaoFiscalVOs; - - private StringBuilder getAberturaArquivo() { - StringBuilder aberturaArquivo = new StringBuilder(); - aberturaArquivo.append("0") //Identificador Registro = "0" - .append(DateUtil.getStringCurrentDate("yyyyMMdd")) //Data geração arquivo - .append(StringHelper.preencherStringEspacoEsquerda(cnpjFilial.replace("[^0-9]", ""), 14)) //Cnpj filial - .append(StringHelper.preencherStringEspacoEsquerda(null, 371)) //Brancos - .append(StringHelper.preencherZeroEsquerda((++sequencial).toString(), 6)) //Sequencial - .append(StringHelper.QUEBRA_LINHA); - return aberturaArquivo; - } - - private StringBuilder getHeaderArquivo() { - StringBuilder headerArquivo = new StringBuilder(); - for (ImportacionNaoFiscalVO importacionNaoFiscalVO : importacionNaoFiscalVOs) { - headerArquivo.append("1") //Identificador Registro = "1" - .append(DateUtil.getStringDate(importacionNaoFiscalVO.getFechorvta(),"yyyyMMdd")) //Data emissão documento - .append(StringHelper.preencherStringEspacoEsquerda(cnpjFilial.replace("[^0-9]", ""), 14)) //Cnpj filial - .append(StringHelper.preencherStringEspacoEsquerda(importacionNaoFiscalVO.getNumeroDocumento(), 9)) //Numero do Documento - .append(StringHelper.preencherStringEspacoEsquerda(null, 3)) //Série - .append(StringHelper.preencherStringEspacoEsquerda("SVP", 5)) //Prefixo = "SVP" - .append(StringHelper.preencherStringEsquerda(null, 6, "9")) //Codigo Cliente "999999" - .append(StringHelper.preencherStringEsquerda(null, 2, "9")) //Filial cliente="99" - .append(StringHelper.preencherStringEsquerda(null, 3, "9")) //condição pagamento = "999" - .append(UtiliteriasFiscal.formataZeroDecimal(importacionNaoFiscalVO.getTotal(), 2, 14)) //Valor Total documento - .append(StringHelper.preencherStringEspacoEsquerda("REC", 3)) //Tipo = "REC" - .append(StringHelper.preencherStringEspacoEsquerda(importacionNaoFiscalVO.getTipoeventoextraId()+"", 10)) //Natureza - .append(StringHelper.preencherStringEspacoEsquerda(null, 316)) //Brancos - .append(StringHelper.preencherZeroEsquerda((++sequencial).toString(), 6)) //Sequencial - .append(StringHelper.QUEBRA_LINHA); - } - return headerArquivo; - } - - private StringBuilder getFechamentoArquivo() { - StringBuilder fechamentoArquivo = new StringBuilder(); - fechamentoArquivo.append("3") //Identificador Registro = "3" - .append(StringHelper.preencherZeroEsquerda((importacionNaoFiscalVOs.size())+"", 6)) //Qtde de Documentos gerados = 1 - .append(StringHelper.preencherZeroEsquerda((importacionNaoFiscalVOs.size())+"", 6)) //Qtde de Itens Documentos gerados = 2 - .append(StringHelper.preencherStringEspacoEsquerda(null, 381)) //Brancos - .append(StringHelper.preencherZeroEsquerda((++sequencial).toString(), 6)); //Sequencial - return fechamentoArquivo; - } - - public File gerarArquivo(String cnpjFilial, List importacionNaoFiscalVOs) throws BusinessException { - try { - String nomeArquivo = UsuarioLogado.getUsuarioLogado().getNombusuario() + "_" + Calendar.getInstance().getTime().getTime() + "_" + "naofiscal"; - File arquivo = File.createTempFile(nomeArquivo, ".tmp"); - PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); - - /* Gerando arquivo */ - this.cnpjFilial = cnpjFilial; - this.importacionNaoFiscalVOs = importacionNaoFiscalVOs; - gravarArq.print(getAberturaArquivo()); - gravarArq.print(getHeaderArquivo()); - gravarArq.print(getFechamentoArquivo()); - - gravarArq.close(); - - return arquivo; - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new BusinessException(e.getMessage(), e); - } - } - -} +package com.rjconsultores.ventaboletos.utilerias.archivointegracion; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.StringHelper; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; + +public class ArchivoIntegracionNaoFiscal { + + private static final Logger log = LogManager.getLogger(ArchivoIntegracionNaoFiscal.class); + + private String cnpjFilial; + private Integer sequencial = 0; + + private List importacionNaoFiscalVOs; + + private StringBuilder getAberturaArquivo() { + StringBuilder aberturaArquivo = new StringBuilder(); + aberturaArquivo.append("0") //Identificador Registro = "0" + .append(DateUtil.getStringCurrentDate("yyyyMMdd")) //Data geração arquivo + .append(StringHelper.preencherStringEspacoEsquerda(cnpjFilial.replace("[^0-9]", ""), 14)) //Cnpj filial + .append(StringHelper.preencherStringEspacoEsquerda(null, 371)) //Brancos + .append(StringHelper.preencherZeroEsquerda((++sequencial).toString(), 6)) //Sequencial + .append(StringHelper.QUEBRA_LINHA); + return aberturaArquivo; + } + + private StringBuilder getHeaderArquivo() { + StringBuilder headerArquivo = new StringBuilder(); + for (ImportacionNaoFiscalVO importacionNaoFiscalVO : importacionNaoFiscalVOs) { + headerArquivo.append("1") //Identificador Registro = "1" + .append(DateUtil.getStringDate(importacionNaoFiscalVO.getFechorvta(),"yyyyMMdd")) //Data emissão documento + .append(StringHelper.preencherStringEspacoEsquerda(cnpjFilial.replace("[^0-9]", ""), 14)) //Cnpj filial + .append(StringHelper.preencherStringEspacoEsquerda(importacionNaoFiscalVO.getNumeroDocumento(), 9)) //Numero do Documento + .append(StringHelper.preencherStringEspacoEsquerda(null, 3)) //Série + .append(StringHelper.preencherStringEspacoEsquerda("SVP", 5)) //Prefixo = "SVP" + .append(StringHelper.preencherStringEsquerda(null, 6, "9")) //Codigo Cliente "999999" + .append(StringHelper.preencherStringEsquerda(null, 2, "9")) //Filial cliente="99" + .append(StringHelper.preencherStringEsquerda(null, 3, "9")) //condição pagamento = "999" + .append(UtiliteriasFiscal.formataZeroDecimal(importacionNaoFiscalVO.getTotal(), 2, 14)) //Valor Total documento + .append(StringHelper.preencherStringEspacoEsquerda("REC", 3)) //Tipo = "REC" + .append(StringHelper.preencherStringEspacoEsquerda(importacionNaoFiscalVO.getTipoeventoextraId()+"", 10)) //Natureza + .append(StringHelper.preencherStringEspacoEsquerda(null, 316)) //Brancos + .append(StringHelper.preencherZeroEsquerda((++sequencial).toString(), 6)) //Sequencial + .append(StringHelper.QUEBRA_LINHA); + } + return headerArquivo; + } + + private StringBuilder getFechamentoArquivo() { + StringBuilder fechamentoArquivo = new StringBuilder(); + fechamentoArquivo.append("3") //Identificador Registro = "3" + .append(StringHelper.preencherZeroEsquerda((importacionNaoFiscalVOs.size())+"", 6)) //Qtde de Documentos gerados = 1 + .append(StringHelper.preencherZeroEsquerda((importacionNaoFiscalVOs.size())+"", 6)) //Qtde de Itens Documentos gerados = 2 + .append(StringHelper.preencherStringEspacoEsquerda(null, 381)) //Brancos + .append(StringHelper.preencherZeroEsquerda((++sequencial).toString(), 6)); //Sequencial + return fechamentoArquivo; + } + + public File gerarArquivo(String cnpjFilial, List importacionNaoFiscalVOs) throws BusinessException { + try { + String nomeArquivo = UsuarioLogado.getUsuarioLogado().getNombusuario() + "_" + Calendar.getInstance().getTime().getTime() + "_" + "naofiscal"; + File arquivo = File.createTempFile(nomeArquivo, ".tmp"); + PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); + + /* Gerando arquivo */ + this.cnpjFilial = cnpjFilial; + this.importacionNaoFiscalVOs = importacionNaoFiscalVOs; + gravarArq.print(getAberturaArquivo()); + gravarArq.print(getHeaderArquivo()); + gravarArq.print(getFechamentoArquivo()); + + gravarArq.close(); + + return arquivo; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new BusinessException(e.getMessage(), e); + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java index fae7125ed..9a046457d 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java @@ -1,191 +1,191 @@ -package com.rjconsultores.ventaboletos.utilerias.archivointegracion; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.StringHelper; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; -import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; - -public class ArchivoIntegracionReducaoZ { - - private static final Logger log = LogManager.getLogger(ArchivoIntegracionReducaoZ.class); - - public File importacionReducaoZ(Date inicio, Date fim, Empresa empresa, boolean isPendencias, List listReducao) { - - try { - String nomeArquivo = "fiscal_reducao_z_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - if (isPendencias) - nomeArquivo = "fiscal_pendencia_reducao_z_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); - - File arquivo = File.createTempFile(nomeArquivo, ".txt"); - - PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); - - Integer seq = 1; - - String cnpjFilial = StringHelper.retornaSomenteNumeros(empresa.getCnpj() == null ? StringHelper.preencherStringEspacoEsquerda(null, 14) : empresa.getCnpj()); - String brancos371 = StringHelper.preencherStringEspacoEsquerda(null, 371); - String dataAgora = DateUtil.getStringDate(Calendar.getInstance().getTime(), UtiliteriasFiscal.DATE_FORMAT_FISCAL); - String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String abertura = UtiliteriasFiscal.aberturaDeArquivo("0", dataAgora, cnpjFilial, brancos371, sequencial); - gravarArq.print(abertura + UtiliteriasFiscal.QUEBRA_LINHA); - - List list = null; - if (isPendencias) { - list = listReducao; - } else { - list = agruparReducaoZ(listReducao); - } - - for (ImportacionFiscalReducaoZVO ifrZ : list) { - - String dataMovimento = ifrZ.getDatamov(); - String cnpj = StringHelper.retornaSomenteNumeros(ifrZ.getCnpj() == null ? StringHelper.preencherStringEspacoEsquerda(null, 14) : ifrZ.getCnpj()); - - String impAliquota = ifrZ.getAliquota() == null ? "" : ifrZ.getAliquota().substring(0, 2); - String numRelatorio = StringHelper.preencherZeroEsquerda(impAliquota, 6); - - String numPDV = StringHelper.preencherStringEspacoEsquerda(ifrZ.getNumpdv(), 10); - String numSeriePDV = StringHelper.preencherStringEspacoEsquerda(ifrZ.getNumserie20(), 20); - String numReducaoZ = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCrz(), 5); - - String gtInicial = StringHelper.preencherZeroEsquerda(ifrZ.getGtInicial().toString(), 18); - String gtFinal = StringHelper.preencherZeroEsquerda(ifrZ.getGtFinal().toString(), 18); - - String docFiscalInic = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCooinicial(), 9); - String docFiscalFinal = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCoofinal(), 9); - - String valorCancel = StringHelper.preencherZeroEsquerda("", 8); - String valorContabil = StringHelper.preencherZeroEsquerda(ifrZ.getVendabrutadiaria().toString(), 14); - - String subtributaria = StringHelper.preencherZeroEsquerda("", 14); - String descontos = StringHelper.preencherZeroEsquerda("", 14); - String isento = StringHelper.preencherZeroEsquerda("", 14); - - String valorNaoTributado = ifrZ.getValorNaoTributado() == null ? "" : ifrZ.getValorNaoTributado().toString(); - String naoTributado = StringHelper.preencherZeroEsquerda(valorNaoTributado, 14); - - String aliquota = StringHelper.preencherZeroEsquerda("", 14); - if (ifrZ.getAliquota().length() == 7 && ifrZ.getAliquota().substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { - aliquota = ifrZ.getAliquota().substring(3, 7); - aliquota = StringHelper.preencherZeroEsquerda(aliquota, 14); - } - - String aliquota2 = StringHelper.preencherZeroEsquerda("", 14); - String aliquota3 = StringHelper.preencherZeroEsquerda("", 14); - String aliquota4 = StringHelper.preencherZeroEsquerda("", 14); - - String coo = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCoo(), 6); - String outrosRecebimentos = StringHelper.preencherZeroEsquerda("", 14); - - BigDecimal aliquotaCalc = BigDecimal.valueOf(Double.valueOf(aliquota) / UtiliteriasFiscal.CEM.doubleValue()); - aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); - - BigDecimal baseCalculo = UtiliteriasFiscal.arredondar(ifrZ.getImposto().divide(UtiliteriasFiscal.CEM)); - baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); - - BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); - valorImposto = UtiliteriasFiscal.arredondar(valorImposto); - String impostoDebitado = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 13); - - String dataReducaoZ = ifrZ.getDatareducao(); - String horaReducaoZ = ifrZ.getHorareducao(); - - String valorDocFiscal = StringHelper.preencherZeroEsquerda(ifrZ.getImposto().toString(), 13); - - String cro = StringHelper.preencherZeroEsquerda(ifrZ.getCro(), 4); - - String brancos = StringHelper.preencherStringEspacoEsquerda(null, 68); - String status = StringHelper.preencherStringEspacoEsquerda(null, 10); - if (isPendencias) - status = StringHelper.preencherStringEspacoEsquerda(ifrZ.getStatus(), 10); - - seq++; - sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String redZ = UtiliteriasFiscal.reducaoZ("1", dataMovimento, cnpj, numRelatorio, numPDV, numSeriePDV, numReducaoZ, - gtInicial, gtFinal, docFiscalInic, docFiscalFinal, valorCancel, valorContabil, subtributaria, - descontos, isento, naoTributado, aliquota, aliquota2, aliquota3, aliquota4, coo, outrosRecebimentos, - impostoDebitado, dataReducaoZ, horaReducaoZ, valorDocFiscal, cro, status, brancos, sequencial); - gravarArq.print(redZ + UtiliteriasFiscal.QUEBRA_LINHA); - } - - Integer qtdeDoc = seq - 1; - seq++; - - String qtdeDocGerados = StringHelper.preencherZeroEsquerda(qtdeDoc.toString(), 6); - String brancos387 = StringHelper.preencherStringEspacoEsquerda(null, 387); - sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); - - String fechamento = UtiliteriasFiscal.fechamentoDeArquivo("3", qtdeDocGerados, null, brancos387, sequencial); - gravarArq.print(fechamento + UtiliteriasFiscal.QUEBRA_LINHA); - - gravarArq.close(); - return arquivo; - - } catch (IOException e) { - log.error("", e); - } - - return null; - } - - private List agruparReducaoZ(List list) { - - List aux = new ArrayList(); - - BigDecimal valorNaoTributado = null; - BigDecimal valorNaoIncluido = BigDecimal.ZERO; - - ImportacionFiscalReducaoZVO item = null; - - for (ImportacionFiscalReducaoZVO ifr : list) { - - if (!ifr.equals(item)) { - valorNaoIncluido = BigDecimal.ZERO; - item = ifr; - } - - String tipoMovimento = ifr.getAliquota(); - if (tipoMovimento.equals(SituacaoTributaria.CANCELADO.getValue()) || - tipoMovimento.equals(SituacaoTributaria.DESCONTO.getValue())) { - - valorNaoIncluido = valorNaoIncluido.add(ifr.getImposto()); - ifr.setValorNaoIncluido(valorNaoIncluido); - - } else if (tipoMovimento.equals(SituacaoTributaria.NAO_TRIBUTADO.getValue())) { - valorNaoTributado = ifr.getImposto(); - } else { - - ifr.setValorNaoTributado(valorNaoTributado); - ifr.setValorNaoIncluido(valorNaoIncluido); - - BigDecimal valorReducaoZ = ifr.getVendabrutadiaria().subtract(valorNaoIncluido); - ifr.setVendabrutadiaria(valorReducaoZ); - - aux.add(ifr); - - } - } - - return aux; - } - -} +package com.rjconsultores.ventaboletos.utilerias.archivointegracion; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.StringHelper; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionFiscalReducaoZVO; +import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; + +public class ArchivoIntegracionReducaoZ { + + private static final Logger log = LogManager.getLogger(ArchivoIntegracionReducaoZ.class); + + public File importacionReducaoZ(Date inicio, Date fim, Empresa empresa, boolean isPendencias, List listReducao) { + + try { + String nomeArquivo = "fiscal_reducao_z_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + if (isPendencias) + nomeArquivo = "fiscal_pendencia_reducao_z_" + DateUtil.getStringDate(Calendar.getInstance().getTime(), "yyyyMMddhhmmss"); + + File arquivo = File.createTempFile(nomeArquivo, ".txt"); + + PrintWriter gravarArq = new PrintWriter(new OutputStreamWriter(new FileOutputStream(arquivo), Constantes.UTF_8)); + + Integer seq = 1; + + String cnpjFilial = StringHelper.retornaSomenteNumeros(empresa.getCnpj() == null ? StringHelper.preencherStringEspacoEsquerda(null, 14) : empresa.getCnpj()); + String brancos371 = StringHelper.preencherStringEspacoEsquerda(null, 371); + String dataAgora = DateUtil.getStringDate(Calendar.getInstance().getTime(), UtiliteriasFiscal.DATE_FORMAT_FISCAL); + String sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String abertura = UtiliteriasFiscal.aberturaDeArquivo("0", dataAgora, cnpjFilial, brancos371, sequencial); + gravarArq.print(abertura + UtiliteriasFiscal.QUEBRA_LINHA); + + List list = null; + if (isPendencias) { + list = listReducao; + } else { + list = agruparReducaoZ(listReducao); + } + + for (ImportacionFiscalReducaoZVO ifrZ : list) { + + String dataMovimento = ifrZ.getDatamov(); + String cnpj = StringHelper.retornaSomenteNumeros(ifrZ.getCnpj() == null ? StringHelper.preencherStringEspacoEsquerda(null, 14) : ifrZ.getCnpj()); + + String impAliquota = ifrZ.getAliquota() == null ? "" : ifrZ.getAliquota().substring(0, 2); + String numRelatorio = StringHelper.preencherZeroEsquerda(impAliquota, 6); + + String numPDV = StringHelper.preencherStringEspacoEsquerda(ifrZ.getNumpdv(), 10); + String numSeriePDV = StringHelper.preencherStringEspacoEsquerda(ifrZ.getNumserie20(), 20); + String numReducaoZ = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCrz(), 5); + + String gtInicial = StringHelper.preencherZeroEsquerda(ifrZ.getGtInicial().toString(), 18); + String gtFinal = StringHelper.preencherZeroEsquerda(ifrZ.getGtFinal().toString(), 18); + + String docFiscalInic = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCooinicial(), 9); + String docFiscalFinal = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCoofinal(), 9); + + String valorCancel = StringHelper.preencherZeroEsquerda("", 8); + String valorContabil = StringHelper.preencherZeroEsquerda(ifrZ.getVendabrutadiaria().toString(), 14); + + String subtributaria = StringHelper.preencherZeroEsquerda("", 14); + String descontos = StringHelper.preencherZeroEsquerda("", 14); + String isento = StringHelper.preencherZeroEsquerda("", 14); + + String valorNaoTributado = ifrZ.getValorNaoTributado() == null ? "" : ifrZ.getValorNaoTributado().toString(); + String naoTributado = StringHelper.preencherZeroEsquerda(valorNaoTributado, 14); + + String aliquota = StringHelper.preencherZeroEsquerda("", 14); + if (ifrZ.getAliquota().length() == 7 && ifrZ.getAliquota().substring(2, 3).equals(SituacaoTributaria.TRIBUTADO.getValue())) { + aliquota = ifrZ.getAliquota().substring(3, 7); + aliquota = StringHelper.preencherZeroEsquerda(aliquota, 14); + } + + String aliquota2 = StringHelper.preencherZeroEsquerda("", 14); + String aliquota3 = StringHelper.preencherZeroEsquerda("", 14); + String aliquota4 = StringHelper.preencherZeroEsquerda("", 14); + + String coo = StringHelper.preencherStringEspacoEsquerda(ifrZ.getCoo(), 6); + String outrosRecebimentos = StringHelper.preencherZeroEsquerda("", 14); + + BigDecimal aliquotaCalc = BigDecimal.valueOf(Double.valueOf(aliquota) / UtiliteriasFiscal.CEM.doubleValue()); + aliquotaCalc = UtiliteriasFiscal.arredondar(aliquotaCalc); + + BigDecimal baseCalculo = UtiliteriasFiscal.arredondar(ifrZ.getImposto().divide(UtiliteriasFiscal.CEM)); + baseCalculo = UtiliteriasFiscal.arredondar(baseCalculo); + + BigDecimal valorImposto = baseCalculo.multiply(aliquotaCalc.divide(UtiliteriasFiscal.CEM)); + valorImposto = UtiliteriasFiscal.arredondar(valorImposto); + String impostoDebitado = UtiliteriasFiscal.formataZeroDecimal(valorImposto, 13); + + String dataReducaoZ = ifrZ.getDatareducao(); + String horaReducaoZ = ifrZ.getHorareducao(); + + String valorDocFiscal = StringHelper.preencherZeroEsquerda(ifrZ.getImposto().toString(), 13); + + String cro = StringHelper.preencherZeroEsquerda(ifrZ.getCro(), 4); + + String brancos = StringHelper.preencherStringEspacoEsquerda(null, 68); + String status = StringHelper.preencherStringEspacoEsquerda(null, 10); + if (isPendencias) + status = StringHelper.preencherStringEspacoEsquerda(ifrZ.getStatus(), 10); + + seq++; + sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String redZ = UtiliteriasFiscal.reducaoZ("1", dataMovimento, cnpj, numRelatorio, numPDV, numSeriePDV, numReducaoZ, + gtInicial, gtFinal, docFiscalInic, docFiscalFinal, valorCancel, valorContabil, subtributaria, + descontos, isento, naoTributado, aliquota, aliquota2, aliquota3, aliquota4, coo, outrosRecebimentos, + impostoDebitado, dataReducaoZ, horaReducaoZ, valorDocFiscal, cro, status, brancos, sequencial); + gravarArq.print(redZ + UtiliteriasFiscal.QUEBRA_LINHA); + } + + Integer qtdeDoc = seq - 1; + seq++; + + String qtdeDocGerados = StringHelper.preencherZeroEsquerda(qtdeDoc.toString(), 6); + String brancos387 = StringHelper.preencherStringEspacoEsquerda(null, 387); + sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6); + + String fechamento = UtiliteriasFiscal.fechamentoDeArquivo("3", qtdeDocGerados, null, brancos387, sequencial); + gravarArq.print(fechamento + UtiliteriasFiscal.QUEBRA_LINHA); + + gravarArq.close(); + return arquivo; + + } catch (IOException e) { + log.error("", e); + } + + return null; + } + + private List agruparReducaoZ(List list) { + + List aux = new ArrayList(); + + BigDecimal valorNaoTributado = null; + BigDecimal valorNaoIncluido = BigDecimal.ZERO; + + ImportacionFiscalReducaoZVO item = null; + + for (ImportacionFiscalReducaoZVO ifr : list) { + + if (!ifr.equals(item)) { + valorNaoIncluido = BigDecimal.ZERO; + item = ifr; + } + + String tipoMovimento = ifr.getAliquota(); + if (tipoMovimento.equals(SituacaoTributaria.CANCELADO.getValue()) || + tipoMovimento.equals(SituacaoTributaria.DESCONTO.getValue())) { + + valorNaoIncluido = valorNaoIncluido.add(ifr.getImposto()); + ifr.setValorNaoIncluido(valorNaoIncluido); + + } else if (tipoMovimento.equals(SituacaoTributaria.NAO_TRIBUTADO.getValue())) { + valorNaoTributado = ifr.getImposto(); + } else { + + ifr.setValorNaoTributado(valorNaoTributado); + ifr.setValorNaoIncluido(valorNaoIncluido); + + BigDecimal valorReducaoZ = ifr.getVendabrutadiaria().subtract(valorNaoIncluido); + ifr.setVendabrutadiaria(valorReducaoZ); + + aux.add(ifr); + + } + } + + return aux; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ValidaIntegracionECFRedZxls.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ValidaIntegracionECFRedZxls.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ValidaIntegracionECFRedZxls.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ValidaIntegracionECFRedZxls.java index 5e68d14e6..14771c5d7 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ValidaIntegracionECFRedZxls.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ValidaIntegracionECFRedZxls.java @@ -1,410 +1,410 @@ -package com.rjconsultores.ventaboletos.utilerias.archivointegracion; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; - -public class ValidaIntegracionECFRedZxls { - - private List listEcf; - private List listRedZ; - - public static void main(String[] args) { - ValidaIntegracionECFRedZxls ss = new ValidaIntegracionECFRedZxls(); - ss.executar(); - } - - private void executar() { - - listEcf = verificaArquivoEcf(); - listRedZ = verificaArquivoRedZ(); - - try { - - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet firstSheet = workbook.createSheet(); - - int linha = 0; - - // Cabecalho - HSSFRow row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue("EMPRESA"); - row.createCell(1).setCellValue("DATA_MOVIMENTO"); - row.createCell(2).setCellValue("SERIE"); - row.createCell(3).setCellValue("PDV"); - row.createCell(4).setCellValue("NUMERO_BILHETES"); - row.createCell(5).setCellValue("VALOR_ECF"); - row.createCell(6).setCellValue("VALOR_REDUCAO_Z"); - row.createCell(7).setCellValue("STATUS_DIFERENÇA"); - - for (FiscalVO ecf : listEcf) { - - RedZVO redz = buscaRegistroRedZ(ecf.getNumserie20(), ecf.getDatamov()); - boolean isValoresIguais = true; - - row = firstSheet.createRow(linha++); - row.createCell(0).setCellValue("UTIL"); - row.createCell(1).setCellValue(ecf.getDatamov()); - row.createCell(2).setCellValue(redz.getNumserie20()); - row.createCell(3).setCellValue(ecf.getPdv()); - row.createCell(4).setCellValue(ecf.getQuantidade()); - row.createCell(5).setCellValue(ecf.getValorTotal().doubleValue()); - row.createCell(6).setCellValue(redz.getValorTotal().doubleValue()); - - if (!redz.getValorTotal().equals(ecf.getValorTotal())) { - isValoresIguais = false; - } - - if (isValoresIguais) { - row.createCell(7).setCellValue("VALIDO"); - System.out.println(" VALIDO ---- SERIE: " + redz.getNumserie20() + " DATAMOV: " + ecf.getDatamov() + " VALOR ECF: " + ecf.getValorTotal() + " VALOR RED Z: " + redz.getValorTotal() + " CONT: " + ecf.getQuantidade() + " PDV: " + ecf.getPdv()); - } else { - row.createCell(7).setCellValue("INVALIDO"); - System.out.println(" !!! INVALIDO ---- SERIE: " + redz.getNumserie20() + " DATAMOV: " + ecf.getDatamov() + " VALOR ECF: " + ecf.getValorTotal() + " VALOR RED Z: " + redz.getValorTotal() + " CONT: " + ecf.getQuantidade() + " PDV: " + ecf.getPdv()); - } - - } - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - workbook.write(bos); - - File arquivo = new File("C:\\Users\\rjgw\\Desktop\\dif.xls"); - - FileOutputStream fos = new FileOutputStream(arquivo); - fos.write(bos.toByteArray()); - fos.close(); - - } catch (IOException e) { - e.printStackTrace(); - } - } - - private RedZVO buscaRegistroRedZ(String numserie20, String datamov) { - try { - int index = listRedZ.indexOf(new RedZVO(datamov, numserie20)); - return listRedZ.get(index); - } catch (ArrayIndexOutOfBoundsException e) { - } - return null; - } - - public List verificaArquivoRedZ() { - - List list = new ArrayList(); - - File arquivoTxt = new File("C:\\Users\\rjgw\\Desktop\\fiscal_reducao_z_201606240529438877750410577735828.txt"); - BufferedReader br; - - try { - br = new BufferedReader(new FileReader(arquivoTxt)); - String linha = br.readLine(); - - RedZVO atual = null; - while (linha != null) { - - if (linha.startsWith("1")) { - - String datamov = linha.substring(1, 9).trim(); - String numserie20 = linha.substring(39, 60).trim(); - RedZVO novo = new RedZVO(datamov, numserie20); - novo.setPdv(linha.substring(56, 60).trim()); - - String valor = linha.substring(128, 140).trim(); - try { - novo.setValorTotal(new BigDecimal(valor)); - } catch (Exception e) { - } - - if (atual == null) { - atual = novo; - - } else if (atual.equals(novo)) { - - } else { - list.add(atual); - atual = novo; - - } - } - - linha = br.readLine(); - } - - list.add(atual); - - br.close(); - - return list; - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - return null; - } - - public List verificaArquivoEcf() { - - List list = new ArrayList(); - - File arquivoTxt = new File("C:\\Users\\rjgw\\Desktop\\fiscal_ecf_201606240529405088610479025318030.txt"); - BufferedReader br; - - try { - br = new BufferedReader(new FileReader(arquivoTxt)); - String linha = br.readLine(); - int cont = 0; - - FiscalVO atual = null; - while (linha != null) { - - if (linha.startsWith("1")) { - - String datamov = linha.substring(1, 9).trim(); - String pdv = linha.substring(32, 35).trim(); - FiscalVO novo = new FiscalVO(datamov, pdv); - - String valor = linha.substring(56, 70).trim(); - - if (atual == null) { - atual = novo; - atual.soma(valor); - cont++; - - } else if (atual.equals(novo)) { - atual.soma(valor); - cont++; - } else { - atual.setQuantidade(cont); - list.add(atual); - - cont = 0; - - atual = novo; - atual.soma(valor); - cont++; - } - } - - if (linha.startsWith("2")) { - atual.setNumserie20(linha.substring(212, 232).trim()); - } - - linha = br.readLine(); - } - - list.add(atual); - - br.close(); - - return list; - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - return null; - } - - public class RedZVO { - private String datamov; - private String pdv; - private String numserie20; - private BigDecimal valorTotal; - - public RedZVO(String datamov, String numserie20) { - this.datamov = datamov; - this.numserie20 = numserie20; - this.valorTotal = BigDecimal.ZERO; - } - - public void soma(String valor) { - BigDecimal vl = new BigDecimal(valor); - this.valorTotal = valorTotal.add(vl); - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public String getNumserie20() { - return numserie20; - } - - public void setNumserie20(String numserie20) { - this.numserie20 = numserie20; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public String getPdv() { - return pdv; - } - - public void setPdv(String pdv) { - this.pdv = pdv; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + getOuterType().hashCode(); - result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); - result = prime * result + ((numserie20 == null) ? 0 : numserie20.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - RedZVO other = (RedZVO) obj; - if (!getOuterType().equals(other.getOuterType())) - return false; - if (datamov == null) { - if (other.datamov != null) - return false; - } else if (!datamov.equals(other.datamov)) - return false; - if (numserie20 == null) { - if (other.numserie20 != null) - return false; - } else if (!numserie20.equals(other.numserie20)) - return false; - return true; - } - - private ValidaIntegracionECFRedZxls getOuterType() { - return ValidaIntegracionECFRedZxls.this; - } - - } - - public class FiscalVO { - private String datamov; - private String pdv; - private String numserie20; - private BigDecimal valorTotal; - private int quantidade; - - public FiscalVO(String datamov, String pdv) { - super(); - this.datamov = datamov; - this.pdv = pdv; - this.valorTotal = BigDecimal.ZERO; - this.quantidade = 0; - } - - public void soma(String valor) { - BigDecimal vl = new BigDecimal(valor); - this.valorTotal = valorTotal.add(vl); - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public String getNumserie20() { - return numserie20; - } - - public void setNumserie20(String numserie20) { - this.numserie20 = numserie20; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public int getQuantidade() { - return quantidade; - } - - public void setQuantidade(int quantidade) { - this.quantidade = quantidade; - } - - public String getPdv() { - return pdv; - } - - public void setPdv(String pdv) { - this.pdv = pdv; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + getOuterType().hashCode(); - result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); - result = prime * result + ((pdv == null) ? 0 : pdv.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - FiscalVO other = (FiscalVO) obj; - if (!getOuterType().equals(other.getOuterType())) - return false; - if (datamov == null) { - if (other.datamov != null) - return false; - } else if (!datamov.equals(other.datamov)) - return false; - if (pdv == null) { - if (other.pdv != null) - return false; - } else if (!pdv.equals(other.pdv)) - return false; - return true; - } - - private ValidaIntegracionECFRedZxls getOuterType() { - return ValidaIntegracionECFRedZxls.this; - } - - } -} +package com.rjconsultores.ventaboletos.utilerias.archivointegracion; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; + +public class ValidaIntegracionECFRedZxls { + + private List listEcf; + private List listRedZ; + + public static void main(String[] args) { + ValidaIntegracionECFRedZxls ss = new ValidaIntegracionECFRedZxls(); + ss.executar(); + } + + private void executar() { + + listEcf = verificaArquivoEcf(); + listRedZ = verificaArquivoRedZ(); + + try { + + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet firstSheet = workbook.createSheet(); + + int linha = 0; + + // Cabecalho + HSSFRow row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue("EMPRESA"); + row.createCell(1).setCellValue("DATA_MOVIMENTO"); + row.createCell(2).setCellValue("SERIE"); + row.createCell(3).setCellValue("PDV"); + row.createCell(4).setCellValue("NUMERO_BILHETES"); + row.createCell(5).setCellValue("VALOR_ECF"); + row.createCell(6).setCellValue("VALOR_REDUCAO_Z"); + row.createCell(7).setCellValue("STATUS_DIFERENÇA"); + + for (FiscalVO ecf : listEcf) { + + RedZVO redz = buscaRegistroRedZ(ecf.getNumserie20(), ecf.getDatamov()); + boolean isValoresIguais = true; + + row = firstSheet.createRow(linha++); + row.createCell(0).setCellValue("UTIL"); + row.createCell(1).setCellValue(ecf.getDatamov()); + row.createCell(2).setCellValue(redz.getNumserie20()); + row.createCell(3).setCellValue(ecf.getPdv()); + row.createCell(4).setCellValue(ecf.getQuantidade()); + row.createCell(5).setCellValue(ecf.getValorTotal().doubleValue()); + row.createCell(6).setCellValue(redz.getValorTotal().doubleValue()); + + if (!redz.getValorTotal().equals(ecf.getValorTotal())) { + isValoresIguais = false; + } + + if (isValoresIguais) { + row.createCell(7).setCellValue("VALIDO"); + System.out.println(" VALIDO ---- SERIE: " + redz.getNumserie20() + " DATAMOV: " + ecf.getDatamov() + " VALOR ECF: " + ecf.getValorTotal() + " VALOR RED Z: " + redz.getValorTotal() + " CONT: " + ecf.getQuantidade() + " PDV: " + ecf.getPdv()); + } else { + row.createCell(7).setCellValue("INVALIDO"); + System.out.println(" !!! INVALIDO ---- SERIE: " + redz.getNumserie20() + " DATAMOV: " + ecf.getDatamov() + " VALOR ECF: " + ecf.getValorTotal() + " VALOR RED Z: " + redz.getValorTotal() + " CONT: " + ecf.getQuantidade() + " PDV: " + ecf.getPdv()); + } + + } + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + workbook.write(bos); + + File arquivo = new File("C:\\Users\\rjgw\\Desktop\\dif.xls"); + + FileOutputStream fos = new FileOutputStream(arquivo); + fos.write(bos.toByteArray()); + fos.close(); + + } catch (IOException e) { + e.printStackTrace(); + } + } + + private RedZVO buscaRegistroRedZ(String numserie20, String datamov) { + try { + int index = listRedZ.indexOf(new RedZVO(datamov, numserie20)); + return listRedZ.get(index); + } catch (ArrayIndexOutOfBoundsException e) { + } + return null; + } + + public List verificaArquivoRedZ() { + + List list = new ArrayList(); + + File arquivoTxt = new File("C:\\Users\\rjgw\\Desktop\\fiscal_reducao_z_201606240529438877750410577735828.txt"); + BufferedReader br; + + try { + br = new BufferedReader(new FileReader(arquivoTxt)); + String linha = br.readLine(); + + RedZVO atual = null; + while (linha != null) { + + if (linha.startsWith("1")) { + + String datamov = linha.substring(1, 9).trim(); + String numserie20 = linha.substring(39, 60).trim(); + RedZVO novo = new RedZVO(datamov, numserie20); + novo.setPdv(linha.substring(56, 60).trim()); + + String valor = linha.substring(128, 140).trim(); + try { + novo.setValorTotal(new BigDecimal(valor)); + } catch (Exception e) { + } + + if (atual == null) { + atual = novo; + + } else if (atual.equals(novo)) { + + } else { + list.add(atual); + atual = novo; + + } + } + + linha = br.readLine(); + } + + list.add(atual); + + br.close(); + + return list; + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + } + + public List verificaArquivoEcf() { + + List list = new ArrayList(); + + File arquivoTxt = new File("C:\\Users\\rjgw\\Desktop\\fiscal_ecf_201606240529405088610479025318030.txt"); + BufferedReader br; + + try { + br = new BufferedReader(new FileReader(arquivoTxt)); + String linha = br.readLine(); + int cont = 0; + + FiscalVO atual = null; + while (linha != null) { + + if (linha.startsWith("1")) { + + String datamov = linha.substring(1, 9).trim(); + String pdv = linha.substring(32, 35).trim(); + FiscalVO novo = new FiscalVO(datamov, pdv); + + String valor = linha.substring(56, 70).trim(); + + if (atual == null) { + atual = novo; + atual.soma(valor); + cont++; + + } else if (atual.equals(novo)) { + atual.soma(valor); + cont++; + } else { + atual.setQuantidade(cont); + list.add(atual); + + cont = 0; + + atual = novo; + atual.soma(valor); + cont++; + } + } + + if (linha.startsWith("2")) { + atual.setNumserie20(linha.substring(212, 232).trim()); + } + + linha = br.readLine(); + } + + list.add(atual); + + br.close(); + + return list; + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + } + + public class RedZVO { + private String datamov; + private String pdv; + private String numserie20; + private BigDecimal valorTotal; + + public RedZVO(String datamov, String numserie20) { + this.datamov = datamov; + this.numserie20 = numserie20; + this.valorTotal = BigDecimal.ZERO; + } + + public void soma(String valor) { + BigDecimal vl = new BigDecimal(valor); + this.valorTotal = valorTotal.add(vl); + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public String getNumserie20() { + return numserie20; + } + + public void setNumserie20(String numserie20) { + this.numserie20 = numserie20; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public String getPdv() { + return pdv; + } + + public void setPdv(String pdv) { + this.pdv = pdv; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + getOuterType().hashCode(); + result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); + result = prime * result + ((numserie20 == null) ? 0 : numserie20.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + RedZVO other = (RedZVO) obj; + if (!getOuterType().equals(other.getOuterType())) + return false; + if (datamov == null) { + if (other.datamov != null) + return false; + } else if (!datamov.equals(other.datamov)) + return false; + if (numserie20 == null) { + if (other.numserie20 != null) + return false; + } else if (!numserie20.equals(other.numserie20)) + return false; + return true; + } + + private ValidaIntegracionECFRedZxls getOuterType() { + return ValidaIntegracionECFRedZxls.this; + } + + } + + public class FiscalVO { + private String datamov; + private String pdv; + private String numserie20; + private BigDecimal valorTotal; + private int quantidade; + + public FiscalVO(String datamov, String pdv) { + super(); + this.datamov = datamov; + this.pdv = pdv; + this.valorTotal = BigDecimal.ZERO; + this.quantidade = 0; + } + + public void soma(String valor) { + BigDecimal vl = new BigDecimal(valor); + this.valorTotal = valorTotal.add(vl); + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public String getNumserie20() { + return numserie20; + } + + public void setNumserie20(String numserie20) { + this.numserie20 = numserie20; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public int getQuantidade() { + return quantidade; + } + + public void setQuantidade(int quantidade) { + this.quantidade = quantidade; + } + + public String getPdv() { + return pdv; + } + + public void setPdv(String pdv) { + this.pdv = pdv; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + getOuterType().hashCode(); + result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); + result = prime * result + ((pdv == null) ? 0 : pdv.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + FiscalVO other = (FiscalVO) obj; + if (!getOuterType().equals(other.getOuterType())) + return false; + if (datamov == null) { + if (other.datamov != null) + return false; + } else if (!datamov.equals(other.datamov)) + return false; + if (pdv == null) { + if (other.pdv != null) + return false; + } else if (!pdv.equals(other.pdv)) + return false; + return true; + } + + private ValidaIntegracionECFRedZxls getOuterType() { + return ValidaIntegracionECFRedZxls.this; + } + + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java index 393de4646..9046c1dc5 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java @@ -1,267 +1,267 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao; - -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.stereotype.Service; - -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEBase; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoBPE; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoDPE; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoOBE; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoPRC; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Service("exportacaoBpe") -public class ExportacaoBpe { - private static final Logger log = LogManager.getLogger(ExportacaoBpe.class); - - private static String VAZIO = ""; - private static String SEPARADOR = "|"; - - public ExportacaoBpe() { - - } - - public String gerarArquivoBPE(final Date dataInicial, final Date dataFinal, String nomeArquivo, final String nomeEmpresa, ExportacaoBPEVo registro) { - - log.info(" Inicio -- Retorno da lista " + new Date()); - try { - StringBuilder writer = new StringBuilder(); - - ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); - Constante contante = constanteService.buscarPorNomeConstante("IMPORT_BPE_LAYOUT_DIF"); - String valorConstante = contante == null ? null : contante.getValorconstante(); - - boolean isVersao131 = StringUtils.isBlank(valorConstante) || "131".equals(valorConstante) ? true : false; - String versaoLayout = StringUtils.isBlank(valorConstante) || "131".equals(valorConstante) ? "131" : valorConstante; - - adicionarRegistroBPETipoCAB(writer, dataInicial, dataFinal, nomeEmpresa, nomeArquivo, versaoLayout); - - int linhas = 2; - - if (registro.getListaRegistroBaseBPE() != null && registro.getListaRegistroBaseBPE().size() == 0) { - return null; - } - - for (ExportacaoBPEBase ee : registro.getListaRegistroBaseBPE()) { - - for (ExportacaoBPETipoBPE tipoBPE : ee.getListaRegistroBPE()) { - adicionarRegistroBPETipoBEP(writer, tipoBPE, isVersao131); - linhas++; - } - - for (ExportacaoBPETipoDPE tipoDPE : ee.getListaRegistroDPE()) { - adicionarRegistroBPETipoDPE(writer, tipoDPE); - linhas++; - } - - /* - * Expecificado na documentação original - * - * for (ExportacaoBPETipoOBE tipoOBE : ee.getListaRegistroOBE()) { adicionarRegistroBPETipoOBE(writer, tipoOBE); linhas++; - * - * - * for (ExportacaoBPETipoPRC tipoPRC : ee.getListaRegistroPRC()) { adicionarRegistroBPETipoRPC(writer, tipoPRC); linhas++; } - */ - } - - writer.append("TRA|" + linhas + UtiliteriasFiscal.QUEBRA_LINHA); - - log.info(" Fim -- Retorno da lista " + new Date()); - - return writer.toString(); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - - return null; - } - - private void adicionarRegistroBPETipoCAB(final StringBuilder sb, final Date dataInicial, final Date dataFinal, final String nomeEmpresa, final String arquivo, String versaoLayout) { - sb.append("CAB").append(SEPARADOR); - sb.append(versaoLayout).append(SEPARADOR); - sb.append("TotalBus").append(SEPARADOR); - sb.append(new SimpleDateFormat("yyyyMMdd").format(new Date())).append(SEPARADOR); - sb.append(formataCaracter(nomeEmpresa, false, 15)).append(SEPARADOR); - sb.append(new SimpleDateFormat("yyyyMMdd").format(dataInicial)).append(SEPARADOR); - sb.append(new SimpleDateFormat("yyyyMMdd").format(dataFinal)).append(SEPARADOR); - sb.append(arquivo).append(SEPARADOR); - sb.append("N"); - sb.append(UtiliteriasFiscal.QUEBRA_LINHA); - } - - private void adicionarRegistroBPETipoBEP(final StringBuilder sb, ExportacaoBPETipoBPE tipoBPE, boolean isVersao131) { - - String tipoRegistro = "BPE"; - /** - * Mantis 18267 - */ - String estabelecimento = StringUtils.isBlank(tipoBPE.getEstabelecimento()) ? VAZIO : tipoBPE.getEstabelecimento(); - String chaveEletronica = tipoBPE.getChaveEletronica(); - String serie = tipoBPE.getSerie(); - String numero = tipoBPE.getNumero(); - String dataEmissao = StringUtils.isBlank(tipoBPE.getDataEmissao()) ? VAZIO : tipoBPE.getDataEmissao(); - String dataPrestacao = StringUtils.isBlank(tipoBPE.getDataPrestacao()) ? VAZIO : tipoBPE.getDataPrestacao(); - String situacaoDocumento = tipoBPE.getSituacaoDoc(); - - String valorBruto = tipoBPE.getValorBruto() == null ? VAZIO : formataValor(tipoBPE.getValorBruto(), 15); - String valorDesconto = tipoBPE.getValorDesconto() == null ? VAZIO : formataValor(tipoBPE.getValorDesconto(), 15); - String UFOrigem = tipoBPE.getUFOrigem(); - String muniOrigem = tipoBPE.getMunicipioOrigem(); - String UFDestino = tipoBPE.getUFDestino(); - String muniDestino = tipoBPE.getMunicipioDestino(); - String CSTCOFINS = tipoBPE.getCstCofins(); - String receitaTributavelCOFINS = tipoBPE.getReceitaTriCofins() == null ? VAZIO : formataValor(tipoBPE.getReceitaTriCofins(), 15); - String naturezaReceitaCOFINS = VAZIO; - String CSTPIS = tipoBPE.getCstPis(); - String receitaTributavelPIS = tipoBPE.getReceitaTriCofins() == null ? VAZIO : formataValor(tipoBPE.getReceitaTriCofins(), 15); - String naturezaReceitaPIS = VAZIO; - String receitaCSL1 = VAZIO; - String receitaCSL2 = VAZIO; - String receitaIRPJ1 = VAZIO; - String receitaIRPJ2 = VAZIO; - String receitaIRPJ3 = VAZIO; - String receitaIRPJ4 = VAZIO; - String tipoBPe = tipoBPE.getTipoBPe(); - String chaveEletRef = StringUtils.isBlank(tipoBPE.getChaveEletronicaReferencia()) ? VAZIO : tipoBPE.getChaveEletronicaReferencia(); - String codigoContabil = StringUtils.isBlank(tipoBPE.getCodigoContabil()) ? VAZIO : tipoBPE.getCodigoContabil(); - String codigoPrevidenciaria = tipoBPE.getIndContribuicaoPrevidenciaria(); - String codigoComplementar = VAZIO; - String observacao = VAZIO; - String codAjusteFiscal = VAZIO; - String exclussaoBCPISCOFINS = VAZIO; - - String baseCalculoAjusteICMS = VAZIO; - String aliquotaAjusteICMS = VAZIO; - String valorAjusteICMS = VAZIO; - - sb.append(tipoRegistro).append(SEPARADOR); - sb.append(estabelecimento).append(SEPARADOR); - sb.append(chaveEletronica).append(SEPARADOR); - sb.append(serie).append(SEPARADOR); - sb.append(numero).append(SEPARADOR); - sb.append(dataEmissao).append(SEPARADOR); - sb.append(situacaoDocumento).append(SEPARADOR); - sb.append(dataPrestacao).append(SEPARADOR); - sb.append(valorBruto).append(SEPARADOR); - sb.append(valorDesconto).append(SEPARADOR); - sb.append(UFOrigem).append(SEPARADOR); - sb.append(muniOrigem).append(SEPARADOR); - sb.append(UFDestino).append(SEPARADOR); - sb.append(muniDestino).append(SEPARADOR); - sb.append(CSTCOFINS).append(SEPARADOR); - sb.append(receitaTributavelCOFINS).append(SEPARADOR); - sb.append(naturezaReceitaCOFINS).append(SEPARADOR); - sb.append(CSTPIS).append(SEPARADOR); - sb.append(receitaTributavelPIS).append(SEPARADOR); - sb.append(naturezaReceitaPIS).append(SEPARADOR); - sb.append(receitaCSL1).append(SEPARADOR); - sb.append(receitaCSL2).append(SEPARADOR); - sb.append(receitaIRPJ1).append(SEPARADOR); - sb.append(receitaIRPJ2).append(SEPARADOR); - sb.append(receitaIRPJ3).append(SEPARADOR); - sb.append(receitaIRPJ4).append(SEPARADOR); - sb.append(tipoBPe).append(SEPARADOR); - sb.append(chaveEletRef).append(SEPARADOR); - sb.append(codigoContabil).append(SEPARADOR); - sb.append(codigoPrevidenciaria).append(SEPARADOR); - sb.append(codigoComplementar).append(SEPARADOR); - sb.append(observacao).append(SEPARADOR); - sb.append(codAjusteFiscal).append(isVersao131 ? VAZIO : SEPARADOR); - - if(!isVersao131) { - sb.append(exclussaoBCPISCOFINS).append(SEPARADOR); - sb.append(baseCalculoAjusteICMS).append(SEPARADOR); - sb.append(aliquotaAjusteICMS).append(SEPARADOR); - sb.append(valorAjusteICMS); - } - - sb.append(UtiliteriasFiscal.QUEBRA_LINHA); - } - - private void adicionarRegistroBPETipoDPE(final StringBuilder sb, ExportacaoBPETipoDPE tipoDPE) { - String tipoRegistro = "DBE"; - String valor = formataValor(tipoDPE.getValor(), 15); - String CFOP = tipoDPE.getCfop(); - String CSTB = tipoDPE.getCstb(); - String CSOSNB = tipoDPE.getCsosnb(); - String baseCalculoICMS = formataValor(tipoDPE.getBaseCalculoICMS(), 15); - String aliquotaICMS = formataValor(tipoDPE.getAliquotaICMS(), 15); - String ICMS = formataValor(tipoDPE.getIcms(), 15); - String isentas = formataValor(tipoDPE.getIsentas(), 15); - String outras = formataValor(tipoDPE.getOutras(), 15); - - sb.append(tipoRegistro).append(SEPARADOR); - sb.append(valor).append(SEPARADOR); - sb.append(CFOP).append(SEPARADOR); - sb.append(CSTB).append(SEPARADOR); - sb.append(CSOSNB).append(SEPARADOR); - sb.append(baseCalculoICMS).append(SEPARADOR); - sb.append(aliquotaICMS).append(SEPARADOR); - sb.append(ICMS).append(SEPARADOR); - sb.append(isentas).append(SEPARADOR); - sb.append(outras); - sb.append(UtiliteriasFiscal.QUEBRA_LINHA); - } - - /* - * Expecificado na documentação original - */ - @SuppressWarnings("unused") - private void adicionarRegistroBPETipoOBE(final StringBuilder sb, ExportacaoBPETipoOBE tipoOBE) { - String tipoRegistro = "OBE"; - String codigo = tipoOBE.getCodigo(); - String valor = formataValor(tipoOBE.getValor(), 15); - - sb.append(tipoRegistro).append(SEPARADOR); - sb.append(codigo).append(SEPARADOR); - sb.append(valor); - sb.append(UtiliteriasFiscal.QUEBRA_LINHA); - } - - /* - * Expecificado na documentação original - */ - @SuppressWarnings("unused") - private void adicionarRegistroBPETipoRPC(final StringBuilder sb, ExportacaoBPETipoPRC tipoPRC) { - String tipoRegistro = "RPC"; - String UF = tipoPRC.getUf(); - String municipio = tipoPRC.getMunicipio(); - String valor = formataValor(tipoPRC.getValor(), 15); - String baseCalculoICMS = formataValor(tipoPRC.getBaseCalculoICMS(), 15); - String ICMS = formataValor(tipoPRC.getIcms(), 15); - - sb.append(tipoRegistro).append(SEPARADOR); - sb.append(UF).append(SEPARADOR); - sb.append(municipio).append(SEPARADOR); - sb.append(valor).append(SEPARADOR); - sb.append(baseCalculoICMS).append(SEPARADOR); - sb.append(ICMS); - sb.append(UtiliteriasFiscal.QUEBRA_LINHA); - } - - private String formataValor(final BigDecimal valor, final int tamanho) { - if (valor == null) { - return "0"; - } else { - return valor.setScale(2, BigDecimal.ROUND_HALF_EVEN).toString(); - } - } - - private String formataCaracter(String valor, boolean removeMascara, int tamanho) { - if (valor == null) { - valor = VAZIO; - } - return valor; - } - +package com.rjconsultores.ventaboletos.utilerias.exportacao; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.stereotype.Service; + +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEBase; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoBPE; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoDPE; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoOBE; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPETipoPRC; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Service("exportacaoBpe") +public class ExportacaoBpe { + private static final Logger log = LogManager.getLogger(ExportacaoBpe.class); + + private static String VAZIO = ""; + private static String SEPARADOR = "|"; + + public ExportacaoBpe() { + + } + + public String gerarArquivoBPE(final Date dataInicial, final Date dataFinal, String nomeArquivo, final String nomeEmpresa, ExportacaoBPEVo registro) { + + log.info(" Inicio -- Retorno da lista " + new Date()); + try { + StringBuilder writer = new StringBuilder(); + + ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); + Constante contante = constanteService.buscarPorNomeConstante("IMPORT_BPE_LAYOUT_DIF"); + String valorConstante = contante == null ? null : contante.getValorconstante(); + + boolean isVersao131 = StringUtils.isBlank(valorConstante) || "131".equals(valorConstante) ? true : false; + String versaoLayout = StringUtils.isBlank(valorConstante) || "131".equals(valorConstante) ? "131" : valorConstante; + + adicionarRegistroBPETipoCAB(writer, dataInicial, dataFinal, nomeEmpresa, nomeArquivo, versaoLayout); + + int linhas = 2; + + if (registro.getListaRegistroBaseBPE() != null && registro.getListaRegistroBaseBPE().size() == 0) { + return null; + } + + for (ExportacaoBPEBase ee : registro.getListaRegistroBaseBPE()) { + + for (ExportacaoBPETipoBPE tipoBPE : ee.getListaRegistroBPE()) { + adicionarRegistroBPETipoBEP(writer, tipoBPE, isVersao131); + linhas++; + } + + for (ExportacaoBPETipoDPE tipoDPE : ee.getListaRegistroDPE()) { + adicionarRegistroBPETipoDPE(writer, tipoDPE); + linhas++; + } + + /* + * Expecificado na documentação original + * + * for (ExportacaoBPETipoOBE tipoOBE : ee.getListaRegistroOBE()) { adicionarRegistroBPETipoOBE(writer, tipoOBE); linhas++; + * + * + * for (ExportacaoBPETipoPRC tipoPRC : ee.getListaRegistroPRC()) { adicionarRegistroBPETipoRPC(writer, tipoPRC); linhas++; } + */ + } + + writer.append("TRA|" + linhas + UtiliteriasFiscal.QUEBRA_LINHA); + + log.info(" Fim -- Retorno da lista " + new Date()); + + return writer.toString(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + return null; + } + + private void adicionarRegistroBPETipoCAB(final StringBuilder sb, final Date dataInicial, final Date dataFinal, final String nomeEmpresa, final String arquivo, String versaoLayout) { + sb.append("CAB").append(SEPARADOR); + sb.append(versaoLayout).append(SEPARADOR); + sb.append("TotalBus").append(SEPARADOR); + sb.append(new SimpleDateFormat("yyyyMMdd").format(new Date())).append(SEPARADOR); + sb.append(formataCaracter(nomeEmpresa, false, 15)).append(SEPARADOR); + sb.append(new SimpleDateFormat("yyyyMMdd").format(dataInicial)).append(SEPARADOR); + sb.append(new SimpleDateFormat("yyyyMMdd").format(dataFinal)).append(SEPARADOR); + sb.append(arquivo).append(SEPARADOR); + sb.append("N"); + sb.append(UtiliteriasFiscal.QUEBRA_LINHA); + } + + private void adicionarRegistroBPETipoBEP(final StringBuilder sb, ExportacaoBPETipoBPE tipoBPE, boolean isVersao131) { + + String tipoRegistro = "BPE"; + /** + * Mantis 18267 + */ + String estabelecimento = StringUtils.isBlank(tipoBPE.getEstabelecimento()) ? VAZIO : tipoBPE.getEstabelecimento(); + String chaveEletronica = tipoBPE.getChaveEletronica(); + String serie = tipoBPE.getSerie(); + String numero = tipoBPE.getNumero(); + String dataEmissao = StringUtils.isBlank(tipoBPE.getDataEmissao()) ? VAZIO : tipoBPE.getDataEmissao(); + String dataPrestacao = StringUtils.isBlank(tipoBPE.getDataPrestacao()) ? VAZIO : tipoBPE.getDataPrestacao(); + String situacaoDocumento = tipoBPE.getSituacaoDoc(); + + String valorBruto = tipoBPE.getValorBruto() == null ? VAZIO : formataValor(tipoBPE.getValorBruto(), 15); + String valorDesconto = tipoBPE.getValorDesconto() == null ? VAZIO : formataValor(tipoBPE.getValorDesconto(), 15); + String UFOrigem = tipoBPE.getUFOrigem(); + String muniOrigem = tipoBPE.getMunicipioOrigem(); + String UFDestino = tipoBPE.getUFDestino(); + String muniDestino = tipoBPE.getMunicipioDestino(); + String CSTCOFINS = tipoBPE.getCstCofins(); + String receitaTributavelCOFINS = tipoBPE.getReceitaTriCofins() == null ? VAZIO : formataValor(tipoBPE.getReceitaTriCofins(), 15); + String naturezaReceitaCOFINS = VAZIO; + String CSTPIS = tipoBPE.getCstPis(); + String receitaTributavelPIS = tipoBPE.getReceitaTriCofins() == null ? VAZIO : formataValor(tipoBPE.getReceitaTriCofins(), 15); + String naturezaReceitaPIS = VAZIO; + String receitaCSL1 = VAZIO; + String receitaCSL2 = VAZIO; + String receitaIRPJ1 = VAZIO; + String receitaIRPJ2 = VAZIO; + String receitaIRPJ3 = VAZIO; + String receitaIRPJ4 = VAZIO; + String tipoBPe = tipoBPE.getTipoBPe(); + String chaveEletRef = StringUtils.isBlank(tipoBPE.getChaveEletronicaReferencia()) ? VAZIO : tipoBPE.getChaveEletronicaReferencia(); + String codigoContabil = StringUtils.isBlank(tipoBPE.getCodigoContabil()) ? VAZIO : tipoBPE.getCodigoContabil(); + String codigoPrevidenciaria = tipoBPE.getIndContribuicaoPrevidenciaria(); + String codigoComplementar = VAZIO; + String observacao = VAZIO; + String codAjusteFiscal = VAZIO; + String exclussaoBCPISCOFINS = VAZIO; + + String baseCalculoAjusteICMS = VAZIO; + String aliquotaAjusteICMS = VAZIO; + String valorAjusteICMS = VAZIO; + + sb.append(tipoRegistro).append(SEPARADOR); + sb.append(estabelecimento).append(SEPARADOR); + sb.append(chaveEletronica).append(SEPARADOR); + sb.append(serie).append(SEPARADOR); + sb.append(numero).append(SEPARADOR); + sb.append(dataEmissao).append(SEPARADOR); + sb.append(situacaoDocumento).append(SEPARADOR); + sb.append(dataPrestacao).append(SEPARADOR); + sb.append(valorBruto).append(SEPARADOR); + sb.append(valorDesconto).append(SEPARADOR); + sb.append(UFOrigem).append(SEPARADOR); + sb.append(muniOrigem).append(SEPARADOR); + sb.append(UFDestino).append(SEPARADOR); + sb.append(muniDestino).append(SEPARADOR); + sb.append(CSTCOFINS).append(SEPARADOR); + sb.append(receitaTributavelCOFINS).append(SEPARADOR); + sb.append(naturezaReceitaCOFINS).append(SEPARADOR); + sb.append(CSTPIS).append(SEPARADOR); + sb.append(receitaTributavelPIS).append(SEPARADOR); + sb.append(naturezaReceitaPIS).append(SEPARADOR); + sb.append(receitaCSL1).append(SEPARADOR); + sb.append(receitaCSL2).append(SEPARADOR); + sb.append(receitaIRPJ1).append(SEPARADOR); + sb.append(receitaIRPJ2).append(SEPARADOR); + sb.append(receitaIRPJ3).append(SEPARADOR); + sb.append(receitaIRPJ4).append(SEPARADOR); + sb.append(tipoBPe).append(SEPARADOR); + sb.append(chaveEletRef).append(SEPARADOR); + sb.append(codigoContabil).append(SEPARADOR); + sb.append(codigoPrevidenciaria).append(SEPARADOR); + sb.append(codigoComplementar).append(SEPARADOR); + sb.append(observacao).append(SEPARADOR); + sb.append(codAjusteFiscal).append(isVersao131 ? VAZIO : SEPARADOR); + + if(!isVersao131) { + sb.append(exclussaoBCPISCOFINS).append(SEPARADOR); + sb.append(baseCalculoAjusteICMS).append(SEPARADOR); + sb.append(aliquotaAjusteICMS).append(SEPARADOR); + sb.append(valorAjusteICMS); + } + + sb.append(UtiliteriasFiscal.QUEBRA_LINHA); + } + + private void adicionarRegistroBPETipoDPE(final StringBuilder sb, ExportacaoBPETipoDPE tipoDPE) { + String tipoRegistro = "DBE"; + String valor = formataValor(tipoDPE.getValor(), 15); + String CFOP = tipoDPE.getCfop(); + String CSTB = tipoDPE.getCstb(); + String CSOSNB = tipoDPE.getCsosnb(); + String baseCalculoICMS = formataValor(tipoDPE.getBaseCalculoICMS(), 15); + String aliquotaICMS = formataValor(tipoDPE.getAliquotaICMS(), 15); + String ICMS = formataValor(tipoDPE.getIcms(), 15); + String isentas = formataValor(tipoDPE.getIsentas(), 15); + String outras = formataValor(tipoDPE.getOutras(), 15); + + sb.append(tipoRegistro).append(SEPARADOR); + sb.append(valor).append(SEPARADOR); + sb.append(CFOP).append(SEPARADOR); + sb.append(CSTB).append(SEPARADOR); + sb.append(CSOSNB).append(SEPARADOR); + sb.append(baseCalculoICMS).append(SEPARADOR); + sb.append(aliquotaICMS).append(SEPARADOR); + sb.append(ICMS).append(SEPARADOR); + sb.append(isentas).append(SEPARADOR); + sb.append(outras); + sb.append(UtiliteriasFiscal.QUEBRA_LINHA); + } + + /* + * Expecificado na documentação original + */ + @SuppressWarnings("unused") + private void adicionarRegistroBPETipoOBE(final StringBuilder sb, ExportacaoBPETipoOBE tipoOBE) { + String tipoRegistro = "OBE"; + String codigo = tipoOBE.getCodigo(); + String valor = formataValor(tipoOBE.getValor(), 15); + + sb.append(tipoRegistro).append(SEPARADOR); + sb.append(codigo).append(SEPARADOR); + sb.append(valor); + sb.append(UtiliteriasFiscal.QUEBRA_LINHA); + } + + /* + * Expecificado na documentação original + */ + @SuppressWarnings("unused") + private void adicionarRegistroBPETipoRPC(final StringBuilder sb, ExportacaoBPETipoPRC tipoPRC) { + String tipoRegistro = "RPC"; + String UF = tipoPRC.getUf(); + String municipio = tipoPRC.getMunicipio(); + String valor = formataValor(tipoPRC.getValor(), 15); + String baseCalculoICMS = formataValor(tipoPRC.getBaseCalculoICMS(), 15); + String ICMS = formataValor(tipoPRC.getIcms(), 15); + + sb.append(tipoRegistro).append(SEPARADOR); + sb.append(UF).append(SEPARADOR); + sb.append(municipio).append(SEPARADOR); + sb.append(valor).append(SEPARADOR); + sb.append(baseCalculoICMS).append(SEPARADOR); + sb.append(ICMS); + sb.append(UtiliteriasFiscal.QUEBRA_LINHA); + } + + private String formataValor(final BigDecimal valor, final int tamanho) { + if (valor == null) { + return "0"; + } else { + return valor.setScale(2, BigDecimal.ROUND_HALF_EVEN).toString(); + } + } + + private String formataCaracter(String valor, boolean removeMascara, int tamanho) { + if (valor == null) { + valor = VAZIO; + } + return valor; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEBase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEBase.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEBase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEBase.java index f5c1ff190..373511c17 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEBase.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEBase.java @@ -1,776 +1,776 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -public class ExportacaoBPEBase { - - private Long boletoId; - private String numfoliosistema; - private BigDecimal valortotal; - private BigDecimal vDesconto; - private String chbpe; - private String chbpeSub; - private String dhrecbto; - private String dhEmisao; - private String tpBpe; - private String retorno; - private String nprot; - private String numBpe; - private String numSerieBpe; - private String codEstabelecimento; - private String municipioOrigem; - private String estadoOrigem; - private String municipioDestino; - private String estadoDestino; - private BigDecimal valortributado; - private BigDecimal redBaseCalcEstadual; - private BigDecimal redBaseCalcMunicipal; - private BigDecimal porcRedMunicipal; - private BigDecimal porcRedEstadual; - private BigDecimal tributacaoImportacao; - private String pagamentos; - private String codstatus; - private String tipoevento; - private String codigoContabilEstadual; - private String codigocontabilMunicipal; - private Integer crt; - private String xml; - private String xmlAnterior; - private Boolean indTarifaMunicipal; - private Boolean indSeguroMunicipal; - private Boolean indTxEmbarqueMunicipal; - private Boolean indPedagioMunicipal; - private Boolean indTarifaEstadual; - private Boolean indSeguroEstadual; - private Boolean indTxEmbarqueEstadual; - private Boolean indPedadioEstdual; - - private String cmunini; - private String cmunfim; - private String ufini; - private String uffim; - private String nbp; - private String dhemb; - private String cst00; - private String cst20; - private String cst45; - private String cst90; - private String cstoutrauf; - private String cstsn; - private String vbc00; - private String picms00; - private String vicms00; - private String vbc20; - private String picms20; - private String vicms20; - private String vbp; - private String vdesconto; - private String vpgto; - private String tpcomp01; - private String tpcomp02; - private String tpcomp03; - private String tpcomp04; - private String tpcomp05; - private String tpcomp06; - private String tpcomp99; - private String vcomp01; - private String vcomp02; - private String vcomp03; - private String vcomp04; - private String vcomp05; - private String vcomp06; - private String vcomp99; - private String pRedBC; - - private String dhrecbtoBPe; - private boolean activoBPe; - private int motivoCancelacionId; - private String indContribuicaoPrevidenciaria; - - private List listaRegistroBPE; - private List listaRegistroDPE; - private List listaRegistroOBE; - private List listaRegistroPRC; - - public ExportacaoBPEBase() { - listaRegistroBPE = new ArrayList(0); - listaRegistroDPE = new ArrayList(0); - listaRegistroOBE = new ArrayList(0); - listaRegistroPRC = new ArrayList(0); - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public String getNumfoliosistema() { - return numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public BigDecimal getValortotal() { - return valortotal; - } - - public void setValortotal(BigDecimal valortotal) { - this.valortotal = valortotal; - } - - public BigDecimal getvDesconto() { - return vDesconto; - } - - public void setvDesconto(BigDecimal vDesconto) { - this.vDesconto = vDesconto; - } - - public String getChbpe() { - return chbpe; - } - - public void setChbpe(String chbpe) { - this.chbpe = chbpe; - } - - public String getChbpeSub() { - return chbpeSub; - } - - public void setChbpeSub(String chbpeSub) { - this.chbpeSub = chbpeSub; - } - - public String getDhrecbto() { - return dhrecbto; - } - - public void setDhrecbto(String dhrecbto) { - this.dhrecbto = dhrecbto; - } - - public String getDhEmisao() { - return dhEmisao; - } - - public void setDhEmisao(String dhEmisao) { - this.dhEmisao = dhEmisao; - } - - public String getTpBpe() { - return tpBpe; - } - - public void setTpBpe(String tpBpe) { - this.tpBpe = tpBpe; - } - - public String getRetorno() { - return retorno; - } - - public void setRetorno(String retorno) { - this.retorno = retorno; - } - - public String getNprot() { - return nprot; - } - - public void setNprot(String nprot) { - this.nprot = nprot; - } - - public String getNumBpe() { - return numBpe; - } - - public void setNumBpe(String numBpe) { - this.numBpe = numBpe; - } - - public String getNumSerieBpe() { - return numSerieBpe; - } - - public void setNumSerieBpe(String numSerieBpe) { - this.numSerieBpe = numSerieBpe; - } - - public String getCodEstabelecimento() { - return codEstabelecimento; - } - - public void setCodEstabelecimento(String codEstabelecimento) { - this.codEstabelecimento = codEstabelecimento; - } - - public String getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(String municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public String getEstadoOrigem() { - return estadoOrigem; - } - - public void setEstadoOrigem(String estadoOrigem) { - this.estadoOrigem = estadoOrigem; - } - - public String getMunicipioDestino() { - return municipioDestino; - } - - public void setMunicipioDestino(String municipioDestino) { - this.municipioDestino = municipioDestino; - } - - public String getEstadoDestino() { - return estadoDestino; - } - - public void setEstadoDestino(String estadoDestino) { - this.estadoDestino = estadoDestino; - } - - public BigDecimal getValortributado() { - return valortributado; - } - - public void setValortributado(BigDecimal valortributado) { - this.valortributado = valortributado; - } - - public BigDecimal getRedBaseCalcEstadual() { - return redBaseCalcEstadual; - } - - public void setRedBaseCalcEstadual(BigDecimal redBaseCalcEstadual) { - this.redBaseCalcEstadual = redBaseCalcEstadual; - } - - public BigDecimal getRedBaseCalcMunicipal() { - return redBaseCalcMunicipal; - } - - public void setRedBaseCalcMunicipal(BigDecimal redBaseCalcMunicipal) { - this.redBaseCalcMunicipal = redBaseCalcMunicipal; - } - - public BigDecimal getPorcRedMunicipal() { - return porcRedMunicipal; - } - - public void setPorcRedMunicipal(BigDecimal porcRedMunicipal) { - this.porcRedMunicipal = porcRedMunicipal; - } - - public BigDecimal getPorcRedEstadual() { - return porcRedEstadual; - } - - public void setPorcRedEstadual(BigDecimal porcRedEstadual) { - this.porcRedEstadual = porcRedEstadual; - } - - public BigDecimal getTributacaoImportacao() { - return tributacaoImportacao; - } - - public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { - this.tributacaoImportacao = tributacaoImportacao; - } - - public String getPagamentos() { - return pagamentos; - } - - public void setPagamentos(String pagamentos) { - this.pagamentos = pagamentos; - } - - public String getCodstatus() { - return codstatus; - } - - public void setCodstatus(String codstatus) { - this.codstatus = codstatus; - } - - public String getTipoevento() { - return tipoevento; - } - - public void setTipoevento(String tipoevento) { - this.tipoevento = tipoevento; - } - - public String getCodigoContabilEstadual() { - return codigoContabilEstadual; - } - - public void setCodigoContabilEstadual(String codigoContabilEstadual) { - this.codigoContabilEstadual = codigoContabilEstadual; - } - - public String getCodigocontabilMunicipal() { - return codigocontabilMunicipal; - } - - public void setCodigocontabilMunicipal(String codigocontabilMunicipal) { - this.codigocontabilMunicipal = codigocontabilMunicipal; - } - - public Integer getCrt() { - return crt; - } - - public void setCrt(Integer crt) { - this.crt = crt; - } - - public String getXml() { - return xml; - } - - public void setXml(String xml) { - this.xml = xml; - } - - public Boolean getIndTarifaMunicipal() { - return indTarifaMunicipal; - } - - public void setIndTarifaMunicipal(Boolean indTarifaMunicipal) { - this.indTarifaMunicipal = indTarifaMunicipal; - } - - public Boolean getIndSeguroMunicipal() { - return indSeguroMunicipal; - } - - public void setIndSeguroMunicipal(Boolean indSeguroMunicipal) { - this.indSeguroMunicipal = indSeguroMunicipal; - } - - public Boolean getIndTxEmbarqueMunicipal() { - return indTxEmbarqueMunicipal; - } - - public void setIndTxEmbarqueMunicipal(Boolean indTxEmbarqueMunicipal) { - this.indTxEmbarqueMunicipal = indTxEmbarqueMunicipal; - } - - public Boolean getIndPedagioMunicipal() { - return indPedagioMunicipal; - } - - public void setIndPedagioMunicipal(Boolean indPedagioMunicipal) { - this.indPedagioMunicipal = indPedagioMunicipal; - } - - public Boolean getIndTarifaEstadual() { - return indTarifaEstadual; - } - - public void setIndTarifaEstadual(Boolean indTarifaEstadual) { - this.indTarifaEstadual = indTarifaEstadual; - } - - public Boolean getIndSeguroEstadual() { - return indSeguroEstadual; - } - - public void setIndSeguroEstadual(Boolean indSeguroEstadual) { - this.indSeguroEstadual = indSeguroEstadual; - } - - public Boolean getIndTxEmbarqueEstadual() { - return indTxEmbarqueEstadual; - } - - public void setIndTxEmbarqueEstadual(Boolean indTxEmbarqueEstadual) { - this.indTxEmbarqueEstadual = indTxEmbarqueEstadual; - } - - public Boolean getIndPedadioEstdual() { - return indPedadioEstdual; - } - - public void setIndPedadioEstdual(Boolean indPedadioEstdual) { - this.indPedadioEstdual = indPedadioEstdual; - } - - public List getListaRegistroBPE() { - return listaRegistroBPE; - } - - public void setListaRegistroBPE(List listaRegistroBPE) { - this.listaRegistroBPE = listaRegistroBPE; - } - - public List getListaRegistroDPE() { - return listaRegistroDPE; - } - - public void setListaRegistroDPE(List listaRegistroDPE) { - this.listaRegistroDPE = listaRegistroDPE; - } - - public List getListaRegistroOBE() { - return listaRegistroOBE; - } - - public void setListaRegistroOBE(List listaRegistroOBE) { - this.listaRegistroOBE = listaRegistroOBE; - } - - public List getListaRegistroPRC() { - return listaRegistroPRC; - } - - public void setListaRegistroPRC(List listaRegistroPRC) { - this.listaRegistroPRC = listaRegistroPRC; - } - - public String getXmlAnterior() { - return xmlAnterior; - } - - public void setXmlAnterior(String xmlAnterior) { - this.xmlAnterior = xmlAnterior; - } - - public String getCmunini() { - return cmunini; - } - - public void setCmunini(String cmunini) { - this.cmunini = cmunini; - } - - public String getCmunfim() { - return cmunfim; - } - - public void setCmunfim(String cmunfim) { - this.cmunfim = cmunfim; - } - - public String getUfini() { - return ufini; - } - - public void setUfini(String ufini) { - this.ufini = ufini; - } - - public String getUffim() { - return uffim; - } - - public void setUffim(String uffim) { - this.uffim = uffim; - } - - public String getNbp() { - return nbp; - } - - public void setNbp(String nbp) { - this.nbp = nbp; - } - - public String getDhemb() { - return dhemb; - } - - public void setDhemb(String dhemb) { - this.dhemb = dhemb; - } - - public String getCst00() { - return cst00; - } - - public void setCst00(String cst00) { - this.cst00 = cst00; - } - - public String getCst20() { - return cst20; - } - - public void setCst20(String cst20) { - this.cst20 = cst20; - } - - public String getCst45() { - return cst45; - } - - public void setCst45(String cst45) { - this.cst45 = cst45; - } - - public String getCst90() { - return cst90; - } - - public void setCst90(String cst90) { - this.cst90 = cst90; - } - - public String getCstoutrauf() { - return cstoutrauf; - } - - public void setCstoutrauf(String cstoutrauf) { - this.cstoutrauf = cstoutrauf; - } - - public String getCstsn() { - return cstsn; - } - - public void setCstsn(String cstsn) { - this.cstsn = cstsn; - } - - public String getVbc00() { - return vbc00; - } - - public void setVbc00(String vbc00) { - this.vbc00 = vbc00; - } - - public String getPicms00() { - return picms00; - } - - public void setPicms00(String picms00) { - this.picms00 = picms00; - } - - public String getVicms00() { - return vicms00; - } - - public void setVicms00(String vicms00) { - this.vicms00 = vicms00; - } - - public String getVbc20() { - return vbc20; - } - - public void setVbc20(String vbc20) { - this.vbc20 = vbc20; - } - - public String getPicms20() { - return picms20; - } - - public void setPicms20(String picms20) { - this.picms20 = picms20; - } - - public String getVicms20() { - return vicms20; - } - - public void setVicms20(String vicms20) { - this.vicms20 = vicms20; - } - - public String getVbp() { - return vbp; - } - - public void setVbp(String vbp) { - this.vbp = vbp; - } - - public String getVdesconto() { - return vdesconto; - } - - public void setVdesconto(String vdesconto) { - this.vdesconto = vdesconto; - } - - public String getVpgto() { - return vpgto; - } - - public void setVpgto(String vpgto) { - this.vpgto = vpgto; - } - - public String getTpcomp01() { - return tpcomp01; - } - - public void setTpcomp01(String tpcomp01) { - this.tpcomp01 = tpcomp01; - } - - public String getTpcomp02() { - return tpcomp02; - } - - public void setTpcomp02(String tpcomp02) { - this.tpcomp02 = tpcomp02; - } - - public String getTpcomp03() { - return tpcomp03; - } - - public void setTpcomp03(String tpcomp03) { - this.tpcomp03 = tpcomp03; - } - - public String getTpcomp04() { - return tpcomp04; - } - - public void setTpcomp04(String tpcomp04) { - this.tpcomp04 = tpcomp04; - } - - public String getTpcomp05() { - return tpcomp05; - } - - public void setTpcomp05(String tpcomp05) { - this.tpcomp05 = tpcomp05; - } - - public String getTpcomp06() { - return tpcomp06; - } - - public void setTpcomp06(String tpcomp06) { - this.tpcomp06 = tpcomp06; - } - - public String getTpcomp99() { - return tpcomp99; - } - - public void setTpcomp99(String tpcomp99) { - this.tpcomp99 = tpcomp99; - } - - public String getVcomp01() { - return vcomp01; - } - - public void setVcomp01(String vcomp01) { - this.vcomp01 = vcomp01; - } - - public String getVcomp02() { - return vcomp02; - } - - public void setVcomp02(String vcomp02) { - this.vcomp02 = vcomp02; - } - - public String getVcomp03() { - return vcomp03; - } - - public void setVcomp03(String vcomp03) { - this.vcomp03 = vcomp03; - } - - public String getVcomp04() { - return vcomp04; - } - - public void setVcomp04(String vcomp04) { - this.vcomp04 = vcomp04; - } - - public String getVcomp05() { - return vcomp05; - } - - public void setVcomp05(String vcomp05) { - this.vcomp05 = vcomp05; - } - - public String getVcomp06() { - return vcomp06; - } - - public void setVcomp06(String vcomp06) { - this.vcomp06 = vcomp06; - } - - public String getVcomp99() { - return vcomp99; - } - - public void setVcomp99(String vcomp99) { - this.vcomp99 = vcomp99; - } - - public String getpRedBC() { - return pRedBC; - } - - public void setpRedBC(String pRedBC) { - this.pRedBC = pRedBC; - } - - public String getDhrecbtoBPe() { - return dhrecbtoBPe; - } - - public void setDhrecbtoBPe(String dhrecbtoBPe) { - this.dhrecbtoBPe = dhrecbtoBPe; - } - - public boolean isActivoBPe() { - return activoBPe; - } - - public void setActivoBPe(boolean activoBPe) { - this.activoBPe = activoBPe; - } - - public int getMotivoCancelacionId() { - return motivoCancelacionId; - } - - public void setMotivoCancelacionId(int motivoCancelacionId) { - this.motivoCancelacionId = motivoCancelacionId; - } - - public String getIndContribuicaoPrevidenciaria() { - return indContribuicaoPrevidenciaria; - } - - public void setIndContribuicaoPrevidenciaria(String indContribuicaoPrevidenciaria) { - this.indContribuicaoPrevidenciaria = indContribuicaoPrevidenciaria; - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class ExportacaoBPEBase { + + private Long boletoId; + private String numfoliosistema; + private BigDecimal valortotal; + private BigDecimal vDesconto; + private String chbpe; + private String chbpeSub; + private String dhrecbto; + private String dhEmisao; + private String tpBpe; + private String retorno; + private String nprot; + private String numBpe; + private String numSerieBpe; + private String codEstabelecimento; + private String municipioOrigem; + private String estadoOrigem; + private String municipioDestino; + private String estadoDestino; + private BigDecimal valortributado; + private BigDecimal redBaseCalcEstadual; + private BigDecimal redBaseCalcMunicipal; + private BigDecimal porcRedMunicipal; + private BigDecimal porcRedEstadual; + private BigDecimal tributacaoImportacao; + private String pagamentos; + private String codstatus; + private String tipoevento; + private String codigoContabilEstadual; + private String codigocontabilMunicipal; + private Integer crt; + private String xml; + private String xmlAnterior; + private Boolean indTarifaMunicipal; + private Boolean indSeguroMunicipal; + private Boolean indTxEmbarqueMunicipal; + private Boolean indPedagioMunicipal; + private Boolean indTarifaEstadual; + private Boolean indSeguroEstadual; + private Boolean indTxEmbarqueEstadual; + private Boolean indPedadioEstdual; + + private String cmunini; + private String cmunfim; + private String ufini; + private String uffim; + private String nbp; + private String dhemb; + private String cst00; + private String cst20; + private String cst45; + private String cst90; + private String cstoutrauf; + private String cstsn; + private String vbc00; + private String picms00; + private String vicms00; + private String vbc20; + private String picms20; + private String vicms20; + private String vbp; + private String vdesconto; + private String vpgto; + private String tpcomp01; + private String tpcomp02; + private String tpcomp03; + private String tpcomp04; + private String tpcomp05; + private String tpcomp06; + private String tpcomp99; + private String vcomp01; + private String vcomp02; + private String vcomp03; + private String vcomp04; + private String vcomp05; + private String vcomp06; + private String vcomp99; + private String pRedBC; + + private String dhrecbtoBPe; + private boolean activoBPe; + private int motivoCancelacionId; + private String indContribuicaoPrevidenciaria; + + private List listaRegistroBPE; + private List listaRegistroDPE; + private List listaRegistroOBE; + private List listaRegistroPRC; + + public ExportacaoBPEBase() { + listaRegistroBPE = new ArrayList(0); + listaRegistroDPE = new ArrayList(0); + listaRegistroOBE = new ArrayList(0); + listaRegistroPRC = new ArrayList(0); + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public String getNumfoliosistema() { + return numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public BigDecimal getValortotal() { + return valortotal; + } + + public void setValortotal(BigDecimal valortotal) { + this.valortotal = valortotal; + } + + public BigDecimal getvDesconto() { + return vDesconto; + } + + public void setvDesconto(BigDecimal vDesconto) { + this.vDesconto = vDesconto; + } + + public String getChbpe() { + return chbpe; + } + + public void setChbpe(String chbpe) { + this.chbpe = chbpe; + } + + public String getChbpeSub() { + return chbpeSub; + } + + public void setChbpeSub(String chbpeSub) { + this.chbpeSub = chbpeSub; + } + + public String getDhrecbto() { + return dhrecbto; + } + + public void setDhrecbto(String dhrecbto) { + this.dhrecbto = dhrecbto; + } + + public String getDhEmisao() { + return dhEmisao; + } + + public void setDhEmisao(String dhEmisao) { + this.dhEmisao = dhEmisao; + } + + public String getTpBpe() { + return tpBpe; + } + + public void setTpBpe(String tpBpe) { + this.tpBpe = tpBpe; + } + + public String getRetorno() { + return retorno; + } + + public void setRetorno(String retorno) { + this.retorno = retorno; + } + + public String getNprot() { + return nprot; + } + + public void setNprot(String nprot) { + this.nprot = nprot; + } + + public String getNumBpe() { + return numBpe; + } + + public void setNumBpe(String numBpe) { + this.numBpe = numBpe; + } + + public String getNumSerieBpe() { + return numSerieBpe; + } + + public void setNumSerieBpe(String numSerieBpe) { + this.numSerieBpe = numSerieBpe; + } + + public String getCodEstabelecimento() { + return codEstabelecimento; + } + + public void setCodEstabelecimento(String codEstabelecimento) { + this.codEstabelecimento = codEstabelecimento; + } + + public String getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(String municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public String getEstadoOrigem() { + return estadoOrigem; + } + + public void setEstadoOrigem(String estadoOrigem) { + this.estadoOrigem = estadoOrigem; + } + + public String getMunicipioDestino() { + return municipioDestino; + } + + public void setMunicipioDestino(String municipioDestino) { + this.municipioDestino = municipioDestino; + } + + public String getEstadoDestino() { + return estadoDestino; + } + + public void setEstadoDestino(String estadoDestino) { + this.estadoDestino = estadoDestino; + } + + public BigDecimal getValortributado() { + return valortributado; + } + + public void setValortributado(BigDecimal valortributado) { + this.valortributado = valortributado; + } + + public BigDecimal getRedBaseCalcEstadual() { + return redBaseCalcEstadual; + } + + public void setRedBaseCalcEstadual(BigDecimal redBaseCalcEstadual) { + this.redBaseCalcEstadual = redBaseCalcEstadual; + } + + public BigDecimal getRedBaseCalcMunicipal() { + return redBaseCalcMunicipal; + } + + public void setRedBaseCalcMunicipal(BigDecimal redBaseCalcMunicipal) { + this.redBaseCalcMunicipal = redBaseCalcMunicipal; + } + + public BigDecimal getPorcRedMunicipal() { + return porcRedMunicipal; + } + + public void setPorcRedMunicipal(BigDecimal porcRedMunicipal) { + this.porcRedMunicipal = porcRedMunicipal; + } + + public BigDecimal getPorcRedEstadual() { + return porcRedEstadual; + } + + public void setPorcRedEstadual(BigDecimal porcRedEstadual) { + this.porcRedEstadual = porcRedEstadual; + } + + public BigDecimal getTributacaoImportacao() { + return tributacaoImportacao; + } + + public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { + this.tributacaoImportacao = tributacaoImportacao; + } + + public String getPagamentos() { + return pagamentos; + } + + public void setPagamentos(String pagamentos) { + this.pagamentos = pagamentos; + } + + public String getCodstatus() { + return codstatus; + } + + public void setCodstatus(String codstatus) { + this.codstatus = codstatus; + } + + public String getTipoevento() { + return tipoevento; + } + + public void setTipoevento(String tipoevento) { + this.tipoevento = tipoevento; + } + + public String getCodigoContabilEstadual() { + return codigoContabilEstadual; + } + + public void setCodigoContabilEstadual(String codigoContabilEstadual) { + this.codigoContabilEstadual = codigoContabilEstadual; + } + + public String getCodigocontabilMunicipal() { + return codigocontabilMunicipal; + } + + public void setCodigocontabilMunicipal(String codigocontabilMunicipal) { + this.codigocontabilMunicipal = codigocontabilMunicipal; + } + + public Integer getCrt() { + return crt; + } + + public void setCrt(Integer crt) { + this.crt = crt; + } + + public String getXml() { + return xml; + } + + public void setXml(String xml) { + this.xml = xml; + } + + public Boolean getIndTarifaMunicipal() { + return indTarifaMunicipal; + } + + public void setIndTarifaMunicipal(Boolean indTarifaMunicipal) { + this.indTarifaMunicipal = indTarifaMunicipal; + } + + public Boolean getIndSeguroMunicipal() { + return indSeguroMunicipal; + } + + public void setIndSeguroMunicipal(Boolean indSeguroMunicipal) { + this.indSeguroMunicipal = indSeguroMunicipal; + } + + public Boolean getIndTxEmbarqueMunicipal() { + return indTxEmbarqueMunicipal; + } + + public void setIndTxEmbarqueMunicipal(Boolean indTxEmbarqueMunicipal) { + this.indTxEmbarqueMunicipal = indTxEmbarqueMunicipal; + } + + public Boolean getIndPedagioMunicipal() { + return indPedagioMunicipal; + } + + public void setIndPedagioMunicipal(Boolean indPedagioMunicipal) { + this.indPedagioMunicipal = indPedagioMunicipal; + } + + public Boolean getIndTarifaEstadual() { + return indTarifaEstadual; + } + + public void setIndTarifaEstadual(Boolean indTarifaEstadual) { + this.indTarifaEstadual = indTarifaEstadual; + } + + public Boolean getIndSeguroEstadual() { + return indSeguroEstadual; + } + + public void setIndSeguroEstadual(Boolean indSeguroEstadual) { + this.indSeguroEstadual = indSeguroEstadual; + } + + public Boolean getIndTxEmbarqueEstadual() { + return indTxEmbarqueEstadual; + } + + public void setIndTxEmbarqueEstadual(Boolean indTxEmbarqueEstadual) { + this.indTxEmbarqueEstadual = indTxEmbarqueEstadual; + } + + public Boolean getIndPedadioEstdual() { + return indPedadioEstdual; + } + + public void setIndPedadioEstdual(Boolean indPedadioEstdual) { + this.indPedadioEstdual = indPedadioEstdual; + } + + public List getListaRegistroBPE() { + return listaRegistroBPE; + } + + public void setListaRegistroBPE(List listaRegistroBPE) { + this.listaRegistroBPE = listaRegistroBPE; + } + + public List getListaRegistroDPE() { + return listaRegistroDPE; + } + + public void setListaRegistroDPE(List listaRegistroDPE) { + this.listaRegistroDPE = listaRegistroDPE; + } + + public List getListaRegistroOBE() { + return listaRegistroOBE; + } + + public void setListaRegistroOBE(List listaRegistroOBE) { + this.listaRegistroOBE = listaRegistroOBE; + } + + public List getListaRegistroPRC() { + return listaRegistroPRC; + } + + public void setListaRegistroPRC(List listaRegistroPRC) { + this.listaRegistroPRC = listaRegistroPRC; + } + + public String getXmlAnterior() { + return xmlAnterior; + } + + public void setXmlAnterior(String xmlAnterior) { + this.xmlAnterior = xmlAnterior; + } + + public String getCmunini() { + return cmunini; + } + + public void setCmunini(String cmunini) { + this.cmunini = cmunini; + } + + public String getCmunfim() { + return cmunfim; + } + + public void setCmunfim(String cmunfim) { + this.cmunfim = cmunfim; + } + + public String getUfini() { + return ufini; + } + + public void setUfini(String ufini) { + this.ufini = ufini; + } + + public String getUffim() { + return uffim; + } + + public void setUffim(String uffim) { + this.uffim = uffim; + } + + public String getNbp() { + return nbp; + } + + public void setNbp(String nbp) { + this.nbp = nbp; + } + + public String getDhemb() { + return dhemb; + } + + public void setDhemb(String dhemb) { + this.dhemb = dhemb; + } + + public String getCst00() { + return cst00; + } + + public void setCst00(String cst00) { + this.cst00 = cst00; + } + + public String getCst20() { + return cst20; + } + + public void setCst20(String cst20) { + this.cst20 = cst20; + } + + public String getCst45() { + return cst45; + } + + public void setCst45(String cst45) { + this.cst45 = cst45; + } + + public String getCst90() { + return cst90; + } + + public void setCst90(String cst90) { + this.cst90 = cst90; + } + + public String getCstoutrauf() { + return cstoutrauf; + } + + public void setCstoutrauf(String cstoutrauf) { + this.cstoutrauf = cstoutrauf; + } + + public String getCstsn() { + return cstsn; + } + + public void setCstsn(String cstsn) { + this.cstsn = cstsn; + } + + public String getVbc00() { + return vbc00; + } + + public void setVbc00(String vbc00) { + this.vbc00 = vbc00; + } + + public String getPicms00() { + return picms00; + } + + public void setPicms00(String picms00) { + this.picms00 = picms00; + } + + public String getVicms00() { + return vicms00; + } + + public void setVicms00(String vicms00) { + this.vicms00 = vicms00; + } + + public String getVbc20() { + return vbc20; + } + + public void setVbc20(String vbc20) { + this.vbc20 = vbc20; + } + + public String getPicms20() { + return picms20; + } + + public void setPicms20(String picms20) { + this.picms20 = picms20; + } + + public String getVicms20() { + return vicms20; + } + + public void setVicms20(String vicms20) { + this.vicms20 = vicms20; + } + + public String getVbp() { + return vbp; + } + + public void setVbp(String vbp) { + this.vbp = vbp; + } + + public String getVdesconto() { + return vdesconto; + } + + public void setVdesconto(String vdesconto) { + this.vdesconto = vdesconto; + } + + public String getVpgto() { + return vpgto; + } + + public void setVpgto(String vpgto) { + this.vpgto = vpgto; + } + + public String getTpcomp01() { + return tpcomp01; + } + + public void setTpcomp01(String tpcomp01) { + this.tpcomp01 = tpcomp01; + } + + public String getTpcomp02() { + return tpcomp02; + } + + public void setTpcomp02(String tpcomp02) { + this.tpcomp02 = tpcomp02; + } + + public String getTpcomp03() { + return tpcomp03; + } + + public void setTpcomp03(String tpcomp03) { + this.tpcomp03 = tpcomp03; + } + + public String getTpcomp04() { + return tpcomp04; + } + + public void setTpcomp04(String tpcomp04) { + this.tpcomp04 = tpcomp04; + } + + public String getTpcomp05() { + return tpcomp05; + } + + public void setTpcomp05(String tpcomp05) { + this.tpcomp05 = tpcomp05; + } + + public String getTpcomp06() { + return tpcomp06; + } + + public void setTpcomp06(String tpcomp06) { + this.tpcomp06 = tpcomp06; + } + + public String getTpcomp99() { + return tpcomp99; + } + + public void setTpcomp99(String tpcomp99) { + this.tpcomp99 = tpcomp99; + } + + public String getVcomp01() { + return vcomp01; + } + + public void setVcomp01(String vcomp01) { + this.vcomp01 = vcomp01; + } + + public String getVcomp02() { + return vcomp02; + } + + public void setVcomp02(String vcomp02) { + this.vcomp02 = vcomp02; + } + + public String getVcomp03() { + return vcomp03; + } + + public void setVcomp03(String vcomp03) { + this.vcomp03 = vcomp03; + } + + public String getVcomp04() { + return vcomp04; + } + + public void setVcomp04(String vcomp04) { + this.vcomp04 = vcomp04; + } + + public String getVcomp05() { + return vcomp05; + } + + public void setVcomp05(String vcomp05) { + this.vcomp05 = vcomp05; + } + + public String getVcomp06() { + return vcomp06; + } + + public void setVcomp06(String vcomp06) { + this.vcomp06 = vcomp06; + } + + public String getVcomp99() { + return vcomp99; + } + + public void setVcomp99(String vcomp99) { + this.vcomp99 = vcomp99; + } + + public String getpRedBC() { + return pRedBC; + } + + public void setpRedBC(String pRedBC) { + this.pRedBC = pRedBC; + } + + public String getDhrecbtoBPe() { + return dhrecbtoBPe; + } + + public void setDhrecbtoBPe(String dhrecbtoBPe) { + this.dhrecbtoBPe = dhrecbtoBPe; + } + + public boolean isActivoBPe() { + return activoBPe; + } + + public void setActivoBPe(boolean activoBPe) { + this.activoBPe = activoBPe; + } + + public int getMotivoCancelacionId() { + return motivoCancelacionId; + } + + public void setMotivoCancelacionId(int motivoCancelacionId) { + this.motivoCancelacionId = motivoCancelacionId; + } + + public String getIndContribuicaoPrevidenciaria() { + return indContribuicaoPrevidenciaria; + } + + public void setIndContribuicaoPrevidenciaria(String indContribuicaoPrevidenciaria) { + this.indContribuicaoPrevidenciaria = indContribuicaoPrevidenciaria; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoBPE.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoBPE.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoBPE.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoBPE.java index 00a34ef89..f6aabe556 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoBPE.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoBPE.java @@ -1,234 +1,234 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; - -import java.math.BigDecimal; - -public class ExportacaoBPETipoBPE { - - private String estabelecimento; - private String chaveEletronica; - private String serie; - private String numero; - private String dataEmissao; - private String situacaoDoc; - private String dataPrestacao; - private BigDecimal valorBruto; - private BigDecimal valorDesconto; - private String UFOrigem; - private String municipioOrigem; - private String UFDestino; - private String municipioDestino; - private String cstCofins; - private BigDecimal receitaTriCofins; - private String cstPis; - private BigDecimal receitaTributavelPis; - private String tipoBPe; - private String chaveEletronicaReferencia; - private String codigoContabil; - private String indContribuicaoPrevidenciaria; - private String tpDesconto; - - public ExportacaoBPETipoBPE() { - } - - public ExportacaoBPETipoBPE(String estabelecimento, String chaveEletronica, String serie, String numero, String dataEmissao, String situacaoDoc, String dataPrestacao, BigDecimal valorBruto, BigDecimal valorDesconto, String uFOrigem, String municipioOrigem, String uFDestino, String municipioDestino, String cstCofins, BigDecimal receitaTriCofins, String tipoBPe, String chaveEletronicaReferencia, String codigoContabil, String indContribuicaoPrevidenciaria, String tpDesconto, String cstPis) { - super(); - this.estabelecimento = estabelecimento; - this.chaveEletronica = chaveEletronica; - this.serie = serie; - this.numero = numero; - this.dataEmissao = dataEmissao; - this.situacaoDoc = situacaoDoc; - this.dataPrestacao = dataPrestacao; - this.valorBruto = valorBruto; - this.valorDesconto = valorDesconto; - this.UFOrigem = uFOrigem; - this.municipioOrigem = municipioOrigem; - this.UFDestino = uFDestino; - this.municipioDestino = municipioDestino; - this.cstCofins = cstCofins; - this.receitaTriCofins = receitaTriCofins; - this.tipoBPe = tipoBPe; - this.chaveEletronicaReferencia = chaveEletronicaReferencia; - this.codigoContabil = codigoContabil; - this.indContribuicaoPrevidenciaria = indContribuicaoPrevidenciaria; - this.tpDesconto = tpDesconto; - this.cstPis = cstPis; - } - - public String getEstabelecimento() { - return estabelecimento; - } - - public void setEstabelecimento(String estabelecimento) { - this.estabelecimento = estabelecimento; - } - - public String getChaveEletronica() { - return chaveEletronica; - } - - public void setChaveEletronica(String chaveEletronica) { - this.chaveEletronica = chaveEletronica; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public String getSituacaoDoc() { - return situacaoDoc; - } - - public void setSituacaoDoc(String situacaoDoc) { - this.situacaoDoc = situacaoDoc; - } - - public String getDataPrestacao() { - return dataPrestacao; - } - - public void setDataPrestacao(String dataPrestacao) { - this.dataPrestacao = dataPrestacao; - } - - public BigDecimal getValorBruto() { - return valorBruto; - } - - public void setValorBruto(BigDecimal valorBruto) { - this.valorBruto = valorBruto; - } - - public BigDecimal getValorDesconto() { - return valorDesconto; - } - - public void setValorDesconto(BigDecimal valorDesconto) { - this.valorDesconto = valorDesconto; - } - - public String getUFOrigem() { - return UFOrigem; - } - - public void setUFOrigem(String uFOrigem) { - this.UFOrigem = uFOrigem; - } - - public String getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(String municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public String getUFDestino() { - return UFDestino; - } - - public void setUFDestino(String uFDestino) { - this.UFDestino = uFDestino; - } - - public String getMunicipioDestino() { - return municipioDestino; - } - - public void setMunicipioDestino(String municipioDestino) { - this.municipioDestino = municipioDestino; - } - - public String getCstCofins() { - return cstCofins; - } - - public void setCstCofins(String cstCofins) { - this.cstCofins = cstCofins; - } - - public BigDecimal getReceitaTriCofins() { - return receitaTriCofins; - } - - public void setReceitaTriCofins(BigDecimal receitaTriCofins) { - this.receitaTriCofins = receitaTriCofins; - } - - public String getCstPis() { - return cstPis; - } - - public void setCstPis(String cstPis) { - this.cstPis = cstPis; - } - - public BigDecimal getReceitaTributavelPis() { - return receitaTributavelPis; - } - - public void setReceitaTributavelPis(BigDecimal receitaTributavelPis) { - this.receitaTributavelPis = receitaTributavelPis; - } - - public String getTipoBPe() { - return tipoBPe; - } - - public void setTipoBPe(String tipoBPe) { - this.tipoBPe = tipoBPe; - } - - public String getChaveEletronicaReferencia() { - return chaveEletronicaReferencia; - } - - public void setChaveEletronicaReferencia(String chaveEletronicaReferencia) { - this.chaveEletronicaReferencia = chaveEletronicaReferencia; - } - - public String getCodigoContabil() { - return codigoContabil; - } - - public void setCodigoContabil(String codigoContabil) { - this.codigoContabil = codigoContabil; - } - - public String getIndContribuicaoPrevidenciaria() { - return indContribuicaoPrevidenciaria; - } - - public void setIndContribuicaoPrevidenciaria(String indContribuicaoPrevidenciaria) { - this.indContribuicaoPrevidenciaria = indContribuicaoPrevidenciaria; - } - - public String getTpDesconto() { - return tpDesconto; - } - - public void setTpDesconto(String tpDesconto) { - this.tpDesconto = tpDesconto; - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; + +import java.math.BigDecimal; + +public class ExportacaoBPETipoBPE { + + private String estabelecimento; + private String chaveEletronica; + private String serie; + private String numero; + private String dataEmissao; + private String situacaoDoc; + private String dataPrestacao; + private BigDecimal valorBruto; + private BigDecimal valorDesconto; + private String UFOrigem; + private String municipioOrigem; + private String UFDestino; + private String municipioDestino; + private String cstCofins; + private BigDecimal receitaTriCofins; + private String cstPis; + private BigDecimal receitaTributavelPis; + private String tipoBPe; + private String chaveEletronicaReferencia; + private String codigoContabil; + private String indContribuicaoPrevidenciaria; + private String tpDesconto; + + public ExportacaoBPETipoBPE() { + } + + public ExportacaoBPETipoBPE(String estabelecimento, String chaveEletronica, String serie, String numero, String dataEmissao, String situacaoDoc, String dataPrestacao, BigDecimal valorBruto, BigDecimal valorDesconto, String uFOrigem, String municipioOrigem, String uFDestino, String municipioDestino, String cstCofins, BigDecimal receitaTriCofins, String tipoBPe, String chaveEletronicaReferencia, String codigoContabil, String indContribuicaoPrevidenciaria, String tpDesconto, String cstPis) { + super(); + this.estabelecimento = estabelecimento; + this.chaveEletronica = chaveEletronica; + this.serie = serie; + this.numero = numero; + this.dataEmissao = dataEmissao; + this.situacaoDoc = situacaoDoc; + this.dataPrestacao = dataPrestacao; + this.valorBruto = valorBruto; + this.valorDesconto = valorDesconto; + this.UFOrigem = uFOrigem; + this.municipioOrigem = municipioOrigem; + this.UFDestino = uFDestino; + this.municipioDestino = municipioDestino; + this.cstCofins = cstCofins; + this.receitaTriCofins = receitaTriCofins; + this.tipoBPe = tipoBPe; + this.chaveEletronicaReferencia = chaveEletronicaReferencia; + this.codigoContabil = codigoContabil; + this.indContribuicaoPrevidenciaria = indContribuicaoPrevidenciaria; + this.tpDesconto = tpDesconto; + this.cstPis = cstPis; + } + + public String getEstabelecimento() { + return estabelecimento; + } + + public void setEstabelecimento(String estabelecimento) { + this.estabelecimento = estabelecimento; + } + + public String getChaveEletronica() { + return chaveEletronica; + } + + public void setChaveEletronica(String chaveEletronica) { + this.chaveEletronica = chaveEletronica; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public String getSituacaoDoc() { + return situacaoDoc; + } + + public void setSituacaoDoc(String situacaoDoc) { + this.situacaoDoc = situacaoDoc; + } + + public String getDataPrestacao() { + return dataPrestacao; + } + + public void setDataPrestacao(String dataPrestacao) { + this.dataPrestacao = dataPrestacao; + } + + public BigDecimal getValorBruto() { + return valorBruto; + } + + public void setValorBruto(BigDecimal valorBruto) { + this.valorBruto = valorBruto; + } + + public BigDecimal getValorDesconto() { + return valorDesconto; + } + + public void setValorDesconto(BigDecimal valorDesconto) { + this.valorDesconto = valorDesconto; + } + + public String getUFOrigem() { + return UFOrigem; + } + + public void setUFOrigem(String uFOrigem) { + this.UFOrigem = uFOrigem; + } + + public String getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(String municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public String getUFDestino() { + return UFDestino; + } + + public void setUFDestino(String uFDestino) { + this.UFDestino = uFDestino; + } + + public String getMunicipioDestino() { + return municipioDestino; + } + + public void setMunicipioDestino(String municipioDestino) { + this.municipioDestino = municipioDestino; + } + + public String getCstCofins() { + return cstCofins; + } + + public void setCstCofins(String cstCofins) { + this.cstCofins = cstCofins; + } + + public BigDecimal getReceitaTriCofins() { + return receitaTriCofins; + } + + public void setReceitaTriCofins(BigDecimal receitaTriCofins) { + this.receitaTriCofins = receitaTriCofins; + } + + public String getCstPis() { + return cstPis; + } + + public void setCstPis(String cstPis) { + this.cstPis = cstPis; + } + + public BigDecimal getReceitaTributavelPis() { + return receitaTributavelPis; + } + + public void setReceitaTributavelPis(BigDecimal receitaTributavelPis) { + this.receitaTributavelPis = receitaTributavelPis; + } + + public String getTipoBPe() { + return tipoBPe; + } + + public void setTipoBPe(String tipoBPe) { + this.tipoBPe = tipoBPe; + } + + public String getChaveEletronicaReferencia() { + return chaveEletronicaReferencia; + } + + public void setChaveEletronicaReferencia(String chaveEletronicaReferencia) { + this.chaveEletronicaReferencia = chaveEletronicaReferencia; + } + + public String getCodigoContabil() { + return codigoContabil; + } + + public void setCodigoContabil(String codigoContabil) { + this.codigoContabil = codigoContabil; + } + + public String getIndContribuicaoPrevidenciaria() { + return indContribuicaoPrevidenciaria; + } + + public void setIndContribuicaoPrevidenciaria(String indContribuicaoPrevidenciaria) { + this.indContribuicaoPrevidenciaria = indContribuicaoPrevidenciaria; + } + + public String getTpDesconto() { + return tpDesconto; + } + + public void setTpDesconto(String tpDesconto) { + this.tpDesconto = tpDesconto; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoDPE.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoDPE.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoDPE.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoDPE.java index f5aaadbdb..339321854 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoDPE.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoDPE.java @@ -1,105 +1,105 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; - -import java.math.BigDecimal; - -public class ExportacaoBPETipoDPE { - - private BigDecimal valor; - private String cfop; - private String cstb; - private String csosnb; - private BigDecimal baseCalculoICMS; - private BigDecimal aliquotaICMS; - private BigDecimal icms; - private BigDecimal isentas; - private BigDecimal outras; - - public ExportacaoBPETipoDPE() { - } - - public ExportacaoBPETipoDPE(BigDecimal valor, String cfop, String cstb, String csosnb, BigDecimal baseCalculoICMS, BigDecimal aliquotaICMS, BigDecimal icms, BigDecimal isentas, BigDecimal outras) { - super(); - this.valor = valor; - this.cfop = cfop; - this.cstb = cstb; - this.csosnb = csosnb; - this.baseCalculoICMS = baseCalculoICMS; - this.aliquotaICMS = aliquotaICMS; - this.icms = icms; - this.isentas = isentas; - this.outras = outras; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public String getCfop() { - return cfop; - } - - public void setCfop(String cfop) { - this.cfop = cfop; - } - - public String getCstb() { - return cstb; - } - - public void setCstb(String cstb) { - this.cstb = cstb; - } - - public String getCsosnb() { - return csosnb; - } - - public void setCsosnb(String csosnb) { - this.csosnb = csosnb; - } - - public BigDecimal getBaseCalculoICMS() { - return baseCalculoICMS; - } - - public void setBaseCalculoICMS(BigDecimal baseCalculoICMS) { - this.baseCalculoICMS = baseCalculoICMS; - } - - public BigDecimal getAliquotaICMS() { - return aliquotaICMS; - } - - public void setAliquotaICMS(BigDecimal aliquotaICMS) { - this.aliquotaICMS = aliquotaICMS; - } - - public BigDecimal getIcms() { - return icms; - } - - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - - public BigDecimal getIsentas() { - return isentas; - } - - public void setIsentas(BigDecimal isentas) { - this.isentas = isentas; - } - - public BigDecimal getOutras() { - return outras; - } - - public void setOutras(BigDecimal outras) { - this.outras = outras; - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; + +import java.math.BigDecimal; + +public class ExportacaoBPETipoDPE { + + private BigDecimal valor; + private String cfop; + private String cstb; + private String csosnb; + private BigDecimal baseCalculoICMS; + private BigDecimal aliquotaICMS; + private BigDecimal icms; + private BigDecimal isentas; + private BigDecimal outras; + + public ExportacaoBPETipoDPE() { + } + + public ExportacaoBPETipoDPE(BigDecimal valor, String cfop, String cstb, String csosnb, BigDecimal baseCalculoICMS, BigDecimal aliquotaICMS, BigDecimal icms, BigDecimal isentas, BigDecimal outras) { + super(); + this.valor = valor; + this.cfop = cfop; + this.cstb = cstb; + this.csosnb = csosnb; + this.baseCalculoICMS = baseCalculoICMS; + this.aliquotaICMS = aliquotaICMS; + this.icms = icms; + this.isentas = isentas; + this.outras = outras; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public String getCfop() { + return cfop; + } + + public void setCfop(String cfop) { + this.cfop = cfop; + } + + public String getCstb() { + return cstb; + } + + public void setCstb(String cstb) { + this.cstb = cstb; + } + + public String getCsosnb() { + return csosnb; + } + + public void setCsosnb(String csosnb) { + this.csosnb = csosnb; + } + + public BigDecimal getBaseCalculoICMS() { + return baseCalculoICMS; + } + + public void setBaseCalculoICMS(BigDecimal baseCalculoICMS) { + this.baseCalculoICMS = baseCalculoICMS; + } + + public BigDecimal getAliquotaICMS() { + return aliquotaICMS; + } + + public void setAliquotaICMS(BigDecimal aliquotaICMS) { + this.aliquotaICMS = aliquotaICMS; + } + + public BigDecimal getIcms() { + return icms; + } + + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + + public BigDecimal getIsentas() { + return isentas; + } + + public void setIsentas(BigDecimal isentas) { + this.isentas = isentas; + } + + public BigDecimal getOutras() { + return outras; + } + + public void setOutras(BigDecimal outras) { + this.outras = outras; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoOBE.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoOBE.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoOBE.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoOBE.java index 341537035..417fa74b5 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoOBE.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoOBE.java @@ -1,35 +1,35 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; - -import java.math.BigDecimal; - -public class ExportacaoBPETipoOBE { - - private String codigo; - private BigDecimal valor; - - public ExportacaoBPETipoOBE() { - } - - public ExportacaoBPETipoOBE(String codigo, BigDecimal valor) { - super(); - this.codigo = codigo; - this.valor = valor; - } - - public String getCodigo() { - return codigo; - } - - public void setCodigo(String codigo) { - this.codigo = codigo; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; + +import java.math.BigDecimal; + +public class ExportacaoBPETipoOBE { + + private String codigo; + private BigDecimal valor; + + public ExportacaoBPETipoOBE() { + } + + public ExportacaoBPETipoOBE(String codigo, BigDecimal valor) { + super(); + this.codigo = codigo; + this.valor = valor; + } + + public String getCodigo() { + return codigo; + } + + public void setCodigo(String codigo) { + this.codigo = codigo; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoPRC.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoPRC.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoPRC.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoPRC.java index 6636d4b6f..a90413cd8 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoPRC.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPETipoPRC.java @@ -1,65 +1,65 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; - -import java.math.BigDecimal; - -public class ExportacaoBPETipoPRC { - - private String uf; - private String municipio; - private BigDecimal valor; - private BigDecimal baseCalculoICMS; - private BigDecimal icms; - - public ExportacaoBPETipoPRC() { - } - - public ExportacaoBPETipoPRC(String uf, String municipio, BigDecimal valor, BigDecimal baseCalculoICMS, BigDecimal icms) { - super(); - this.uf = uf; - this.municipio = municipio; - this.valor = valor; - this.baseCalculoICMS = baseCalculoICMS; - this.icms = icms; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getMunicipio() { - return municipio; - } - - public void setMunicipio(String municipio) { - this.municipio = municipio; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public BigDecimal getBaseCalculoICMS() { - return baseCalculoICMS; - } - - public void setBaseCalculoICMS(BigDecimal baseCalculoICMS) { - this.baseCalculoICMS = baseCalculoICMS; - } - - public BigDecimal getIcms() { - return icms; - } - - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; + +import java.math.BigDecimal; + +public class ExportacaoBPETipoPRC { + + private String uf; + private String municipio; + private BigDecimal valor; + private BigDecimal baseCalculoICMS; + private BigDecimal icms; + + public ExportacaoBPETipoPRC() { + } + + public ExportacaoBPETipoPRC(String uf, String municipio, BigDecimal valor, BigDecimal baseCalculoICMS, BigDecimal icms) { + super(); + this.uf = uf; + this.municipio = municipio; + this.valor = valor; + this.baseCalculoICMS = baseCalculoICMS; + this.icms = icms; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getMunicipio() { + return municipio; + } + + public void setMunicipio(String municipio) { + this.municipio = municipio; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public BigDecimal getBaseCalculoICMS() { + return baseCalculoICMS; + } + + public void setBaseCalculoICMS(BigDecimal baseCalculoICMS) { + this.baseCalculoICMS = baseCalculoICMS; + } + + public BigDecimal getIcms() { + return icms; + } + + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java index 04702dc3c..49420482a 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java @@ -1,406 +1,406 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil; - -import br.inf.portalfiscal.bpe.TBPe; - -public class ExportacaoBPEVo { - - static String VAZIO = ""; - static final BigDecimal ZERO = BigDecimal.ZERO; - static int MOTIVO_CANCELACION_AGRUPACION_CORRIDA = 17; - - public class StatusBpe { - static final String CONTIGENCIA_ENVIADA = "-1"; - static final String VENDA = "100"; - static final String CANCELAMENTO_BPE_HOMOLOGADO = "101"; - static final String SUBSTITUICAO_BPE_HOMOLOGADA = "102"; - static final String VENDA_CONTIGENCIA = "150"; - static final String EVENTOS = "135"; - } - - public class EventosBpe { - static final String CANCELAMENTO = "110111"; - static final String NAO_EMBARQUE = "110115"; - static final String TROCA_POLTRONA = "110116"; - } - - public static class CrtBpe { - static final Integer SIMPLES_NACIONAL = 1; - static final Integer SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA = 2; - static final Integer REGIME_NORMAL = 3; - } - - public class TipoComp { - public static final String TARIFA = "01"; - public static final String PEDAGIO = "02"; - public static final String TAXA_EMBARQUE = "03"; - public static final String SEGURO = "04"; - public static final String TAXA_MANUTENCAO_RODOVIA = "05"; - public static final String SERVICO_VENDA_INTEGRADA = "06"; - public static final String OUTROS = "99"; - - } - - private List listaRegistroBaseBPE; - - public ExportacaoBPEVo() { - listaRegistroBaseBPE = new ArrayList(0); - } - - public List getListaRegistroBaseBPE() { - return listaRegistroBaseBPE; - } - - public void setListaRegistroBaseBPE(List listaRegistroBaseBPE) { - this.listaRegistroBaseBPE = listaRegistroBaseBPE; - } - - public static boolean isBpeCancelado(String codstatus) { - return (codstatus == null ? false : (codstatus.equals(StatusBpe.EVENTOS) || codstatus.equals(StatusBpe.CANCELAMENTO_BPE_HOMOLOGADO))); - } - - public static boolean validaBPeCorridaAgrupada(ExportacaoBPEBase registro) { - if (registro.getMotivoCancelacionId() == MOTIVO_CANCELACION_AGRUPACION_CORRIDA) { - return true; - } else { - if (!StringUtils.equals(registro.getDhEmisao(), registro.getDhrecbtoBPe()) - && registro.isActivoBPe() && StringUtils.equals(registro.getCodstatus(), StatusBpe.VENDA)) { - return true; - } else { - return false; - } - } - } - - public static ExportacaoBPEBase gerarListas(ExportacaoBPEBase registro) { - - String indContribuicaoPrevidenciaria = StringUtils.isBlank(registro.getIndContribuicaoPrevidenciaria()) ? "00000060" : StringUtils.leftPad(registro.getIndContribuicaoPrevidenciaria(), 8, "0"); - boolean isCancelamento = isBpeCancelado(registro.getCodstatus()); - String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0"); - String numBpe = StringUtils.isBlank(registro.getNbp()) ? registro.getNumBpe() : registro.getNbp(); - String dhEmisao = registro.getDhEmisao(); - - if (isCancelamento) { - - ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), - registro.getChbpe(), registro.getNumSerieBpe(), - numBpe, dhEmisao, tpDoc, VAZIO, null, null, - VAZIO, VAZIO, VAZIO, VAZIO, VAZIO, null, VAZIO, VAZIO, VAZIO, - VAZIO, registro.getRetorno(), VAZIO); - registro.getListaRegistroBPE().add(tipoBPE); - - } else { - String municipioOrigem = StringUtils.substring(registro.getCmunini(), 2); - String municipioDestino = StringUtils.substring(registro.getCmunfim(), 2); - String estadoOrigem = registro.getUfini(); - String estadoDestino = registro.getUffim(); - - boolean isInterMunicipal = estadoOrigem.equals(estadoDestino); - String codigoContabil = isInterMunicipal ? registro.getCodigocontabilMunicipal() : registro.getCodigoContabilEstadual(); - - String dataPrestacao = StringUtils.isBlank(registro.getDhemb()) ? registro.getDhrecbto() - : DateUtil.changeFormatStringDate(registro.getDhemb(), DateUtil.formatGMT, DateUtil.formatExp); - - String vBC = null; - String pICMS = null; - String vICMS = null; - String cst = null; - String pRedBC = null; - String vBP = null; - String vDesconto = null; - String vPgto = null; - - String vTxEmbarque = null; - String vPedagio = null; - String vSeguro = null; - - if (StringUtils.isNotBlank(registro.getPicms00())) { - vBC = registro.getVbc00(); - pICMS = registro.getPicms00(); - vICMS = registro.getVicms00(); - } else if (StringUtils.isNotBlank(registro.getPicms20())) { - vBC = registro.getVbc20(); - pICMS = registro.getPicms20(); - vICMS = registro.getVicms20(); - pRedBC = registro.getpRedBC(); - } - - vBP = registro.getVbp(); - vDesconto = registro.getVdesconto(); - vPgto = registro.getVpgto(); - - vPedagio = (isInterMunicipal && !registro.getIndPedadioEstdual()) ? (registro.getVcomp02() == null ? "0.0" : registro.getVcomp02()) : "0.0"; - if (vPedagio.equals("0.0")) - vPedagio = (!isInterMunicipal && !registro.getIndPedagioMunicipal()) ? (registro.getVcomp02() == null ? "0.0" : registro.getVcomp02()) : "0.0"; - - vTxEmbarque = (isInterMunicipal && !registro.getIndTxEmbarqueEstadual()) ? (registro.getVcomp03() == null ? "0.0" : registro.getVcomp03()) : "0.0"; - if (vTxEmbarque.equals("0.0")) - vTxEmbarque = (!isInterMunicipal && !registro.getIndTxEmbarqueMunicipal()) ? (registro.getVcomp03() == null ? "0.0" : registro.getVcomp03()) : "0.0"; - - vSeguro = (isInterMunicipal && !registro.getIndSeguroEstadual()) ? (registro.getVcomp04() == null ? "0.0" : registro.getVcomp04()) : "0.0"; - if (vSeguro.equals("0.0")) - vSeguro = (!isInterMunicipal && !registro.getIndSeguroMunicipal()) ? (registro.getVcomp04() == null ? "0.0" : registro.getVcomp04()) : "0.0"; - - // validar cst enviado - if (StringUtils.isNotBlank(registro.getCst00())) - cst = registro.getCst00(); - else if (StringUtils.isNotBlank(registro.getCst20())) - cst = registro.getCst20(); - else if (StringUtils.isNotBlank(registro.getCst45())) - cst = registro.getCst45(); - else if (StringUtils.isNotBlank(registro.getCst90())) - cst = registro.getCst90(); - else if (StringUtils.isNotBlank(registro.getCstoutrauf())) - cst = registro.getCstoutrauf(); - else if (StringUtils.isNotBlank(registro.getCstsn())) - cst = registro.getCstsn(); - - String cstCofins = "01"; - String cstPis = "01"; - - // dependende dos parametros - BigDecimal valorPago = new BigDecimal(vPgto == null ? "0.0" : vPgto); - BigDecimal txEmbarque = new BigDecimal(vTxEmbarque == null ? "0.0" : vTxEmbarque); - BigDecimal pedagio = new BigDecimal(vPedagio == null ? "0.0" : vPedagio); - BigDecimal seguro = new BigDecimal(vSeguro == null ? "0.0" : vSeguro); - - BigDecimal txExtras = txEmbarque.add(pedagio).add(seguro); - - BigDecimal receitaTriCofins = new BigDecimal(vBC == null ? "0.0" : vBC); - if (pRedBC != null) { - receitaTriCofins = valorPago.subtract(txExtras); - } - - BigDecimal valorBruto = StringUtils.isBlank(vBP) ? registro.getValortotal() : new BigDecimal(vBP == null ? "0.0" : vBP); - BigDecimal desconto = StringUtils.isBlank(vDesconto) ? registro.getvDesconto() : new BigDecimal(vDesconto == null ? "0.0" : vDesconto); - - String chbpeSub = registro.getChbpeSub(); - String tpBpe = StringUtils.isBlank(registro.getChbpeSub()) ? "1" : "2"; - - ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), - numBpe, dhEmisao, tpDoc, dataPrestacao, valorBruto, - desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino, - cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil, - indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis); - - registro.getListaRegistroBPE().add(tipoBPE); - - String cfop = isInterMunicipal ? "5357" : "6357"; - - String csosnb = ""; - if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL)) { - csosnb = CrtBpe.SIMPLES_NACIONAL.toString(); - csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); - } else if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA)) { - csosnb = CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA.toString(); - csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); - } - - BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC); - BigDecimal aliquotaICMS = new BigDecimal(pICMS == null ? "0.0" : pICMS); - BigDecimal icms = new BigDecimal(vICMS == null ? "0.0" : vICMS); - - BigDecimal isentas = registro.getValortotal().subtract(baseCalculoICMS); - if (pRedBC != null) { - isentas = txExtras; - } - - BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC); - if (pRedBC != null) { - outras = valorPago.subtract(baseCalculoICMS); - outras = outras.subtract(isentas); - } - - ExportacaoBPETipoDPE tipoDPE = new ExportacaoBPETipoDPE(registro.getValortotal(), cfop, cst, csosnb, - baseCalculoICMS, aliquotaICMS, icms, isentas, outras); - registro.getListaRegistroDPE().add(tipoDPE); - - } - - return registro; - } - - /* - * Apos a Implementação dos novos campos na taleta BPE na venda não utilizar mais este metodo para importação de dados BPe - */ - @Deprecated - public static ExportacaoBPEBase gerarListasXML(ExportacaoBPEBase registro) { - - String indContribuicaoPrevidenciaria = StringUtils.isBlank(registro.getIndContribuicaoPrevidenciaria()) ? "00000060" : StringUtils.leftPad(registro.getIndContribuicaoPrevidenciaria(), 8, "0"); - - boolean isCancelamento = isBpeCancelado(registro.getCodstatus()); - - String numBpe = registro.getNumBpe(); - String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0"); - String dhEmisao = registro.getDhEmisao(); - - if (isCancelamento) { - ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), - numBpe, dhEmisao, tpDoc, VAZIO, null, null, - VAZIO, VAZIO, VAZIO, VAZIO, VAZIO, null, VAZIO, VAZIO, VAZIO, - VAZIO, registro.getRetorno(), VAZIO); - - registro.getListaRegistroBPE().add(tipoBPE); - - } else { - - TBPe tbpe = null; - String xml = StringUtils.isNotBlank(registro.getXmlAnterior()) ? registro.getXmlAnterior() : registro.getXml(); - - if (StringUtils.isNotBlank(xml)) - tbpe = BPeUtil.convertXmlToBpe(xml); - - String municipioOrigem = StringUtils.substring((StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getCMunIni() : registro.getMunicipioOrigem()), 2); - String municipioDestino = StringUtils.substring((StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getCMunFim() : registro.getMunicipioDestino()), 2); - String estadoOrigem = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFIni().value() : registro.getEstadoOrigem()); - String estadoDestino = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFFim().value() : registro.getEstadoDestino()); - - boolean isInterMunicipal = estadoOrigem.equals(estadoDestino); - String codigoContabil = isInterMunicipal ? registro.getCodigocontabilMunicipal() : registro.getCodigoContabilEstadual(); - numBpe = StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getNBP() : registro.getNumBpe(); - String dataPrestacao = StringUtils.isBlank(xml) ? registro.getDhrecbto() - : DateUtil.changeFormatStringDate(tbpe.getInfBPe().getInfPassagem().getDhEmb(), DateUtil.formatGMT, DateUtil.formatExp); - - String vBC = null; - String pICMS = null; - String vICMS = null; - String cst = null; - String pRedBC = null; - String vBP = null; - String vDesconto = null; - String vPgto = null; - - String vTxEmbarque = null; - String vPedagio = null; - String vSeguro = null; - - if (StringUtils.isNotBlank(xml)) { - if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) { - vBC = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVBC(); - pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS00().getPICMS(); - vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVICMS(); - } else if (tbpe.getInfBPe().getImp().getICMS().getICMS20() != null) { - vBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVBC(); - pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPICMS(); - vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVICMS(); - pRedBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPRedBC(); - } - - if (tbpe.getInfBPe().getInfValorBPe() != null) { - vBP = tbpe.getInfBPe().getInfValorBPe().getVBP(); - vDesconto = tbpe.getInfBPe().getInfValorBPe().getVDesconto(); - vPgto = tbpe.getInfBPe().getInfValorBPe().getVPgto(); - - for (TBPe.InfBPe.InfValorBPe.Comp comp : tbpe.getInfBPe().getInfValorBPe().getComp()) { - - if (comp.getTpComp().equals(TipoComp.PEDAGIO)) { - vPedagio = (isInterMunicipal && !registro.getIndPedadioEstdual()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; - if (vPedagio.equals("0.0")) - vPedagio = (!isInterMunicipal && !registro.getIndPedagioMunicipal()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; - } - - if (comp.getTpComp().equals(TipoComp.TAXA_EMBARQUE)) { - vTxEmbarque = (isInterMunicipal && !registro.getIndTxEmbarqueEstadual()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; - if (vTxEmbarque.equals("0.0")) - vTxEmbarque = (!isInterMunicipal && !registro.getIndTxEmbarqueMunicipal()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; - } - - if (comp.getTpComp().equals(TipoComp.SEGURO)) { - vSeguro = (isInterMunicipal && !registro.getIndSeguroEstadual()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; - if (vSeguro.equals("0.0")) - vSeguro = (!isInterMunicipal && !registro.getIndSeguroMunicipal()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; - } - } - } - - // validar cst enviado - if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) - cst = tbpe.getInfBPe().getImp().getICMS().getICMS00().getCST(); - else if (tbpe.getInfBPe().getImp().getICMS().getICMS20() != null) - cst = tbpe.getInfBPe().getImp().getICMS().getICMS20().getCST(); - else if (tbpe.getInfBPe().getImp().getICMS().getICMS45() != null) - cst = tbpe.getInfBPe().getImp().getICMS().getICMS45().getCST(); - else if (tbpe.getInfBPe().getImp().getICMS().getICMS90() != null) - cst = tbpe.getInfBPe().getImp().getICMS().getICMS90().getCST(); - else if (tbpe.getInfBPe().getImp().getICMS().getICMSOutraUF() != null) - cst = tbpe.getInfBPe().getImp().getICMS().getICMSOutraUF().getCST(); - else if (tbpe.getInfBPe().getImp().getICMS().getICMSSN() != null) - cst = tbpe.getInfBPe().getImp().getICMS().getICMSSN().getCST(); - - } - - String cstCofins = "01"; - String cstPis = "01"; - - // dependende dos parametros - BigDecimal valorPago = new BigDecimal(vPgto == null ? "0.0" : vPgto); - BigDecimal txEmbarque = new BigDecimal(vTxEmbarque == null ? "0.0" : vTxEmbarque); - BigDecimal pedagio = new BigDecimal(vPedagio == null ? "0.0" : vPedagio); - BigDecimal seguro = new BigDecimal(vSeguro == null ? "0.0" : vSeguro); - - BigDecimal txExtras = txEmbarque.add(pedagio).add(seguro); - - BigDecimal receitaTriCofins = new BigDecimal(vBC == null ? "0.0" : vBC); - if (pRedBC != null) { - receitaTriCofins = valorPago.subtract(txExtras); - } - - BigDecimal valorBruto = StringUtils.isBlank(xml) ? registro.getValortotal() : new BigDecimal(vBP == null ? "0.0" : vBP); - BigDecimal desconto = StringUtils.isBlank(xml) ? registro.getvDesconto() : new BigDecimal(vDesconto == null ? "0.0" : vDesconto); - - String chbpeSub = StringUtils.isBlank(xml) ? "" : (tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()); - String tpBpe = StringUtils.isBlank(xml) ? "" : (StringUtils.isBlank(tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()) ? "1" : "2"); - - ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), - numBpe, dhEmisao, tpDoc, dataPrestacao, valorBruto, - desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino, - cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil, - indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis); - - registro.getListaRegistroBPE().add(tipoBPE); - - String cfop = isInterMunicipal ? "5357" : "6357"; - - String csosnb = ""; - if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL)) { - csosnb = CrtBpe.SIMPLES_NACIONAL.toString(); - csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); - } else if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA)) { - csosnb = CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA.toString(); - csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); - } - - BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC); - BigDecimal aliquotaICMS = new BigDecimal(pICMS == null ? "0.0" : pICMS); - BigDecimal icms = new BigDecimal(vICMS == null ? "0.0" : vICMS); - - BigDecimal isentas = registro.getValortotal().subtract(baseCalculoICMS); - if (pRedBC != null) { - isentas = txExtras; - } - - BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC); - if (pRedBC != null) { - outras = valorPago.subtract(baseCalculoICMS); - outras = outras.subtract(isentas); - } - - ExportacaoBPETipoDPE tipoDPE = new ExportacaoBPETipoDPE(registro.getValortotal(), cfop, cst, csosnb, - baseCalculoICMS, aliquotaICMS, icms, isentas, outras); - registro.getListaRegistroDPE().add(tipoDPE); - - } - - return registro; - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil; + +import br.inf.portalfiscal.bpe.TBPe; + +public class ExportacaoBPEVo { + + static String VAZIO = ""; + static final BigDecimal ZERO = BigDecimal.ZERO; + static int MOTIVO_CANCELACION_AGRUPACION_CORRIDA = 17; + + public class StatusBpe { + static final String CONTIGENCIA_ENVIADA = "-1"; + static final String VENDA = "100"; + static final String CANCELAMENTO_BPE_HOMOLOGADO = "101"; + static final String SUBSTITUICAO_BPE_HOMOLOGADA = "102"; + static final String VENDA_CONTIGENCIA = "150"; + static final String EVENTOS = "135"; + } + + public class EventosBpe { + static final String CANCELAMENTO = "110111"; + static final String NAO_EMBARQUE = "110115"; + static final String TROCA_POLTRONA = "110116"; + } + + public static class CrtBpe { + static final Integer SIMPLES_NACIONAL = 1; + static final Integer SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA = 2; + static final Integer REGIME_NORMAL = 3; + } + + public class TipoComp { + public static final String TARIFA = "01"; + public static final String PEDAGIO = "02"; + public static final String TAXA_EMBARQUE = "03"; + public static final String SEGURO = "04"; + public static final String TAXA_MANUTENCAO_RODOVIA = "05"; + public static final String SERVICO_VENDA_INTEGRADA = "06"; + public static final String OUTROS = "99"; + + } + + private List listaRegistroBaseBPE; + + public ExportacaoBPEVo() { + listaRegistroBaseBPE = new ArrayList(0); + } + + public List getListaRegistroBaseBPE() { + return listaRegistroBaseBPE; + } + + public void setListaRegistroBaseBPE(List listaRegistroBaseBPE) { + this.listaRegistroBaseBPE = listaRegistroBaseBPE; + } + + public static boolean isBpeCancelado(String codstatus) { + return (codstatus == null ? false : (codstatus.equals(StatusBpe.EVENTOS) || codstatus.equals(StatusBpe.CANCELAMENTO_BPE_HOMOLOGADO))); + } + + public static boolean validaBPeCorridaAgrupada(ExportacaoBPEBase registro) { + if (registro.getMotivoCancelacionId() == MOTIVO_CANCELACION_AGRUPACION_CORRIDA) { + return true; + } else { + if (!StringUtils.equals(registro.getDhEmisao(), registro.getDhrecbtoBPe()) + && registro.isActivoBPe() && StringUtils.equals(registro.getCodstatus(), StatusBpe.VENDA)) { + return true; + } else { + return false; + } + } + } + + public static ExportacaoBPEBase gerarListas(ExportacaoBPEBase registro) { + + String indContribuicaoPrevidenciaria = StringUtils.isBlank(registro.getIndContribuicaoPrevidenciaria()) ? "00000060" : StringUtils.leftPad(registro.getIndContribuicaoPrevidenciaria(), 8, "0"); + boolean isCancelamento = isBpeCancelado(registro.getCodstatus()); + String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0"); + String numBpe = StringUtils.isBlank(registro.getNbp()) ? registro.getNumBpe() : registro.getNbp(); + String dhEmisao = registro.getDhEmisao(); + + if (isCancelamento) { + + ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), + registro.getChbpe(), registro.getNumSerieBpe(), + numBpe, dhEmisao, tpDoc, VAZIO, null, null, + VAZIO, VAZIO, VAZIO, VAZIO, VAZIO, null, VAZIO, VAZIO, VAZIO, + VAZIO, registro.getRetorno(), VAZIO); + registro.getListaRegistroBPE().add(tipoBPE); + + } else { + String municipioOrigem = StringUtils.substring(registro.getCmunini(), 2); + String municipioDestino = StringUtils.substring(registro.getCmunfim(), 2); + String estadoOrigem = registro.getUfini(); + String estadoDestino = registro.getUffim(); + + boolean isInterMunicipal = estadoOrigem.equals(estadoDestino); + String codigoContabil = isInterMunicipal ? registro.getCodigocontabilMunicipal() : registro.getCodigoContabilEstadual(); + + String dataPrestacao = StringUtils.isBlank(registro.getDhemb()) ? registro.getDhrecbto() + : DateUtil.changeFormatStringDate(registro.getDhemb(), DateUtil.formatGMT, DateUtil.formatExp); + + String vBC = null; + String pICMS = null; + String vICMS = null; + String cst = null; + String pRedBC = null; + String vBP = null; + String vDesconto = null; + String vPgto = null; + + String vTxEmbarque = null; + String vPedagio = null; + String vSeguro = null; + + if (StringUtils.isNotBlank(registro.getPicms00())) { + vBC = registro.getVbc00(); + pICMS = registro.getPicms00(); + vICMS = registro.getVicms00(); + } else if (StringUtils.isNotBlank(registro.getPicms20())) { + vBC = registro.getVbc20(); + pICMS = registro.getPicms20(); + vICMS = registro.getVicms20(); + pRedBC = registro.getpRedBC(); + } + + vBP = registro.getVbp(); + vDesconto = registro.getVdesconto(); + vPgto = registro.getVpgto(); + + vPedagio = (isInterMunicipal && !registro.getIndPedadioEstdual()) ? (registro.getVcomp02() == null ? "0.0" : registro.getVcomp02()) : "0.0"; + if (vPedagio.equals("0.0")) + vPedagio = (!isInterMunicipal && !registro.getIndPedagioMunicipal()) ? (registro.getVcomp02() == null ? "0.0" : registro.getVcomp02()) : "0.0"; + + vTxEmbarque = (isInterMunicipal && !registro.getIndTxEmbarqueEstadual()) ? (registro.getVcomp03() == null ? "0.0" : registro.getVcomp03()) : "0.0"; + if (vTxEmbarque.equals("0.0")) + vTxEmbarque = (!isInterMunicipal && !registro.getIndTxEmbarqueMunicipal()) ? (registro.getVcomp03() == null ? "0.0" : registro.getVcomp03()) : "0.0"; + + vSeguro = (isInterMunicipal && !registro.getIndSeguroEstadual()) ? (registro.getVcomp04() == null ? "0.0" : registro.getVcomp04()) : "0.0"; + if (vSeguro.equals("0.0")) + vSeguro = (!isInterMunicipal && !registro.getIndSeguroMunicipal()) ? (registro.getVcomp04() == null ? "0.0" : registro.getVcomp04()) : "0.0"; + + // validar cst enviado + if (StringUtils.isNotBlank(registro.getCst00())) + cst = registro.getCst00(); + else if (StringUtils.isNotBlank(registro.getCst20())) + cst = registro.getCst20(); + else if (StringUtils.isNotBlank(registro.getCst45())) + cst = registro.getCst45(); + else if (StringUtils.isNotBlank(registro.getCst90())) + cst = registro.getCst90(); + else if (StringUtils.isNotBlank(registro.getCstoutrauf())) + cst = registro.getCstoutrauf(); + else if (StringUtils.isNotBlank(registro.getCstsn())) + cst = registro.getCstsn(); + + String cstCofins = "01"; + String cstPis = "01"; + + // dependende dos parametros + BigDecimal valorPago = new BigDecimal(vPgto == null ? "0.0" : vPgto); + BigDecimal txEmbarque = new BigDecimal(vTxEmbarque == null ? "0.0" : vTxEmbarque); + BigDecimal pedagio = new BigDecimal(vPedagio == null ? "0.0" : vPedagio); + BigDecimal seguro = new BigDecimal(vSeguro == null ? "0.0" : vSeguro); + + BigDecimal txExtras = txEmbarque.add(pedagio).add(seguro); + + BigDecimal receitaTriCofins = new BigDecimal(vBC == null ? "0.0" : vBC); + if (pRedBC != null) { + receitaTriCofins = valorPago.subtract(txExtras); + } + + BigDecimal valorBruto = StringUtils.isBlank(vBP) ? registro.getValortotal() : new BigDecimal(vBP == null ? "0.0" : vBP); + BigDecimal desconto = StringUtils.isBlank(vDesconto) ? registro.getvDesconto() : new BigDecimal(vDesconto == null ? "0.0" : vDesconto); + + String chbpeSub = registro.getChbpeSub(); + String tpBpe = StringUtils.isBlank(registro.getChbpeSub()) ? "1" : "2"; + + ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), + numBpe, dhEmisao, tpDoc, dataPrestacao, valorBruto, + desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino, + cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil, + indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis); + + registro.getListaRegistroBPE().add(tipoBPE); + + String cfop = isInterMunicipal ? "5357" : "6357"; + + String csosnb = ""; + if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL)) { + csosnb = CrtBpe.SIMPLES_NACIONAL.toString(); + csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); + } else if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA)) { + csosnb = CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA.toString(); + csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); + } + + BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC); + BigDecimal aliquotaICMS = new BigDecimal(pICMS == null ? "0.0" : pICMS); + BigDecimal icms = new BigDecimal(vICMS == null ? "0.0" : vICMS); + + BigDecimal isentas = registro.getValortotal().subtract(baseCalculoICMS); + if (pRedBC != null) { + isentas = txExtras; + } + + BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC); + if (pRedBC != null) { + outras = valorPago.subtract(baseCalculoICMS); + outras = outras.subtract(isentas); + } + + ExportacaoBPETipoDPE tipoDPE = new ExportacaoBPETipoDPE(registro.getValortotal(), cfop, cst, csosnb, + baseCalculoICMS, aliquotaICMS, icms, isentas, outras); + registro.getListaRegistroDPE().add(tipoDPE); + + } + + return registro; + } + + /* + * Apos a Implementação dos novos campos na taleta BPE na venda não utilizar mais este metodo para importação de dados BPe + */ + @Deprecated + public static ExportacaoBPEBase gerarListasXML(ExportacaoBPEBase registro) { + + String indContribuicaoPrevidenciaria = StringUtils.isBlank(registro.getIndContribuicaoPrevidenciaria()) ? "00000060" : StringUtils.leftPad(registro.getIndContribuicaoPrevidenciaria(), 8, "0"); + + boolean isCancelamento = isBpeCancelado(registro.getCodstatus()); + + String numBpe = registro.getNumBpe(); + String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0"); + String dhEmisao = registro.getDhEmisao(); + + if (isCancelamento) { + ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), + numBpe, dhEmisao, tpDoc, VAZIO, null, null, + VAZIO, VAZIO, VAZIO, VAZIO, VAZIO, null, VAZIO, VAZIO, VAZIO, + VAZIO, registro.getRetorno(), VAZIO); + + registro.getListaRegistroBPE().add(tipoBPE); + + } else { + + TBPe tbpe = null; + String xml = StringUtils.isNotBlank(registro.getXmlAnterior()) ? registro.getXmlAnterior() : registro.getXml(); + + if (StringUtils.isNotBlank(xml)) + tbpe = BPeUtil.convertXmlToBpe(xml); + + String municipioOrigem = StringUtils.substring((StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getCMunIni() : registro.getMunicipioOrigem()), 2); + String municipioDestino = StringUtils.substring((StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getCMunFim() : registro.getMunicipioDestino()), 2); + String estadoOrigem = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFIni().value() : registro.getEstadoOrigem()); + String estadoDestino = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFFim().value() : registro.getEstadoDestino()); + + boolean isInterMunicipal = estadoOrigem.equals(estadoDestino); + String codigoContabil = isInterMunicipal ? registro.getCodigocontabilMunicipal() : registro.getCodigoContabilEstadual(); + numBpe = StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getNBP() : registro.getNumBpe(); + String dataPrestacao = StringUtils.isBlank(xml) ? registro.getDhrecbto() + : DateUtil.changeFormatStringDate(tbpe.getInfBPe().getInfPassagem().getDhEmb(), DateUtil.formatGMT, DateUtil.formatExp); + + String vBC = null; + String pICMS = null; + String vICMS = null; + String cst = null; + String pRedBC = null; + String vBP = null; + String vDesconto = null; + String vPgto = null; + + String vTxEmbarque = null; + String vPedagio = null; + String vSeguro = null; + + if (StringUtils.isNotBlank(xml)) { + if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) { + vBC = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVBC(); + pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS00().getPICMS(); + vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS00().getVICMS(); + } else if (tbpe.getInfBPe().getImp().getICMS().getICMS20() != null) { + vBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVBC(); + pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPICMS(); + vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVICMS(); + pRedBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPRedBC(); + } + + if (tbpe.getInfBPe().getInfValorBPe() != null) { + vBP = tbpe.getInfBPe().getInfValorBPe().getVBP(); + vDesconto = tbpe.getInfBPe().getInfValorBPe().getVDesconto(); + vPgto = tbpe.getInfBPe().getInfValorBPe().getVPgto(); + + for (TBPe.InfBPe.InfValorBPe.Comp comp : tbpe.getInfBPe().getInfValorBPe().getComp()) { + + if (comp.getTpComp().equals(TipoComp.PEDAGIO)) { + vPedagio = (isInterMunicipal && !registro.getIndPedadioEstdual()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; + if (vPedagio.equals("0.0")) + vPedagio = (!isInterMunicipal && !registro.getIndPedagioMunicipal()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; + } + + if (comp.getTpComp().equals(TipoComp.TAXA_EMBARQUE)) { + vTxEmbarque = (isInterMunicipal && !registro.getIndTxEmbarqueEstadual()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; + if (vTxEmbarque.equals("0.0")) + vTxEmbarque = (!isInterMunicipal && !registro.getIndTxEmbarqueMunicipal()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; + } + + if (comp.getTpComp().equals(TipoComp.SEGURO)) { + vSeguro = (isInterMunicipal && !registro.getIndSeguroEstadual()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; + if (vSeguro.equals("0.0")) + vSeguro = (!isInterMunicipal && !registro.getIndSeguroMunicipal()) ? (comp.getVComp() == null ? "0.0" : comp.getVComp()) : "0.0"; + } + } + } + + // validar cst enviado + if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) + cst = tbpe.getInfBPe().getImp().getICMS().getICMS00().getCST(); + else if (tbpe.getInfBPe().getImp().getICMS().getICMS20() != null) + cst = tbpe.getInfBPe().getImp().getICMS().getICMS20().getCST(); + else if (tbpe.getInfBPe().getImp().getICMS().getICMS45() != null) + cst = tbpe.getInfBPe().getImp().getICMS().getICMS45().getCST(); + else if (tbpe.getInfBPe().getImp().getICMS().getICMS90() != null) + cst = tbpe.getInfBPe().getImp().getICMS().getICMS90().getCST(); + else if (tbpe.getInfBPe().getImp().getICMS().getICMSOutraUF() != null) + cst = tbpe.getInfBPe().getImp().getICMS().getICMSOutraUF().getCST(); + else if (tbpe.getInfBPe().getImp().getICMS().getICMSSN() != null) + cst = tbpe.getInfBPe().getImp().getICMS().getICMSSN().getCST(); + + } + + String cstCofins = "01"; + String cstPis = "01"; + + // dependende dos parametros + BigDecimal valorPago = new BigDecimal(vPgto == null ? "0.0" : vPgto); + BigDecimal txEmbarque = new BigDecimal(vTxEmbarque == null ? "0.0" : vTxEmbarque); + BigDecimal pedagio = new BigDecimal(vPedagio == null ? "0.0" : vPedagio); + BigDecimal seguro = new BigDecimal(vSeguro == null ? "0.0" : vSeguro); + + BigDecimal txExtras = txEmbarque.add(pedagio).add(seguro); + + BigDecimal receitaTriCofins = new BigDecimal(vBC == null ? "0.0" : vBC); + if (pRedBC != null) { + receitaTriCofins = valorPago.subtract(txExtras); + } + + BigDecimal valorBruto = StringUtils.isBlank(xml) ? registro.getValortotal() : new BigDecimal(vBP == null ? "0.0" : vBP); + BigDecimal desconto = StringUtils.isBlank(xml) ? registro.getvDesconto() : new BigDecimal(vDesconto == null ? "0.0" : vDesconto); + + String chbpeSub = StringUtils.isBlank(xml) ? "" : (tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()); + String tpBpe = StringUtils.isBlank(xml) ? "" : (StringUtils.isBlank(tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()) ? "1" : "2"); + + ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), + numBpe, dhEmisao, tpDoc, dataPrestacao, valorBruto, + desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino, + cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil, + indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis); + + registro.getListaRegistroBPE().add(tipoBPE); + + String cfop = isInterMunicipal ? "5357" : "6357"; + + String csosnb = ""; + if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL)) { + csosnb = CrtBpe.SIMPLES_NACIONAL.toString(); + csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); + } else if (registro.getCrt().equals(CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA)) { + csosnb = CrtBpe.SIMPLES_NACIONAL_EXCESSO_RECEITA_BRUTA.toString(); + csosnb = UtiliteriasFiscal.formataNumerico(csosnb, 3); + } + + BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC); + BigDecimal aliquotaICMS = new BigDecimal(pICMS == null ? "0.0" : pICMS); + BigDecimal icms = new BigDecimal(vICMS == null ? "0.0" : vICMS); + + BigDecimal isentas = registro.getValortotal().subtract(baseCalculoICMS); + if (pRedBC != null) { + isentas = txExtras; + } + + BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC); + if (pRedBC != null) { + outras = valorPago.subtract(baseCalculoICMS); + outras = outras.subtract(isentas); + } + + ExportacaoBPETipoDPE tipoDPE = new ExportacaoBPETipoDPE(registro.getValortotal(), cfop, cst, csosnb, + baseCalculoICMS, aliquotaICMS, icms, isentas, outras); + registro.getListaRegistroDPE().add(tipoDPE); + + } + + return registro; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java index 5fe7d1d86..242e0c51e 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java @@ -1,165 +1,165 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; -import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; - -import br.inf.portalfiscal.bpe.TBPe; - -public class BPeUtil { - - private static final Logger log = LogManager.getLogger(ExportacaoBPEVo.class); - - public static TBPe convertXmlToBpe(String xml) { - TBPe objeto = null; - if (xml != null) { - try { - JAXBContext jc = JAXBContext.newInstance(TBPe.class); - Unmarshaller unmarshaller = jc.createUnmarshaller(); - InputStream input = new ByteArrayInputStream(xml.getBytes(Constantes.UTF_8)); - StreamSource source = new StreamSource(input); - objeto = (TBPe) unmarshaller.unmarshal(source); - } catch (JAXBException e) { - log.info("Nao encontrou o xml bpe"); - } catch (UnsupportedEncodingException e) { - log.info("Nao encontrou o xml bpe"); - } - } - return objeto; - } - - public static Map convertBPeXmlRegularToArquivoXml(BPeVO bpe) { - try { - String complemento = "BPeRecepacao_E"; - String nomeArquivo = getNomeArquivo(bpe, complemento); - return gerarArquivo(bpe.getXmlEnvio(), nomeArquivo); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - return null; - } - - public static Map convertBPeXmlRepostaToArquivoXml(BPeVO bpe) { - try { - String complemento = "BPeRecepacao_R"; - String nomeArquivo = getNomeArquivo(bpe, complemento); - return gerarArquivo(bpe.getXmlResposta(), nomeArquivo); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - return null; - } - - public static Map convertBPeXmlRegularEventoToArquivoXml(BPeVO bpe) { - try { - String complemento = "BPeRecepacaoEvento_" + bpe.getTipoevento() + "_E"; - String nomeArquivo = getNomeArquivo(bpe, complemento); - return gerarArquivo(bpe.getXmlEnvio(), nomeArquivo); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - return null; - } - - public static Map convertBPeXmlRepostaEventoToArquivoXml(BPeVO bpe) { - try { - String complemento = "BPeRecepacaoEvento_" + bpe.getTipoevento() + "_R"; - String nomeArquivo = getNomeArquivo(bpe, complemento); - return gerarArquivo(bpe.getXmlResposta(), nomeArquivo); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - return null; - } - - private static Map gerarArquivo(String xml, String nomeArquivo) throws IOException { - InputStream file = IOUtils.toInputStream(xml, Constantes.UTF_8); - Map arquivo = new HashMap(); - arquivo.put(nomeArquivo, file); - return arquivo; - } - - private static String getNomeArquivo(BPeVO bpe, String complemento) { - StringBuilder nomeArquivo = new StringBuilder(); - nomeArquivo.append(DateUtil.getStringDate(bpe.getFechorventa(), "yyyyMMddHHmmss")) - .append("_") - .append(bpe.getChbpe()) - .append("_") - .append(bpe.getNumserieBpe()) - .append("_") - .append(bpe.getNumBpe()) - .append("_") - .append(complemento) - .append(".xml"); - - return nomeArquivo.toString(); - - } - - public static byte[] zipFiles(Map arquivos) { - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ZipOutputStream outputStream = new ZipOutputStream(baos); - InputStream inputStream = null; - - try { - for (Entry arquivo : arquivos.entrySet()) { - outputStream.putNextEntry(new ZipEntry(arquivo.getKey())); - byte[] readBuff = new byte[4096]; - int readLen = -1; - - while ((readLen = arquivo.getValue().read(readBuff)) != -1) { - outputStream.write(readBuff, 0, readLen); - } - outputStream.closeEntry(); - arquivo.getValue().close(); - } - - outputStream.finish(); - - } catch (Exception e) { - log.error(e.getMessage(), e); - - } finally { - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } - - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } - } - - return baos.toByteArray(); - } - -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo; +import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; + +import br.inf.portalfiscal.bpe.TBPe; + +public class BPeUtil { + + private static final Logger log = LogManager.getLogger(ExportacaoBPEVo.class); + + public static TBPe convertXmlToBpe(String xml) { + TBPe objeto = null; + if (xml != null) { + try { + JAXBContext jc = JAXBContext.newInstance(TBPe.class); + Unmarshaller unmarshaller = jc.createUnmarshaller(); + InputStream input = new ByteArrayInputStream(xml.getBytes(Constantes.UTF_8)); + StreamSource source = new StreamSource(input); + objeto = (TBPe) unmarshaller.unmarshal(source); + } catch (JAXBException e) { + log.info("Nao encontrou o xml bpe"); + } catch (UnsupportedEncodingException e) { + log.info("Nao encontrou o xml bpe"); + } + } + return objeto; + } + + public static Map convertBPeXmlRegularToArquivoXml(BPeVO bpe) { + try { + String complemento = "BPeRecepacao_E"; + String nomeArquivo = getNomeArquivo(bpe, complemento); + return gerarArquivo(bpe.getXmlEnvio(), nomeArquivo); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + return null; + } + + public static Map convertBPeXmlRepostaToArquivoXml(BPeVO bpe) { + try { + String complemento = "BPeRecepacao_R"; + String nomeArquivo = getNomeArquivo(bpe, complemento); + return gerarArquivo(bpe.getXmlResposta(), nomeArquivo); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + return null; + } + + public static Map convertBPeXmlRegularEventoToArquivoXml(BPeVO bpe) { + try { + String complemento = "BPeRecepacaoEvento_" + bpe.getTipoevento() + "_E"; + String nomeArquivo = getNomeArquivo(bpe, complemento); + return gerarArquivo(bpe.getXmlEnvio(), nomeArquivo); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + return null; + } + + public static Map convertBPeXmlRepostaEventoToArquivoXml(BPeVO bpe) { + try { + String complemento = "BPeRecepacaoEvento_" + bpe.getTipoevento() + "_R"; + String nomeArquivo = getNomeArquivo(bpe, complemento); + return gerarArquivo(bpe.getXmlResposta(), nomeArquivo); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + return null; + } + + private static Map gerarArquivo(String xml, String nomeArquivo) throws IOException { + InputStream file = IOUtils.toInputStream(xml, Constantes.UTF_8); + Map arquivo = new HashMap(); + arquivo.put(nomeArquivo, file); + return arquivo; + } + + private static String getNomeArquivo(BPeVO bpe, String complemento) { + StringBuilder nomeArquivo = new StringBuilder(); + nomeArquivo.append(DateUtil.getStringDate(bpe.getFechorventa(), "yyyyMMddHHmmss")) + .append("_") + .append(bpe.getChbpe()) + .append("_") + .append(bpe.getNumserieBpe()) + .append("_") + .append(bpe.getNumBpe()) + .append("_") + .append(complemento) + .append(".xml"); + + return nomeArquivo.toString(); + + } + + public static byte[] zipFiles(Map arquivos) { + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ZipOutputStream outputStream = new ZipOutputStream(baos); + InputStream inputStream = null; + + try { + for (Entry arquivo : arquivos.entrySet()) { + outputStream.putNextEntry(new ZipEntry(arquivo.getKey())); + byte[] readBuff = new byte[4096]; + int readLen = -1; + + while ((readLen = arquivo.getValue().read(readBuff)) != -1) { + outputStream.write(readBuff, 0, readLen); + } + outputStream.closeEntry(); + arquivo.getValue().close(); + } + + outputStream.finish(); + + } catch (Exception e) { + log.error(e.getMessage(), e); + + } finally { + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } + + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } + } + + return baos.toByteArray(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BpeBuscaCamposXml.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BpeBuscaCamposXml.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BpeBuscaCamposXml.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BpeBuscaCamposXml.java index 0a2444716..2507aba3e 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BpeBuscaCamposXml.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BpeBuscaCamposXml.java @@ -1,105 +1,105 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml; - -import org.json.JSONObject; -import org.json.XML; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; - -public class BpeBuscaCamposXml { - - private static BpeBuscaCamposXml instance = null; - private String json; - - protected BpeBuscaCamposXml(String xml) { - controiJson(xml); - } - - public static BpeBuscaCamposXml getInstance(String xml) { - if (instance == null) { - instance = new BpeBuscaCamposXml(xml); - } - return instance; - } - - private void controiJson(String xml) { - if (xml != null) { - try { - JSONObject xmlJSONObj = XML.toJSONObject(xml); - this.json = xmlJSONObj.toString(4); - } catch (Exception je) { - je.printStackTrace(); - } - } - } - - public String buscaCamposXml(String campo) { - try { - - JsonElement root = new JsonParser().parse(json); - String resp = null; - if (campo.equals("CST")) - resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") - .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("CST").toString(); - if (campo.equals("pICMS")) - resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") - .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("pICMS").toString(); - if (campo.equals("vICMS")) - resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") - .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("vICMS").toString(); - if (campo.equals("vBC")) - resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") - .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("vBC").toString(); - if (campo.equals("UFIni")) - resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("ide") - .getAsJsonObject().get("UFIni").toString(); - if (campo.equals("vBP")) - resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("infValorBPe") - .getAsJsonObject().get("vBP").toString(); - - resp = resp.replace("\"", ""); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public String[] buscaCamposXmlArray(String campo) { - try { - JsonElement root = new JsonParser().parse(json); - JsonArray array = null; - - array = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("infValorBPe") - .getAsJsonObject().get("Comp").getAsJsonArray(); - - if (campo.equals("tpComp")) { - String[] a = new String[array.size()]; - int cont = 0; - for (JsonElement jsonElement : array) { - String aux = jsonElement.getAsJsonObject().get("tpComp").toString(); - aux = aux.replace("\"", ""); - a[cont] = aux; - cont++; - } - return a; - } - - if (campo.equals("vComp")) { - String[] a = new String[array.size()]; - int cont = 0; - for (JsonElement jsonElement : array) { - String aux = jsonElement.getAsJsonObject().get("vComp").toString(); - aux = aux.replace("\"", ""); - a[cont] = aux; - cont++; - } - return a; - } - } catch (Exception e) { - e.printStackTrace(); - } - return null; - - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml; + +import org.json.JSONObject; +import org.json.XML; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + +public class BpeBuscaCamposXml { + + private static BpeBuscaCamposXml instance = null; + private String json; + + protected BpeBuscaCamposXml(String xml) { + controiJson(xml); + } + + public static BpeBuscaCamposXml getInstance(String xml) { + if (instance == null) { + instance = new BpeBuscaCamposXml(xml); + } + return instance; + } + + private void controiJson(String xml) { + if (xml != null) { + try { + JSONObject xmlJSONObj = XML.toJSONObject(xml); + this.json = xmlJSONObj.toString(4); + } catch (Exception je) { + je.printStackTrace(); + } + } + } + + public String buscaCamposXml(String campo) { + try { + + JsonElement root = new JsonParser().parse(json); + String resp = null; + if (campo.equals("CST")) + resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") + .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("CST").toString(); + if (campo.equals("pICMS")) + resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") + .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("pICMS").toString(); + if (campo.equals("vICMS")) + resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") + .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("vICMS").toString(); + if (campo.equals("vBC")) + resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("imp") + .getAsJsonObject().get("ICMS").getAsJsonObject().get("ICMS00").getAsJsonObject().get("vBC").toString(); + if (campo.equals("UFIni")) + resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("ide") + .getAsJsonObject().get("UFIni").toString(); + if (campo.equals("vBP")) + resp = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("infValorBPe") + .getAsJsonObject().get("vBP").toString(); + + resp = resp.replace("\"", ""); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public String[] buscaCamposXmlArray(String campo) { + try { + JsonElement root = new JsonParser().parse(json); + JsonArray array = null; + + array = root.getAsJsonObject().get("BPe").getAsJsonObject().get("infBPe").getAsJsonObject().get("infValorBPe") + .getAsJsonObject().get("Comp").getAsJsonArray(); + + if (campo.equals("tpComp")) { + String[] a = new String[array.size()]; + int cont = 0; + for (JsonElement jsonElement : array) { + String aux = jsonElement.getAsJsonObject().get("tpComp").toString(); + aux = aux.replace("\"", ""); + a[cont] = aux; + cont++; + } + return a; + } + + if (campo.equals("vComp")) { + String[] a = new String[array.size()]; + int cont = 0; + for (JsonElement jsonElement : array) { + String aux = jsonElement.getAsJsonObject().get("vComp").toString(); + aux = aux.replace("\"", ""); + a[cont] = aux; + cont++; + } + return a; + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java index 1616184c6..2d88ac537 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java @@ -1,341 +1,341 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; - -public class ExportacaoBPR { - private static final String CODIGO_INDICADOR_CONTR_PREVIDENCIARIA = "00000060"; - - private List listaRegistroBPR; - - private List listaRegistroBPRTipoPAR; - private List listaRegistroBPRTipoRMD; - private List listaRegistroBPRTipoSeqBPS; - - public ExportacaoBPR() { - listaRegistroBPR = new ArrayList(0); - - listaRegistroBPRTipoPAR = new ArrayList(0); - listaRegistroBPRTipoRMD = new ArrayList(0); - listaRegistroBPRTipoSeqBPS = new ArrayList(0); - } - - public List getListaRegistroBPR() { - return listaRegistroBPR; - } - - public List getListaRegistroBPRTipoPAR() { - return listaRegistroBPRTipoPAR; - } - - public List getListaRegistroBPRTipoRMD() { - return listaRegistroBPRTipoRMD; - } - - public List getListaRegistroBPRTipoSeqBPS() { - return listaRegistroBPRTipoSeqBPS; - } - - public void gerarListas() { - ordenarLista(); - - gerarPAR(); - gerarRMD(); - gerarBPS_DBP(); - } - - private void ordenarLista() { - Collections.sort(listaRegistroBPR, new Comparator(){ - public int compare(ExportacaoBPRBase e1, ExportacaoBPRBase e2) { - String c1 = e1.getDataEmissao() + "-" + e1.getNumeroFormulario() + "-" + e1.getCfop() + "-" + e1.getUfDestino(); - String c2 = e2.getDataEmissao() + "-" + e2.getNumeroFormulario() + "-" + e2.getCfop() + "-" + e2.getUfDestino(); - - return c1.compareToIgnoreCase(c2); - } - }); - } - - private void gerarPAR() { - listaRegistroBPRTipoPAR.clear(); - - ExportacaoRMDTipoPAR registro = null; - - Map group = new HashMap(0); - - for (ExportacaoBPRBase base : listaRegistroBPR) { - String key = base.getCodigoEstabelecimentoPar() + "-" + base.getCodigoEstabelecimentoPar() + "-" + base.getNomeParticipante(); - - if (group.containsKey(key)) { - continue; - } - - registro = new ExportacaoRMDTipoPAR(); - registro.setCodigoParticipante(base.getCodigoParticipantePar()); - registro.setCodigoEstabelecimento(base.getCodigoEstabelecimentoPar()); - registro.setNomeParticipante(base.getNomeParticipante()); - registro.setUfParticipante(base.getUfParticipante()); - registro.setCpfParticipante(base.getCpfParticipante()); - registro.setIeParticipante(base.getIeParticipante()); - registro.setLogradouro(base.getLogradouro()); - registro.setNumero(base.getNumero()); - registro.setComplemento(base.getComplemento()); - registro.setBairro(base.getBairro()); - registro.setCep(base.getCep()); - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - listaRegistroBPRTipoPAR.add(entry.getValue()); - } - - Collections.sort(listaRegistroBPRTipoPAR, new Comparator(){ - public int compare(ExportacaoRMDTipoPAR e1, ExportacaoRMDTipoPAR e2) { - String c1 = e1.getCodigoParticipante() + "-" + e1.getCodigoEstabelecimento() + "-" + e1.getNomeParticipante(); - String c2 = e2.getCodigoParticipante() + "-" + e2.getCodigoEstabelecimento() + "-" + e2.getNomeParticipante(); - - return c1.compareToIgnoreCase(c2); - } - }); - } - - private void gerarRMD() { - listaRegistroBPRTipoRMD.clear(); - - ExportacaoRMDTipoRMD registro = null; - - Map group = new HashMap(0); - - for (ExportacaoBPRBase base : listaRegistroBPR) { - - // String numeroAIDF = base.getNumeroAIDF(); - // if (numeroAIDF == null || numeroAIDF.trim().isEmpty() || numeroAIDF.trim().equals("0")) { - // continue; - // } - - String key = base.getCodigoEstabelecimento() + "-" + base.getNumeroAIDFRMD() + "-" + base.getNumeroFormularioBilheteAIDF(); - - if (group.containsKey(key)) { - continue; - } - - registro = new ExportacaoRMDTipoRMD(); - registro.setDataEmissao(base.getDataEmissaoRMD()); - registro.setCodigoParticipante(base.getDocumentoCancelado() ? base.getCodigoParticipantePar() : base.getCodigoParticipante()); - registro.setCodigoEstabelecimento( base.getDocumentoCancelado() ? base.getCodigoEstabelecimentoPar() : base.getCodigoEstabelecimento()); - registro.setNumeroAIDF(base.getNumeroAIDFRMD()); - registro.setSerieAIDF(base.getSerieAIDFRMD()); - registro.setSubSerieAIDF(base.getSubSerieAIDFRMD()); - registro.setNumeroBilheteAIDF(base.getNumeroFormularioBilheteAIDF()); - registro.setNumeroFormularioAIDF(base.getNumeroFormularioBilheteAIDF()); - registro.setCancelado(base.getDocumentoCancelado()); - registro.setCodigoContabil(base.getCodigoContabil()); - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - listaRegistroBPRTipoRMD.add(entry.getValue()); - } - - Collections.sort(listaRegistroBPRTipoRMD, new Comparator(){ - public int compare(ExportacaoRMDTipoRMD e1, ExportacaoRMDTipoRMD e2) { - String c1 = e1.getCodigoEstabelecimento() + "-" + e1.getNumeroAIDF() + "-" + e1.getNumeroBilheteAIDF(); - String c2 = e2.getCodigoEstabelecimento() + "-" + e2.getNumeroAIDF() + "-" + e2.getNumeroBilheteAIDF(); - - return c1.compareToIgnoreCase(c2); - } - }); - } - - private void gerarBPS_DBP() { - listaRegistroBPRTipoSeqBPS.clear(); - - ExportacaoRMDTipoSeqBPS registroBPS = null; - ExportacaoRMDTipoSeqDBP registroDBP = null; - - Long numeroInicial = 0l; - Long numeroFinal = 0l; - - String dataEmissaoControle = ""; - Integer cfopControle = 0; - - Integer quantidadeTotal = 0; - Integer quantidadeCancelado = 0; - - BigDecimal totalizador = BigDecimal.ZERO; - - for (ExportacaoBPRBase base : listaRegistroBPR) { - Integer codigoEstabelecimento = base.getCodigoEstabelecimento(); - String numeroAIDF = base.getNumeroAIDF(); - String serieAIDF = base.getSerieAIDF(); - String subSerieAIDF = base.getSubSerieAIDF(); - String numeroAIDFRMD = base.getNumeroAIDFRMD(); - String serieAIDFRMD = base.getSerieAIDFRMD(); - String subSerieAIDFRMD = base.getSubSerieAIDFRMD(); - Integer numeroRMD = base.getNumeroRMD(); - String dataEmissao = base.getDataEmissao(); - Long numeroFormulario = base.getNumeroFormulario(); - String ufDestino = base.getUfDestino(); - Integer cfop = base.getCfop(); - String ufOrigem = base.getUfOrigem(); - Integer municipioOrigem = base.getMunicipioOrigem(); - Boolean isenta = (base.getBoletoIsento() == 1); - Boolean cancelado = (base.getBoletoCancelado() == 1); - BigDecimal valorTotal = base.getValorPago(); - BigDecimal red_base_calc_icms = base.getReducaoBaseCalcICMS(); - BigDecimal porc_red_municipal = base.getPorcReducaoMunicipal(); - BigDecimal porc_red_estadual = base.getPorcReducaoEstadual(); - BigDecimal tributacao_importacao = base.getTributacaoImportacao(); - - if (base.getDocumentoCancelado()) - continue; - - if (numeroAIDF == null || numeroAIDF.trim().isEmpty() || numeroAIDF.trim().equals("0")) { - continue; - } - - // BPR - if ((numeroFinal + 1) != numeroFormulario || !dataEmissaoControle.equals(dataEmissao) || !cfopControle.equals(cfop)) { - numeroInicial = numeroFormulario; - dataEmissaoControle = dataEmissao; - cfopControle = cfop; - - registroBPS = new ExportacaoRMDTipoSeqBPS(); - registroBPS.setEspecie("BPR"); - registroBPS.setNumeroInicial(numeroInicial); - registroBPS.setCodigoEstabelecimento(codigoEstabelecimento); - registroBPS.setNumeroAIDF(numeroAIDF); - registroBPS.setSerieAIDF(serieAIDF); - registroBPS.setSubSerieAIDF(subSerieAIDF); - registroBPS.setNumeroAIDFRMD(numeroAIDFRMD); - registroBPS.setSerieAIDFRMD(serieAIDFRMD); - registroBPS.setSubSerieAIDFRMD(subSerieAIDFRMD); - registroBPS.setNumeroRMD(numeroRMD); - registroBPS.setDataEmissao(dataEmissao); - registroBPS.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); - - listaRegistroBPRTipoSeqBPS.add(registroBPS); - - quantidadeTotal = 0; - quantidadeCancelado = 0; - - totalizador = BigDecimal.ZERO; - } - - quantidadeTotal++; - - if (cancelado) { - quantidadeCancelado++; - } else { - totalizador = MoneyHelper.somar(totalizador, valorTotal); - } - - numeroFinal = numeroFormulario; - - registroBPS.setNumeroFinal(numeroFinal); - - registroBPS.setQuantidadeTotal(quantidadeTotal); - registroBPS.setQuantidadeCancelados(quantidadeCancelado); - registroBPS.setValorTotal(totalizador); - - // DBP - registroDBP = new ExportacaoRMDTipoSeqDBP(ufDestino); - - Integer indice = registroBPS.getListaDBP().indexOf(registroDBP); - - if (indice == -1) { - registroBPS.getListaDBP().add(registroDBP); - - registroDBP.setCfop(cfop); // IM=5357; serviço IE= 6357 - registroDBP.setUfOrigem(ufOrigem); - registroDBP.setMunicipioOrigem(municipioOrigem); - - registroDBP.setCodigoSituacaoTribColunaB(null); - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (isenta) { - registroDBP.setCodigoSituacaoTribColunaB(40); - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (registroDBP.getCodigoSituacaoTribColunaB() == null) { - registroDBP.setCodigoSituacaoTribColunaB(red_base_calc_icms == null || red_base_calc_icms.compareTo(BigDecimal.ZERO) == 0 ? 0 : 20); - } - - registroDBP.setValorBaseCalculoICMS(BigDecimal.ZERO); - registroDBP.setValorTotal(BigDecimal.ZERO); - registroDBP.setValorICMS(BigDecimal.ZERO); - registroDBP.setValorICMSIsento(BigDecimal.ZERO); - registroDBP.setValorICMSOutros(BigDecimal.ZERO); - } else { - registroDBP = registroBPS.getListaDBP().get(indice); - } - - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - BigDecimal valorIsenta = BigDecimal.ZERO; - BigDecimal valorIsentaOutros = BigDecimal.ZERO; - - if (base.getBoletoIsento() == 1) { - valorIsenta = valorTotal; - valorTotal = BigDecimal.ZERO; - } else { - if (red_base_calc_icms != null) { - valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); - } else { - valorBaseCalculoICMS = valorTotal; - } - } - - registroDBP.setAliquotaICMS(tributacao_importacao); - - if (tributacao_importacao == null) { - tributacao_importacao = BigDecimal.ZERO; - } else { - if (red_base_calc_icms != null) { - BigDecimal porc_red = BigDecimal.ZERO; - - if (ufOrigem.equals(ufDestino)) { - if (porc_red_municipal != null) { - porc_red = porc_red_municipal; - } - } else { - if (porc_red_estadual != null) { - porc_red = porc_red_estadual; - } - } - - BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); - valorIsentaOutros = valorTotal.multiply(porc); - } - - tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - } - - BigDecimal valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); - - registroDBP.setValorBaseCalculoICMS(registroDBP.getValorBaseCalculoICMS().add(valorBaseCalculoICMS)); - registroDBP.setValorTotal(registroDBP.getValorTotal().add(valorTotal)); - registroDBP.setValorICMS(registroDBP.getValorICMS().add(valorICMS)); - registroDBP.setValorICMSIsento(registroDBP.getValorICMSIsento().add(valorIsenta)); - registroDBP.setValorICMSOutros(registroDBP.getValorICMSOutros().add(valorIsentaOutros)); - } - - Collections.sort(listaRegistroBPRTipoSeqBPS, new Comparator(){ - public int compare(ExportacaoRMDTipoSeqBPS e1, ExportacaoRMDTipoSeqBPS e2) { - String c1 = e1.getDataEmissao(); - String c2 = e2.getDataEmissao(); - - return c1.compareToIgnoreCase(c2); - } - }); - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; + +public class ExportacaoBPR { + private static final String CODIGO_INDICADOR_CONTR_PREVIDENCIARIA = "00000060"; + + private List listaRegistroBPR; + + private List listaRegistroBPRTipoPAR; + private List listaRegistroBPRTipoRMD; + private List listaRegistroBPRTipoSeqBPS; + + public ExportacaoBPR() { + listaRegistroBPR = new ArrayList(0); + + listaRegistroBPRTipoPAR = new ArrayList(0); + listaRegistroBPRTipoRMD = new ArrayList(0); + listaRegistroBPRTipoSeqBPS = new ArrayList(0); + } + + public List getListaRegistroBPR() { + return listaRegistroBPR; + } + + public List getListaRegistroBPRTipoPAR() { + return listaRegistroBPRTipoPAR; + } + + public List getListaRegistroBPRTipoRMD() { + return listaRegistroBPRTipoRMD; + } + + public List getListaRegistroBPRTipoSeqBPS() { + return listaRegistroBPRTipoSeqBPS; + } + + public void gerarListas() { + ordenarLista(); + + gerarPAR(); + gerarRMD(); + gerarBPS_DBP(); + } + + private void ordenarLista() { + Collections.sort(listaRegistroBPR, new Comparator(){ + public int compare(ExportacaoBPRBase e1, ExportacaoBPRBase e2) { + String c1 = e1.getDataEmissao() + "-" + e1.getNumeroFormulario() + "-" + e1.getCfop() + "-" + e1.getUfDestino(); + String c2 = e2.getDataEmissao() + "-" + e2.getNumeroFormulario() + "-" + e2.getCfop() + "-" + e2.getUfDestino(); + + return c1.compareToIgnoreCase(c2); + } + }); + } + + private void gerarPAR() { + listaRegistroBPRTipoPAR.clear(); + + ExportacaoRMDTipoPAR registro = null; + + Map group = new HashMap(0); + + for (ExportacaoBPRBase base : listaRegistroBPR) { + String key = base.getCodigoEstabelecimentoPar() + "-" + base.getCodigoEstabelecimentoPar() + "-" + base.getNomeParticipante(); + + if (group.containsKey(key)) { + continue; + } + + registro = new ExportacaoRMDTipoPAR(); + registro.setCodigoParticipante(base.getCodigoParticipantePar()); + registro.setCodigoEstabelecimento(base.getCodigoEstabelecimentoPar()); + registro.setNomeParticipante(base.getNomeParticipante()); + registro.setUfParticipante(base.getUfParticipante()); + registro.setCpfParticipante(base.getCpfParticipante()); + registro.setIeParticipante(base.getIeParticipante()); + registro.setLogradouro(base.getLogradouro()); + registro.setNumero(base.getNumero()); + registro.setComplemento(base.getComplemento()); + registro.setBairro(base.getBairro()); + registro.setCep(base.getCep()); + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + listaRegistroBPRTipoPAR.add(entry.getValue()); + } + + Collections.sort(listaRegistroBPRTipoPAR, new Comparator(){ + public int compare(ExportacaoRMDTipoPAR e1, ExportacaoRMDTipoPAR e2) { + String c1 = e1.getCodigoParticipante() + "-" + e1.getCodigoEstabelecimento() + "-" + e1.getNomeParticipante(); + String c2 = e2.getCodigoParticipante() + "-" + e2.getCodigoEstabelecimento() + "-" + e2.getNomeParticipante(); + + return c1.compareToIgnoreCase(c2); + } + }); + } + + private void gerarRMD() { + listaRegistroBPRTipoRMD.clear(); + + ExportacaoRMDTipoRMD registro = null; + + Map group = new HashMap(0); + + for (ExportacaoBPRBase base : listaRegistroBPR) { + + // String numeroAIDF = base.getNumeroAIDF(); + // if (numeroAIDF == null || numeroAIDF.trim().isEmpty() || numeroAIDF.trim().equals("0")) { + // continue; + // } + + String key = base.getCodigoEstabelecimento() + "-" + base.getNumeroAIDFRMD() + "-" + base.getNumeroFormularioBilheteAIDF(); + + if (group.containsKey(key)) { + continue; + } + + registro = new ExportacaoRMDTipoRMD(); + registro.setDataEmissao(base.getDataEmissaoRMD()); + registro.setCodigoParticipante(base.getDocumentoCancelado() ? base.getCodigoParticipantePar() : base.getCodigoParticipante()); + registro.setCodigoEstabelecimento( base.getDocumentoCancelado() ? base.getCodigoEstabelecimentoPar() : base.getCodigoEstabelecimento()); + registro.setNumeroAIDF(base.getNumeroAIDFRMD()); + registro.setSerieAIDF(base.getSerieAIDFRMD()); + registro.setSubSerieAIDF(base.getSubSerieAIDFRMD()); + registro.setNumeroBilheteAIDF(base.getNumeroFormularioBilheteAIDF()); + registro.setNumeroFormularioAIDF(base.getNumeroFormularioBilheteAIDF()); + registro.setCancelado(base.getDocumentoCancelado()); + registro.setCodigoContabil(base.getCodigoContabil()); + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + listaRegistroBPRTipoRMD.add(entry.getValue()); + } + + Collections.sort(listaRegistroBPRTipoRMD, new Comparator(){ + public int compare(ExportacaoRMDTipoRMD e1, ExportacaoRMDTipoRMD e2) { + String c1 = e1.getCodigoEstabelecimento() + "-" + e1.getNumeroAIDF() + "-" + e1.getNumeroBilheteAIDF(); + String c2 = e2.getCodigoEstabelecimento() + "-" + e2.getNumeroAIDF() + "-" + e2.getNumeroBilheteAIDF(); + + return c1.compareToIgnoreCase(c2); + } + }); + } + + private void gerarBPS_DBP() { + listaRegistroBPRTipoSeqBPS.clear(); + + ExportacaoRMDTipoSeqBPS registroBPS = null; + ExportacaoRMDTipoSeqDBP registroDBP = null; + + Long numeroInicial = 0l; + Long numeroFinal = 0l; + + String dataEmissaoControle = ""; + Integer cfopControle = 0; + + Integer quantidadeTotal = 0; + Integer quantidadeCancelado = 0; + + BigDecimal totalizador = BigDecimal.ZERO; + + for (ExportacaoBPRBase base : listaRegistroBPR) { + Integer codigoEstabelecimento = base.getCodigoEstabelecimento(); + String numeroAIDF = base.getNumeroAIDF(); + String serieAIDF = base.getSerieAIDF(); + String subSerieAIDF = base.getSubSerieAIDF(); + String numeroAIDFRMD = base.getNumeroAIDFRMD(); + String serieAIDFRMD = base.getSerieAIDFRMD(); + String subSerieAIDFRMD = base.getSubSerieAIDFRMD(); + Integer numeroRMD = base.getNumeroRMD(); + String dataEmissao = base.getDataEmissao(); + Long numeroFormulario = base.getNumeroFormulario(); + String ufDestino = base.getUfDestino(); + Integer cfop = base.getCfop(); + String ufOrigem = base.getUfOrigem(); + Integer municipioOrigem = base.getMunicipioOrigem(); + Boolean isenta = (base.getBoletoIsento() == 1); + Boolean cancelado = (base.getBoletoCancelado() == 1); + BigDecimal valorTotal = base.getValorPago(); + BigDecimal red_base_calc_icms = base.getReducaoBaseCalcICMS(); + BigDecimal porc_red_municipal = base.getPorcReducaoMunicipal(); + BigDecimal porc_red_estadual = base.getPorcReducaoEstadual(); + BigDecimal tributacao_importacao = base.getTributacaoImportacao(); + + if (base.getDocumentoCancelado()) + continue; + + if (numeroAIDF == null || numeroAIDF.trim().isEmpty() || numeroAIDF.trim().equals("0")) { + continue; + } + + // BPR + if ((numeroFinal + 1) != numeroFormulario || !dataEmissaoControle.equals(dataEmissao) || !cfopControle.equals(cfop)) { + numeroInicial = numeroFormulario; + dataEmissaoControle = dataEmissao; + cfopControle = cfop; + + registroBPS = new ExportacaoRMDTipoSeqBPS(); + registroBPS.setEspecie("BPR"); + registroBPS.setNumeroInicial(numeroInicial); + registroBPS.setCodigoEstabelecimento(codigoEstabelecimento); + registroBPS.setNumeroAIDF(numeroAIDF); + registroBPS.setSerieAIDF(serieAIDF); + registroBPS.setSubSerieAIDF(subSerieAIDF); + registroBPS.setNumeroAIDFRMD(numeroAIDFRMD); + registroBPS.setSerieAIDFRMD(serieAIDFRMD); + registroBPS.setSubSerieAIDFRMD(subSerieAIDFRMD); + registroBPS.setNumeroRMD(numeroRMD); + registroBPS.setDataEmissao(dataEmissao); + registroBPS.setInfoPadraoBilhetePassagem(CODIGO_INDICADOR_CONTR_PREVIDENCIARIA); + + listaRegistroBPRTipoSeqBPS.add(registroBPS); + + quantidadeTotal = 0; + quantidadeCancelado = 0; + + totalizador = BigDecimal.ZERO; + } + + quantidadeTotal++; + + if (cancelado) { + quantidadeCancelado++; + } else { + totalizador = MoneyHelper.somar(totalizador, valorTotal); + } + + numeroFinal = numeroFormulario; + + registroBPS.setNumeroFinal(numeroFinal); + + registroBPS.setQuantidadeTotal(quantidadeTotal); + registroBPS.setQuantidadeCancelados(quantidadeCancelado); + registroBPS.setValorTotal(totalizador); + + // DBP + registroDBP = new ExportacaoRMDTipoSeqDBP(ufDestino); + + Integer indice = registroBPS.getListaDBP().indexOf(registroDBP); + + if (indice == -1) { + registroBPS.getListaDBP().add(registroDBP); + + registroDBP.setCfop(cfop); // IM=5357; serviço IE= 6357 + registroDBP.setUfOrigem(ufOrigem); + registroDBP.setMunicipioOrigem(municipioOrigem); + + registroDBP.setCodigoSituacaoTribColunaB(null); + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (isenta) { + registroDBP.setCodigoSituacaoTribColunaB(40); + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (registroDBP.getCodigoSituacaoTribColunaB() == null) { + registroDBP.setCodigoSituacaoTribColunaB(red_base_calc_icms == null || red_base_calc_icms.compareTo(BigDecimal.ZERO) == 0 ? 0 : 20); + } + + registroDBP.setValorBaseCalculoICMS(BigDecimal.ZERO); + registroDBP.setValorTotal(BigDecimal.ZERO); + registroDBP.setValorICMS(BigDecimal.ZERO); + registroDBP.setValorICMSIsento(BigDecimal.ZERO); + registroDBP.setValorICMSOutros(BigDecimal.ZERO); + } else { + registroDBP = registroBPS.getListaDBP().get(indice); + } + + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + BigDecimal valorIsenta = BigDecimal.ZERO; + BigDecimal valorIsentaOutros = BigDecimal.ZERO; + + if (base.getBoletoIsento() == 1) { + valorIsenta = valorTotal; + valorTotal = BigDecimal.ZERO; + } else { + if (red_base_calc_icms != null) { + valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); + } else { + valorBaseCalculoICMS = valorTotal; + } + } + + registroDBP.setAliquotaICMS(tributacao_importacao); + + if (tributacao_importacao == null) { + tributacao_importacao = BigDecimal.ZERO; + } else { + if (red_base_calc_icms != null) { + BigDecimal porc_red = BigDecimal.ZERO; + + if (ufOrigem.equals(ufDestino)) { + if (porc_red_municipal != null) { + porc_red = porc_red_municipal; + } + } else { + if (porc_red_estadual != null) { + porc_red = porc_red_estadual; + } + } + + BigDecimal porc = tributacao_importacao.subtract(porc_red.divide(BigDecimal.valueOf(100d))); + valorIsentaOutros = valorTotal.multiply(porc); + } + + tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + } + + BigDecimal valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); + + registroDBP.setValorBaseCalculoICMS(registroDBP.getValorBaseCalculoICMS().add(valorBaseCalculoICMS)); + registroDBP.setValorTotal(registroDBP.getValorTotal().add(valorTotal)); + registroDBP.setValorICMS(registroDBP.getValorICMS().add(valorICMS)); + registroDBP.setValorICMSIsento(registroDBP.getValorICMSIsento().add(valorIsenta)); + registroDBP.setValorICMSOutros(registroDBP.getValorICMSOutros().add(valorIsentaOutros)); + } + + Collections.sort(listaRegistroBPRTipoSeqBPS, new Comparator(){ + public int compare(ExportacaoRMDTipoSeqBPS e1, ExportacaoRMDTipoSeqBPS e2) { + String c1 = e1.getDataEmissao(); + String c2 = e2.getDataEmissao(); + + return c1.compareToIgnoreCase(c2); + } + }); + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPRBase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPRBase.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPRBase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPRBase.java index 5c0adca31..98ae4ed2c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPRBase.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPRBase.java @@ -1,364 +1,364 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoBPRBase { - // PAR - private Integer codigoParticipantePar; - private Integer codigoEstabelecimentoPar; - private String nomeParticipante; - private String ufParticipante; - private String cpfParticipante; - private String ieParticipante; - private String imParticipante; - private String logradouro; - private String numero; - private String complemento; - private String bairro; - private Integer cep; - - // RMD - private String dataEmissaoRMD; - private Integer codigoParticipante; - private Integer codigoEstabelecimento; - private String numeroAIDF; - private String serieAIDF; - private String subSerieAIDF; - private Long numeroFormularioBilheteAIDF; - private Boolean documentoCancelado; - private String codigoContabil; - - // BPS - private String dataEmissao; - private Long numeroFormulario; - private String numeroAIDFRMD; - private String serieAIDFRMD; - private String subSerieAIDFRMD; - private Integer numeroRMD; - private Integer boletoIsento; - private Integer boletoCancelado; - private BigDecimal valorPago; - - // DBP - private String ufDestino; - private String ufOrigem; - private Integer municipioOrigem; - private Integer cfop; - private BigDecimal reducaoBaseCalcICMS; - private BigDecimal porcReducaoMunicipal; - private BigDecimal porcReducaoEstadual; - private BigDecimal tributacaoImportacao; - - public ExportacaoBPRBase() { - - } - - public Integer getCodigoParticipantePar() { - return codigoParticipantePar; - } - - public void setCodigoParticipantePar(Integer codigoParticipantePar) { - this.codigoParticipantePar = codigoParticipantePar; - } - - public Integer getCodigoEstabelecimentoPar() { - return codigoEstabelecimentoPar; - } - - public void setCodigoEstabelecimentoPar(Integer codigoEstabelecimentoPar) { - this.codigoEstabelecimentoPar = codigoEstabelecimentoPar; - } - - public String getNomeParticipante() { - return nomeParticipante; - } - - public void setNomeParticipante(String nomeParticipante) { - this.nomeParticipante = nomeParticipante; - } - - public String getUfParticipante() { - return ufParticipante; - } - - public void setUfParticipante(String ufParticipante) { - this.ufParticipante = ufParticipante; - } - - public String getCpfParticipante() { - return cpfParticipante; - } - - public void setCpfParticipante(String cpfParticipante) { - this.cpfParticipante = cpfParticipante; - } - - public String getIeParticipante() { - return ieParticipante; - } - - public void setIeParticipante(String ieParticipante) { - this.ieParticipante = ieParticipante; - } - - public String getImParticipante() { - return imParticipante; - } - - public void setImParticipante(String imParticipante) { - this.imParticipante = imParticipante; - } - - public String getLogradouro() { - return logradouro; - } - - public void setLogradouro(String logradouro) { - this.logradouro = logradouro; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public Integer getCep() { - return cep; - } - - public void setCep(Integer cep) { - this.cep = cep; - } - - public String getDataEmissaoRMD() { - return dataEmissaoRMD; - } - - public void setDataEmissaoRMD(String dataEmissaoRMD) { - this.dataEmissaoRMD = dataEmissaoRMD; - } - - public Integer getCodigoParticipante() { - return codigoParticipante; - } - - public void setCodigoParticipante(Integer codigoParticipante) { - this.codigoParticipante = codigoParticipante; - } - - public Integer getCodigoEstabelecimento() { - return codigoEstabelecimento; - } - - public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { - this.codigoEstabelecimento = codigoEstabelecimento; - } - - public String getNumeroAIDF() { - return numeroAIDF; - } - - public void setNumeroAIDF(String numeroAIDF) { - this.numeroAIDF = numeroAIDF; - } - - public String getSerieAIDF() { - return serieAIDF; - } - - public void setSerieAIDF(String serieAIDF) { - this.serieAIDF = serieAIDF; - } - - public String getSubSerieAIDF() { - return subSerieAIDF; - } - - public void setSubSerieAIDF(String subSerieAIDF) { - this.subSerieAIDF = subSerieAIDF; - } - - public Long getNumeroFormularioBilheteAIDF() { - return numeroFormularioBilheteAIDF; - } - - public void setNumeroFormularioBilheteAIDF(Long numeroFormularioBilheteAIDF) { - this.numeroFormularioBilheteAIDF = numeroFormularioBilheteAIDF; - } - - public Boolean getDocumentoCancelado() { - return documentoCancelado; - } - - public void setDocumentoCancelado(Boolean documentoCancelado) { - this.documentoCancelado = documentoCancelado; - } - - public String getCodigoContabil() { - return codigoContabil; - } - - public void setCodigoContabil(String codigoContabil) { - this.codigoContabil = codigoContabil; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public Long getNumeroFormulario() { - return numeroFormulario; - } - - public void setNumeroFormulario(Long numeroFormulario) { - this.numeroFormulario = numeroFormulario; - } - - public String getNumeroAIDFRMD() { - return numeroAIDFRMD; - } - - public void setNumeroAIDFRMD(String numeroAIDFRMD) { - this.numeroAIDFRMD = numeroAIDFRMD; - } - - public String getSerieAIDFRMD() { - return serieAIDFRMD; - } - - public void setSerieAIDFRMD(String serieAIDFRMD) { - this.serieAIDFRMD = serieAIDFRMD; - } - - public String getSubSerieAIDFRMD() { - return subSerieAIDFRMD; - } - - public void setSubSerieAIDFRMD(String subSerieAIDFRMD) { - this.subSerieAIDFRMD = subSerieAIDFRMD; - } - - public Integer getNumeroRMD() { - return numeroRMD; - } - - public void setNumeroRMD(Integer numeroRMD) { - this.numeroRMD = numeroRMD; - } - - public Integer getBoletoIsento() { - return boletoIsento == null ? 0 : boletoIsento; - } - - public void setBoletoIsento(Integer boletoIsento) { - this.boletoIsento = boletoIsento; - } - - public Integer getBoletoCancelado() { - return boletoCancelado == null ? 0 : boletoCancelado; - } - - public void setBoletoCancelado(Integer boletoCancelado) { - this.boletoCancelado = boletoCancelado; - } - - public BigDecimal getValorPago() { - return valorPago; - } - - public void setValorPago(BigDecimal valorPago) { - this.valorPago = valorPago; - } - - public String getUfDestino() { - return ufDestino; - } - - public void setUfDestino(String ufDestino) { - this.ufDestino = ufDestino; - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public Integer getCfop() { - return cfop; - } - - public void setCfop(Integer cfop) { - this.cfop = cfop; - } - - public BigDecimal getReducaoBaseCalcICMS() { - return reducaoBaseCalcICMS; - } - - public void setReducaoBaseCalcICMS(BigDecimal reducaoBaseCalcICMS) { - this.reducaoBaseCalcICMS = reducaoBaseCalcICMS; - } - - public BigDecimal getPorcReducaoMunicipal() { - return porcReducaoMunicipal; - } - - public void setPorcReducaoMunicipal(BigDecimal porcReducaoMunicipal) { - this.porcReducaoMunicipal = porcReducaoMunicipal; - } - - public BigDecimal getPorcReducaoEstadual() { - return porcReducaoEstadual; - } - - public void setPorcReducaoEstadual(BigDecimal porcReducaoEstadual) { - this.porcReducaoEstadual = porcReducaoEstadual; - } - - public BigDecimal getTributacaoImportacao() { - return tributacaoImportacao; - } - - public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { - this.tributacaoImportacao = tributacaoImportacao; - } - - @Override - public String toString() { - return "ExportacaoRMDBase [codigoParticipantePar=" + codigoParticipantePar + ", codigoEstabelecimentoPar=" + codigoEstabelecimentoPar + ", nomeParticipante=" + nomeParticipante + ", ufParticipante=" + ufParticipante + ", cpfParticipante=" + cpfParticipante + ", ieParticipante=" + ieParticipante + ", imParticipante=" + imParticipante + ", logradouro=" + logradouro + ", numero=" + numero + ", complemento=" + complemento + ", bairro=" + bairro + ", cep=" + cep + ", dataEmissaoRMD=" + dataEmissaoRMD + ", codigoParticipante=" + codigoParticipante + ", codigoEstabelecimento=" + codigoEstabelecimento + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroFormularioBilheteAIDF=" + numeroFormularioBilheteAIDF + ", documentoCancelado=" + documentoCancelado + ", codigoContabil=" + codigoContabil + ", dataEmissao=" + dataEmissao + ", numeroFormulario=" + numeroFormulario + ", numeroAIDFRMD=" + numeroAIDFRMD + ", serieAIDFRMD=" + serieAIDFRMD + ", subSerieAIDFRMD=" + subSerieAIDFRMD + ", numeroRMD=" + numeroRMD + ", boletoCancelado=" + boletoCancelado + ", valorPago=" + valorPago + ", ufDestino=" + ufDestino + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", cfop=" + cfop + ", reducaoBaseCalcICMS=" + reducaoBaseCalcICMS + ", porcReducaoMunicipal=" + porcReducaoMunicipal + ", porcReducaoEstadual=" + porcReducaoEstadual + ", tributacaoImportacao=" + tributacaoImportacao + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoBPRBase { + // PAR + private Integer codigoParticipantePar; + private Integer codigoEstabelecimentoPar; + private String nomeParticipante; + private String ufParticipante; + private String cpfParticipante; + private String ieParticipante; + private String imParticipante; + private String logradouro; + private String numero; + private String complemento; + private String bairro; + private Integer cep; + + // RMD + private String dataEmissaoRMD; + private Integer codigoParticipante; + private Integer codigoEstabelecimento; + private String numeroAIDF; + private String serieAIDF; + private String subSerieAIDF; + private Long numeroFormularioBilheteAIDF; + private Boolean documentoCancelado; + private String codigoContabil; + + // BPS + private String dataEmissao; + private Long numeroFormulario; + private String numeroAIDFRMD; + private String serieAIDFRMD; + private String subSerieAIDFRMD; + private Integer numeroRMD; + private Integer boletoIsento; + private Integer boletoCancelado; + private BigDecimal valorPago; + + // DBP + private String ufDestino; + private String ufOrigem; + private Integer municipioOrigem; + private Integer cfop; + private BigDecimal reducaoBaseCalcICMS; + private BigDecimal porcReducaoMunicipal; + private BigDecimal porcReducaoEstadual; + private BigDecimal tributacaoImportacao; + + public ExportacaoBPRBase() { + + } + + public Integer getCodigoParticipantePar() { + return codigoParticipantePar; + } + + public void setCodigoParticipantePar(Integer codigoParticipantePar) { + this.codigoParticipantePar = codigoParticipantePar; + } + + public Integer getCodigoEstabelecimentoPar() { + return codigoEstabelecimentoPar; + } + + public void setCodigoEstabelecimentoPar(Integer codigoEstabelecimentoPar) { + this.codigoEstabelecimentoPar = codigoEstabelecimentoPar; + } + + public String getNomeParticipante() { + return nomeParticipante; + } + + public void setNomeParticipante(String nomeParticipante) { + this.nomeParticipante = nomeParticipante; + } + + public String getUfParticipante() { + return ufParticipante; + } + + public void setUfParticipante(String ufParticipante) { + this.ufParticipante = ufParticipante; + } + + public String getCpfParticipante() { + return cpfParticipante; + } + + public void setCpfParticipante(String cpfParticipante) { + this.cpfParticipante = cpfParticipante; + } + + public String getIeParticipante() { + return ieParticipante; + } + + public void setIeParticipante(String ieParticipante) { + this.ieParticipante = ieParticipante; + } + + public String getImParticipante() { + return imParticipante; + } + + public void setImParticipante(String imParticipante) { + this.imParticipante = imParticipante; + } + + public String getLogradouro() { + return logradouro; + } + + public void setLogradouro(String logradouro) { + this.logradouro = logradouro; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public Integer getCep() { + return cep; + } + + public void setCep(Integer cep) { + this.cep = cep; + } + + public String getDataEmissaoRMD() { + return dataEmissaoRMD; + } + + public void setDataEmissaoRMD(String dataEmissaoRMD) { + this.dataEmissaoRMD = dataEmissaoRMD; + } + + public Integer getCodigoParticipante() { + return codigoParticipante; + } + + public void setCodigoParticipante(Integer codigoParticipante) { + this.codigoParticipante = codigoParticipante; + } + + public Integer getCodigoEstabelecimento() { + return codigoEstabelecimento; + } + + public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { + this.codigoEstabelecimento = codigoEstabelecimento; + } + + public String getNumeroAIDF() { + return numeroAIDF; + } + + public void setNumeroAIDF(String numeroAIDF) { + this.numeroAIDF = numeroAIDF; + } + + public String getSerieAIDF() { + return serieAIDF; + } + + public void setSerieAIDF(String serieAIDF) { + this.serieAIDF = serieAIDF; + } + + public String getSubSerieAIDF() { + return subSerieAIDF; + } + + public void setSubSerieAIDF(String subSerieAIDF) { + this.subSerieAIDF = subSerieAIDF; + } + + public Long getNumeroFormularioBilheteAIDF() { + return numeroFormularioBilheteAIDF; + } + + public void setNumeroFormularioBilheteAIDF(Long numeroFormularioBilheteAIDF) { + this.numeroFormularioBilheteAIDF = numeroFormularioBilheteAIDF; + } + + public Boolean getDocumentoCancelado() { + return documentoCancelado; + } + + public void setDocumentoCancelado(Boolean documentoCancelado) { + this.documentoCancelado = documentoCancelado; + } + + public String getCodigoContabil() { + return codigoContabil; + } + + public void setCodigoContabil(String codigoContabil) { + this.codigoContabil = codigoContabil; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public Long getNumeroFormulario() { + return numeroFormulario; + } + + public void setNumeroFormulario(Long numeroFormulario) { + this.numeroFormulario = numeroFormulario; + } + + public String getNumeroAIDFRMD() { + return numeroAIDFRMD; + } + + public void setNumeroAIDFRMD(String numeroAIDFRMD) { + this.numeroAIDFRMD = numeroAIDFRMD; + } + + public String getSerieAIDFRMD() { + return serieAIDFRMD; + } + + public void setSerieAIDFRMD(String serieAIDFRMD) { + this.serieAIDFRMD = serieAIDFRMD; + } + + public String getSubSerieAIDFRMD() { + return subSerieAIDFRMD; + } + + public void setSubSerieAIDFRMD(String subSerieAIDFRMD) { + this.subSerieAIDFRMD = subSerieAIDFRMD; + } + + public Integer getNumeroRMD() { + return numeroRMD; + } + + public void setNumeroRMD(Integer numeroRMD) { + this.numeroRMD = numeroRMD; + } + + public Integer getBoletoIsento() { + return boletoIsento == null ? 0 : boletoIsento; + } + + public void setBoletoIsento(Integer boletoIsento) { + this.boletoIsento = boletoIsento; + } + + public Integer getBoletoCancelado() { + return boletoCancelado == null ? 0 : boletoCancelado; + } + + public void setBoletoCancelado(Integer boletoCancelado) { + this.boletoCancelado = boletoCancelado; + } + + public BigDecimal getValorPago() { + return valorPago; + } + + public void setValorPago(BigDecimal valorPago) { + this.valorPago = valorPago; + } + + public String getUfDestino() { + return ufDestino; + } + + public void setUfDestino(String ufDestino) { + this.ufDestino = ufDestino; + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public Integer getCfop() { + return cfop; + } + + public void setCfop(Integer cfop) { + this.cfop = cfop; + } + + public BigDecimal getReducaoBaseCalcICMS() { + return reducaoBaseCalcICMS; + } + + public void setReducaoBaseCalcICMS(BigDecimal reducaoBaseCalcICMS) { + this.reducaoBaseCalcICMS = reducaoBaseCalcICMS; + } + + public BigDecimal getPorcReducaoMunicipal() { + return porcReducaoMunicipal; + } + + public void setPorcReducaoMunicipal(BigDecimal porcReducaoMunicipal) { + this.porcReducaoMunicipal = porcReducaoMunicipal; + } + + public BigDecimal getPorcReducaoEstadual() { + return porcReducaoEstadual; + } + + public void setPorcReducaoEstadual(BigDecimal porcReducaoEstadual) { + this.porcReducaoEstadual = porcReducaoEstadual; + } + + public BigDecimal getTributacaoImportacao() { + return tributacaoImportacao; + } + + public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { + this.tributacaoImportacao = tributacaoImportacao; + } + + @Override + public String toString() { + return "ExportacaoRMDBase [codigoParticipantePar=" + codigoParticipantePar + ", codigoEstabelecimentoPar=" + codigoEstabelecimentoPar + ", nomeParticipante=" + nomeParticipante + ", ufParticipante=" + ufParticipante + ", cpfParticipante=" + cpfParticipante + ", ieParticipante=" + ieParticipante + ", imParticipante=" + imParticipante + ", logradouro=" + logradouro + ", numero=" + numero + ", complemento=" + complemento + ", bairro=" + bairro + ", cep=" + cep + ", dataEmissaoRMD=" + dataEmissaoRMD + ", codigoParticipante=" + codigoParticipante + ", codigoEstabelecimento=" + codigoEstabelecimento + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroFormularioBilheteAIDF=" + numeroFormularioBilheteAIDF + ", documentoCancelado=" + documentoCancelado + ", codigoContabil=" + codigoContabil + ", dataEmissao=" + dataEmissao + ", numeroFormulario=" + numeroFormulario + ", numeroAIDFRMD=" + numeroAIDFRMD + ", serieAIDFRMD=" + serieAIDFRMD + ", subSerieAIDFRMD=" + subSerieAIDFRMD + ", numeroRMD=" + numeroRMD + ", boletoCancelado=" + boletoCancelado + ", valorPago=" + valorPago + ", ufDestino=" + ufDestino + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", cfop=" + cfop + ", reducaoBaseCalcICMS=" + reducaoBaseCalcICMS + ", porcReducaoMunicipal=" + porcReducaoMunicipal + ", porcReducaoEstadual=" + porcReducaoEstadual + ", tributacaoImportacao=" + tributacaoImportacao + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java index 8e351f352..e5eb722aa 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECF.java @@ -1,418 +1,418 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; - -public class ExportacaoECF { - private List listaRegistroECF; - - private List listaRegistroECFTipoCFC; - private List listaRegistroECFTipoCCF; - private List listaRegistroECFTipoICF; - private List listaRegistroECFTipoPRC; - - public ExportacaoECF() { - listaRegistroECF = new ArrayList(0); - - listaRegistroECFTipoCFC = new ArrayList(0); - listaRegistroECFTipoCCF = new ArrayList(0); - listaRegistroECFTipoICF = new ArrayList(0); - listaRegistroECFTipoPRC = new ArrayList(0); - } - - public List getListaRegistroECF() { - return listaRegistroECF; - } - - public List getListaRegistroECFTipoCFC() { - return listaRegistroECFTipoCFC; - } - - public List getListaRegistroECFTipoCCF() { - return listaRegistroECFTipoCCF; - } - - public List getListaRegistroECFTipoICF() { - return listaRegistroECFTipoICF; - } - - public List getListaRegistroECFTipoPRC() { - return listaRegistroECFTipoPRC; - } - - public void gerarListas() { - gerarCFC(); - gerarCCF(); - gerarICF(); - gerarPRC(); - } - - private void gerarCFC() { - listaRegistroECFTipoCFC.clear(); - - ExportacaoECFTipoCFC registro = null; - - Map group = new HashMap(0); - - for (ExportacaoECFBase base : listaRegistroECF) { - String key = base.getEcf() + "-" + base.getNumeroSerie() + "-" + base.getDataEmissao() + "-" + base.getCooInicial() + "-" + base.getCooFinal() + "-" + base.getCooReducaoZ() + "-" + base.getCro() + "-" + base.getCooReducaoZ() + "-" + base.getEstabelecimento() + "-" + base.getEstabelecimentoECF() + "-" + base.getNumeroIdentificacaoECF() + "-" + base.getUfOrigem(); - - BigDecimal totalisenta = BigDecimal.ZERO; - BigDecimal totalvenda = BigDecimal.ZERO; - - if (base.getIsenta().intValue() == 1) { - totalisenta = MoneyHelper.somar(totalisenta, base.getValorTributado()); - } - - totalvenda = MoneyHelper.somar(totalvenda, base.getValorTributado()); - - if (group.containsKey(key)) { - registro = group.get(key); - - totalisenta = MoneyHelper.somar(totalisenta, registro.getValorIsentas()); - totalvenda = MoneyHelper.somar(totalvenda, registro.getValorTotal()); - - } else { - registro = new ExportacaoECFTipoCFC(); - } - - registro.setEstabelecimento(base.getEstabelecimento()); - registro.setDataEmissao(base.getDataEmissao()); - registro.setNumeroIdentificacaoECF(base.getNumeroIdentificacaoECF()); - registro.setEcf(base.getEcf()); - registro.setCooReducaoZ(base.getCooReducaoZ()); - registro.setCooInicial(base.getCooInicial()); - registro.setCooFinal(base.getCooFinal()); - registro.setContadorReducao(base.getContadorReducao()); - registro.setCro(base.getCro()); - registro.setEstabelecimentoECF(base.getEstabelecimentoECF()); - registro.setNumeroSerie(base.getNumeroSerie()); - registro.setInfoPadraoBilhetePassagem(base.getInfoPadraoBilhetePassagem()); - - registro.setValorIsentas(totalisenta); - registro.setValorTotal(totalvenda); - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - listaRegistroECFTipoCFC.add(entry.getValue()); - } - - Collections.sort(listaRegistroECFTipoCFC, new Comparator(){ - public int compare(ExportacaoECFTipoCFC e1, ExportacaoECFTipoCFC e2) { - String c1 = e1.getDataEmissao() + (e1.getNumeroIdentificacaoECF() == null ? "000" : e1.getNumeroIdentificacaoECF()); - String c2 = e2.getDataEmissao() + (e2.getNumeroIdentificacaoECF() == null ? "000" : e2.getNumeroIdentificacaoECF()); - - return c1.compareToIgnoreCase(c2); - } - }); - } - - private void gerarCCF() { - listaRegistroECFTipoCCF.clear(); - - ExportacaoECFTipoCCF registro = null; - - for (ExportacaoECFBase base : listaRegistroECF) { - BigDecimal valorTributado = base.getValorTributado(); - - registro = new ExportacaoECFTipoCCF(); - registro.setEcf(base.getEcf()); - registro.setDataEmissao(base.getDataEmissao()); - registro.setCoo(base.getCoo()); - registro.setValorServico(valorTributado); - registro.setDescontoGlobal(null); - registro.setCodigoParticipante(null); - registro.setSituacaoCOO(0); // 0 - Documento Regular; 2 - Documento Cancelado - registro.setAcrescimo(null); - registro.setNumFolioSistema(base.getNumFolioSistema()); - - registro.setCodigoSituacaoTribColunaB(null); - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (base.getIsenta() == 1) { - registro.setCodigoSituacaoTribColunaB(40); - } - - registro.setUfOrigem(base.getUfOrigem()); - registro.setMunicipioOrigem(base.getMunicipioOrigem()); - registro.setUfDestino(base.getUfDestino()); - - // IM=5357; serviço IE= 6357 - if (base.getUfOrigem().equals(base.getUfDestino())) { - registro.setCfop(5357); - } else { - registro.setCfop(6357); - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (registro.getCodigoSituacaoTribColunaB() == null) { - registro.setCodigoSituacaoTribColunaB(base.getReducaoBaseCalcICMS().compareTo(BigDecimal.ZERO) == 0 ? 0 : 20); - } - - BigDecimal valorTotal = valorTributado; - - BigDecimal red_base_calc_icms = MoneyHelper.instanciar(base.getReducaoBaseCalcICMS()); - BigDecimal tributacao_importacao = MoneyHelper.instanciar(base.getTributacaoImportacao()); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - if (registro.getCodigoSituacaoTribColunaB() != 0) { - if ("30|40|41|50|60".contains(registro.getCodigoSituacaoTribColunaB().toString())) { - tributacao_importacao = BigDecimal.ZERO; - } - } - - if (red_base_calc_icms != null) { - valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); - } else { - valorBaseCalculoICMS = valorTotal; - } - - if (base.getIsenta() == 1) { - valorBaseCalculoICMS = null; - } - - registro.setValorTotal(valorTotal); - - // 1 - Demais; 2 - Região Metropolitanao ou seja, quando o campo CSTB for "40", esse campo deve vir "2". Do contrário, deve vir "1" - registro.setTributacaoICMS(registro.getCodigoSituacaoTribColunaB() == 40 ? 2 : 1); - - registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); - registro.setAliquotaICMS(tributacao_importacao); - - if (valorTotal.doubleValue() != 0) { - listaRegistroECFTipoCCF.add(registro); - } - } - - Collections.sort(listaRegistroECFTipoCCF, new Comparator(){ - public int compare(ExportacaoECFTipoCCF e1, ExportacaoECFTipoCCF e2) { - String c1 = String.format("%06d", e1.getCoo()); - String c2 = String.format("%06d", e2.getCoo()); - - if (c1.equals("000001")) { - c1 = "999999"; - } - - if (c2.equals("000001")) { - c2 = "999999"; - } - - return c1.compareToIgnoreCase(c2); - } - }); - } - - private void gerarICF() { - listaRegistroECFTipoICF.clear(); - - ExportacaoECFTipoICF registro = null; - - Map group = new HashMap(); - - for (ExportacaoECFBase base : listaRegistroECF) { - BigDecimal valorTotal = base.getValorTributado(); - - if (valorTotal == null || valorTotal.doubleValue() == 0) { - continue; - } - - BigDecimal red_base_calc_icms = MoneyHelper.instanciar(base.getReducaoBaseCalcICMS()); - BigDecimal porc_red_municipal = MoneyHelper.instanciar(base.getPorcReducaoMunicipal()); - BigDecimal porc_red_estadual = MoneyHelper.instanciar(base.getPorcReducaoEstadual()); - BigDecimal tributacao_importacao = MoneyHelper.instanciar(base.getTributacaoImportacao()); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - if (red_base_calc_icms != null) { - BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); - valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); - } else { - valorBaseCalculoICMS = valorTotal; - } - - BigDecimal valorICMSDebitado = BigDecimal.ZERO; - - if (tributacao_importacao != null) { - BigDecimal aTributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - valorICMSDebitado = MoneyHelper.multiplicar(valorBaseCalculoICMS, aTributacao_importacao); - } - - BigDecimal valorICMSIsento = BigDecimal.ZERO; - BigDecimal valorICMSOutros = MoneyHelper.subtrair(valorTotal, valorBaseCalculoICMS); - - String ecf = base.getEcf(); - String datamov = base.getDataEmissao(); - String ufDestino = ""; - String ufOrigem = ""; - Integer municipioOrigem = 0; - Integer cfop = 0; // IM=5357; serviço IE= 6357 - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - Integer codigoSituacaoTribColunaB = null; - - if (base.getIsenta() == 1) { - codigoSituacaoTribColunaB = 40; - - valorICMSOutros = valorTotal; - } - - ufDestino = base.getUfDestino(); - ufOrigem = base.getUfOrigem(); - municipioOrigem = base.getMunicipioOrigem(); - - // IM=5357; serviço IE= 6357 - if (base.getUfOrigem().equals(base.getUfDestino())) { - cfop = 5357; - } else { - cfop = 6357; - } - - // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - if (codigoSituacaoTribColunaB == null) { - codigoSituacaoTribColunaB = base.getReducaoBaseCalcICMS().compareTo(BigDecimal.ZERO) == 0 ? 0 : 20; - } - - if (codigoSituacaoTribColunaB == 40) { - tributacao_importacao = BigDecimal.ZERO; - valorBaseCalculoICMS = BigDecimal.ZERO; - valorICMSDebitado = BigDecimal.ZERO; - valorICMSOutros = BigDecimal.ZERO; - - valorICMSIsento = valorTotal; - } - - String key = ecf + "|" + datamov + "|" + ufDestino + "|" + cfop.toString() + "|" + codigoSituacaoTribColunaB.toString() + "|" + municipioOrigem; - - if (group.containsKey(key)) { - registro = group.get(key); - - valorTotal = MoneyHelper.somar(valorTotal, registro.getValorTotal()); - valorBaseCalculoICMS = MoneyHelper.somar(valorBaseCalculoICMS, registro.getValorBaseCalculoICMS()); - valorICMSDebitado = MoneyHelper.somar(valorICMSDebitado, registro.getValorICMSDebitado()); - valorICMSIsento = MoneyHelper.somar(valorICMSIsento, registro.getValorICMSIsento()); - valorICMSOutros = MoneyHelper.somar(valorICMSOutros, registro.getValorICMSOutros()); - } else { - registro = new ExportacaoECFTipoICF(); - registro.setEcf(ecf); - registro.setDataEmissao(datamov); - registro.setUfDestino(ufDestino); - registro.setCfop(cfop); // IM=5357; serviço IE= 6357 - registro.setCodigoSituacaoTribColunaB(codigoSituacaoTribColunaB); // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - registro.setAliquotaICMS(tributacao_importacao); - registro.setUfOrigem(ufOrigem); - registro.setMunicipioOrigem(municipioOrigem); - - registro.setRedutorBaseCalculoIcms(red_base_calc_icms); - registro.setRedutorMunicipalIcms(porc_red_municipal); - registro.setRedutorEstadualIcms(porc_red_estadual); - - group.put(key, registro); - } - - registro.setValorTotal(valorTotal); - registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); - registro.setValorICMSDebitado(valorICMSDebitado); - registro.setValorICMSIsento(valorICMSIsento); - registro.setValorICMSOutros(valorICMSOutros); - } - - for (Map.Entry entry : group.entrySet()) { - if (entry.getValue().getAliquotaICMS() != null && entry.getValue().getValorBaseCalculoICMS() != null) { - BigDecimal valorICMSDebitado = BigDecimal.ZERO; - - BigDecimal aTributacao_importacao = MoneyHelper.dividir(entry.getValue().getAliquotaICMS(), BigDecimal.valueOf(100d)); - valorICMSDebitado = MoneyHelper.multiplicar(entry.getValue().getValorBaseCalculoICMS(), aTributacao_importacao); - - entry.getValue().setValorICMSDebitado(valorICMSDebitado); - } - - listaRegistroECFTipoICF.add(entry.getValue()); - } - - Collections.sort(listaRegistroECFTipoICF, new Comparator(){ - public int compare(ExportacaoECFTipoICF e1, ExportacaoECFTipoICF e2) { - String c1 = e1.getUfDestino(); - String c2 = e2.getUfDestino(); - - return c1.compareToIgnoreCase(c2); - } - }); - } - - private void gerarPRC() { - listaRegistroECFTipoPRC.clear(); - - ExportacaoECFTipoPRC registro = null; - - Map group = new HashMap(); - - for (ExportacaoECFBase base : listaRegistroECF) { - BigDecimal valorTotal = base.getValorTributado(); - - BigDecimal red_base_calc_icms = MoneyHelper.instanciar(base.getReducaoBaseCalcICMS()); - BigDecimal tributacao_importacao = MoneyHelper.instanciar(base.getTributacaoImportacao()); - BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; - - if (tributacao_importacao != null) { - tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); - } - - if (red_base_calc_icms != null) { - BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); - valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); - } else { - valorBaseCalculoICMS = valorTotal; - } - - BigDecimal valorICMS = BigDecimal.ZERO; - - if (tributacao_importacao != null) { - valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); - } - - String key = base.getEcf() + "|" + base.getDataEmissao() + "|" + base.getUfOrigem() + "|" + base.getMunicipioOrigem(); - - if (group.containsKey(key)) { - registro = group.get(key); - - registro.setValorTotal(MoneyHelper.somar(registro.getValorTotal(), valorTotal)); - registro.setValorBaseCalculoICMS(MoneyHelper.somar(registro.getValorBaseCalculoICMS(), valorBaseCalculoICMS)); - registro.setValorICMS(MoneyHelper.somar(registro.getValorICMS(), valorICMS)); - - } else { - registro = new ExportacaoECFTipoPRC(); - registro.setEcf(base.getEcf()); - registro.setDataEmissao(base.getDataEmissao()); - registro.setUfOrigem(base.getUfOrigem()); - registro.setMunicipioOrigem(base.getMunicipioOrigem()); - registro.setValorTotal(valorTotal); - registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); - registro.setValorICMS(valorICMS); - registro.setTributacao(tributacao_importacao); - } - - group.put(key, registro); - } - - for (Map.Entry entry : group.entrySet()) { - listaRegistroECFTipoPRC.add(entry.getValue()); - } - - Collections.sort(listaRegistroECFTipoPRC, new Comparator(){ - public int compare(ExportacaoECFTipoPRC e1, ExportacaoECFTipoPRC e2) { - String c1 = String.valueOf(e1.getMunicipioOrigem()); - String c2 = String.valueOf(e2.getMunicipioOrigem()); - - return c1.compareToIgnoreCase(c2); - } - }); - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; + +public class ExportacaoECF { + private List listaRegistroECF; + + private List listaRegistroECFTipoCFC; + private List listaRegistroECFTipoCCF; + private List listaRegistroECFTipoICF; + private List listaRegistroECFTipoPRC; + + public ExportacaoECF() { + listaRegistroECF = new ArrayList(0); + + listaRegistroECFTipoCFC = new ArrayList(0); + listaRegistroECFTipoCCF = new ArrayList(0); + listaRegistroECFTipoICF = new ArrayList(0); + listaRegistroECFTipoPRC = new ArrayList(0); + } + + public List getListaRegistroECF() { + return listaRegistroECF; + } + + public List getListaRegistroECFTipoCFC() { + return listaRegistroECFTipoCFC; + } + + public List getListaRegistroECFTipoCCF() { + return listaRegistroECFTipoCCF; + } + + public List getListaRegistroECFTipoICF() { + return listaRegistroECFTipoICF; + } + + public List getListaRegistroECFTipoPRC() { + return listaRegistroECFTipoPRC; + } + + public void gerarListas() { + gerarCFC(); + gerarCCF(); + gerarICF(); + gerarPRC(); + } + + private void gerarCFC() { + listaRegistroECFTipoCFC.clear(); + + ExportacaoECFTipoCFC registro = null; + + Map group = new HashMap(0); + + for (ExportacaoECFBase base : listaRegistroECF) { + String key = base.getEcf() + "-" + base.getNumeroSerie() + "-" + base.getDataEmissao() + "-" + base.getCooInicial() + "-" + base.getCooFinal() + "-" + base.getCooReducaoZ() + "-" + base.getCro() + "-" + base.getCooReducaoZ() + "-" + base.getEstabelecimento() + "-" + base.getEstabelecimentoECF() + "-" + base.getNumeroIdentificacaoECF() + "-" + base.getUfOrigem(); + + BigDecimal totalisenta = BigDecimal.ZERO; + BigDecimal totalvenda = BigDecimal.ZERO; + + if (base.getIsenta().intValue() == 1) { + totalisenta = MoneyHelper.somar(totalisenta, base.getValorTributado()); + } + + totalvenda = MoneyHelper.somar(totalvenda, base.getValorTributado()); + + if (group.containsKey(key)) { + registro = group.get(key); + + totalisenta = MoneyHelper.somar(totalisenta, registro.getValorIsentas()); + totalvenda = MoneyHelper.somar(totalvenda, registro.getValorTotal()); + + } else { + registro = new ExportacaoECFTipoCFC(); + } + + registro.setEstabelecimento(base.getEstabelecimento()); + registro.setDataEmissao(base.getDataEmissao()); + registro.setNumeroIdentificacaoECF(base.getNumeroIdentificacaoECF()); + registro.setEcf(base.getEcf()); + registro.setCooReducaoZ(base.getCooReducaoZ()); + registro.setCooInicial(base.getCooInicial()); + registro.setCooFinal(base.getCooFinal()); + registro.setContadorReducao(base.getContadorReducao()); + registro.setCro(base.getCro()); + registro.setEstabelecimentoECF(base.getEstabelecimentoECF()); + registro.setNumeroSerie(base.getNumeroSerie()); + registro.setInfoPadraoBilhetePassagem(base.getInfoPadraoBilhetePassagem()); + + registro.setValorIsentas(totalisenta); + registro.setValorTotal(totalvenda); + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + listaRegistroECFTipoCFC.add(entry.getValue()); + } + + Collections.sort(listaRegistroECFTipoCFC, new Comparator(){ + public int compare(ExportacaoECFTipoCFC e1, ExportacaoECFTipoCFC e2) { + String c1 = e1.getDataEmissao() + (e1.getNumeroIdentificacaoECF() == null ? "000" : e1.getNumeroIdentificacaoECF()); + String c2 = e2.getDataEmissao() + (e2.getNumeroIdentificacaoECF() == null ? "000" : e2.getNumeroIdentificacaoECF()); + + return c1.compareToIgnoreCase(c2); + } + }); + } + + private void gerarCCF() { + listaRegistroECFTipoCCF.clear(); + + ExportacaoECFTipoCCF registro = null; + + for (ExportacaoECFBase base : listaRegistroECF) { + BigDecimal valorTributado = base.getValorTributado(); + + registro = new ExportacaoECFTipoCCF(); + registro.setEcf(base.getEcf()); + registro.setDataEmissao(base.getDataEmissao()); + registro.setCoo(base.getCoo()); + registro.setValorServico(valorTributado); + registro.setDescontoGlobal(null); + registro.setCodigoParticipante(null); + registro.setSituacaoCOO(0); // 0 - Documento Regular; 2 - Documento Cancelado + registro.setAcrescimo(null); + registro.setNumFolioSistema(base.getNumFolioSistema()); + + registro.setCodigoSituacaoTribColunaB(null); + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (base.getIsenta() == 1) { + registro.setCodigoSituacaoTribColunaB(40); + } + + registro.setUfOrigem(base.getUfOrigem()); + registro.setMunicipioOrigem(base.getMunicipioOrigem()); + registro.setUfDestino(base.getUfDestino()); + + // IM=5357; serviço IE= 6357 + if (base.getUfOrigem().equals(base.getUfDestino())) { + registro.setCfop(5357); + } else { + registro.setCfop(6357); + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (registro.getCodigoSituacaoTribColunaB() == null) { + registro.setCodigoSituacaoTribColunaB(base.getReducaoBaseCalcICMS().compareTo(BigDecimal.ZERO) == 0 ? 0 : 20); + } + + BigDecimal valorTotal = valorTributado; + + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(base.getReducaoBaseCalcICMS()); + BigDecimal tributacao_importacao = MoneyHelper.instanciar(base.getTributacaoImportacao()); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + if (registro.getCodigoSituacaoTribColunaB() != 0) { + if ("30|40|41|50|60".contains(registro.getCodigoSituacaoTribColunaB().toString())) { + tributacao_importacao = BigDecimal.ZERO; + } + } + + if (red_base_calc_icms != null) { + valorBaseCalculoICMS = valorTotal.subtract(valorTotal.multiply(red_base_calc_icms.divide(BigDecimal.valueOf(100d)))); + } else { + valorBaseCalculoICMS = valorTotal; + } + + if (base.getIsenta() == 1) { + valorBaseCalculoICMS = null; + } + + registro.setValorTotal(valorTotal); + + // 1 - Demais; 2 - Região Metropolitanao ou seja, quando o campo CSTB for "40", esse campo deve vir "2". Do contrário, deve vir "1" + registro.setTributacaoICMS(registro.getCodigoSituacaoTribColunaB() == 40 ? 2 : 1); + + registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); + registro.setAliquotaICMS(tributacao_importacao); + + if (valorTotal.doubleValue() != 0) { + listaRegistroECFTipoCCF.add(registro); + } + } + + Collections.sort(listaRegistroECFTipoCCF, new Comparator(){ + public int compare(ExportacaoECFTipoCCF e1, ExportacaoECFTipoCCF e2) { + String c1 = String.format("%06d", e1.getCoo()); + String c2 = String.format("%06d", e2.getCoo()); + + if (c1.equals("000001")) { + c1 = "999999"; + } + + if (c2.equals("000001")) { + c2 = "999999"; + } + + return c1.compareToIgnoreCase(c2); + } + }); + } + + private void gerarICF() { + listaRegistroECFTipoICF.clear(); + + ExportacaoECFTipoICF registro = null; + + Map group = new HashMap(); + + for (ExportacaoECFBase base : listaRegistroECF) { + BigDecimal valorTotal = base.getValorTributado(); + + if (valorTotal == null || valorTotal.doubleValue() == 0) { + continue; + } + + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(base.getReducaoBaseCalcICMS()); + BigDecimal porc_red_municipal = MoneyHelper.instanciar(base.getPorcReducaoMunicipal()); + BigDecimal porc_red_estadual = MoneyHelper.instanciar(base.getPorcReducaoEstadual()); + BigDecimal tributacao_importacao = MoneyHelper.instanciar(base.getTributacaoImportacao()); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + if (red_base_calc_icms != null) { + BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); + valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); + } else { + valorBaseCalculoICMS = valorTotal; + } + + BigDecimal valorICMSDebitado = BigDecimal.ZERO; + + if (tributacao_importacao != null) { + BigDecimal aTributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + valorICMSDebitado = MoneyHelper.multiplicar(valorBaseCalculoICMS, aTributacao_importacao); + } + + BigDecimal valorICMSIsento = BigDecimal.ZERO; + BigDecimal valorICMSOutros = MoneyHelper.subtrair(valorTotal, valorBaseCalculoICMS); + + String ecf = base.getEcf(); + String datamov = base.getDataEmissao(); + String ufDestino = ""; + String ufOrigem = ""; + Integer municipioOrigem = 0; + Integer cfop = 0; // IM=5357; serviço IE= 6357 + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + Integer codigoSituacaoTribColunaB = null; + + if (base.getIsenta() == 1) { + codigoSituacaoTribColunaB = 40; + + valorICMSOutros = valorTotal; + } + + ufDestino = base.getUfDestino(); + ufOrigem = base.getUfOrigem(); + municipioOrigem = base.getMunicipioOrigem(); + + // IM=5357; serviço IE= 6357 + if (base.getUfOrigem().equals(base.getUfDestino())) { + cfop = 5357; + } else { + cfop = 6357; + } + + // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + if (codigoSituacaoTribColunaB == null) { + codigoSituacaoTribColunaB = base.getReducaoBaseCalcICMS().compareTo(BigDecimal.ZERO) == 0 ? 0 : 20; + } + + if (codigoSituacaoTribColunaB == 40) { + tributacao_importacao = BigDecimal.ZERO; + valorBaseCalculoICMS = BigDecimal.ZERO; + valorICMSDebitado = BigDecimal.ZERO; + valorICMSOutros = BigDecimal.ZERO; + + valorICMSIsento = valorTotal; + } + + String key = ecf + "|" + datamov + "|" + ufDestino + "|" + cfop.toString() + "|" + codigoSituacaoTribColunaB.toString() + "|" + municipioOrigem; + + if (group.containsKey(key)) { + registro = group.get(key); + + valorTotal = MoneyHelper.somar(valorTotal, registro.getValorTotal()); + valorBaseCalculoICMS = MoneyHelper.somar(valorBaseCalculoICMS, registro.getValorBaseCalculoICMS()); + valorICMSDebitado = MoneyHelper.somar(valorICMSDebitado, registro.getValorICMSDebitado()); + valorICMSIsento = MoneyHelper.somar(valorICMSIsento, registro.getValorICMSIsento()); + valorICMSOutros = MoneyHelper.somar(valorICMSOutros, registro.getValorICMSOutros()); + } else { + registro = new ExportacaoECFTipoICF(); + registro.setEcf(ecf); + registro.setDataEmissao(datamov); + registro.setUfDestino(ufDestino); + registro.setCfop(cfop); // IM=5357; serviço IE= 6357 + registro.setCodigoSituacaoTribColunaB(codigoSituacaoTribColunaB); // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + registro.setAliquotaICMS(tributacao_importacao); + registro.setUfOrigem(ufOrigem); + registro.setMunicipioOrigem(municipioOrigem); + + registro.setRedutorBaseCalculoIcms(red_base_calc_icms); + registro.setRedutorMunicipalIcms(porc_red_municipal); + registro.setRedutorEstadualIcms(porc_red_estadual); + + group.put(key, registro); + } + + registro.setValorTotal(valorTotal); + registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); + registro.setValorICMSDebitado(valorICMSDebitado); + registro.setValorICMSIsento(valorICMSIsento); + registro.setValorICMSOutros(valorICMSOutros); + } + + for (Map.Entry entry : group.entrySet()) { + if (entry.getValue().getAliquotaICMS() != null && entry.getValue().getValorBaseCalculoICMS() != null) { + BigDecimal valorICMSDebitado = BigDecimal.ZERO; + + BigDecimal aTributacao_importacao = MoneyHelper.dividir(entry.getValue().getAliquotaICMS(), BigDecimal.valueOf(100d)); + valorICMSDebitado = MoneyHelper.multiplicar(entry.getValue().getValorBaseCalculoICMS(), aTributacao_importacao); + + entry.getValue().setValorICMSDebitado(valorICMSDebitado); + } + + listaRegistroECFTipoICF.add(entry.getValue()); + } + + Collections.sort(listaRegistroECFTipoICF, new Comparator(){ + public int compare(ExportacaoECFTipoICF e1, ExportacaoECFTipoICF e2) { + String c1 = e1.getUfDestino(); + String c2 = e2.getUfDestino(); + + return c1.compareToIgnoreCase(c2); + } + }); + } + + private void gerarPRC() { + listaRegistroECFTipoPRC.clear(); + + ExportacaoECFTipoPRC registro = null; + + Map group = new HashMap(); + + for (ExportacaoECFBase base : listaRegistroECF) { + BigDecimal valorTotal = base.getValorTributado(); + + BigDecimal red_base_calc_icms = MoneyHelper.instanciar(base.getReducaoBaseCalcICMS()); + BigDecimal tributacao_importacao = MoneyHelper.instanciar(base.getTributacaoImportacao()); + BigDecimal valorBaseCalculoICMS = BigDecimal.ZERO; + + if (tributacao_importacao != null) { + tributacao_importacao = MoneyHelper.dividir(tributacao_importacao, BigDecimal.valueOf(100d)); + } + + if (red_base_calc_icms != null) { + BigDecimal aRed_base_calc_icms = MoneyHelper.dividir(red_base_calc_icms, BigDecimal.valueOf(100d)); + valorBaseCalculoICMS = MoneyHelper.subtrair(valorTotal, MoneyHelper.multiplicar(valorTotal, aRed_base_calc_icms)); + } else { + valorBaseCalculoICMS = valorTotal; + } + + BigDecimal valorICMS = BigDecimal.ZERO; + + if (tributacao_importacao != null) { + valorICMS = MoneyHelper.multiplicar(valorBaseCalculoICMS, tributacao_importacao); + } + + String key = base.getEcf() + "|" + base.getDataEmissao() + "|" + base.getUfOrigem() + "|" + base.getMunicipioOrigem(); + + if (group.containsKey(key)) { + registro = group.get(key); + + registro.setValorTotal(MoneyHelper.somar(registro.getValorTotal(), valorTotal)); + registro.setValorBaseCalculoICMS(MoneyHelper.somar(registro.getValorBaseCalculoICMS(), valorBaseCalculoICMS)); + registro.setValorICMS(MoneyHelper.somar(registro.getValorICMS(), valorICMS)); + + } else { + registro = new ExportacaoECFTipoPRC(); + registro.setEcf(base.getEcf()); + registro.setDataEmissao(base.getDataEmissao()); + registro.setUfOrigem(base.getUfOrigem()); + registro.setMunicipioOrigem(base.getMunicipioOrigem()); + registro.setValorTotal(valorTotal); + registro.setValorBaseCalculoICMS(valorBaseCalculoICMS); + registro.setValorICMS(valorICMS); + registro.setTributacao(tributacao_importacao); + } + + group.put(key, registro); + } + + for (Map.Entry entry : group.entrySet()) { + listaRegistroECFTipoPRC.add(entry.getValue()); + } + + Collections.sort(listaRegistroECFTipoPRC, new Comparator(){ + public int compare(ExportacaoECFTipoPRC e1, ExportacaoECFTipoPRC e2) { + String c1 = String.valueOf(e1.getMunicipioOrigem()); + String c2 = String.valueOf(e2.getMunicipioOrigem()); + + return c1.compareToIgnoreCase(c2); + } + }); + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFBase.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFBase.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFBase.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFBase.java index 6d55c91bd..715b47aec 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFBase.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFBase.java @@ -1,236 +1,236 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoECFBase { - private String estabelecimento; - private String dataEmissao; - private String numeroIdentificacaoECF; - private Integer cooReducaoZ; - private Integer cooInicial; - private Integer cooFinal; - private Integer contadorReducao; - private Integer cro; - private String estabelecimentoECF; - private String ecf; - private String numeroSerie; - private Integer coo; - private String numFolioSistema; - private String ufOrigem; - private Integer municipioOrigem; - private String ufDestino; - private Integer municipioDestino; - private BigDecimal reducaoBaseCalcICMS; - private BigDecimal porcReducaoMunicipal; - private BigDecimal porcReducaoEstadual; - private BigDecimal tributacaoImportacao; - private String infoPadraoBilhetePassagem; - - private Integer isenta; - private BigDecimal valorTributado; - private BigDecimal valorTotal; - - public ExportacaoECFBase() { - - } - - public String getEstabelecimento() { - return estabelecimento; - } - - public void setEstabelecimento(String estabelecimento) { - this.estabelecimento = estabelecimento; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public String getNumeroIdentificacaoECF() { - return numeroIdentificacaoECF; - } - - public void setNumeroIdentificacaoECF(String numeroIdentificacaoECF) { - this.numeroIdentificacaoECF = numeroIdentificacaoECF; - } - - public Integer getCooReducaoZ() { - return cooReducaoZ; - } - - public void setCooReducaoZ(Integer cooReducaoZ) { - this.cooReducaoZ = cooReducaoZ; - } - - public Integer getCooInicial() { - return cooInicial; - } - - public void setCooInicial(Integer cooInicial) { - this.cooInicial = cooInicial; - } - - public Integer getCooFinal() { - return cooFinal; - } - - public void setCooFinal(Integer cooFinal) { - this.cooFinal = cooFinal; - } - - public Integer getContadorReducao() { - return contadorReducao; - } - - public void setContadorReducao(Integer contadorReducao) { - this.contadorReducao = contadorReducao; - } - - public Integer getCro() { - return cro; - } - - public void setCro(Integer cro) { - this.cro = cro; - } - - public String getEstabelecimentoECF() { - return estabelecimentoECF; - } - - public void setEstabelecimentoECF(String estabelecimentoECF) { - this.estabelecimentoECF = estabelecimentoECF; - } - - public String getEcf() { - return ecf; - } - - public void setEcf(String ecf) { - this.ecf = ecf; - } - - public String getNumeroSerie() { - return numeroSerie; - } - - public void setNumeroSerie(String numeroSerie) { - this.numeroSerie = numeroSerie; - } - - public Integer getCoo() { - return coo; - } - - public void setCoo(Integer coo) { - this.coo = coo; - } - - public String getNumFolioSistema() { - return numFolioSistema; - } - - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public String getUfDestino() { - return ufDestino; - } - - public void setUfDestino(String ufDestino) { - this.ufDestino = ufDestino; - } - - public Integer getMunicipioDestino() { - return municipioDestino; - } - - public void setMunicipioDestino(Integer municipioDestino) { - this.municipioDestino = municipioDestino; - } - - public BigDecimal getReducaoBaseCalcICMS() { - return reducaoBaseCalcICMS == null ? BigDecimal.ZERO : reducaoBaseCalcICMS; - } - - public void setReducaoBaseCalcICMS(BigDecimal reducaoBaseCalcICMS) { - this.reducaoBaseCalcICMS = reducaoBaseCalcICMS; - } - - public BigDecimal getPorcReducaoMunicipal() { - return porcReducaoMunicipal; - } - - public void setPorcReducaoMunicipal(BigDecimal porcReducaoMunicipal) { - this.porcReducaoMunicipal = porcReducaoMunicipal; - } - - public BigDecimal getPorcReducaoEstadual() { - return porcReducaoEstadual; - } - - public void setPorcReducaoEstadual(BigDecimal porcReducaoEstadual) { - this.porcReducaoEstadual = porcReducaoEstadual; - } - - public BigDecimal getTributacaoImportacao() { - return tributacaoImportacao; - } - - public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { - this.tributacaoImportacao = tributacaoImportacao; - } - - public String getInfoPadraoBilhetePassagem() { - return infoPadraoBilhetePassagem; - } - - public void setInfoPadraoBilhetePassagem(String infoPadraoBilhetePassagem) { - this.infoPadraoBilhetePassagem = infoPadraoBilhetePassagem; - } - - public Integer getIsenta() { - return isenta; - } - - public void setIsenta(Integer isenta) { - this.isenta = isenta; - } - - public BigDecimal getValorTributado() { - return valorTributado; - } - - public void setValorTributado(BigDecimal valorTributado) { - this.valorTributado = valorTributado; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoECFBase { + private String estabelecimento; + private String dataEmissao; + private String numeroIdentificacaoECF; + private Integer cooReducaoZ; + private Integer cooInicial; + private Integer cooFinal; + private Integer contadorReducao; + private Integer cro; + private String estabelecimentoECF; + private String ecf; + private String numeroSerie; + private Integer coo; + private String numFolioSistema; + private String ufOrigem; + private Integer municipioOrigem; + private String ufDestino; + private Integer municipioDestino; + private BigDecimal reducaoBaseCalcICMS; + private BigDecimal porcReducaoMunicipal; + private BigDecimal porcReducaoEstadual; + private BigDecimal tributacaoImportacao; + private String infoPadraoBilhetePassagem; + + private Integer isenta; + private BigDecimal valorTributado; + private BigDecimal valorTotal; + + public ExportacaoECFBase() { + + } + + public String getEstabelecimento() { + return estabelecimento; + } + + public void setEstabelecimento(String estabelecimento) { + this.estabelecimento = estabelecimento; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public String getNumeroIdentificacaoECF() { + return numeroIdentificacaoECF; + } + + public void setNumeroIdentificacaoECF(String numeroIdentificacaoECF) { + this.numeroIdentificacaoECF = numeroIdentificacaoECF; + } + + public Integer getCooReducaoZ() { + return cooReducaoZ; + } + + public void setCooReducaoZ(Integer cooReducaoZ) { + this.cooReducaoZ = cooReducaoZ; + } + + public Integer getCooInicial() { + return cooInicial; + } + + public void setCooInicial(Integer cooInicial) { + this.cooInicial = cooInicial; + } + + public Integer getCooFinal() { + return cooFinal; + } + + public void setCooFinal(Integer cooFinal) { + this.cooFinal = cooFinal; + } + + public Integer getContadorReducao() { + return contadorReducao; + } + + public void setContadorReducao(Integer contadorReducao) { + this.contadorReducao = contadorReducao; + } + + public Integer getCro() { + return cro; + } + + public void setCro(Integer cro) { + this.cro = cro; + } + + public String getEstabelecimentoECF() { + return estabelecimentoECF; + } + + public void setEstabelecimentoECF(String estabelecimentoECF) { + this.estabelecimentoECF = estabelecimentoECF; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public String getNumeroSerie() { + return numeroSerie; + } + + public void setNumeroSerie(String numeroSerie) { + this.numeroSerie = numeroSerie; + } + + public Integer getCoo() { + return coo; + } + + public void setCoo(Integer coo) { + this.coo = coo; + } + + public String getNumFolioSistema() { + return numFolioSistema; + } + + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public String getUfDestino() { + return ufDestino; + } + + public void setUfDestino(String ufDestino) { + this.ufDestino = ufDestino; + } + + public Integer getMunicipioDestino() { + return municipioDestino; + } + + public void setMunicipioDestino(Integer municipioDestino) { + this.municipioDestino = municipioDestino; + } + + public BigDecimal getReducaoBaseCalcICMS() { + return reducaoBaseCalcICMS == null ? BigDecimal.ZERO : reducaoBaseCalcICMS; + } + + public void setReducaoBaseCalcICMS(BigDecimal reducaoBaseCalcICMS) { + this.reducaoBaseCalcICMS = reducaoBaseCalcICMS; + } + + public BigDecimal getPorcReducaoMunicipal() { + return porcReducaoMunicipal; + } + + public void setPorcReducaoMunicipal(BigDecimal porcReducaoMunicipal) { + this.porcReducaoMunicipal = porcReducaoMunicipal; + } + + public BigDecimal getPorcReducaoEstadual() { + return porcReducaoEstadual; + } + + public void setPorcReducaoEstadual(BigDecimal porcReducaoEstadual) { + this.porcReducaoEstadual = porcReducaoEstadual; + } + + public BigDecimal getTributacaoImportacao() { + return tributacaoImportacao; + } + + public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { + this.tributacaoImportacao = tributacaoImportacao; + } + + public String getInfoPadraoBilhetePassagem() { + return infoPadraoBilhetePassagem; + } + + public void setInfoPadraoBilhetePassagem(String infoPadraoBilhetePassagem) { + this.infoPadraoBilhetePassagem = infoPadraoBilhetePassagem; + } + + public Integer getIsenta() { + return isenta; + } + + public void setIsenta(Integer isenta) { + this.isenta = isenta; + } + + public BigDecimal getValorTributado() { + return valorTributado; + } + + public void setValorTributado(BigDecimal valorTributado) { + this.valorTributado = valorTributado; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCCF.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCCF.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCCF.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCCF.java index 7ccb5b70a..e4e02406a 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCCF.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCCF.java @@ -1,177 +1,177 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoECFTipoCCF { - private Integer coo; - private BigDecimal valorServico; - private BigDecimal descontoGlobal; - private Integer codigoParticipante; - private Integer situacaoCOO; // 0 - Documento Regular; 2 - Documento Cancelado - private BigDecimal acrescimo; - private String ufOrigem; - private Integer municipioOrigem; - private String ufDestino; - private Integer cfop; // IM=5357; serviço IE= 6357 - private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - private BigDecimal valorTotal; - private Integer tributacaoICMS; // 1 - Demais; 2 - Região Metropolitanao ou seja, quando o campo CSTB for "40", esse campo deve vir "2". Do contrário, deve vir "1" - private BigDecimal valorBaseCalculoICMS; - private BigDecimal aliquotaICMS; - private String ecf; - private String dataEmissao; - private String numFolioSistema; - - public ExportacaoECFTipoCCF() { - - } - - public Integer getCoo() { - return coo; - } - - public void setCoo(Integer coo) { - this.coo = coo; - } - - public BigDecimal getValorServico() { - return valorServico; - } - - public void setValorServico(BigDecimal valorServico) { - this.valorServico = valorServico; - } - - public BigDecimal getDescontoGlobal() { - return descontoGlobal; - } - - public void setDescontoGlobal(BigDecimal descontoGlobal) { - this.descontoGlobal = descontoGlobal; - } - - public Integer getCodigoParticipante() { - return codigoParticipante; - } - - public void setCodigoParticipante(Integer codigoParticipante) { - this.codigoParticipante = codigoParticipante; - } - - public Integer getSituacaoCOO() { - return situacaoCOO; - } - - public void setSituacaoCOO(Integer situacaoCOO) { - this.situacaoCOO = situacaoCOO; - } - - public BigDecimal getAcrescimo() { - return acrescimo; - } - - public void setAcrescimo(BigDecimal acrescimo) { - this.acrescimo = acrescimo; - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public String getUfDestino() { - return ufDestino; - } - - public void setUfDestino(String ufDestino) { - this.ufDestino = ufDestino; - } - - public Integer getCfop() { - return cfop; - } - - public void setCfop(Integer cfop) { - this.cfop = cfop; - } - - public Integer getCodigoSituacaoTribColunaB() { - return codigoSituacaoTribColunaB; - } - - public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { - this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public Integer getTributacaoICMS() { - return tributacaoICMS; - } - - public void setTributacaoICMS(Integer tributacaoICMS) { - this.tributacaoICMS = tributacaoICMS; - } - - public BigDecimal getValorBaseCalculoICMS() { - return valorBaseCalculoICMS; - } - - public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { - this.valorBaseCalculoICMS = valorBaseCalculoICMS; - } - - public BigDecimal getAliquotaICMS() { - return aliquotaICMS; - } - - public void setAliquotaICMS(BigDecimal aliquotaICMS) { - this.aliquotaICMS = aliquotaICMS; - } - - public String getEcf() { - return ecf; - } - - public void setEcf(String ecf) { - this.ecf = ecf; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public String getNumFolioSistema() { - return numFolioSistema; - } - - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - - @Override - public String toString() { - return "ExportacaoECFTipoCCF [coo=" + coo + ", valorServico=" + valorServico + ", descontoGlobal=" + descontoGlobal + ", codigoParticipante=" + codigoParticipante + ", situacaoCOO=" + situacaoCOO + ", acrescimo=" + acrescimo + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", ufDestino=" + ufDestino + ", cfop=" + cfop + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", valorTotal=" + valorTotal + ", tributacaoICMS=" + tributacaoICMS + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", ecf=" + ecf + ", dataEmissao=" + dataEmissao + ", numFolioSistema=" + numFolioSistema + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoECFTipoCCF { + private Integer coo; + private BigDecimal valorServico; + private BigDecimal descontoGlobal; + private Integer codigoParticipante; + private Integer situacaoCOO; // 0 - Documento Regular; 2 - Documento Cancelado + private BigDecimal acrescimo; + private String ufOrigem; + private Integer municipioOrigem; + private String ufDestino; + private Integer cfop; // IM=5357; serviço IE= 6357 + private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + private BigDecimal valorTotal; + private Integer tributacaoICMS; // 1 - Demais; 2 - Região Metropolitanao ou seja, quando o campo CSTB for "40", esse campo deve vir "2". Do contrário, deve vir "1" + private BigDecimal valorBaseCalculoICMS; + private BigDecimal aliquotaICMS; + private String ecf; + private String dataEmissao; + private String numFolioSistema; + + public ExportacaoECFTipoCCF() { + + } + + public Integer getCoo() { + return coo; + } + + public void setCoo(Integer coo) { + this.coo = coo; + } + + public BigDecimal getValorServico() { + return valorServico; + } + + public void setValorServico(BigDecimal valorServico) { + this.valorServico = valorServico; + } + + public BigDecimal getDescontoGlobal() { + return descontoGlobal; + } + + public void setDescontoGlobal(BigDecimal descontoGlobal) { + this.descontoGlobal = descontoGlobal; + } + + public Integer getCodigoParticipante() { + return codigoParticipante; + } + + public void setCodigoParticipante(Integer codigoParticipante) { + this.codigoParticipante = codigoParticipante; + } + + public Integer getSituacaoCOO() { + return situacaoCOO; + } + + public void setSituacaoCOO(Integer situacaoCOO) { + this.situacaoCOO = situacaoCOO; + } + + public BigDecimal getAcrescimo() { + return acrescimo; + } + + public void setAcrescimo(BigDecimal acrescimo) { + this.acrescimo = acrescimo; + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public String getUfDestino() { + return ufDestino; + } + + public void setUfDestino(String ufDestino) { + this.ufDestino = ufDestino; + } + + public Integer getCfop() { + return cfop; + } + + public void setCfop(Integer cfop) { + this.cfop = cfop; + } + + public Integer getCodigoSituacaoTribColunaB() { + return codigoSituacaoTribColunaB; + } + + public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { + this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public Integer getTributacaoICMS() { + return tributacaoICMS; + } + + public void setTributacaoICMS(Integer tributacaoICMS) { + this.tributacaoICMS = tributacaoICMS; + } + + public BigDecimal getValorBaseCalculoICMS() { + return valorBaseCalculoICMS; + } + + public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { + this.valorBaseCalculoICMS = valorBaseCalculoICMS; + } + + public BigDecimal getAliquotaICMS() { + return aliquotaICMS; + } + + public void setAliquotaICMS(BigDecimal aliquotaICMS) { + this.aliquotaICMS = aliquotaICMS; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public String getNumFolioSistema() { + return numFolioSistema; + } + + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + + @Override + public String toString() { + return "ExportacaoECFTipoCCF [coo=" + coo + ", valorServico=" + valorServico + ", descontoGlobal=" + descontoGlobal + ", codigoParticipante=" + codigoParticipante + ", situacaoCOO=" + situacaoCOO + ", acrescimo=" + acrescimo + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", ufDestino=" + ufDestino + ", cfop=" + cfop + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", valorTotal=" + valorTotal + ", tributacaoICMS=" + tributacaoICMS + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", ecf=" + ecf + ", dataEmissao=" + dataEmissao + ", numFolioSistema=" + numFolioSistema + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCFC.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCFC.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCFC.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCFC.java index 1b88e656a..93f1ccd0a 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCFC.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoCFC.java @@ -1,141 +1,141 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoECFTipoCFC { - private String estabelecimento; - private String dataEmissao; - private String numeroIdentificacaoECF; - private Integer cooReducaoZ; - private Integer cooInicial; - private Integer cooFinal; - private Integer contadorReducao; - private Integer cro; - private BigDecimal valorTotal; - private BigDecimal valorIsentas; - private String estabelecimentoECF; - private String ecf; - private String numeroSerie; - private String infoPadraoBilhetePassagem; - - public ExportacaoECFTipoCFC() { - - } - - public String getEstabelecimento() { - return estabelecimento; - } - - public void setEstabelecimento(String estabelecimento) { - this.estabelecimento = estabelecimento; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public String getNumeroIdentificacaoECF() { - return numeroIdentificacaoECF; - } - - public void setNumeroIdentificacaoECF(String numeroIdentificacaoECF) { - this.numeroIdentificacaoECF = numeroIdentificacaoECF; - } - - public Integer getCooReducaoZ() { - return cooReducaoZ; - } - - public void setCooReducaoZ(Integer cooReducaoZ) { - this.cooReducaoZ = cooReducaoZ; - } - - public Integer getCooInicial() { - return cooInicial; - } - - public void setCooInicial(Integer cooInicial) { - this.cooInicial = cooInicial; - } - - public Integer getCooFinal() { - return cooFinal; - } - - public void setCooFinal(Integer cooFinal) { - this.cooFinal = cooFinal; - } - - public Integer getContadorReducao() { - return contadorReducao; - } - - public void setContadorReducao(Integer contadorReducao) { - this.contadorReducao = contadorReducao; - } - - public Integer getCro() { - return cro; - } - - public void setCro(Integer cro) { - this.cro = cro; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public BigDecimal getValorIsentas() { - return valorIsentas; - } - - public void setValorIsentas(BigDecimal valorIsentas) { - this.valorIsentas = valorIsentas; - } - - public String getEstabelecimentoECF() { - return estabelecimentoECF; - } - - public void setEstabelecimentoECF(String estabelecimentoECF) { - this.estabelecimentoECF = estabelecimentoECF; - } - - public String getEcf() { - return ecf; - } - - public void setEcf(String ecf) { - this.ecf = ecf; - } - - public String getNumeroSerie() { - return numeroSerie; - } - - public void setNumeroSerie(String numeroSerie) { - this.numeroSerie = numeroSerie; - } - - public String getInfoPadraoBilhetePassagem() { - return infoPadraoBilhetePassagem; - } - - public void setInfoPadraoBilhetePassagem(String infoPadraoBilhetePassagem) { - this.infoPadraoBilhetePassagem = infoPadraoBilhetePassagem; - } - - @Override - public String toString() { - return "ExportacaoECFTipoCFC [estabelecimento=" + estabelecimento + ", dataEmissao=" + dataEmissao + ", numeroIdentificacaoECF=" + numeroIdentificacaoECF + ", cooReducaoZ=" + cooReducaoZ + ", cooInicial=" + cooInicial + ", cooFinal=" + cooFinal + ", contadorReducao=" + contadorReducao + ", cro=" + cro + ", valorTotal=" + valorTotal + ", valorIsentas=" + valorIsentas + ", estabelecimentoECF=" + estabelecimentoECF + ", ecf=" + ecf + ", numeroSerie=" + numeroSerie + ", infoPadraoBilhetePassagem=" + infoPadraoBilhetePassagem + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoECFTipoCFC { + private String estabelecimento; + private String dataEmissao; + private String numeroIdentificacaoECF; + private Integer cooReducaoZ; + private Integer cooInicial; + private Integer cooFinal; + private Integer contadorReducao; + private Integer cro; + private BigDecimal valorTotal; + private BigDecimal valorIsentas; + private String estabelecimentoECF; + private String ecf; + private String numeroSerie; + private String infoPadraoBilhetePassagem; + + public ExportacaoECFTipoCFC() { + + } + + public String getEstabelecimento() { + return estabelecimento; + } + + public void setEstabelecimento(String estabelecimento) { + this.estabelecimento = estabelecimento; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public String getNumeroIdentificacaoECF() { + return numeroIdentificacaoECF; + } + + public void setNumeroIdentificacaoECF(String numeroIdentificacaoECF) { + this.numeroIdentificacaoECF = numeroIdentificacaoECF; + } + + public Integer getCooReducaoZ() { + return cooReducaoZ; + } + + public void setCooReducaoZ(Integer cooReducaoZ) { + this.cooReducaoZ = cooReducaoZ; + } + + public Integer getCooInicial() { + return cooInicial; + } + + public void setCooInicial(Integer cooInicial) { + this.cooInicial = cooInicial; + } + + public Integer getCooFinal() { + return cooFinal; + } + + public void setCooFinal(Integer cooFinal) { + this.cooFinal = cooFinal; + } + + public Integer getContadorReducao() { + return contadorReducao; + } + + public void setContadorReducao(Integer contadorReducao) { + this.contadorReducao = contadorReducao; + } + + public Integer getCro() { + return cro; + } + + public void setCro(Integer cro) { + this.cro = cro; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public BigDecimal getValorIsentas() { + return valorIsentas; + } + + public void setValorIsentas(BigDecimal valorIsentas) { + this.valorIsentas = valorIsentas; + } + + public String getEstabelecimentoECF() { + return estabelecimentoECF; + } + + public void setEstabelecimentoECF(String estabelecimentoECF) { + this.estabelecimentoECF = estabelecimentoECF; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public String getNumeroSerie() { + return numeroSerie; + } + + public void setNumeroSerie(String numeroSerie) { + this.numeroSerie = numeroSerie; + } + + public String getInfoPadraoBilhetePassagem() { + return infoPadraoBilhetePassagem; + } + + public void setInfoPadraoBilhetePassagem(String infoPadraoBilhetePassagem) { + this.infoPadraoBilhetePassagem = infoPadraoBilhetePassagem; + } + + @Override + public String toString() { + return "ExportacaoECFTipoCFC [estabelecimento=" + estabelecimento + ", dataEmissao=" + dataEmissao + ", numeroIdentificacaoECF=" + numeroIdentificacaoECF + ", cooReducaoZ=" + cooReducaoZ + ", cooInicial=" + cooInicial + ", cooFinal=" + cooFinal + ", contadorReducao=" + contadorReducao + ", cro=" + cro + ", valorTotal=" + valorTotal + ", valorIsentas=" + valorIsentas + ", estabelecimentoECF=" + estabelecimentoECF + ", ecf=" + ecf + ", numeroSerie=" + numeroSerie + ", infoPadraoBilhetePassagem=" + infoPadraoBilhetePassagem + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoICF.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoICF.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoICF.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoICF.java index dfa8977c1..99ba2bbf2 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoICF.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoICF.java @@ -1,161 +1,161 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoECFTipoICF { - private BigDecimal valorTotal; - private String ufDestino; - private Integer cfop; // IM=5357; serviço IE= 6357 - private BigDecimal valorBaseCalculoICMS; - private BigDecimal aliquotaICMS; - private BigDecimal valorICMSDebitado; - private BigDecimal valorICMSIsento; - private BigDecimal valorICMSOutros; - private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - private String ufOrigem; - private Integer municipioOrigem; - private String ecf; - private String dataEmissao; - - private BigDecimal redutorBaseCalculoIcms; - private BigDecimal redutorMunicipalIcms; - private BigDecimal redutorEstadualIcms; - - - public ExportacaoECFTipoICF() { - - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public String getUfDestino() { - return ufDestino; - } - - public void setUfDestino(String ufDestino) { - this.ufDestino = ufDestino; - } - - public Integer getCfop() { - return cfop; - } - - public void setCfop(Integer cfop) { - this.cfop = cfop; - } - - public BigDecimal getValorBaseCalculoICMS() { - return valorBaseCalculoICMS; - } - - public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { - this.valorBaseCalculoICMS = valorBaseCalculoICMS; - } - - public BigDecimal getAliquotaICMS() { - return aliquotaICMS; - } - - public void setAliquotaICMS(BigDecimal aliquotaICMS) { - this.aliquotaICMS = aliquotaICMS; - } - - public BigDecimal getValorICMSDebitado() { - return valorICMSDebitado; - } - - public void setValorICMSDebitado(BigDecimal valorICMSDebitado) { - this.valorICMSDebitado = valorICMSDebitado; - } - - public BigDecimal getValorICMSIsento() { - return valorICMSIsento; - } - - public void setValorICMSIsento(BigDecimal valorICMSIsento) { - this.valorICMSIsento = valorICMSIsento; - } - - public BigDecimal getValorICMSOutros() { - return valorICMSOutros; - } - - public void setValorICMSOutros(BigDecimal valorICMSOutros) { - this.valorICMSOutros = valorICMSOutros; - } - - public Integer getCodigoSituacaoTribColunaB() { - return codigoSituacaoTribColunaB; - } - - public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { - this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public String getEcf() { - return ecf; - } - - public void setEcf(String ecf) { - this.ecf = ecf; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public BigDecimal getRedutorBaseCalculoIcms() { - return redutorBaseCalculoIcms; - } - - public void setRedutorBaseCalculoIcms(BigDecimal redutorBaseCalculoIcms) { - this.redutorBaseCalculoIcms = redutorBaseCalculoIcms; - } - - public BigDecimal getRedutorMunicipalIcms() { - return redutorMunicipalIcms; - } - - public void setRedutorMunicipalIcms(BigDecimal redutorMunicipalIcms) { - this.redutorMunicipalIcms = redutorMunicipalIcms; - } - - public BigDecimal getRedutorEstadualIcms() { - return redutorEstadualIcms; - } - - public void setRedutorEstadualIcms(BigDecimal redutorEstadualIcms) { - this.redutorEstadualIcms = redutorEstadualIcms; - } - - @Override - public String toString() { - return "ExportacaoECFTipoICF [valorTotal=" + valorTotal + ", ufDestino=" + ufDestino + ", cfop=" + cfop + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", valorICMSDebitado=" + valorICMSDebitado + ", valorICMSIsento=" + valorICMSIsento + ", valorICMSOutros=" + valorICMSOutros + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", ecf=" + ecf + ", dataEmissao=" + dataEmissao + ", redutorBaseCalculoIcms=" + redutorBaseCalculoIcms + ", redutorMunicipalIcms=" + redutorMunicipalIcms + ", redutorEstadualIcms=" + redutorEstadualIcms + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoECFTipoICF { + private BigDecimal valorTotal; + private String ufDestino; + private Integer cfop; // IM=5357; serviço IE= 6357 + private BigDecimal valorBaseCalculoICMS; + private BigDecimal aliquotaICMS; + private BigDecimal valorICMSDebitado; + private BigDecimal valorICMSIsento; + private BigDecimal valorICMSOutros; + private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + private String ufOrigem; + private Integer municipioOrigem; + private String ecf; + private String dataEmissao; + + private BigDecimal redutorBaseCalculoIcms; + private BigDecimal redutorMunicipalIcms; + private BigDecimal redutorEstadualIcms; + + + public ExportacaoECFTipoICF() { + + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public String getUfDestino() { + return ufDestino; + } + + public void setUfDestino(String ufDestino) { + this.ufDestino = ufDestino; + } + + public Integer getCfop() { + return cfop; + } + + public void setCfop(Integer cfop) { + this.cfop = cfop; + } + + public BigDecimal getValorBaseCalculoICMS() { + return valorBaseCalculoICMS; + } + + public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { + this.valorBaseCalculoICMS = valorBaseCalculoICMS; + } + + public BigDecimal getAliquotaICMS() { + return aliquotaICMS; + } + + public void setAliquotaICMS(BigDecimal aliquotaICMS) { + this.aliquotaICMS = aliquotaICMS; + } + + public BigDecimal getValorICMSDebitado() { + return valorICMSDebitado; + } + + public void setValorICMSDebitado(BigDecimal valorICMSDebitado) { + this.valorICMSDebitado = valorICMSDebitado; + } + + public BigDecimal getValorICMSIsento() { + return valorICMSIsento; + } + + public void setValorICMSIsento(BigDecimal valorICMSIsento) { + this.valorICMSIsento = valorICMSIsento; + } + + public BigDecimal getValorICMSOutros() { + return valorICMSOutros; + } + + public void setValorICMSOutros(BigDecimal valorICMSOutros) { + this.valorICMSOutros = valorICMSOutros; + } + + public Integer getCodigoSituacaoTribColunaB() { + return codigoSituacaoTribColunaB; + } + + public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { + this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public BigDecimal getRedutorBaseCalculoIcms() { + return redutorBaseCalculoIcms; + } + + public void setRedutorBaseCalculoIcms(BigDecimal redutorBaseCalculoIcms) { + this.redutorBaseCalculoIcms = redutorBaseCalculoIcms; + } + + public BigDecimal getRedutorMunicipalIcms() { + return redutorMunicipalIcms; + } + + public void setRedutorMunicipalIcms(BigDecimal redutorMunicipalIcms) { + this.redutorMunicipalIcms = redutorMunicipalIcms; + } + + public BigDecimal getRedutorEstadualIcms() { + return redutorEstadualIcms; + } + + public void setRedutorEstadualIcms(BigDecimal redutorEstadualIcms) { + this.redutorEstadualIcms = redutorEstadualIcms; + } + + @Override + public String toString() { + return "ExportacaoECFTipoICF [valorTotal=" + valorTotal + ", ufDestino=" + ufDestino + ", cfop=" + cfop + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", valorICMSDebitado=" + valorICMSDebitado + ", valorICMSIsento=" + valorICMSIsento + ", valorICMSOutros=" + valorICMSOutros + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", ecf=" + ecf + ", dataEmissao=" + dataEmissao + ", redutorBaseCalculoIcms=" + redutorBaseCalculoIcms + ", redutorMunicipalIcms=" + redutorMunicipalIcms + ", redutorEstadualIcms=" + redutorEstadualIcms + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoPRC.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoPRC.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoPRC.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoPRC.java index 488a87d90..a4b275739 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoPRC.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoECFTipoPRC.java @@ -1,87 +1,87 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoECFTipoPRC { - private String ufOrigem; - private Integer municipioOrigem ; - private BigDecimal valorTotal; - private BigDecimal valorBaseCalculoICMS; - private BigDecimal valorICMS; - private String ecf; - private String dataEmissao; - private BigDecimal tributacao; - - public ExportacaoECFTipoPRC() { - - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public BigDecimal getValorBaseCalculoICMS() { - return valorBaseCalculoICMS; - } - - public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { - this.valorBaseCalculoICMS = valorBaseCalculoICMS; - } - - public BigDecimal getValorICMS() { - return valorICMS; - } - - public void setValorICMS(BigDecimal valorICMS) { - this.valorICMS = valorICMS; - } - - public String getEcf() { - return ecf; - } - - public void setEcf(String ecf) { - this.ecf = ecf; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public BigDecimal getTributacao() { - return tributacao; - } - - public void setTributacao(BigDecimal tributacao) { - this.tributacao = tributacao; - } - - @Override - public String toString() { - return "ExportacaoECFTipoPRC [ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", valorTotal=" + valorTotal + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", valorICMS=" + valorICMS + ", ecf=" + ecf + ", dataEmissao=" + dataEmissao + ", tributacao=" + tributacao + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoECFTipoPRC { + private String ufOrigem; + private Integer municipioOrigem ; + private BigDecimal valorTotal; + private BigDecimal valorBaseCalculoICMS; + private BigDecimal valorICMS; + private String ecf; + private String dataEmissao; + private BigDecimal tributacao; + + public ExportacaoECFTipoPRC() { + + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public BigDecimal getValorBaseCalculoICMS() { + return valorBaseCalculoICMS; + } + + public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { + this.valorBaseCalculoICMS = valorBaseCalculoICMS; + } + + public BigDecimal getValorICMS() { + return valorICMS; + } + + public void setValorICMS(BigDecimal valorICMS) { + this.valorICMS = valorICMS; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public BigDecimal getTributacao() { + return tributacao; + } + + public void setTributacao(BigDecimal tributacao) { + this.tributacao = tributacao; + } + + @Override + public String toString() { + return "ExportacaoECFTipoPRC [ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + ", valorTotal=" + valorTotal + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", valorICMS=" + valorICMS + ", ecf=" + ecf + ", dataEmissao=" + dataEmissao + ", tributacao=" + tributacao + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoBPS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoBPS.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoBPS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoBPS.java index c99f73c92..ca6381c09 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoBPS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoBPS.java @@ -1,159 +1,159 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoRMDTipoBPS { - private Integer codigoEstabelecimento; - private String especie; - private Long numeroAIDF; - private String serieAIDF; - private String subSerieAIDF; - private Long numeroInicial; - private Long numeroFinal; - private Integer quantidadeCancelados; - private String dataEmissao; - private BigDecimal valorTotal; - private Boolean resumoMovimentoDiario; - private Long numeroAIDFRMD; - private String serieAIDFRMD; - private String subSerieAIDFRMD; - private Integer numeroRMD; - private Integer quantidadeTotal; - - public ExportacaoRMDTipoBPS() { - - } - - public Integer getCodigoEstabelecimento() { - return codigoEstabelecimento; - } - - public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { - this.codigoEstabelecimento = codigoEstabelecimento; - } - - public String getEspecie() { - return especie; - } - - public void setEspecie(String especie) { - this.especie = especie; - } - - public Long getNumeroAIDF() { - return numeroAIDF; - } - - public void setNumeroAIDF(Long numeroAIDF) { - this.numeroAIDF = numeroAIDF; - } - - public String getSerieAIDF() { - return serieAIDF; - } - - public void setSerieAIDF(String serieAIDF) { - this.serieAIDF = serieAIDF; - } - - public String getSubSerieAIDF() { - return subSerieAIDF; - } - - public void setSubSerieAIDF(String subSerieAIDF) { - this.subSerieAIDF = subSerieAIDF; - } - - public Long getNumeroInicial() { - return numeroInicial; - } - - public void setNumeroInicial(Long numeroInicial) { - this.numeroInicial = numeroInicial; - } - - public Long getNumeroFinal() { - return numeroFinal; - } - - public void setNumeroFinal(Long numeroFinal) { - this.numeroFinal = numeroFinal; - } - - public Integer getQuantidadeCancelados() { - return quantidadeCancelados; - } - - public void setQuantidadeCancelados(Integer quantidadeCancelados) { - this.quantidadeCancelados = quantidadeCancelados; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public Boolean getResumoMovimentoDiario() { - return resumoMovimentoDiario; - } - - public void setResumoMovimentoDiario(Boolean resumoMovimentoDiario) { - this.resumoMovimentoDiario = resumoMovimentoDiario; - } - - public Long getNumeroAIDFRMD() { - return numeroAIDFRMD; - } - - public void setNumeroAIDFRMD(Long numeroAIDFRMD) { - this.numeroAIDFRMD = numeroAIDFRMD; - } - - public String getSerieAIDFRMD() { - return serieAIDFRMD; - } - - public void setSerieAIDFRMD(String serieAIDFRMD) { - this.serieAIDFRMD = serieAIDFRMD; - } - - public String getSubSerieAIDFRMD() { - return subSerieAIDFRMD; - } - - public void setSubSerieAIDFRMD(String subSerieAIDFRMD) { - this.subSerieAIDFRMD = subSerieAIDFRMD; - } - - public Integer getNumeroRMD() { - return numeroRMD; - } - - public void setNumeroRMD(Integer numeroRMD) { - this.numeroRMD = numeroRMD; - } - - public Integer getQuantidadeTotal() { - return quantidadeTotal; - } - - public void setQuantidadeTotal(Integer quantidadeTotal) { - this.quantidadeTotal = quantidadeTotal; - } - - @Override - public String toString() { - return "ExportacaoRMDTipoBPS [codigoEstabelecimento=" + codigoEstabelecimento + ", especie=" + especie + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroInicial=" + numeroInicial + ", numeroFinal=" + numeroFinal + ", quantidadeCancelados=" + quantidadeCancelados + ", dataEmissao=" + dataEmissao + ", valorTotal=" + valorTotal + ", resumoMovimentoDiario=" + resumoMovimentoDiario + ", numeroAIDFRMD=" + numeroAIDFRMD + ", serieAIDFRMD=" + serieAIDFRMD + ", subSerieAIDFRMD=" + subSerieAIDFRMD + ", numeroRMD=" + numeroRMD + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoRMDTipoBPS { + private Integer codigoEstabelecimento; + private String especie; + private Long numeroAIDF; + private String serieAIDF; + private String subSerieAIDF; + private Long numeroInicial; + private Long numeroFinal; + private Integer quantidadeCancelados; + private String dataEmissao; + private BigDecimal valorTotal; + private Boolean resumoMovimentoDiario; + private Long numeroAIDFRMD; + private String serieAIDFRMD; + private String subSerieAIDFRMD; + private Integer numeroRMD; + private Integer quantidadeTotal; + + public ExportacaoRMDTipoBPS() { + + } + + public Integer getCodigoEstabelecimento() { + return codigoEstabelecimento; + } + + public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { + this.codigoEstabelecimento = codigoEstabelecimento; + } + + public String getEspecie() { + return especie; + } + + public void setEspecie(String especie) { + this.especie = especie; + } + + public Long getNumeroAIDF() { + return numeroAIDF; + } + + public void setNumeroAIDF(Long numeroAIDF) { + this.numeroAIDF = numeroAIDF; + } + + public String getSerieAIDF() { + return serieAIDF; + } + + public void setSerieAIDF(String serieAIDF) { + this.serieAIDF = serieAIDF; + } + + public String getSubSerieAIDF() { + return subSerieAIDF; + } + + public void setSubSerieAIDF(String subSerieAIDF) { + this.subSerieAIDF = subSerieAIDF; + } + + public Long getNumeroInicial() { + return numeroInicial; + } + + public void setNumeroInicial(Long numeroInicial) { + this.numeroInicial = numeroInicial; + } + + public Long getNumeroFinal() { + return numeroFinal; + } + + public void setNumeroFinal(Long numeroFinal) { + this.numeroFinal = numeroFinal; + } + + public Integer getQuantidadeCancelados() { + return quantidadeCancelados; + } + + public void setQuantidadeCancelados(Integer quantidadeCancelados) { + this.quantidadeCancelados = quantidadeCancelados; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public Boolean getResumoMovimentoDiario() { + return resumoMovimentoDiario; + } + + public void setResumoMovimentoDiario(Boolean resumoMovimentoDiario) { + this.resumoMovimentoDiario = resumoMovimentoDiario; + } + + public Long getNumeroAIDFRMD() { + return numeroAIDFRMD; + } + + public void setNumeroAIDFRMD(Long numeroAIDFRMD) { + this.numeroAIDFRMD = numeroAIDFRMD; + } + + public String getSerieAIDFRMD() { + return serieAIDFRMD; + } + + public void setSerieAIDFRMD(String serieAIDFRMD) { + this.serieAIDFRMD = serieAIDFRMD; + } + + public String getSubSerieAIDFRMD() { + return subSerieAIDFRMD; + } + + public void setSubSerieAIDFRMD(String subSerieAIDFRMD) { + this.subSerieAIDFRMD = subSerieAIDFRMD; + } + + public Integer getNumeroRMD() { + return numeroRMD; + } + + public void setNumeroRMD(Integer numeroRMD) { + this.numeroRMD = numeroRMD; + } + + public Integer getQuantidadeTotal() { + return quantidadeTotal; + } + + public void setQuantidadeTotal(Integer quantidadeTotal) { + this.quantidadeTotal = quantidadeTotal; + } + + @Override + public String toString() { + return "ExportacaoRMDTipoBPS [codigoEstabelecimento=" + codigoEstabelecimento + ", especie=" + especie + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroInicial=" + numeroInicial + ", numeroFinal=" + numeroFinal + ", quantidadeCancelados=" + quantidadeCancelados + ", dataEmissao=" + dataEmissao + ", valorTotal=" + valorTotal + ", resumoMovimentoDiario=" + resumoMovimentoDiario + ", numeroAIDFRMD=" + numeroAIDFRMD + ", serieAIDFRMD=" + serieAIDFRMD + ", subSerieAIDFRMD=" + subSerieAIDFRMD + ", numeroRMD=" + numeroRMD + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoDBP.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoDBP.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoDBP.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoDBP.java index cd4b41620..356d4f217 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoDBP.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoDBP.java @@ -1,114 +1,114 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoRMDTipoDBP { - private String ufDestino; - private Integer cfop; // IM=5357; serviço IE= 6357 - private BigDecimal valorTotal; - private BigDecimal valorBaseCalculoICMS; - private BigDecimal aliquotaICMS; - private BigDecimal valorICMS; - private BigDecimal valorICMSIsento; - private BigDecimal valorICMSOutros; - private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - private String ufOrigem; - private Integer municipioOrigem; - - public ExportacaoRMDTipoDBP() { - - } - - public String getUfDestino() { - return ufDestino; - } - - public void setUfDestino(String ufDestino) { - this.ufDestino = ufDestino; - } - - public Integer getCfop() { - return cfop; - } - - public void setCfop(Integer cfop) { - this.cfop = cfop; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public BigDecimal getValorBaseCalculoICMS() { - return valorBaseCalculoICMS; - } - - public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { - this.valorBaseCalculoICMS = valorBaseCalculoICMS; - } - - public BigDecimal getAliquotaICMS() { - return aliquotaICMS; - } - - public void setAliquotaICMS(BigDecimal aliquotaICMS) { - this.aliquotaICMS = aliquotaICMS; - } - - public BigDecimal getValorICMS() { - return valorICMS; - } - - public void setValorICMS(BigDecimal valorICMS) { - this.valorICMS = valorICMS; - } - - public BigDecimal getValorICMSIsento() { - return valorICMSIsento; - } - - public void setValorICMSIsento(BigDecimal valorICMSIsento) { - this.valorICMSIsento = valorICMSIsento; - } - - public BigDecimal getValorICMSOutros() { - return valorICMSOutros; - } - - public void setValorICMSOutros(BigDecimal valorICMSOutros) { - this.valorICMSOutros = valorICMSOutros; - } - - public Integer getCodigoSituacaoTribColunaB() { - return codigoSituacaoTribColunaB; - } - - public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { - this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - @Override - public String toString() { - return "ExportacaoRMDTipoDBP [ufDestino=" + ufDestino + ", cfop=" + cfop + ", valorTotal=" + valorTotal + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", valorICMS=" + valorICMS + ", valorICMSIsento=" + valorICMSIsento + ", valorICMSOutros=" + valorICMSOutros + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoRMDTipoDBP { + private String ufDestino; + private Integer cfop; // IM=5357; serviço IE= 6357 + private BigDecimal valorTotal; + private BigDecimal valorBaseCalculoICMS; + private BigDecimal aliquotaICMS; + private BigDecimal valorICMS; + private BigDecimal valorICMSIsento; + private BigDecimal valorICMSOutros; + private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + private String ufOrigem; + private Integer municipioOrigem; + + public ExportacaoRMDTipoDBP() { + + } + + public String getUfDestino() { + return ufDestino; + } + + public void setUfDestino(String ufDestino) { + this.ufDestino = ufDestino; + } + + public Integer getCfop() { + return cfop; + } + + public void setCfop(Integer cfop) { + this.cfop = cfop; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public BigDecimal getValorBaseCalculoICMS() { + return valorBaseCalculoICMS; + } + + public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { + this.valorBaseCalculoICMS = valorBaseCalculoICMS; + } + + public BigDecimal getAliquotaICMS() { + return aliquotaICMS; + } + + public void setAliquotaICMS(BigDecimal aliquotaICMS) { + this.aliquotaICMS = aliquotaICMS; + } + + public BigDecimal getValorICMS() { + return valorICMS; + } + + public void setValorICMS(BigDecimal valorICMS) { + this.valorICMS = valorICMS; + } + + public BigDecimal getValorICMSIsento() { + return valorICMSIsento; + } + + public void setValorICMSIsento(BigDecimal valorICMSIsento) { + this.valorICMSIsento = valorICMSIsento; + } + + public BigDecimal getValorICMSOutros() { + return valorICMSOutros; + } + + public void setValorICMSOutros(BigDecimal valorICMSOutros) { + this.valorICMSOutros = valorICMSOutros; + } + + public Integer getCodigoSituacaoTribColunaB() { + return codigoSituacaoTribColunaB; + } + + public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { + this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + @Override + public String toString() { + return "ExportacaoRMDTipoDBP [ufDestino=" + ufDestino + ", cfop=" + cfop + ", valorTotal=" + valorTotal + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", valorICMS=" + valorICMS + ", valorICMSIsento=" + valorICMSIsento + ", valorICMSOutros=" + valorICMSOutros + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoPAR.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoPAR.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoPAR.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoPAR.java index 12879d042..bc6ac9fbc 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoPAR.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoPAR.java @@ -1,121 +1,121 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -public class ExportacaoRMDTipoPAR { - private Integer codigoParticipante; - private Integer codigoEstabelecimento; - private String nomeParticipante; - private String ufParticipante; - private String cpfParticipante; - private String ieParticipante; - private String imParticipante; - private String logradouro; - private String numero; - private String complemento; - private String bairro; - private Integer cep; - - public ExportacaoRMDTipoPAR() { - - } - - public Integer getCodigoParticipante() { - return codigoParticipante; - } - - public void setCodigoParticipante(Integer codigoParticipante) { - this.codigoParticipante = codigoParticipante; - } - - public String getNomeParticipante() { - return nomeParticipante; - } - - public void setNomeParticipante(String nomeParticipante) { - this.nomeParticipante = nomeParticipante; - } - - public String getUfParticipante() { - return ufParticipante; - } - - public void setUfParticipante(String ufParticipante) { - this.ufParticipante = ufParticipante; - } - - public String getCpfParticipante() { - return cpfParticipante; - } - - public void setCpfParticipante(String cpfParticipante) { - this.cpfParticipante = cpfParticipante; - } - - public String getIeParticipante() { - return ieParticipante; - } - - public void setIeParticipante(String ieParticipante) { - this.ieParticipante = ieParticipante; - } - - public String getImParticipante() { - return imParticipante; - } - - public void setImParticipante(String imParticipante) { - this.imParticipante = imParticipante; - } - - public String getLogradouro() { - return logradouro; - } - - public void setLogradouro(String logradouro) { - this.logradouro = logradouro; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public Integer getCep() { - return cep; - } - - public void setCep(Integer cep) { - this.cep = cep; - } - - public Integer getCodigoEstabelecimento() { - return codigoEstabelecimento; - } - - public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { - this.codigoEstabelecimento = codigoEstabelecimento; - } - - @Override - public String toString() { - return "ExportacaoRMDTipoPAR [codigoParticipante=" + codigoParticipante + ", codigoEstabelecimento=" + codigoEstabelecimento + ", nomeParticipante=" + nomeParticipante + ", ufParticipante=" + ufParticipante + ", cpfParticipante=" + cpfParticipante + ", ieParticipante=" + ieParticipante + ", imParticipante=" + imParticipante + ", logradouro=" + logradouro + ", numero=" + numero + ", complemento=" + complemento + ", bairro=" + bairro + ", cep=" + cep + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +public class ExportacaoRMDTipoPAR { + private Integer codigoParticipante; + private Integer codigoEstabelecimento; + private String nomeParticipante; + private String ufParticipante; + private String cpfParticipante; + private String ieParticipante; + private String imParticipante; + private String logradouro; + private String numero; + private String complemento; + private String bairro; + private Integer cep; + + public ExportacaoRMDTipoPAR() { + + } + + public Integer getCodigoParticipante() { + return codigoParticipante; + } + + public void setCodigoParticipante(Integer codigoParticipante) { + this.codigoParticipante = codigoParticipante; + } + + public String getNomeParticipante() { + return nomeParticipante; + } + + public void setNomeParticipante(String nomeParticipante) { + this.nomeParticipante = nomeParticipante; + } + + public String getUfParticipante() { + return ufParticipante; + } + + public void setUfParticipante(String ufParticipante) { + this.ufParticipante = ufParticipante; + } + + public String getCpfParticipante() { + return cpfParticipante; + } + + public void setCpfParticipante(String cpfParticipante) { + this.cpfParticipante = cpfParticipante; + } + + public String getIeParticipante() { + return ieParticipante; + } + + public void setIeParticipante(String ieParticipante) { + this.ieParticipante = ieParticipante; + } + + public String getImParticipante() { + return imParticipante; + } + + public void setImParticipante(String imParticipante) { + this.imParticipante = imParticipante; + } + + public String getLogradouro() { + return logradouro; + } + + public void setLogradouro(String logradouro) { + this.logradouro = logradouro; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public Integer getCep() { + return cep; + } + + public void setCep(Integer cep) { + this.cep = cep; + } + + public Integer getCodigoEstabelecimento() { + return codigoEstabelecimento; + } + + public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { + this.codigoEstabelecimento = codigoEstabelecimento; + } + + @Override + public String toString() { + return "ExportacaoRMDTipoPAR [codigoParticipante=" + codigoParticipante + ", codigoEstabelecimento=" + codigoEstabelecimento + ", nomeParticipante=" + nomeParticipante + ", ufParticipante=" + ufParticipante + ", cpfParticipante=" + cpfParticipante + ", ieParticipante=" + ieParticipante + ", imParticipante=" + imParticipante + ", logradouro=" + logradouro + ", numero=" + numero + ", complemento=" + complemento + ", bairro=" + bairro + ", cep=" + cep + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoRMD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoRMD.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoRMD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoRMD.java index 313445c6e..251661716 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoRMD.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoRMD.java @@ -1,103 +1,103 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -public class ExportacaoRMDTipoRMD { - private Integer codigoEstabelecimento; - private String numeroAIDF; - private String serieAIDF; - private String subSerieAIDF; - private Long numeroBilheteAIDF; - private Long numeroFormularioAIDF; - private String dataEmissao; - private Boolean cancelado; - private Integer codigoParticipante; - private String codigoContabil; - - public ExportacaoRMDTipoRMD() { - - } - - public Integer getCodigoEstabelecimento() { - return codigoEstabelecimento; - } - - public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { - this.codigoEstabelecimento = codigoEstabelecimento; - } - - public String getNumeroAIDF() { - return numeroAIDF; - } - - public void setNumeroAIDF(String numeroAIDF) { - this.numeroAIDF = numeroAIDF; - } - - public String getSerieAIDF() { - return serieAIDF; - } - - public void setSerieAIDF(String serieAIDF) { - this.serieAIDF = serieAIDF; - } - - public String getSubSerieAIDF() { - return subSerieAIDF; - } - - public void setSubSerieAIDF(String subSerieAIDF) { - this.subSerieAIDF = subSerieAIDF; - } - - public Long getNumeroBilheteAIDF() { - return numeroBilheteAIDF; - } - - public void setNumeroBilheteAIDF(Long numeroBilheteAIDF) { - this.numeroBilheteAIDF = numeroBilheteAIDF; - } - - public Long getNumeroFormularioAIDF() { - return numeroFormularioAIDF; - } - - public void setNumeroFormularioAIDF(Long numeroFormularioAIDF) { - this.numeroFormularioAIDF = numeroFormularioAIDF; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public Boolean getCancelado() { - return cancelado; - } - - public void setCancelado(Boolean cancelado) { - this.cancelado = cancelado; - } - - public Integer getCodigoParticipante() { - return codigoParticipante; - } - - public void setCodigoParticipante(Integer codigoParticipante) { - this.codigoParticipante = codigoParticipante; - } - - public String getCodigoContabil() { - return codigoContabil; - } - - public void setCodigoContabil(String codigoContabil) { - this.codigoContabil = codigoContabil; - } - - @Override - public String toString() { - return "ExportacaoRMDTipoRMD [codigoEstabelecimento=" + codigoEstabelecimento + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroBilheteAIDF=" + numeroBilheteAIDF + ", numeroFormularioAIDF=" + numeroFormularioAIDF + ", dataEmissao=" + dataEmissao + ", cancelado=" + cancelado + ", codigoParticipante=" + codigoParticipante + ", codigoContabil=" + codigoContabil + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +public class ExportacaoRMDTipoRMD { + private Integer codigoEstabelecimento; + private String numeroAIDF; + private String serieAIDF; + private String subSerieAIDF; + private Long numeroBilheteAIDF; + private Long numeroFormularioAIDF; + private String dataEmissao; + private Boolean cancelado; + private Integer codigoParticipante; + private String codigoContabil; + + public ExportacaoRMDTipoRMD() { + + } + + public Integer getCodigoEstabelecimento() { + return codigoEstabelecimento; + } + + public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { + this.codigoEstabelecimento = codigoEstabelecimento; + } + + public String getNumeroAIDF() { + return numeroAIDF; + } + + public void setNumeroAIDF(String numeroAIDF) { + this.numeroAIDF = numeroAIDF; + } + + public String getSerieAIDF() { + return serieAIDF; + } + + public void setSerieAIDF(String serieAIDF) { + this.serieAIDF = serieAIDF; + } + + public String getSubSerieAIDF() { + return subSerieAIDF; + } + + public void setSubSerieAIDF(String subSerieAIDF) { + this.subSerieAIDF = subSerieAIDF; + } + + public Long getNumeroBilheteAIDF() { + return numeroBilheteAIDF; + } + + public void setNumeroBilheteAIDF(Long numeroBilheteAIDF) { + this.numeroBilheteAIDF = numeroBilheteAIDF; + } + + public Long getNumeroFormularioAIDF() { + return numeroFormularioAIDF; + } + + public void setNumeroFormularioAIDF(Long numeroFormularioAIDF) { + this.numeroFormularioAIDF = numeroFormularioAIDF; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public Boolean getCancelado() { + return cancelado; + } + + public void setCancelado(Boolean cancelado) { + this.cancelado = cancelado; + } + + public Integer getCodigoParticipante() { + return codigoParticipante; + } + + public void setCodigoParticipante(Integer codigoParticipante) { + this.codigoParticipante = codigoParticipante; + } + + public String getCodigoContabil() { + return codigoContabil; + } + + public void setCodigoContabil(String codigoContabil) { + this.codigoContabil = codigoContabil; + } + + @Override + public String toString() { + return "ExportacaoRMDTipoRMD [codigoEstabelecimento=" + codigoEstabelecimento + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroBilheteAIDF=" + numeroBilheteAIDF + ", numeroFormularioAIDF=" + numeroFormularioAIDF + ", dataEmissao=" + dataEmissao + ", cancelado=" + cancelado + ", codigoParticipante=" + codigoParticipante + ", codigoContabil=" + codigoContabil + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqBPS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqBPS.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqBPS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqBPS.java index 1db0cb376..c648f79fe 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqBPS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqBPS.java @@ -1,185 +1,185 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -public class ExportacaoRMDTipoSeqBPS { - private Integer codigoEstabelecimento; - private String especie; - private String numeroAIDF; - private String serieAIDF; - private String subSerieAIDF; - private Long numeroInicial; - private Long numeroFinal; - private Integer quantidadeCancelados; - private String dataEmissao; - private BigDecimal valorTotal; - private String numeroAIDFRMD; - private String serieAIDFRMD; - private String subSerieAIDFRMD; - private Integer numeroRMD; - private Integer quantidadeTotal; - private String infoPadraoBilhetePassagem; - private List listaDBP; - - public ExportacaoRMDTipoSeqBPS() { - listaDBP = new ArrayList(0); - - quantidadeTotal = 0; - quantidadeCancelados = 0; - } - - public Integer getCodigoEstabelecimento() { - return codigoEstabelecimento; - } - - public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { - this.codigoEstabelecimento = codigoEstabelecimento; - } - - public String getEspecie() { - return especie; - } - - public void setEspecie(String especie) { - this.especie = especie; - } - - public String getNumeroAIDF() { - return numeroAIDF; - } - - public void setNumeroAIDF(String numeroAIDF) { - this.numeroAIDF = numeroAIDF; - } - - public String getSerieAIDF() { - return serieAIDF; - } - - public void setSerieAIDF(String serieAIDF) { - this.serieAIDF = serieAIDF; - } - - public String getSubSerieAIDF() { - return subSerieAIDF; - } - - public void setSubSerieAIDF(String subSerieAIDF) { - this.subSerieAIDF = subSerieAIDF; - } - - public Long getNumeroInicial() { - return numeroInicial; - } - - public void setNumeroInicial(Long numeroInicial) { - this.numeroInicial = numeroInicial; - } - - public Long getNumeroFinal() { - return numeroFinal; - } - - public void setNumeroFinal(Long numeroFinal) { - this.numeroFinal = numeroFinal; - } - - public Integer getQuantidadeCancelados() { - return quantidadeCancelados; - } - - public void setQuantidadeCancelados(Integer quantidadeCancelados) { - this.quantidadeCancelados = quantidadeCancelados; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public BigDecimal getValorTotal() { - if (quantidadeTotal.intValue() == quantidadeCancelados.intValue()) { - return null; - } - - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public Boolean getResumoMovimentoDiario() { - if (quantidadeTotal.intValue() == quantidadeCancelados.intValue()) { - return null; - } else { - return Boolean.TRUE; - } - } - - public String getNumeroAIDFRMD() { - return numeroAIDFRMD; - } - - public void setNumeroAIDFRMD(String numeroAIDFRMD) { - this.numeroAIDFRMD = numeroAIDFRMD; - } - - public String getSerieAIDFRMD() { - return serieAIDFRMD; - } - - public void setSerieAIDFRMD(String serieAIDFRMD) { - this.serieAIDFRMD = serieAIDFRMD; - } - - public String getSubSerieAIDFRMD() { - return subSerieAIDFRMD; - } - - public void setSubSerieAIDFRMD(String subSerieAIDFRMD) { - this.subSerieAIDFRMD = subSerieAIDFRMD; - } - - public Integer getNumeroRMD() { - return numeroRMD; - } - - public void setNumeroRMD(Integer numeroRMD) { - this.numeroRMD = numeroRMD; - } - - public Integer getQuantidadeTotal() { - return quantidadeTotal; - } - - public void setQuantidadeTotal(Integer quantidadeTotal) { - this.quantidadeTotal = quantidadeTotal; - } - - public String getInfoPadraoBilhetePassagem() { - return infoPadraoBilhetePassagem; - } - - public void setInfoPadraoBilhetePassagem(String infoPadraoBilhetePassagem) { - this.infoPadraoBilhetePassagem = infoPadraoBilhetePassagem; - } - - public List getListaDBP() { - return listaDBP; - } - - public void setListaDBP(List listaDBP) { - this.listaDBP = listaDBP; - } - - @Override - public String toString() { - return "ExportacaoRMDTipoSeqBPS [codigoEstabelecimento=" + codigoEstabelecimento + ", especie=" + especie + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroInicial=" + numeroInicial + ", numeroFinal=" + numeroFinal + ", quantidadeCancelados=" + quantidadeCancelados + ", dataEmissao=" + dataEmissao + ", valorTotal=" + valorTotal + ", resumoMovimentoDiario=" + getResumoMovimentoDiario() + ", numeroAIDFRMD=" + numeroAIDFRMD + ", serieAIDFRMD=" + serieAIDFRMD + ", subSerieAIDFRMD=" + subSerieAIDFRMD + ", numeroRMD=" + numeroRMD + ", quantidadeTotal=" + quantidadeTotal + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class ExportacaoRMDTipoSeqBPS { + private Integer codigoEstabelecimento; + private String especie; + private String numeroAIDF; + private String serieAIDF; + private String subSerieAIDF; + private Long numeroInicial; + private Long numeroFinal; + private Integer quantidadeCancelados; + private String dataEmissao; + private BigDecimal valorTotal; + private String numeroAIDFRMD; + private String serieAIDFRMD; + private String subSerieAIDFRMD; + private Integer numeroRMD; + private Integer quantidadeTotal; + private String infoPadraoBilhetePassagem; + private List listaDBP; + + public ExportacaoRMDTipoSeqBPS() { + listaDBP = new ArrayList(0); + + quantidadeTotal = 0; + quantidadeCancelados = 0; + } + + public Integer getCodigoEstabelecimento() { + return codigoEstabelecimento; + } + + public void setCodigoEstabelecimento(Integer codigoEstabelecimento) { + this.codigoEstabelecimento = codigoEstabelecimento; + } + + public String getEspecie() { + return especie; + } + + public void setEspecie(String especie) { + this.especie = especie; + } + + public String getNumeroAIDF() { + return numeroAIDF; + } + + public void setNumeroAIDF(String numeroAIDF) { + this.numeroAIDF = numeroAIDF; + } + + public String getSerieAIDF() { + return serieAIDF; + } + + public void setSerieAIDF(String serieAIDF) { + this.serieAIDF = serieAIDF; + } + + public String getSubSerieAIDF() { + return subSerieAIDF; + } + + public void setSubSerieAIDF(String subSerieAIDF) { + this.subSerieAIDF = subSerieAIDF; + } + + public Long getNumeroInicial() { + return numeroInicial; + } + + public void setNumeroInicial(Long numeroInicial) { + this.numeroInicial = numeroInicial; + } + + public Long getNumeroFinal() { + return numeroFinal; + } + + public void setNumeroFinal(Long numeroFinal) { + this.numeroFinal = numeroFinal; + } + + public Integer getQuantidadeCancelados() { + return quantidadeCancelados; + } + + public void setQuantidadeCancelados(Integer quantidadeCancelados) { + this.quantidadeCancelados = quantidadeCancelados; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public BigDecimal getValorTotal() { + if (quantidadeTotal.intValue() == quantidadeCancelados.intValue()) { + return null; + } + + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public Boolean getResumoMovimentoDiario() { + if (quantidadeTotal.intValue() == quantidadeCancelados.intValue()) { + return null; + } else { + return Boolean.TRUE; + } + } + + public String getNumeroAIDFRMD() { + return numeroAIDFRMD; + } + + public void setNumeroAIDFRMD(String numeroAIDFRMD) { + this.numeroAIDFRMD = numeroAIDFRMD; + } + + public String getSerieAIDFRMD() { + return serieAIDFRMD; + } + + public void setSerieAIDFRMD(String serieAIDFRMD) { + this.serieAIDFRMD = serieAIDFRMD; + } + + public String getSubSerieAIDFRMD() { + return subSerieAIDFRMD; + } + + public void setSubSerieAIDFRMD(String subSerieAIDFRMD) { + this.subSerieAIDFRMD = subSerieAIDFRMD; + } + + public Integer getNumeroRMD() { + return numeroRMD; + } + + public void setNumeroRMD(Integer numeroRMD) { + this.numeroRMD = numeroRMD; + } + + public Integer getQuantidadeTotal() { + return quantidadeTotal; + } + + public void setQuantidadeTotal(Integer quantidadeTotal) { + this.quantidadeTotal = quantidadeTotal; + } + + public String getInfoPadraoBilhetePassagem() { + return infoPadraoBilhetePassagem; + } + + public void setInfoPadraoBilhetePassagem(String infoPadraoBilhetePassagem) { + this.infoPadraoBilhetePassagem = infoPadraoBilhetePassagem; + } + + public List getListaDBP() { + return listaDBP; + } + + public void setListaDBP(List listaDBP) { + this.listaDBP = listaDBP; + } + + @Override + public String toString() { + return "ExportacaoRMDTipoSeqBPS [codigoEstabelecimento=" + codigoEstabelecimento + ", especie=" + especie + ", numeroAIDF=" + numeroAIDF + ", serieAIDF=" + serieAIDF + ", subSerieAIDF=" + subSerieAIDF + ", numeroInicial=" + numeroInicial + ", numeroFinal=" + numeroFinal + ", quantidadeCancelados=" + quantidadeCancelados + ", dataEmissao=" + dataEmissao + ", valorTotal=" + valorTotal + ", resumoMovimentoDiario=" + getResumoMovimentoDiario() + ", numeroAIDFRMD=" + numeroAIDFRMD + ", serieAIDFRMD=" + serieAIDFRMD + ", subSerieAIDFRMD=" + subSerieAIDFRMD + ", numeroRMD=" + numeroRMD + ", quantidadeTotal=" + quantidadeTotal + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqDBP.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqDBP.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqDBP.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqDBP.java index 35209c1c7..d449d61a1 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqDBP.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoRMDTipoSeqDBP.java @@ -1,139 +1,139 @@ -package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; - -import java.math.BigDecimal; - -public class ExportacaoRMDTipoSeqDBP { - private String ufDestino; - private Integer cfop; // IM=5357; serviço IE= 6357 - private BigDecimal valorTotal; - private BigDecimal valorBaseCalculoICMS; - private BigDecimal aliquotaICMS; - private BigDecimal valorICMS; - private BigDecimal valorICMSIsento; - private BigDecimal valorICMSOutros; - private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos - private String ufOrigem; - private Integer municipioOrigem; - - public ExportacaoRMDTipoSeqDBP(String ufDestino) { - this.ufDestino = ufDestino; - } - - public String getUfDestino() { - return ufDestino; - } - - public void setUfDestino(String ufDestino) { - this.ufDestino = ufDestino; - } - - public Integer getCfop() { - return cfop; - } - - public void setCfop(Integer cfop) { - this.cfop = cfop; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public BigDecimal getValorBaseCalculoICMS() { - return valorBaseCalculoICMS; - } - - public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { - this.valorBaseCalculoICMS = valorBaseCalculoICMS; - } - - public BigDecimal getAliquotaICMS() { - return aliquotaICMS; - } - - public void setAliquotaICMS(BigDecimal aliquotaICMS) { - this.aliquotaICMS = aliquotaICMS; - } - - public BigDecimal getValorICMS() { - return valorICMS; - } - - public void setValorICMS(BigDecimal valorICMS) { - this.valorICMS = valorICMS; - } - - public BigDecimal getValorICMSIsento() { - return valorICMSIsento; - } - - public void setValorICMSIsento(BigDecimal valorICMSIsento) { - this.valorICMSIsento = valorICMSIsento; - } - - public BigDecimal getValorICMSOutros() { - return valorICMSOutros; - } - - public void setValorICMSOutros(BigDecimal valorICMSOutros) { - this.valorICMSOutros = valorICMSOutros; - } - - public Integer getCodigoSituacaoTribColunaB() { - return codigoSituacaoTribColunaB; - } - - public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { - this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; - } - - public String getUfOrigem() { - return ufOrigem; - } - - public void setUfOrigem(String ufOrigem) { - this.ufOrigem = ufOrigem; - } - - public Integer getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(Integer municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ufDestino == null) ? 0 : ufDestino.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ExportacaoRMDTipoSeqDBP other = (ExportacaoRMDTipoSeqDBP) obj; - if (ufDestino == null) { - if (other.ufDestino != null) - return false; - } else if (!ufDestino.equals(other.ufDestino)) - return false; - return true; - } - - @Override - public String toString() { - return "ExportacaoRMDTipoSeqDBP [ufDestino=" + ufDestino + ", cfop=" + cfop + ", valorTotal=" + valorTotal + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", valorICMS=" + valorICMS + ", valorICMSIsento=" + valorICMSIsento + ", valorICMSOutros=" + valorICMSOutros + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + "]"; - } -} +package com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo; + +import java.math.BigDecimal; + +public class ExportacaoRMDTipoSeqDBP { + private String ufDestino; + private Integer cfop; // IM=5357; serviço IE= 6357 + private BigDecimal valorTotal; + private BigDecimal valorBaseCalculoICMS; + private BigDecimal aliquotaICMS; + private BigDecimal valorICMS; + private BigDecimal valorICMSIsento; + private BigDecimal valorICMSOutros; + private Integer codigoSituacaoTribColunaB; // 00 - tributação normal; 20 - tributação com redução na base de calculo; 40 - isentos + private String ufOrigem; + private Integer municipioOrigem; + + public ExportacaoRMDTipoSeqDBP(String ufDestino) { + this.ufDestino = ufDestino; + } + + public String getUfDestino() { + return ufDestino; + } + + public void setUfDestino(String ufDestino) { + this.ufDestino = ufDestino; + } + + public Integer getCfop() { + return cfop; + } + + public void setCfop(Integer cfop) { + this.cfop = cfop; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public BigDecimal getValorBaseCalculoICMS() { + return valorBaseCalculoICMS; + } + + public void setValorBaseCalculoICMS(BigDecimal valorBaseCalculoICMS) { + this.valorBaseCalculoICMS = valorBaseCalculoICMS; + } + + public BigDecimal getAliquotaICMS() { + return aliquotaICMS; + } + + public void setAliquotaICMS(BigDecimal aliquotaICMS) { + this.aliquotaICMS = aliquotaICMS; + } + + public BigDecimal getValorICMS() { + return valorICMS; + } + + public void setValorICMS(BigDecimal valorICMS) { + this.valorICMS = valorICMS; + } + + public BigDecimal getValorICMSIsento() { + return valorICMSIsento; + } + + public void setValorICMSIsento(BigDecimal valorICMSIsento) { + this.valorICMSIsento = valorICMSIsento; + } + + public BigDecimal getValorICMSOutros() { + return valorICMSOutros; + } + + public void setValorICMSOutros(BigDecimal valorICMSOutros) { + this.valorICMSOutros = valorICMSOutros; + } + + public Integer getCodigoSituacaoTribColunaB() { + return codigoSituacaoTribColunaB; + } + + public void setCodigoSituacaoTribColunaB(Integer codigoSituacaoTribColunaB) { + this.codigoSituacaoTribColunaB = codigoSituacaoTribColunaB; + } + + public String getUfOrigem() { + return ufOrigem; + } + + public void setUfOrigem(String ufOrigem) { + this.ufOrigem = ufOrigem; + } + + public Integer getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(Integer municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ufDestino == null) ? 0 : ufDestino.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ExportacaoRMDTipoSeqDBP other = (ExportacaoRMDTipoSeqDBP) obj; + if (ufDestino == null) { + if (other.ufDestino != null) + return false; + } else if (!ufDestino.equals(other.ufDestino)) + return false; + return true; + } + + @Override + public String toString() { + return "ExportacaoRMDTipoSeqDBP [ufDestino=" + ufDestino + ", cfop=" + cfop + ", valorTotal=" + valorTotal + ", valorBaseCalculoICMS=" + valorBaseCalculoICMS + ", aliquotaICMS=" + aliquotaICMS + ", valorICMS=" + valorICMS + ", valorICMSIsento=" + valorICMSIsento + ", valorICMSOutros=" + valorICMSOutros + ", codigoSituacaoTribColunaB=" + codigoSituacaoTribColunaB + ", ufOrigem=" + ufOrigem + ", municipioOrigem=" + municipioOrigem + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/DetalhadoFiscal.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/DetalhadoFiscal.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/DetalhadoFiscal.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/DetalhadoFiscal.java index efb4bdb26..995e9df6d 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/DetalhadoFiscal.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/DetalhadoFiscal.java @@ -1,633 +1,633 @@ -package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; - -import java.math.BigDecimal; -import java.util.Date; - -public class DetalhadoFiscal { - - private Long cajaId; - private String tipoReceita; - private String numoperacion; - private Integer estadoId; - private Date fechorVenta; - private String estadoOrigem; - private String estadoDestino; - private String municipioOrigem; - private boolean isInterEstadual; - private BigDecimal icmsInterestadual; - private BigDecimal icmsIntermunicipal; - private BigDecimal redBaseCalcIcms; - private BigDecimal porcRedMunicipal; - private BigDecimal porcRedEstadual; - private BigDecimal tributacaoImportacao; - private Boolean indTarifaMunicipal; - private Boolean indSeguroMunicipal; - private Boolean indTxembarqueMunicipal; - private Boolean indPedagioMunicipal; - private Boolean indTarifaEstadual; - private Boolean indSeguroEstadual; - private Boolean indTxembarqueEstadual; - private Boolean indPedagioEstdual; - private Boolean isenta; - private BigDecimal tarifa; - private BigDecimal taxaEmbarque; - private BigDecimal pedagio; - private BigDecimal seguro; - private BigDecimal outros; - private String datamov; - - private String xml; - - private String codstatus; - private String chbpe; - - private String cmunini; - private String cmunfim; - private String ufini; - private String uffim; - private String nbp; - private String dhemb; - private String cst00; - private String cst20; - private String cst45; - private String cst90; - private String cstoutrauf; - private String cstsn; - private String vbc00; - private String picms00; - private String vicms00; - private String vbc20; - private String picms20; - private String vicms20; - private String vbp; - private String vdesconto; - private String vpgto; - private String tpcomp01; - private String tpcomp02; - private String tpcomp03; - private String tpcomp04; - private String tpcomp05; - private String tpcomp06; - private String tpcomp99; - private String vcomp01; - private String vcomp02; - private String vcomp03; - private String vcomp04; - private String vcomp05; - private String vcomp06; - private String vcomp99; - private String pRedBC; - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public String getTipoReceita() { - return tipoReceita; - } - - public void setTipoReceita(String tipoReceita) { - this.tipoReceita = tipoReceita; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public Integer getEstadoId() { - return estadoId; - } - - public void setEstadoId(Integer estadoId) { - this.estadoId = estadoId; - } - - public Date getFechorVenta() { - return fechorVenta; - } - - public void setFechorVenta(Date fechorVenta) { - this.fechorVenta = fechorVenta; - } - - public String getEstadoOrigem() { - return estadoOrigem; - } - - public void setEstadoOrigem(String estadoOrigem) { - this.estadoOrigem = estadoOrigem; - } - - public String getEstadoDestino() { - return estadoDestino; - } - - public void setEstadoDestino(String estadoDestino) { - this.estadoDestino = estadoDestino; - } - - public String getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(String municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public boolean isInterEstadual() { - return isInterEstadual; - } - - public void setInterEstadual(boolean isInterEstadual) { - this.isInterEstadual = isInterEstadual; - } - - public BigDecimal getIcmsInterestadual() { - return icmsInterestadual; - } - - public void setIcmsInterestadual(BigDecimal icmsInterestadual) { - this.icmsInterestadual = icmsInterestadual; - } - - public BigDecimal getIcmsIntermunicipal() { - return icmsIntermunicipal; - } - - public void setIcmsIntermunicipal(BigDecimal icmsIntermunicipal) { - this.icmsIntermunicipal = icmsIntermunicipal; - } - - public BigDecimal getRedBaseCalcIcms() { - return redBaseCalcIcms; - } - - public void setRedBaseCalcIcms(BigDecimal redBaseCalcIcms) { - this.redBaseCalcIcms = redBaseCalcIcms; - } - - public BigDecimal getPorcRedMunicipal() { - return porcRedMunicipal; - } - - public void setPorcRedMunicipal(BigDecimal porcRedMunicipal) { - this.porcRedMunicipal = porcRedMunicipal; - } - - public BigDecimal getPorcRedEstadual() { - return porcRedEstadual; - } - - public void setPorcRedEstadual(BigDecimal porcRedEstadual) { - this.porcRedEstadual = porcRedEstadual; - } - - public BigDecimal getTributacaoImportacao() { - return tributacaoImportacao; - } - - public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { - this.tributacaoImportacao = tributacaoImportacao; - } - - public Boolean getIndTarifaMunicipal() { - return indTarifaMunicipal; - } - - public void setIndTarifaMunicipal(Boolean indTarifaMunicipal) { - this.indTarifaMunicipal = indTarifaMunicipal; - } - - public Boolean getIndSeguroMunicipal() { - return indSeguroMunicipal; - } - - public void setIndSeguroMunicipal(Boolean indSeguroMunicipal) { - this.indSeguroMunicipal = indSeguroMunicipal; - } - - public Boolean getIndTxembarqueMunicipal() { - return indTxembarqueMunicipal; - } - - public void setIndTxembarqueMunicipal(Boolean indTxembarqueMunicipal) { - this.indTxembarqueMunicipal = indTxembarqueMunicipal; - } - - public Boolean getIndPedagioMunicipal() { - return indPedagioMunicipal; - } - - public void setIndPedagioMunicipal(Boolean indPedagioMunicipal) { - this.indPedagioMunicipal = indPedagioMunicipal; - } - - public Boolean getIndTarifaEstadual() { - return indTarifaEstadual; - } - - public void setIndTarifaEstadual(Boolean indTarifaEstadual) { - this.indTarifaEstadual = indTarifaEstadual; - } - - public Boolean getIndSeguroEstadual() { - return indSeguroEstadual; - } - - public void setIndSeguroEstadual(Boolean indSeguroEstadual) { - this.indSeguroEstadual = indSeguroEstadual; - } - - public Boolean getIndTxembarqueEstadual() { - return indTxembarqueEstadual; - } - - public void setIndTxembarqueEstadual(Boolean indTxembarqueEstadual) { - this.indTxembarqueEstadual = indTxembarqueEstadual; - } - - public Boolean getIndPedagioEstdual() { - return indPedagioEstdual; - } - - public void setIndPedagioEstdual(Boolean indPedagioEstdual) { - this.indPedagioEstdual = indPedagioEstdual; - } - - public Boolean getIsenta() { - return isenta; - } - - public void setIsenta(Boolean isenta) { - this.isenta = isenta; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public BigDecimal getTaxaEmbarque() { - return taxaEmbarque; - } - - public void setTaxaEmbarque(BigDecimal taxaEmbarque) { - this.taxaEmbarque = taxaEmbarque; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getSeguro() { - return seguro; - } - - public void setSeguro(BigDecimal seguro) { - this.seguro = seguro; - } - - public BigDecimal getOutros() { - return outros; - } - - public void setOutros(BigDecimal outros) { - this.outros = outros; - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public String getXml() { - return xml; - } - - public void setXml(String xml) { - this.xml = xml; - } - - public String getCmunini() { - return cmunini; - } - - public void setCmunini(String cmunini) { - this.cmunini = cmunini; - } - - public String getCmunfim() { - return cmunfim; - } - - public void setCmunfim(String cmunfim) { - this.cmunfim = cmunfim; - } - - public String getUfini() { - return ufini; - } - - public void setUfini(String ufini) { - this.ufini = ufini; - } - - public String getUffim() { - return uffim; - } - - public void setUffim(String uffim) { - this.uffim = uffim; - } - - public String getNbp() { - return nbp; - } - - public void setNbp(String nbp) { - this.nbp = nbp; - } - - public String getDhemb() { - return dhemb; - } - - public void setDhemb(String dhemb) { - this.dhemb = dhemb; - } - - public String getCst00() { - return cst00; - } - - public void setCst00(String cst00) { - this.cst00 = cst00; - } - - public String getCst20() { - return cst20; - } - - public void setCst20(String cst20) { - this.cst20 = cst20; - } - - public String getCst45() { - return cst45; - } - - public void setCst45(String cst45) { - this.cst45 = cst45; - } - - public String getCst90() { - return cst90; - } - - public void setCst90(String cst90) { - this.cst90 = cst90; - } - - public String getCstoutrauf() { - return cstoutrauf; - } - - public void setCstoutrauf(String cstoutrauf) { - this.cstoutrauf = cstoutrauf; - } - - public String getCstsn() { - return cstsn; - } - - public void setCstsn(String cstsn) { - this.cstsn = cstsn; - } - - public String getVbc00() { - return vbc00; - } - - public void setVbc00(String vbc00) { - this.vbc00 = vbc00; - } - - public String getPicms00() { - return picms00; - } - - public void setPicms00(String picms00) { - this.picms00 = picms00; - } - - public String getVicms00() { - return vicms00; - } - - public void setVicms00(String vicms00) { - this.vicms00 = vicms00; - } - - public String getVbc20() { - return vbc20; - } - - public void setVbc20(String vbc20) { - this.vbc20 = vbc20; - } - - public String getPicms20() { - return picms20; - } - - public void setPicms20(String picms20) { - this.picms20 = picms20; - } - - public String getVicms20() { - return vicms20; - } - - public void setVicms20(String vicms20) { - this.vicms20 = vicms20; - } - - public String getVbp() { - return vbp; - } - - public void setVbp(String vbp) { - this.vbp = vbp; - } - - public String getVdesconto() { - return vdesconto; - } - - public void setVdesconto(String vdesconto) { - this.vdesconto = vdesconto; - } - - public String getVpgto() { - return vpgto; - } - - public void setVpgto(String vpgto) { - this.vpgto = vpgto; - } - - public String getTpcomp01() { - return tpcomp01; - } - - public void setTpcomp01(String tpcomp01) { - this.tpcomp01 = tpcomp01; - } - - public String getTpcomp02() { - return tpcomp02; - } - - public void setTpcomp02(String tpcomp02) { - this.tpcomp02 = tpcomp02; - } - - public String getTpcomp03() { - return tpcomp03; - } - - public void setTpcomp03(String tpcomp03) { - this.tpcomp03 = tpcomp03; - } - - public String getTpcomp04() { - return tpcomp04; - } - - public void setTpcomp04(String tpcomp04) { - this.tpcomp04 = tpcomp04; - } - - public String getTpcomp05() { - return tpcomp05; - } - - public void setTpcomp05(String tpcomp05) { - this.tpcomp05 = tpcomp05; - } - - public String getTpcomp06() { - return tpcomp06; - } - - public void setTpcomp06(String tpcomp06) { - this.tpcomp06 = tpcomp06; - } - - public String getTpcomp99() { - return tpcomp99; - } - - public void setTpcomp99(String tpcomp99) { - this.tpcomp99 = tpcomp99; - } - - public String getVcomp01() { - return vcomp01; - } - - public void setVcomp01(String vcomp01) { - this.vcomp01 = vcomp01; - } - - public String getVcomp02() { - return vcomp02; - } - - public void setVcomp02(String vcomp02) { - this.vcomp02 = vcomp02; - } - - public String getVcomp03() { - return vcomp03; - } - - public void setVcomp03(String vcomp03) { - this.vcomp03 = vcomp03; - } - - public String getVcomp04() { - return vcomp04; - } - - public void setVcomp04(String vcomp04) { - this.vcomp04 = vcomp04; - } - - public String getVcomp05() { - return vcomp05; - } - - public void setVcomp05(String vcomp05) { - this.vcomp05 = vcomp05; - } - - public String getVcomp06() { - return vcomp06; - } - - public void setVcomp06(String vcomp06) { - this.vcomp06 = vcomp06; - } - - public String getVcomp99() { - return vcomp99; - } - - public void setVcomp99(String vcomp99) { - this.vcomp99 = vcomp99; - } - - public String getpRedBC() { - return pRedBC; - } - - public void setpRedBC(String pRedBC) { - this.pRedBC = pRedBC; - } - - public String getCodstatus() { - return codstatus; - } - - public void setCodstatus(String codstatus) { - this.codstatus = codstatus; - } - - public String getChbpe() { - return chbpe; - } - - public void setChbpe(String chbpe) { - this.chbpe = chbpe; - } - +package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; + +import java.math.BigDecimal; +import java.util.Date; + +public class DetalhadoFiscal { + + private Long cajaId; + private String tipoReceita; + private String numoperacion; + private Integer estadoId; + private Date fechorVenta; + private String estadoOrigem; + private String estadoDestino; + private String municipioOrigem; + private boolean isInterEstadual; + private BigDecimal icmsInterestadual; + private BigDecimal icmsIntermunicipal; + private BigDecimal redBaseCalcIcms; + private BigDecimal porcRedMunicipal; + private BigDecimal porcRedEstadual; + private BigDecimal tributacaoImportacao; + private Boolean indTarifaMunicipal; + private Boolean indSeguroMunicipal; + private Boolean indTxembarqueMunicipal; + private Boolean indPedagioMunicipal; + private Boolean indTarifaEstadual; + private Boolean indSeguroEstadual; + private Boolean indTxembarqueEstadual; + private Boolean indPedagioEstdual; + private Boolean isenta; + private BigDecimal tarifa; + private BigDecimal taxaEmbarque; + private BigDecimal pedagio; + private BigDecimal seguro; + private BigDecimal outros; + private String datamov; + + private String xml; + + private String codstatus; + private String chbpe; + + private String cmunini; + private String cmunfim; + private String ufini; + private String uffim; + private String nbp; + private String dhemb; + private String cst00; + private String cst20; + private String cst45; + private String cst90; + private String cstoutrauf; + private String cstsn; + private String vbc00; + private String picms00; + private String vicms00; + private String vbc20; + private String picms20; + private String vicms20; + private String vbp; + private String vdesconto; + private String vpgto; + private String tpcomp01; + private String tpcomp02; + private String tpcomp03; + private String tpcomp04; + private String tpcomp05; + private String tpcomp06; + private String tpcomp99; + private String vcomp01; + private String vcomp02; + private String vcomp03; + private String vcomp04; + private String vcomp05; + private String vcomp06; + private String vcomp99; + private String pRedBC; + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public String getTipoReceita() { + return tipoReceita; + } + + public void setTipoReceita(String tipoReceita) { + this.tipoReceita = tipoReceita; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public Integer getEstadoId() { + return estadoId; + } + + public void setEstadoId(Integer estadoId) { + this.estadoId = estadoId; + } + + public Date getFechorVenta() { + return fechorVenta; + } + + public void setFechorVenta(Date fechorVenta) { + this.fechorVenta = fechorVenta; + } + + public String getEstadoOrigem() { + return estadoOrigem; + } + + public void setEstadoOrigem(String estadoOrigem) { + this.estadoOrigem = estadoOrigem; + } + + public String getEstadoDestino() { + return estadoDestino; + } + + public void setEstadoDestino(String estadoDestino) { + this.estadoDestino = estadoDestino; + } + + public String getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(String municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public boolean isInterEstadual() { + return isInterEstadual; + } + + public void setInterEstadual(boolean isInterEstadual) { + this.isInterEstadual = isInterEstadual; + } + + public BigDecimal getIcmsInterestadual() { + return icmsInterestadual; + } + + public void setIcmsInterestadual(BigDecimal icmsInterestadual) { + this.icmsInterestadual = icmsInterestadual; + } + + public BigDecimal getIcmsIntermunicipal() { + return icmsIntermunicipal; + } + + public void setIcmsIntermunicipal(BigDecimal icmsIntermunicipal) { + this.icmsIntermunicipal = icmsIntermunicipal; + } + + public BigDecimal getRedBaseCalcIcms() { + return redBaseCalcIcms; + } + + public void setRedBaseCalcIcms(BigDecimal redBaseCalcIcms) { + this.redBaseCalcIcms = redBaseCalcIcms; + } + + public BigDecimal getPorcRedMunicipal() { + return porcRedMunicipal; + } + + public void setPorcRedMunicipal(BigDecimal porcRedMunicipal) { + this.porcRedMunicipal = porcRedMunicipal; + } + + public BigDecimal getPorcRedEstadual() { + return porcRedEstadual; + } + + public void setPorcRedEstadual(BigDecimal porcRedEstadual) { + this.porcRedEstadual = porcRedEstadual; + } + + public BigDecimal getTributacaoImportacao() { + return tributacaoImportacao; + } + + public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { + this.tributacaoImportacao = tributacaoImportacao; + } + + public Boolean getIndTarifaMunicipal() { + return indTarifaMunicipal; + } + + public void setIndTarifaMunicipal(Boolean indTarifaMunicipal) { + this.indTarifaMunicipal = indTarifaMunicipal; + } + + public Boolean getIndSeguroMunicipal() { + return indSeguroMunicipal; + } + + public void setIndSeguroMunicipal(Boolean indSeguroMunicipal) { + this.indSeguroMunicipal = indSeguroMunicipal; + } + + public Boolean getIndTxembarqueMunicipal() { + return indTxembarqueMunicipal; + } + + public void setIndTxembarqueMunicipal(Boolean indTxembarqueMunicipal) { + this.indTxembarqueMunicipal = indTxembarqueMunicipal; + } + + public Boolean getIndPedagioMunicipal() { + return indPedagioMunicipal; + } + + public void setIndPedagioMunicipal(Boolean indPedagioMunicipal) { + this.indPedagioMunicipal = indPedagioMunicipal; + } + + public Boolean getIndTarifaEstadual() { + return indTarifaEstadual; + } + + public void setIndTarifaEstadual(Boolean indTarifaEstadual) { + this.indTarifaEstadual = indTarifaEstadual; + } + + public Boolean getIndSeguroEstadual() { + return indSeguroEstadual; + } + + public void setIndSeguroEstadual(Boolean indSeguroEstadual) { + this.indSeguroEstadual = indSeguroEstadual; + } + + public Boolean getIndTxembarqueEstadual() { + return indTxembarqueEstadual; + } + + public void setIndTxembarqueEstadual(Boolean indTxembarqueEstadual) { + this.indTxembarqueEstadual = indTxembarqueEstadual; + } + + public Boolean getIndPedagioEstdual() { + return indPedagioEstdual; + } + + public void setIndPedagioEstdual(Boolean indPedagioEstdual) { + this.indPedagioEstdual = indPedagioEstdual; + } + + public Boolean getIsenta() { + return isenta; + } + + public void setIsenta(Boolean isenta) { + this.isenta = isenta; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public BigDecimal getTaxaEmbarque() { + return taxaEmbarque; + } + + public void setTaxaEmbarque(BigDecimal taxaEmbarque) { + this.taxaEmbarque = taxaEmbarque; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getSeguro() { + return seguro; + } + + public void setSeguro(BigDecimal seguro) { + this.seguro = seguro; + } + + public BigDecimal getOutros() { + return outros; + } + + public void setOutros(BigDecimal outros) { + this.outros = outros; + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public String getXml() { + return xml; + } + + public void setXml(String xml) { + this.xml = xml; + } + + public String getCmunini() { + return cmunini; + } + + public void setCmunini(String cmunini) { + this.cmunini = cmunini; + } + + public String getCmunfim() { + return cmunfim; + } + + public void setCmunfim(String cmunfim) { + this.cmunfim = cmunfim; + } + + public String getUfini() { + return ufini; + } + + public void setUfini(String ufini) { + this.ufini = ufini; + } + + public String getUffim() { + return uffim; + } + + public void setUffim(String uffim) { + this.uffim = uffim; + } + + public String getNbp() { + return nbp; + } + + public void setNbp(String nbp) { + this.nbp = nbp; + } + + public String getDhemb() { + return dhemb; + } + + public void setDhemb(String dhemb) { + this.dhemb = dhemb; + } + + public String getCst00() { + return cst00; + } + + public void setCst00(String cst00) { + this.cst00 = cst00; + } + + public String getCst20() { + return cst20; + } + + public void setCst20(String cst20) { + this.cst20 = cst20; + } + + public String getCst45() { + return cst45; + } + + public void setCst45(String cst45) { + this.cst45 = cst45; + } + + public String getCst90() { + return cst90; + } + + public void setCst90(String cst90) { + this.cst90 = cst90; + } + + public String getCstoutrauf() { + return cstoutrauf; + } + + public void setCstoutrauf(String cstoutrauf) { + this.cstoutrauf = cstoutrauf; + } + + public String getCstsn() { + return cstsn; + } + + public void setCstsn(String cstsn) { + this.cstsn = cstsn; + } + + public String getVbc00() { + return vbc00; + } + + public void setVbc00(String vbc00) { + this.vbc00 = vbc00; + } + + public String getPicms00() { + return picms00; + } + + public void setPicms00(String picms00) { + this.picms00 = picms00; + } + + public String getVicms00() { + return vicms00; + } + + public void setVicms00(String vicms00) { + this.vicms00 = vicms00; + } + + public String getVbc20() { + return vbc20; + } + + public void setVbc20(String vbc20) { + this.vbc20 = vbc20; + } + + public String getPicms20() { + return picms20; + } + + public void setPicms20(String picms20) { + this.picms20 = picms20; + } + + public String getVicms20() { + return vicms20; + } + + public void setVicms20(String vicms20) { + this.vicms20 = vicms20; + } + + public String getVbp() { + return vbp; + } + + public void setVbp(String vbp) { + this.vbp = vbp; + } + + public String getVdesconto() { + return vdesconto; + } + + public void setVdesconto(String vdesconto) { + this.vdesconto = vdesconto; + } + + public String getVpgto() { + return vpgto; + } + + public void setVpgto(String vpgto) { + this.vpgto = vpgto; + } + + public String getTpcomp01() { + return tpcomp01; + } + + public void setTpcomp01(String tpcomp01) { + this.tpcomp01 = tpcomp01; + } + + public String getTpcomp02() { + return tpcomp02; + } + + public void setTpcomp02(String tpcomp02) { + this.tpcomp02 = tpcomp02; + } + + public String getTpcomp03() { + return tpcomp03; + } + + public void setTpcomp03(String tpcomp03) { + this.tpcomp03 = tpcomp03; + } + + public String getTpcomp04() { + return tpcomp04; + } + + public void setTpcomp04(String tpcomp04) { + this.tpcomp04 = tpcomp04; + } + + public String getTpcomp05() { + return tpcomp05; + } + + public void setTpcomp05(String tpcomp05) { + this.tpcomp05 = tpcomp05; + } + + public String getTpcomp06() { + return tpcomp06; + } + + public void setTpcomp06(String tpcomp06) { + this.tpcomp06 = tpcomp06; + } + + public String getTpcomp99() { + return tpcomp99; + } + + public void setTpcomp99(String tpcomp99) { + this.tpcomp99 = tpcomp99; + } + + public String getVcomp01() { + return vcomp01; + } + + public void setVcomp01(String vcomp01) { + this.vcomp01 = vcomp01; + } + + public String getVcomp02() { + return vcomp02; + } + + public void setVcomp02(String vcomp02) { + this.vcomp02 = vcomp02; + } + + public String getVcomp03() { + return vcomp03; + } + + public void setVcomp03(String vcomp03) { + this.vcomp03 = vcomp03; + } + + public String getVcomp04() { + return vcomp04; + } + + public void setVcomp04(String vcomp04) { + this.vcomp04 = vcomp04; + } + + public String getVcomp05() { + return vcomp05; + } + + public void setVcomp05(String vcomp05) { + this.vcomp05 = vcomp05; + } + + public String getVcomp06() { + return vcomp06; + } + + public void setVcomp06(String vcomp06) { + this.vcomp06 = vcomp06; + } + + public String getVcomp99() { + return vcomp99; + } + + public void setVcomp99(String vcomp99) { + this.vcomp99 = vcomp99; + } + + public String getpRedBC() { + return pRedBC; + } + + public void setpRedBC(String pRedBC) { + this.pRedBC = pRedBC; + } + + public String getCodstatus() { + return codstatus; + } + + public void setCodstatus(String codstatus) { + this.codstatus = codstatus; + } + + public String getChbpe() { + return chbpe; + } + + public void setChbpe(String chbpe) { + this.chbpe = chbpe; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroAnalitico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroAnalitico.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroAnalitico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroAnalitico.java index 69f508969..6e11fd7e4 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroAnalitico.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroAnalitico.java @@ -1,282 +1,282 @@ -package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; - -import java.math.BigDecimal; -import java.util.Date; - -public class FinanceiroAnalitico implements Comparable { - - private String uf; - private String codigoAgencia; - private Date fechorVenta; - private BigDecimal receitaBPR; - private BigDecimal gapVenda; - private BigDecimal gapImpressa; - private BigDecimal totalVendaPassagens; - private BigDecimal receitaEb; - private BigDecimal multaComp; - private BigDecimal difTrocaOCD; - private BigDecimal difTarifaMaior; - private BigDecimal totalOutrasReceitas; - private BigDecimal txEmb; - private BigDecimal pedagio; - private BigDecimal segFacult; - private BigDecimal totalTerceiros; - private BigDecimal receitaBruta; - private BigDecimal devolBPR; - private BigDecimal devolGAP; - private BigDecimal receitaLiquida; - private BigDecimal despesas; - private BigDecimal pgOCD; - private BigDecimal difTarifaMenor; - private BigDecimal cartaoCredito; - private BigDecimal cartaoDebito; - private BigDecimal boletoBancario; - private BigDecimal deposito; - private BigDecimal totalDetalhamento; - private BigDecimal saldo; - - @Override - public int compareTo(FinanceiroAnalitico o) { - int retorno = getFechorVenta().compareTo(o.getFechorVenta()); - if (retorno == 0 && (getUf()!=null && o.getUf()!= null ) ) { - retorno = getUf().compareTo(o.getUf()); - } - if (retorno == 0 && (getCodigoAgencia()!=null && o.getCodigoAgencia()!= null ) ) { - retorno = getCodigoAgencia().compareTo(o.getCodigoAgencia()); - } - return retorno; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getCodigoAgencia() { - return codigoAgencia; - } - - public void setCodigoAgencia(String codigoAgencia) { - this.codigoAgencia = codigoAgencia; - } - - public Date getFechorVenta() { - return fechorVenta; - } - - public void setFechorVenta(Date fechorVenta) { - this.fechorVenta = fechorVenta; - } - - public BigDecimal getReceitaBPR() { - return receitaBPR; - } - - public void setReceitaBPR(BigDecimal receitaBPR) { - this.receitaBPR = receitaBPR; - } - - public BigDecimal getGapVenda() { - return gapVenda; - } - - public void setGapVenda(BigDecimal gapVenda) { - this.gapVenda = gapVenda; - } - - public BigDecimal getGapImpressa() { - return gapImpressa; - } - - public void setGapImpressa(BigDecimal gapImpressa) { - this.gapImpressa = gapImpressa; - } - - public BigDecimal getTotalVendaPassagens() { - return totalVendaPassagens; - } - - public void setTotalVendaPassagens(BigDecimal totalVendaPassagens) { - this.totalVendaPassagens = totalVendaPassagens; - } - - public BigDecimal getMultaComp() { - return multaComp; - } - - public void setMultaComp(BigDecimal multaComp) { - this.multaComp = multaComp; - } - - public BigDecimal getDifTrocaOCD() { - return difTrocaOCD; - } - - public void setDifTrocaOCD(BigDecimal difTrocaOCD) { - this.difTrocaOCD = difTrocaOCD; - } - - public BigDecimal getDifTarifaMaior() { - return difTarifaMaior; - } - - public void setDifTarifaMaior(BigDecimal difTarifaMaior) { - this.difTarifaMaior = difTarifaMaior; - } - - public BigDecimal getTotalOutrasReceitas() { - return totalOutrasReceitas; - } - - public void setTotalOutrasReceitas(BigDecimal totalOutrasReceitas) { - this.totalOutrasReceitas = totalOutrasReceitas; - } - - public BigDecimal getTxEmb() { - return txEmb; - } - - public void setTxEmb(BigDecimal txEmb) { - this.txEmb = txEmb; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getSegFacult() { - return segFacult; - } - - public void setSegFacult(BigDecimal segFacult) { - this.segFacult = segFacult; - } - - public BigDecimal getTotalTerceiros() { - return totalTerceiros; - } - - public void setTotalTerceiros(BigDecimal totalTerceiros) { - this.totalTerceiros = totalTerceiros; - } - - public BigDecimal getReceitaBruta() { - return receitaBruta; - } - - public void setReceitaBruta(BigDecimal receitaBruta) { - this.receitaBruta = receitaBruta; - } - - public BigDecimal getDevolBPR() { - return devolBPR; - } - - public void setDevolBPR(BigDecimal devolBPR) { - this.devolBPR = devolBPR; - } - - public BigDecimal getDevolGAP() { - return devolGAP; - } - - public void setDevolGAP(BigDecimal devolGAP) { - this.devolGAP = devolGAP; - } - - public BigDecimal getReceitaLiquida() { - return receitaLiquida; - } - - public void setReceitaLiquida(BigDecimal receitaLiquida) { - this.receitaLiquida = receitaLiquida; - } - - public BigDecimal getDespesas() { - return despesas; - } - - public void setDespesas(BigDecimal despesas) { - this.despesas = despesas; - } - - public BigDecimal getPgOCD() { - return pgOCD; - } - - public void setPgOCD(BigDecimal pgOCD) { - this.pgOCD = pgOCD; - } - - public BigDecimal getDifTarifaMenor() { - return difTarifaMenor; - } - - public void setDifTarifaMenor(BigDecimal difTarifaMenor) { - this.difTarifaMenor = difTarifaMenor; - } - - public BigDecimal getCartaoCredito() { - return cartaoCredito; - } - - public void setCartaoCredito(BigDecimal cartaoCredito) { - this.cartaoCredito = cartaoCredito; - } - - public BigDecimal getCartaoDebito() { - return cartaoDebito; - } - - public void setCartaoDebito(BigDecimal cartaoDebito) { - this.cartaoDebito = cartaoDebito; - } - - public BigDecimal getBoletoBancario() { - return boletoBancario; - } - - public void setBoletoBancario(BigDecimal boletoBancario) { - this.boletoBancario = boletoBancario; - } - - public BigDecimal getDeposito() { - return deposito; - } - - public void setDeposito(BigDecimal deposito) { - this.deposito = deposito; - } - - public BigDecimal getTotalDetalhamento() { - return totalDetalhamento; - } - - public void setTotalDetalhamento(BigDecimal totalDetalhamento) { - this.totalDetalhamento = totalDetalhamento; - } - - public BigDecimal getSaldo() { - return saldo; - } - - public void setSaldo(BigDecimal saldo) { - this.saldo = saldo; - } - - public BigDecimal getReceitaEb() { - return receitaEb; - } - - public void setReceitaEb(BigDecimal receitaEb) { - this.receitaEb = receitaEb; - } - -} +package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; + +import java.math.BigDecimal; +import java.util.Date; + +public class FinanceiroAnalitico implements Comparable { + + private String uf; + private String codigoAgencia; + private Date fechorVenta; + private BigDecimal receitaBPR; + private BigDecimal gapVenda; + private BigDecimal gapImpressa; + private BigDecimal totalVendaPassagens; + private BigDecimal receitaEb; + private BigDecimal multaComp; + private BigDecimal difTrocaOCD; + private BigDecimal difTarifaMaior; + private BigDecimal totalOutrasReceitas; + private BigDecimal txEmb; + private BigDecimal pedagio; + private BigDecimal segFacult; + private BigDecimal totalTerceiros; + private BigDecimal receitaBruta; + private BigDecimal devolBPR; + private BigDecimal devolGAP; + private BigDecimal receitaLiquida; + private BigDecimal despesas; + private BigDecimal pgOCD; + private BigDecimal difTarifaMenor; + private BigDecimal cartaoCredito; + private BigDecimal cartaoDebito; + private BigDecimal boletoBancario; + private BigDecimal deposito; + private BigDecimal totalDetalhamento; + private BigDecimal saldo; + + @Override + public int compareTo(FinanceiroAnalitico o) { + int retorno = getFechorVenta().compareTo(o.getFechorVenta()); + if (retorno == 0 && (getUf()!=null && o.getUf()!= null ) ) { + retorno = getUf().compareTo(o.getUf()); + } + if (retorno == 0 && (getCodigoAgencia()!=null && o.getCodigoAgencia()!= null ) ) { + retorno = getCodigoAgencia().compareTo(o.getCodigoAgencia()); + } + return retorno; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getCodigoAgencia() { + return codigoAgencia; + } + + public void setCodigoAgencia(String codigoAgencia) { + this.codigoAgencia = codigoAgencia; + } + + public Date getFechorVenta() { + return fechorVenta; + } + + public void setFechorVenta(Date fechorVenta) { + this.fechorVenta = fechorVenta; + } + + public BigDecimal getReceitaBPR() { + return receitaBPR; + } + + public void setReceitaBPR(BigDecimal receitaBPR) { + this.receitaBPR = receitaBPR; + } + + public BigDecimal getGapVenda() { + return gapVenda; + } + + public void setGapVenda(BigDecimal gapVenda) { + this.gapVenda = gapVenda; + } + + public BigDecimal getGapImpressa() { + return gapImpressa; + } + + public void setGapImpressa(BigDecimal gapImpressa) { + this.gapImpressa = gapImpressa; + } + + public BigDecimal getTotalVendaPassagens() { + return totalVendaPassagens; + } + + public void setTotalVendaPassagens(BigDecimal totalVendaPassagens) { + this.totalVendaPassagens = totalVendaPassagens; + } + + public BigDecimal getMultaComp() { + return multaComp; + } + + public void setMultaComp(BigDecimal multaComp) { + this.multaComp = multaComp; + } + + public BigDecimal getDifTrocaOCD() { + return difTrocaOCD; + } + + public void setDifTrocaOCD(BigDecimal difTrocaOCD) { + this.difTrocaOCD = difTrocaOCD; + } + + public BigDecimal getDifTarifaMaior() { + return difTarifaMaior; + } + + public void setDifTarifaMaior(BigDecimal difTarifaMaior) { + this.difTarifaMaior = difTarifaMaior; + } + + public BigDecimal getTotalOutrasReceitas() { + return totalOutrasReceitas; + } + + public void setTotalOutrasReceitas(BigDecimal totalOutrasReceitas) { + this.totalOutrasReceitas = totalOutrasReceitas; + } + + public BigDecimal getTxEmb() { + return txEmb; + } + + public void setTxEmb(BigDecimal txEmb) { + this.txEmb = txEmb; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getSegFacult() { + return segFacult; + } + + public void setSegFacult(BigDecimal segFacult) { + this.segFacult = segFacult; + } + + public BigDecimal getTotalTerceiros() { + return totalTerceiros; + } + + public void setTotalTerceiros(BigDecimal totalTerceiros) { + this.totalTerceiros = totalTerceiros; + } + + public BigDecimal getReceitaBruta() { + return receitaBruta; + } + + public void setReceitaBruta(BigDecimal receitaBruta) { + this.receitaBruta = receitaBruta; + } + + public BigDecimal getDevolBPR() { + return devolBPR; + } + + public void setDevolBPR(BigDecimal devolBPR) { + this.devolBPR = devolBPR; + } + + public BigDecimal getDevolGAP() { + return devolGAP; + } + + public void setDevolGAP(BigDecimal devolGAP) { + this.devolGAP = devolGAP; + } + + public BigDecimal getReceitaLiquida() { + return receitaLiquida; + } + + public void setReceitaLiquida(BigDecimal receitaLiquida) { + this.receitaLiquida = receitaLiquida; + } + + public BigDecimal getDespesas() { + return despesas; + } + + public void setDespesas(BigDecimal despesas) { + this.despesas = despesas; + } + + public BigDecimal getPgOCD() { + return pgOCD; + } + + public void setPgOCD(BigDecimal pgOCD) { + this.pgOCD = pgOCD; + } + + public BigDecimal getDifTarifaMenor() { + return difTarifaMenor; + } + + public void setDifTarifaMenor(BigDecimal difTarifaMenor) { + this.difTarifaMenor = difTarifaMenor; + } + + public BigDecimal getCartaoCredito() { + return cartaoCredito; + } + + public void setCartaoCredito(BigDecimal cartaoCredito) { + this.cartaoCredito = cartaoCredito; + } + + public BigDecimal getCartaoDebito() { + return cartaoDebito; + } + + public void setCartaoDebito(BigDecimal cartaoDebito) { + this.cartaoDebito = cartaoDebito; + } + + public BigDecimal getBoletoBancario() { + return boletoBancario; + } + + public void setBoletoBancario(BigDecimal boletoBancario) { + this.boletoBancario = boletoBancario; + } + + public BigDecimal getDeposito() { + return deposito; + } + + public void setDeposito(BigDecimal deposito) { + this.deposito = deposito; + } + + public BigDecimal getTotalDetalhamento() { + return totalDetalhamento; + } + + public void setTotalDetalhamento(BigDecimal totalDetalhamento) { + this.totalDetalhamento = totalDetalhamento; + } + + public BigDecimal getSaldo() { + return saldo; + } + + public void setSaldo(BigDecimal saldo) { + this.saldo = saldo; + } + + public BigDecimal getReceitaEb() { + return receitaEb; + } + + public void setReceitaEb(BigDecimal receitaEb) { + this.receitaEb = receitaEb; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroSintetico.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroSintetico.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroSintetico.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroSintetico.java index d7b7c7b1d..7e2c31011 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroSintetico.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FinanceiroSintetico.java @@ -1,287 +1,287 @@ -package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; - -import java.math.BigDecimal; - -public class FinanceiroSintetico implements Comparable { - - private String uf; - private String codigoAgencia; - private BigDecimal receitaBPR; - private BigDecimal gapVenda; - private BigDecimal gapImpressa; - private BigDecimal totalVendaPassagens; - private BigDecimal receitaEb; - private BigDecimal multaComp; - private BigDecimal difTrocaOCD; - private BigDecimal difTarifaMaior; - private BigDecimal totalOutrasReceitas; - private BigDecimal txEmb; - private BigDecimal txConveniencia; - private BigDecimal pedagio; - private BigDecimal segFacult; - private BigDecimal totalTerceiros; - private BigDecimal receitaBruta; - private BigDecimal devolBPR; - private BigDecimal devolGAP; - private BigDecimal devolOCD; - private BigDecimal receitaLiquida; - private BigDecimal despesas; - private BigDecimal pgOCD; - private BigDecimal difTarifaMenor; - private BigDecimal cartaoCredito; - private BigDecimal cartaoDebito; - private BigDecimal boletoBancario; - private BigDecimal deposito; - private BigDecimal totalDetalhamento; - private BigDecimal saldo; - - @Override - public int compareTo(FinanceiroSintetico o) { - int retorno = getUf().compareTo(o.getUf()); - if (retorno == 0) { - retorno = getCodigoAgencia().compareTo(o.getCodigoAgencia()); - } - return retorno; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getCodigoAgencia() { - return codigoAgencia; - } - - public void setCodigoAgencia(String codigoAgencia) { - this.codigoAgencia = codigoAgencia; - } - - public BigDecimal getReceitaBPR() { - return receitaBPR; - } - - public void setReceitaBPR(BigDecimal receitaBPR) { - this.receitaBPR = receitaBPR; - } - - public BigDecimal getGapVenda() { - return gapVenda; - } - - public void setGapVenda(BigDecimal gapVenda) { - this.gapVenda = gapVenda; - } - - public BigDecimal getGapImpressa() { - return gapImpressa; - } - - public void setGapImpressa(BigDecimal gapImpressa) { - this.gapImpressa = gapImpressa; - } - - public BigDecimal getTotalVendaPassagens() { - return totalVendaPassagens; - } - - public void setTotalVendaPassagens(BigDecimal totalVendaPassagens) { - this.totalVendaPassagens = totalVendaPassagens; - } - - public BigDecimal getMultaComp() { - return multaComp; - } - - public void setMultaComp(BigDecimal multaComp) { - this.multaComp = multaComp; - } - - public BigDecimal getDifTrocaOCD() { - return difTrocaOCD; - } - - public void setDifTrocaOCD(BigDecimal difTrocaOCD) { - this.difTrocaOCD = difTrocaOCD; - } - - public BigDecimal getDifTarifaMaior() { - return difTarifaMaior; - } - - public void setDifTarifaMaior(BigDecimal difTarifaMaior) { - this.difTarifaMaior = difTarifaMaior; - } - - public BigDecimal getTotalOutrasReceitas() { - return totalOutrasReceitas; - } - - public void setTotalOutrasReceitas(BigDecimal totalOutrasReceitas) { - this.totalOutrasReceitas = totalOutrasReceitas; - } - - public BigDecimal getTxEmb() { - return txEmb; - } - - public void setTxEmb(BigDecimal txEmb) { - this.txEmb = txEmb; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getSegFacult() { - return segFacult; - } - - public void setSegFacult(BigDecimal segFacult) { - this.segFacult = segFacult; - } - - public BigDecimal getTotalTerceiros() { - return totalTerceiros; - } - - public void setTotalTerceiros(BigDecimal totalTerceiros) { - this.totalTerceiros = totalTerceiros; - } - - public BigDecimal getReceitaBruta() { - return receitaBruta; - } - - public void setReceitaBruta(BigDecimal receitaBruta) { - this.receitaBruta = receitaBruta; - } - - public BigDecimal getDevolBPR() { - return devolBPR; - } - - public void setDevolBPR(BigDecimal devolBPR) { - this.devolBPR = devolBPR; - } - - public BigDecimal getDevolGAP() { - return devolGAP; - } - - public void setDevolGAP(BigDecimal devolGAP) { - this.devolGAP = devolGAP; - } - - public BigDecimal getReceitaLiquida() { - return receitaLiquida; - } - - public void setReceitaLiquida(BigDecimal receitaLiquida) { - this.receitaLiquida = receitaLiquida; - } - - public BigDecimal getDespesas() { - return despesas; - } - - public void setDespesas(BigDecimal despesas) { - this.despesas = despesas; - } - - public BigDecimal getPgOCD() { - return pgOCD; - } - - public void setPgOCD(BigDecimal pgOCD) { - this.pgOCD = pgOCD; - } - - public BigDecimal getDifTarifaMenor() { - return difTarifaMenor; - } - - public void setDifTarifaMenor(BigDecimal difTarifaMenor) { - this.difTarifaMenor = difTarifaMenor; - } - - public BigDecimal getCartaoCredito() { - return cartaoCredito; - } - - public void setCartaoCredito(BigDecimal cartaoCredito) { - this.cartaoCredito = cartaoCredito; - } - - public BigDecimal getCartaoDebito() { - return cartaoDebito; - } - - public void setCartaoDebito(BigDecimal cartaoDebito) { - this.cartaoDebito = cartaoDebito; - } - - public BigDecimal getBoletoBancario() { - return boletoBancario; - } - - public void setBoletoBancario(BigDecimal boletoBancario) { - this.boletoBancario = boletoBancario; - } - - public BigDecimal getDeposito() { - return deposito; - } - - public void setDeposito(BigDecimal deposito) { - this.deposito = deposito; - } - - public BigDecimal getTotalDetalhamento() { - return totalDetalhamento; - } - - public void setTotalDetalhamento(BigDecimal totalDetalhamento) { - this.totalDetalhamento = totalDetalhamento; - } - - public BigDecimal getSaldo() { - return saldo; - } - - public void setSaldo(BigDecimal saldo) { - this.saldo = saldo; - } - - public BigDecimal getReceitaEb() { - return receitaEb; - } - - public void setReceitaEb(BigDecimal receitaEb) { - this.receitaEb = receitaEb; - } - - public BigDecimal getTxConveniencia() { - return txConveniencia; - } - - public void setTxConveniencia(BigDecimal txConveniencia) { - this.txConveniencia = txConveniencia; - } - - public BigDecimal getDevolOCD() { - return devolOCD; - } - - public void setDevolOCD(BigDecimal devolOCD) { - this.devolOCD = devolOCD; - } - -} +package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; + +import java.math.BigDecimal; + +public class FinanceiroSintetico implements Comparable { + + private String uf; + private String codigoAgencia; + private BigDecimal receitaBPR; + private BigDecimal gapVenda; + private BigDecimal gapImpressa; + private BigDecimal totalVendaPassagens; + private BigDecimal receitaEb; + private BigDecimal multaComp; + private BigDecimal difTrocaOCD; + private BigDecimal difTarifaMaior; + private BigDecimal totalOutrasReceitas; + private BigDecimal txEmb; + private BigDecimal txConveniencia; + private BigDecimal pedagio; + private BigDecimal segFacult; + private BigDecimal totalTerceiros; + private BigDecimal receitaBruta; + private BigDecimal devolBPR; + private BigDecimal devolGAP; + private BigDecimal devolOCD; + private BigDecimal receitaLiquida; + private BigDecimal despesas; + private BigDecimal pgOCD; + private BigDecimal difTarifaMenor; + private BigDecimal cartaoCredito; + private BigDecimal cartaoDebito; + private BigDecimal boletoBancario; + private BigDecimal deposito; + private BigDecimal totalDetalhamento; + private BigDecimal saldo; + + @Override + public int compareTo(FinanceiroSintetico o) { + int retorno = getUf().compareTo(o.getUf()); + if (retorno == 0) { + retorno = getCodigoAgencia().compareTo(o.getCodigoAgencia()); + } + return retorno; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getCodigoAgencia() { + return codigoAgencia; + } + + public void setCodigoAgencia(String codigoAgencia) { + this.codigoAgencia = codigoAgencia; + } + + public BigDecimal getReceitaBPR() { + return receitaBPR; + } + + public void setReceitaBPR(BigDecimal receitaBPR) { + this.receitaBPR = receitaBPR; + } + + public BigDecimal getGapVenda() { + return gapVenda; + } + + public void setGapVenda(BigDecimal gapVenda) { + this.gapVenda = gapVenda; + } + + public BigDecimal getGapImpressa() { + return gapImpressa; + } + + public void setGapImpressa(BigDecimal gapImpressa) { + this.gapImpressa = gapImpressa; + } + + public BigDecimal getTotalVendaPassagens() { + return totalVendaPassagens; + } + + public void setTotalVendaPassagens(BigDecimal totalVendaPassagens) { + this.totalVendaPassagens = totalVendaPassagens; + } + + public BigDecimal getMultaComp() { + return multaComp; + } + + public void setMultaComp(BigDecimal multaComp) { + this.multaComp = multaComp; + } + + public BigDecimal getDifTrocaOCD() { + return difTrocaOCD; + } + + public void setDifTrocaOCD(BigDecimal difTrocaOCD) { + this.difTrocaOCD = difTrocaOCD; + } + + public BigDecimal getDifTarifaMaior() { + return difTarifaMaior; + } + + public void setDifTarifaMaior(BigDecimal difTarifaMaior) { + this.difTarifaMaior = difTarifaMaior; + } + + public BigDecimal getTotalOutrasReceitas() { + return totalOutrasReceitas; + } + + public void setTotalOutrasReceitas(BigDecimal totalOutrasReceitas) { + this.totalOutrasReceitas = totalOutrasReceitas; + } + + public BigDecimal getTxEmb() { + return txEmb; + } + + public void setTxEmb(BigDecimal txEmb) { + this.txEmb = txEmb; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getSegFacult() { + return segFacult; + } + + public void setSegFacult(BigDecimal segFacult) { + this.segFacult = segFacult; + } + + public BigDecimal getTotalTerceiros() { + return totalTerceiros; + } + + public void setTotalTerceiros(BigDecimal totalTerceiros) { + this.totalTerceiros = totalTerceiros; + } + + public BigDecimal getReceitaBruta() { + return receitaBruta; + } + + public void setReceitaBruta(BigDecimal receitaBruta) { + this.receitaBruta = receitaBruta; + } + + public BigDecimal getDevolBPR() { + return devolBPR; + } + + public void setDevolBPR(BigDecimal devolBPR) { + this.devolBPR = devolBPR; + } + + public BigDecimal getDevolGAP() { + return devolGAP; + } + + public void setDevolGAP(BigDecimal devolGAP) { + this.devolGAP = devolGAP; + } + + public BigDecimal getReceitaLiquida() { + return receitaLiquida; + } + + public void setReceitaLiquida(BigDecimal receitaLiquida) { + this.receitaLiquida = receitaLiquida; + } + + public BigDecimal getDespesas() { + return despesas; + } + + public void setDespesas(BigDecimal despesas) { + this.despesas = despesas; + } + + public BigDecimal getPgOCD() { + return pgOCD; + } + + public void setPgOCD(BigDecimal pgOCD) { + this.pgOCD = pgOCD; + } + + public BigDecimal getDifTarifaMenor() { + return difTarifaMenor; + } + + public void setDifTarifaMenor(BigDecimal difTarifaMenor) { + this.difTarifaMenor = difTarifaMenor; + } + + public BigDecimal getCartaoCredito() { + return cartaoCredito; + } + + public void setCartaoCredito(BigDecimal cartaoCredito) { + this.cartaoCredito = cartaoCredito; + } + + public BigDecimal getCartaoDebito() { + return cartaoDebito; + } + + public void setCartaoDebito(BigDecimal cartaoDebito) { + this.cartaoDebito = cartaoDebito; + } + + public BigDecimal getBoletoBancario() { + return boletoBancario; + } + + public void setBoletoBancario(BigDecimal boletoBancario) { + this.boletoBancario = boletoBancario; + } + + public BigDecimal getDeposito() { + return deposito; + } + + public void setDeposito(BigDecimal deposito) { + this.deposito = deposito; + } + + public BigDecimal getTotalDetalhamento() { + return totalDetalhamento; + } + + public void setTotalDetalhamento(BigDecimal totalDetalhamento) { + this.totalDetalhamento = totalDetalhamento; + } + + public BigDecimal getSaldo() { + return saldo; + } + + public void setSaldo(BigDecimal saldo) { + this.saldo = saldo; + } + + public BigDecimal getReceitaEb() { + return receitaEb; + } + + public void setReceitaEb(BigDecimal receitaEb) { + this.receitaEb = receitaEb; + } + + public BigDecimal getTxConveniencia() { + return txConveniencia; + } + + public void setTxConveniencia(BigDecimal txConveniencia) { + this.txConveniencia = txConveniencia; + } + + public BigDecimal getDevolOCD() { + return devolOCD; + } + + public void setDevolOCD(BigDecimal devolOCD) { + this.devolOCD = devolOCD; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FiscalRdi.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FiscalRdi.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FiscalRdi.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FiscalRdi.java index f07acae09..f45c17eea 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FiscalRdi.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/FiscalRdi.java @@ -1,269 +1,269 @@ -package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; - -import java.math.BigDecimal; - -public class FiscalRdi implements Comparable { - - private String estado; - private String tipoViagem; - private String tipoReceita; - private BigDecimal quantBilhetes; - private BigDecimal tarifa; - private BigDecimal seguro; - private BigDecimal txEmbarque; - private BigDecimal pedagio; - private BigDecimal passagem; - private BigDecimal isentos; - private BigDecimal outros; - private BigDecimal rbc; - private BigDecimal baseCalculo; - private BigDecimal aliquota; - private BigDecimal icms; - private BigDecimal cp; - private BigDecimal credPres; - private BigDecimal icmsRec; - - public FiscalRdi() { - super(); - } - - public FiscalRdi(String estado, String tipoViagem, String tipoReceita) { - super(); - this.estado = estado; - this.tipoViagem = tipoViagem; - this.tipoReceita = tipoReceita; - initDados(); - } - - public FiscalRdi(String estado, String tipoViagem, String tipoReceita, BigDecimal tarifa, BigDecimal seguro, BigDecimal txEmbarque, BigDecimal pedagio, BigDecimal passagem, BigDecimal isentos, BigDecimal outros, BigDecimal rbc, BigDecimal baseCalculo, BigDecimal aliquota, BigDecimal icms, BigDecimal cp, BigDecimal credPres, BigDecimal icmsRec) { - super(); - this.estado = estado; - this.tipoViagem = tipoViagem; - this.tipoReceita = tipoReceita; - this.tarifa = tarifa; - this.seguro = seguro; - this.txEmbarque = txEmbarque; - this.pedagio = pedagio; - this.passagem = passagem; - this.isentos = isentos; - this.outros = outros; - this.rbc = rbc; - this.baseCalculo = baseCalculo; - this.aliquota = aliquota; - this.icms = icms; - this.cp = cp; - this.credPres = credPres; - this.icmsRec = icmsRec; - } - - public void initDados() { - this.quantBilhetes = BigDecimal.ZERO; - this.tarifa = BigDecimal.ZERO; - this.seguro = BigDecimal.ZERO; - this.txEmbarque = BigDecimal.ZERO; - this.pedagio = BigDecimal.ZERO; - this.passagem = BigDecimal.ZERO; - this.isentos = BigDecimal.ZERO; - this.outros = BigDecimal.ZERO; - this.rbc = BigDecimal.ZERO; - this.baseCalculo = BigDecimal.ZERO; - this.aliquota = BigDecimal.ZERO; - this.icms = BigDecimal.ZERO; - this.cp = BigDecimal.ZERO; - this.credPres = BigDecimal.ZERO; - this.icmsRec = BigDecimal.ZERO; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public String getTipoViagem() { - return tipoViagem; - } - - public void setTipoViagem(String tipoViagem) { - this.tipoViagem = tipoViagem; - } - - public String getTipoReceita() { - return tipoReceita; - } - - public void setTipoReceita(String tipoReceita) { - this.tipoReceita = tipoReceita; - } - - public BigDecimal getQuantBilhetes() { - return quantBilhetes; - } - - public void setQuantBilhetes(BigDecimal quantBilhetes) { - this.quantBilhetes = quantBilhetes; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public BigDecimal getSeguro() { - return seguro; - } - - public void setSeguro(BigDecimal seguro) { - this.seguro = seguro; - } - - public BigDecimal getTxEmbarque() { - return txEmbarque; - } - - public void setTxEmbarque(BigDecimal txEmbarque) { - this.txEmbarque = txEmbarque; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getPassagem() { - return passagem; - } - - public void setPassagem(BigDecimal passagem) { - this.passagem = passagem; - } - - public BigDecimal getIsentos() { - return isentos; - } - - public void setIsentos(BigDecimal isentos) { - this.isentos = isentos; - } - - public BigDecimal getOutros() { - return outros; - } - - public void setOutros(BigDecimal outros) { - this.outros = outros; - } - - public BigDecimal getRbc() { - return rbc; - } - - public void setRbc(BigDecimal rbc) { - this.rbc = rbc; - } - - public BigDecimal getBaseCalculo() { - return baseCalculo; - } - - public void setBaseCalculo(BigDecimal baseCalculo) { - this.baseCalculo = baseCalculo; - } - - public BigDecimal getAliquota() { - return aliquota; - } - - public void setAliquota(BigDecimal aliquota) { - this.aliquota = aliquota; - } - - public BigDecimal getIcms() { - return icms; - } - - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - - public BigDecimal getCp() { - return cp; - } - - public void setCp(BigDecimal cp) { - this.cp = cp; - } - - public BigDecimal getCredPres() { - return credPres; - } - - public void setCredPres(BigDecimal credPres) { - this.credPres = credPres; - } - - public BigDecimal getIcmsRec() { - return icmsRec; - } - - public void setIcmsRec(BigDecimal icmsRec) { - this.icmsRec = icmsRec; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((estado == null) ? 0 : estado.hashCode()); - result = prime * result + ((tipoReceita == null) ? 0 : tipoReceita.hashCode()); - result = prime * result + ((tipoViagem == null) ? 0 : tipoViagem.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - FiscalRdi other = (FiscalRdi) obj; - if (estado == null) { - if (other.estado != null) - return false; - } else if (!estado.equals(other.estado)) - return false; - if (tipoReceita == null) { - if (other.tipoReceita != null) - return false; - } else if (!tipoReceita.equals(other.tipoReceita)) - return false; - if (tipoViagem == null) { - if (other.tipoViagem != null) - return false; - } else if (!tipoViagem.equals(other.tipoViagem)) - return false; - return true; - } - - @Override - public int compareTo(FiscalRdi o) { - int result = this.estado.compareToIgnoreCase(o.estado); - if (result == 0) { - result = o.tipoViagem.compareToIgnoreCase(this.tipoViagem); - } - if (result == 0) { - return o.tipoReceita.compareToIgnoreCase(this.tipoReceita); - } - return result; - } -} +package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; + +import java.math.BigDecimal; + +public class FiscalRdi implements Comparable { + + private String estado; + private String tipoViagem; + private String tipoReceita; + private BigDecimal quantBilhetes; + private BigDecimal tarifa; + private BigDecimal seguro; + private BigDecimal txEmbarque; + private BigDecimal pedagio; + private BigDecimal passagem; + private BigDecimal isentos; + private BigDecimal outros; + private BigDecimal rbc; + private BigDecimal baseCalculo; + private BigDecimal aliquota; + private BigDecimal icms; + private BigDecimal cp; + private BigDecimal credPres; + private BigDecimal icmsRec; + + public FiscalRdi() { + super(); + } + + public FiscalRdi(String estado, String tipoViagem, String tipoReceita) { + super(); + this.estado = estado; + this.tipoViagem = tipoViagem; + this.tipoReceita = tipoReceita; + initDados(); + } + + public FiscalRdi(String estado, String tipoViagem, String tipoReceita, BigDecimal tarifa, BigDecimal seguro, BigDecimal txEmbarque, BigDecimal pedagio, BigDecimal passagem, BigDecimal isentos, BigDecimal outros, BigDecimal rbc, BigDecimal baseCalculo, BigDecimal aliquota, BigDecimal icms, BigDecimal cp, BigDecimal credPres, BigDecimal icmsRec) { + super(); + this.estado = estado; + this.tipoViagem = tipoViagem; + this.tipoReceita = tipoReceita; + this.tarifa = tarifa; + this.seguro = seguro; + this.txEmbarque = txEmbarque; + this.pedagio = pedagio; + this.passagem = passagem; + this.isentos = isentos; + this.outros = outros; + this.rbc = rbc; + this.baseCalculo = baseCalculo; + this.aliquota = aliquota; + this.icms = icms; + this.cp = cp; + this.credPres = credPres; + this.icmsRec = icmsRec; + } + + public void initDados() { + this.quantBilhetes = BigDecimal.ZERO; + this.tarifa = BigDecimal.ZERO; + this.seguro = BigDecimal.ZERO; + this.txEmbarque = BigDecimal.ZERO; + this.pedagio = BigDecimal.ZERO; + this.passagem = BigDecimal.ZERO; + this.isentos = BigDecimal.ZERO; + this.outros = BigDecimal.ZERO; + this.rbc = BigDecimal.ZERO; + this.baseCalculo = BigDecimal.ZERO; + this.aliquota = BigDecimal.ZERO; + this.icms = BigDecimal.ZERO; + this.cp = BigDecimal.ZERO; + this.credPres = BigDecimal.ZERO; + this.icmsRec = BigDecimal.ZERO; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public String getTipoViagem() { + return tipoViagem; + } + + public void setTipoViagem(String tipoViagem) { + this.tipoViagem = tipoViagem; + } + + public String getTipoReceita() { + return tipoReceita; + } + + public void setTipoReceita(String tipoReceita) { + this.tipoReceita = tipoReceita; + } + + public BigDecimal getQuantBilhetes() { + return quantBilhetes; + } + + public void setQuantBilhetes(BigDecimal quantBilhetes) { + this.quantBilhetes = quantBilhetes; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public BigDecimal getSeguro() { + return seguro; + } + + public void setSeguro(BigDecimal seguro) { + this.seguro = seguro; + } + + public BigDecimal getTxEmbarque() { + return txEmbarque; + } + + public void setTxEmbarque(BigDecimal txEmbarque) { + this.txEmbarque = txEmbarque; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getPassagem() { + return passagem; + } + + public void setPassagem(BigDecimal passagem) { + this.passagem = passagem; + } + + public BigDecimal getIsentos() { + return isentos; + } + + public void setIsentos(BigDecimal isentos) { + this.isentos = isentos; + } + + public BigDecimal getOutros() { + return outros; + } + + public void setOutros(BigDecimal outros) { + this.outros = outros; + } + + public BigDecimal getRbc() { + return rbc; + } + + public void setRbc(BigDecimal rbc) { + this.rbc = rbc; + } + + public BigDecimal getBaseCalculo() { + return baseCalculo; + } + + public void setBaseCalculo(BigDecimal baseCalculo) { + this.baseCalculo = baseCalculo; + } + + public BigDecimal getAliquota() { + return aliquota; + } + + public void setAliquota(BigDecimal aliquota) { + this.aliquota = aliquota; + } + + public BigDecimal getIcms() { + return icms; + } + + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + + public BigDecimal getCp() { + return cp; + } + + public void setCp(BigDecimal cp) { + this.cp = cp; + } + + public BigDecimal getCredPres() { + return credPres; + } + + public void setCredPres(BigDecimal credPres) { + this.credPres = credPres; + } + + public BigDecimal getIcmsRec() { + return icmsRec; + } + + public void setIcmsRec(BigDecimal icmsRec) { + this.icmsRec = icmsRec; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((estado == null) ? 0 : estado.hashCode()); + result = prime * result + ((tipoReceita == null) ? 0 : tipoReceita.hashCode()); + result = prime * result + ((tipoViagem == null) ? 0 : tipoViagem.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + FiscalRdi other = (FiscalRdi) obj; + if (estado == null) { + if (other.estado != null) + return false; + } else if (!estado.equals(other.estado)) + return false; + if (tipoReceita == null) { + if (other.tipoReceita != null) + return false; + } else if (!tipoReceita.equals(other.tipoReceita)) + return false; + if (tipoViagem == null) { + if (other.tipoViagem != null) + return false; + } else if (!tipoViagem.equals(other.tipoViagem)) + return false; + return true; + } + + @Override + public int compareTo(FiscalRdi o) { + int result = this.estado.compareToIgnoreCase(o.estado); + if (result == 0) { + result = o.tipoViagem.compareToIgnoreCase(this.tipoViagem); + } + if (result == 0) { + return o.tipoReceita.compareToIgnoreCase(this.tipoReceita); + } + return result; + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/RdiValidacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/RdiValidacion.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/RdiValidacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/RdiValidacion.java index 71d4be6d9..83ae06980 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/RdiValidacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/fiscal/vo/RdiValidacion.java @@ -1,85 +1,85 @@ -package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; - -public class RdiValidacion { - - private String estado; - private boolean temIMRec; - private boolean temIMDev; - private boolean temIERec; - private boolean temIEDev; - - public RdiValidacion(String estado) { - super(); - this.estado = estado; - this.temIMRec = false; - this.temIMDev = false; - this.temIERec = false; - this.temIEDev = false; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public boolean isTemIMRec() { - return temIMRec; - } - - public void setTemIMRec(boolean temIMRec) { - this.temIMRec = temIMRec; - } - - public boolean isTemIMDev() { - return temIMDev; - } - - public void setTemIMDev(boolean temIMDev) { - this.temIMDev = temIMDev; - } - - public boolean isTemIERec() { - return temIERec; - } - - public void setTemIERec(boolean temIERec) { - this.temIERec = temIERec; - } - - public boolean isTemIEDev() { - return temIEDev; - } - - public void setTemIEDev(boolean temIEDev) { - this.temIEDev = temIEDev; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((estado == null) ? 0 : estado.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - RdiValidacion other = (RdiValidacion) obj; - if (estado == null) { - if (other.estado != null) - return false; - } else if (!estado.equals(other.estado)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.utilerias.fiscal.vo; + +public class RdiValidacion { + + private String estado; + private boolean temIMRec; + private boolean temIMDev; + private boolean temIERec; + private boolean temIEDev; + + public RdiValidacion(String estado) { + super(); + this.estado = estado; + this.temIMRec = false; + this.temIMDev = false; + this.temIERec = false; + this.temIEDev = false; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public boolean isTemIMRec() { + return temIMRec; + } + + public void setTemIMRec(boolean temIMRec) { + this.temIMRec = temIMRec; + } + + public boolean isTemIMDev() { + return temIMDev; + } + + public void setTemIMDev(boolean temIMDev) { + this.temIMDev = temIMDev; + } + + public boolean isTemIERec() { + return temIERec; + } + + public void setTemIERec(boolean temIERec) { + this.temIERec = temIERec; + } + + public boolean isTemIEDev() { + return temIEDev; + } + + public void setTemIEDev(boolean temIEDev) { + this.temIEDev = temIEDev; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((estado == null) ? 0 : estado.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + RdiValidacion other = (RdiValidacion) obj; + if (estado == null) { + if (other.estado != null) + return false; + } else if (!estado.equals(other.estado)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java index 9d2a4b2d8..fb01d2591 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java @@ -1,345 +1,345 @@ -package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; - -import java.math.BigDecimal; -import java.util.Date; - -public class DetalhadoRMD { - - private Long cajaId; - private String numoperacion; - private String serie; - private Integer folio; - private Integer estadoId; - private Date fechorVenta; - private String empresa; - private String enderecoEmpresa; - private String cnpjEmpresa; - private String ieEmpresa; - private BigDecimal icmsInterestadual; - private BigDecimal icmsIntermunicipal; - private String estadoOrigem; - private String estadoDestino; - private String municipioOrigem; - private boolean isInterEstadual; - private BigDecimal redBaseCalcIcms; - private BigDecimal porcRedMunicipal; - private BigDecimal porcRedEstadual; - private BigDecimal tributacaoImportacao; - private boolean isenta; - private String rmd; - private BigDecimal tarifa; - private BigDecimal taxaEmbarque; - private BigDecimal pedagio; - private BigDecimal seguro; - private BigDecimal outros; - private String nombPuntoVenta; - private String numPuntoVenta; - - // CAMPOS ECF - private String ecf; - private String datamov; - private String coo; - private String ccf; - private String totalFiscal; - private String estadoImpressora; - - private Integer rmdId; - private String foliormd; - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public Integer getFolio() { - return folio; - } - - public void setFolio(Integer folio) { - this.folio = folio; - } - - public Integer getEstadoId() { - return estadoId; - } - - public void setEstadoId(Integer estadoId) { - this.estadoId = estadoId; - } - - public Date getFechorVenta() { - return fechorVenta; - } - - public void setFechorVenta(Date fechorVenta) { - this.fechorVenta = fechorVenta; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public String getEnderecoEmpresa() { - return enderecoEmpresa; - } - - public void setEnderecoEmpresa(String enderecoEmpresa) { - this.enderecoEmpresa = enderecoEmpresa; - } - - public String getCnpjEmpresa() { - return cnpjEmpresa; - } - - public void setCnpjEmpresa(String cnpjEmpresa) { - this.cnpjEmpresa = cnpjEmpresa; - } - - public String getIeEmpresa() { - return ieEmpresa; - } - - public void setIeEmpresa(String ieEmpresa) { - this.ieEmpresa = ieEmpresa; - } - - public BigDecimal getIcmsInterestadual() { - return icmsInterestadual; - } - - public void setIcmsInterestadual(BigDecimal icmsInterestadual) { - this.icmsInterestadual = icmsInterestadual; - } - - public BigDecimal getIcmsIntermunicipal() { - return icmsIntermunicipal; - } - - public void setIcmsIntermunicipal(BigDecimal icmsIntermunicipal) { - this.icmsIntermunicipal = icmsIntermunicipal; - } - - public String getEstadoOrigem() { - return estadoOrigem; - } - - public void setEstadoOrigem(String estadoOrigem) { - this.estadoOrigem = estadoOrigem; - } - - public String getEstadoDestino() { - return estadoDestino; - } - - public void setEstadoDestino(String estadoDestino) { - this.estadoDestino = estadoDestino; - } - - public String getMunicipioOrigem() { - return municipioOrigem; - } - - public void setMunicipioOrigem(String municipioOrigem) { - this.municipioOrigem = municipioOrigem; - } - - public boolean isInterEstadual() { - return isInterEstadual; - } - - public void setInterEstadual(boolean isInterEstadual) { - this.isInterEstadual = isInterEstadual; - } - - public BigDecimal getRedBaseCalcIcms() { - return redBaseCalcIcms; - } - - public void setRedBaseCalcIcms(BigDecimal redBaseCalcIcms) { - this.redBaseCalcIcms = redBaseCalcIcms; - } - - public BigDecimal getPorcRedMunicipal() { - return porcRedMunicipal; - } - - public void setPorcRedMunicipal(BigDecimal porcRedMunicipal) { - this.porcRedMunicipal = porcRedMunicipal; - } - - public BigDecimal getPorcRedEstadual() { - return porcRedEstadual; - } - - public void setPorcRedEstadual(BigDecimal porcRedEstadual) { - this.porcRedEstadual = porcRedEstadual; - } - - public BigDecimal getTributacaoImportacao() { - return tributacaoImportacao; - } - - public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { - this.tributacaoImportacao = tributacaoImportacao; - } - - public boolean getIsenta() { - return isenta; - } - - public void setIsenta(boolean isenta) { - this.isenta = isenta; - } - - public String getRmd() { - return rmd; - } - - public void setRmd(String rmd) { - this.rmd = rmd; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public BigDecimal getTaxaEmbarque() { - return taxaEmbarque; - } - - public void setTaxaEmbarque(BigDecimal taxaEmbarque) { - this.taxaEmbarque = taxaEmbarque; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getSeguro() { - return seguro; - } - - public void setSeguro(BigDecimal seguro) { - this.seguro = seguro; - } - - public BigDecimal getOutros() { - return outros; - } - - public void setOutros(BigDecimal outros) { - this.outros = outros; - } - - public String getEcf() { - return ecf; - } - - public void setEcf(String ecf) { - this.ecf = ecf; - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public String getCoo() { - return coo; - } - - public void setCoo(String coo) { - this.coo = coo; - } - - public String getTotalFiscal() { - return totalFiscal; - } - - public void setTotalFiscal(String totalFiscal) { - this.totalFiscal = totalFiscal; - } - - public String getCcf() { - return ccf; - } - - public void setCcf(String ccf) { - this.ccf = ccf; - } - - public String getNombPuntoVenta() { - return nombPuntoVenta; - } - - public void setNombPuntoVenta(String nombPuntoVenta) { - this.nombPuntoVenta = nombPuntoVenta; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - - public String getEstadoImpressora() { - return estadoImpressora; - } - - public void setEstadoImpressora(String estadoImpressora) { - this.estadoImpressora = estadoImpressora; - } - - public Integer getRmdId() { - return rmdId; - } - - public void setRmdId(Integer rmdId) { - this.rmdId = rmdId; - } - - public String getFoliormd() { - return foliormd; - } - - public void setFoliormd(String foliormd) { - this.foliormd = foliormd; - } - -} +package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; + +import java.math.BigDecimal; +import java.util.Date; + +public class DetalhadoRMD { + + private Long cajaId; + private String numoperacion; + private String serie; + private Integer folio; + private Integer estadoId; + private Date fechorVenta; + private String empresa; + private String enderecoEmpresa; + private String cnpjEmpresa; + private String ieEmpresa; + private BigDecimal icmsInterestadual; + private BigDecimal icmsIntermunicipal; + private String estadoOrigem; + private String estadoDestino; + private String municipioOrigem; + private boolean isInterEstadual; + private BigDecimal redBaseCalcIcms; + private BigDecimal porcRedMunicipal; + private BigDecimal porcRedEstadual; + private BigDecimal tributacaoImportacao; + private boolean isenta; + private String rmd; + private BigDecimal tarifa; + private BigDecimal taxaEmbarque; + private BigDecimal pedagio; + private BigDecimal seguro; + private BigDecimal outros; + private String nombPuntoVenta; + private String numPuntoVenta; + + // CAMPOS ECF + private String ecf; + private String datamov; + private String coo; + private String ccf; + private String totalFiscal; + private String estadoImpressora; + + private Integer rmdId; + private String foliormd; + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public Integer getFolio() { + return folio; + } + + public void setFolio(Integer folio) { + this.folio = folio; + } + + public Integer getEstadoId() { + return estadoId; + } + + public void setEstadoId(Integer estadoId) { + this.estadoId = estadoId; + } + + public Date getFechorVenta() { + return fechorVenta; + } + + public void setFechorVenta(Date fechorVenta) { + this.fechorVenta = fechorVenta; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getEnderecoEmpresa() { + return enderecoEmpresa; + } + + public void setEnderecoEmpresa(String enderecoEmpresa) { + this.enderecoEmpresa = enderecoEmpresa; + } + + public String getCnpjEmpresa() { + return cnpjEmpresa; + } + + public void setCnpjEmpresa(String cnpjEmpresa) { + this.cnpjEmpresa = cnpjEmpresa; + } + + public String getIeEmpresa() { + return ieEmpresa; + } + + public void setIeEmpresa(String ieEmpresa) { + this.ieEmpresa = ieEmpresa; + } + + public BigDecimal getIcmsInterestadual() { + return icmsInterestadual; + } + + public void setIcmsInterestadual(BigDecimal icmsInterestadual) { + this.icmsInterestadual = icmsInterestadual; + } + + public BigDecimal getIcmsIntermunicipal() { + return icmsIntermunicipal; + } + + public void setIcmsIntermunicipal(BigDecimal icmsIntermunicipal) { + this.icmsIntermunicipal = icmsIntermunicipal; + } + + public String getEstadoOrigem() { + return estadoOrigem; + } + + public void setEstadoOrigem(String estadoOrigem) { + this.estadoOrigem = estadoOrigem; + } + + public String getEstadoDestino() { + return estadoDestino; + } + + public void setEstadoDestino(String estadoDestino) { + this.estadoDestino = estadoDestino; + } + + public String getMunicipioOrigem() { + return municipioOrigem; + } + + public void setMunicipioOrigem(String municipioOrigem) { + this.municipioOrigem = municipioOrigem; + } + + public boolean isInterEstadual() { + return isInterEstadual; + } + + public void setInterEstadual(boolean isInterEstadual) { + this.isInterEstadual = isInterEstadual; + } + + public BigDecimal getRedBaseCalcIcms() { + return redBaseCalcIcms; + } + + public void setRedBaseCalcIcms(BigDecimal redBaseCalcIcms) { + this.redBaseCalcIcms = redBaseCalcIcms; + } + + public BigDecimal getPorcRedMunicipal() { + return porcRedMunicipal; + } + + public void setPorcRedMunicipal(BigDecimal porcRedMunicipal) { + this.porcRedMunicipal = porcRedMunicipal; + } + + public BigDecimal getPorcRedEstadual() { + return porcRedEstadual; + } + + public void setPorcRedEstadual(BigDecimal porcRedEstadual) { + this.porcRedEstadual = porcRedEstadual; + } + + public BigDecimal getTributacaoImportacao() { + return tributacaoImportacao; + } + + public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { + this.tributacaoImportacao = tributacaoImportacao; + } + + public boolean getIsenta() { + return isenta; + } + + public void setIsenta(boolean isenta) { + this.isenta = isenta; + } + + public String getRmd() { + return rmd; + } + + public void setRmd(String rmd) { + this.rmd = rmd; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public BigDecimal getTaxaEmbarque() { + return taxaEmbarque; + } + + public void setTaxaEmbarque(BigDecimal taxaEmbarque) { + this.taxaEmbarque = taxaEmbarque; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getSeguro() { + return seguro; + } + + public void setSeguro(BigDecimal seguro) { + this.seguro = seguro; + } + + public BigDecimal getOutros() { + return outros; + } + + public void setOutros(BigDecimal outros) { + this.outros = outros; + } + + public String getEcf() { + return ecf; + } + + public void setEcf(String ecf) { + this.ecf = ecf; + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public String getCoo() { + return coo; + } + + public void setCoo(String coo) { + this.coo = coo; + } + + public String getTotalFiscal() { + return totalFiscal; + } + + public void setTotalFiscal(String totalFiscal) { + this.totalFiscal = totalFiscal; + } + + public String getCcf() { + return ccf; + } + + public void setCcf(String ccf) { + this.ccf = ccf; + } + + public String getNombPuntoVenta() { + return nombPuntoVenta; + } + + public void setNombPuntoVenta(String nombPuntoVenta) { + this.nombPuntoVenta = nombPuntoVenta; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + + public String getEstadoImpressora() { + return estadoImpressora; + } + + public void setEstadoImpressora(String estadoImpressora) { + this.estadoImpressora = estadoImpressora; + } + + public Integer getRmdId() { + return rmdId; + } + + public void setRmdId(Integer rmdId) { + this.rmdId = rmdId; + } + + public String getFoliormd() { + return foliormd; + } + + public void setFoliormd(String foliormd) { + this.foliormd = foliormd; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java index d2dbb0c0b..83d5e269c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java @@ -1,144 +1,144 @@ -package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; - -import java.math.BigDecimal; -import java.util.Date; - -public class FolioRMD { - - private String foliormd; - private String status; - private String fechorfolio; - private String empresa; - private String uf; - private String estado; - private String tipo; - private Date fechorfolioDate; - private String doc; - private BigDecimal valorContabil; - private BigDecimal baseCalculo; - private BigDecimal aliquota; - private BigDecimal isentos; - private BigDecimal outros; - private BigDecimal icms; - - public String getFoliormd() { - return foliormd; - } - - public void setFoliormd(String foliormd) { - this.foliormd = foliormd; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getFechorfolio() { - return fechorfolio; - } - - public void setFechorfolio(String fechorfolio) { - this.fechorfolio = fechorfolio; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public String getTipo() { - return tipo; - } - - public void setTipo(String tipo) { - this.tipo = tipo; - } - - public Date getFechorfolioDate() { - return fechorfolioDate; - } - - public void setFechorfolioDate(Date fechorfolioDate) { - this.fechorfolioDate = fechorfolioDate; - } - - public String getDoc() { - return doc; - } - - public void setDoc(String doc) { - this.doc = doc; - } - - public BigDecimal getValorContabil() { - return valorContabil; - } - - public void setValorContabil(BigDecimal valorContabil) { - this.valorContabil = valorContabil; - } - - public BigDecimal getBaseCalculo() { - return baseCalculo; - } - - public void setBaseCalculo(BigDecimal baseCalculo) { - this.baseCalculo = baseCalculo; - } - - public BigDecimal getAliquota() { - return aliquota; - } - - public void setAliquota(BigDecimal aliquota) { - this.aliquota = aliquota; - } - - public BigDecimal getIsentos() { - return isentos; - } - - public void setIsentos(BigDecimal isentos) { - this.isentos = isentos; - } - - public BigDecimal getOutros() { - return outros; - } - - public void setOutros(BigDecimal outros) { - this.outros = outros; - } - - public BigDecimal getIcms() { - return icms; - } - - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - -} +package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; + +import java.math.BigDecimal; +import java.util.Date; + +public class FolioRMD { + + private String foliormd; + private String status; + private String fechorfolio; + private String empresa; + private String uf; + private String estado; + private String tipo; + private Date fechorfolioDate; + private String doc; + private BigDecimal valorContabil; + private BigDecimal baseCalculo; + private BigDecimal aliquota; + private BigDecimal isentos; + private BigDecimal outros; + private BigDecimal icms; + + public String getFoliormd() { + return foliormd; + } + + public void setFoliormd(String foliormd) { + this.foliormd = foliormd; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getFechorfolio() { + return fechorfolio; + } + + public void setFechorfolio(String fechorfolio) { + this.fechorfolio = fechorfolio; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public String getTipo() { + return tipo; + } + + public void setTipo(String tipo) { + this.tipo = tipo; + } + + public Date getFechorfolioDate() { + return fechorfolioDate; + } + + public void setFechorfolioDate(Date fechorfolioDate) { + this.fechorfolioDate = fechorfolioDate; + } + + public String getDoc() { + return doc; + } + + public void setDoc(String doc) { + this.doc = doc; + } + + public BigDecimal getValorContabil() { + return valorContabil; + } + + public void setValorContabil(BigDecimal valorContabil) { + this.valorContabil = valorContabil; + } + + public BigDecimal getBaseCalculo() { + return baseCalculo; + } + + public void setBaseCalculo(BigDecimal baseCalculo) { + this.baseCalculo = baseCalculo; + } + + public BigDecimal getAliquota() { + return aliquota; + } + + public void setAliquota(BigDecimal aliquota) { + this.aliquota = aliquota; + } + + public BigDecimal getIsentos() { + return isentos; + } + + public void setIsentos(BigDecimal isentos) { + this.isentos = isentos; + } + + public BigDecimal getOutros() { + return outros; + } + + public void setOutros(BigDecimal outros) { + this.outros = outros; + } + + public BigDecimal getIcms() { + return icms; + } + + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/ImpressaoRMD.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/ImpressaoRMD.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/ImpressaoRMD.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/ImpressaoRMD.java index dceaa123a..f0454f80a 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/ImpressaoRMD.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/ImpressaoRMD.java @@ -1,222 +1,222 @@ -package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ImpressaoRMD { - - private String empresa; - private String enderecoEmpresa; - private String cnpjEmpresa; - private String ieEmpresa; - private Date data; - private String rmd; - private String naturezaOperacao; - private String tipo; - private String serie; - private String numero; - private BigDecimal valorContabil; - private BigDecimal baseCalculo; - private BigDecimal aliquota; - private BigDecimal isentos; - private BigDecimal outros; - private BigDecimal icms; - private String obs; - private String folio; - - private List detalhada; - - public ImpressaoRMD(String empresa, String enderecoEmpresa, String cnpjEmpresa, String ieEmpresa, - Date data, String rmd, String naturezaOperacao, String tipo, String serie, String obs) { - super(); - this.empresa = empresa; - this.enderecoEmpresa = enderecoEmpresa; - this.cnpjEmpresa = cnpjEmpresa; - this.ieEmpresa = ieEmpresa; - this.data = data; - this.rmd = rmd; - this.naturezaOperacao = naturezaOperacao; - this.tipo = tipo; - this.serie = serie; - this.obs = obs; - } - - public ImpressaoRMD(String empresa, String enderecoEmpresa, String cnpjEmpresa, String ieEmpresa, - Date data, String rmd, String naturezaOperacao, String tipo, String serie, String obs, String folio) { - super(); - this.empresa = empresa; - this.enderecoEmpresa = enderecoEmpresa; - this.cnpjEmpresa = cnpjEmpresa; - this.ieEmpresa = ieEmpresa; - this.data = data; - this.rmd = rmd; - this.naturezaOperacao = naturezaOperacao; - this.tipo = tipo; - this.serie = serie; - this.obs = obs; - this.folio = folio; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public String getEnderecoEmpresa() { - return enderecoEmpresa; - } - - public void setEnderecoEmpresa(String enderecoEmpresa) { - this.enderecoEmpresa = enderecoEmpresa; - } - - public String getCnpjEmpresa() { - return cnpjEmpresa; - } - - public void setCnpjEmpresa(String cnpjEmpresa) { - this.cnpjEmpresa = cnpjEmpresa; - } - - public String getIeEmpresa() { - return ieEmpresa; - } - - public void setIeEmpresa(String ieEmpresa) { - this.ieEmpresa = ieEmpresa; - } - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - - public String getRmd() { - return rmd; - } - - public void setRmd(String rmd) { - this.rmd = rmd; - } - - public String getNaturezaOperacao() { - return naturezaOperacao; - } - - public void setNaturezaOperacao(String naturezaOperacao) { - this.naturezaOperacao = naturezaOperacao; - } - - public String getTipo() { - return tipo; - } - - public void setTipo(String tipo) { - this.tipo = tipo; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public BigDecimal getValorContabil() { - return valorContabil == null ? BigDecimal.ZERO : valorContabil; - } - - public void setValorContabil(BigDecimal valorContabil) { - this.valorContabil = valorContabil; - } - - public BigDecimal getBaseCalculo() { - return baseCalculo == null ? BigDecimal.ZERO : baseCalculo; - } - - public void setBaseCalculo(BigDecimal baseCalculo) { - this.baseCalculo = baseCalculo; - } - - public BigDecimal getAliquota() { - return aliquota; - } - - public void setAliquota(BigDecimal aliquota) { - this.aliquota = aliquota; - } - - public BigDecimal getIsentos() { - return isentos; - } - - public void setIsentos(BigDecimal isentos) { - this.isentos = isentos; - } - - public BigDecimal getOutros() { - return outros; - } - - public void setOutros(BigDecimal outros) { - this.outros = outros; - } - - public String getObs() { - return obs; - } - - public void setObs(String obs) { - this.obs = obs; - } - - public List getDetalhada() { - if (detalhada == null) { - detalhada = new ArrayList(); - } - return detalhada; - } - - public void setDetalhada(List detalhada) { - this.detalhada = detalhada; - } - - public BigDecimal getIcms() { - return icms; - } - - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - - @Override - public String toString() { - return "ImpressaoRMD [empresa=" + empresa + ", enderecoEmpresa=" + enderecoEmpresa + ", cnpjEmpresa=" + cnpjEmpresa + ", ieEmpresa=" + ieEmpresa + ", data=" + data + ", rmd=" + rmd + ", naturezaOperacao=" + naturezaOperacao + ", tipo=" + tipo + ", serie=" + serie + ", numero=" + numero + ", valorContabil=" + valorContabil + ", baseCalculo=" + baseCalculo + ", aliquota=" + aliquota + ", isentos=" + isentos + ", outros=" + outros + ", icms=" + icms + ", obs=" + obs + ", detalhada=" + detalhada + "]"; - } - - public String getFolio() { - return folio; - } - - public void setFolio(String folio) { - this.folio = folio; - } - -} +package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ImpressaoRMD { + + private String empresa; + private String enderecoEmpresa; + private String cnpjEmpresa; + private String ieEmpresa; + private Date data; + private String rmd; + private String naturezaOperacao; + private String tipo; + private String serie; + private String numero; + private BigDecimal valorContabil; + private BigDecimal baseCalculo; + private BigDecimal aliquota; + private BigDecimal isentos; + private BigDecimal outros; + private BigDecimal icms; + private String obs; + private String folio; + + private List detalhada; + + public ImpressaoRMD(String empresa, String enderecoEmpresa, String cnpjEmpresa, String ieEmpresa, + Date data, String rmd, String naturezaOperacao, String tipo, String serie, String obs) { + super(); + this.empresa = empresa; + this.enderecoEmpresa = enderecoEmpresa; + this.cnpjEmpresa = cnpjEmpresa; + this.ieEmpresa = ieEmpresa; + this.data = data; + this.rmd = rmd; + this.naturezaOperacao = naturezaOperacao; + this.tipo = tipo; + this.serie = serie; + this.obs = obs; + } + + public ImpressaoRMD(String empresa, String enderecoEmpresa, String cnpjEmpresa, String ieEmpresa, + Date data, String rmd, String naturezaOperacao, String tipo, String serie, String obs, String folio) { + super(); + this.empresa = empresa; + this.enderecoEmpresa = enderecoEmpresa; + this.cnpjEmpresa = cnpjEmpresa; + this.ieEmpresa = ieEmpresa; + this.data = data; + this.rmd = rmd; + this.naturezaOperacao = naturezaOperacao; + this.tipo = tipo; + this.serie = serie; + this.obs = obs; + this.folio = folio; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getEnderecoEmpresa() { + return enderecoEmpresa; + } + + public void setEnderecoEmpresa(String enderecoEmpresa) { + this.enderecoEmpresa = enderecoEmpresa; + } + + public String getCnpjEmpresa() { + return cnpjEmpresa; + } + + public void setCnpjEmpresa(String cnpjEmpresa) { + this.cnpjEmpresa = cnpjEmpresa; + } + + public String getIeEmpresa() { + return ieEmpresa; + } + + public void setIeEmpresa(String ieEmpresa) { + this.ieEmpresa = ieEmpresa; + } + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + + public String getRmd() { + return rmd; + } + + public void setRmd(String rmd) { + this.rmd = rmd; + } + + public String getNaturezaOperacao() { + return naturezaOperacao; + } + + public void setNaturezaOperacao(String naturezaOperacao) { + this.naturezaOperacao = naturezaOperacao; + } + + public String getTipo() { + return tipo; + } + + public void setTipo(String tipo) { + this.tipo = tipo; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public BigDecimal getValorContabil() { + return valorContabil == null ? BigDecimal.ZERO : valorContabil; + } + + public void setValorContabil(BigDecimal valorContabil) { + this.valorContabil = valorContabil; + } + + public BigDecimal getBaseCalculo() { + return baseCalculo == null ? BigDecimal.ZERO : baseCalculo; + } + + public void setBaseCalculo(BigDecimal baseCalculo) { + this.baseCalculo = baseCalculo; + } + + public BigDecimal getAliquota() { + return aliquota; + } + + public void setAliquota(BigDecimal aliquota) { + this.aliquota = aliquota; + } + + public BigDecimal getIsentos() { + return isentos; + } + + public void setIsentos(BigDecimal isentos) { + this.isentos = isentos; + } + + public BigDecimal getOutros() { + return outros; + } + + public void setOutros(BigDecimal outros) { + this.outros = outros; + } + + public String getObs() { + return obs; + } + + public void setObs(String obs) { + this.obs = obs; + } + + public List getDetalhada() { + if (detalhada == null) { + detalhada = new ArrayList(); + } + return detalhada; + } + + public void setDetalhada(List detalhada) { + this.detalhada = detalhada; + } + + public BigDecimal getIcms() { + return icms; + } + + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + + @Override + public String toString() { + return "ImpressaoRMD [empresa=" + empresa + ", enderecoEmpresa=" + enderecoEmpresa + ", cnpjEmpresa=" + cnpjEmpresa + ", ieEmpresa=" + ieEmpresa + ", data=" + data + ", rmd=" + rmd + ", naturezaOperacao=" + naturezaOperacao + ", tipo=" + tipo + ", serie=" + serie + ", numero=" + numero + ", valorContabil=" + valorContabil + ", baseCalculo=" + baseCalculo + ", aliquota=" + aliquota + ", isentos=" + isentos + ", outros=" + outros + ", icms=" + icms + ", obs=" + obs + ", detalhada=" + detalhada + "]"; + } + + public String getFolio() { + return folio; + } + + public void setFolio(String folio) { + this.folio = folio; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/seguridad/Base64.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/seguridad/Base64.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/seguridad/Base64.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/seguridad/Base64.java index dbf06aa71..d0f8c3e5d 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/seguridad/Base64.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/seguridad/Base64.java @@ -1,203 +1,203 @@ -/* - * @(#)Base64.java 1.3 01/12/03 - * - * Copyright 2002 Sun Microsystems, Inc. All rights reserved. - * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - */ -package com.rjconsultores.ventaboletos.utilerias.seguridad; - -/** - * Static methods for translating Base64 encoded strings to byte arrays and vice-versa. - * - * @author Josh Bloch - * @version 1.3, 12/03/01 - * @see Preferences - * @since 1.4 - */ -public class Base64 { - - /** - * Translates the specified byte array into a Base64 string as per Preferences.put(byte[]). - */ - public static String byteArrayToBase64(byte[] a) { - return byteArrayToBase64(a, false); - } - - /** - * Translates the specified byte array into an "aternate representation" Base64 string. This non-standard variant uses an alphabet that does not contain the uppercase alphabetic characters, which makes it suitable for use in situations where case-folding occurs. - */ - public static String byteArrayToAltBase64(byte[] a) { - return byteArrayToBase64(a, true); - } - - private static String byteArrayToBase64(byte[] a, boolean alternate) { - int aLen = a.length; - int numFullGroups = aLen / 3; - int numBytesInPartialGroup = aLen - 3 * numFullGroups; - int resultLen = 4 * ((aLen + 2) / 3); - StringBuffer result = new StringBuffer(resultLen); - char[] intToAlpha = (alternate ? intToAltBase64 : intToBase64); - - // Translate all full groups from byte array elements to Base64 - int inCursor = 0; - for (int i = 0; i < numFullGroups; i++) { - int byte0 = a[inCursor++] & 0xff; - int byte1 = a[inCursor++] & 0xff; - int byte2 = a[inCursor++] & 0xff; - result.append(intToAlpha[byte0 >> 2]); - result.append(intToAlpha[(byte0 << 4) & 0x3f | (byte1 >> 4)]); - result.append(intToAlpha[(byte1 << 2) & 0x3f | (byte2 >> 6)]); - result.append(intToAlpha[byte2 & 0x3f]); - } - - // Translate partial group if present - if (numBytesInPartialGroup != 0) { - int byte0 = a[inCursor++] & 0xff; - result.append(intToAlpha[byte0 >> 2]); - if (numBytesInPartialGroup == 1) { - result.append(intToAlpha[(byte0 << 4) & 0x3f]); - result.append("=="); - } else { - // assert numBytesInPartialGroup == 2; - int byte1 = a[inCursor++] & 0xff; - result.append(intToAlpha[(byte0 << 4) & 0x3f | (byte1 >> 4)]); - result.append(intToAlpha[(byte1 << 2) & 0x3f]); - result.append('='); - } - } - // assert inCursor == a.length; - // assert result.length() == resultLen; - return result.toString(); - } - - /** - * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet" equivalents as specified in Table 1 of RFC 2045. - */ - private static final char intToBase64[] = { - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' - }; - /** - * This array is a lookup table that translates 6-bit positive integer index values into their "Alternate Base64 Alphabet" equivalents. This is NOT the real Base64 Alphabet as per in Table 1 of RFC 2045. This alternate alphabet does not use the capital letters. It is designed for use in environments where "case folding" occurs. - */ - private static final char intToAltBase64[] = { - '!', '"', '#', '$', '%', '&', '\'', '(', ')', ',', '-', '.', ':', - ';', '<', '>', '@', '[', ']', '^', '`', '_', '{', '|', '}', '~', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '?' - }; - - /** - * Translates the specified Base64 string (as per Preferences.get(byte[])) into a byte array. - * - * @throw IllegalArgumentException if s is not a valid Base64 string. - */ - public static byte[] base64ToByteArray(String s) { - return base64ToByteArray(s, false); - } - - /** - * Translates the specified "aternate representation" Base64 string into a byte array. - * - * @throw IllegalArgumentException or ArrayOutOfBoundsException if s is not a valid alternate representation Base64 string. - */ - public static byte[] altBase64ToByteArray(String s) { - return base64ToByteArray(s, true); - } - - private static byte[] base64ToByteArray(String s, boolean alternate) { - byte[] alphaToInt = (alternate ? altBase64ToInt : base64ToInt); - int sLen = s.length(); - int numGroups = sLen / 4; - if (4 * numGroups != sLen) { - throw new IllegalArgumentException( - "String length must be a multiple of four."); - } - int missingBytesInLastGroup = 0; - int numFullGroups = numGroups; - if (sLen != 0) { - if (s.charAt(sLen - 1) == '=') { - missingBytesInLastGroup++; - numFullGroups--; - } - if (s.charAt(sLen - 2) == '=') { - missingBytesInLastGroup++; - } - } - byte[] result = new byte[3 * numGroups - missingBytesInLastGroup]; - - // Translate all full groups from base64 to byte array elements - int inCursor = 0, outCursor = 0; - for (int i = 0; i < numFullGroups; i++) { - int ch0 = base64toInt(s.charAt(inCursor++), alphaToInt); - int ch1 = base64toInt(s.charAt(inCursor++), alphaToInt); - int ch2 = base64toInt(s.charAt(inCursor++), alphaToInt); - int ch3 = base64toInt(s.charAt(inCursor++), alphaToInt); - result[outCursor++] = (byte) ((ch0 << 2) | (ch1 >> 4)); - result[outCursor++] = (byte) ((ch1 << 4) | (ch2 >> 2)); - result[outCursor++] = (byte) ((ch2 << 6) | ch3); - } - - // Translate partial group, if present - if (missingBytesInLastGroup != 0) { - int ch0 = base64toInt(s.charAt(inCursor++), alphaToInt); - int ch1 = base64toInt(s.charAt(inCursor++), alphaToInt); - result[outCursor++] = (byte) ((ch0 << 2) | (ch1 >> 4)); - - if (missingBytesInLastGroup == 1) { - int ch2 = base64toInt(s.charAt(inCursor++), alphaToInt); - result[outCursor++] = (byte) ((ch1 << 4) | (ch2 >> 2)); - } - } - return result; - } - - /** - * Translates the specified character, which is assumed to be in the "Base 64 Alphabet" into its equivalent 6-bit positive integer. - * - * @throw IllegalArgumentException or ArrayOutOfBoundsException if c is not in the Base64 Alphabet. - */ - private static int base64toInt(char c, byte[] alphaToInt) { - int result = alphaToInt[c]; - if (result < 0) { - throw new IllegalArgumentException("Illegal character " + c); - } - return result; - } - - /** - * This array is a lookup table that translates unicode characters drawn from the "Base64 Alphabet" (as specified in Table 1 of RFC 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64 alphabet but fall within the bounds of the array are translated to -1. - */ - private static final byte base64ToInt[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 - }; - /** - * This array is the analogue of base64ToInt, but for the nonstandard variant that avoids the use of uppercase alphabetic characters. - */ - private static final byte altBase64ToInt[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, - 2, 3, 4, 5, 6, 7, 8, -1, 62, 9, 10, 11, -1, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 12, 13, 14, -1, 15, 63, 16, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 17, -1, 18, 19, 21, 20, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 22, 23, 24, 25 - }; - - public static void main(String args[]) { - Integer i = new Integer(-1); - Short s = i.shortValue(); - System.out.println(s); - } -} +/* + * @(#)Base64.java 1.3 01/12/03 + * + * Copyright 2002 Sun Microsystems, Inc. All rights reserved. + * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + */ +package com.rjconsultores.ventaboletos.utilerias.seguridad; + +/** + * Static methods for translating Base64 encoded strings to byte arrays and vice-versa. + * + * @author Josh Bloch + * @version 1.3, 12/03/01 + * @see Preferences + * @since 1.4 + */ +public class Base64 { + + /** + * Translates the specified byte array into a Base64 string as per Preferences.put(byte[]). + */ + public static String byteArrayToBase64(byte[] a) { + return byteArrayToBase64(a, false); + } + + /** + * Translates the specified byte array into an "aternate representation" Base64 string. This non-standard variant uses an alphabet that does not contain the uppercase alphabetic characters, which makes it suitable for use in situations where case-folding occurs. + */ + public static String byteArrayToAltBase64(byte[] a) { + return byteArrayToBase64(a, true); + } + + private static String byteArrayToBase64(byte[] a, boolean alternate) { + int aLen = a.length; + int numFullGroups = aLen / 3; + int numBytesInPartialGroup = aLen - 3 * numFullGroups; + int resultLen = 4 * ((aLen + 2) / 3); + StringBuffer result = new StringBuffer(resultLen); + char[] intToAlpha = (alternate ? intToAltBase64 : intToBase64); + + // Translate all full groups from byte array elements to Base64 + int inCursor = 0; + for (int i = 0; i < numFullGroups; i++) { + int byte0 = a[inCursor++] & 0xff; + int byte1 = a[inCursor++] & 0xff; + int byte2 = a[inCursor++] & 0xff; + result.append(intToAlpha[byte0 >> 2]); + result.append(intToAlpha[(byte0 << 4) & 0x3f | (byte1 >> 4)]); + result.append(intToAlpha[(byte1 << 2) & 0x3f | (byte2 >> 6)]); + result.append(intToAlpha[byte2 & 0x3f]); + } + + // Translate partial group if present + if (numBytesInPartialGroup != 0) { + int byte0 = a[inCursor++] & 0xff; + result.append(intToAlpha[byte0 >> 2]); + if (numBytesInPartialGroup == 1) { + result.append(intToAlpha[(byte0 << 4) & 0x3f]); + result.append("=="); + } else { + // assert numBytesInPartialGroup == 2; + int byte1 = a[inCursor++] & 0xff; + result.append(intToAlpha[(byte0 << 4) & 0x3f | (byte1 >> 4)]); + result.append(intToAlpha[(byte1 << 2) & 0x3f]); + result.append('='); + } + } + // assert inCursor == a.length; + // assert result.length() == resultLen; + return result.toString(); + } + + /** + * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet" equivalents as specified in Table 1 of RFC 2045. + */ + private static final char intToBase64[] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' + }; + /** + * This array is a lookup table that translates 6-bit positive integer index values into their "Alternate Base64 Alphabet" equivalents. This is NOT the real Base64 Alphabet as per in Table 1 of RFC 2045. This alternate alphabet does not use the capital letters. It is designed for use in environments where "case folding" occurs. + */ + private static final char intToAltBase64[] = { + '!', '"', '#', '$', '%', '&', '\'', '(', ')', ',', '-', '.', ':', + ';', '<', '>', '@', '[', ']', '^', '`', '_', '{', '|', '}', '~', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '?' + }; + + /** + * Translates the specified Base64 string (as per Preferences.get(byte[])) into a byte array. + * + * @throw IllegalArgumentException if s is not a valid Base64 string. + */ + public static byte[] base64ToByteArray(String s) { + return base64ToByteArray(s, false); + } + + /** + * Translates the specified "aternate representation" Base64 string into a byte array. + * + * @throw IllegalArgumentException or ArrayOutOfBoundsException if s is not a valid alternate representation Base64 string. + */ + public static byte[] altBase64ToByteArray(String s) { + return base64ToByteArray(s, true); + } + + private static byte[] base64ToByteArray(String s, boolean alternate) { + byte[] alphaToInt = (alternate ? altBase64ToInt : base64ToInt); + int sLen = s.length(); + int numGroups = sLen / 4; + if (4 * numGroups != sLen) { + throw new IllegalArgumentException( + "String length must be a multiple of four."); + } + int missingBytesInLastGroup = 0; + int numFullGroups = numGroups; + if (sLen != 0) { + if (s.charAt(sLen - 1) == '=') { + missingBytesInLastGroup++; + numFullGroups--; + } + if (s.charAt(sLen - 2) == '=') { + missingBytesInLastGroup++; + } + } + byte[] result = new byte[3 * numGroups - missingBytesInLastGroup]; + + // Translate all full groups from base64 to byte array elements + int inCursor = 0, outCursor = 0; + for (int i = 0; i < numFullGroups; i++) { + int ch0 = base64toInt(s.charAt(inCursor++), alphaToInt); + int ch1 = base64toInt(s.charAt(inCursor++), alphaToInt); + int ch2 = base64toInt(s.charAt(inCursor++), alphaToInt); + int ch3 = base64toInt(s.charAt(inCursor++), alphaToInt); + result[outCursor++] = (byte) ((ch0 << 2) | (ch1 >> 4)); + result[outCursor++] = (byte) ((ch1 << 4) | (ch2 >> 2)); + result[outCursor++] = (byte) ((ch2 << 6) | ch3); + } + + // Translate partial group, if present + if (missingBytesInLastGroup != 0) { + int ch0 = base64toInt(s.charAt(inCursor++), alphaToInt); + int ch1 = base64toInt(s.charAt(inCursor++), alphaToInt); + result[outCursor++] = (byte) ((ch0 << 2) | (ch1 >> 4)); + + if (missingBytesInLastGroup == 1) { + int ch2 = base64toInt(s.charAt(inCursor++), alphaToInt); + result[outCursor++] = (byte) ((ch1 << 4) | (ch2 >> 2)); + } + } + return result; + } + + /** + * Translates the specified character, which is assumed to be in the "Base 64 Alphabet" into its equivalent 6-bit positive integer. + * + * @throw IllegalArgumentException or ArrayOutOfBoundsException if c is not in the Base64 Alphabet. + */ + private static int base64toInt(char c, byte[] alphaToInt) { + int result = alphaToInt[c]; + if (result < 0) { + throw new IllegalArgumentException("Illegal character " + c); + } + return result; + } + + /** + * This array is a lookup table that translates unicode characters drawn from the "Base64 Alphabet" (as specified in Table 1 of RFC 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64 alphabet but fall within the bounds of the array are translated to -1. + */ + private static final byte base64ToInt[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 + }; + /** + * This array is the analogue of base64ToInt, but for the nonstandard variant that avoids the use of uppercase alphabetic characters. + */ + private static final byte altBase64ToInt[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, + 2, 3, 4, 5, 6, 7, 8, -1, 62, 9, 10, 11, -1, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 12, 13, 14, -1, 15, 63, 16, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 17, -1, 18, 19, 21, 20, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 22, 23, 24, 25 + }; + + public static void main(String args[]) { + Integer i = new Integer(-1); + Short s = i.shortValue(); + System.out.println(s); + } +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java index 39b834425..716248f8c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/seguridad/ContrasenaUtileria.java @@ -1,76 +1,76 @@ -package com.rjconsultores.ventaboletos.utilerias.seguridad; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.regex.Pattern; - -import com.rjconsultores.ventaboletos.exception.BusinessException; - -public class ContrasenaUtileria { - private int CANT_MIN_CARACTER = 6; - private int CANT_MIN_NUMERO = 1; - private int CANT_MIN_LETRA = 1; - private int CANT_ESPECIALES = 0; - - private Pattern patternHayNumero = null; - private Pattern patternHayLetra = null; - private Pattern patternHayEspeciales = null; - - public ContrasenaUtileria(){ - this.cargarPattern(); - } - - public ContrasenaUtileria(int cantMinCaracteres){ - CANT_MIN_CARACTER = cantMinCaracteres; - this.cargarPattern(); - } - - private void cargarPattern(){ - patternHayNumero = Pattern.compile(String.format(".*[0-9]{%s,}+.*",CANT_MIN_NUMERO)); - patternHayLetra = Pattern.compile(String.format(".*[a-zA-Z]{%s,}+.*",CANT_MIN_LETRA)); - patternHayEspeciales = Pattern.compile(String.format("((.*[\\W]){%s,})",CANT_ESPECIALES)); - - } - - public ContrasenaUtileria(int cantMinCaracteres,int cantMinNumeros,int cantMinLetra,int cantEspeciales){ - CANT_ESPECIALES = cantEspeciales; - CANT_MIN_CARACTER = cantMinCaracteres; - CANT_MIN_LETRA = cantMinLetra; - CANT_MIN_NUMERO = cantMinNumeros; - - this.cargarPattern(); - } - - public static String encriptarContrasena(String contrasena){ - MessageDigest md; - try { - md = MessageDigest.getInstance("MD5"); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - - byte[] pass = md.digest(contrasena.getBytes()); - return Base64.byteArrayToBase64(pass); - } - public void validarContrasenaCompleja(String contrasena) throws BusinessException{ - int length = contrasena.length(); - - if (length< CANT_MIN_CARACTER){ - throw new BusinessException("complejidadContrasena.CANT_MIN_CARACTER", new Object[]{CANT_MIN_CARACTER}); - } - - if (!patternHayLetra.matcher(contrasena).find()){ - throw new BusinessException("complejidadContrasena.CANT_MIN_LETRA", new Object[]{CANT_MIN_LETRA}); - } - - if (!patternHayNumero.matcher(contrasena).find()){ - throw new BusinessException("complejidadContrasena.CANT_MIN_NUMERO", new Object[]{CANT_MIN_NUMERO}); - } - - if (!patternHayEspeciales.matcher(contrasena).find()){ - throw new BusinessException("complejidadContrasena.CANT_ESPECIALES", new Object[]{CANT_ESPECIALES}); - } - } - - -} +package com.rjconsultores.ventaboletos.utilerias.seguridad; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.regex.Pattern; + +import com.rjconsultores.ventaboletos.exception.BusinessException; + +public class ContrasenaUtileria { + private int CANT_MIN_CARACTER = 6; + private int CANT_MIN_NUMERO = 1; + private int CANT_MIN_LETRA = 1; + private int CANT_ESPECIALES = 0; + + private Pattern patternHayNumero = null; + private Pattern patternHayLetra = null; + private Pattern patternHayEspeciales = null; + + public ContrasenaUtileria(){ + this.cargarPattern(); + } + + public ContrasenaUtileria(int cantMinCaracteres){ + CANT_MIN_CARACTER = cantMinCaracteres; + this.cargarPattern(); + } + + private void cargarPattern(){ + patternHayNumero = Pattern.compile(String.format(".*[0-9]{%s,}+.*",CANT_MIN_NUMERO)); + patternHayLetra = Pattern.compile(String.format(".*[a-zA-Z]{%s,}+.*",CANT_MIN_LETRA)); + patternHayEspeciales = Pattern.compile(String.format("((.*[\\W]){%s,})",CANT_ESPECIALES)); + + } + + public ContrasenaUtileria(int cantMinCaracteres,int cantMinNumeros,int cantMinLetra,int cantEspeciales){ + CANT_ESPECIALES = cantEspeciales; + CANT_MIN_CARACTER = cantMinCaracteres; + CANT_MIN_LETRA = cantMinLetra; + CANT_MIN_NUMERO = cantMinNumeros; + + this.cargarPattern(); + } + + public static String encriptarContrasena(String contrasena){ + MessageDigest md; + try { + md = MessageDigest.getInstance("MD5"); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + + byte[] pass = md.digest(contrasena.getBytes()); + return Base64.byteArrayToBase64(pass); + } + public void validarContrasenaCompleja(String contrasena) throws BusinessException{ + int length = contrasena.length(); + + if (length< CANT_MIN_CARACTER){ + throw new BusinessException("complejidadContrasena.CANT_MIN_CARACTER", new Object[]{CANT_MIN_CARACTER}); + } + + if (!patternHayLetra.matcher(contrasena).find()){ + throw new BusinessException("complejidadContrasena.CANT_MIN_LETRA", new Object[]{CANT_MIN_LETRA}); + } + + if (!patternHayNumero.matcher(contrasena).find()){ + throw new BusinessException("complejidadContrasena.CANT_MIN_NUMERO", new Object[]{CANT_MIN_NUMERO}); + } + + if (!patternHayEspeciales.matcher(contrasena).find()){ + throw new BusinessException("complejidadContrasena.CANT_ESPECIALES", new Object[]{CANT_ESPECIALES}); + } + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/spring/MyAnnotationSessionFactoryBean.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/MyAnnotationSessionFactoryBean.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/spring/MyAnnotationSessionFactoryBean.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/MyAnnotationSessionFactoryBean.java index 9aad51041..bb7b91783 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/spring/MyAnnotationSessionFactoryBean.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/MyAnnotationSessionFactoryBean.java @@ -1,32 +1,32 @@ -package com.rjconsultores.ventaboletos.utilerias.spring; - -import org.hibernate.HibernateException; -import org.hibernate.cfg.AnnotationConfiguration; -import org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean; - -import com.rjconsultores.ventaboletos.auditoria.interceptor.AuditInterceptor; -import com.rjconsultores.ventaboletos.dao.hibernate.sqlfunction.FnArredondamentoTarifa; -import com.rjconsultores.ventaboletos.dao.util.DBUtil; - -@SuppressWarnings("deprecation") -public class MyAnnotationSessionFactoryBean extends AnnotationSessionFactoryBean{ - - - public MyAnnotationSessionFactoryBean() { - super(); - super.setEntityInterceptor(new AuditInterceptor()); - } - - protected void postProcessAnnotationConfiguration(AnnotationConfiguration config) throws HibernateException { - config.addSqlFunction("FN_ARREDONDAMENTO_TARIFA", new FnArredondamentoTarifa()); - } - - @Override - protected void afterSessionFactoryCreation() throws Exception { - DBUtil.getInstance().setSessionFactory(this.getSessionFactory()); - super.afterSessionFactoryCreation(); - } -} - - - +package com.rjconsultores.ventaboletos.utilerias.spring; + +import org.hibernate.HibernateException; +import org.hibernate.cfg.AnnotationConfiguration; +import org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean; + +import com.rjconsultores.ventaboletos.auditoria.interceptor.AuditInterceptor; +import com.rjconsultores.ventaboletos.dao.hibernate.sqlfunction.FnArredondamentoTarifa; +import com.rjconsultores.ventaboletos.dao.util.DBUtil; + +@SuppressWarnings("deprecation") +public class MyAnnotationSessionFactoryBean extends AnnotationSessionFactoryBean{ + + + public MyAnnotationSessionFactoryBean() { + super(); + super.setEntityInterceptor(new AuditInterceptor()); + } + + protected void postProcessAnnotationConfiguration(AnnotationConfiguration config) throws HibernateException { + config.addSqlFunction("FN_ARREDONDAMENTO_TARIFA", new FnArredondamentoTarifa()); + } + + @Override + protected void afterSessionFactoryCreation() throws Exception { + DBUtil.getInstance().setSessionFactory(this.getSessionFactory()); + super.afterSessionFactoryCreation(); + } +} + + + diff --git a/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiGrantedAuthority.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiGrantedAuthority.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiGrantedAuthority.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiGrantedAuthority.java index 2fa1a0a1c..6ad892c06 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiGrantedAuthority.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiGrantedAuthority.java @@ -1,23 +1,23 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.utilerias.spring.security; - -import org.springframework.security.core.GrantedAuthority; - -/** - * @author gleimar - * - */ -public interface MiGrantedAuthority extends GrantedAuthority { - /** - * Indica si para el permiso actual tienes acceso de lectura y escrita. - * - * - * @return - * true - Acceso de lectura y escrita
- * false - Acceso de lectura
- * - */ - public boolean fullAccess(); -} +/** + * + */ +package com.rjconsultores.ventaboletos.utilerias.spring.security; + +import org.springframework.security.core.GrantedAuthority; + +/** + * @author gleimar + * + */ +public interface MiGrantedAuthority extends GrantedAuthority { + /** + * Indica si para el permiso actual tienes acceso de lectura y escrita. + * + * + * @return + * true - Acceso de lectura y escrita
+ * false - Acceso de lectura
+ * + */ + public boolean fullAccess(); +} diff --git a/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiPasswordEncoder.java b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiPasswordEncoder.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiPasswordEncoder.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiPasswordEncoder.java index 2ec3aaca0..30e98788b 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiPasswordEncoder.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/utilerias/spring/security/MiPasswordEncoder.java @@ -1,19 +1,19 @@ -package com.rjconsultores.ventaboletos.utilerias.spring.security; - -import org.springframework.dao.DataAccessException; -import org.springframework.security.authentication.encoding.PasswordEncoder; - -import com.rjconsultores.ventaboletos.utilerias.seguridad.ContrasenaUtileria; - -public class MiPasswordEncoder implements PasswordEncoder { - - public String encodePassword(String pwd, Object salt) throws DataAccessException { - return ContrasenaUtileria.encriptarContrasena(pwd); - - } - - public boolean isPasswordValid(String encPass, String pwd, Object salt) throws DataAccessException { - return encodePassword(pwd, salt).equals(encPass); - } - -} +package com.rjconsultores.ventaboletos.utilerias.spring.security; + +import org.springframework.dao.DataAccessException; +import org.springframework.security.authentication.encoding.PasswordEncoder; + +import com.rjconsultores.ventaboletos.utilerias.seguridad.ContrasenaUtileria; + +public class MiPasswordEncoder implements PasswordEncoder { + + public String encodePassword(String pwd, Object salt) throws DataAccessException { + return ContrasenaUtileria.encriptarContrasena(pwd); + + } + + public boolean isPasswordValid(String encPass, String pwd, Object salt) throws DataAccessException { + return encodePassword(pwd, salt).equals(encPass); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/version/model/entidadesAdmVta.version b/ModelWeb/src/com/rjconsultores/ventaboletos/version/model/entidadesAdmVta.version similarity index 100% rename from src/com/rjconsultores/ventaboletos/version/model/entidadesAdmVta.version rename to ModelWeb/src/com/rjconsultores/ventaboletos/version/model/entidadesAdmVta.version diff --git a/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/OrgaoConcedenteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/OrgaoConcedenteVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/OrgaoConcedenteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/OrgaoConcedenteVO.java index 1ac9f8345..f4b74c674 100644 --- a/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/OrgaoConcedenteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/OrgaoConcedenteVO.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.vo.OrgaoConcedente; - -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; - -public class OrgaoConcedenteVO { - - private Integer orgaoConcedenteId; - private String descOrgao; - private Boolean indValDocObligatorioEmbarcada; - - public OrgaoConcedenteVO(Integer orgaoConcedenteId, String descOrgao) { - this.orgaoConcedenteId = orgaoConcedenteId; - this.descOrgao = descOrgao; - } - - public OrgaoConcedenteVO(Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada) { - this.orgaoConcedenteId = orgaoConcedenteId; - this.descOrgao = descOrgao; - this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada; - } - - public OrgaoConcedenteVO(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedenteId = orgaoConcedente.getOrgaoConcedenteId(); - this.descOrgao = orgaoConcedente.getDescOrgao(); - this.indValDocObligatorioEmbarcada = orgaoConcedente.getIndValDocObligatorioEmbarcada(); - } - - public Integer getOrgaoConcedenteId() { - return orgaoConcedenteId; - } - - public void setOrgaoConcedenteId(Integer orgaoConcedenteId) { - this.orgaoConcedenteId = orgaoConcedenteId; - } - - public String getDescOrgao() { - return descOrgao; - } - - public void setDescOrgao(String descOrgao) { - this.descOrgao = descOrgao; - } - - public Boolean getIndValDocObligatorioEmbarcada() { - return indValDocObligatorioEmbarcada; - } - - public void setIndValDocObligatorioEmbarcada(Boolean indValDocObligatorioEmbarcada) { - this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada; - } - -} +package com.rjconsultores.ventaboletos.vo.OrgaoConcedente; + +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; + +public class OrgaoConcedenteVO { + + private Integer orgaoConcedenteId; + private String descOrgao; + private Boolean indValDocObligatorioEmbarcada; + + public OrgaoConcedenteVO(Integer orgaoConcedenteId, String descOrgao) { + this.orgaoConcedenteId = orgaoConcedenteId; + this.descOrgao = descOrgao; + } + + public OrgaoConcedenteVO(Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada) { + this.orgaoConcedenteId = orgaoConcedenteId; + this.descOrgao = descOrgao; + this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada; + } + + public OrgaoConcedenteVO(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedenteId = orgaoConcedente.getOrgaoConcedenteId(); + this.descOrgao = orgaoConcedente.getDescOrgao(); + this.indValDocObligatorioEmbarcada = orgaoConcedente.getIndValDocObligatorioEmbarcada(); + } + + public Integer getOrgaoConcedenteId() { + return orgaoConcedenteId; + } + + public void setOrgaoConcedenteId(Integer orgaoConcedenteId) { + this.orgaoConcedenteId = orgaoConcedenteId; + } + + public String getDescOrgao() { + return descOrgao; + } + + public void setDescOrgao(String descOrgao) { + this.descOrgao = descOrgao; + } + + public Boolean getIndValDocObligatorioEmbarcada() { + return indValDocObligatorioEmbarcada; + } + + public void setIndValDocObligatorioEmbarcada(Boolean indValDocObligatorioEmbarcada) { + this.indValDocObligatorioEmbarcada = indValDocObligatorioEmbarcada; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/RelatorioGratuidadeAgepanVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/RelatorioGratuidadeAgepanVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/RelatorioGratuidadeAgepanVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/RelatorioGratuidadeAgepanVO.java index 80d788006..7cfbc6658 100644 --- a/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/RelatorioGratuidadeAgepanVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/OrgaoConcedente/RelatorioGratuidadeAgepanVO.java @@ -1,204 +1,204 @@ -package com.rjconsultores.ventaboletos.vo.OrgaoConcedente; - -import java.math.BigDecimal; -import java.util.Date; - -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; - -public class RelatorioGratuidadeAgepanVO { - - private String numBpe; - private Date fechorventa; - private Integer origenId; - private Integer puntoventaId; - private String origem; - private String destino; - private String dhemb; - private String nombpasajero; - private String desctipodoc; - private String descnumdoc; - private String desctipodoc2; - private String descnumdoc2; - private String corridaextra; - private String tiposervicobpe; - private Date fechorviaje; - private String prefixo; - private String numasiento; - private BigDecimal totalbilhete; - private BigDecimal totalbase; - private String descontobpe; - private String chbpe; - - public String getNumBpe() { - return numBpe; - } - - public void setNumBpe(String numBpe) { - this.numBpe = numBpe; - } - - public Date getFechorventa() { - return fechorventa; - } - - public void setFechorventa(Date fechorventa) { - this.fechorventa = fechorventa; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public String getOrigem() { - return origem; - } - - public void setOrigem(String origem) { - this.origem = origem; - } - - public String getDestino() { - return destino; - } - - public void setDestino(String destino) { - this.destino = destino; - } - - public String getDhemb() { - return dhemb; - } - - public void setDhemb(String dhemb) { - this.dhemb = dhemb; - } - - public String getNombpasajero() { - return nombpasajero; - } - - public void setNombpasajero(String nombpasajero) { - this.nombpasajero = nombpasajero; - } - - public String getDesctipodoc() { - return desctipodoc; - } - - public void setDesctipodoc(String desctipodoc) { - this.desctipodoc = desctipodoc; - } - - public String getDescnumdoc() { - return descnumdoc; - } - - public void setDescnumdoc(String descnumdoc) { - this.descnumdoc = descnumdoc; - } - - public String getDesctipodoc2() { - return desctipodoc2; - } - - public void setDesctipodoc2(String desctipodoc2) { - this.desctipodoc2 = desctipodoc2; - } - - public String getDescnumdoc2() { - return descnumdoc2; - } - - public void setDescnumdoc2(String descnumdoc2) { - this.descnumdoc2 = descnumdoc2; - } - - public String getCorridaextra() { - return corridaextra; - } - - public void setCorridaextra(String corridaextra) { - this.corridaextra = corridaextra; - } - - public String getTiposervicobpe() { - return tiposervicobpe; - } - - public void setTiposervicobpe(String tiposervicobpe) { - this.tiposervicobpe = tiposervicobpe; - } - - public Date getFechorviaje() { - return fechorviaje; - } - - public void setFechorviaje(Date fechorviaje) { - this.fechorviaje = fechorviaje; - } - - public String getPrefixo() { - return prefixo; - } - - public void setPrefixo(String prefixo) { - this.prefixo = prefixo; - } - - public String getNumasiento() { - return numasiento; - } - - public void setNumasiento(String numasiento) { - this.numasiento = numasiento; - } - - public BigDecimal getTotalbilhete() { - return totalbilhete; - } - - public void setTotalbilhete(BigDecimal totalbilhete) { - this.totalbilhete = totalbilhete; - } - - public BigDecimal getTotalbase() { - return totalbase; - } - - public void setTotalbase(BigDecimal totalbase) { - this.totalbase = totalbase; - } - - public String getDescontobpe() { - return descontobpe; - } - - public void setDescontobpe(String descontobpe) { - this.descontobpe = descontobpe; - } - - public String getChbpe() { - return chbpe; - } - - public void setChbpe(String chbpe) { - this.chbpe = chbpe; - } - - public BigDecimal getDesconto() { - return MoneyHelper.subtrair(getTotalbase(), getTotalbilhete()); - } - -} +package com.rjconsultores.ventaboletos.vo.OrgaoConcedente; + +import java.math.BigDecimal; +import java.util.Date; + +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; + +public class RelatorioGratuidadeAgepanVO { + + private String numBpe; + private Date fechorventa; + private Integer origenId; + private Integer puntoventaId; + private String origem; + private String destino; + private String dhemb; + private String nombpasajero; + private String desctipodoc; + private String descnumdoc; + private String desctipodoc2; + private String descnumdoc2; + private String corridaextra; + private String tiposervicobpe; + private Date fechorviaje; + private String prefixo; + private String numasiento; + private BigDecimal totalbilhete; + private BigDecimal totalbase; + private String descontobpe; + private String chbpe; + + public String getNumBpe() { + return numBpe; + } + + public void setNumBpe(String numBpe) { + this.numBpe = numBpe; + } + + public Date getFechorventa() { + return fechorventa; + } + + public void setFechorventa(Date fechorventa) { + this.fechorventa = fechorventa; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public String getOrigem() { + return origem; + } + + public void setOrigem(String origem) { + this.origem = origem; + } + + public String getDestino() { + return destino; + } + + public void setDestino(String destino) { + this.destino = destino; + } + + public String getDhemb() { + return dhemb; + } + + public void setDhemb(String dhemb) { + this.dhemb = dhemb; + } + + public String getNombpasajero() { + return nombpasajero; + } + + public void setNombpasajero(String nombpasajero) { + this.nombpasajero = nombpasajero; + } + + public String getDesctipodoc() { + return desctipodoc; + } + + public void setDesctipodoc(String desctipodoc) { + this.desctipodoc = desctipodoc; + } + + public String getDescnumdoc() { + return descnumdoc; + } + + public void setDescnumdoc(String descnumdoc) { + this.descnumdoc = descnumdoc; + } + + public String getDesctipodoc2() { + return desctipodoc2; + } + + public void setDesctipodoc2(String desctipodoc2) { + this.desctipodoc2 = desctipodoc2; + } + + public String getDescnumdoc2() { + return descnumdoc2; + } + + public void setDescnumdoc2(String descnumdoc2) { + this.descnumdoc2 = descnumdoc2; + } + + public String getCorridaextra() { + return corridaextra; + } + + public void setCorridaextra(String corridaextra) { + this.corridaextra = corridaextra; + } + + public String getTiposervicobpe() { + return tiposervicobpe; + } + + public void setTiposervicobpe(String tiposervicobpe) { + this.tiposervicobpe = tiposervicobpe; + } + + public Date getFechorviaje() { + return fechorviaje; + } + + public void setFechorviaje(Date fechorviaje) { + this.fechorviaje = fechorviaje; + } + + public String getPrefixo() { + return prefixo; + } + + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } + + public String getNumasiento() { + return numasiento; + } + + public void setNumasiento(String numasiento) { + this.numasiento = numasiento; + } + + public BigDecimal getTotalbilhete() { + return totalbilhete; + } + + public void setTotalbilhete(BigDecimal totalbilhete) { + this.totalbilhete = totalbilhete; + } + + public BigDecimal getTotalbase() { + return totalbase; + } + + public void setTotalbase(BigDecimal totalbase) { + this.totalbase = totalbase; + } + + public String getDescontobpe() { + return descontobpe; + } + + public void setDescontobpe(String descontobpe) { + this.descontobpe = descontobpe; + } + + public String getChbpe() { + return chbpe; + } + + public void setChbpe(String chbpe) { + this.chbpe = chbpe; + } + + public BigDecimal getDesconto() { + return MoneyHelper.subtrair(getTotalbase(), getTotalbilhete()); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java index 9409c01ca..36fe2818f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.vo.aidf; - -import java.util.Date; - -import com.rjconsultores.ventaboletos.entidad.AidfTipo; - -public class AidfVo { - - private Long aidfId; - private AidfTipo aidfTipo; - private Integer aidfEspecieId; - private Integer estadoId; - private String docfiscal; - private String acfiscal; - private String serie; - private String subserie; - private String forminicial; - private String formfinal; - private Date fecadquisicion; - private Date fecvencimiento; - private String inscestadual; - private Integer empresaId; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private String cnpj; - private String tipoValidaVenta; - public Long getAidfId() { - return aidfId; - } - public void setAidfId(Long aidfId) { - this.aidfId = aidfId; - } - public AidfTipo getAidfTipo() { - return aidfTipo; - } - public void setAidfTipo(AidfTipo aidfTipo) { - this.aidfTipo = aidfTipo; - } - public Integer getAidfEspecieId() { - return aidfEspecieId; - } - public void setAidfEspecieId(Integer aidfEspecieId) { - this.aidfEspecieId = aidfEspecieId; - } - public Integer getEstadoId() { - return estadoId; - } - public void setEstadoId(Integer estadoId) { - this.estadoId = estadoId; - } - public String getDocfiscal() { - return docfiscal; - } - public void setDocfiscal(String docfiscal) { - this.docfiscal = docfiscal; - } - public String getAcfiscal() { - return acfiscal; - } - public void setAcfiscal(String acfiscal) { - this.acfiscal = acfiscal; - } - public String getSerie() { - return serie; - } - public void setSerie(String serie) { - this.serie = serie; - } - public String getSubserie() { - return subserie==null?"":subserie; - } - public void setSubserie(String subserie) { - this.subserie = subserie; - } - public String getForminicial() { - return forminicial; - } - public void setForminicial(String forminicial) { - this.forminicial = forminicial; - } - public String getFormfinal() { - return formfinal; - } - public void setFormfinal(String formfinal) { - this.formfinal = formfinal; - } - public Date getFecadquisicion() { - return fecadquisicion; - } - public void setFecadquisicion(Date fecadquisicion) { - this.fecadquisicion = fecadquisicion; - } - public Date getFecvencimiento() { - return fecvencimiento; - } - public void setFecvencimiento(Date fecvencimiento) { - this.fecvencimiento = fecvencimiento; - } - public String getInscestadual() { - return inscestadual; - } - public void setInscestadual(String inscestadual) { - this.inscestadual = inscestadual; - } - public Integer getEmpresaId() { - return empresaId; - } - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getCnpj() { - return cnpj; - } - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - public String getTipoValidaVenta() { - return tipoValidaVenta; - } - public void setTipoValidaVenta(String tipoValidaVenta) { - this.tipoValidaVenta = tipoValidaVenta; - } - -} +package com.rjconsultores.ventaboletos.vo.aidf; + +import java.util.Date; + +import com.rjconsultores.ventaboletos.entidad.AidfTipo; + +public class AidfVo { + + private Long aidfId; + private AidfTipo aidfTipo; + private Integer aidfEspecieId; + private Integer estadoId; + private String docfiscal; + private String acfiscal; + private String serie; + private String subserie; + private String forminicial; + private String formfinal; + private Date fecadquisicion; + private Date fecvencimiento; + private String inscestadual; + private Integer empresaId; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private String cnpj; + private String tipoValidaVenta; + public Long getAidfId() { + return aidfId; + } + public void setAidfId(Long aidfId) { + this.aidfId = aidfId; + } + public AidfTipo getAidfTipo() { + return aidfTipo; + } + public void setAidfTipo(AidfTipo aidfTipo) { + this.aidfTipo = aidfTipo; + } + public Integer getAidfEspecieId() { + return aidfEspecieId; + } + public void setAidfEspecieId(Integer aidfEspecieId) { + this.aidfEspecieId = aidfEspecieId; + } + public Integer getEstadoId() { + return estadoId; + } + public void setEstadoId(Integer estadoId) { + this.estadoId = estadoId; + } + public String getDocfiscal() { + return docfiscal; + } + public void setDocfiscal(String docfiscal) { + this.docfiscal = docfiscal; + } + public String getAcfiscal() { + return acfiscal; + } + public void setAcfiscal(String acfiscal) { + this.acfiscal = acfiscal; + } + public String getSerie() { + return serie; + } + public void setSerie(String serie) { + this.serie = serie; + } + public String getSubserie() { + return subserie==null?"":subserie; + } + public void setSubserie(String subserie) { + this.subserie = subserie; + } + public String getForminicial() { + return forminicial; + } + public void setForminicial(String forminicial) { + this.forminicial = forminicial; + } + public String getFormfinal() { + return formfinal; + } + public void setFormfinal(String formfinal) { + this.formfinal = formfinal; + } + public Date getFecadquisicion() { + return fecadquisicion; + } + public void setFecadquisicion(Date fecadquisicion) { + this.fecadquisicion = fecadquisicion; + } + public Date getFecvencimiento() { + return fecvencimiento; + } + public void setFecvencimiento(Date fecvencimiento) { + this.fecvencimiento = fecvencimiento; + } + public String getInscestadual() { + return inscestadual; + } + public void setInscestadual(String inscestadual) { + this.inscestadual = inscestadual; + } + public Integer getEmpresaId() { + return empresaId; + } + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getCnpj() { + return cnpj; + } + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + public String getTipoValidaVenta() { + return tipoValidaVenta; + } + public void setTipoValidaVenta(String tipoValidaVenta) { + this.tipoValidaVenta = tipoValidaVenta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/aidf/ItemRelatorioMovimentoEstoque.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/aidf/ItemRelatorioMovimentoEstoque.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/aidf/ItemRelatorioMovimentoEstoque.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/aidf/ItemRelatorioMovimentoEstoque.java index fa97a47f6..9a77e41f4 100644 --- a/src/com/rjconsultores/ventaboletos/vo/aidf/ItemRelatorioMovimentoEstoque.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/aidf/ItemRelatorioMovimentoEstoque.java @@ -1,125 +1,125 @@ -package com.rjconsultores.ventaboletos.vo.aidf; - -import java.util.Date; - -public class ItemRelatorioMovimentoEstoque { - - private Date data; - private String aidf; - private String serie; - private String subserie; - private String empresa; - private String puntoventaEnv; - private String puntoventaRec; - private String estacionEnv; - private String estacionRec; - private String numFolioInicial; - private String numFolioFinal; - private String usuario; - private Integer total; - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - - public String getAidf() { - return aidf; - } - - public void setAidf(String aidf) { - this.aidf = aidf; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getSubserie() { - return subserie; - } - - public void setSubserie(String subserie) { - this.subserie = subserie; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public String getPuntoventaEnv() { - return puntoventaEnv; - } - - public void setPuntoventaEnv(String puntoventaEnv) { - this.puntoventaEnv = puntoventaEnv; - } - - public String getPuntoventaRec() { - return puntoventaRec; - } - - public void setPuntoventaRec(String puntoventaRec) { - this.puntoventaRec = puntoventaRec; - } - - public String getEstacionEnv() { - return estacionEnv; - } - - public void setEstacionEnv(String estacionEnv) { - this.estacionEnv = estacionEnv; - } - - public String getEstacionRec() { - return estacionRec; - } - - public void setEstacionRec(String estacionRec) { - this.estacionRec = estacionRec; - } - - public String getNumFolioInicial() { - return numFolioInicial; - } - - public void setNumFolioInicial(String numFolioInicial) { - this.numFolioInicial = numFolioInicial; - } - - public String getNumFolioFinal() { - return numFolioFinal; - } - - public void setNumFolioFinal(String numFolioFinal) { - this.numFolioFinal = numFolioFinal; - } - - public String getUsuario() { - return usuario; - } - - public void setUsuario(String usuario) { - this.usuario = usuario; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - -} +package com.rjconsultores.ventaboletos.vo.aidf; + +import java.util.Date; + +public class ItemRelatorioMovimentoEstoque { + + private Date data; + private String aidf; + private String serie; + private String subserie; + private String empresa; + private String puntoventaEnv; + private String puntoventaRec; + private String estacionEnv; + private String estacionRec; + private String numFolioInicial; + private String numFolioFinal; + private String usuario; + private Integer total; + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + + public String getAidf() { + return aidf; + } + + public void setAidf(String aidf) { + this.aidf = aidf; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getSubserie() { + return subserie; + } + + public void setSubserie(String subserie) { + this.subserie = subserie; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getPuntoventaEnv() { + return puntoventaEnv; + } + + public void setPuntoventaEnv(String puntoventaEnv) { + this.puntoventaEnv = puntoventaEnv; + } + + public String getPuntoventaRec() { + return puntoventaRec; + } + + public void setPuntoventaRec(String puntoventaRec) { + this.puntoventaRec = puntoventaRec; + } + + public String getEstacionEnv() { + return estacionEnv; + } + + public void setEstacionEnv(String estacionEnv) { + this.estacionEnv = estacionEnv; + } + + public String getEstacionRec() { + return estacionRec; + } + + public void setEstacionRec(String estacionRec) { + this.estacionRec = estacionRec; + } + + public String getNumFolioInicial() { + return numFolioInicial; + } + + public void setNumFolioInicial(String numFolioInicial) { + this.numFolioInicial = numFolioInicial; + } + + public String getNumFolioFinal() { + return numFolioFinal; + } + + public void setNumFolioFinal(String numFolioFinal) { + this.numFolioFinal = numFolioFinal; + } + + public String getUsuario() { + return usuario; + } + + public void setUsuario(String usuario) { + this.usuario = usuario; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/bpe/BPeVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/bpe/BPeVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/bpe/BPeVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/bpe/BPeVO.java index bc68a3d53..9a6440685 100644 --- a/src/com/rjconsultores/ventaboletos/vo/bpe/BPeVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/bpe/BPeVO.java @@ -1,138 +1,138 @@ -package com.rjconsultores.ventaboletos.vo.bpe; - -import java.util.Date; - -import org.apache.commons.lang.StringUtils; - -public class BPeVO { - - private Integer bpeId; - private String codstat; - private String chbpe; - private String numBpe; - private String numserieBpe; - private String uf; - private String motivo; - private String errocontingencia; - private Date fechorventa; - private String nombempresa; - private String xmlEnvio; - private String xmlResposta; - private String tipoevento; - - public Integer getBpeId() { - return bpeId; - } - - public void setBpeId(Integer bpeId) { - this.bpeId = bpeId; - } - - public String getCodstat() { - return codstat; - } - - public void setCodstat(String codstat) { - this.codstat = codstat; - } - - public String getChbpe() { - return chbpe; - } - - public void setChbpe(String chbpe) { - this.chbpe = chbpe; - } - - public String getNumBpeSerie() { - StringBuilder numBpeSerie = new StringBuilder(); - if(StringUtils.isNotBlank(numBpe)) { - numBpeSerie.append(numBpe); - } - if(numBpeSerie.length() > 0 && StringUtils.isNotBlank(numserieBpe)) { - numBpeSerie.append("/").append(numserieBpe); - } - return numBpeSerie.toString(); - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getMotivo() { - return motivo; - } - - public void setMotivo(String motivo) { - this.motivo = motivo; - } - - public String getErrocontingencia() { - return errocontingencia; - } - - public void setErrocontingencia(String errocontingencia) { - this.errocontingencia = errocontingencia; - } - - public Date getFechorventa() { - return fechorventa; - } - - public void setFechorventa(Date fechorventa) { - this.fechorventa = fechorventa; - } - - public String getNumBpe() { - return numBpe; - } - - public void setNumBpe(String numBpe) { - this.numBpe = numBpe; - } - - public String getNumserieBpe() { - return numserieBpe; - } - - public void setNumserieBpe(String numserieBpe) { - this.numserieBpe = numserieBpe; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public String getXmlResposta() { - return xmlResposta; - } - - public void setXmlResposta(String xmlResposta) { - this.xmlResposta = xmlResposta; - } - - public String getTipoevento() { - return tipoevento; - } - - public void setTipoevento(String tipoevento) { - this.tipoevento = tipoevento; - } - - public String getXmlEnvio() { - return xmlEnvio; - } - - public void setXmlEnvio(String xmlEnvio) { - this.xmlEnvio = xmlEnvio; - } - -} +package com.rjconsultores.ventaboletos.vo.bpe; + +import java.util.Date; + +import org.apache.commons.lang.StringUtils; + +public class BPeVO { + + private Integer bpeId; + private String codstat; + private String chbpe; + private String numBpe; + private String numserieBpe; + private String uf; + private String motivo; + private String errocontingencia; + private Date fechorventa; + private String nombempresa; + private String xmlEnvio; + private String xmlResposta; + private String tipoevento; + + public Integer getBpeId() { + return bpeId; + } + + public void setBpeId(Integer bpeId) { + this.bpeId = bpeId; + } + + public String getCodstat() { + return codstat; + } + + public void setCodstat(String codstat) { + this.codstat = codstat; + } + + public String getChbpe() { + return chbpe; + } + + public void setChbpe(String chbpe) { + this.chbpe = chbpe; + } + + public String getNumBpeSerie() { + StringBuilder numBpeSerie = new StringBuilder(); + if(StringUtils.isNotBlank(numBpe)) { + numBpeSerie.append(numBpe); + } + if(numBpeSerie.length() > 0 && StringUtils.isNotBlank(numserieBpe)) { + numBpeSerie.append("/").append(numserieBpe); + } + return numBpeSerie.toString(); + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getMotivo() { + return motivo; + } + + public void setMotivo(String motivo) { + this.motivo = motivo; + } + + public String getErrocontingencia() { + return errocontingencia; + } + + public void setErrocontingencia(String errocontingencia) { + this.errocontingencia = errocontingencia; + } + + public Date getFechorventa() { + return fechorventa; + } + + public void setFechorventa(Date fechorventa) { + this.fechorventa = fechorventa; + } + + public String getNumBpe() { + return numBpe; + } + + public void setNumBpe(String numBpe) { + this.numBpe = numBpe; + } + + public String getNumserieBpe() { + return numserieBpe; + } + + public void setNumserieBpe(String numserieBpe) { + this.numserieBpe = numserieBpe; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public String getXmlResposta() { + return xmlResposta; + } + + public void setXmlResposta(String xmlResposta) { + this.xmlResposta = xmlResposta; + } + + public String getTipoevento() { + return tipoevento; + } + + public void setTipoevento(String tipoevento) { + this.tipoevento = tipoevento; + } + + public String getXmlEnvio() { + return xmlEnvio; + } + + public void setXmlEnvio(String xmlEnvio) { + this.xmlEnvio = xmlEnvio; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ClientePacoteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ClientePacoteVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ClientePacoteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ClientePacoteVO.java index 11d9ef91d..1743049be 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ClientePacoteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ClientePacoteVO.java @@ -1,174 +1,174 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -import com.rjconsultores.ventaboletos.enums.TipoPessoa; - -@XmlRootElement(name = "cliente") -@XmlType(propOrder = {"razaoSocial", "cpfCnpj", "tipoPessoa", "descemail", "desctelefone", "descfax", "endereco", "numero", "complemento", - "bairro", "cidade", "estado", "cep", "pais"}) -public class ClientePacoteVO { - - private Long vendapacoteId; - private String razaoSocial; - private String cpfCnpj; - private String tipoPessoa; - private String descemail; - private String desctelefone; - private String descfax; - private String endereco; - private String numero; - private String complemento; - private String bairro; - private String cidade; - private String estado; - private String cep; - private String pais; - - public ClientePacoteVO() { - super(); - } - - public ClientePacoteVO(String razaoSocial, String cpfCnpj, TipoPessoa tipoPessoa, String descemail, String desctelefone, String descfax, String cep, - String endereco, String numero, String complemento, String pais, String estado, String cidade, String bairro) { - this(); - setRazaoSocial(razaoSocial); - setCpfCnpj(cpfCnpj); - setTipoPessoa(tipoPessoa.toString()); - setDescemail(descemail); - setDesctelefone(desctelefone); - setDescfax(descfax); - setCep(cep); - setEndereco(endereco); - setNumero(numero); - setComplemento(complemento); - setPais(pais); - setEstado(estado); - setCidade(cidade); - setBairro(bairro); - } - - public String getRazaoSocial() { - return razaoSocial; - } - - public void setRazaoSocial(String razaoSocial) { - this.razaoSocial = razaoSocial; - } - - public String getCpfCnpj() { - return cpfCnpj; - } - - public void setCpfCnpj(String cpfCnpj) { - this.cpfCnpj = cpfCnpj; - } - - public String getTipoPessoa() { - return tipoPessoa; - } - - public void setTipoPessoa(String tipoPessoa) { - this.tipoPessoa = tipoPessoa; - } - - public String getDescemail() { - return descemail; - } - - public void setDescemail(String descemail) { - this.descemail = descemail; - } - - public String getDesctelefone() { - return desctelefone; - } - - public void setDesctelefone(String desctelefone) { - this.desctelefone = desctelefone; - } - - public String getDescfax() { - return descfax; - } - - public void setDescfax(String descfax) { - this.descfax = descfax; - } - - public String getCep() { - return cep; - } - - public void setCep(String cep) { - this.cep = cep; - } - - public String getEndereco() { - return endereco; - } - - public void setEndereco(String endereco) { - this.endereco = endereco; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getPais() { - return pais; - } - - public void setPais(String pais) { - this.pais = pais; - } - - public String getEstado() { - return estado; - } - - public void setEstado(String estado) { - this.estado = estado; - } - - public String getCidade() { - return cidade; - } - - public void setCidade(String cidade) { - this.cidade = cidade; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +import com.rjconsultores.ventaboletos.enums.TipoPessoa; + +@XmlRootElement(name = "cliente") +@XmlType(propOrder = {"razaoSocial", "cpfCnpj", "tipoPessoa", "descemail", "desctelefone", "descfax", "endereco", "numero", "complemento", + "bairro", "cidade", "estado", "cep", "pais"}) +public class ClientePacoteVO { + + private Long vendapacoteId; + private String razaoSocial; + private String cpfCnpj; + private String tipoPessoa; + private String descemail; + private String desctelefone; + private String descfax; + private String endereco; + private String numero; + private String complemento; + private String bairro; + private String cidade; + private String estado; + private String cep; + private String pais; + + public ClientePacoteVO() { + super(); + } + + public ClientePacoteVO(String razaoSocial, String cpfCnpj, TipoPessoa tipoPessoa, String descemail, String desctelefone, String descfax, String cep, + String endereco, String numero, String complemento, String pais, String estado, String cidade, String bairro) { + this(); + setRazaoSocial(razaoSocial); + setCpfCnpj(cpfCnpj); + setTipoPessoa(tipoPessoa.toString()); + setDescemail(descemail); + setDesctelefone(desctelefone); + setDescfax(descfax); + setCep(cep); + setEndereco(endereco); + setNumero(numero); + setComplemento(complemento); + setPais(pais); + setEstado(estado); + setCidade(cidade); + setBairro(bairro); + } + + public String getRazaoSocial() { + return razaoSocial; + } + + public void setRazaoSocial(String razaoSocial) { + this.razaoSocial = razaoSocial; + } + + public String getCpfCnpj() { + return cpfCnpj; + } + + public void setCpfCnpj(String cpfCnpj) { + this.cpfCnpj = cpfCnpj; + } + + public String getTipoPessoa() { + return tipoPessoa; + } + + public void setTipoPessoa(String tipoPessoa) { + this.tipoPessoa = tipoPessoa; + } + + public String getDescemail() { + return descemail; + } + + public void setDescemail(String descemail) { + this.descemail = descemail; + } + + public String getDesctelefone() { + return desctelefone; + } + + public void setDesctelefone(String desctelefone) { + this.desctelefone = desctelefone; + } + + public String getDescfax() { + return descfax; + } + + public void setDescfax(String descfax) { + this.descfax = descfax; + } + + public String getCep() { + return cep; + } + + public void setCep(String cep) { + this.cep = cep; + } + + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getPais() { + return pais; + } + + public void setPais(String pais) { + this.pais = pais; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/DadosBancarioVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/DadosBancarioVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/DadosBancarioVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/DadosBancarioVO.java index b42ec5849..62d9a7adf 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/DadosBancarioVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/DadosBancarioVO.java @@ -1,50 +1,50 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "dadosBancarios") -@XmlType(propOrder = {"banco", "identificadorDeposito", "data", "valor"}) -public class DadosBancarioVO { - - private String banco; - private String identificadorDeposito; - private Date data; - private BigDecimal valor; - - public String getBanco() { - return banco; - } - - public void setBanco(String banco) { - this.banco = banco; - } - - public String getIdentificadorDeposito() { - return identificadorDeposito; - } - - public void setIdentificadorDeposito(String identificadorDeposito) { - this.identificadorDeposito = identificadorDeposito; - } - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "dadosBancarios") +@XmlType(propOrder = {"banco", "identificadorDeposito", "data", "valor"}) +public class DadosBancarioVO { + + private String banco; + private String identificadorDeposito; + private Date data; + private BigDecimal valor; + + public String getBanco() { + return banco; + } + + public void setBanco(String banco) { + this.banco = banco; + } + + public String getIdentificadorDeposito() { + return identificadorDeposito; + } + + public void setIdentificadorDeposito(String identificadorDeposito) { + this.identificadorDeposito = identificadorDeposito; + } + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/EnderecoApanheVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/EnderecoApanheVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/EnderecoApanheVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/EnderecoApanheVO.java index 0b458c0f5..90a68390a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/EnderecoApanheVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/EnderecoApanheVO.java @@ -1,103 +1,103 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "pacote") -@XmlType(propOrder = { "local", "deschotel", "cep", "endereco", "cidade", "numero", "bairro", "complemento", "referencia" }) -public class EnderecoApanheVO { - - private Long vendapacoteId; - private String local; - private String cep; - private String endereco; - private String cidade; - private String numero; - private String bairro; - private String complemento; - private String referencia; - private String deschotel; - - public String getLocal() { - return local; - } - - public void setLocal(String local) { - this.local = local; - } - - public String getCep() { - return cep; - } - - public void setCep(String cep) { - this.cep = cep; - } - - public String getEndereco() { - return endereco; - } - - public void setEndereco(String endereco) { - this.endereco = endereco; - } - - public String getCidade() { - return cidade; - } - - public void setCidade(String cidade) { - this.cidade = cidade; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public String getComplemento() { - return complemento; - } - - public void setComplemento(String complemento) { - this.complemento = complemento; - } - - public String getReferencia() { - return referencia; - } - - public void setReferencia(String referencia) { - this.referencia = referencia; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - public String getDeschotel() { - return deschotel; - } - - public void setDeschotel(String deschotel) { - this.deschotel = deschotel; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "pacote") +@XmlType(propOrder = { "local", "deschotel", "cep", "endereco", "cidade", "numero", "bairro", "complemento", "referencia" }) +public class EnderecoApanheVO { + + private Long vendapacoteId; + private String local; + private String cep; + private String endereco; + private String cidade; + private String numero; + private String bairro; + private String complemento; + private String referencia; + private String deschotel; + + public String getLocal() { + return local; + } + + public void setLocal(String local) { + this.local = local; + } + + public String getCep() { + return cep; + } + + public void setCep(String cep) { + this.cep = cep; + } + + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public String getComplemento() { + return complemento; + } + + public void setComplemento(String complemento) { + this.complemento = complemento; + } + + public String getReferencia() { + return referencia; + } + + public void setReferencia(String referencia) { + this.referencia = referencia; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + public String getDeschotel() { + return deschotel; + } + + public void setDeschotel(String deschotel) { + this.deschotel = deschotel; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ItemAdicionalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ItemAdicionalVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ItemAdicionalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ItemAdicionalVO.java index 840cccf05..99104d6a4 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ItemAdicionalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ItemAdicionalVO.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement -@XmlType(propOrder = {"descitemadicional"}) -public class ItemAdicionalVO { - - private Long itemadicionalId; - private String descitemadicional; - private Long vendapacoteId; - - public String getDescitemadicional() { - return descitemadicional; - } - - public void setDescitemadicional(String descitemadicional) { - this.descitemadicional = descitemadicional; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - @XmlTransient - public Long getItemadicionalId() { - return itemadicionalId; - } - - public void setItemadicionalId(Long itemadicionalId) { - this.itemadicionalId = itemadicionalId; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement +@XmlType(propOrder = {"descitemadicional"}) +public class ItemAdicionalVO { + + private Long itemadicionalId; + private String descitemadicional; + private Long vendapacoteId; + + public String getDescitemadicional() { + return descitemadicional; + } + + public void setDescitemadicional(String descitemadicional) { + this.descitemadicional = descitemadicional; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + @XmlTransient + public Long getItemadicionalId() { + return itemadicionalId; + } + + public void setItemadicionalId(Long itemadicionalId) { + this.itemadicionalId = itemadicionalId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/NotaCreditoVendaPacoteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/NotaCreditoVendaPacoteVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/NotaCreditoVendaPacoteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/NotaCreditoVendaPacoteVO.java index 2a9ab2146..6ccac0321 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/NotaCreditoVendaPacoteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/NotaCreditoVendaPacoteVO.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "notacredito") -@XmlType(propOrder = { "vouchernotacredito", "numoperacaopacotecancelamento" }) -public class NotaCreditoVendaPacoteVO { - - private String numoperacaopacotecancelamento; - private String vouchernotacredito; - - public String getNumoperacaopacotecancelamento() { - return numoperacaopacotecancelamento; - } - - public void setNumoperacaopacotecancelamento(String numoperacaopacotecancelamento) { - this.numoperacaopacotecancelamento = numoperacaopacotecancelamento; - } - - public String getVouchernotacredito() { - return vouchernotacredito; - } - - public void setVouchernotacredito(String vouchernotacredito) { - this.vouchernotacredito = vouchernotacredito; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "notacredito") +@XmlType(propOrder = { "vouchernotacredito", "numoperacaopacotecancelamento" }) +public class NotaCreditoVendaPacoteVO { + + private String numoperacaopacotecancelamento; + private String vouchernotacredito; + + public String getNumoperacaopacotecancelamento() { + return numoperacaopacotecancelamento; + } + + public void setNumoperacaopacotecancelamento(String numoperacaopacotecancelamento) { + this.numoperacaopacotecancelamento = numoperacaopacotecancelamento; + } + + public String getVouchernotacredito() { + return vouchernotacredito; + } + + public void setVouchernotacredito(String vouchernotacredito) { + this.vouchernotacredito = vouchernotacredito; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/OcdPacoteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/OcdPacoteVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/OcdPacoteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/OcdPacoteVO.java index e45ca394a..8f8805a55 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/OcdPacoteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/OcdPacoteVO.java @@ -1,20 +1,20 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "ocd") -@XmlType(propOrder = { "voucherocd" }) -public class OcdPacoteVO { - - private String voucherocd; - - public String getVoucherocd() { - return voucherocd; - } - - public void setVoucherocd(String voucherocd) { - this.voucherocd = voucherocd; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "ocd") +@XmlType(propOrder = { "voucherocd" }) +public class OcdPacoteVO { + + private String voucherocd; + + public String getVoucherocd() { + return voucherocd; + } + + public void setVoucherocd(String voucherocd) { + this.voucherocd = voucherocd; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PacoteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PacoteVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PacoteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PacoteVO.java index d9dfb5c74..5088a5327 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PacoteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PacoteVO.java @@ -1,315 +1,315 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "pacote") -@XmlType(propOrder = { "numoperacao", "datavenda", "datapacote", "dataalteracao", "datacancelamento", "nompacote", "pacoteId", "descpacote", "usuariovenda", - "status", "pontoVenda", "empresaId", "empresa", "quantidade", "totalTarifa", "totalSeguro", "totalOutros", "totalPedagio", "totalTaxaEmbarque", - "valorsubtotal", "valortotal", "valordesconto", "formaspagamento", "servico", "pax", "enderecoApanhe", "clientePacote", "itens", "indEncargoVenta" }) -public class PacoteVO { - - private Long vendapacoteId; - private Date datapacote; - private Date datavenda; - private Date datacancelamento; - private Date dataalteracao; - private Long pacoteId; - private String nompacote; - private String descpacote; - private String numoperacao; - private Integer usuariovenda; - private String status; - private String pontoVenda; - private String empresa; - private Integer quantidade = 0; - private BigDecimal totalTarifa = BigDecimal.ZERO; - private BigDecimal totalSeguro = BigDecimal.ZERO; - private BigDecimal totalOutros = BigDecimal.ZERO; - private BigDecimal totalPedagio = BigDecimal.ZERO; - private BigDecimal totalTaxaEmbarque = BigDecimal.ZERO; - - private BigDecimal valorsubtotal = BigDecimal.ZERO; - private BigDecimal valortotal = BigDecimal.ZERO; - private BigDecimal valordesconto = BigDecimal.ZERO; - - private ClientePacoteVO clientePacote; - private ServicoVO servico; - private EnderecoApanheVO enderecoApanhe; - - private List formaspagamento = new ArrayList(); - private List pax = new ArrayList(); - private List itens = new ArrayList(); - - private Integer empresaId; - - /* Auxiliares */ - private Integer qtdePacoteFormaspago; - - private Boolean indEncargoVenta; - - public Integer getQuantidade() { - return quantidade; - } - - public void setQuantidade(Integer quantidade) { - this.quantidade = quantidade; - } - - public String getNumoperacao() { - return numoperacao; - } - - public void setNumoperacao(String numoperacao) { - this.numoperacao = numoperacao; - } - - public Integer getUsuariovenda() { - return usuariovenda; - } - - public void setUsuariovenda(Integer usuariovenda) { - this.usuariovenda = usuariovenda; - } - - public Date getDatavenda() { - return datavenda; - } - - public void setDatavenda(Date datavenda) { - this.datavenda = datavenda; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public BigDecimal getValortotal() { - return valortotal; - } - - public void setValortotal(BigDecimal valortotal) { - this.valortotal = valortotal; - } - - public BigDecimal getValordesconto() { - return valordesconto; - } - - public void setValordesconto(BigDecimal valordesconto) { - this.valordesconto = valordesconto; - } - - @XmlElementWrapper - @XmlElement(name = "pagamento", type = PagamentoVO.class) - public List getFormaspagamento() { - return formaspagamento; - } - - public void setFormaspagamento(List formaspagamento) { - this.formaspagamento = formaspagamento; - } - - public ServicoVO getServico() { - return servico; - } - - public void setServico(ServicoVO servico) { - this.servico = servico; - } - - @XmlElementWrapper - @XmlElement(name = "passageiro", type = PassageiroVO.class) - public List getPax() { - return pax; - } - - public void setPax(List pax) { - this.pax = pax; - } - - public Date getDatapacote() { - return datapacote; - } - - public void setDatapacote(Date datapacote) { - this.datapacote = datapacote; - } - - public String getPontoVenda() { - return pontoVenda; - } - - public void setPontoVenda(String pontoVenda) { - this.pontoVenda = pontoVenda; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public BigDecimal getValorsubtotal() { - return valorsubtotal; - } - - public void setValorsubtotal(BigDecimal valorsubtotal) { - this.valorsubtotal = valorsubtotal; - } - - public BigDecimal getTotalTarifa() { - return totalTarifa; - } - - public void setTotalTarifa(BigDecimal totalTarifa) { - this.totalTarifa = totalTarifa; - } - - public BigDecimal getTotalSeguro() { - return totalSeguro; - } - - public void setTotalSeguro(BigDecimal totalSeguro) { - this.totalSeguro = totalSeguro; - } - - public BigDecimal getTotalOutros() { - return totalOutros; - } - - public void setTotalOutros(BigDecimal totalOutros) { - this.totalOutros = totalOutros; - } - - public ClientePacoteVO getClientePacote() { - return clientePacote; - } - - public void setClientePacote(ClientePacoteVO clientePacote) { - this.clientePacote = clientePacote; - } - - public BigDecimal getTotalTaxaEmbarque() { - return totalTaxaEmbarque; - } - - public void setTotalTaxaEmbarque(BigDecimal totalTaxaEmbarque) { - this.totalTaxaEmbarque = totalTaxaEmbarque; - } - - public BigDecimal getTotalPedagio() { - return totalPedagio; - } - - public void setTotalPedagio(BigDecimal totalPedagio) { - this.totalPedagio = totalPedagio; - } - - public String getNompacote() { - return nompacote; - } - - public void setNompacote(String nompacote) { - this.nompacote = nompacote; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - public EnderecoApanheVO getEnderecoApanhe() { - return enderecoApanhe; - } - - public void setEnderecoApanhe(EnderecoApanheVO enderecoApanhe) { - this.enderecoApanhe = enderecoApanhe; - } - - @XmlTransient - public Integer getQtdePacoteFormaspago() { - return qtdePacoteFormaspago; - } - - public void setQtdePacoteFormaspago(Integer qtdePacoteFormaspago) { - this.qtdePacoteFormaspago = qtdePacoteFormaspago; - } - - public String getDescpacote() { - return descpacote; - } - - public void setDescpacote(String descpacote) { - this.descpacote = descpacote; - } - - @XmlElementWrapper - @XmlElement(name = "itemPacote", type = ItemAdicionalVO.class) - public List getItens() { - return itens; - } - - public void setItens(List itens) { - this.itens = itens; - } - - public Long getPacoteId() { - return pacoteId; - } - - public void setPacoteId(Long pacoteId) { - this.pacoteId = pacoteId; - } - - public Date getDatacancelamento() { - return datacancelamento; - } - - public void setDatacancelamento(Date datacancelamento) { - this.datacancelamento = datacancelamento; - } - - public Date getDataalteracao() { - return dataalteracao; - } - - public void setDataalteracao(Date dataalteracao) { - this.dataalteracao = dataalteracao; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Boolean getIndEncargoVenta() { - return indEncargoVenta; - } - - public void setIndEncargoVenta(Boolean indEncargoVenta) { - this.indEncargoVenta = indEncargoVenta; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "pacote") +@XmlType(propOrder = { "numoperacao", "datavenda", "datapacote", "dataalteracao", "datacancelamento", "nompacote", "pacoteId", "descpacote", "usuariovenda", + "status", "pontoVenda", "empresaId", "empresa", "quantidade", "totalTarifa", "totalSeguro", "totalOutros", "totalPedagio", "totalTaxaEmbarque", + "valorsubtotal", "valortotal", "valordesconto", "formaspagamento", "servico", "pax", "enderecoApanhe", "clientePacote", "itens", "indEncargoVenta" }) +public class PacoteVO { + + private Long vendapacoteId; + private Date datapacote; + private Date datavenda; + private Date datacancelamento; + private Date dataalteracao; + private Long pacoteId; + private String nompacote; + private String descpacote; + private String numoperacao; + private Integer usuariovenda; + private String status; + private String pontoVenda; + private String empresa; + private Integer quantidade = 0; + private BigDecimal totalTarifa = BigDecimal.ZERO; + private BigDecimal totalSeguro = BigDecimal.ZERO; + private BigDecimal totalOutros = BigDecimal.ZERO; + private BigDecimal totalPedagio = BigDecimal.ZERO; + private BigDecimal totalTaxaEmbarque = BigDecimal.ZERO; + + private BigDecimal valorsubtotal = BigDecimal.ZERO; + private BigDecimal valortotal = BigDecimal.ZERO; + private BigDecimal valordesconto = BigDecimal.ZERO; + + private ClientePacoteVO clientePacote; + private ServicoVO servico; + private EnderecoApanheVO enderecoApanhe; + + private List formaspagamento = new ArrayList(); + private List pax = new ArrayList(); + private List itens = new ArrayList(); + + private Integer empresaId; + + /* Auxiliares */ + private Integer qtdePacoteFormaspago; + + private Boolean indEncargoVenta; + + public Integer getQuantidade() { + return quantidade; + } + + public void setQuantidade(Integer quantidade) { + this.quantidade = quantidade; + } + + public String getNumoperacao() { + return numoperacao; + } + + public void setNumoperacao(String numoperacao) { + this.numoperacao = numoperacao; + } + + public Integer getUsuariovenda() { + return usuariovenda; + } + + public void setUsuariovenda(Integer usuariovenda) { + this.usuariovenda = usuariovenda; + } + + public Date getDatavenda() { + return datavenda; + } + + public void setDatavenda(Date datavenda) { + this.datavenda = datavenda; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public BigDecimal getValortotal() { + return valortotal; + } + + public void setValortotal(BigDecimal valortotal) { + this.valortotal = valortotal; + } + + public BigDecimal getValordesconto() { + return valordesconto; + } + + public void setValordesconto(BigDecimal valordesconto) { + this.valordesconto = valordesconto; + } + + @XmlElementWrapper + @XmlElement(name = "pagamento", type = PagamentoVO.class) + public List getFormaspagamento() { + return formaspagamento; + } + + public void setFormaspagamento(List formaspagamento) { + this.formaspagamento = formaspagamento; + } + + public ServicoVO getServico() { + return servico; + } + + public void setServico(ServicoVO servico) { + this.servico = servico; + } + + @XmlElementWrapper + @XmlElement(name = "passageiro", type = PassageiroVO.class) + public List getPax() { + return pax; + } + + public void setPax(List pax) { + this.pax = pax; + } + + public Date getDatapacote() { + return datapacote; + } + + public void setDatapacote(Date datapacote) { + this.datapacote = datapacote; + } + + public String getPontoVenda() { + return pontoVenda; + } + + public void setPontoVenda(String pontoVenda) { + this.pontoVenda = pontoVenda; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public BigDecimal getValorsubtotal() { + return valorsubtotal; + } + + public void setValorsubtotal(BigDecimal valorsubtotal) { + this.valorsubtotal = valorsubtotal; + } + + public BigDecimal getTotalTarifa() { + return totalTarifa; + } + + public void setTotalTarifa(BigDecimal totalTarifa) { + this.totalTarifa = totalTarifa; + } + + public BigDecimal getTotalSeguro() { + return totalSeguro; + } + + public void setTotalSeguro(BigDecimal totalSeguro) { + this.totalSeguro = totalSeguro; + } + + public BigDecimal getTotalOutros() { + return totalOutros; + } + + public void setTotalOutros(BigDecimal totalOutros) { + this.totalOutros = totalOutros; + } + + public ClientePacoteVO getClientePacote() { + return clientePacote; + } + + public void setClientePacote(ClientePacoteVO clientePacote) { + this.clientePacote = clientePacote; + } + + public BigDecimal getTotalTaxaEmbarque() { + return totalTaxaEmbarque; + } + + public void setTotalTaxaEmbarque(BigDecimal totalTaxaEmbarque) { + this.totalTaxaEmbarque = totalTaxaEmbarque; + } + + public BigDecimal getTotalPedagio() { + return totalPedagio; + } + + public void setTotalPedagio(BigDecimal totalPedagio) { + this.totalPedagio = totalPedagio; + } + + public String getNompacote() { + return nompacote; + } + + public void setNompacote(String nompacote) { + this.nompacote = nompacote; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + public EnderecoApanheVO getEnderecoApanhe() { + return enderecoApanhe; + } + + public void setEnderecoApanhe(EnderecoApanheVO enderecoApanhe) { + this.enderecoApanhe = enderecoApanhe; + } + + @XmlTransient + public Integer getQtdePacoteFormaspago() { + return qtdePacoteFormaspago; + } + + public void setQtdePacoteFormaspago(Integer qtdePacoteFormaspago) { + this.qtdePacoteFormaspago = qtdePacoteFormaspago; + } + + public String getDescpacote() { + return descpacote; + } + + public void setDescpacote(String descpacote) { + this.descpacote = descpacote; + } + + @XmlElementWrapper + @XmlElement(name = "itemPacote", type = ItemAdicionalVO.class) + public List getItens() { + return itens; + } + + public void setItens(List itens) { + this.itens = itens; + } + + public Long getPacoteId() { + return pacoteId; + } + + public void setPacoteId(Long pacoteId) { + this.pacoteId = pacoteId; + } + + public Date getDatacancelamento() { + return datacancelamento; + } + + public void setDatacancelamento(Date datacancelamento) { + this.datacancelamento = datacancelamento; + } + + public Date getDataalteracao() { + return dataalteracao; + } + + public void setDataalteracao(Date dataalteracao) { + this.dataalteracao = dataalteracao; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Boolean getIndEncargoVenta() { + return indEncargoVenta; + } + + public void setIndEncargoVenta(Boolean indEncargoVenta) { + this.indEncargoVenta = indEncargoVenta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PagamentoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PagamentoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PagamentoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PagamentoVO.java index 1101eb7e9..a55360bb8 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PagamentoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PagamentoVO.java @@ -1,151 +1,151 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import java.math.BigDecimal; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -import com.rjconsultores.ventaboletos.enums.TipoFormapago; -import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; - -@XmlRootElement(name = "pagamento") -@XmlType(propOrder = { "formapagamento", "moeda", "valor", "notacredito", "ocd", "cartao", "dadosBancarios" }) -public class PagamentoVO { - - private String formapagamento; - private String moeda; - private BigDecimal valor; - private PagamentoCartaoVO cartao; - private Long vendapacoteId; - private Integer formapagoId; - private NotaCreditoVendaPacoteVO notacredito; - private TipoFormapago tipoFormapago; - private Long cajadiversospagoId; - private OcdPacoteVO ocd; - - private List dadosBancarios; - - public String getMoeda() { - return moeda; - } - - public void setMoeda(String moeda) { - this.moeda = moeda; - } - - public String getFormapagamento() { - return formapagamento; - } - - public void setFormapagamento(String formapagamento) { - this.formapagamento = formapagamento; - } - - public PagamentoCartaoVO getCartao() { - return cartao; - } - - public void setCartao(PagamentoCartaoVO cartao) { - this.cartao = cartao; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - @XmlTransient - public Integer getFormapagoId() { - return formapagoId; - } - - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - - public NotaCreditoVendaPacoteVO getNotacredito() { - return notacredito; - } - - public void setNotacredito(NotaCreditoVendaPacoteVO notacredito) { - this.notacredito = notacredito; - } - - @XmlTransient - public TipoFormapago getTipoFormapago() { - return tipoFormapago; - } - - public void setTipoFormapago(TipoFormapago tipoFormapago) { - this.tipoFormapago = tipoFormapago; - } - - @XmlTransient - public Long getCajadiversospagoId() { - return cajadiversospagoId; - } - - public void setCajadiversospagoId(Long cajadiversospagoId) { - this.cajadiversospagoId = cajadiversospagoId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((formapagoId == null) ? 0 : formapagoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof PagamentoVO)) - return false; - PagamentoVO other = (PagamentoVO) obj; - if (formapagoId == null) { - if (other.formapagoId != null) - return false; - } else if (!formapagoId.equals(other.formapagoId)) - return false; - return true; - } - - @XmlElementWrapper - @XmlElement(name = "dadosBancario", type = DadosBancarioVO.class) - public List getDadosBancarios() { - return dadosBancarios; - } - - public void setDadosBancarios(List dadosBancarios) { - this.dadosBancarios = dadosBancarios; - } - - public OcdPacoteVO getOcd() { - return ocd; - } - - public void setOcd(OcdPacoteVO ocd) { - this.ocd = ocd; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import java.math.BigDecimal; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +import com.rjconsultores.ventaboletos.enums.TipoFormapago; +import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; + +@XmlRootElement(name = "pagamento") +@XmlType(propOrder = { "formapagamento", "moeda", "valor", "notacredito", "ocd", "cartao", "dadosBancarios" }) +public class PagamentoVO { + + private String formapagamento; + private String moeda; + private BigDecimal valor; + private PagamentoCartaoVO cartao; + private Long vendapacoteId; + private Integer formapagoId; + private NotaCreditoVendaPacoteVO notacredito; + private TipoFormapago tipoFormapago; + private Long cajadiversospagoId; + private OcdPacoteVO ocd; + + private List dadosBancarios; + + public String getMoeda() { + return moeda; + } + + public void setMoeda(String moeda) { + this.moeda = moeda; + } + + public String getFormapagamento() { + return formapagamento; + } + + public void setFormapagamento(String formapagamento) { + this.formapagamento = formapagamento; + } + + public PagamentoCartaoVO getCartao() { + return cartao; + } + + public void setCartao(PagamentoCartaoVO cartao) { + this.cartao = cartao; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + @XmlTransient + public Integer getFormapagoId() { + return formapagoId; + } + + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + + public NotaCreditoVendaPacoteVO getNotacredito() { + return notacredito; + } + + public void setNotacredito(NotaCreditoVendaPacoteVO notacredito) { + this.notacredito = notacredito; + } + + @XmlTransient + public TipoFormapago getTipoFormapago() { + return tipoFormapago; + } + + public void setTipoFormapago(TipoFormapago tipoFormapago) { + this.tipoFormapago = tipoFormapago; + } + + @XmlTransient + public Long getCajadiversospagoId() { + return cajadiversospagoId; + } + + public void setCajadiversospagoId(Long cajadiversospagoId) { + this.cajadiversospagoId = cajadiversospagoId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((formapagoId == null) ? 0 : formapagoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof PagamentoVO)) + return false; + PagamentoVO other = (PagamentoVO) obj; + if (formapagoId == null) { + if (other.formapagoId != null) + return false; + } else if (!formapagoId.equals(other.formapagoId)) + return false; + return true; + } + + @XmlElementWrapper + @XmlElement(name = "dadosBancario", type = DadosBancarioVO.class) + public List getDadosBancarios() { + return dadosBancarios; + } + + public void setDadosBancarios(List dadosBancarios) { + this.dadosBancarios = dadosBancarios; + } + + public OcdPacoteVO getOcd() { + return ocd; + } + + public void setOcd(OcdPacoteVO ocd) { + this.ocd = ocd; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PassageiroVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PassageiroVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PassageiroVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PassageiroVO.java index 08dcf5e7c..b50e3f11f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PassageiroVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/PassageiroVO.java @@ -1,67 +1,67 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name="passageiro") -@XmlType(propOrder = { "nome", "documento", "categoria", "assento", "boletoId" }) -public class PassageiroVO { - - private Long vendapacoteId; - private Long tarifavendapacoteId; - private Long boletoId; - private String assento; - private String nome; - private String documento; - private String categoria; - - public String getNome() { - return nome; - } - public void setNome(String nome) { - this.nome = nome; - } - public String getDocumento() { - return documento; - } - public void setDocumento(String documento) { - this.documento = documento; - } - public String getCategoria() { - return categoria; - } - public void setCategoria(String categoria) { - this.categoria = categoria; - } - public Long getBoletoId() { - return boletoId; - } - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - - @XmlTransient - public Long getTarifavendapacoteId() { - return tarifavendapacoteId; - } - public void setTarifavendapacoteId(Long tarifavendapacoteId) { - this.tarifavendapacoteId = tarifavendapacoteId; - } - public String getAssento() { - return assento; - } - public void setAssento(String assento) { - this.assento = assento; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name="passageiro") +@XmlType(propOrder = { "nome", "documento", "categoria", "assento", "boletoId" }) +public class PassageiroVO { + + private Long vendapacoteId; + private Long tarifavendapacoteId; + private Long boletoId; + private String assento; + private String nome; + private String documento; + private String categoria; + + public String getNome() { + return nome; + } + public void setNome(String nome) { + this.nome = nome; + } + public String getDocumento() { + return documento; + } + public void setDocumento(String documento) { + this.documento = documento; + } + public String getCategoria() { + return categoria; + } + public void setCategoria(String categoria) { + this.categoria = categoria; + } + public Long getBoletoId() { + return boletoId; + } + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + + @XmlTransient + public Long getTarifavendapacoteId() { + return tarifavendapacoteId; + } + public void setTarifavendapacoteId(Long tarifavendapacoteId) { + this.tarifavendapacoteId = tarifavendapacoteId; + } + public String getAssento() { + return assento; + } + public void setAssento(String assento) { + this.assento = assento; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ServicoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ServicoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ServicoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ServicoVO.java index 8d153da1f..6cdb32123 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ServicoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/ServicoVO.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes; - -import java.util.Date; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement -@XmlType(propOrder = {"localorigem", "origem", "destino", "dataviagem", "horario", "horarioapanhe"}) -public class ServicoVO { - - private Long vendapacoteId; - private Integer localorigem; - private Date dataviagem; - private Date horario; - private Date horarioapanhe; - private String destino; - private String origem; - - public Integer getLocalorigem() { - return localorigem; - } - - public void setLocalorigem(Integer localorigem) { - this.localorigem = localorigem; - } - - public Date getDataviagem() { - return dataviagem; - } - - public void setDataviagem(Date dataviagem) { - this.dataviagem = dataviagem; - } - - public Date getHorario() { - return horario; - } - - public void setHorario(Date horario) { - this.horario = horario; - } - - public Date getHorarioapanhe() { - return horarioapanhe; - } - - public void setHorarioapanhe(Date horarioapanhe) { - this.horarioapanhe = horarioapanhe; - } - - public String getDestino() { - return destino; - } - - public void setDestino(String destino) { - this.destino = destino; - } - - public String getOrigem() { - return origem; - } - - public void setOrigem(String origem) { - this.origem = origem; - } - - @XmlTransient - public Long getVendapacoteId() { - return vendapacoteId; - } - - public void setVendapacoteId(Long vendapacoteId) { - this.vendapacoteId = vendapacoteId; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes; + +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement +@XmlType(propOrder = {"localorigem", "origem", "destino", "dataviagem", "horario", "horarioapanhe"}) +public class ServicoVO { + + private Long vendapacoteId; + private Integer localorigem; + private Date dataviagem; + private Date horario; + private Date horarioapanhe; + private String destino; + private String origem; + + public Integer getLocalorigem() { + return localorigem; + } + + public void setLocalorigem(Integer localorigem) { + this.localorigem = localorigem; + } + + public Date getDataviagem() { + return dataviagem; + } + + public void setDataviagem(Date dataviagem) { + this.dataviagem = dataviagem; + } + + public Date getHorario() { + return horario; + } + + public void setHorario(Date horario) { + this.horario = horario; + } + + public Date getHorarioapanhe() { + return horarioapanhe; + } + + public void setHorarioapanhe(Date horarioapanhe) { + this.horarioapanhe = horarioapanhe; + } + + public String getDestino() { + return destino; + } + + public void setDestino(String destino) { + this.destino = destino; + } + + public String getOrigem() { + return origem; + } + + public void setOrigem(String origem) { + this.origem = origem; + } + + @XmlTransient + public Long getVendapacoteId() { + return vendapacoteId; + } + + public void setVendapacoteId(Long vendapacoteId) { + this.vendapacoteId = vendapacoteId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosClientePacoteResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosClientePacoteResultTransformer.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosClientePacoteResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosClientePacoteResultTransformer.java index 227c00187..1f52c2f38 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosClientePacoteResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosClientePacoteResultTransformer.java @@ -1,80 +1,80 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; - -public class DatosClientePacoteResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List transformList(List mapList) { - Map passageiros = new HashMap(); - - for (Object objmap : mapList) { - Map tupleMap = (Map) objmap; - Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); - - if(!passageiros.containsKey(vendapacoteId)){ - ClientePacoteVO clientePacote = new ClientePacoteVO(); - clientePacote.setVendapacoteId(vendapacoteId); - setDatosClientePacote(clientePacote, tupleMap); - passageiros.put(vendapacoteId, clientePacote); - } - } - - List clientesPacoteList = new ArrayList(); - clientesPacoteList.addAll(passageiros.values()); - - return clientesPacoteList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - - private void setDatosClientePacote(ClientePacoteVO clientePacote, Map tupleMap) { - StringBuilder sRazaoSocial = new StringBuilder(); - if(tupleMap.get("NOMBCLIENTE") != null) { - sRazaoSocial.append(tupleMap.get("NOMBCLIENTE")); - } - if(tupleMap.get("APELLIDOPATERNO") != null) { - if(sRazaoSocial.length() > 0) { - sRazaoSocial.append(" "); - } - sRazaoSocial.append(tupleMap.get("APELLIDOPATERNO")); - } - if(tupleMap.get("APELLIDOMATERNO") != null) { - if(sRazaoSocial.length() > 0) { - sRazaoSocial.append(" "); - } - sRazaoSocial.append(tupleMap.get("APELLIDOMATERNO")); - } - clientePacote.setRazaoSocial(sRazaoSocial.toString()); - clientePacote.setCpfCnpj((String) tupleMap.get("NUMIDENTIFICAUNO")); - clientePacote.setDescemail((String) tupleMap.get("DESCCORREO")); - clientePacote.setDesctelefone((String) tupleMap.get("DESCTELEFONE")); - clientePacote.setCep((String) tupleMap.get("CODPOSTAL")); - clientePacote.setEndereco((String) tupleMap.get("DESCCALLE")); - clientePacote.setNumero((String) tupleMap.get("NUMINTERIOR")); - clientePacote.setComplemento((String) tupleMap.get("DESCCALLECOMP")); - clientePacote.setEstado((String) tupleMap.get("DESESTADO")); - clientePacote.setCidade((String) tupleMap.get("DESCIUDAD")); - clientePacote.setBairro((String) tupleMap.get("DESCCOLONIA")); - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; + +public class DatosClientePacoteResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public List transformList(List mapList) { + Map passageiros = new HashMap(); + + for (Object objmap : mapList) { + Map tupleMap = (Map) objmap; + Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); + + if(!passageiros.containsKey(vendapacoteId)){ + ClientePacoteVO clientePacote = new ClientePacoteVO(); + clientePacote.setVendapacoteId(vendapacoteId); + setDatosClientePacote(clientePacote, tupleMap); + passageiros.put(vendapacoteId, clientePacote); + } + } + + List clientesPacoteList = new ArrayList(); + clientesPacoteList.addAll(passageiros.values()); + + return clientesPacoteList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + + private void setDatosClientePacote(ClientePacoteVO clientePacote, Map tupleMap) { + StringBuilder sRazaoSocial = new StringBuilder(); + if(tupleMap.get("NOMBCLIENTE") != null) { + sRazaoSocial.append(tupleMap.get("NOMBCLIENTE")); + } + if(tupleMap.get("APELLIDOPATERNO") != null) { + if(sRazaoSocial.length() > 0) { + sRazaoSocial.append(" "); + } + sRazaoSocial.append(tupleMap.get("APELLIDOPATERNO")); + } + if(tupleMap.get("APELLIDOMATERNO") != null) { + if(sRazaoSocial.length() > 0) { + sRazaoSocial.append(" "); + } + sRazaoSocial.append(tupleMap.get("APELLIDOMATERNO")); + } + clientePacote.setRazaoSocial(sRazaoSocial.toString()); + clientePacote.setCpfCnpj((String) tupleMap.get("NUMIDENTIFICAUNO")); + clientePacote.setDescemail((String) tupleMap.get("DESCCORREO")); + clientePacote.setDesctelefone((String) tupleMap.get("DESCTELEFONE")); + clientePacote.setCep((String) tupleMap.get("CODPOSTAL")); + clientePacote.setEndereco((String) tupleMap.get("DESCCALLE")); + clientePacote.setNumero((String) tupleMap.get("NUMINTERIOR")); + clientePacote.setComplemento((String) tupleMap.get("DESCCALLECOMP")); + clientePacote.setEstado((String) tupleMap.get("DESESTADO")); + clientePacote.setCidade((String) tupleMap.get("DESCIUDAD")); + clientePacote.setBairro((String) tupleMap.get("DESCCOLONIA")); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosDadosBancarioResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosDadosBancarioResultTransformer.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosDadosBancarioResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosDadosBancarioResultTransformer.java index 1acf64284..99d43c7ba 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosDadosBancarioResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosDadosBancarioResultTransformer.java @@ -1,46 +1,46 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; - -public class DatosDadosBancarioResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public List transformList(List mapList) { - List dadosBancarios = new ArrayList(); - for(Object objmap : mapList ) { - Map tupleMap = (Map) objmap; - DadosBancarioVO dadosBancario = new DadosBancarioVO(); - dadosBancario.setIdentificadorDeposito((String) tupleMap.get("IDENTIFICACAO_DEPOSITO")); - dadosBancario.setData((Date) tupleMap.get("FECDEPOSITO")); - dadosBancario.setValor((BigDecimal) tupleMap.get("IMPORTE")); - - dadosBancarios.add(dadosBancario); - } - - return dadosBancarios; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; + +public class DatosDadosBancarioResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public List transformList(List mapList) { + List dadosBancarios = new ArrayList(); + for(Object objmap : mapList ) { + Map tupleMap = (Map) objmap; + DadosBancarioVO dadosBancario = new DadosBancarioVO(); + dadosBancario.setIdentificadorDeposito((String) tupleMap.get("IDENTIFICACAO_DEPOSITO")); + dadosBancario.setData((Date) tupleMap.get("FECDEPOSITO")); + dadosBancario.setValor((BigDecimal) tupleMap.get("IMPORTE")); + + dadosBancarios.add(dadosBancario); + } + + return dadosBancarios; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEmpresaResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEmpresaResultTransformer.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEmpresaResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEmpresaResultTransformer.java index 40ae1ca18..120b00e06 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEmpresaResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEmpresaResultTransformer.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.entidad.Empresa; - -public class DatosEmpresaResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List transformList(List mapList) { - Map empresas = new HashMap(); - - for(Object objmap : mapList ){ - - Map tupleMap = (Map) objmap; - Integer empresaId = (Integer) tupleMap.get("EMPRESA_ID"); - - if(!empresas.containsKey(empresaId)){ - Empresa empresa = new Empresa(); - empresa.setEmpresaId(empresaId); - empresa.setNombempresa((String) tupleMap.get("NOMBEMPRESA")); - empresa.setActivo((Boolean) tupleMap.get("ACTIVO")); - empresas.put(empresaId, empresa); - } - } - - List empresaList = new ArrayList(); - empresaList.addAll(empresas.values()); - - return empresaList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.entidad.Empresa; + +public class DatosEmpresaResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public List transformList(List mapList) { + Map empresas = new HashMap(); + + for(Object objmap : mapList ){ + + Map tupleMap = (Map) objmap; + Integer empresaId = (Integer) tupleMap.get("EMPRESA_ID"); + + if(!empresas.containsKey(empresaId)){ + Empresa empresa = new Empresa(); + empresa.setEmpresaId(empresaId); + empresa.setNombempresa((String) tupleMap.get("NOMBEMPRESA")); + empresa.setActivo((Boolean) tupleMap.get("ACTIVO")); + empresas.put(empresaId, empresa); + } + } + + List empresaList = new ArrayList(); + empresaList.addAll(empresas.values()); + + return empresaList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEnderecoApanheResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEnderecoApanheResultTransformer.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEnderecoApanheResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEnderecoApanheResultTransformer.java index 13ca852b5..d22d3ebfd 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEnderecoApanheResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosEnderecoApanheResultTransformer.java @@ -1,65 +1,65 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.EnderecoApanheVO; - -public class DatosEnderecoApanheResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List transformList(List mapList) { - Map passageiros = new HashMap(); - - for (Object objmap : mapList) { - Map tupleMap = (Map) objmap; - Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); - - if(!passageiros.containsKey(vendapacoteId)){ - EnderecoApanheVO enderecoApanhe = new EnderecoApanheVO(); - enderecoApanhe.setVendapacoteId(vendapacoteId); - setDatosEnderecoApanhe(enderecoApanhe, tupleMap); - passageiros.put(vendapacoteId, enderecoApanhe); - } - } - - List enderecosApanheList = new ArrayList(); - enderecosApanheList.addAll(passageiros.values()); - - return enderecosApanheList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - - private void setDatosEnderecoApanhe(EnderecoApanheVO enderecoApanhe, Map tupleMap) { - LocalEnderecoApanhe localEnderecoApanhe = LocalEnderecoApanhe.getLocalEnderecoApanhe((Integer) tupleMap.get("LOCAL")); - enderecoApanhe.setLocal(localEnderecoApanhe.toString()); - enderecoApanhe.setDeschotel((String) tupleMap.get("DESCHOTEL")); - enderecoApanhe.setCep((String) tupleMap.get("CEP")); - enderecoApanhe.setEndereco((String) tupleMap.get("ENDERECO")); - enderecoApanhe.setNumero((String) tupleMap.get("NUMERO")); - enderecoApanhe.setComplemento((String) tupleMap.get("COMPLEMENTO")); - enderecoApanhe.setCidade((String) tupleMap.get("CIDADE")); - enderecoApanhe.setBairro((String) tupleMap.get("BAIRRO")); - enderecoApanhe.setReferencia((String) tupleMap.get("REFERENCIA")); - - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.EnderecoApanheVO; + +public class DatosEnderecoApanheResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public List transformList(List mapList) { + Map passageiros = new HashMap(); + + for (Object objmap : mapList) { + Map tupleMap = (Map) objmap; + Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); + + if(!passageiros.containsKey(vendapacoteId)){ + EnderecoApanheVO enderecoApanhe = new EnderecoApanheVO(); + enderecoApanhe.setVendapacoteId(vendapacoteId); + setDatosEnderecoApanhe(enderecoApanhe, tupleMap); + passageiros.put(vendapacoteId, enderecoApanhe); + } + } + + List enderecosApanheList = new ArrayList(); + enderecosApanheList.addAll(passageiros.values()); + + return enderecosApanheList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + + private void setDatosEnderecoApanhe(EnderecoApanheVO enderecoApanhe, Map tupleMap) { + LocalEnderecoApanhe localEnderecoApanhe = LocalEnderecoApanhe.getLocalEnderecoApanhe((Integer) tupleMap.get("LOCAL")); + enderecoApanhe.setLocal(localEnderecoApanhe.toString()); + enderecoApanhe.setDeschotel((String) tupleMap.get("DESCHOTEL")); + enderecoApanhe.setCep((String) tupleMap.get("CEP")); + enderecoApanhe.setEndereco((String) tupleMap.get("ENDERECO")); + enderecoApanhe.setNumero((String) tupleMap.get("NUMERO")); + enderecoApanhe.setComplemento((String) tupleMap.get("COMPLEMENTO")); + enderecoApanhe.setCidade((String) tupleMap.get("CIDADE")); + enderecoApanhe.setBairro((String) tupleMap.get("BAIRRO")); + enderecoApanhe.setReferencia((String) tupleMap.get("REFERENCIA")); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosItemAdicionalResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosItemAdicionalResultTransformer.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosItemAdicionalResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosItemAdicionalResultTransformer.java index 02aeca015..8059188e9 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosItemAdicionalResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosItemAdicionalResultTransformer.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ItemAdicionalVO; - -public class DatosItemAdicionalResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List transformList(List mapList) { - Map itens = new HashMap(); - - for (Object objmap : mapList) { - Map tupleMap = (Map) objmap; - Long itemadicionalId = (Long) tupleMap.get("ITEMADICIONAL_ID"); - - if(!itens.containsKey(itemadicionalId)){ - ItemAdicionalVO itemAdicional = new ItemAdicionalVO(); - itemAdicional.setItemadicionalId(itemadicionalId); - setDatosItemAdicional(itemAdicional, tupleMap); - itens.put(itemadicionalId+""+itemAdicional.getVendapacoteId(), itemAdicional); - } - } - - List itemAdicionalList = new ArrayList(); - itemAdicionalList.addAll(itens.values()); - - return itemAdicionalList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - - private void setDatosItemAdicional(ItemAdicionalVO itemAdicional, Map tupleMap) { - itemAdicional.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); - itemAdicional.setDescitemadicional((String) tupleMap.get("DESCITEMADICIONAL")); - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ItemAdicionalVO; + +public class DatosItemAdicionalResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public List transformList(List mapList) { + Map itens = new HashMap(); + + for (Object objmap : mapList) { + Map tupleMap = (Map) objmap; + Long itemadicionalId = (Long) tupleMap.get("ITEMADICIONAL_ID"); + + if(!itens.containsKey(itemadicionalId)){ + ItemAdicionalVO itemAdicional = new ItemAdicionalVO(); + itemAdicional.setItemadicionalId(itemadicionalId); + setDatosItemAdicional(itemAdicional, tupleMap); + itens.put(itemadicionalId+""+itemAdicional.getVendapacoteId(), itemAdicional); + } + } + + List itemAdicionalList = new ArrayList(); + itemAdicionalList.addAll(itens.values()); + + return itemAdicionalList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + + private void setDatosItemAdicional(ItemAdicionalVO itemAdicional, Map tupleMap) { + itemAdicional.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); + itemAdicional.setDescitemadicional((String) tupleMap.get("DESCITEMADICIONAL")); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPagamentoResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPagamentoResultTransformer.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPagamentoResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPagamentoResultTransformer.java index 65f587a92..a1cda2a47 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPagamentoResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPagamentoResultTransformer.java @@ -1,121 +1,121 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.enums.TipoFormapago; -import com.rjconsultores.ventaboletos.utilerias.OcdUtil; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.OcdPacoteVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PagamentoVO; -import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; - -public class DatosPagamentoResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public List transformList(List mapList) { - Map pacotes = new HashMap(); - - for(Object objmap : mapList ) { - - Map tupleMap = (Map) objmap; - Long cajadiversospagoId = (Long) tupleMap.get("CAJADIVERSOSPAGO_ID"); - - if(!pacotes.containsKey(cajadiversospagoId)){ - PagamentoVO pagamento = new PagamentoVO(); - setDatosPacote(pagamento, tupleMap); - if(pagamento.getValor().signum() >= 0) { - pacotes.put(cajadiversospagoId, pagamento); - } - } - } - - List pacotesList = new ArrayList(); - pacotesList.addAll(pacotes.values()); - Collections.sort(pacotesList, new Comparator() { - @Override - public int compare(PagamentoVO o1, PagamentoVO o2) { - return o1.getVendapacoteId().compareTo(o2.getVendapacoteId()); - } - }); - - return pacotesList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - - private void setDatosPacote(PagamentoVO pagamento, Map tupleMap) { - pagamento.setMoeda("R$"); - pagamento.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); - pagamento.setFormapagoId((Integer) tupleMap.get("FORMAPAGO_ID")); - pagamento.setFormapagamento((String) tupleMap.get("DESCPAGO")); - pagamento.setValor((BigDecimal) tupleMap.get("VALOR")); - - Integer tipoPago = (Integer) tupleMap.get("TIPO_PAGO"); - pagamento.setTipoFormapago(TipoFormapago.getTipoFormapagoByValor(tipoPago)); - - if(isVentaCartaoCredito(pagamento.getTipoFormapago()) || isVentaCartaoDebito(pagamento.getTipoFormapago())) { - PagamentoCartaoVO cartao = new PagamentoCartaoVO(); - cartao.setBandeira((String) tupleMap.get("TIPOTARJETA")); - cartao.setNumautorizacao((String) tupleMap.get("NUMAUTORIZACION")); - cartao.setParcelas((Integer) tupleMap.get("CANTPARCELAS")); - cartao.setTitular((String) tupleMap.get("NOMBTITULAR")); - cartao.setDatapagamento((Date) tupleMap.get("FECOPERACION")); - cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); - cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); - cartao.setOperadoracartao((String) tupleMap.get("DESCOPERADORACARTAO")); - - pagamento.setCartao(cartao); - } - - if(isVentaNotaCredito(pagamento.getTipoFormapago())) { - if(tupleMap.get("NOTACREDITOVENDAPACOTE_ID") != null) { - NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); - notacredito.setVouchernotacredito(((Long) tupleMap.get("NOTACREDITOVENDAPACOTE_ID")).toString()); - notacredito.setNumoperacaopacotecancelamento((String) tupleMap.get("NUMOPERACAOPACOTECANCELAMENTO")); - pagamento.setNotacredito(notacredito); - } - - if(tupleMap.get("OCD_ID") != null) { - String voucherocd = OcdUtil.generaLocalizadorOCD((String) tupleMap.get("NUMOPERACION_OCD"), (Long) tupleMap.get("OCD_ID")); - OcdPacoteVO ocdPacote = new OcdPacoteVO(); - ocdPacote.setVoucherocd(voucherocd); - pagamento.setOcd(ocdPacote); - } - } - - } - - private boolean isVentaCartaoCredito(TipoFormapago tipoFormapago) { - return TipoFormapago.CREDITO.equals(tipoFormapago); - } - - private boolean isVentaCartaoDebito(TipoFormapago tipoFormapago) { - return TipoFormapago.DEBITO.equals(tipoFormapago); - } - - private boolean isVentaNotaCredito(TipoFormapago tipoFormapago) { - return TipoFormapago.NOTA_CREDITO.equals(tipoFormapago); - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.enums.TipoFormapago; +import com.rjconsultores.ventaboletos.utilerias.OcdUtil; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.OcdPacoteVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PagamentoVO; +import com.rjconsultores.ventaboletos.vo.caja.PagamentoCartaoVO; + +public class DatosPagamentoResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public List transformList(List mapList) { + Map pacotes = new HashMap(); + + for(Object objmap : mapList ) { + + Map tupleMap = (Map) objmap; + Long cajadiversospagoId = (Long) tupleMap.get("CAJADIVERSOSPAGO_ID"); + + if(!pacotes.containsKey(cajadiversospagoId)){ + PagamentoVO pagamento = new PagamentoVO(); + setDatosPacote(pagamento, tupleMap); + if(pagamento.getValor().signum() >= 0) { + pacotes.put(cajadiversospagoId, pagamento); + } + } + } + + List pacotesList = new ArrayList(); + pacotesList.addAll(pacotes.values()); + Collections.sort(pacotesList, new Comparator() { + @Override + public int compare(PagamentoVO o1, PagamentoVO o2) { + return o1.getVendapacoteId().compareTo(o2.getVendapacoteId()); + } + }); + + return pacotesList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + + private void setDatosPacote(PagamentoVO pagamento, Map tupleMap) { + pagamento.setMoeda("R$"); + pagamento.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); + pagamento.setFormapagoId((Integer) tupleMap.get("FORMAPAGO_ID")); + pagamento.setFormapagamento((String) tupleMap.get("DESCPAGO")); + pagamento.setValor((BigDecimal) tupleMap.get("VALOR")); + + Integer tipoPago = (Integer) tupleMap.get("TIPO_PAGO"); + pagamento.setTipoFormapago(TipoFormapago.getTipoFormapagoByValor(tipoPago)); + + if(isVentaCartaoCredito(pagamento.getTipoFormapago()) || isVentaCartaoDebito(pagamento.getTipoFormapago())) { + PagamentoCartaoVO cartao = new PagamentoCartaoVO(); + cartao.setBandeira((String) tupleMap.get("TIPOTARJETA")); + cartao.setNumautorizacao((String) tupleMap.get("NUMAUTORIZACION")); + cartao.setParcelas((Integer) tupleMap.get("CANTPARCELAS")); + cartao.setTitular((String) tupleMap.get("NOMBTITULAR")); + cartao.setDatapagamento((Date) tupleMap.get("FECOPERACION")); + cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); + cartao.setNumcartao((String) tupleMap.get("NUMTARJETA")); + cartao.setOperadoracartao((String) tupleMap.get("DESCOPERADORACARTAO")); + + pagamento.setCartao(cartao); + } + + if(isVentaNotaCredito(pagamento.getTipoFormapago())) { + if(tupleMap.get("NOTACREDITOVENDAPACOTE_ID") != null) { + NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); + notacredito.setVouchernotacredito(((Long) tupleMap.get("NOTACREDITOVENDAPACOTE_ID")).toString()); + notacredito.setNumoperacaopacotecancelamento((String) tupleMap.get("NUMOPERACAOPACOTECANCELAMENTO")); + pagamento.setNotacredito(notacredito); + } + + if(tupleMap.get("OCD_ID") != null) { + String voucherocd = OcdUtil.generaLocalizadorOCD((String) tupleMap.get("NUMOPERACION_OCD"), (Long) tupleMap.get("OCD_ID")); + OcdPacoteVO ocdPacote = new OcdPacoteVO(); + ocdPacote.setVoucherocd(voucherocd); + pagamento.setOcd(ocdPacote); + } + } + + } + + private boolean isVentaCartaoCredito(TipoFormapago tipoFormapago) { + return TipoFormapago.CREDITO.equals(tipoFormapago); + } + + private boolean isVentaCartaoDebito(TipoFormapago tipoFormapago) { + return TipoFormapago.DEBITO.equals(tipoFormapago); + } + + private boolean isVentaNotaCredito(TipoFormapago tipoFormapago) { + return TipoFormapago.NOTA_CREDITO.equals(tipoFormapago); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPassageiroResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPassageiroResultTransformer.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPassageiroResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPassageiroResultTransformer.java index 4a6afdb2e..ac8abcbb3 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPassageiroResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPassageiroResultTransformer.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PassageiroVO; - -public class DatosPassageiroResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List transformList(List mapList) { - Map passageiros = new HashMap(); - - for (Object objmap : mapList) { - - Map tupleMap = (Map) objmap; - Long tarifavendapacoteId = (Long) tupleMap.get("TARIFAVENDAPACOTE_ID"); - - if(!passageiros.containsKey(tarifavendapacoteId)){ - PassageiroVO passageiro = new PassageiroVO(); - passageiro.setTarifavendapacoteId(tarifavendapacoteId); - setDatosPassageiro(passageiro, tupleMap); - passageiros.put(tarifavendapacoteId, passageiro); - } - } - - List passageirosList = new ArrayList(); - passageirosList.addAll(passageiros.values()); - - return passageirosList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - - private void setDatosPassageiro(PassageiroVO passageiro, Map tupleMap){ - - passageiro.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); - passageiro.setDocumento((String) tupleMap.get("DOCUMENTO")); - passageiro.setNome((String) tupleMap.get("NOMEPASSAGEIRO")); - passageiro.setBoletoId((Long) tupleMap.get("BOLETO_ID")); - passageiro.setAssento((String) tupleMap.get("NUMASIENTO")); - passageiro.setCategoria((String) tupleMap.get("CVECATEGORIA")); - - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PassageiroVO; + +public class DatosPassageiroResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public List transformList(List mapList) { + Map passageiros = new HashMap(); + + for (Object objmap : mapList) { + + Map tupleMap = (Map) objmap; + Long tarifavendapacoteId = (Long) tupleMap.get("TARIFAVENDAPACOTE_ID"); + + if(!passageiros.containsKey(tarifavendapacoteId)){ + PassageiroVO passageiro = new PassageiroVO(); + passageiro.setTarifavendapacoteId(tarifavendapacoteId); + setDatosPassageiro(passageiro, tupleMap); + passageiros.put(tarifavendapacoteId, passageiro); + } + } + + List passageirosList = new ArrayList(); + passageirosList.addAll(passageiros.values()); + + return passageirosList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + + private void setDatosPassageiro(PassageiroVO passageiro, Map tupleMap){ + + passageiro.setVendapacoteId((Long) tupleMap.get("VENDAPACOTE_ID")); + passageiro.setDocumento((String) tupleMap.get("DOCUMENTO")); + passageiro.setNome((String) tupleMap.get("NOMEPASSAGEIRO")); + passageiro.setBoletoId((Long) tupleMap.get("BOLETO_ID")); + passageiro.setAssento((String) tupleMap.get("NUMASIENTO")); + passageiro.setCategoria((String) tupleMap.get("CVECATEGORIA")); + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPuntoVentaResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPuntoVentaResultTransformer.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPuntoVentaResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPuntoVentaResultTransformer.java index 49f543c39..be4e51c29 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPuntoVentaResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosPuntoVentaResultTransformer.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; - -public class DatosPuntoVentaResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public List transformList(List mapList) { - Map puntoventas = new HashMap(); - - for(Object objmap : mapList ){ - - Map tupleMap = (Map) objmap; - Integer puntoventaId = (Integer) tupleMap.get("PUNTOVENTA_ID"); - - if(!puntoventas.containsKey(puntoventaId)){ - PuntoVenta puntoventa = new PuntoVenta(); - puntoventa.setPuntoventaId(puntoventaId); - puntoventa.setNombpuntoventa((String) tupleMap.get("NOMBPUNTOVENTA")); - puntoventa.setActivo((Boolean) tupleMap.get("ACTIVO")); - puntoventas.put(puntoventaId, puntoventa); - } - } - - List puntoventaList = new ArrayList(); - puntoventaList.addAll(puntoventas.values()); - - return puntoventaList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; + +public class DatosPuntoVentaResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public List transformList(List mapList) { + Map puntoventas = new HashMap(); + + for(Object objmap : mapList ){ + + Map tupleMap = (Map) objmap; + Integer puntoventaId = (Integer) tupleMap.get("PUNTOVENTA_ID"); + + if(!puntoventas.containsKey(puntoventaId)){ + PuntoVenta puntoventa = new PuntoVenta(); + puntoventa.setPuntoventaId(puntoventaId); + puntoventa.setNombpuntoventa((String) tupleMap.get("NOMBPUNTOVENTA")); + puntoventa.setActivo((Boolean) tupleMap.get("ACTIVO")); + puntoventas.put(puntoventaId, puntoventa); + } + } + + List puntoventaList = new ArrayList(); + puntoventaList.addAll(puntoventas.values()); + + return puntoventaList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosServicoResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosServicoResultTransformer.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosServicoResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosServicoResultTransformer.java index 5646196ac..f00e9c8ba 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosServicoResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosServicoResultTransformer.java @@ -1,60 +1,60 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ServicoVO; - -public class DatosServicoResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public List transformList(List mapList) { - Map servicos = new HashMap(); - - for (Object objmap : mapList) { - - Map tupleMap = (Map) objmap; - Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); - - if(!servicos.containsKey(vendapacoteId)){ - ServicoVO servico = new ServicoVO(); - servico.setVendapacoteId(vendapacoteId); - setDatosServico(servico, tupleMap); - servicos.put(vendapacoteId, servico); - } - } - - List servicosList = new ArrayList(); - servicosList.addAll(servicos.values()); - - return servicosList; - } - - private void setDatosServico(ServicoVO servico, Map tupleMap) { - servico.setDataviagem((Date) tupleMap.get("FECHORVIAJE")); - servico.setHorario((Date) tupleMap.get("FECHORVIAJE")); - servico.setLocalorigem((Integer) tupleMap.get("ORIGEN_ID")); - servico.setOrigem((String) tupleMap.get("ORIGEM")); - servico.setDestino((String) tupleMap.get("DESTINO")); - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ServicoVO; + +public class DatosServicoResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public List transformList(List mapList) { + Map servicos = new HashMap(); + + for (Object objmap : mapList) { + + Map tupleMap = (Map) objmap; + Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); + + if(!servicos.containsKey(vendapacoteId)){ + ServicoVO servico = new ServicoVO(); + servico.setVendapacoteId(vendapacoteId); + setDatosServico(servico, tupleMap); + servicos.put(vendapacoteId, servico); + } + } + + List servicosList = new ArrayList(); + servicosList.addAll(servicos.values()); + + return servicosList; + } + + private void setDatosServico(ServicoVO servico, Map tupleMap) { + servico.setDataviagem((Date) tupleMap.get("FECHORVIAJE")); + servico.setHorario((Date) tupleMap.get("FECHORVIAJE")); + servico.setLocalorigem((Integer) tupleMap.get("ORIGEN_ID")); + servico.setOrigem((String) tupleMap.get("ORIGEM")); + servico.setDestino((String) tupleMap.get("DESTINO")); + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosTicketResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosTicketResultTransformer.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosTicketResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosTicketResultTransformer.java index dcc255b78..df80f5b95 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosTicketResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/DatosTicketResultTransformer.java @@ -1,97 +1,97 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; - -public class DatosTicketResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public List transformList(List mapList) { - - Map pacotes = new HashMap(); - - for(Object objmap : mapList ){ - - Map tupleMap = (Map) objmap; - Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); - - if(!pacotes.containsKey(vendapacoteId)){ - PacoteVO pacote = new PacoteVO(); - pacote.setVendapacoteId(vendapacoteId); - setDatosPacote(pacote, tupleMap); - pacotes.put(vendapacoteId, pacote); - } - } - - List pacotesList = new ArrayList(); - pacotesList.addAll(pacotes.values()); - - return pacotesList; - } - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - - Map row = new HashMap(); - - for(int index = 0; index < aliases.length; index++){ - row.put(aliases[index], data[index]); - } - - return row; - } - - private void setDatosPacote(PacoteVO pacote, Map tupleMap){ - pacote.setNumoperacao((String) tupleMap.get("NUMOPERACION")); - pacote.setUsuariovenda((Integer) tupleMap.get("USUARIO_ID")); - pacote.setDatavenda((Date) tupleMap.get("DATAVENDA")); - pacote.setDatapacote((Date) tupleMap.get("DATAPACOTE")); - - if(tupleMap.get("SITUACAO") != null) { - SituacaoVendaPacote situacaoVendaPacote = SituacaoVendaPacote.getSituacaoVendaPacote((Integer) tupleMap.get("SITUACAO")); - if(situacaoVendaPacote != null) { - pacote.setStatus(situacaoVendaPacote.toString()); - } - } - - pacote.setPacoteId((Long) tupleMap.get("PACOTE_ID")); - pacote.setDescpacote((String) tupleMap.get("DESCPACOTE")); - pacote.setNompacote((String) tupleMap.get("NOMPACOTE")); - pacote.setPontoVenda((String) tupleMap.get("NOMBPUNTOVENTA")); - pacote.setEmpresa((String) tupleMap.get("NOMBEMPRESA")); - pacote.setQuantidade((Integer) tupleMap.get("QTDEPASSAGEIRO")); - pacote.setTotalTarifa((BigDecimal) tupleMap.get("TOTALTARIFA")); - pacote.setTotalTaxaEmbarque((BigDecimal) tupleMap.get("TOTALTAXAEMBARQUE")); - pacote.setTotalPedagio((BigDecimal) tupleMap.get("TOTALPEDAGIO")); - pacote.setTotalOutros((BigDecimal) tupleMap.get("TOTALOUTROS")); - pacote.setTotalSeguro((BigDecimal) tupleMap.get("TOTALSEGURO")); - pacote.setValorsubtotal((BigDecimal) tupleMap.get("SUBTOTAL")); - pacote.setValortotal((BigDecimal) tupleMap.get("TOTAL")); - pacote.setValordesconto((BigDecimal) tupleMap.get("DESCONTO")); - pacote.setQtdePacoteFormaspago((Integer) tupleMap.get("QTDEPACOTEFORMAPAGO")); - pacote.setDataalteracao((Date) tupleMap.get("FECMODIF")); - pacote.setDatacancelamento((Date) tupleMap.get("DATACANCELAMENTO")); - pacote.setEmpresaId((Integer) tupleMap.get("EMPRESA_ID")); - pacote.setIndEncargoVenta((Boolean) tupleMap.get("INDENCARGOVENTA")); - - if(StringUtils.isNotBlank(pacote.getDescpacote())){ - pacote.setDescpacote(StringEscapeUtils.unescapeHtml(pacote.getDescpacote().replaceAll(" ", " ").replaceAll("\\<.*?\\>", " ")).replaceAll("\\s+", " ")); - } - - } - -} +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; + +public class DatosTicketResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public List transformList(List mapList) { + + Map pacotes = new HashMap(); + + for(Object objmap : mapList ){ + + Map tupleMap = (Map) objmap; + Long vendapacoteId = (Long) tupleMap.get("VENDAPACOTE_ID"); + + if(!pacotes.containsKey(vendapacoteId)){ + PacoteVO pacote = new PacoteVO(); + pacote.setVendapacoteId(vendapacoteId); + setDatosPacote(pacote, tupleMap); + pacotes.put(vendapacoteId, pacote); + } + } + + List pacotesList = new ArrayList(); + pacotesList.addAll(pacotes.values()); + + return pacotesList; + } + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + + Map row = new HashMap(); + + for(int index = 0; index < aliases.length; index++){ + row.put(aliases[index], data[index]); + } + + return row; + } + + private void setDatosPacote(PacoteVO pacote, Map tupleMap){ + pacote.setNumoperacao((String) tupleMap.get("NUMOPERACION")); + pacote.setUsuariovenda((Integer) tupleMap.get("USUARIO_ID")); + pacote.setDatavenda((Date) tupleMap.get("DATAVENDA")); + pacote.setDatapacote((Date) tupleMap.get("DATAPACOTE")); + + if(tupleMap.get("SITUACAO") != null) { + SituacaoVendaPacote situacaoVendaPacote = SituacaoVendaPacote.getSituacaoVendaPacote((Integer) tupleMap.get("SITUACAO")); + if(situacaoVendaPacote != null) { + pacote.setStatus(situacaoVendaPacote.toString()); + } + } + + pacote.setPacoteId((Long) tupleMap.get("PACOTE_ID")); + pacote.setDescpacote((String) tupleMap.get("DESCPACOTE")); + pacote.setNompacote((String) tupleMap.get("NOMPACOTE")); + pacote.setPontoVenda((String) tupleMap.get("NOMBPUNTOVENTA")); + pacote.setEmpresa((String) tupleMap.get("NOMBEMPRESA")); + pacote.setQuantidade((Integer) tupleMap.get("QTDEPASSAGEIRO")); + pacote.setTotalTarifa((BigDecimal) tupleMap.get("TOTALTARIFA")); + pacote.setTotalTaxaEmbarque((BigDecimal) tupleMap.get("TOTALTAXAEMBARQUE")); + pacote.setTotalPedagio((BigDecimal) tupleMap.get("TOTALPEDAGIO")); + pacote.setTotalOutros((BigDecimal) tupleMap.get("TOTALOUTROS")); + pacote.setTotalSeguro((BigDecimal) tupleMap.get("TOTALSEGURO")); + pacote.setValorsubtotal((BigDecimal) tupleMap.get("SUBTOTAL")); + pacote.setValortotal((BigDecimal) tupleMap.get("TOTAL")); + pacote.setValordesconto((BigDecimal) tupleMap.get("DESCONTO")); + pacote.setQtdePacoteFormaspago((Integer) tupleMap.get("QTDEPACOTEFORMAPAGO")); + pacote.setDataalteracao((Date) tupleMap.get("FECMODIF")); + pacote.setDatacancelamento((Date) tupleMap.get("DATACANCELAMENTO")); + pacote.setEmpresaId((Integer) tupleMap.get("EMPRESA_ID")); + pacote.setIndEncargoVenta((Boolean) tupleMap.get("INDENCARGOVENTA")); + + if(StringUtils.isNotBlank(pacote.getDescpacote())){ + pacote.setDescpacote(StringEscapeUtils.unescapeHtml(pacote.getDescpacote().replaceAll(" ", " ").replaceAll("\\<.*?\\>", " ")).replaceAll("\\s+", " ")); + } + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/RelatorioVendaCartaoCashMonitorResultTransformer.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/RelatorioVendaCartaoCashMonitorResultTransformer.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/RelatorioVendaCartaoCashMonitorResultTransformer.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/RelatorioVendaCartaoCashMonitorResultTransformer.java index 47331b627..3be5822e6 100644 --- a/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/RelatorioVendaCartaoCashMonitorResultTransformer.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/busquedapacotes/transformer/RelatorioVendaCartaoCashMonitorResultTransformer.java @@ -1,53 +1,53 @@ -package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hibernate.transform.ResultTransformer; - -import com.rjconsultores.ventaboletos.vo.cashmonitor.RelatorioVendaCartaoCashMonitorVO; - -public class RelatorioVendaCartaoCashMonitorResultTransformer implements ResultTransformer { - - private static final long serialVersionUID = 1L; - - @Override - public Object transformTuple(Object[] data, String[] aliases) { - Map row = new HashMap(); - - for (int index = 0; index < aliases.length; index++) { - row.put(aliases[index], data[index]); - } - - return row; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public List transformList(List mapList) { - List listaVO = new ArrayList(); - - for (Object object : mapList) { - Map tupleMap = (Map) object; - RelatorioVendaCartaoCashMonitorVO vo = new RelatorioVendaCartaoCashMonitorVO(); - vo.setDataTransacao((String) tupleMap.get("data_transacao")); - vo.setLoja((String) tupleMap.get("loja")); - vo.setAdquirente((String) tupleMap.get("adquirente")); - vo.setNsu((String) tupleMap.get("nsu")); - vo.setAutorizacao((String) tupleMap.get("autorizacao")); - vo.setValorBruto((BigDecimal) tupleMap.get("valor_bruto")); - vo.setFormapago_id((Integer) tupleMap.get("formapago_id")); - vo.setBandeira((String) tupleMap.get("bandeira")); - vo.setCodigoPedido((String) tupleMap.get("codigo_pedido")); - vo.setValorParcela((BigDecimal) tupleMap.get("valor_parcela")); - vo.setParcelas((Integer) tupleMap.get("parcelas")); - - listaVO.add(vo); - } - - return listaVO; - } +package com.rjconsultores.ventaboletos.vo.busquedapacotes.transformer; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.transform.ResultTransformer; + +import com.rjconsultores.ventaboletos.vo.cashmonitor.RelatorioVendaCartaoCashMonitorVO; + +public class RelatorioVendaCartaoCashMonitorResultTransformer implements ResultTransformer { + + private static final long serialVersionUID = 1L; + + @Override + public Object transformTuple(Object[] data, String[] aliases) { + Map row = new HashMap(); + + for (int index = 0; index < aliases.length; index++) { + row.put(aliases[index], data[index]); + } + + return row; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public List transformList(List mapList) { + List listaVO = new ArrayList(); + + for (Object object : mapList) { + Map tupleMap = (Map) object; + RelatorioVendaCartaoCashMonitorVO vo = new RelatorioVendaCartaoCashMonitorVO(); + vo.setDataTransacao((String) tupleMap.get("data_transacao")); + vo.setLoja((String) tupleMap.get("loja")); + vo.setAdquirente((String) tupleMap.get("adquirente")); + vo.setNsu((String) tupleMap.get("nsu")); + vo.setAutorizacao((String) tupleMap.get("autorizacao")); + vo.setValorBruto((BigDecimal) tupleMap.get("valor_bruto")); + vo.setFormapago_id((Integer) tupleMap.get("formapago_id")); + vo.setBandeira((String) tupleMap.get("bandeira")); + vo.setCodigoPedido((String) tupleMap.get("codigo_pedido")); + vo.setValorParcela((BigDecimal) tupleMap.get("valor_parcela")); + vo.setParcelas((Integer) tupleMap.get("parcelas")); + + listaVO.add(vo); + } + + return listaVO; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java index 5a7e4933a..36c52487a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java @@ -1,174 +1,174 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class CajaCerradoVO { - - private Long cajaId; - private String numFolioSistema; - private String origen; - private String destino; - private Integer corridaId; - private BigDecimal precioPagado; - private Date fecHorVenta; - private BigDecimal importeTaxaEmbarque; - private String ruta; - private String numAutorizacion; - private String ordenSevicio; - private String secretaria; - private String cvesecretaria; - private String emissorTarjeta; - private String tipoPasaje; - private String formaPago; - - public CajaCerradoVO() { - this.cajaId = new Long(-1); - this.numFolioSistema = ""; - this.origen = ""; - this.destino = ""; - this.corridaId = new Integer(-1); - this.precioPagado = new BigDecimal(0); - this.fecHorVenta = new Date(); - this.importeTaxaEmbarque = new BigDecimal(0); - this.ruta = ""; - this.numAutorizacion = ""; - this.ordenSevicio = ""; - this.secretaria = ""; - this.cvesecretaria = ""; - this.emissorTarjeta = ""; - this.tipoPasaje = ""; - this.formaPago = ""; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public String getNumFolioSistema() { - return numFolioSistema; - } - - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - - public String getOrigen() { - return origen; - } - - public void setOrigen(String origen) { - this.origen = origen; - } - - public String getDestino() { - return destino; - } - - public void setDestino(String destino) { - this.destino = destino; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public BigDecimal getPrecioPagado() { - return precioPagado; - } - - public void setPrecioPagado(BigDecimal precioPagado) { - this.precioPagado = precioPagado; - } - - public Date getFecHorVenta() { - return fecHorVenta; - } - - public void setFecHorVenta(Date fecHorVenta) { - this.fecHorVenta = fecHorVenta; - } - - public BigDecimal getImporteTaxaEmbarque() { - return importeTaxaEmbarque; - } - - public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { - this.importeTaxaEmbarque = importeTaxaEmbarque; - } - - public String getRuta() { - return ruta; - } - - public void setRuta(String ruta) { - this.ruta = ruta; - } - - public String getNumAutorizacion() { - return numAutorizacion; - } - - public void setNumAutorizacion(String numAutorizacion) { - this.numAutorizacion = numAutorizacion; - } - - public String getOrdenSevicio() { - return ordenSevicio; - } - - public void setOrdenSevicio(String ordenSevicio) { - this.ordenSevicio = ordenSevicio; - } - - public String getCodigoSecretaria() { - return secretaria; - } - - public void setCodigoSecretaria(String secretaria) { - this.secretaria = secretaria; - } - - public String getCvesecretaria() { - return cvesecretaria; - } - - public void setCvesecretaria(String cvesecretaria) { - this.cvesecretaria = cvesecretaria; - } - - public String getEmissorTarjeta() { - return emissorTarjeta; - } - - public void setEmissorTarjeta(String emissorTarjeta) { - this.emissorTarjeta = emissorTarjeta; - } - - public String getTipoPasaje() { - return tipoPasaje; - } - - public void setTipoPasaje(String tipoPasaje) { - this.tipoPasaje = tipoPasaje; - } - - public String getFormaPago() { - return formaPago; - } - - public void setFormaPago(String formaPago) { - this.formaPago = formaPago; - } -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class CajaCerradoVO { + + private Long cajaId; + private String numFolioSistema; + private String origen; + private String destino; + private Integer corridaId; + private BigDecimal precioPagado; + private Date fecHorVenta; + private BigDecimal importeTaxaEmbarque; + private String ruta; + private String numAutorizacion; + private String ordenSevicio; + private String secretaria; + private String cvesecretaria; + private String emissorTarjeta; + private String tipoPasaje; + private String formaPago; + + public CajaCerradoVO() { + this.cajaId = new Long(-1); + this.numFolioSistema = ""; + this.origen = ""; + this.destino = ""; + this.corridaId = new Integer(-1); + this.precioPagado = new BigDecimal(0); + this.fecHorVenta = new Date(); + this.importeTaxaEmbarque = new BigDecimal(0); + this.ruta = ""; + this.numAutorizacion = ""; + this.ordenSevicio = ""; + this.secretaria = ""; + this.cvesecretaria = ""; + this.emissorTarjeta = ""; + this.tipoPasaje = ""; + this.formaPago = ""; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public String getNumFolioSistema() { + return numFolioSistema; + } + + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + + public String getOrigen() { + return origen; + } + + public void setOrigen(String origen) { + this.origen = origen; + } + + public String getDestino() { + return destino; + } + + public void setDestino(String destino) { + this.destino = destino; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public BigDecimal getPrecioPagado() { + return precioPagado; + } + + public void setPrecioPagado(BigDecimal precioPagado) { + this.precioPagado = precioPagado; + } + + public Date getFecHorVenta() { + return fecHorVenta; + } + + public void setFecHorVenta(Date fecHorVenta) { + this.fecHorVenta = fecHorVenta; + } + + public BigDecimal getImporteTaxaEmbarque() { + return importeTaxaEmbarque; + } + + public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { + this.importeTaxaEmbarque = importeTaxaEmbarque; + } + + public String getRuta() { + return ruta; + } + + public void setRuta(String ruta) { + this.ruta = ruta; + } + + public String getNumAutorizacion() { + return numAutorizacion; + } + + public void setNumAutorizacion(String numAutorizacion) { + this.numAutorizacion = numAutorizacion; + } + + public String getOrdenSevicio() { + return ordenSevicio; + } + + public void setOrdenSevicio(String ordenSevicio) { + this.ordenSevicio = ordenSevicio; + } + + public String getCodigoSecretaria() { + return secretaria; + } + + public void setCodigoSecretaria(String secretaria) { + this.secretaria = secretaria; + } + + public String getCvesecretaria() { + return cvesecretaria; + } + + public void setCvesecretaria(String cvesecretaria) { + this.cvesecretaria = cvesecretaria; + } + + public String getEmissorTarjeta() { + return emissorTarjeta; + } + + public void setEmissorTarjeta(String emissorTarjeta) { + this.emissorTarjeta = emissorTarjeta; + } + + public String getTipoPasaje() { + return tipoPasaje; + } + + public void setTipoPasaje(String tipoPasaje) { + this.tipoPasaje = tipoPasaje; + } + + public String getFormaPago() { + return formaPago; + } + + public void setFormaPago(String formaPago) { + this.formaPago = formaPago; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java index 776965173..73d7098c4 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java @@ -1,514 +1,514 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - - -@XmlRootElement -public class CajaDetalleVO { - - private Long cajaId; - private String numAsiento; - private Integer categoriaId; - private String numFolioSistema; - private Integer claseServicioId; - private Integer marcaId; - private Integer origenId; - private Integer destinoId; - private Integer corridaId; - private Date fecCorrida; - private String nombPasajero; - private BigDecimal precioBase; - private BigDecimal precioPagado; - private Integer tipoVentaId; - private String numSeriePreimpresa; - private String numFolioPreImpreso; - private Date fecHorViaje; - private Date fecHorVenta; - private Integer puntoVentaId; - private String numPuntoVenta; - private BigDecimal numKmViaje; - private String numOperacion; - private Integer motivoCancelacionId; - private Integer empresaPuntoVentaId; - private Integer empresaCorridaId; - private Integer turnoId; - private BigDecimal importeTaxaEmbarque; - private BigDecimal importePedagio; - private BigDecimal importeOutros; - private BigDecimal importeSeguro; - private Integer rutaId; - private Integer usuarioId; - private String numAutorizacion; - private String ordenSevicio; - private String uf; - private String desccategoria; - private List formaspagamento = new ArrayList(); - private String descPago; - private String cveCategoria; - private Integer formaPagoId; - private BigDecimal vlrFormaPago; - private String descMotivo; - private Long transacaoId; - private Long transacaooriginalId; - - private String descnumdoc; - private String descnumdoc2; - private String desctipodoc; - private String desctipodoc2; - private String desctelefono; - - private String tipotarjeta; - private Integer cantparcelas; - private String numtarjeta; - private Date fecoperacion; - private String nombtitular; - - private Long notacreditovendapacoteId; - private Long ocdId; - private String numoperacionOcd; - private String operadoracartao; - private String cvesecretaria; - private String descsecretaria; - private Boolean indEncargoVenta; - - private String descconvenio; - private String cveconvenio; - - private Integer tipoPago; - - public Long getCajaId() { - return cajaId; - } - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - public String getNumAsiento() { - return numAsiento; - } - public void setNumAsiento(String numAsiento) { - this.numAsiento = numAsiento; - } - public Integer getCategoriaId() { - return categoriaId; - } - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - public String getNumFolioSistema() { - return numFolioSistema; - } - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - public Integer getClaseServicioId() { - return claseServicioId; - } - public void setClaseServicioId(Integer claseServicioId) { - this.claseServicioId = claseServicioId; - } - public Integer getMarcaId() { - return marcaId; - } - public void setMarcaId(Integer marcaId) { - this.marcaId = marcaId; - } - public Integer getOrigenId() { - return origenId; - } - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - public Integer getDestinoId() { - return destinoId; - } - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - public Integer getCorridaId() { - return corridaId; - } - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - public Date getFecCorrida() { - return fecCorrida; - } - public void setFecCorrida(Date fecCorrida) { - this.fecCorrida = fecCorrida; - } - public String getNombPasajero() { - return nombPasajero; - } - public void setNombPasajero(String nombPasajero) { - this.nombPasajero = nombPasajero; - } - public BigDecimal getPrecioBase() { - return precioBase; - } - public void setPrecioBase(BigDecimal precioBase) { - this.precioBase = precioBase; - } - public BigDecimal getPrecioPagado() { - return precioPagado; - } - public void setPrecioPagado(BigDecimal precioPagado) { - this.precioPagado = precioPagado; - } - public Integer getTipoVentaId() { - return tipoVentaId; - } - public void setTipoVentaId(Integer tipoVentaId) { - this.tipoVentaId = tipoVentaId; - } - public String getNumSeriePreimpresa() { - return numSeriePreimpresa; - } - public void setNumSeriePreimpresa(String numSeriePreimpresa) { - this.numSeriePreimpresa = numSeriePreimpresa; - } - public String getNumFolioPreImpreso() { - return numFolioPreImpreso; - } - public void setNumFolioPreImpreso(String numFolioPreImpreso) { - this.numFolioPreImpreso = numFolioPreImpreso; - } - public Date getFecHorViaje() { - return fecHorViaje; - } - public void setFecHorViaje(Date fecHorViaje) { - this.fecHorViaje = fecHorViaje; - } - public Date getFecHorVenta() { - return fecHorVenta; - } - public void setFecHorVenta(Date fecHorVenta) { - this.fecHorVenta = fecHorVenta; - } - public Integer getPuntoVentaId() { - return puntoVentaId; - } - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - public BigDecimal getNumKmViaje() { - return numKmViaje; - } - public void setNumKmViaje(BigDecimal numKmViaje) { - this.numKmViaje = numKmViaje; - } - public String getNumOperacion() { - return numOperacion; - } - public void setNumOperacion(String numOperacion) { - this.numOperacion = numOperacion; - } - public Integer getMotivoCancelacionId() { - return motivoCancelacionId; - } - public void setMotivoCancelacionId(Integer motivoCancelacionId) { - this.motivoCancelacionId = motivoCancelacionId; - } - public Integer getEmpresaPuntoVentaId() { - return empresaPuntoVentaId; - } - public void setEmpresaPuntoVentaId(Integer empresaPuntoVentaId) { - this.empresaPuntoVentaId = empresaPuntoVentaId; - } - public Integer getEmpresaCorridaId() { - return empresaCorridaId; - } - public void setEmpresaCorridaId(Integer empresaCorridaId) { - this.empresaCorridaId = empresaCorridaId; - } - public Integer getTurnoId() { - return turnoId; - } - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - public BigDecimal getImporteTaxaEmbarque() { - return importeTaxaEmbarque; - } - public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { - this.importeTaxaEmbarque = importeTaxaEmbarque; - } - public BigDecimal getImportePedagio() { - return importePedagio; - } - public void setImportePedagio(BigDecimal importePedagio) { - this.importePedagio = importePedagio; - } - public BigDecimal getImporteOutros() { - return importeOutros; - } - public void setImporteOutros(BigDecimal importeOutros) { - this.importeOutros = importeOutros; - } - public BigDecimal getImporteSeguro() { - return importeSeguro; - } - public void setImporteSeguro(BigDecimal importeSeguro) { - this.importeSeguro = importeSeguro; - } - public Integer getRutaId() { - return rutaId; - } - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getNumAutorizacion() { - return numAutorizacion; - } - public void setNumAutorizacion(String numAutorizacion) { - this.numAutorizacion = numAutorizacion; - } - public String getOrdenSevicio() { - return ordenSevicio; - } - public void setOrdenSevicio(String ordenSevicio) { - this.ordenSevicio = ordenSevicio; - } - public String getNumPuntoVenta() { - return numPuntoVenta; - } - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - public String getUf() { - return uf; - } - public void setUf(String uf) { - this.uf = uf; - } - public String getDesccategoria() { - return desccategoria; - } - public void setDesccategoria(String desccategoria) { - this.desccategoria = desccategoria; - } - @XmlElementWrapper - @XmlElement(name = "pagamento", type = PagamentoVO.class) - public List getFormaspagamento() { - return formaspagamento; - } - public void setFormaspagamento(List formaspagamento) { - this.formaspagamento = formaspagamento; - } - @XmlTransient - public String getDescPago() { - return descPago; - } - public void setDescPago(String descPago) { - this.descPago = descPago; - } - public String getCveCategoria() { - return cveCategoria; - } - public void setCveCategoria(String cveCategoria) { - this.cveCategoria = cveCategoria; - } - - public Integer getFormaPagoId() { - return formaPagoId; - } - public void setFormaPagoId(Integer formaPagoId) { - this.formaPagoId = formaPagoId; - } - @XmlTransient - public BigDecimal getVlrFormaPago() { - return vlrFormaPago; - } - public void setVlrFormaPago(BigDecimal vlrFormaPago) { - this.vlrFormaPago = vlrFormaPago; - } - - - public String getDescMotivo() { - return descMotivo; - } - public void setDescMotivo(String descMotivo) { - this.descMotivo = descMotivo; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((cajaId == null) ? 0 : cajaId.hashCode()); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - CajaDetalleVO other = (CajaDetalleVO) obj; - if (cajaId == null) { - if (other.cajaId != null) - return false; - } else if (!cajaId.equals(other.cajaId)) - return false; - return true; - } - public Long getTransacaoId() { - return transacaoId; - } - public void setTransacaoId(Long transacaoId) { - this.transacaoId = transacaoId; - } - public Long getTransacaooriginalId() { - return transacaooriginalId; - } - public void setTransacaooriginalId(Long transacaooriginalId) { - this.transacaooriginalId = transacaooriginalId; - } - public String getDescnumdoc() { - return descnumdoc; - } - public void setDescnumdoc(String descnumdoc) { - this.descnumdoc = descnumdoc; - } - public String getDescnumdoc2() { - return descnumdoc2; - } - public void setDescnumdoc2(String descnumdoc2) { - this.descnumdoc2 = descnumdoc2; - } - public String getDesctipodoc() { - return desctipodoc; - } - public void setDesctipodoc(String desctipodoc) { - this.desctipodoc = desctipodoc; - } - public String getDesctipodoc2() { - return desctipodoc2; - } - public void setDesctipodoc2(String desctipodoc2) { - this.desctipodoc2 = desctipodoc2; - } - public String getDesctelefono() { - return desctelefono; - } - public void setDesctelefono(String desctelefono) { - this.desctelefono = desctelefono; - } - @XmlTransient - public String getTipotarjeta() { - return tipotarjeta; - } - public void setTipotarjeta(String tipotarjeta) { - this.tipotarjeta = tipotarjeta; - } - @XmlTransient - public Integer getCantparcelas() { - return cantparcelas; - } - public void setCantparcelas(Integer cantparcelas) { - this.cantparcelas = cantparcelas; - } - @XmlTransient - public String getNumtarjeta() { - return numtarjeta; - } - public void setNumtarjeta(String numtarjeta) { - this.numtarjeta = numtarjeta; - } - @XmlTransient - public Date getFecoperacion() { - return fecoperacion; - } - public void setFecoperacion(Date fecoperacion) { - this.fecoperacion = fecoperacion; - } - @XmlTransient - public String getNombtitular() { - return nombtitular; - } - public void setNombtitular(String nombtitular) { - this.nombtitular = nombtitular; - } - @XmlTransient - public Long getNotacreditovendapacoteId() { - return notacreditovendapacoteId; - } - public void setNotacreditovendapacoteId(Long notacreditovendapacoteId) { - this.notacreditovendapacoteId = notacreditovendapacoteId; - } - @XmlTransient - public Long getOcdId() { - return ocdId; - } - public void setOcdId(Long ocdId) { - this.ocdId = ocdId; - } - @XmlTransient - public String getNumoperacionOcd() { - return numoperacionOcd; - } - public void setNumoperacionOcd(String numoperacionOcd) { - this.numoperacionOcd = numoperacionOcd; - } - @XmlTransient - public String getOperadoracartao() { - return operadoracartao; - } - public void setOperadoracartao(String operadoracartao) { - this.operadoracartao = operadoracartao; - } - @XmlTransient - public String getCvesecretaria() { - return cvesecretaria; - } - public void setCvesecretaria(String cvesecretaria) { - this.cvesecretaria = cvesecretaria; - } - @XmlTransient - public Integer getTipoPago() { - return tipoPago; - } - public void setTipoPago(Integer tipoPago) { - this.tipoPago = tipoPago; - } - public Boolean getIndEncargoVenta() { - return indEncargoVenta; - } - public void setIndEncargoVenta(Boolean indEncargoVenta) { - this.indEncargoVenta = indEncargoVenta; - } - public String getDescconvenio() { - return descconvenio; - } - public void setDescconvenio(String descconvenio) { - this.descconvenio = descconvenio; - } - public String getCveconvenio() { - return cveconvenio; - } - public void setCveconvenio(String cveconvenio) { - this.cveconvenio = cveconvenio; - } - @XmlTransient - public String getDescsecretaria() { - return descsecretaria; - } - public void setDescsecretaria(String descsecretaria) { - this.descsecretaria = descsecretaria; - } - -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + + +@XmlRootElement +public class CajaDetalleVO { + + private Long cajaId; + private String numAsiento; + private Integer categoriaId; + private String numFolioSistema; + private Integer claseServicioId; + private Integer marcaId; + private Integer origenId; + private Integer destinoId; + private Integer corridaId; + private Date fecCorrida; + private String nombPasajero; + private BigDecimal precioBase; + private BigDecimal precioPagado; + private Integer tipoVentaId; + private String numSeriePreimpresa; + private String numFolioPreImpreso; + private Date fecHorViaje; + private Date fecHorVenta; + private Integer puntoVentaId; + private String numPuntoVenta; + private BigDecimal numKmViaje; + private String numOperacion; + private Integer motivoCancelacionId; + private Integer empresaPuntoVentaId; + private Integer empresaCorridaId; + private Integer turnoId; + private BigDecimal importeTaxaEmbarque; + private BigDecimal importePedagio; + private BigDecimal importeOutros; + private BigDecimal importeSeguro; + private Integer rutaId; + private Integer usuarioId; + private String numAutorizacion; + private String ordenSevicio; + private String uf; + private String desccategoria; + private List formaspagamento = new ArrayList(); + private String descPago; + private String cveCategoria; + private Integer formaPagoId; + private BigDecimal vlrFormaPago; + private String descMotivo; + private Long transacaoId; + private Long transacaooriginalId; + + private String descnumdoc; + private String descnumdoc2; + private String desctipodoc; + private String desctipodoc2; + private String desctelefono; + + private String tipotarjeta; + private Integer cantparcelas; + private String numtarjeta; + private Date fecoperacion; + private String nombtitular; + + private Long notacreditovendapacoteId; + private Long ocdId; + private String numoperacionOcd; + private String operadoracartao; + private String cvesecretaria; + private String descsecretaria; + private Boolean indEncargoVenta; + + private String descconvenio; + private String cveconvenio; + + private Integer tipoPago; + + public Long getCajaId() { + return cajaId; + } + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + public String getNumAsiento() { + return numAsiento; + } + public void setNumAsiento(String numAsiento) { + this.numAsiento = numAsiento; + } + public Integer getCategoriaId() { + return categoriaId; + } + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + public String getNumFolioSistema() { + return numFolioSistema; + } + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + public Integer getClaseServicioId() { + return claseServicioId; + } + public void setClaseServicioId(Integer claseServicioId) { + this.claseServicioId = claseServicioId; + } + public Integer getMarcaId() { + return marcaId; + } + public void setMarcaId(Integer marcaId) { + this.marcaId = marcaId; + } + public Integer getOrigenId() { + return origenId; + } + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + public Integer getDestinoId() { + return destinoId; + } + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + public Integer getCorridaId() { + return corridaId; + } + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + public Date getFecCorrida() { + return fecCorrida; + } + public void setFecCorrida(Date fecCorrida) { + this.fecCorrida = fecCorrida; + } + public String getNombPasajero() { + return nombPasajero; + } + public void setNombPasajero(String nombPasajero) { + this.nombPasajero = nombPasajero; + } + public BigDecimal getPrecioBase() { + return precioBase; + } + public void setPrecioBase(BigDecimal precioBase) { + this.precioBase = precioBase; + } + public BigDecimal getPrecioPagado() { + return precioPagado; + } + public void setPrecioPagado(BigDecimal precioPagado) { + this.precioPagado = precioPagado; + } + public Integer getTipoVentaId() { + return tipoVentaId; + } + public void setTipoVentaId(Integer tipoVentaId) { + this.tipoVentaId = tipoVentaId; + } + public String getNumSeriePreimpresa() { + return numSeriePreimpresa; + } + public void setNumSeriePreimpresa(String numSeriePreimpresa) { + this.numSeriePreimpresa = numSeriePreimpresa; + } + public String getNumFolioPreImpreso() { + return numFolioPreImpreso; + } + public void setNumFolioPreImpreso(String numFolioPreImpreso) { + this.numFolioPreImpreso = numFolioPreImpreso; + } + public Date getFecHorViaje() { + return fecHorViaje; + } + public void setFecHorViaje(Date fecHorViaje) { + this.fecHorViaje = fecHorViaje; + } + public Date getFecHorVenta() { + return fecHorVenta; + } + public void setFecHorVenta(Date fecHorVenta) { + this.fecHorVenta = fecHorVenta; + } + public Integer getPuntoVentaId() { + return puntoVentaId; + } + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + public BigDecimal getNumKmViaje() { + return numKmViaje; + } + public void setNumKmViaje(BigDecimal numKmViaje) { + this.numKmViaje = numKmViaje; + } + public String getNumOperacion() { + return numOperacion; + } + public void setNumOperacion(String numOperacion) { + this.numOperacion = numOperacion; + } + public Integer getMotivoCancelacionId() { + return motivoCancelacionId; + } + public void setMotivoCancelacionId(Integer motivoCancelacionId) { + this.motivoCancelacionId = motivoCancelacionId; + } + public Integer getEmpresaPuntoVentaId() { + return empresaPuntoVentaId; + } + public void setEmpresaPuntoVentaId(Integer empresaPuntoVentaId) { + this.empresaPuntoVentaId = empresaPuntoVentaId; + } + public Integer getEmpresaCorridaId() { + return empresaCorridaId; + } + public void setEmpresaCorridaId(Integer empresaCorridaId) { + this.empresaCorridaId = empresaCorridaId; + } + public Integer getTurnoId() { + return turnoId; + } + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + public BigDecimal getImporteTaxaEmbarque() { + return importeTaxaEmbarque; + } + public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { + this.importeTaxaEmbarque = importeTaxaEmbarque; + } + public BigDecimal getImportePedagio() { + return importePedagio; + } + public void setImportePedagio(BigDecimal importePedagio) { + this.importePedagio = importePedagio; + } + public BigDecimal getImporteOutros() { + return importeOutros; + } + public void setImporteOutros(BigDecimal importeOutros) { + this.importeOutros = importeOutros; + } + public BigDecimal getImporteSeguro() { + return importeSeguro; + } + public void setImporteSeguro(BigDecimal importeSeguro) { + this.importeSeguro = importeSeguro; + } + public Integer getRutaId() { + return rutaId; + } + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getNumAutorizacion() { + return numAutorizacion; + } + public void setNumAutorizacion(String numAutorizacion) { + this.numAutorizacion = numAutorizacion; + } + public String getOrdenSevicio() { + return ordenSevicio; + } + public void setOrdenSevicio(String ordenSevicio) { + this.ordenSevicio = ordenSevicio; + } + public String getNumPuntoVenta() { + return numPuntoVenta; + } + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + public String getUf() { + return uf; + } + public void setUf(String uf) { + this.uf = uf; + } + public String getDesccategoria() { + return desccategoria; + } + public void setDesccategoria(String desccategoria) { + this.desccategoria = desccategoria; + } + @XmlElementWrapper + @XmlElement(name = "pagamento", type = PagamentoVO.class) + public List getFormaspagamento() { + return formaspagamento; + } + public void setFormaspagamento(List formaspagamento) { + this.formaspagamento = formaspagamento; + } + @XmlTransient + public String getDescPago() { + return descPago; + } + public void setDescPago(String descPago) { + this.descPago = descPago; + } + public String getCveCategoria() { + return cveCategoria; + } + public void setCveCategoria(String cveCategoria) { + this.cveCategoria = cveCategoria; + } + + public Integer getFormaPagoId() { + return formaPagoId; + } + public void setFormaPagoId(Integer formaPagoId) { + this.formaPagoId = formaPagoId; + } + @XmlTransient + public BigDecimal getVlrFormaPago() { + return vlrFormaPago; + } + public void setVlrFormaPago(BigDecimal vlrFormaPago) { + this.vlrFormaPago = vlrFormaPago; + } + + + public String getDescMotivo() { + return descMotivo; + } + public void setDescMotivo(String descMotivo) { + this.descMotivo = descMotivo; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((cajaId == null) ? 0 : cajaId.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CajaDetalleVO other = (CajaDetalleVO) obj; + if (cajaId == null) { + if (other.cajaId != null) + return false; + } else if (!cajaId.equals(other.cajaId)) + return false; + return true; + } + public Long getTransacaoId() { + return transacaoId; + } + public void setTransacaoId(Long transacaoId) { + this.transacaoId = transacaoId; + } + public Long getTransacaooriginalId() { + return transacaooriginalId; + } + public void setTransacaooriginalId(Long transacaooriginalId) { + this.transacaooriginalId = transacaooriginalId; + } + public String getDescnumdoc() { + return descnumdoc; + } + public void setDescnumdoc(String descnumdoc) { + this.descnumdoc = descnumdoc; + } + public String getDescnumdoc2() { + return descnumdoc2; + } + public void setDescnumdoc2(String descnumdoc2) { + this.descnumdoc2 = descnumdoc2; + } + public String getDesctipodoc() { + return desctipodoc; + } + public void setDesctipodoc(String desctipodoc) { + this.desctipodoc = desctipodoc; + } + public String getDesctipodoc2() { + return desctipodoc2; + } + public void setDesctipodoc2(String desctipodoc2) { + this.desctipodoc2 = desctipodoc2; + } + public String getDesctelefono() { + return desctelefono; + } + public void setDesctelefono(String desctelefono) { + this.desctelefono = desctelefono; + } + @XmlTransient + public String getTipotarjeta() { + return tipotarjeta; + } + public void setTipotarjeta(String tipotarjeta) { + this.tipotarjeta = tipotarjeta; + } + @XmlTransient + public Integer getCantparcelas() { + return cantparcelas; + } + public void setCantparcelas(Integer cantparcelas) { + this.cantparcelas = cantparcelas; + } + @XmlTransient + public String getNumtarjeta() { + return numtarjeta; + } + public void setNumtarjeta(String numtarjeta) { + this.numtarjeta = numtarjeta; + } + @XmlTransient + public Date getFecoperacion() { + return fecoperacion; + } + public void setFecoperacion(Date fecoperacion) { + this.fecoperacion = fecoperacion; + } + @XmlTransient + public String getNombtitular() { + return nombtitular; + } + public void setNombtitular(String nombtitular) { + this.nombtitular = nombtitular; + } + @XmlTransient + public Long getNotacreditovendapacoteId() { + return notacreditovendapacoteId; + } + public void setNotacreditovendapacoteId(Long notacreditovendapacoteId) { + this.notacreditovendapacoteId = notacreditovendapacoteId; + } + @XmlTransient + public Long getOcdId() { + return ocdId; + } + public void setOcdId(Long ocdId) { + this.ocdId = ocdId; + } + @XmlTransient + public String getNumoperacionOcd() { + return numoperacionOcd; + } + public void setNumoperacionOcd(String numoperacionOcd) { + this.numoperacionOcd = numoperacionOcd; + } + @XmlTransient + public String getOperadoracartao() { + return operadoracartao; + } + public void setOperadoracartao(String operadoracartao) { + this.operadoracartao = operadoracartao; + } + @XmlTransient + public String getCvesecretaria() { + return cvesecretaria; + } + public void setCvesecretaria(String cvesecretaria) { + this.cvesecretaria = cvesecretaria; + } + @XmlTransient + public Integer getTipoPago() { + return tipoPago; + } + public void setTipoPago(Integer tipoPago) { + this.tipoPago = tipoPago; + } + public Boolean getIndEncargoVenta() { + return indEncargoVenta; + } + public void setIndEncargoVenta(Boolean indEncargoVenta) { + this.indEncargoVenta = indEncargoVenta; + } + public String getDescconvenio() { + return descconvenio; + } + public void setDescconvenio(String descconvenio) { + this.descconvenio = descconvenio; + } + public String getCveconvenio() { + return cveconvenio; + } + public void setCveconvenio(String cveconvenio) { + this.cveconvenio = cveconvenio; + } + @XmlTransient + public String getDescsecretaria() { + return descsecretaria; + } + public void setDescsecretaria(String descsecretaria) { + this.descsecretaria = descsecretaria; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/caja/CajaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaVO.java index 35e283539..83e784e6a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/CajaVO.java @@ -1,264 +1,264 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; -import java.util.Date; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class CajaVO { - - private Long cajaId; - private String numAsiento; - private Integer categoriaId; - private String numFolioSistema; - private Integer claseServicioId; - private Integer marcaId; - private Integer origenId; - private Integer destinoId; - private Integer corridaId; - private Date fecCorrida; - private String nombPasajero; - private BigDecimal precioBase; - private BigDecimal precioPagado; - private Integer tipoVentaId; - private String numSeriePreimpresa; - private String numFolioPreImpreso; - private Date fecHorViaje; - private Date fecHorVenta; - private Integer puntoVentaId; - private String numPuntoVenta; - private BigDecimal numKmViaje; - private String numOperacion; - private Integer motivoCancelacionId; - private Integer empresaPuntoVentaId; - private Integer empresaCorridaId; - private Integer turnoId; - private BigDecimal importeTaxaEmbarque; - private BigDecimal importePedagio; - private BigDecimal importeOutros; - private BigDecimal importeSeguro; - private Integer rutaId; - private Integer usuarioId; - private String numAutorizacion; - private String ordenSevicio; - private String uf; - private String desccategoria; - - public Long getCajaId() { - return cajaId; - } - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - public String getNumAsiento() { - return numAsiento; - } - public void setNumAsiento(String numAsiento) { - this.numAsiento = numAsiento; - } - public Integer getCategoriaId() { - return categoriaId; - } - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - public String getNumFolioSistema() { - return numFolioSistema; - } - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - public Integer getClaseServicioId() { - return claseServicioId; - } - public void setClaseServicioId(Integer claseServicioId) { - this.claseServicioId = claseServicioId; - } - public Integer getMarcaId() { - return marcaId; - } - public void setMarcaId(Integer marcaId) { - this.marcaId = marcaId; - } - public Integer getOrigenId() { - return origenId; - } - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - public Integer getDestinoId() { - return destinoId; - } - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - public Integer getCorridaId() { - return corridaId; - } - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - public Date getFecCorrida() { - return fecCorrida; - } - public void setFecCorrida(Date fecCorrida) { - this.fecCorrida = fecCorrida; - } - public String getNombPasajero() { - return nombPasajero; - } - public void setNombPasajero(String nombPasajero) { - this.nombPasajero = nombPasajero; - } - public BigDecimal getPrecioBase() { - return precioBase; - } - public void setPrecioBase(BigDecimal precioBase) { - this.precioBase = precioBase; - } - public BigDecimal getPrecioPagado() { - return precioPagado; - } - public void setPrecioPagado(BigDecimal precioPagado) { - this.precioPagado = precioPagado; - } - public Integer getTipoVentaId() { - return tipoVentaId; - } - public void setTipoVentaId(Integer tipoVentaId) { - this.tipoVentaId = tipoVentaId; - } - public String getNumSeriePreimpresa() { - return numSeriePreimpresa; - } - public void setNumSeriePreimpresa(String numSeriePreimpresa) { - this.numSeriePreimpresa = numSeriePreimpresa; - } - public String getNumFolioPreImpreso() { - return numFolioPreImpreso; - } - public void setNumFolioPreImpreso(String numFolioPreImpreso) { - this.numFolioPreImpreso = numFolioPreImpreso; - } - public Date getFecHorViaje() { - return fecHorViaje; - } - public void setFecHorViaje(Date fecHorViaje) { - this.fecHorViaje = fecHorViaje; - } - public Date getFecHorVenta() { - return fecHorVenta; - } - public void setFecHorVenta(Date fecHorVenta) { - this.fecHorVenta = fecHorVenta; - } - public Integer getPuntoVentaId() { - return puntoVentaId; - } - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - public BigDecimal getNumKmViaje() { - return numKmViaje; - } - public void setNumKmViaje(BigDecimal numKmViaje) { - this.numKmViaje = numKmViaje; - } - public String getNumOperacion() { - return numOperacion; - } - public void setNumOperacion(String numOperacion) { - this.numOperacion = numOperacion; - } - public Integer getMotivoCancelacionId() { - return motivoCancelacionId; - } - public void setMotivoCancelacionId(Integer motivoCancelacionId) { - this.motivoCancelacionId = motivoCancelacionId; - } - public Integer getEmpresaPuntoVentaId() { - return empresaPuntoVentaId; - } - public void setEmpresaPuntoVentaId(Integer empresaPuntoVentaId) { - this.empresaPuntoVentaId = empresaPuntoVentaId; - } - public Integer getEmpresaCorridaId() { - return empresaCorridaId; - } - public void setEmpresaCorridaId(Integer empresaCorridaId) { - this.empresaCorridaId = empresaCorridaId; - } - public Integer getTurnoId() { - return turnoId; - } - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - public BigDecimal getImporteTaxaEmbarque() { - return importeTaxaEmbarque; - } - public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { - this.importeTaxaEmbarque = importeTaxaEmbarque; - } - public BigDecimal getImportePedagio() { - return importePedagio; - } - public void setImportePedagio(BigDecimal importePedagio) { - this.importePedagio = importePedagio; - } - public BigDecimal getImporteOutros() { - return importeOutros; - } - public void setImporteOutros(BigDecimal importeOutros) { - this.importeOutros = importeOutros; - } - public BigDecimal getImporteSeguro() { - return importeSeguro; - } - public void setImporteSeguro(BigDecimal importeSeguro) { - this.importeSeguro = importeSeguro; - } - public Integer getRutaId() { - return rutaId; - } - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getNumAutorizacion() { - return numAutorizacion; - } - public void setNumAutorizacion(String numAutorizacion) { - this.numAutorizacion = numAutorizacion; - } - public String getOrdenSevicio() { - return ordenSevicio; - } - public void setOrdenSevicio(String ordenSevicio) { - this.ordenSevicio = ordenSevicio; - } - public String getNumPuntoVenta() { - return numPuntoVenta; - } - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - public String getUf() { - return uf; - } - public void setUf(String uf) { - this.uf = uf; - } - public String getDesccategoria() { - return desccategoria; - } - public void setDesccategoria(String desccategoria) { - this.desccategoria = desccategoria; - } -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class CajaVO { + + private Long cajaId; + private String numAsiento; + private Integer categoriaId; + private String numFolioSistema; + private Integer claseServicioId; + private Integer marcaId; + private Integer origenId; + private Integer destinoId; + private Integer corridaId; + private Date fecCorrida; + private String nombPasajero; + private BigDecimal precioBase; + private BigDecimal precioPagado; + private Integer tipoVentaId; + private String numSeriePreimpresa; + private String numFolioPreImpreso; + private Date fecHorViaje; + private Date fecHorVenta; + private Integer puntoVentaId; + private String numPuntoVenta; + private BigDecimal numKmViaje; + private String numOperacion; + private Integer motivoCancelacionId; + private Integer empresaPuntoVentaId; + private Integer empresaCorridaId; + private Integer turnoId; + private BigDecimal importeTaxaEmbarque; + private BigDecimal importePedagio; + private BigDecimal importeOutros; + private BigDecimal importeSeguro; + private Integer rutaId; + private Integer usuarioId; + private String numAutorizacion; + private String ordenSevicio; + private String uf; + private String desccategoria; + + public Long getCajaId() { + return cajaId; + } + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + public String getNumAsiento() { + return numAsiento; + } + public void setNumAsiento(String numAsiento) { + this.numAsiento = numAsiento; + } + public Integer getCategoriaId() { + return categoriaId; + } + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + public String getNumFolioSistema() { + return numFolioSistema; + } + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + public Integer getClaseServicioId() { + return claseServicioId; + } + public void setClaseServicioId(Integer claseServicioId) { + this.claseServicioId = claseServicioId; + } + public Integer getMarcaId() { + return marcaId; + } + public void setMarcaId(Integer marcaId) { + this.marcaId = marcaId; + } + public Integer getOrigenId() { + return origenId; + } + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + public Integer getDestinoId() { + return destinoId; + } + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + public Integer getCorridaId() { + return corridaId; + } + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + public Date getFecCorrida() { + return fecCorrida; + } + public void setFecCorrida(Date fecCorrida) { + this.fecCorrida = fecCorrida; + } + public String getNombPasajero() { + return nombPasajero; + } + public void setNombPasajero(String nombPasajero) { + this.nombPasajero = nombPasajero; + } + public BigDecimal getPrecioBase() { + return precioBase; + } + public void setPrecioBase(BigDecimal precioBase) { + this.precioBase = precioBase; + } + public BigDecimal getPrecioPagado() { + return precioPagado; + } + public void setPrecioPagado(BigDecimal precioPagado) { + this.precioPagado = precioPagado; + } + public Integer getTipoVentaId() { + return tipoVentaId; + } + public void setTipoVentaId(Integer tipoVentaId) { + this.tipoVentaId = tipoVentaId; + } + public String getNumSeriePreimpresa() { + return numSeriePreimpresa; + } + public void setNumSeriePreimpresa(String numSeriePreimpresa) { + this.numSeriePreimpresa = numSeriePreimpresa; + } + public String getNumFolioPreImpreso() { + return numFolioPreImpreso; + } + public void setNumFolioPreImpreso(String numFolioPreImpreso) { + this.numFolioPreImpreso = numFolioPreImpreso; + } + public Date getFecHorViaje() { + return fecHorViaje; + } + public void setFecHorViaje(Date fecHorViaje) { + this.fecHorViaje = fecHorViaje; + } + public Date getFecHorVenta() { + return fecHorVenta; + } + public void setFecHorVenta(Date fecHorVenta) { + this.fecHorVenta = fecHorVenta; + } + public Integer getPuntoVentaId() { + return puntoVentaId; + } + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + public BigDecimal getNumKmViaje() { + return numKmViaje; + } + public void setNumKmViaje(BigDecimal numKmViaje) { + this.numKmViaje = numKmViaje; + } + public String getNumOperacion() { + return numOperacion; + } + public void setNumOperacion(String numOperacion) { + this.numOperacion = numOperacion; + } + public Integer getMotivoCancelacionId() { + return motivoCancelacionId; + } + public void setMotivoCancelacionId(Integer motivoCancelacionId) { + this.motivoCancelacionId = motivoCancelacionId; + } + public Integer getEmpresaPuntoVentaId() { + return empresaPuntoVentaId; + } + public void setEmpresaPuntoVentaId(Integer empresaPuntoVentaId) { + this.empresaPuntoVentaId = empresaPuntoVentaId; + } + public Integer getEmpresaCorridaId() { + return empresaCorridaId; + } + public void setEmpresaCorridaId(Integer empresaCorridaId) { + this.empresaCorridaId = empresaCorridaId; + } + public Integer getTurnoId() { + return turnoId; + } + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + public BigDecimal getImporteTaxaEmbarque() { + return importeTaxaEmbarque; + } + public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { + this.importeTaxaEmbarque = importeTaxaEmbarque; + } + public BigDecimal getImportePedagio() { + return importePedagio; + } + public void setImportePedagio(BigDecimal importePedagio) { + this.importePedagio = importePedagio; + } + public BigDecimal getImporteOutros() { + return importeOutros; + } + public void setImporteOutros(BigDecimal importeOutros) { + this.importeOutros = importeOutros; + } + public BigDecimal getImporteSeguro() { + return importeSeguro; + } + public void setImporteSeguro(BigDecimal importeSeguro) { + this.importeSeguro = importeSeguro; + } + public Integer getRutaId() { + return rutaId; + } + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getNumAutorizacion() { + return numAutorizacion; + } + public void setNumAutorizacion(String numAutorizacion) { + this.numAutorizacion = numAutorizacion; + } + public String getOrdenSevicio() { + return ordenSevicio; + } + public void setOrdenSevicio(String ordenSevicio) { + this.ordenSevicio = ordenSevicio; + } + public String getNumPuntoVenta() { + return numPuntoVenta; + } + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + public String getUf() { + return uf; + } + public void setUf(String uf) { + this.uf = uf; + } + public String getDesccategoria() { + return desccategoria; + } + public void setDesccategoria(String desccategoria) { + this.desccategoria = desccategoria; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoCartaoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoCartaoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/caja/PagamentoCartaoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoCartaoVO.java index 66ae117a4..40440c786 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoCartaoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoCartaoVO.java @@ -1,62 +1,62 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.util.Date; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -@XmlRootElement(name="cartao") -public class PagamentoCartaoVO { - - private String bandeira; - private String numautorizacao; - private Integer parcelas; - private String titular; - private String numcartao; - private Date datapagamento; - private String operadoracartao; - - public String getBandeira() { - return bandeira; - } - public void setBandeira(String bandeira) { - this.bandeira = bandeira; - } - public String getNumautorizacao() { - return numautorizacao; - } - public void setNumautorizacao(String numautorizacao) { - this.numautorizacao = numautorizacao; - } - public Integer getParcelas() { - return parcelas; - } - public void setParcelas(Integer parcelas) { - this.parcelas = parcelas; - } - public String getTitular() { - return titular; - } - public void setTitular(String titular) { - this.titular = titular; - } - public String getNumcartao() { - return numcartao; - } - public void setNumcartao(String numcartao) { - this.numcartao = numcartao; - } - public Date getDatapagamento() { - return datapagamento; - } - public void setDatapagamento(Date datapagamento) { - this.datapagamento = datapagamento; - } - public String getOperadoracartao() { - return operadoracartao; - } - public void setOperadoracartao(String operadoracartao) { - this.operadoracartao = operadoracartao; - } - -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.util.Date; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +@XmlRootElement(name="cartao") +public class PagamentoCartaoVO { + + private String bandeira; + private String numautorizacao; + private Integer parcelas; + private String titular; + private String numcartao; + private Date datapagamento; + private String operadoracartao; + + public String getBandeira() { + return bandeira; + } + public void setBandeira(String bandeira) { + this.bandeira = bandeira; + } + public String getNumautorizacao() { + return numautorizacao; + } + public void setNumautorizacao(String numautorizacao) { + this.numautorizacao = numautorizacao; + } + public Integer getParcelas() { + return parcelas; + } + public void setParcelas(Integer parcelas) { + this.parcelas = parcelas; + } + public String getTitular() { + return titular; + } + public void setTitular(String titular) { + this.titular = titular; + } + public String getNumcartao() { + return numcartao; + } + public void setNumcartao(String numcartao) { + this.numcartao = numcartao; + } + public Date getDatapagamento() { + return datapagamento; + } + public void setDatapagamento(Date datapagamento) { + this.datapagamento = datapagamento; + } + public String getOperadoracartao() { + return operadoracartao; + } + public void setOperadoracartao(String operadoracartao) { + this.operadoracartao = operadoracartao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java index 2344114cc..feb7e4c61 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java @@ -1,115 +1,115 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -import com.rjconsultores.ventaboletos.enums.TipoFormapago; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; - -@XmlRootElement(name = "pagamento") -@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa", "razaoSocial", "dadosBancarios"}) -public class PagamentoVO { - - private String formapagamento; - private String moeda; - private BigDecimal valor; - private PagamentoCartaoVO cartao; - private Integer formapagoId; - private NotaCreditoVendaPacoteVO notacredito; - private String identificacaoEmpresa; - private String razaoSocial; - private TipoFormapago tipoFormapago; - - private List dadosBancarios; - - public String getMoeda() { - return moeda; - } - - public void setMoeda(String moeda) { - this.moeda = moeda; - } - - public String getFormapagamento() { - return formapagamento; - } - - public void setFormapagamento(String formapagamento) { - this.formapagamento = formapagamento; - } - - public PagamentoCartaoVO getCartao() { - return cartao; - } - - public void setCartao(PagamentoCartaoVO cartao) { - this.cartao = cartao; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - @XmlTransient - public Integer getFormapagoId() { - return formapagoId; - } - - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - - public NotaCreditoVendaPacoteVO getNotacredito() { - return notacredito; - } - - public void setNotacredito(NotaCreditoVendaPacoteVO notacredito) { - this.notacredito = notacredito; - } - - public String getIdentificacaoEmpresa() { - return identificacaoEmpresa; - } - - public void setIdentificacaoEmpresa(String identificacaoEmpresa) { - this.identificacaoEmpresa = identificacaoEmpresa; - } - - @XmlTransient - public TipoFormapago getTipoFormapago() { - return tipoFormapago; - } - - public void setTipoFormapago(TipoFormapago tipoFormapago) { - this.tipoFormapago = tipoFormapago; - } - - @XmlElementWrapper - @XmlElement(name = "dadosBancario", type = DadosBancarioVO.class) - public List getDadosBancarios() { - return dadosBancarios; - } - - public void setDadosBancarios(List dadosBancarios) { - this.dadosBancarios = dadosBancarios; - } - - public String getRazaoSocial() { - return razaoSocial; - } - - public void setRazaoSocial(String razaoSocial) { - this.razaoSocial = razaoSocial; - } -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; + +import com.rjconsultores.ventaboletos.enums.TipoFormapago; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; + +@XmlRootElement(name = "pagamento") +@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa", "razaoSocial", "dadosBancarios"}) +public class PagamentoVO { + + private String formapagamento; + private String moeda; + private BigDecimal valor; + private PagamentoCartaoVO cartao; + private Integer formapagoId; + private NotaCreditoVendaPacoteVO notacredito; + private String identificacaoEmpresa; + private String razaoSocial; + private TipoFormapago tipoFormapago; + + private List dadosBancarios; + + public String getMoeda() { + return moeda; + } + + public void setMoeda(String moeda) { + this.moeda = moeda; + } + + public String getFormapagamento() { + return formapagamento; + } + + public void setFormapagamento(String formapagamento) { + this.formapagamento = formapagamento; + } + + public PagamentoCartaoVO getCartao() { + return cartao; + } + + public void setCartao(PagamentoCartaoVO cartao) { + this.cartao = cartao; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + @XmlTransient + public Integer getFormapagoId() { + return formapagoId; + } + + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + + public NotaCreditoVendaPacoteVO getNotacredito() { + return notacredito; + } + + public void setNotacredito(NotaCreditoVendaPacoteVO notacredito) { + this.notacredito = notacredito; + } + + public String getIdentificacaoEmpresa() { + return identificacaoEmpresa; + } + + public void setIdentificacaoEmpresa(String identificacaoEmpresa) { + this.identificacaoEmpresa = identificacaoEmpresa; + } + + @XmlTransient + public TipoFormapago getTipoFormapago() { + return tipoFormapago; + } + + public void setTipoFormapago(TipoFormapago tipoFormapago) { + this.tipoFormapago = tipoFormapago; + } + + @XmlElementWrapper + @XmlElement(name = "dadosBancario", type = DadosBancarioVO.class) + public List getDadosBancarios() { + return dadosBancarios; + } + + public void setDadosBancarios(List dadosBancarios) { + this.dadosBancarios = dadosBancarios; + } + + public String getRazaoSocial() { + return razaoSocial; + } + + public void setRazaoSocial(String razaoSocial) { + this.razaoSocial = razaoSocial; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/ReceitaDespesaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/ReceitaDespesaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/caja/ReceitaDespesaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/ReceitaDespesaVO.java index 08c296b8e..42ab136a1 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/ReceitaDespesaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/ReceitaDespesaVO.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; - -import javax.xml.bind.annotation.XmlRootElement; - - -public class ReceitaDespesaVO { - private BigDecimal precio; - private String tipoEvento; - - public BigDecimal getPrecio() { - return precio; - } - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - public String getTipoEvento() { - return tipoEvento; - } - public void setTipoEvento(String tipoEvento) { - this.tipoEvento = tipoEvento; - } -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; + +import javax.xml.bind.annotation.XmlRootElement; + + +public class ReceitaDespesaVO { + private BigDecimal precio; + private String tipoEvento; + + public BigDecimal getPrecio() { + return precio; + } + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + public String getTipoEvento() { + return tipoEvento; + } + public void setTipoEvento(String tipoEvento) { + this.tipoEvento = tipoEvento; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioActivoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioActivoVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/caja/UsuarioActivoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioActivoVO.java index d5130bf4f..4174cb02c 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioActivoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioActivoVO.java @@ -1,37 +1,37 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class UsuarioActivoVO { - private Integer usuarioId; - private String nombusuario; - private String cveusuario; - - public UsuarioActivoVO() { - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public String getNombusuario() { - return nombusuario; - } - - public void setNombusuario(String nombusuario) { - this.nombusuario = nombusuario; - } - - public String getCveusuario() { - return cveusuario; - } - - public void setCveusuario(String cveUsuario) { - this.cveusuario = cveUsuario; - } -} +package com.rjconsultores.ventaboletos.vo.caja; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class UsuarioActivoVO { + private Integer usuarioId; + private String nombusuario; + private String cveusuario; + + public UsuarioActivoVO() { + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public String getNombusuario() { + return nombusuario; + } + + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + + public String getCveusuario() { + return cveusuario; + } + + public void setCveusuario(String cveUsuario) { + this.cveusuario = cveUsuario; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java index 716e014f4..aaac27fd6 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java @@ -1,84 +1,84 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class UsuarioVO { - private Integer usuarioId; - private String cveusuario; - private Integer puntoVentaId; - private String numPuntoVenta; - private Integer turnoId; - private Date fecCorte; - private BigDecimal importeTotal; - private List pasajes; - private List diversos; - - public UsuarioVO() { - this.puntoVentaId = new Integer(-1); - this.fecCorte = new Date();; - this.turnoId = new Integer(-1); - this.importeTotal = new BigDecimal(0); - } - - public List getPasajes() { - return pasajes; - } - public void setPasajes(List pasajes) { - this.pasajes = pasajes; - } - public List getDiversos() { - return diversos; - } - public void setDiversos(List diversos) { - this.diversos = diversos; - } - public String getCveusuario() { - return cveusuario; - } - public void setCveusuario(String cveusuario) { - this.cveusuario = cveusuario; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public Integer getPuntoVentaId() { - return puntoVentaId; - } - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - public Date getFecCorte() { - return fecCorte; - } - public void setFecCorte(Date fecCorte) { - this.fecCorte = fecCorte; - } - public Integer getTurnoId() { - return turnoId; - } - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - public BigDecimal getImporteTotal() { - return importeTotal; - } - public void setImporteTotal(BigDecimal importeTotal) { - this.importeTotal = importeTotal; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class UsuarioVO { + private Integer usuarioId; + private String cveusuario; + private Integer puntoVentaId; + private String numPuntoVenta; + private Integer turnoId; + private Date fecCorte; + private BigDecimal importeTotal; + private List pasajes; + private List diversos; + + public UsuarioVO() { + this.puntoVentaId = new Integer(-1); + this.fecCorte = new Date();; + this.turnoId = new Integer(-1); + this.importeTotal = new BigDecimal(0); + } + + public List getPasajes() { + return pasajes; + } + public void setPasajes(List pasajes) { + this.pasajes = pasajes; + } + public List getDiversos() { + return diversos; + } + public void setDiversos(List diversos) { + this.diversos = diversos; + } + public String getCveusuario() { + return cveusuario; + } + public void setCveusuario(String cveusuario) { + this.cveusuario = cveusuario; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public Integer getPuntoVentaId() { + return puntoVentaId; + } + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + public Date getFecCorte() { + return fecCorte; + } + public void setFecCorte(Date fecCorte) { + this.fecCorte = fecCorte; + } + public Integer getTurnoId() { + return turnoId; + } + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + public BigDecimal getImporteTotal() { + return importeTotal; + } + public void setImporteTotal(BigDecimal importeTotal) { + this.importeTotal = importeTotal; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/VendaEmbarcadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/VendaEmbarcadaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/caja/VendaEmbarcadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/VendaEmbarcadaVO.java index c9e7dda8d..64356a57f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/VendaEmbarcadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/caja/VendaEmbarcadaVO.java @@ -1,292 +1,292 @@ -package com.rjconsultores.ventaboletos.vo.caja; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Date; - -public class VendaEmbarcadaVO { - private Long cajaId; - private String numAsiento; - private Integer categoriaId; - private Integer claseServicioId; - private Integer marcaId; - private Integer origemId; - private Integer destinoId; - private Integer corridaId; - private Date fecCorrida; - private Integer tipoVentaId; - private Date fechorViaje; - private Date fechorVenta; - private Integer puntoVentaId; - private String numOperacion; - private Integer empresaPuntoVentaId; - private Integer empresaCorridaId; - private Integer estacionId; - private Integer usuarioId; - private Integer clienteId; - private BigDecimal precio; - private BigDecimal importeTaxaEmbarque; - private BigDecimal importePedagio; - private BigDecimal importeOutros; - private BigDecimal importeSeguro; - private Integer rutaId; - private Integer formaPagoId; - private BigInteger empresaId; - private Long boletoId; - private Date fecModIf; - private String numFolioPreimpresso; - private String serieImpFiscal; - - public VendaEmbarcadaVO() { - fecModIf = new Date(System.currentTimeMillis()); - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public BigInteger getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(BigInteger empresaId) { - this.empresaId = empresaId; - } - - public Integer getFormaPagoId() { - return formaPagoId; - } - - public void setFormaPagoId(Integer formaPagoId) { - this.formaPagoId = formaPagoId; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public String getNumAsiento() { - return numAsiento; - } - - public void setNumAsiento(String numAsiento) { - this.numAsiento = numAsiento; - } - - public Integer getCategoriaId() { - return categoriaId; - } - - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - - public Integer getClaseServicioId() { - return claseServicioId; - } - - public void setClaseServicioId(Integer claseServicioId) { - this.claseServicioId = claseServicioId; - } - - public Integer getMarcaId() { - return marcaId; - } - - public void setMarcaId(Integer marcaId) { - this.marcaId = marcaId; - } - - public Integer getOrigemId() { - return origemId; - } - - public void setOrigemId(Integer origemId) { - this.origemId = origemId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Date getFecCorrida() { - return fecCorrida; - } - - public void setFecCorrida(Date fecCorrida) { - this.fecCorrida = fecCorrida; - } - - public Integer getTipoVentaId() { - return tipoVentaId; - } - - public void setTipoVentaId(Integer tipoVentaId) { - this.tipoVentaId = tipoVentaId; - } - - public Date getFechorViaje() { - return fechorViaje; - } - - public void setFechorViaje(Date fechorViaje) { - this.fechorViaje = fechorViaje; - } - - public Date getFechorVenta() { - return fechorVenta; - } - - public void setFechorVenta(Date fechorVenta) { - this.fechorVenta = fechorVenta; - } - - public Integer getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - - public String getNumOperacion() { - return numOperacion; - } - - public void setNumOperacion(String numOperacion) { - this.numOperacion = numOperacion; - } - - public Integer getEmpresaPuntoVentaId() { - return empresaPuntoVentaId; - } - - public void setEmpresaPuntoVentaId(Integer empresaPuntoVentaId) { - this.empresaPuntoVentaId = empresaPuntoVentaId; - } - - public Integer getEmpresaCorridaId() { - return empresaCorridaId; - } - - public void setEmpresaCorridaId(Integer empresaCorridaId) { - this.empresaCorridaId = empresaCorridaId; - } - - public Integer getEstacionId() { - return estacionId; - } - - public void setEstacionId(Integer estacionId) { - this.estacionId = estacionId; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getClienteId() { - return clienteId; - } - - public void setClienteId(Integer clienteId) { - this.clienteId = clienteId; - } - - public BigDecimal getPrecio() { - return precio; - } - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - public BigDecimal getImporteTaxaEmbarque() { - return importeTaxaEmbarque; - } - - public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { - this.importeTaxaEmbarque = importeTaxaEmbarque; - } - - public BigDecimal getImportePedagio() { - return importePedagio; - } - - public void setImportePedagio(BigDecimal importePedagio) { - this.importePedagio = importePedagio; - } - - public BigDecimal getImporteOutros() { - return importeOutros; - } - - public void setImporteOutros(BigDecimal importeOutros) { - this.importeOutros = importeOutros; - } - - public BigDecimal getImporteSeguro() { - return importeSeguro; - } - - public void setImporteSeguro(BigDecimal importeSeguro) { - this.importeSeguro = importeSeguro; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public Date getFecModIf() { - return fecModIf; - } - - public void setFecModIf(Date fecModIf) { - this.fecModIf = fecModIf; - } - - public String getNumFolioPreimpresso() { - return numFolioPreimpresso; - } - - public void setNumFolioPreimpresso(String numFolioPreimpresso) { - this.numFolioPreimpresso = numFolioPreimpresso; - } - - public String getSerieImpFiscal() { - return serieImpFiscal; - } - - public void setSerieImpFiscal(String serieImpFiscal) { - this.serieImpFiscal = serieImpFiscal; - } - -} +package com.rjconsultores.ventaboletos.vo.caja; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Date; + +public class VendaEmbarcadaVO { + private Long cajaId; + private String numAsiento; + private Integer categoriaId; + private Integer claseServicioId; + private Integer marcaId; + private Integer origemId; + private Integer destinoId; + private Integer corridaId; + private Date fecCorrida; + private Integer tipoVentaId; + private Date fechorViaje; + private Date fechorVenta; + private Integer puntoVentaId; + private String numOperacion; + private Integer empresaPuntoVentaId; + private Integer empresaCorridaId; + private Integer estacionId; + private Integer usuarioId; + private Integer clienteId; + private BigDecimal precio; + private BigDecimal importeTaxaEmbarque; + private BigDecimal importePedagio; + private BigDecimal importeOutros; + private BigDecimal importeSeguro; + private Integer rutaId; + private Integer formaPagoId; + private BigInteger empresaId; + private Long boletoId; + private Date fecModIf; + private String numFolioPreimpresso; + private String serieImpFiscal; + + public VendaEmbarcadaVO() { + fecModIf = new Date(System.currentTimeMillis()); + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public BigInteger getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(BigInteger empresaId) { + this.empresaId = empresaId; + } + + public Integer getFormaPagoId() { + return formaPagoId; + } + + public void setFormaPagoId(Integer formaPagoId) { + this.formaPagoId = formaPagoId; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public String getNumAsiento() { + return numAsiento; + } + + public void setNumAsiento(String numAsiento) { + this.numAsiento = numAsiento; + } + + public Integer getCategoriaId() { + return categoriaId; + } + + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + + public Integer getClaseServicioId() { + return claseServicioId; + } + + public void setClaseServicioId(Integer claseServicioId) { + this.claseServicioId = claseServicioId; + } + + public Integer getMarcaId() { + return marcaId; + } + + public void setMarcaId(Integer marcaId) { + this.marcaId = marcaId; + } + + public Integer getOrigemId() { + return origemId; + } + + public void setOrigemId(Integer origemId) { + this.origemId = origemId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Date getFecCorrida() { + return fecCorrida; + } + + public void setFecCorrida(Date fecCorrida) { + this.fecCorrida = fecCorrida; + } + + public Integer getTipoVentaId() { + return tipoVentaId; + } + + public void setTipoVentaId(Integer tipoVentaId) { + this.tipoVentaId = tipoVentaId; + } + + public Date getFechorViaje() { + return fechorViaje; + } + + public void setFechorViaje(Date fechorViaje) { + this.fechorViaje = fechorViaje; + } + + public Date getFechorVenta() { + return fechorVenta; + } + + public void setFechorVenta(Date fechorVenta) { + this.fechorVenta = fechorVenta; + } + + public Integer getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + + public String getNumOperacion() { + return numOperacion; + } + + public void setNumOperacion(String numOperacion) { + this.numOperacion = numOperacion; + } + + public Integer getEmpresaPuntoVentaId() { + return empresaPuntoVentaId; + } + + public void setEmpresaPuntoVentaId(Integer empresaPuntoVentaId) { + this.empresaPuntoVentaId = empresaPuntoVentaId; + } + + public Integer getEmpresaCorridaId() { + return empresaCorridaId; + } + + public void setEmpresaCorridaId(Integer empresaCorridaId) { + this.empresaCorridaId = empresaCorridaId; + } + + public Integer getEstacionId() { + return estacionId; + } + + public void setEstacionId(Integer estacionId) { + this.estacionId = estacionId; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getClienteId() { + return clienteId; + } + + public void setClienteId(Integer clienteId) { + this.clienteId = clienteId; + } + + public BigDecimal getPrecio() { + return precio; + } + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + public BigDecimal getImporteTaxaEmbarque() { + return importeTaxaEmbarque; + } + + public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { + this.importeTaxaEmbarque = importeTaxaEmbarque; + } + + public BigDecimal getImportePedagio() { + return importePedagio; + } + + public void setImportePedagio(BigDecimal importePedagio) { + this.importePedagio = importePedagio; + } + + public BigDecimal getImporteOutros() { + return importeOutros; + } + + public void setImporteOutros(BigDecimal importeOutros) { + this.importeOutros = importeOutros; + } + + public BigDecimal getImporteSeguro() { + return importeSeguro; + } + + public void setImporteSeguro(BigDecimal importeSeguro) { + this.importeSeguro = importeSeguro; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public Date getFecModIf() { + return fecModIf; + } + + public void setFecModIf(Date fecModIf) { + this.fecModIf = fecModIf; + } + + public String getNumFolioPreimpresso() { + return numFolioPreimpresso; + } + + public void setNumFolioPreimpresso(String numFolioPreimpresso) { + this.numFolioPreimpresso = numFolioPreimpresso; + } + + public String getSerieImpFiscal() { + return serieImpFiscal; + } + + public void setSerieImpFiscal(String serieImpFiscal) { + this.serieImpFiscal = serieImpFiscal; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/cashmonitor/RelatorioVendaCartaoCashMonitorVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/cashmonitor/RelatorioVendaCartaoCashMonitorVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/cashmonitor/RelatorioVendaCartaoCashMonitorVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/cashmonitor/RelatorioVendaCartaoCashMonitorVO.java index 3f05bcd40..58a9232da 100644 --- a/src/com/rjconsultores/ventaboletos/vo/cashmonitor/RelatorioVendaCartaoCashMonitorVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/cashmonitor/RelatorioVendaCartaoCashMonitorVO.java @@ -1,122 +1,122 @@ -package com.rjconsultores.ventaboletos.vo.cashmonitor; - -import java.io.Serializable; -import java.math.BigDecimal; - -@SuppressWarnings("serial") -public class RelatorioVendaCartaoCashMonitorVO implements Serializable { - - private String dataTransacao; - private String loja; - private String adquirente; - private String nsu; - private String autorizacao; - private BigDecimal valorBruto; - private Integer formapago_id; - private String bandeira; - private String codigoPedido; - private BigDecimal valorParcela; - private Integer parcelas; - - public String getDataTransacao() { - return dataTransacao; - } - - public String getLoja() { - return loja; - } - - public String getAdquirente() { - return adquirente; - } - - public String getNsu() { - return nsu; - } - - public String getAutorizacao() { - return autorizacao; - } - - public BigDecimal getValorBruto() { - return valorBruto; - } - - public Integer getFormapago_id() { - return formapago_id; - } - - public String getBandeira() { - return bandeira; - } - - public String getCodigoPedido() { - return codigoPedido; - } - - public BigDecimal getValorParcela() { - return valorParcela; - } - - public Integer getParcelas() { - return parcelas; - } - - public void setDataTransacao(String dataTransacao) { - this.dataTransacao = dataTransacao; - } - - public void setLoja(String loja) { - this.loja = loja; - } - - public void setAdquirente(String adquirente) { - this.adquirente = adquirente; - } - - public void setNsu(String nsu) { - this.nsu = nsu; - } - - public void setAutorizacao(String autorizacao) { - this.autorizacao = autorizacao; - } - - public void setValorBruto(BigDecimal valorBruto) { - this.valorBruto = valorBruto; - } - - public void setFormapago_id(Integer formapago_id) { - this.formapago_id = formapago_id; - } - - public void setBandeira(String bandeira) { - this.bandeira = bandeira; - } - - public void setCodigoPedido(String codigoPedido) { - this.codigoPedido = codigoPedido; - } - - public void setValorParcela(BigDecimal valorParcela) { - this.valorParcela = valorParcela; - } - - public void setParcelas(Integer parcelas) { - this.parcelas = parcelas; - } - - public String getCondicaoVenda() { - // Espec01 - Relatorio de vendas de cartões.docx - // CONDICAO DE VENDA: Débito/a vista/parcelada - if (getFormapago_id()==3) { - return "Débito"; - } else { - if (getParcelas() == 1) { - return "a vista"; - } else { - return "parcelada"; - } - } - } +package com.rjconsultores.ventaboletos.vo.cashmonitor; + +import java.io.Serializable; +import java.math.BigDecimal; + +@SuppressWarnings("serial") +public class RelatorioVendaCartaoCashMonitorVO implements Serializable { + + private String dataTransacao; + private String loja; + private String adquirente; + private String nsu; + private String autorizacao; + private BigDecimal valorBruto; + private Integer formapago_id; + private String bandeira; + private String codigoPedido; + private BigDecimal valorParcela; + private Integer parcelas; + + public String getDataTransacao() { + return dataTransacao; + } + + public String getLoja() { + return loja; + } + + public String getAdquirente() { + return adquirente; + } + + public String getNsu() { + return nsu; + } + + public String getAutorizacao() { + return autorizacao; + } + + public BigDecimal getValorBruto() { + return valorBruto; + } + + public Integer getFormapago_id() { + return formapago_id; + } + + public String getBandeira() { + return bandeira; + } + + public String getCodigoPedido() { + return codigoPedido; + } + + public BigDecimal getValorParcela() { + return valorParcela; + } + + public Integer getParcelas() { + return parcelas; + } + + public void setDataTransacao(String dataTransacao) { + this.dataTransacao = dataTransacao; + } + + public void setLoja(String loja) { + this.loja = loja; + } + + public void setAdquirente(String adquirente) { + this.adquirente = adquirente; + } + + public void setNsu(String nsu) { + this.nsu = nsu; + } + + public void setAutorizacao(String autorizacao) { + this.autorizacao = autorizacao; + } + + public void setValorBruto(BigDecimal valorBruto) { + this.valorBruto = valorBruto; + } + + public void setFormapago_id(Integer formapago_id) { + this.formapago_id = formapago_id; + } + + public void setBandeira(String bandeira) { + this.bandeira = bandeira; + } + + public void setCodigoPedido(String codigoPedido) { + this.codigoPedido = codigoPedido; + } + + public void setValorParcela(BigDecimal valorParcela) { + this.valorParcela = valorParcela; + } + + public void setParcelas(Integer parcelas) { + this.parcelas = parcelas; + } + + public String getCondicaoVenda() { + // Espec01 - Relatorio de vendas de cartões.docx + // CONDICAO DE VENDA: Débito/a vista/parcelada + if (getFormapago_id()==3) { + return "Débito"; + } else { + if (getParcelas() == 1) { + return "a vista"; + } else { + return "parcelada"; + } + } + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/vo/clase/ClaseVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/clase/ClaseVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/clase/ClaseVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/clase/ClaseVO.java index 295196674..75636c8ad 100644 --- a/src/com/rjconsultores/ventaboletos/vo/clase/ClaseVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/clase/ClaseVO.java @@ -1,36 +1,36 @@ -package com.rjconsultores.ventaboletos.vo.clase; - -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; - -public class ClaseVO { - private Integer claseId; - private String descClase; - - public ClaseVO(Integer claseId, String descClase) { - super(); - this.claseId = claseId; - this.descClase = descClase; - } - - public ClaseVO(ClaseServicio clase) { - this.claseId = clase.getClaseservicioId(); - this.descClase = clase.getDescclase(); - } - - public Integer getClaseId() { - return claseId; - } - - public void setClaseId(Integer claseId) { - this.claseId = claseId; - } - - public String getDescClase() { - return descClase; - } - - public void setDescClase(String descClase) { - this.descClase = descClase; - } - -} +package com.rjconsultores.ventaboletos.vo.clase; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; + +public class ClaseVO { + private Integer claseId; + private String descClase; + + public ClaseVO(Integer claseId, String descClase) { + super(); + this.claseId = claseId; + this.descClase = descClase; + } + + public ClaseVO(ClaseServicio clase) { + this.claseId = clase.getClaseservicioId(); + this.descClase = clase.getDescclase(); + } + + public Integer getClaseId() { + return claseId; + } + + public void setClaseId(Integer claseId) { + this.claseId = claseId; + } + + public String getDescClase() { + return descClase; + } + + public void setDescClase(String descClase) { + this.descClase = descClase; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java index 0bd8089b9..216c040f3 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java @@ -1,1088 +1,1088 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.constantes.Constantes; -import com.rjconsultores.ventaboletos.constantes.DescricaoTipoVenta; -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; -import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -public class BoletoComissao { - - private Long boletoId; - private Long boletoOriginalId; - private Integer empresaId; - private Integer puntoVentaId; - private String datavenda; - private Integer tipoVenta; - private String indstatusboleto; - private Integer motivoCancelacionId; - private Integer motivoCancelacionOriginal1; - private Integer motivoCancelacionOriginal2; - private String descmotivocancelacion; - private BigDecimal valorbase; - private BigDecimal valorpagado; - private BigDecimal valorTabela; - private BigDecimal seguro; - private BigDecimal pedagio; - private BigDecimal embarque; - private BigDecimal excessoBagagem; - private BigDecimal seguroOpcional; - private BigDecimal seguroOutros; - private Boolean ptoVtaOrigem; - private String numAsiento; - private String numAsientoVinculado; - private String numFolioSistema; - private String numSeriePreimpresa; - private String numFolioPreImpreso; - private String uf; - private String desccategoria; - private String nombpasajero; - private Integer status; - private String numoperacion; - private Integer tipoVentaOriginal1; - private Integer tipoVentaOriginal2; - private Integer ocdId; - private BigDecimal valorPagarOcd; - private BigDecimal valorTarjetaOcd; - - private Integer estadoId; - private Integer formapagoId; - private String descpago; - private Boolean indconferenciafisicacomissao; - private BigDecimal importeFp; - - private List formapagos; - private BigDecimal icmsBase; - private String nombusuario; - private Integer comempformapagoId; - private Integer comempcategoriaId; - private Long logconferenciaId; - - private boolean exigeConferenciaDevolvido; - private Boolean indcarboletosdevolvidosconf; - - private boolean exigeConferenciaAba; - - private boolean conferido; - - private Date feccorrida; - - private Integer corridaId; - - private Boolean indCancelacion; - - private Boolean indreimpresion; - - private Integer tipoventaAnteriorId; - - private Long cajaId; - - private Long transacaoOriginalId; - - private Conferencia conferencia; - - private Date feccorte; - - private Long transacaoId; - - private Boolean conferidoEntrega; - - private Integer ptovtaventaId; - - private Integer usuarioId; - - private Integer turnoId; - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Integer getPuntoVentaId() { - return puntoVentaId; - } - - public void setPuntoVentaId(Integer puntoVentaId) { - this.puntoVentaId = puntoVentaId; - } - - public String getDatavenda() { - return datavenda; - } - - public void setDatavenda(String datavenda) { - this.datavenda = datavenda; - } - - public Integer getTipoVenta() { - return tipoVenta; - } - - public void setTipoVenta(Integer tipoVenta) { - this.tipoVenta = tipoVenta; - } - - public Integer getMotivoCancelacionId() { - return motivoCancelacionId; - } - - public void setMotivoCancelacionId(Integer motivoCancelacionId) { - this.motivoCancelacionId = motivoCancelacionId; - } - - public BigDecimal getValorpagado() { - return valorpagado; - } - - public void setValorpagado(BigDecimal valorpagado) { - this.valorpagado = valorpagado; - } - - public BigDecimal getSeguro() { - return seguro; - } - - public void setSeguro(BigDecimal seguro) { - this.seguro = seguro; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getEmbarque() { - return embarque; - } - - public void setEmbarque(BigDecimal embarque) { - this.embarque = embarque; - } - - public BigDecimal getExcessoBagagem() { - return excessoBagagem; - } - - public void setExcessoBagagem(BigDecimal excessoBagagem) { - this.excessoBagagem = excessoBagagem; - } - - public BigDecimal getSeguroOpcional() { - return seguroOpcional; - } - - public void setSeguroOpcional(BigDecimal seguroOpcional) { - this.seguroOpcional = seguroOpcional; - } - - public BigDecimal getSeguroOutros() { - return seguroOutros; - } - - public void setSeguroOutros(BigDecimal seguroOutros) { - this.seguroOutros = seguroOutros; - } - - public void setPtoVtaOrigem(Boolean ptoVtaOrigem) { - this.ptoVtaOrigem = ptoVtaOrigem; - } - - public String getIndstatusboleto() { - return indstatusboleto; - } - - public void setIndstatusboleto(String indstatusboleto) { - this.indstatusboleto = indstatusboleto; - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public void setBoletoOriginalId(Long boletoOriginalId) { - this.boletoOriginalId = boletoOriginalId; - } - - public Long getBoletoOriginalId() { - return boletoOriginalId; - } - - public String getNumAsiento() { - return numAsiento; - } - - public void setNumAsiento(String numAsiento) { - this.numAsiento = numAsiento; - } - - public String getNumFolioSistema() { - return numFolioSistema; - } - - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - - public String getNumSeriePreimpresa() { - return numSeriePreimpresa; - } - - public void setNumSeriePreimpresa(String numSeriePreimpresa) { - this.numSeriePreimpresa = numSeriePreimpresa; - } - - public String getNumFolioPreImpreso() { - return numFolioPreImpreso; - } - - public void setNumFolioPreImpreso(String numFolioPreImpreso) { - this.numFolioPreImpreso = numFolioPreImpreso; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getDesccategoria() { - return desccategoria; - } - - public void setDesccategoria(String desccategoria) { - this.desccategoria = desccategoria; - } - - public Boolean getPtoVtaOrigem() { - return ptoVtaOrigem; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getStatusDescricao() { - StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); - if (statusLogConferencia != null) { - return statusLogConferencia.toString(); - } - return ""; - } - - public String getDescFormapagos() { - StringBuilder sFormapagos = new StringBuilder(); - for (FormapagoVO formapago : formapagos) { - if (sFormapagos.length() > 0) { - sFormapagos.append(", "); - } - sFormapagos.append(formapago.getDescpago()); - } - - return sFormapagos.toString(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getCajaId() == null) ? 0 : getCajaId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - BoletoComissao other = (BoletoComissao) obj; - if (getCajaId() == null) { - if (other.getCajaId() != null) - return false; - } else if (!getCajaId().equals(other.getCajaId())) - return false; - return true; - } - - public Integer getFormapagoId() { - return formapagoId; - } - - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - - public String getDescpago() { - return descpago; - } - - public void setDescpago(String descpago) { - this.descpago = descpago; - } - - public Boolean getIndconferenciafisicacomissao() { - return indconferenciafisicacomissao; - } - - public void setIndconferenciafisicacomissao(Boolean indconferenciafisicacomissao) { - this.indconferenciafisicacomissao = indconferenciafisicacomissao; - } - - public List getFormapagos() { - return formapagos; - } - - public void setFormapagos(List formapagos) { - this.formapagos = formapagos; - } - - public BigDecimal getIcmsBase() { - return icmsBase; - } - - public void setIcmsBase(BigDecimal icmsBase) { - this.icmsBase = icmsBase; - } - - public String getDescmotivocancelacion() { - return descmotivocancelacion; - } - - public void setDescmotivocancelacion(String descmotivocancelacion) { - this.descmotivocancelacion = descmotivocancelacion; - } - - public Integer getEstadoId() { - return estadoId; - } - - public void setEstadoId(Integer estadoId) { - this.estadoId = estadoId; - } - - public String getNumAsientoVinculado() { - return numAsientoVinculado; - } - - public void setNumAsientoVinculado(String numAsientoVinculado) { - this.numAsientoVinculado = numAsientoVinculado; - } - - public BigDecimal getTotal() { - BigDecimal total = BigDecimal.ZERO; - for (FormapagoVO formapagoVO : formapagos) { - total = total.add(formapagoVO.getImporte()); - } - return total; - } - - public String getDescTipoVenta() { - return DescricaoTipoVenta.getDescricaoTipoVenta(getTipoVenta()); - } - - public String getSituacaoBilhete() { - if (isOcd()) { - return "OCD"; - } - - if(isMotivocancelacionAgrupamento()) { - return getDescmotivocancelacion(); - } - - if(isStatusVendido()) { - return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()).getValue(); - } - - if ((isStatusCancelado()) && (isMotivocancelacionDevolvido() || isMotivocancelacionCancelado()) - && StringUtils.isNotBlank(getDescmotivocancelacion())) { - return getDescmotivocancelacion(); - } - - if (isStatusCancelado()) { - if (isMotivocancelacionTrocado() || (isMotivocancelacionGeracaoOcd() && isFormapagoTrocaPassagem())) { - return "TROCADO"; - } else if (isMotivocancelacionTransferido()) { - return "TRANSFERIDO"; - } - } - - if (isStatusTroca()) { - if (isVendaBilheteTroca(getTipoVenta()) || isVendaGap(getTipoVenta())) { - return "B. DA TROCA"; - } else if (isVendaBilheteTransferencia(getTipoVenta()) || isVendaGap(getTipoVenta())) { - return "B. DA TRANSFERENCIA"; - } else if (isVendaBilheteConfirmaAberto(getTipoVenta())) { - return "CONFIRMAÇÃO ABERTO"; - } else if (isVendaBilheteCheckin(getTipoVenta())) { - return "CHECKIN"; - } - } - - IndStatusBoleto indStatusBoleto = IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()); - return indStatusBoleto != null ? indStatusBoleto.getValue() : ""; - } - - public boolean isFormapagoTrocaPassagem() { - boolean fpTrocapassagem = false; - for (FormapagoVO formapagoVO : formapagos) { - fpTrocapassagem = formapagoVO.getFormapagoId().equals(Constantes.FORMA_PAGO_TROCA_PASSAGEM.intValue()); - } - return fpTrocapassagem; - } - - public boolean isOcd() { - return isMotivocancelacionGeracaoOcd() && isStatusCancelado() && !isFormapagoTrocaPassagem(); - } - - public String getNombusuario() { - return nombusuario; - } - - public void setNombusuario(String nombusuario) { - this.nombusuario = nombusuario; - } - - public BigDecimal getImporteFp() { - return importeFp; - } - - public void setImporteFp(BigDecimal importeFp) { - this.importeFp = importeFp; - } - - public Integer getComempformapagoId() { - return comempformapagoId; - } - - public void setComempformapagoId(Integer comempformapagoId) { - this.comempformapagoId = comempformapagoId; - } - - public Integer getComempcategoriaId() { - return comempcategoriaId; - } - - public void setComempcategoriaId(Integer comempcategoriaId) { - this.comempcategoriaId = comempcategoriaId; - } - - public boolean isExigeConferencia() { - return getComempcategoriaId() != null || getComempformapagoId() != null; - } - - public boolean isExigeConferenciaBoletoDevolvido() { - return exigeConferenciaDevolvido; - } - - public boolean isConferido() { - return conferido; - } - - public void setConferido(boolean conferido) { - this.conferido = conferido; - } - - public Long getLogconferenciaId() { - return logconferenciaId; - } - - public void setLogconferenciaId(Long logconferenciaId) { - this.logconferenciaId = logconferenciaId; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public Integer getTipoVentaOriginal() { - return tipoVenta; - } - - public Integer getTipoVentaOriginal1() { - return tipoVentaOriginal1; - } - - public void setTipoVentaOriginal1(Integer tipoVentaOriginal1) { - this.tipoVentaOriginal1 = tipoVentaOriginal1; - } - - public Integer getTipoVentaOriginal2() { - return tipoVentaOriginal2; - } - - public void setTipoVentaOriginal2(Integer tipoVentaOriginal2) { - this.tipoVentaOriginal2 = tipoVentaOriginal2; - } - - public Integer getOcdId() { - return ocdId; - } - - public void setOcdId(Integer ocdId) { - this.ocdId = ocdId; - } - -/* private boolean isBoletoOriginal() { - return boletoOriginalId == null - && getMotivoCancelacionOriginal() != null - && getMotivoCancelacionOriginal() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue(); - }*/ - - public Integer getMotivoCancelacionOriginal() { - return motivoCancelacionOriginal2 != null ? motivoCancelacionOriginal2 : motivoCancelacionOriginal1; - } - - public Integer getMotivoCancelacionOriginal1() { - return motivoCancelacionOriginal1; - } - - public void setMotivoCancelacionOriginal1(Integer motivoCancelacionOriginal1) { - this.motivoCancelacionOriginal1 = motivoCancelacionOriginal1; - } - - public Integer getMotivoCancelacionOriginal2() { - return motivoCancelacionOriginal2; - } - - public void setMotivoCancelacionOriginal2(Integer motivoCancelacionOriginal2) { - this.motivoCancelacionOriginal2 = motivoCancelacionOriginal2; - } - - public boolean isVendaManual(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_MANUAL.intValue(); - } - - public boolean isVendaGap(Integer tipoVenta) { - return tipoVenta != null && (tipoVenta == Constantes.TPV_BOLETO_REMOTO.intValue() - || tipoVenta == Constantes.TPV_CALL_CENTER.intValue() - || tipoVenta == Constantes.TPV_POR_INTERNET.intValue()); - } - - public boolean isVendaBilheteNormal(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_DIRECTO_NORMAL.intValue(); - } - - public boolean isVendaBilheteTroca(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_TRANSFERENCIAS.intValue(); - } - - public boolean isVendaBilheteTransferencia(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_CAMBIO_VIAJE.intValue(); - } - - public boolean isVendaBilheteManual(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_MANUAL.intValue(); - } - - public boolean isVendaBilheteAbertoManual(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_VENDA_BOLETO_ABERTO_MANUAL.intValue(); - } - - public boolean isVendaBilheteAberto(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_BOLETO_ABIERTO.intValue(); - } - - public boolean isVendaBilheteConfirmaAberto(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_CONFIRMA_ABIERTO.intValue(); - } - - public boolean isVendaBilheteCheckin(Integer tipoVenta) { - return tipoVenta != null && tipoVenta == Constantes.TPV_CHECKIN_VIAGEM.intValue(); - } - - public boolean isSemMotivocancelacion() { - return getMotivoCancelacionId() == null; - } - - public boolean isMotivocancelacionAgrupamento() { - return !isSemMotivocancelacion() && getMotivoCancelacionId() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue(); - } - - public boolean isMotivocancelacionCancelado() { - return !isSemMotivocancelacion() && getMotivoCancelacionId() == Constantes.MVO_CANCEL_CANCELACION.intValue(); - } - - public boolean isMotivocancelacionDevolvido() { - return !isSemMotivocancelacion() && (getMotivoCancelacionId() == Constantes.MVO_CANCEL_DEVOLUCAO.intValue() - || getMotivoCancelacionId() == Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_50.intValue() - || getMotivoCancelacionId() == Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_100.intValue()); - } - - public boolean isMotivocancelacionEntregaGap() { - return !isSemMotivocancelacion() - && getMotivoCancelacionId() == Constantes.MVO_CANCEL_BOLETO_ENTREGADO.intValue(); - } - - public boolean isMotivocancelacionTransferido() { - return !isSemMotivocancelacion() - && getMotivoCancelacionId() == Constantes.MVO_CANCEL_TRANSFERENCIA.intValue(); - } - - public boolean isMotivocancelacionTrocado() { - return !isSemMotivocancelacion() - && getMotivoCancelacionId() == Constantes.MVO_CANCEL_TROCA.intValue(); - } - - public boolean isMotivocancelacionCheckin() { - return !isSemMotivocancelacion() - && getMotivoCancelacionId() == Constantes.MVO_CANCEL_CHECKIN.intValue(); - } - - public boolean isMotivocancelacionGeracaoOcd() { - return !isSemMotivocancelacion() - && getMotivoCancelacionId() == Constantes.MVO_CANCEL_GERACAO_OCD.intValue(); - } - - public boolean isMotivocancelacionQuitacaoOcd() { - return !isSemMotivocancelacion() - && getMotivoCancelacionId() == Constantes.MVO_CANCEL_QUITACAO_OCD.intValue(); - } - - /** ABA BILHETE MANUAL */ - public boolean isBilhetesManualVendido() { - return (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao - (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida; - } - - /** ABA BILHETE MANUAL */ - public boolean isBilhetesAbertoManualVendido() { - return (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao - (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida; - } - - public boolean isStatusVendido() { - return IndStatusBoleto.V.equals(getIndstatusboletoEnum()); - } - - public boolean isStatusCancelado() { - return IndStatusBoleto.C.equals(getIndstatusboletoEnum()); - } - - public boolean isStatusEntregue() { - return IndStatusBoleto.E.equals(getIndstatusboletoEnum()); - } - - public boolean isStatusTroca() { - return IndStatusBoleto.T.equals(getIndstatusboletoEnum()); - } - - public boolean isStatusExtraviado() { - return IndStatusBoleto.X.equals(getIndstatusboletoEnum()); - } - - public boolean isStatusMarcado() { - return IndStatusBoleto.M.equals(getIndstatusboletoEnum()); - } - - public String getNombpasajero() { - return nombpasajero; - } - - public void setNombpasajero(String nombpasajero) { - this.nombpasajero = nombpasajero; - } - - public boolean isBilheteEntregaConferidoVenda() { - return isStatusEntregue() && this.getLogconferenciaId() != null; - } - - public IndStatusBoleto getIndstatusboletoEnum() { - return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()); - } - - public Boolean getIndcarboletosdevolvidosconf() { - return indcarboletosdevolvidosconf; - } - - public void setIndcarboletosdevolvidosconf(Boolean indcarboletosdevolvidosconf) { - this.indcarboletosdevolvidosconf = indcarboletosdevolvidosconf; - } - - public boolean getExigeConferenciaDevolvido() { - return exigeConferenciaDevolvido; - } - - public void setExigeConferenciaDevolvido(boolean exigeConferenciaDevolvido) { - this.exigeConferenciaDevolvido = exigeConferenciaDevolvido; - } - - public boolean isExigeConferenciaAba() { - return exigeConferenciaAba; - } - - public void setExigeConferenciaAba(boolean exigeConferenciaAba) { - this.exigeConferenciaAba = exigeConferenciaAba; - } - - public Date getFeccorrida() { - return feccorrida; - } - - public void setFeccorrida(Date feccorrida) { - this.feccorrida = feccorrida; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public BigDecimal getValorTabela() { - return valorTabela; - } - - public void setValorTabela(BigDecimal valorTabela) { - this.valorTabela = valorTabela; - } - - public String getFeccorridaServico() { - StringBuilder str = new StringBuilder(); - if (getFeccorrida() != null) { - str.append(DateUtil.getStringDate(getFeccorrida(), "dd/MM")); - } - if (getCorridaId() != null) { - if (str.length() > 0) { - str.append(" - "); - } - str.append(getCorridaId()); - } - - return str.toString(); - } - - public boolean isBilheteGap() { - return isAbaGapVendido() || isAbaGapCancelado() || isAbaGapDevolvido(); - } - - public boolean isTotalizarFormapago() { - boolean totalizar = isTotalizarTipovenda(); - if(totalizar) { - totalizar = !isOcd(); - } - if(totalizar) { - totalizar = !getIndreimpresion(); - } - if(totalizar) { - totalizar = !(isStatusTroca() && isVendaBilheteTransferencia(getTipoVenta())); - } - if(totalizar) { - totalizar = !isVendaBilheteConfirmaAberto(getTipoVenta()); - } - return totalizar; - } - - public boolean isTotalizarTipovenda() { - return isAbaBilheteManual() || - isAbaBilheteVendido() || - isAbaBilheteCancelado() || - isAbaBilheteDevolvido() || - isAbaGapVendido() || - isAbaGapCancelado() || - isAbaGapDevolvido(); - } - - public String getOrderExigeConferencia() { - if (isExigeConferenciaAba() || isExigeConferencia() || isExigeConferenciaBoletoDevolvido()) { - if (!isConferido()) { - return "A"; - } else if (isConferido()) { - return "B"; - } - } - return "C"; - } - - public Date getOrderDataMovimento(){ - return conferencia.getDatamovimento(); - } - - /** Define bilhete na aba de venda manual */ - public boolean isAbaBilheteManual() { - return isBilhetesManualVendido() || - isBilhetesAbertoManualVendido(); - } - - /** Define bilhete na aba de venda normal */ - public boolean isAbaBilheteVendido() { - if(isVendaManual(getTipoVenta()) || isVendaBilheteAbertoManual(getTipoVenta())) { - return false; - } - - if(isStatusCancelado()) { - return false; - } - - if(isVendaGap(getTipoVenta()) && !isStatusEntregue()) { - return false; - } - - return isStatusVendido() || isStatusTroca() || isStatusEntregue() || isVendaBilheteTransferencia(getTipoVenta()); - } - public boolean isQuitacaoOCD() { - if(getMotivoCancelacionId() != null){ - if(getMotivoCancelacionId() == Constantes.MVO_CANCEL_QUITACAO_OCD.intValue()){ - return true; - } - } - return false; - } - - /** Define bilhete na aba de venda cancelada */ - public boolean isAbaBilheteCancelado() { - if(isVendaManual(getTipoVenta()) && isStatusCancelado()) { - return isMotivocancelacionCancelado(); - } - - - if(isVendaManual(getTipoVenta()) || isVendaBilheteAbertoManual(getTipoVenta())) { - return false; - } - - if(!isStatusCancelado()) { - return false; - } - - if(isVendaGap(getTipoVenta()) && isNotNumFolioPreImpressoGerado()) { - return false; - } - - return isMotivocancelacionCancelado(); - } - - /** Define bilhete na aba de venda devolvida */ - public boolean isAbaBilheteDevolvido() { - - if(isVendaManual(getTipoVenta()) || isVendaBilheteAbertoManual(getTipoVenta())) { - if(isMotivocancelacionDevolvido() || isMotivocancelacionGeracaoOcd() || isMotivocancelacionTrocado()) { - return true; - } - return false; - } - - if(!isStatusCancelado()) { - return false; - } - - if(isVendaGap(getTipoVenta()) && isNotNumFolioPreImpressoGerado()) { - return false; - } - - return isMotivocancelacionDevolvido() || isMotivocancelacionGeracaoOcd() || isMotivocancelacionTrocado() || isMotivocancelacionTransferido(); - } - - /** Define bilhete na aba de gap */ - public boolean isAbaGapVendido() { - if(isStatusCancelado()) { - return false; - } - - if((!isVendaGap(getTipoVenta()) && !isVendaBilheteTransferencia(getTipoVenta()))) { - return false; - } - - return (isStatusVendido() || isStatusTroca()) && isNotNumFolioPreImpressoGerado(); - } - - /** Define bilhete na aba de gap cancelada */ - public boolean isAbaGapCancelado() { - if(!isStatusCancelado()) { - return false; - } - - if(!isVendaGap(getTipoVenta())) { - return false; - } - - return isMotivocancelacionCancelado() && isNotNumFolioPreImpressoGerado(); - } - - /** Define bilhete na aba de gap devolvida */ - public boolean isAbaGapDevolvido() { - if(!isStatusCancelado()) { - return false; - } - - if(!isVendaGap(getTipoVenta())) { - return false; - } - - return (isMotivocancelacionDevolvido() || isMotivocancelacionGeracaoOcd() || isMotivocancelacionTrocado()) && isNotNumFolioPreImpressoGerado(); - } - - public BigDecimal getValorPagarOcd() { - return valorPagarOcd; - } - - public void setValorPagarOcd(BigDecimal valorPagarOcd) { - this.valorPagarOcd = valorPagarOcd; - } - - public BigDecimal getValorTarjetaOcd() { - return valorTarjetaOcd; - } - - public void setValorTarjetaOcd(BigDecimal valorTarjetaOcd) { - this.valorTarjetaOcd = valorTarjetaOcd; - } - - public Boolean getIndCancelacion() { - return indCancelacion; - } - - public void setIndCancelacion(Boolean indCancelacion) { - this.indCancelacion = indCancelacion; - } - - public Integer getTipoventaAnteriorId() { - return tipoventaAnteriorId; - } - - public void setTipoventaAnteriorId(Integer tipoventaAnteriorId) { - this.tipoventaAnteriorId = tipoventaAnteriorId; - } - - private boolean isNotNumFolioPreImpressoGerado() { - return StringUtils.isBlank(getNumFolioPreImpreso()); - } - - public Boolean getIndreimpresion() { - return indreimpresion != null ? indreimpresion : false; - } - - public void setIndreimpresion(Boolean indreimpresion) { - this.indreimpresion = indreimpresion; - } - - @Override - public String toString() { - return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", nombpasajero=" + nombpasajero + ", total=" + getTotal() + "]"; - } - - public boolean isNotSomarBilhete() { - if(getIndreimpresion()) { - return true; - } - - return false; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public Long getTransacaoOriginalId() { - return transacaoOriginalId; - } - - public void setTransacaoOriginalId(Long transacaoOriginalId) { - this.transacaoOriginalId = transacaoOriginalId; - } - - public Conferencia getConferencia() { - return conferencia; - } - - public void setConferencia(Conferencia conferencia) { - this.conferencia = conferencia; - } - - public Date getFeccorte() { - return feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public BigDecimal getValorbase() { - return valorbase; - } - - public void setValorbase(BigDecimal valorbase) { - this.valorbase = valorbase; - } - - public Long getTransacaoId() { - return transacaoId; - } - - public void setTransacaoId(Long transacaoId) { - this.transacaoId = transacaoId; - } - - public Boolean getConferidoEntrega() { - return conferidoEntrega; - } - - public void setConferidoEntrega(Boolean conferidoEntrega) { - this.conferidoEntrega = conferidoEntrega; - } - - /** - * Retorna TRUE se o motivo de cancelamento for uma geração de OCD e a forma de pagamento for geração de OCD - * @return - */ - public boolean isDiferencaTrocaGeracaoOcd() { - return isMotivocancelacionGeracaoOcd() && - getFormapagoId() != null && getFormapagoId() == Constantes.FORMA_PAGO_GERACAO_OCD.intValue(); - } - - public Integer getPtovtaventaId() { - return ptovtaventaId; - } - - public void setPtovtaventaId(Integer ptovtaventaId) { - this.ptovtaventaId = ptovtaventaId; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getTurnoId() { - return turnoId; - } - - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.constantes.DescricaoTipoVenta; +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; +import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +public class BoletoComissao { + + private Long boletoId; + private Long boletoOriginalId; + private Integer empresaId; + private Integer puntoVentaId; + private String datavenda; + private Integer tipoVenta; + private String indstatusboleto; + private Integer motivoCancelacionId; + private Integer motivoCancelacionOriginal1; + private Integer motivoCancelacionOriginal2; + private String descmotivocancelacion; + private BigDecimal valorbase; + private BigDecimal valorpagado; + private BigDecimal valorTabela; + private BigDecimal seguro; + private BigDecimal pedagio; + private BigDecimal embarque; + private BigDecimal excessoBagagem; + private BigDecimal seguroOpcional; + private BigDecimal seguroOutros; + private Boolean ptoVtaOrigem; + private String numAsiento; + private String numAsientoVinculado; + private String numFolioSistema; + private String numSeriePreimpresa; + private String numFolioPreImpreso; + private String uf; + private String desccategoria; + private String nombpasajero; + private Integer status; + private String numoperacion; + private Integer tipoVentaOriginal1; + private Integer tipoVentaOriginal2; + private Integer ocdId; + private BigDecimal valorPagarOcd; + private BigDecimal valorTarjetaOcd; + + private Integer estadoId; + private Integer formapagoId; + private String descpago; + private Boolean indconferenciafisicacomissao; + private BigDecimal importeFp; + + private List formapagos; + private BigDecimal icmsBase; + private String nombusuario; + private Integer comempformapagoId; + private Integer comempcategoriaId; + private Long logconferenciaId; + + private boolean exigeConferenciaDevolvido; + private Boolean indcarboletosdevolvidosconf; + + private boolean exigeConferenciaAba; + + private boolean conferido; + + private Date feccorrida; + + private Integer corridaId; + + private Boolean indCancelacion; + + private Boolean indreimpresion; + + private Integer tipoventaAnteriorId; + + private Long cajaId; + + private Long transacaoOriginalId; + + private Conferencia conferencia; + + private Date feccorte; + + private Long transacaoId; + + private Boolean conferidoEntrega; + + private Integer ptovtaventaId; + + private Integer usuarioId; + + private Integer turnoId; + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Integer getPuntoVentaId() { + return puntoVentaId; + } + + public void setPuntoVentaId(Integer puntoVentaId) { + this.puntoVentaId = puntoVentaId; + } + + public String getDatavenda() { + return datavenda; + } + + public void setDatavenda(String datavenda) { + this.datavenda = datavenda; + } + + public Integer getTipoVenta() { + return tipoVenta; + } + + public void setTipoVenta(Integer tipoVenta) { + this.tipoVenta = tipoVenta; + } + + public Integer getMotivoCancelacionId() { + return motivoCancelacionId; + } + + public void setMotivoCancelacionId(Integer motivoCancelacionId) { + this.motivoCancelacionId = motivoCancelacionId; + } + + public BigDecimal getValorpagado() { + return valorpagado; + } + + public void setValorpagado(BigDecimal valorpagado) { + this.valorpagado = valorpagado; + } + + public BigDecimal getSeguro() { + return seguro; + } + + public void setSeguro(BigDecimal seguro) { + this.seguro = seguro; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getEmbarque() { + return embarque; + } + + public void setEmbarque(BigDecimal embarque) { + this.embarque = embarque; + } + + public BigDecimal getExcessoBagagem() { + return excessoBagagem; + } + + public void setExcessoBagagem(BigDecimal excessoBagagem) { + this.excessoBagagem = excessoBagagem; + } + + public BigDecimal getSeguroOpcional() { + return seguroOpcional; + } + + public void setSeguroOpcional(BigDecimal seguroOpcional) { + this.seguroOpcional = seguroOpcional; + } + + public BigDecimal getSeguroOutros() { + return seguroOutros; + } + + public void setSeguroOutros(BigDecimal seguroOutros) { + this.seguroOutros = seguroOutros; + } + + public void setPtoVtaOrigem(Boolean ptoVtaOrigem) { + this.ptoVtaOrigem = ptoVtaOrigem; + } + + public String getIndstatusboleto() { + return indstatusboleto; + } + + public void setIndstatusboleto(String indstatusboleto) { + this.indstatusboleto = indstatusboleto; + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public void setBoletoOriginalId(Long boletoOriginalId) { + this.boletoOriginalId = boletoOriginalId; + } + + public Long getBoletoOriginalId() { + return boletoOriginalId; + } + + public String getNumAsiento() { + return numAsiento; + } + + public void setNumAsiento(String numAsiento) { + this.numAsiento = numAsiento; + } + + public String getNumFolioSistema() { + return numFolioSistema; + } + + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + + public String getNumSeriePreimpresa() { + return numSeriePreimpresa; + } + + public void setNumSeriePreimpresa(String numSeriePreimpresa) { + this.numSeriePreimpresa = numSeriePreimpresa; + } + + public String getNumFolioPreImpreso() { + return numFolioPreImpreso; + } + + public void setNumFolioPreImpreso(String numFolioPreImpreso) { + this.numFolioPreImpreso = numFolioPreImpreso; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getDesccategoria() { + return desccategoria; + } + + public void setDesccategoria(String desccategoria) { + this.desccategoria = desccategoria; + } + + public Boolean getPtoVtaOrigem() { + return ptoVtaOrigem; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getStatusDescricao() { + StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); + if (statusLogConferencia != null) { + return statusLogConferencia.toString(); + } + return ""; + } + + public String getDescFormapagos() { + StringBuilder sFormapagos = new StringBuilder(); + for (FormapagoVO formapago : formapagos) { + if (sFormapagos.length() > 0) { + sFormapagos.append(", "); + } + sFormapagos.append(formapago.getDescpago()); + } + + return sFormapagos.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getCajaId() == null) ? 0 : getCajaId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + BoletoComissao other = (BoletoComissao) obj; + if (getCajaId() == null) { + if (other.getCajaId() != null) + return false; + } else if (!getCajaId().equals(other.getCajaId())) + return false; + return true; + } + + public Integer getFormapagoId() { + return formapagoId; + } + + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + + public String getDescpago() { + return descpago; + } + + public void setDescpago(String descpago) { + this.descpago = descpago; + } + + public Boolean getIndconferenciafisicacomissao() { + return indconferenciafisicacomissao; + } + + public void setIndconferenciafisicacomissao(Boolean indconferenciafisicacomissao) { + this.indconferenciafisicacomissao = indconferenciafisicacomissao; + } + + public List getFormapagos() { + return formapagos; + } + + public void setFormapagos(List formapagos) { + this.formapagos = formapagos; + } + + public BigDecimal getIcmsBase() { + return icmsBase; + } + + public void setIcmsBase(BigDecimal icmsBase) { + this.icmsBase = icmsBase; + } + + public String getDescmotivocancelacion() { + return descmotivocancelacion; + } + + public void setDescmotivocancelacion(String descmotivocancelacion) { + this.descmotivocancelacion = descmotivocancelacion; + } + + public Integer getEstadoId() { + return estadoId; + } + + public void setEstadoId(Integer estadoId) { + this.estadoId = estadoId; + } + + public String getNumAsientoVinculado() { + return numAsientoVinculado; + } + + public void setNumAsientoVinculado(String numAsientoVinculado) { + this.numAsientoVinculado = numAsientoVinculado; + } + + public BigDecimal getTotal() { + BigDecimal total = BigDecimal.ZERO; + for (FormapagoVO formapagoVO : formapagos) { + total = total.add(formapagoVO.getImporte()); + } + return total; + } + + public String getDescTipoVenta() { + return DescricaoTipoVenta.getDescricaoTipoVenta(getTipoVenta()); + } + + public String getSituacaoBilhete() { + if (isOcd()) { + return "OCD"; + } + + if(isMotivocancelacionAgrupamento()) { + return getDescmotivocancelacion(); + } + + if(isStatusVendido()) { + return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()).getValue(); + } + + if ((isStatusCancelado()) && (isMotivocancelacionDevolvido() || isMotivocancelacionCancelado()) + && StringUtils.isNotBlank(getDescmotivocancelacion())) { + return getDescmotivocancelacion(); + } + + if (isStatusCancelado()) { + if (isMotivocancelacionTrocado() || (isMotivocancelacionGeracaoOcd() && isFormapagoTrocaPassagem())) { + return "TROCADO"; + } else if (isMotivocancelacionTransferido()) { + return "TRANSFERIDO"; + } + } + + if (isStatusTroca()) { + if (isVendaBilheteTroca(getTipoVenta()) || isVendaGap(getTipoVenta())) { + return "B. DA TROCA"; + } else if (isVendaBilheteTransferencia(getTipoVenta()) || isVendaGap(getTipoVenta())) { + return "B. DA TRANSFERENCIA"; + } else if (isVendaBilheteConfirmaAberto(getTipoVenta())) { + return "CONFIRMAÇÃO ABERTO"; + } else if (isVendaBilheteCheckin(getTipoVenta())) { + return "CHECKIN"; + } + } + + IndStatusBoleto indStatusBoleto = IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()); + return indStatusBoleto != null ? indStatusBoleto.getValue() : ""; + } + + public boolean isFormapagoTrocaPassagem() { + boolean fpTrocapassagem = false; + for (FormapagoVO formapagoVO : formapagos) { + fpTrocapassagem = formapagoVO.getFormapagoId().equals(Constantes.FORMA_PAGO_TROCA_PASSAGEM.intValue()); + } + return fpTrocapassagem; + } + + public boolean isOcd() { + return isMotivocancelacionGeracaoOcd() && isStatusCancelado() && !isFormapagoTrocaPassagem(); + } + + public String getNombusuario() { + return nombusuario; + } + + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + + public BigDecimal getImporteFp() { + return importeFp; + } + + public void setImporteFp(BigDecimal importeFp) { + this.importeFp = importeFp; + } + + public Integer getComempformapagoId() { + return comempformapagoId; + } + + public void setComempformapagoId(Integer comempformapagoId) { + this.comempformapagoId = comempformapagoId; + } + + public Integer getComempcategoriaId() { + return comempcategoriaId; + } + + public void setComempcategoriaId(Integer comempcategoriaId) { + this.comempcategoriaId = comempcategoriaId; + } + + public boolean isExigeConferencia() { + return getComempcategoriaId() != null || getComempformapagoId() != null; + } + + public boolean isExigeConferenciaBoletoDevolvido() { + return exigeConferenciaDevolvido; + } + + public boolean isConferido() { + return conferido; + } + + public void setConferido(boolean conferido) { + this.conferido = conferido; + } + + public Long getLogconferenciaId() { + return logconferenciaId; + } + + public void setLogconferenciaId(Long logconferenciaId) { + this.logconferenciaId = logconferenciaId; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public Integer getTipoVentaOriginal() { + return tipoVenta; + } + + public Integer getTipoVentaOriginal1() { + return tipoVentaOriginal1; + } + + public void setTipoVentaOriginal1(Integer tipoVentaOriginal1) { + this.tipoVentaOriginal1 = tipoVentaOriginal1; + } + + public Integer getTipoVentaOriginal2() { + return tipoVentaOriginal2; + } + + public void setTipoVentaOriginal2(Integer tipoVentaOriginal2) { + this.tipoVentaOriginal2 = tipoVentaOriginal2; + } + + public Integer getOcdId() { + return ocdId; + } + + public void setOcdId(Integer ocdId) { + this.ocdId = ocdId; + } + +/* private boolean isBoletoOriginal() { + return boletoOriginalId == null + && getMotivoCancelacionOriginal() != null + && getMotivoCancelacionOriginal() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue(); + }*/ + + public Integer getMotivoCancelacionOriginal() { + return motivoCancelacionOriginal2 != null ? motivoCancelacionOriginal2 : motivoCancelacionOriginal1; + } + + public Integer getMotivoCancelacionOriginal1() { + return motivoCancelacionOriginal1; + } + + public void setMotivoCancelacionOriginal1(Integer motivoCancelacionOriginal1) { + this.motivoCancelacionOriginal1 = motivoCancelacionOriginal1; + } + + public Integer getMotivoCancelacionOriginal2() { + return motivoCancelacionOriginal2; + } + + public void setMotivoCancelacionOriginal2(Integer motivoCancelacionOriginal2) { + this.motivoCancelacionOriginal2 = motivoCancelacionOriginal2; + } + + public boolean isVendaManual(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_MANUAL.intValue(); + } + + public boolean isVendaGap(Integer tipoVenta) { + return tipoVenta != null && (tipoVenta == Constantes.TPV_BOLETO_REMOTO.intValue() + || tipoVenta == Constantes.TPV_CALL_CENTER.intValue() + || tipoVenta == Constantes.TPV_POR_INTERNET.intValue()); + } + + public boolean isVendaBilheteNormal(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_DIRECTO_NORMAL.intValue(); + } + + public boolean isVendaBilheteTroca(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_TRANSFERENCIAS.intValue(); + } + + public boolean isVendaBilheteTransferencia(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_CAMBIO_VIAJE.intValue(); + } + + public boolean isVendaBilheteManual(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_MANUAL.intValue(); + } + + public boolean isVendaBilheteAbertoManual(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_VENDA_BOLETO_ABERTO_MANUAL.intValue(); + } + + public boolean isVendaBilheteAberto(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_BOLETO_ABIERTO.intValue(); + } + + public boolean isVendaBilheteConfirmaAberto(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_CONFIRMA_ABIERTO.intValue(); + } + + public boolean isVendaBilheteCheckin(Integer tipoVenta) { + return tipoVenta != null && tipoVenta == Constantes.TPV_CHECKIN_VIAGEM.intValue(); + } + + public boolean isSemMotivocancelacion() { + return getMotivoCancelacionId() == null; + } + + public boolean isMotivocancelacionAgrupamento() { + return !isSemMotivocancelacion() && getMotivoCancelacionId() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue(); + } + + public boolean isMotivocancelacionCancelado() { + return !isSemMotivocancelacion() && getMotivoCancelacionId() == Constantes.MVO_CANCEL_CANCELACION.intValue(); + } + + public boolean isMotivocancelacionDevolvido() { + return !isSemMotivocancelacion() && (getMotivoCancelacionId() == Constantes.MVO_CANCEL_DEVOLUCAO.intValue() + || getMotivoCancelacionId() == Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_50.intValue() + || getMotivoCancelacionId() == Constantes.MVO_CANCEL_DEVOLUCAO_CONTIGENCIA_100.intValue()); + } + + public boolean isMotivocancelacionEntregaGap() { + return !isSemMotivocancelacion() + && getMotivoCancelacionId() == Constantes.MVO_CANCEL_BOLETO_ENTREGADO.intValue(); + } + + public boolean isMotivocancelacionTransferido() { + return !isSemMotivocancelacion() + && getMotivoCancelacionId() == Constantes.MVO_CANCEL_TRANSFERENCIA.intValue(); + } + + public boolean isMotivocancelacionTrocado() { + return !isSemMotivocancelacion() + && getMotivoCancelacionId() == Constantes.MVO_CANCEL_TROCA.intValue(); + } + + public boolean isMotivocancelacionCheckin() { + return !isSemMotivocancelacion() + && getMotivoCancelacionId() == Constantes.MVO_CANCEL_CHECKIN.intValue(); + } + + public boolean isMotivocancelacionGeracaoOcd() { + return !isSemMotivocancelacion() + && getMotivoCancelacionId() == Constantes.MVO_CANCEL_GERACAO_OCD.intValue(); + } + + public boolean isMotivocancelacionQuitacaoOcd() { + return !isSemMotivocancelacion() + && getMotivoCancelacionId() == Constantes.MVO_CANCEL_QUITACAO_OCD.intValue(); + } + + /** ABA BILHETE MANUAL */ + public boolean isBilhetesManualVendido() { + return (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao + (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida; + } + + /** ABA BILHETE MANUAL */ + public boolean isBilhetesAbertoManualVendido() { + return (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao + (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida; + } + + public boolean isStatusVendido() { + return IndStatusBoleto.V.equals(getIndstatusboletoEnum()); + } + + public boolean isStatusCancelado() { + return IndStatusBoleto.C.equals(getIndstatusboletoEnum()); + } + + public boolean isStatusEntregue() { + return IndStatusBoleto.E.equals(getIndstatusboletoEnum()); + } + + public boolean isStatusTroca() { + return IndStatusBoleto.T.equals(getIndstatusboletoEnum()); + } + + public boolean isStatusExtraviado() { + return IndStatusBoleto.X.equals(getIndstatusboletoEnum()); + } + + public boolean isStatusMarcado() { + return IndStatusBoleto.M.equals(getIndstatusboletoEnum()); + } + + public String getNombpasajero() { + return nombpasajero; + } + + public void setNombpasajero(String nombpasajero) { + this.nombpasajero = nombpasajero; + } + + public boolean isBilheteEntregaConferidoVenda() { + return isStatusEntregue() && this.getLogconferenciaId() != null; + } + + public IndStatusBoleto getIndstatusboletoEnum() { + return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()); + } + + public Boolean getIndcarboletosdevolvidosconf() { + return indcarboletosdevolvidosconf; + } + + public void setIndcarboletosdevolvidosconf(Boolean indcarboletosdevolvidosconf) { + this.indcarboletosdevolvidosconf = indcarboletosdevolvidosconf; + } + + public boolean getExigeConferenciaDevolvido() { + return exigeConferenciaDevolvido; + } + + public void setExigeConferenciaDevolvido(boolean exigeConferenciaDevolvido) { + this.exigeConferenciaDevolvido = exigeConferenciaDevolvido; + } + + public boolean isExigeConferenciaAba() { + return exigeConferenciaAba; + } + + public void setExigeConferenciaAba(boolean exigeConferenciaAba) { + this.exigeConferenciaAba = exigeConferenciaAba; + } + + public Date getFeccorrida() { + return feccorrida; + } + + public void setFeccorrida(Date feccorrida) { + this.feccorrida = feccorrida; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public BigDecimal getValorTabela() { + return valorTabela; + } + + public void setValorTabela(BigDecimal valorTabela) { + this.valorTabela = valorTabela; + } + + public String getFeccorridaServico() { + StringBuilder str = new StringBuilder(); + if (getFeccorrida() != null) { + str.append(DateUtil.getStringDate(getFeccorrida(), "dd/MM")); + } + if (getCorridaId() != null) { + if (str.length() > 0) { + str.append(" - "); + } + str.append(getCorridaId()); + } + + return str.toString(); + } + + public boolean isBilheteGap() { + return isAbaGapVendido() || isAbaGapCancelado() || isAbaGapDevolvido(); + } + + public boolean isTotalizarFormapago() { + boolean totalizar = isTotalizarTipovenda(); + if(totalizar) { + totalizar = !isOcd(); + } + if(totalizar) { + totalizar = !getIndreimpresion(); + } + if(totalizar) { + totalizar = !(isStatusTroca() && isVendaBilheteTransferencia(getTipoVenta())); + } + if(totalizar) { + totalizar = !isVendaBilheteConfirmaAberto(getTipoVenta()); + } + return totalizar; + } + + public boolean isTotalizarTipovenda() { + return isAbaBilheteManual() || + isAbaBilheteVendido() || + isAbaBilheteCancelado() || + isAbaBilheteDevolvido() || + isAbaGapVendido() || + isAbaGapCancelado() || + isAbaGapDevolvido(); + } + + public String getOrderExigeConferencia() { + if (isExigeConferenciaAba() || isExigeConferencia() || isExigeConferenciaBoletoDevolvido()) { + if (!isConferido()) { + return "A"; + } else if (isConferido()) { + return "B"; + } + } + return "C"; + } + + public Date getOrderDataMovimento(){ + return conferencia.getDatamovimento(); + } + + /** Define bilhete na aba de venda manual */ + public boolean isAbaBilheteManual() { + return isBilhetesManualVendido() || + isBilhetesAbertoManualVendido(); + } + + /** Define bilhete na aba de venda normal */ + public boolean isAbaBilheteVendido() { + if(isVendaManual(getTipoVenta()) || isVendaBilheteAbertoManual(getTipoVenta())) { + return false; + } + + if(isStatusCancelado()) { + return false; + } + + if(isVendaGap(getTipoVenta()) && !isStatusEntregue()) { + return false; + } + + return isStatusVendido() || isStatusTroca() || isStatusEntregue() || isVendaBilheteTransferencia(getTipoVenta()); + } + public boolean isQuitacaoOCD() { + if(getMotivoCancelacionId() != null){ + if(getMotivoCancelacionId() == Constantes.MVO_CANCEL_QUITACAO_OCD.intValue()){ + return true; + } + } + return false; + } + + /** Define bilhete na aba de venda cancelada */ + public boolean isAbaBilheteCancelado() { + if(isVendaManual(getTipoVenta()) && isStatusCancelado()) { + return isMotivocancelacionCancelado(); + } + + + if(isVendaManual(getTipoVenta()) || isVendaBilheteAbertoManual(getTipoVenta())) { + return false; + } + + if(!isStatusCancelado()) { + return false; + } + + if(isVendaGap(getTipoVenta()) && isNotNumFolioPreImpressoGerado()) { + return false; + } + + return isMotivocancelacionCancelado(); + } + + /** Define bilhete na aba de venda devolvida */ + public boolean isAbaBilheteDevolvido() { + + if(isVendaManual(getTipoVenta()) || isVendaBilheteAbertoManual(getTipoVenta())) { + if(isMotivocancelacionDevolvido() || isMotivocancelacionGeracaoOcd() || isMotivocancelacionTrocado()) { + return true; + } + return false; + } + + if(!isStatusCancelado()) { + return false; + } + + if(isVendaGap(getTipoVenta()) && isNotNumFolioPreImpressoGerado()) { + return false; + } + + return isMotivocancelacionDevolvido() || isMotivocancelacionGeracaoOcd() || isMotivocancelacionTrocado() || isMotivocancelacionTransferido(); + } + + /** Define bilhete na aba de gap */ + public boolean isAbaGapVendido() { + if(isStatusCancelado()) { + return false; + } + + if((!isVendaGap(getTipoVenta()) && !isVendaBilheteTransferencia(getTipoVenta()))) { + return false; + } + + return (isStatusVendido() || isStatusTroca()) && isNotNumFolioPreImpressoGerado(); + } + + /** Define bilhete na aba de gap cancelada */ + public boolean isAbaGapCancelado() { + if(!isStatusCancelado()) { + return false; + } + + if(!isVendaGap(getTipoVenta())) { + return false; + } + + return isMotivocancelacionCancelado() && isNotNumFolioPreImpressoGerado(); + } + + /** Define bilhete na aba de gap devolvida */ + public boolean isAbaGapDevolvido() { + if(!isStatusCancelado()) { + return false; + } + + if(!isVendaGap(getTipoVenta())) { + return false; + } + + return (isMotivocancelacionDevolvido() || isMotivocancelacionGeracaoOcd() || isMotivocancelacionTrocado()) && isNotNumFolioPreImpressoGerado(); + } + + public BigDecimal getValorPagarOcd() { + return valorPagarOcd; + } + + public void setValorPagarOcd(BigDecimal valorPagarOcd) { + this.valorPagarOcd = valorPagarOcd; + } + + public BigDecimal getValorTarjetaOcd() { + return valorTarjetaOcd; + } + + public void setValorTarjetaOcd(BigDecimal valorTarjetaOcd) { + this.valorTarjetaOcd = valorTarjetaOcd; + } + + public Boolean getIndCancelacion() { + return indCancelacion; + } + + public void setIndCancelacion(Boolean indCancelacion) { + this.indCancelacion = indCancelacion; + } + + public Integer getTipoventaAnteriorId() { + return tipoventaAnteriorId; + } + + public void setTipoventaAnteriorId(Integer tipoventaAnteriorId) { + this.tipoventaAnteriorId = tipoventaAnteriorId; + } + + private boolean isNotNumFolioPreImpressoGerado() { + return StringUtils.isBlank(getNumFolioPreImpreso()); + } + + public Boolean getIndreimpresion() { + return indreimpresion != null ? indreimpresion : false; + } + + public void setIndreimpresion(Boolean indreimpresion) { + this.indreimpresion = indreimpresion; + } + + @Override + public String toString() { + return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", nombpasajero=" + nombpasajero + ", total=" + getTotal() + "]"; + } + + public boolean isNotSomarBilhete() { + if(getIndreimpresion()) { + return true; + } + + return false; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public Long getTransacaoOriginalId() { + return transacaoOriginalId; + } + + public void setTransacaoOriginalId(Long transacaoOriginalId) { + this.transacaoOriginalId = transacaoOriginalId; + } + + public Conferencia getConferencia() { + return conferencia; + } + + public void setConferencia(Conferencia conferencia) { + this.conferencia = conferencia; + } + + public Date getFeccorte() { + return feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public BigDecimal getValorbase() { + return valorbase; + } + + public void setValorbase(BigDecimal valorbase) { + this.valorbase = valorbase; + } + + public Long getTransacaoId() { + return transacaoId; + } + + public void setTransacaoId(Long transacaoId) { + this.transacaoId = transacaoId; + } + + public Boolean getConferidoEntrega() { + return conferidoEntrega; + } + + public void setConferidoEntrega(Boolean conferidoEntrega) { + this.conferidoEntrega = conferidoEntrega; + } + + /** + * Retorna TRUE se o motivo de cancelamento for uma geração de OCD e a forma de pagamento for geração de OCD + * @return + */ + public boolean isDiferencaTrocaGeracaoOcd() { + return isMotivocancelacionGeracaoOcd() && + getFormapagoId() != null && getFormapagoId() == Constantes.FORMA_PAGO_GERACAO_OCD.intValue(); + } + + public Integer getPtovtaventaId() { + return ptovtaventaId; + } + + public void setPtovtaventaId(Integer ptovtaventaId) { + this.ptovtaventaId = ptovtaventaId; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getTurnoId() { + return turnoId; + } + + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoDesconto.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoDesconto.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoDesconto.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoDesconto.java index 4b81adfdd..7007d87ae 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoDesconto.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoDesconto.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; - -public class ComissaoDesconto { - - public enum TipoDesconto { - FIXO, EVENTUAL; - } - - private String nomeDesconto; - private BigDecimal valorDesconto; - private TipoDesconto tipo; - private String tipoDesconto; - - public String getNomeDesconto() { - return nomeDesconto; - } - - public void setNomeDesconto(String nomeDesconto) { - this.nomeDesconto = nomeDesconto; - } - - public BigDecimal getValorDesconto() { - return valorDesconto; - } - - public void setValorDesconto(BigDecimal valorDesconto) { - this.valorDesconto = valorDesconto; - } - - public String getTipoDesconto() { - if(this.tipo != null) - return tipo.toString(); - - return tipoDesconto; - } - - public void setTipoDesconto(String tipoDesconto) { - this.tipoDesconto = tipoDesconto; - } - - public TipoDesconto getTipo() { - return tipo; - } - - public void setTipo(TipoDesconto tipo) { - this.tipo = tipo; - } - - @Override - public String toString() { - return "RegistroCalculoDesconto [nomeDesconto=" + nomeDesconto + ", valorDesconto=" + valorDesconto + ", tipoDesconto=" + tipoDesconto + "]"; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; + +public class ComissaoDesconto { + + public enum TipoDesconto { + FIXO, EVENTUAL; + } + + private String nomeDesconto; + private BigDecimal valorDesconto; + private TipoDesconto tipo; + private String tipoDesconto; + + public String getNomeDesconto() { + return nomeDesconto; + } + + public void setNomeDesconto(String nomeDesconto) { + this.nomeDesconto = nomeDesconto; + } + + public BigDecimal getValorDesconto() { + return valorDesconto; + } + + public void setValorDesconto(BigDecimal valorDesconto) { + this.valorDesconto = valorDesconto; + } + + public String getTipoDesconto() { + if(this.tipo != null) + return tipo.toString(); + + return tipoDesconto; + } + + public void setTipoDesconto(String tipoDesconto) { + this.tipoDesconto = tipoDesconto; + } + + public TipoDesconto getTipo() { + return tipo; + } + + public void setTipo(TipoDesconto tipo) { + this.tipo = tipo; + } + + @Override + public String toString() { + return "RegistroCalculoDesconto [nomeDesconto=" + nomeDesconto + ", valorDesconto=" + valorDesconto + ", tipoDesconto=" + tipoDesconto + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoLogVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoLogVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoLogVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoLogVO.java index 979daf7ba..4928d3d1b 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoLogVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoLogVO.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.Date; - -public class ComissaoLogVO { - - private Integer puntoventaId; - private Integer empresaId; - private Date feccorte; - private Integer usuarioId; - private Integer turnoId; - private Long cajaId; - private Long cajadiversosId; - private BigDecimal porcComissao; - private BigDecimal valorBase; - private BigDecimal valorComissao; - private String origem; - private String texto; - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Date getFeccorte() { - return feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getTurnoId() { - return turnoId; - } - - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public Long getCajadiversosId() { - return cajadiversosId; - } - - public void setCajadiversosId(Long cajadiversosId) { - this.cajadiversosId = cajadiversosId; - } - - public BigDecimal getPorcComissao() { - return porcComissao; - } - - public void setPorcComissao(BigDecimal porcComissao) { - this.porcComissao = porcComissao; - } - - public BigDecimal getValorBase() { - return valorBase; - } - - public void setValorBase(BigDecimal valorBase) { - this.valorBase = valorBase; - } - - public BigDecimal getValorComissao() { - return valorComissao; - } - - public void setValorComissao(BigDecimal valorComissao) { - this.valorComissao = valorComissao; - } - - public String getOrigem() { - return origem; - } - - public void setOrigem(String origem) { - this.origem = origem; - } - - public String getTexto() { - return texto; - } - - public void setTexto(String texto) { - this.texto = texto; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.Date; + +public class ComissaoLogVO { + + private Integer puntoventaId; + private Integer empresaId; + private Date feccorte; + private Integer usuarioId; + private Integer turnoId; + private Long cajaId; + private Long cajadiversosId; + private BigDecimal porcComissao; + private BigDecimal valorBase; + private BigDecimal valorComissao; + private String origem; + private String texto; + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Date getFeccorte() { + return feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getTurnoId() { + return turnoId; + } + + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public Long getCajadiversosId() { + return cajadiversosId; + } + + public void setCajadiversosId(Long cajadiversosId) { + this.cajadiversosId = cajadiversosId; + } + + public BigDecimal getPorcComissao() { + return porcComissao; + } + + public void setPorcComissao(BigDecimal porcComissao) { + this.porcComissao = porcComissao; + } + + public BigDecimal getValorBase() { + return valorBase; + } + + public void setValorBase(BigDecimal valorBase) { + this.valorBase = valorBase; + } + + public BigDecimal getValorComissao() { + return valorComissao; + } + + public void setValorComissao(BigDecimal valorComissao) { + this.valorComissao = valorComissao; + } + + public String getOrigem() { + return origem; + } + + public void setOrigem(String origem) { + this.origem = origem; + } + + public String getTexto() { + return texto; + } + + public void setTexto(String texto) { + this.texto = texto; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoReceita.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoReceita.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoReceita.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoReceita.java index 53b44d640..5755d6dc8 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoReceita.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ComissaoReceita.java @@ -1,326 +1,326 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; - -public class ComissaoReceita { - - private Date data; - private BigDecimal receitaComissao; - private BigDecimal receitaBPR; - private BigDecimal receitaGAP; - private BigDecimal gapImpressa; - private BigDecimal internet; - private BigDecimal cancelados; - private BigDecimal canceladosGAP; - private BigDecimal devolvidos; - private BigDecimal devolvidosGAP; - private BigDecimal devolucoesOrigem; - private BigDecimal devolucoesOrigemGAP; - private BigDecimal receitaExcessoBagagem; - private BigDecimal receitaSeguro; - private BigDecimal receitaSeguroOpcional; - private BigDecimal receitaSeguroOutros; - private Integer contImpressa; - - private BigDecimal comissaoBPRDiaria; - private BigDecimal comissaoExcessoBagagemDiaria; - private BigDecimal comissaoSegOpcionalDiaria; - private BigDecimal comissaoEntregaPassagemDiaria; - private BigDecimal comissaoOutrosDiaria; - private BigDecimal comissaoSeguroObrigatorioDiaria; - - private String nombpuntoventa; - private String numPuntoVenta; - - private List lsComissaoLog; - - public ComissaoReceita() { - super(); - this.receitaComissao = BigDecimal.ZERO; - this.receitaBPR = BigDecimal.ZERO; - this.receitaGAP = BigDecimal.ZERO; - this.gapImpressa = BigDecimal.ZERO; - this.internet = BigDecimal.ZERO; - this.cancelados = BigDecimal.ZERO; - this.canceladosGAP = BigDecimal.ZERO; - this.devolvidos = BigDecimal.ZERO; - this.devolvidosGAP = BigDecimal.ZERO; - this.devolucoesOrigem = BigDecimal.ZERO; - this.devolucoesOrigemGAP = BigDecimal.ZERO; - this.receitaExcessoBagagem = BigDecimal.ZERO; - this.receitaSeguro = BigDecimal.ZERO; - this.receitaSeguroOpcional = BigDecimal.ZERO; - this.receitaSeguroOutros = BigDecimal.ZERO; - this.contImpressa = 0; - this.comissaoBPRDiaria = BigDecimal.ZERO; - this.comissaoExcessoBagagemDiaria = BigDecimal.ZERO; - this.comissaoSegOpcionalDiaria = BigDecimal.ZERO; - this.comissaoEntregaPassagemDiaria = BigDecimal.ZERO; - this.comissaoOutrosDiaria = BigDecimal.ZERO; - this.comissaoSeguroObrigatorioDiaria = BigDecimal.ZERO; - this.lsComissaoLog = new ArrayList(); - } - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - - public BigDecimal getReceitaComissao() { - return receitaComissao; - } - - public void setReceitaComissao(BigDecimal receitaComissao) { - this.receitaComissao = receitaComissao; - } - - public BigDecimal getReceitaBPR() { - return receitaBPR; - } - - public void setReceitaBPR(BigDecimal receitaBPR) { - this.receitaBPR = receitaBPR; - } - - public BigDecimal getReceitaGAP() { - return receitaGAP; - } - - public void setReceitaGAP(BigDecimal receitaGAP) { - this.receitaGAP = receitaGAP; - } - - public BigDecimal getGapImpressa() { - return gapImpressa; - } - - public void setGapImpressa(BigDecimal gapImpressa) { - this.gapImpressa = gapImpressa; - } - - public BigDecimal getInternet() { - return internet; - } - - public void setInternet(BigDecimal internet) { - this.internet = internet; - } - - public BigDecimal getCancelados() { - return cancelados; - } - - public void setCancelados(BigDecimal cancelados) { - this.cancelados = cancelados; - } - - public BigDecimal getCanceladosGAP() { - return canceladosGAP; - } - - public void setCanceladosGAP(BigDecimal canceladosGAP) { - this.canceladosGAP = canceladosGAP; - } - - public BigDecimal getDevolvidos() { - return devolvidos; - } - - public void setDevolvidos(BigDecimal devolvidos) { - this.devolvidos = devolvidos; - } - - public BigDecimal getDevolvidosRelatorio() { - return getDevolvidos(); - } - - public BigDecimal getDevolvidosGAPRelatorio() { - return getDevolvidosGAP(); - } - - public BigDecimal getDevolvidosGAP() { - return devolvidosGAP; - } - - public void setDevolvidosGAP(BigDecimal devolvidosGAP) { - this.devolvidosGAP = devolvidosGAP; - } - - public BigDecimal getDevolucoesOrigem() { - return devolucoesOrigem; - } - - public void setDevolucoesOrigem(BigDecimal devolucoesOrigem) { - this.devolucoesOrigem = devolucoesOrigem; - } - - public BigDecimal getDevolucoesOrigemGAP() { - return devolucoesOrigemGAP; - } - - public void setDevolucoesOrigemGAP(BigDecimal devolucoesOrigemGAP) { - this.devolucoesOrigemGAP = devolucoesOrigemGAP; - } - - public BigDecimal getReceitaExcessoBagagem() { - return receitaExcessoBagagem; - } - - public void setReceitaExcessoBagagem(BigDecimal receitaExcessoBagagem) { - this.receitaExcessoBagagem = receitaExcessoBagagem; - } - - public BigDecimal getReceitaSeguroOpcional() { - return receitaSeguroOpcional; - } - - public void setReceitaSeguroOpcional(BigDecimal receitaSeguroOpcional) { - this.receitaSeguroOpcional = receitaSeguroOpcional; - } - - public Integer getContImpressa() { - return contImpressa; - } - - public void setContImpressa(Integer contImpressa) { - this.contImpressa = contImpressa; - } - - public BigDecimal getComissaoBPRDiaria() { - return comissaoBPRDiaria; - } - - public void setComissaoBPRDiaria(BigDecimal comissaoBPRDiaria) { - this.comissaoBPRDiaria = comissaoBPRDiaria; - } - - public BigDecimal getComissaoExcessoBagagemDiaria() { - return comissaoExcessoBagagemDiaria; - } - - public void setComissaoExcessoBagagemDiaria(BigDecimal comissaoExcessoBagagemDiaria) { - this.comissaoExcessoBagagemDiaria = comissaoExcessoBagagemDiaria; - } - - public BigDecimal getComissaoSegOpcionalDiaria() { - return comissaoSegOpcionalDiaria; - } - - public void setComissaoSegOpcionalDiaria(BigDecimal comissaoSegOpcionalDiaria) { - this.comissaoSegOpcionalDiaria = comissaoSegOpcionalDiaria; - } - - public BigDecimal getComissaoEntregaPassagemDiaria() { - return comissaoEntregaPassagemDiaria; - } - - public void setComissaoEntregaPassagemDiaria(BigDecimal comissaoEntregaPassagemDiaria) { - this.comissaoEntregaPassagemDiaria = comissaoEntregaPassagemDiaria; - } - - public BigDecimal getReceitaSeguroOutros() { - return receitaSeguroOutros; - } - - public void setReceitaSeguroOutros(BigDecimal receitaSeguroOutros) { - this.receitaSeguroOutros = receitaSeguroOutros; - } - - public BigDecimal getComissaoOutrosDiaria() { - return comissaoOutrosDiaria; - } - - public void setComissaoOutrosDiaria(BigDecimal comissaoOutrosDiaria) { - this.comissaoOutrosDiaria = comissaoOutrosDiaria; - } - - @Override - public String toString() { - return "ComissaoReceita [data=" + data + ", receitaComissao=" + receitaComissao + ", receitaBPR=" + receitaBPR + ", receitaGAP=" + receitaGAP + ", gapImpressa=" + gapImpressa + ", internet=" + internet + ", cancelados=" + cancelados + ", canceladosGAP=" + canceladosGAP + ", devolvidos=" + devolvidos + ", devolvidosGAP=" + devolvidosGAP + ", devolucoesOrigem=" + devolucoesOrigem + ", devolucoesOrigemGAP=" + devolucoesOrigemGAP + ", receitaExcessoBagagem=" + receitaExcessoBagagem + ", receitaSeguroOpcional=" + receitaSeguroOpcional + ", contImpressa=" + contImpressa + ", comissaoBPRDiaria=" + comissaoBPRDiaria + ", comissaoExcessoBagagemDiaria=" + comissaoExcessoBagagemDiaria + ", comissaoSegOpcionalDiaria=" + comissaoSegOpcionalDiaria + ", comissaoEntregaPassagemDiaria=" + comissaoEntregaPassagemDiaria + "]"; - } - - public BigDecimal getTotal() { - BigDecimal total = BigDecimal.ZERO; - total = total.add(getReceitaBPR() != null ? getReceitaBPR() : BigDecimal.ZERO) - .add(getReceitaGAP() != null ? getReceitaGAP() : BigDecimal.ZERO) - .add(getInternet() != null ? getInternet() : BigDecimal.ZERO) - .subtract(getDevolvidos() != null ? getDevolvidos() : BigDecimal.ZERO) - .subtract(getDevolvidosGAP() != null ? getDevolvidosGAP() : BigDecimal.ZERO) - .subtract(getCancelados() != null ? getCancelados() : BigDecimal.ZERO) - .subtract(getCanceladosGAP() != null ? getCanceladosGAP() : BigDecimal.ZERO); - return total; - } - - public BigDecimal getTotalComissao() { - BigDecimal totalComissao = BigDecimal.ZERO; - totalComissao = totalComissao.add(getComissaoBPRDiaria() != null ? getComissaoBPRDiaria() : BigDecimal.ZERO) - .add(getComissaoEntregaPassagemDiaria() != null ? getComissaoEntregaPassagemDiaria() : BigDecimal.ZERO) - .add(getComissaoExcessoBagagemDiaria() != null ? getComissaoExcessoBagagemDiaria() : BigDecimal.ZERO) - .add(getComissaoOutrosDiaria() != null ? getComissaoOutrosDiaria() : BigDecimal.ZERO) - .add(getComissaoSeguroObrigatorioDiaria() != null ? getComissaoSeguroObrigatorioDiaria() : BigDecimal.ZERO) - .add(getComissaoSegOpcionalDiaria() != null ? getComissaoSegOpcionalDiaria() : BigDecimal.ZERO); - return totalComissao; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - - public String getDescricaoPuntoVenta() { - StringBuilder str = new StringBuilder(); - - if(StringUtils.isNotBlank(nombpuntoventa)) { - if(str.length() > 0) { - str.append(" - "); - } - str.append(nombpuntoventa); - } - - return str.toString(); - } - - public BigDecimal getComissaoSeguroObrigatorioDiaria() { - return comissaoSeguroObrigatorioDiaria; - } - - public void setComissaoSeguroObrigatorioDiaria(BigDecimal comissaoSeguroObrigatorioDiaria) { - this.comissaoSeguroObrigatorioDiaria = comissaoSeguroObrigatorioDiaria; - } - - public BigDecimal getReceitaSeguro() { - return receitaSeguro; - } - - public void setReceitaSeguro(BigDecimal receitaSeguro) { - this.receitaSeguro = receitaSeguro; - } - - public List getLsComissaoLog() { - return lsComissaoLog; - } - - public void setLsComissaoLog(List lsComissaoLog) { - this.lsComissaoLog = lsComissaoLog; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; + +public class ComissaoReceita { + + private Date data; + private BigDecimal receitaComissao; + private BigDecimal receitaBPR; + private BigDecimal receitaGAP; + private BigDecimal gapImpressa; + private BigDecimal internet; + private BigDecimal cancelados; + private BigDecimal canceladosGAP; + private BigDecimal devolvidos; + private BigDecimal devolvidosGAP; + private BigDecimal devolucoesOrigem; + private BigDecimal devolucoesOrigemGAP; + private BigDecimal receitaExcessoBagagem; + private BigDecimal receitaSeguro; + private BigDecimal receitaSeguroOpcional; + private BigDecimal receitaSeguroOutros; + private Integer contImpressa; + + private BigDecimal comissaoBPRDiaria; + private BigDecimal comissaoExcessoBagagemDiaria; + private BigDecimal comissaoSegOpcionalDiaria; + private BigDecimal comissaoEntregaPassagemDiaria; + private BigDecimal comissaoOutrosDiaria; + private BigDecimal comissaoSeguroObrigatorioDiaria; + + private String nombpuntoventa; + private String numPuntoVenta; + + private List lsComissaoLog; + + public ComissaoReceita() { + super(); + this.receitaComissao = BigDecimal.ZERO; + this.receitaBPR = BigDecimal.ZERO; + this.receitaGAP = BigDecimal.ZERO; + this.gapImpressa = BigDecimal.ZERO; + this.internet = BigDecimal.ZERO; + this.cancelados = BigDecimal.ZERO; + this.canceladosGAP = BigDecimal.ZERO; + this.devolvidos = BigDecimal.ZERO; + this.devolvidosGAP = BigDecimal.ZERO; + this.devolucoesOrigem = BigDecimal.ZERO; + this.devolucoesOrigemGAP = BigDecimal.ZERO; + this.receitaExcessoBagagem = BigDecimal.ZERO; + this.receitaSeguro = BigDecimal.ZERO; + this.receitaSeguroOpcional = BigDecimal.ZERO; + this.receitaSeguroOutros = BigDecimal.ZERO; + this.contImpressa = 0; + this.comissaoBPRDiaria = BigDecimal.ZERO; + this.comissaoExcessoBagagemDiaria = BigDecimal.ZERO; + this.comissaoSegOpcionalDiaria = BigDecimal.ZERO; + this.comissaoEntregaPassagemDiaria = BigDecimal.ZERO; + this.comissaoOutrosDiaria = BigDecimal.ZERO; + this.comissaoSeguroObrigatorioDiaria = BigDecimal.ZERO; + this.lsComissaoLog = new ArrayList(); + } + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + + public BigDecimal getReceitaComissao() { + return receitaComissao; + } + + public void setReceitaComissao(BigDecimal receitaComissao) { + this.receitaComissao = receitaComissao; + } + + public BigDecimal getReceitaBPR() { + return receitaBPR; + } + + public void setReceitaBPR(BigDecimal receitaBPR) { + this.receitaBPR = receitaBPR; + } + + public BigDecimal getReceitaGAP() { + return receitaGAP; + } + + public void setReceitaGAP(BigDecimal receitaGAP) { + this.receitaGAP = receitaGAP; + } + + public BigDecimal getGapImpressa() { + return gapImpressa; + } + + public void setGapImpressa(BigDecimal gapImpressa) { + this.gapImpressa = gapImpressa; + } + + public BigDecimal getInternet() { + return internet; + } + + public void setInternet(BigDecimal internet) { + this.internet = internet; + } + + public BigDecimal getCancelados() { + return cancelados; + } + + public void setCancelados(BigDecimal cancelados) { + this.cancelados = cancelados; + } + + public BigDecimal getCanceladosGAP() { + return canceladosGAP; + } + + public void setCanceladosGAP(BigDecimal canceladosGAP) { + this.canceladosGAP = canceladosGAP; + } + + public BigDecimal getDevolvidos() { + return devolvidos; + } + + public void setDevolvidos(BigDecimal devolvidos) { + this.devolvidos = devolvidos; + } + + public BigDecimal getDevolvidosRelatorio() { + return getDevolvidos(); + } + + public BigDecimal getDevolvidosGAPRelatorio() { + return getDevolvidosGAP(); + } + + public BigDecimal getDevolvidosGAP() { + return devolvidosGAP; + } + + public void setDevolvidosGAP(BigDecimal devolvidosGAP) { + this.devolvidosGAP = devolvidosGAP; + } + + public BigDecimal getDevolucoesOrigem() { + return devolucoesOrigem; + } + + public void setDevolucoesOrigem(BigDecimal devolucoesOrigem) { + this.devolucoesOrigem = devolucoesOrigem; + } + + public BigDecimal getDevolucoesOrigemGAP() { + return devolucoesOrigemGAP; + } + + public void setDevolucoesOrigemGAP(BigDecimal devolucoesOrigemGAP) { + this.devolucoesOrigemGAP = devolucoesOrigemGAP; + } + + public BigDecimal getReceitaExcessoBagagem() { + return receitaExcessoBagagem; + } + + public void setReceitaExcessoBagagem(BigDecimal receitaExcessoBagagem) { + this.receitaExcessoBagagem = receitaExcessoBagagem; + } + + public BigDecimal getReceitaSeguroOpcional() { + return receitaSeguroOpcional; + } + + public void setReceitaSeguroOpcional(BigDecimal receitaSeguroOpcional) { + this.receitaSeguroOpcional = receitaSeguroOpcional; + } + + public Integer getContImpressa() { + return contImpressa; + } + + public void setContImpressa(Integer contImpressa) { + this.contImpressa = contImpressa; + } + + public BigDecimal getComissaoBPRDiaria() { + return comissaoBPRDiaria; + } + + public void setComissaoBPRDiaria(BigDecimal comissaoBPRDiaria) { + this.comissaoBPRDiaria = comissaoBPRDiaria; + } + + public BigDecimal getComissaoExcessoBagagemDiaria() { + return comissaoExcessoBagagemDiaria; + } + + public void setComissaoExcessoBagagemDiaria(BigDecimal comissaoExcessoBagagemDiaria) { + this.comissaoExcessoBagagemDiaria = comissaoExcessoBagagemDiaria; + } + + public BigDecimal getComissaoSegOpcionalDiaria() { + return comissaoSegOpcionalDiaria; + } + + public void setComissaoSegOpcionalDiaria(BigDecimal comissaoSegOpcionalDiaria) { + this.comissaoSegOpcionalDiaria = comissaoSegOpcionalDiaria; + } + + public BigDecimal getComissaoEntregaPassagemDiaria() { + return comissaoEntregaPassagemDiaria; + } + + public void setComissaoEntregaPassagemDiaria(BigDecimal comissaoEntregaPassagemDiaria) { + this.comissaoEntregaPassagemDiaria = comissaoEntregaPassagemDiaria; + } + + public BigDecimal getReceitaSeguroOutros() { + return receitaSeguroOutros; + } + + public void setReceitaSeguroOutros(BigDecimal receitaSeguroOutros) { + this.receitaSeguroOutros = receitaSeguroOutros; + } + + public BigDecimal getComissaoOutrosDiaria() { + return comissaoOutrosDiaria; + } + + public void setComissaoOutrosDiaria(BigDecimal comissaoOutrosDiaria) { + this.comissaoOutrosDiaria = comissaoOutrosDiaria; + } + + @Override + public String toString() { + return "ComissaoReceita [data=" + data + ", receitaComissao=" + receitaComissao + ", receitaBPR=" + receitaBPR + ", receitaGAP=" + receitaGAP + ", gapImpressa=" + gapImpressa + ", internet=" + internet + ", cancelados=" + cancelados + ", canceladosGAP=" + canceladosGAP + ", devolvidos=" + devolvidos + ", devolvidosGAP=" + devolvidosGAP + ", devolucoesOrigem=" + devolucoesOrigem + ", devolucoesOrigemGAP=" + devolucoesOrigemGAP + ", receitaExcessoBagagem=" + receitaExcessoBagagem + ", receitaSeguroOpcional=" + receitaSeguroOpcional + ", contImpressa=" + contImpressa + ", comissaoBPRDiaria=" + comissaoBPRDiaria + ", comissaoExcessoBagagemDiaria=" + comissaoExcessoBagagemDiaria + ", comissaoSegOpcionalDiaria=" + comissaoSegOpcionalDiaria + ", comissaoEntregaPassagemDiaria=" + comissaoEntregaPassagemDiaria + "]"; + } + + public BigDecimal getTotal() { + BigDecimal total = BigDecimal.ZERO; + total = total.add(getReceitaBPR() != null ? getReceitaBPR() : BigDecimal.ZERO) + .add(getReceitaGAP() != null ? getReceitaGAP() : BigDecimal.ZERO) + .add(getInternet() != null ? getInternet() : BigDecimal.ZERO) + .subtract(getDevolvidos() != null ? getDevolvidos() : BigDecimal.ZERO) + .subtract(getDevolvidosGAP() != null ? getDevolvidosGAP() : BigDecimal.ZERO) + .subtract(getCancelados() != null ? getCancelados() : BigDecimal.ZERO) + .subtract(getCanceladosGAP() != null ? getCanceladosGAP() : BigDecimal.ZERO); + return total; + } + + public BigDecimal getTotalComissao() { + BigDecimal totalComissao = BigDecimal.ZERO; + totalComissao = totalComissao.add(getComissaoBPRDiaria() != null ? getComissaoBPRDiaria() : BigDecimal.ZERO) + .add(getComissaoEntregaPassagemDiaria() != null ? getComissaoEntregaPassagemDiaria() : BigDecimal.ZERO) + .add(getComissaoExcessoBagagemDiaria() != null ? getComissaoExcessoBagagemDiaria() : BigDecimal.ZERO) + .add(getComissaoOutrosDiaria() != null ? getComissaoOutrosDiaria() : BigDecimal.ZERO) + .add(getComissaoSeguroObrigatorioDiaria() != null ? getComissaoSeguroObrigatorioDiaria() : BigDecimal.ZERO) + .add(getComissaoSegOpcionalDiaria() != null ? getComissaoSegOpcionalDiaria() : BigDecimal.ZERO); + return totalComissao; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + + public String getDescricaoPuntoVenta() { + StringBuilder str = new StringBuilder(); + + if(StringUtils.isNotBlank(nombpuntoventa)) { + if(str.length() > 0) { + str.append(" - "); + } + str.append(nombpuntoventa); + } + + return str.toString(); + } + + public BigDecimal getComissaoSeguroObrigatorioDiaria() { + return comissaoSeguroObrigatorioDiaria; + } + + public void setComissaoSeguroObrigatorioDiaria(BigDecimal comissaoSeguroObrigatorioDiaria) { + this.comissaoSeguroObrigatorioDiaria = comissaoSeguroObrigatorioDiaria; + } + + public BigDecimal getReceitaSeguro() { + return receitaSeguro; + } + + public void setReceitaSeguro(BigDecimal receitaSeguro) { + this.receitaSeguro = receitaSeguro; + } + + public List getLsComissaoLog() { + return lsComissaoLog; + } + + public void setLsComissaoLog(List lsComissaoLog) { + this.lsComissaoLog = lsComissaoLog; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/ConferenciaComissaoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ConferenciaComissaoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/ConferenciaComissaoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ConferenciaComissaoVO.java index 25d9c7a33..e0fb7441f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/ConferenciaComissaoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ConferenciaComissaoVO.java @@ -1,147 +1,147 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; - -public class ConferenciaComissaoVO implements Comparable { - - private Integer puntoventaId; - private String nombpuntoventa; - private String numPuntoVenta; - private String competencia; - private Date datamovimento; - private Date dataInicial; - private Date dataFinal; - - private Set diasSemMovimentos = new TreeSet(); - - private List dias = new ArrayList(); - - public ConferenciaComissaoVO() { - super(); - } - - public ConferenciaComissaoVO(Integer puntoventaId, String competencia) { - this(); - this.puntoventaId = puntoventaId; - this.competencia = competencia; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - - public List getDias() { - return dias; - } - - public void setDias(List dias) { - this.dias = dias; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public String getCompetencia() { - return competencia; - } - - public void setCompetencia(String competencia) { - this.competencia = competencia; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((competencia == null) ? 0 : competencia.hashCode()); - result = prime * result + ((puntoventaId == null) ? 0 : puntoventaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - ConferenciaComissaoVO other = (ConferenciaComissaoVO) obj; - if (competencia == null) { - if (other.competencia != null) - return false; - } else if (!competencia.equals(other.competencia)) - return false; - if (puntoventaId == null) { - if (other.puntoventaId != null) - return false; - } else if (!puntoventaId.equals(other.puntoventaId)) - return false; - return true; - } - - public Set getDiasSemMovimentos() { - return diasSemMovimentos; - } - - public void setDiasSemMovimentos(Set diasSemMovimentos) { - this.diasSemMovimentos = diasSemMovimentos; - } - - public List getDiasOrdenado() { - if(getDias() != null){ - Collections.sort(getDias()); - } - return getDias(); - } - - @Override - public int compareTo(ConferenciaComissaoVO o) { - return this.getNombpuntoventa().compareToIgnoreCase(o.getNombpuntoventa()); - } - - public Date getDataMovimento() { - return datamovimento; - } - - public void setDataMovimento(Date datamovimento) { - this.datamovimento = datamovimento; - } - - public Date getDataInicial() { - return dataInicial; - } - - public void setDataInicial(Date dataInicial) { - this.dataInicial = dataInicial; - } - - public Date getDataFinal() { - return dataFinal; - } - - public void setDataFinal(Date dataFinal) { - this.dataFinal = dataFinal; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +public class ConferenciaComissaoVO implements Comparable { + + private Integer puntoventaId; + private String nombpuntoventa; + private String numPuntoVenta; + private String competencia; + private Date datamovimento; + private Date dataInicial; + private Date dataFinal; + + private Set diasSemMovimentos = new TreeSet(); + + private List dias = new ArrayList(); + + public ConferenciaComissaoVO() { + super(); + } + + public ConferenciaComissaoVO(Integer puntoventaId, String competencia) { + this(); + this.puntoventaId = puntoventaId; + this.competencia = competencia; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + + public List getDias() { + return dias; + } + + public void setDias(List dias) { + this.dias = dias; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public String getCompetencia() { + return competencia; + } + + public void setCompetencia(String competencia) { + this.competencia = competencia; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((competencia == null) ? 0 : competencia.hashCode()); + result = prime * result + ((puntoventaId == null) ? 0 : puntoventaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + ConferenciaComissaoVO other = (ConferenciaComissaoVO) obj; + if (competencia == null) { + if (other.competencia != null) + return false; + } else if (!competencia.equals(other.competencia)) + return false; + if (puntoventaId == null) { + if (other.puntoventaId != null) + return false; + } else if (!puntoventaId.equals(other.puntoventaId)) + return false; + return true; + } + + public Set getDiasSemMovimentos() { + return diasSemMovimentos; + } + + public void setDiasSemMovimentos(Set diasSemMovimentos) { + this.diasSemMovimentos = diasSemMovimentos; + } + + public List getDiasOrdenado() { + if(getDias() != null){ + Collections.sort(getDias()); + } + return getDias(); + } + + @Override + public int compareTo(ConferenciaComissaoVO o) { + return this.getNombpuntoventa().compareToIgnoreCase(o.getNombpuntoventa()); + } + + public Date getDataMovimento() { + return datamovimento; + } + + public void setDataMovimento(Date datamovimento) { + this.datamovimento = datamovimento; + } + + public Date getDataInicial() { + return dataInicial; + } + + public void setDataInicial(Date dataInicial) { + this.dataInicial = dataInicial; + } + + public Date getDataFinal() { + return dataFinal; + } + + public void setDataFinal(Date dataFinal) { + this.dataFinal = dataFinal; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java index 948e720f3..704e37c16 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java @@ -1,156 +1,156 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.util.Date; - -import com.rjconsultores.ventaboletos.enums.comissao.CoresConferencia; - -public class DiaConferenciaComissaoVO implements Comparable { - - private Integer dia; - private Date data; - private Long conferenciaId; - - private Boolean indboletogerado; - private Boolean indconferido; - private Boolean indpendencia; - private Boolean indsemmovimento; - private Boolean indmaloterecebido; - - public DiaConferenciaComissaoVO() { - super(); - this.indboletogerado = Boolean.FALSE; - this.indconferido = Boolean.FALSE; - this.indpendencia = Boolean.FALSE; - this.indsemmovimento = Boolean.FALSE; - this.indmaloterecebido = Boolean.FALSE; - } - - public DiaConferenciaComissaoVO(Integer dia) { - this(); - this.dia = dia; - } - - public Integer getDia() { - return dia; - } - - public void setDia(Integer dia) { - this.dia = dia; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((dia == null) ? 0 : dia.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - DiaConferenciaComissaoVO other = (DiaConferenciaComissaoVO) obj; - if (dia == null) { - if (other.dia != null) - return false; - } else if (!dia.equals(other.dia)) - return false; - return true; - } - - @Override - public int compareTo(DiaConferenciaComissaoVO o) { - return this.getDia().compareTo(o.getDia()); - } - - public CoresConferencia getCor() { - CoresConferencia cor = CoresConferencia.BRANCO; - - if (getIndsemmovimento() != null && getIndsemmovimento()) { - cor = CoresConferencia.BRANCO; - } - - if ((getIndsemmovimento() == null || !getIndsemmovimento()) && (getIndmaloterecebido() == null || !getIndmaloterecebido())) { - cor = CoresConferencia.PRETO; - } - - if (getIndmaloterecebido() != null && getIndmaloterecebido()) { - if (getIndconferido() == null || !getIndconferido()) { - cor = CoresConferencia.VERMELHO; - } - } - - if (getIndconferido() != null && getIndconferido()) { - if (getIndboletogerado() != null && getIndboletogerado()) { - cor = CoresConferencia.AZUL; - if (getIndpendencia() != null && getIndpendencia()) { - cor = CoresConferencia.AMARELO; - } - } else if (getIndboletogerado() == null || !getIndboletogerado()) { - cor = CoresConferencia.LARANJA; - } - } - - return cor; - } - - public Boolean getIndboletogerado() { - return indboletogerado; - } - - public void setIndboletogerado(Boolean indboletogerado) { - this.indboletogerado = indboletogerado; - } - - public Boolean getIndconferido() { - return indconferido; - } - - public void setIndconferido(Boolean indconferido) { - this.indconferido = indconferido; - } - - public Boolean getIndpendencia() { - return indpendencia; - } - - public void setIndpendencia(Boolean indpendencia) { - this.indpendencia = indpendencia; - } - - public Boolean getIndsemmovimento() { - return indsemmovimento; - } - - public void setIndsemmovimento(Boolean indsemmovimento) { - this.indsemmovimento = indsemmovimento; - } - - public Boolean getIndmaloterecebido() { - return indmaloterecebido; - } - - public void setIndmaloterecebido(Boolean indmaloterecebido) { - this.indmaloterecebido = indmaloterecebido; - } - - public Long getConferenciaId() { - return conferenciaId; - } - - public void setConferenciaId(Long conferenciaId) { - this.conferenciaId = conferenciaId; - } - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.util.Date; + +import com.rjconsultores.ventaboletos.enums.comissao.CoresConferencia; + +public class DiaConferenciaComissaoVO implements Comparable { + + private Integer dia; + private Date data; + private Long conferenciaId; + + private Boolean indboletogerado; + private Boolean indconferido; + private Boolean indpendencia; + private Boolean indsemmovimento; + private Boolean indmaloterecebido; + + public DiaConferenciaComissaoVO() { + super(); + this.indboletogerado = Boolean.FALSE; + this.indconferido = Boolean.FALSE; + this.indpendencia = Boolean.FALSE; + this.indsemmovimento = Boolean.FALSE; + this.indmaloterecebido = Boolean.FALSE; + } + + public DiaConferenciaComissaoVO(Integer dia) { + this(); + this.dia = dia; + } + + public Integer getDia() { + return dia; + } + + public void setDia(Integer dia) { + this.dia = dia; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dia == null) ? 0 : dia.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + DiaConferenciaComissaoVO other = (DiaConferenciaComissaoVO) obj; + if (dia == null) { + if (other.dia != null) + return false; + } else if (!dia.equals(other.dia)) + return false; + return true; + } + + @Override + public int compareTo(DiaConferenciaComissaoVO o) { + return this.getDia().compareTo(o.getDia()); + } + + public CoresConferencia getCor() { + CoresConferencia cor = CoresConferencia.BRANCO; + + if (getIndsemmovimento() != null && getIndsemmovimento()) { + cor = CoresConferencia.BRANCO; + } + + if ((getIndsemmovimento() == null || !getIndsemmovimento()) && (getIndmaloterecebido() == null || !getIndmaloterecebido())) { + cor = CoresConferencia.PRETO; + } + + if (getIndmaloterecebido() != null && getIndmaloterecebido()) { + if (getIndconferido() == null || !getIndconferido()) { + cor = CoresConferencia.VERMELHO; + } + } + + if (getIndconferido() != null && getIndconferido()) { + if (getIndboletogerado() != null && getIndboletogerado()) { + cor = CoresConferencia.AZUL; + if (getIndpendencia() != null && getIndpendencia()) { + cor = CoresConferencia.AMARELO; + } + } else if (getIndboletogerado() == null || !getIndboletogerado()) { + cor = CoresConferencia.LARANJA; + } + } + + return cor; + } + + public Boolean getIndboletogerado() { + return indboletogerado; + } + + public void setIndboletogerado(Boolean indboletogerado) { + this.indboletogerado = indboletogerado; + } + + public Boolean getIndconferido() { + return indconferido; + } + + public void setIndconferido(Boolean indconferido) { + this.indconferido = indconferido; + } + + public Boolean getIndpendencia() { + return indpendencia; + } + + public void setIndpendencia(Boolean indpendencia) { + this.indpendencia = indpendencia; + } + + public Boolean getIndsemmovimento() { + return indsemmovimento; + } + + public void setIndsemmovimento(Boolean indsemmovimento) { + this.indsemmovimento = indsemmovimento; + } + + public Boolean getIndmaloterecebido() { + return indmaloterecebido; + } + + public void setIndmaloterecebido(Boolean indmaloterecebido) { + this.indmaloterecebido = indmaloterecebido; + } + + public Long getConferenciaId() { + return conferenciaId; + } + + public void setConferenciaId(Long conferenciaId) { + this.conferenciaId = conferenciaId; + } + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java index ddb7cda41..771d77925 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EmailConfigVO.java @@ -1,69 +1,69 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -public class EmailConfigVO { - - private String smtp; - private String senha; - private String smtpPorta; - private String smtpEmail; - private String smtpUser; - private boolean autenticacao; - private String tipoAutorizacao; - - public String getSmtp() { - return smtp; - } - - public void setSmtp(String smtp) { - this.smtp = smtp; - } - - public String getSenha() { - return senha; - } - - public void setSenha(String senha) { - this.senha = senha; - } - - public String getSmtpPorta() { - return smtpPorta; - } - - public void setSmtpPorta(String smtpPorta) { - this.smtpPorta = smtpPorta; - } - - public String getSmtpEmail() { - return smtpEmail; - } - - public void setSmtpEmail(String smtpEmail) { - this.smtpEmail = smtpEmail; - } - - public boolean isAutenticacao() { - return autenticacao; - } - - public void setAutenticacao(boolean autenticacao) { - this.autenticacao = autenticacao; - } - - public String getSmtpUser() { - return smtpUser; - } - - public void setSmtpUser(String smtpUser) { - this.smtpUser = smtpUser; - } - - public String getTipoAutorizacao() { - return tipoAutorizacao; - } - - public void setTipoAutorizacao(String tipoAutorizacao) { - this.tipoAutorizacao = tipoAutorizacao; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +public class EmailConfigVO { + + private String smtp; + private String senha; + private String smtpPorta; + private String smtpEmail; + private String smtpUser; + private boolean autenticacao; + private String tipoAutorizacao; + + public String getSmtp() { + return smtp; + } + + public void setSmtp(String smtp) { + this.smtp = smtp; + } + + public String getSenha() { + return senha; + } + + public void setSenha(String senha) { + this.senha = senha; + } + + public String getSmtpPorta() { + return smtpPorta; + } + + public void setSmtpPorta(String smtpPorta) { + this.smtpPorta = smtpPorta; + } + + public String getSmtpEmail() { + return smtpEmail; + } + + public void setSmtpEmail(String smtpEmail) { + this.smtpEmail = smtpEmail; + } + + public boolean isAutenticacao() { + return autenticacao; + } + + public void setAutenticacao(boolean autenticacao) { + this.autenticacao = autenticacao; + } + + public String getSmtpUser() { + return smtpUser; + } + + public void setSmtpUser(String smtpUser) { + this.smtpUser = smtpUser; + } + + public String getTipoAutorizacao() { + return tipoAutorizacao; + } + + public void setTipoAutorizacao(String tipoAutorizacao) { + this.tipoAutorizacao = tipoAutorizacao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/EtiquetaMalote.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EtiquetaMalote.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/EtiquetaMalote.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EtiquetaMalote.java index 2a433acf9..3a9c620aa 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/EtiquetaMalote.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EtiquetaMalote.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.util.Date; - -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -public class EtiquetaMalote { - - private Integer empresaId; - private String nombempresa; - private Integer puntoventaId; - private String nombpuntoventa; - - private String numeroMalote; - private Date dataInicial; - private Date dataFinal; - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getNumeroMalote() { - return numeroMalote; - } - - public void setNumeroMalote(String numeroMalote) { - this.numeroMalote = numeroMalote; - } - - public Date getDataInicial() { - return dataInicial; - } - - public void setDataInicial(Date dataInicial) { - this.dataInicial = dataInicial; - } - - public Date getDataFinal() { - return dataFinal; - } - - public void setDataFinal(Date dataFinal) { - this.dataFinal = dataFinal; - } - - public String getDatasMalote() { - return DateUtil.getStringDate(getDataInicial(), "dd/MM/yyyy") + " - " + DateUtil.getStringDate(getDataFinal(), "dd/MM/yyyy"); - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.util.Date; + +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +public class EtiquetaMalote { + + private Integer empresaId; + private String nombempresa; + private Integer puntoventaId; + private String nombpuntoventa; + + private String numeroMalote; + private Date dataInicial; + private Date dataFinal; + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getNumeroMalote() { + return numeroMalote; + } + + public void setNumeroMalote(String numeroMalote) { + this.numeroMalote = numeroMalote; + } + + public Date getDataInicial() { + return dataInicial; + } + + public void setDataInicial(Date dataInicial) { + this.dataInicial = dataInicial; + } + + public Date getDataFinal() { + return dataFinal; + } + + public void setDataFinal(Date dataFinal) { + this.dataFinal = dataFinal; + } + + public String getDatasMalote() { + return DateUtil.getStringDate(getDataInicial(), "dd/MM/yyyy") + " - " + DateUtil.getStringDate(getDataFinal(), "dd/MM/yyyy"); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java index dcd09bbb1..ed44d84e9 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java @@ -1,406 +1,406 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; - -public class EventosFinanceirosVO { - - private Long eventoextraId; - private String numdocumento; - private Date fechoringreso; - private BigDecimal impingreso; - private String desctipoevento; - private String descinfo; - private Integer status; - private Integer formapagoId; - private String descpago; - private Boolean indconferenciafisicacomissao; - private String indtipo; /* 0- Debito, 1- Credito */ - private String nombusuario; - - private Integer comemptipoeventoextraId; - private Integer tipoeventoextradebcred; - private Integer comempformapagoId; - - private Long logconferenciaId; - private boolean conferido; - - private Boolean exigeConferenciaAba; - - private Long boletoId; - - private String numFolioSistema; - - private Conferencia conferencia; - - private String cvetipoevento; - - private Date feccorte; - - private BigDecimal icmsBase; - private Integer estadoId; - - private Long cajaDiversosId; - private Integer usuarioId; - private Integer turnoId; - private List formapagos; - - - - public EventosFinanceirosVO(Long eventoextraId, Long logconferenciaId) { - this.eventoextraId = eventoextraId; - this.logconferenciaId = logconferenciaId; - } - - public EventosFinanceirosVO() { - - } - - public Long getEventoextraId() { - return eventoextraId; - } - - public void setEventoextraId(Long eventoextraId) { - this.eventoextraId = eventoextraId; - } - - public String getNumdocumento() { - return numdocumento; - } - - public void setNumdocumento(String numdocumento) { - this.numdocumento = numdocumento; - } - - public Date getFechoringreso() { - return fechoringreso; - } - - public void setFechoringreso(Date fechoringreso) { - this.fechoringreso = fechoringreso; - } - - public BigDecimal getImpingreso() { - return impingreso; - } - - public void setImpingreso(BigDecimal impingreso) { - this.impingreso = impingreso; - } - - public String getDesctipoevento() { - return desctipoevento; - } - - public void setDesctipoevento(String desctipoevento) { - this.desctipoevento = desctipoevento; - } - - public String getDescinfo() { - return descinfo; - } - - public void setDescinfo(String descinfo) { - this.descinfo = descinfo; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getStatusDescricao() { - StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); - if (statusLogConferencia != null) { - return statusLogConferencia.toString(); - } - return ""; - } - - public Integer getFormapagoId() { - return formapagoId; - } - - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - - public String getDescpago() { - return descpago; - } - - public void setDescpago(String descpago) { - this.descpago = descpago; - } - - public Boolean getIndconferenciafisicacomissao() { - return indconferenciafisicacomissao; - } - - public void setIndconferenciafisicacomissao(Boolean indconferenciafisicacomissao) { - this.indconferenciafisicacomissao = indconferenciafisicacomissao; - } - - public String getIndtipo() { - return indtipo; - } - - public void setIndtipo(String indtipo) { - this.indtipo = indtipo; - } - - public boolean isCredito() { - return StringUtils.isNotBlank(getIndtipo()) && "1".equals(getIndtipo()); - } - - public boolean isDebito() { - return StringUtils.isNotBlank(getIndtipo()) && "0".equals(getIndtipo()); - } - - public String getDebitoCredito() { - return isCredito() ? Labels.getLabel("conferenciaController.lbCredito.value") : Labels.getLabel("conferenciaController.lbDebito.value"); - } - - public String getNombusuario() { - return nombusuario; - } - - public void setNombusuario(String nombusuario) { - this.nombusuario = nombusuario; - } - - public Long getLogconferenciaId() { - return logconferenciaId; - } - - public void setLogconferenciaId(Long logconferenciaId) { - this.logconferenciaId = logconferenciaId; - } - - public boolean isConferido() { - return conferido; - } - - public void setConferido(boolean conferido) { - this.conferido = conferido; - } - - public Integer getComemptipoeventoextraId() { - return comemptipoeventoextraId; - } - - public void setComemptipoeventoextraId(Integer comemptipoeventoextraId) { - this.comemptipoeventoextraId = comemptipoeventoextraId; - } - - public Integer getTipoeventoextradebcred() { - return tipoeventoextradebcred; - } - - public void setTipoeventoextradebcred(Integer tipoeventoextradebcred) { - this.tipoeventoextradebcred = tipoeventoextradebcred; - } - - public Integer getComempformapagoId() { - return comempformapagoId; - } - - public void setComempformapagoId(Integer comempformapagoId) { - this.comempformapagoId = comempformapagoId; - } - - public boolean isExigeConferencia() { - return getComemptipoeventoextraId() != null || getComempformapagoId() != null || isExigeConferenciaTipoEvento(); - } - - public boolean isExigeConferenciaTipoEvento() { - if(getTipoeventoextradebcred() != null && getTipoeventoextradebcred() != 0) { - if(getTipoeventoextradebcred() == 1){ - return true; - }else if(isDebito() && getTipoeventoextradebcred() == 2){ - return true; - }else if(isCredito() && getTipoeventoextradebcred() == 3){ - return true; - } - } - return false; - } - - public Boolean getExigeConferenciaAba() { - return exigeConferenciaAba; - } - - public void setExigeConferenciaAba(Boolean exigeConferenciaAba) { - this.exigeConferenciaAba = exigeConferenciaAba; - } - - public String getOrderExigeConferencia() { - if ((getExigeConferenciaAba() != null && getExigeConferenciaAba()) || isExigeConferencia()) { - if (!isConferido()) { - return "A"; - } else if (isConferido()) { - return "B"; - } - } - return "C"; - } - - public Date getOrderDataMovimento(){ - return conferencia.getDatamovimento(); - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public String getNumFolioSistema() { - return numFolioSistema; - } - - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - - public Conferencia getConferencia() { - return conferencia; - } - - public void setConferencia(Conferencia conferencia) { - this.conferencia = conferencia; - } - - public String getCvetipoevento() { - return cvetipoevento; - } - - public void setCvetipoevento(String cvetipoevento) { - this.cvetipoevento = cvetipoevento; - } - - public Date getFeccorte() { - return feccorte; - } - - public void setFeccorte(Date feccorte) { - this.feccorte = feccorte; - } - - public BigDecimal getIcmsBase() { - return icmsBase; - } - - public void setIcmsBase(BigDecimal icmsBase) { - this.icmsBase = icmsBase; - } - - public Integer getEstadoId() { - return estadoId; - } - - public void setEstadoId(Integer estadoId) { - this.estadoId = estadoId; - } - - public Long getCajaDiversosId() { - return cajaDiversosId; - } - - public void setCajaDiversosId(Long cajaDiversosId) { - this.cajaDiversosId = cajaDiversosId; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getTurnoId() { - return turnoId; - } - - public void setTurnoId(Integer turnoId) { - this.turnoId = turnoId; - } - - - - public List getFormapagos() { - return formapagos; - } - - public void setFormapagos(List formapagos) { - this.formapagos = formapagos; - } - - public String getDescFormapagos() { - StringBuilder sFormapagos = new StringBuilder(); - for (FormaPagoEventosFinanceirosVO formapago : formapagos) { - if (sFormapagos.length() > 0) { - sFormapagos.append(", "); - } - sFormapagos.append(formapago.getDescpago()); - } - return sFormapagos.toString(); - } - - public BigDecimal getTotal() { - BigDecimal total = BigDecimal.ZERO; - for (FormaPagoEventosFinanceirosVO formapagoVO : formapagos) { - total = total.add(formapagoVO.getImporte()); - } - return total; - } - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((eventoextraId == null) ? 0 : eventoextraId.hashCode()); - result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EventosFinanceirosVO other = (EventosFinanceirosVO) obj; - if (eventoextraId == null) { - if (other.eventoextraId != null) - return false; - } else if (!eventoextraId.equals(other.eventoextraId)) - return false; - if (logconferenciaId == null) { - if (other.logconferenciaId != null) - return false; - } else if (!logconferenciaId.equals(other.logconferenciaId)) - return false; - return true; - } - - - - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; + +public class EventosFinanceirosVO { + + private Long eventoextraId; + private String numdocumento; + private Date fechoringreso; + private BigDecimal impingreso; + private String desctipoevento; + private String descinfo; + private Integer status; + private Integer formapagoId; + private String descpago; + private Boolean indconferenciafisicacomissao; + private String indtipo; /* 0- Debito, 1- Credito */ + private String nombusuario; + + private Integer comemptipoeventoextraId; + private Integer tipoeventoextradebcred; + private Integer comempformapagoId; + + private Long logconferenciaId; + private boolean conferido; + + private Boolean exigeConferenciaAba; + + private Long boletoId; + + private String numFolioSistema; + + private Conferencia conferencia; + + private String cvetipoevento; + + private Date feccorte; + + private BigDecimal icmsBase; + private Integer estadoId; + + private Long cajaDiversosId; + private Integer usuarioId; + private Integer turnoId; + private List formapagos; + + + + public EventosFinanceirosVO(Long eventoextraId, Long logconferenciaId) { + this.eventoextraId = eventoextraId; + this.logconferenciaId = logconferenciaId; + } + + public EventosFinanceirosVO() { + + } + + public Long getEventoextraId() { + return eventoextraId; + } + + public void setEventoextraId(Long eventoextraId) { + this.eventoextraId = eventoextraId; + } + + public String getNumdocumento() { + return numdocumento; + } + + public void setNumdocumento(String numdocumento) { + this.numdocumento = numdocumento; + } + + public Date getFechoringreso() { + return fechoringreso; + } + + public void setFechoringreso(Date fechoringreso) { + this.fechoringreso = fechoringreso; + } + + public BigDecimal getImpingreso() { + return impingreso; + } + + public void setImpingreso(BigDecimal impingreso) { + this.impingreso = impingreso; + } + + public String getDesctipoevento() { + return desctipoevento; + } + + public void setDesctipoevento(String desctipoevento) { + this.desctipoevento = desctipoevento; + } + + public String getDescinfo() { + return descinfo; + } + + public void setDescinfo(String descinfo) { + this.descinfo = descinfo; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getStatusDescricao() { + StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); + if (statusLogConferencia != null) { + return statusLogConferencia.toString(); + } + return ""; + } + + public Integer getFormapagoId() { + return formapagoId; + } + + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + + public String getDescpago() { + return descpago; + } + + public void setDescpago(String descpago) { + this.descpago = descpago; + } + + public Boolean getIndconferenciafisicacomissao() { + return indconferenciafisicacomissao; + } + + public void setIndconferenciafisicacomissao(Boolean indconferenciafisicacomissao) { + this.indconferenciafisicacomissao = indconferenciafisicacomissao; + } + + public String getIndtipo() { + return indtipo; + } + + public void setIndtipo(String indtipo) { + this.indtipo = indtipo; + } + + public boolean isCredito() { + return StringUtils.isNotBlank(getIndtipo()) && "1".equals(getIndtipo()); + } + + public boolean isDebito() { + return StringUtils.isNotBlank(getIndtipo()) && "0".equals(getIndtipo()); + } + + public String getDebitoCredito() { + return isCredito() ? Labels.getLabel("conferenciaController.lbCredito.value") : Labels.getLabel("conferenciaController.lbDebito.value"); + } + + public String getNombusuario() { + return nombusuario; + } + + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + + public Long getLogconferenciaId() { + return logconferenciaId; + } + + public void setLogconferenciaId(Long logconferenciaId) { + this.logconferenciaId = logconferenciaId; + } + + public boolean isConferido() { + return conferido; + } + + public void setConferido(boolean conferido) { + this.conferido = conferido; + } + + public Integer getComemptipoeventoextraId() { + return comemptipoeventoextraId; + } + + public void setComemptipoeventoextraId(Integer comemptipoeventoextraId) { + this.comemptipoeventoextraId = comemptipoeventoextraId; + } + + public Integer getTipoeventoextradebcred() { + return tipoeventoextradebcred; + } + + public void setTipoeventoextradebcred(Integer tipoeventoextradebcred) { + this.tipoeventoextradebcred = tipoeventoextradebcred; + } + + public Integer getComempformapagoId() { + return comempformapagoId; + } + + public void setComempformapagoId(Integer comempformapagoId) { + this.comempformapagoId = comempformapagoId; + } + + public boolean isExigeConferencia() { + return getComemptipoeventoextraId() != null || getComempformapagoId() != null || isExigeConferenciaTipoEvento(); + } + + public boolean isExigeConferenciaTipoEvento() { + if(getTipoeventoextradebcred() != null && getTipoeventoextradebcred() != 0) { + if(getTipoeventoextradebcred() == 1){ + return true; + }else if(isDebito() && getTipoeventoextradebcred() == 2){ + return true; + }else if(isCredito() && getTipoeventoextradebcred() == 3){ + return true; + } + } + return false; + } + + public Boolean getExigeConferenciaAba() { + return exigeConferenciaAba; + } + + public void setExigeConferenciaAba(Boolean exigeConferenciaAba) { + this.exigeConferenciaAba = exigeConferenciaAba; + } + + public String getOrderExigeConferencia() { + if ((getExigeConferenciaAba() != null && getExigeConferenciaAba()) || isExigeConferencia()) { + if (!isConferido()) { + return "A"; + } else if (isConferido()) { + return "B"; + } + } + return "C"; + } + + public Date getOrderDataMovimento(){ + return conferencia.getDatamovimento(); + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public String getNumFolioSistema() { + return numFolioSistema; + } + + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + + public Conferencia getConferencia() { + return conferencia; + } + + public void setConferencia(Conferencia conferencia) { + this.conferencia = conferencia; + } + + public String getCvetipoevento() { + return cvetipoevento; + } + + public void setCvetipoevento(String cvetipoevento) { + this.cvetipoevento = cvetipoevento; + } + + public Date getFeccorte() { + return feccorte; + } + + public void setFeccorte(Date feccorte) { + this.feccorte = feccorte; + } + + public BigDecimal getIcmsBase() { + return icmsBase; + } + + public void setIcmsBase(BigDecimal icmsBase) { + this.icmsBase = icmsBase; + } + + public Integer getEstadoId() { + return estadoId; + } + + public void setEstadoId(Integer estadoId) { + this.estadoId = estadoId; + } + + public Long getCajaDiversosId() { + return cajaDiversosId; + } + + public void setCajaDiversosId(Long cajaDiversosId) { + this.cajaDiversosId = cajaDiversosId; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getTurnoId() { + return turnoId; + } + + public void setTurnoId(Integer turnoId) { + this.turnoId = turnoId; + } + + + + public List getFormapagos() { + return formapagos; + } + + public void setFormapagos(List formapagos) { + this.formapagos = formapagos; + } + + public String getDescFormapagos() { + StringBuilder sFormapagos = new StringBuilder(); + for (FormaPagoEventosFinanceirosVO formapago : formapagos) { + if (sFormapagos.length() > 0) { + sFormapagos.append(", "); + } + sFormapagos.append(formapago.getDescpago()); + } + return sFormapagos.toString(); + } + + public BigDecimal getTotal() { + BigDecimal total = BigDecimal.ZERO; + for (FormaPagoEventosFinanceirosVO formapagoVO : formapagos) { + total = total.add(formapagoVO.getImporte()); + } + return total; + } + + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((eventoextraId == null) ? 0 : eventoextraId.hashCode()); + result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EventosFinanceirosVO other = (EventosFinanceirosVO) obj; + if (eventoextraId == null) { + if (other.eventoextraId != null) + return false; + } else if (!eventoextraId.equals(other.eventoextraId)) + return false; + if (logconferenciaId == null) { + if (other.logconferenciaId != null) + return false; + } else if (!logconferenciaId.equals(other.logconferenciaId)) + return false; + return true; + } + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/FormaPagoEventosFinanceirosVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/FormaPagoEventosFinanceirosVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/FormaPagoEventosFinanceirosVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/FormaPagoEventosFinanceirosVO.java index 50995c79a..155554846 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/FormaPagoEventosFinanceirosVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/FormaPagoEventosFinanceirosVO.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; -import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; - -public class FormaPagoEventosFinanceirosVO { - - private Integer formapagoId; - private String descpago; - private BigDecimal importe; - - - - - public FormaPagoEventosFinanceirosVO(Integer formapagoId, String descpago, BigDecimal importe) { - super(); - this.formapagoId = formapagoId; - this.descpago = descpago; - this.importe = importe; - } - public Integer getFormapagoId() { - return formapagoId; - } - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - public String getDescpago() { - return descpago; - } - public void setDescpago(String descpago) { - this.descpago = descpago; - } - public BigDecimal getImporte() { - return importe; - } - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - - public String getImporteFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getImporte(), LocaleUtil.getLocale()); - } - - public void add(BigDecimal importe) { - this.importe = MoneyHelper.somar(this.importe, (importe != null ? importe : BigDecimal.ZERO)); - } - - public void subtract(BigDecimal importe) { - this.importe = MoneyHelper.subtrair(this.importe,(importe != null ? importe : BigDecimal.ZERO)); - } - - - - - - - - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; + +public class FormaPagoEventosFinanceirosVO { + + private Integer formapagoId; + private String descpago; + private BigDecimal importe; + + + + + public FormaPagoEventosFinanceirosVO(Integer formapagoId, String descpago, BigDecimal importe) { + super(); + this.formapagoId = formapagoId; + this.descpago = descpago; + this.importe = importe; + } + public Integer getFormapagoId() { + return formapagoId; + } + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + public String getDescpago() { + return descpago; + } + public void setDescpago(String descpago) { + this.descpago = descpago; + } + public BigDecimal getImporte() { + return importe; + } + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + + public String getImporteFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getImporte(), LocaleUtil.getLocale()); + } + + public void add(BigDecimal importe) { + this.importe = MoneyHelper.somar(this.importe, (importe != null ? importe : BigDecimal.ZERO)); + } + + public void subtract(BigDecimal importe) { + this.importe = MoneyHelper.subtrair(this.importe,(importe != null ? importe : BigDecimal.ZERO)); + } + + + + + + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/FormapagoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/FormapagoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/FormapagoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/FormapagoVO.java index 98a103856..89275355f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/FormapagoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/FormapagoVO.java @@ -1,100 +1,100 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; -import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; - -public class FormapagoVO { - - private Integer formapagoId; - private String descpago; - private Boolean indconferenciafisicacomissao; - private BigDecimal importe; - - public FormapagoVO() { - super(); - } - - public FormapagoVO(Integer formapagoId) { - super(); - this.formapagoId = formapagoId; - } - - public FormapagoVO(Integer formapagoId, String descpago, Boolean indconferenciafisicacomissao, BigDecimal importeFp) { - this(); - this.formapagoId = formapagoId; - this.descpago = descpago; - this.indconferenciafisicacomissao = indconferenciafisicacomissao; - this.importe = importeFp; - } - - public Integer getFormapagoId() { - return formapagoId; - } - - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - - public String getDescpago() { - return descpago; - } - - public void setDescpago(String descpago) { - this.descpago = descpago; - } - - public Boolean getIndconferenciafisicacomissao() { - return indconferenciafisicacomissao; - } - - public void setIndconferenciafisicacomissao(Boolean indconferenciafisicacomissao) { - this.indconferenciafisicacomissao = indconferenciafisicacomissao; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((formapagoId == null) ? 0 : formapagoId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - FormapagoVO other = (FormapagoVO) obj; - if (formapagoId == null) { - if (other.formapagoId != null) - return false; - } else if (!formapagoId.equals(other.formapagoId)) - return false; - return true; - } - - public String getImporteFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getImporte(), LocaleUtil.getLocale()); - } - - public void add(BigDecimal importe) { - this.importe = MoneyHelper.somar(this.importe, (importe != null ? importe : BigDecimal.ZERO)); - } - - public void subtract(BigDecimal importe) { - this.importe = MoneyHelper.subtrair(this.importe,(importe != null ? importe : BigDecimal.ZERO)); - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; + +public class FormapagoVO { + + private Integer formapagoId; + private String descpago; + private Boolean indconferenciafisicacomissao; + private BigDecimal importe; + + public FormapagoVO() { + super(); + } + + public FormapagoVO(Integer formapagoId) { + super(); + this.formapagoId = formapagoId; + } + + public FormapagoVO(Integer formapagoId, String descpago, Boolean indconferenciafisicacomissao, BigDecimal importeFp) { + this(); + this.formapagoId = formapagoId; + this.descpago = descpago; + this.indconferenciafisicacomissao = indconferenciafisicacomissao; + this.importe = importeFp; + } + + public Integer getFormapagoId() { + return formapagoId; + } + + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + + public String getDescpago() { + return descpago; + } + + public void setDescpago(String descpago) { + this.descpago = descpago; + } + + public Boolean getIndconferenciafisicacomissao() { + return indconferenciafisicacomissao; + } + + public void setIndconferenciafisicacomissao(Boolean indconferenciafisicacomissao) { + this.indconferenciafisicacomissao = indconferenciafisicacomissao; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((formapagoId == null) ? 0 : formapagoId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + FormapagoVO other = (FormapagoVO) obj; + if (formapagoId == null) { + if (other.formapagoId != null) + return false; + } else if (!formapagoId.equals(other.formapagoId)) + return false; + return true; + } + + public String getImporteFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getImporte(), LocaleUtil.getLocale()); + } + + public void add(BigDecimal importe) { + this.importe = MoneyHelper.somar(this.importe, (importe != null ? importe : BigDecimal.ZERO)); + } + + public void subtract(BigDecimal importe) { + this.importe = MoneyHelper.subtrair(this.importe,(importe != null ? importe : BigDecimal.ZERO)); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/HistoricoComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/HistoricoComissao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/HistoricoComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/HistoricoComissao.java index afef4593a..f93d12d61 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/HistoricoComissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/HistoricoComissao.java @@ -1,331 +1,331 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.text.NumberFormat; -import java.text.ParseException; - -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.brazilutils.text.RealToWords; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.entidad.Comissao; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.DocumentosUtil; -import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; - -public class HistoricoComissao extends Comissao { - - private static final Logger log = LogManager.getLogger(HistoricoComissao.class); - - private static final long serialVersionUID = 1L; - - private static final NumberFormat NF = NumberFormat.getCurrencyInstance(LocaleUtil.getLocale()); - - private String pagamento; - private String usuarioPagamento; - private String usuarioLancamento; - private String nombpuntoventa; - private String numpuntoventa; - private String sigla; - private String nome; - private String banco; - private String conta; - private String agencia; - private String cidade; - private String nombempresa; - private String cnpj; - private String descCorreo; - private String razonsocial; - private String cnpjPuntoventa; - - public HistoricoComissao() { - super(); - setComissaoBpr(BigDecimal.ZERO); - setReceitaExcessobagagem(BigDecimal.ZERO); - setReceitaSeguroopcional(BigDecimal.ZERO); - setReceitaSeguro(BigDecimal.ZERO); - setReceitaOutros(BigDecimal.ZERO); - setDescontosFixos(BigDecimal.ZERO); - setDescontosEventuais(BigDecimal.ZERO); - setRoyaties(BigDecimal.ZERO); - setIssRetido(BigDecimal.ZERO); - setBonificacaoMetas(BigDecimal.ZERO); - setEntregasPassagem(BigDecimal.ZERO); - setReceitaBPR(BigDecimal.ZERO); - setDevolvidos(BigDecimal.ZERO); - setReceitaGAP(BigDecimal.ZERO); - } - - public String getPagamento() { - return pagamento; - } - - public void setPagamento(String pagamento) { - this.pagamento = pagamento; - } - - public String getUsuarioPagamento() { - return usuarioPagamento; - } - - public void setUsuarioPagamento(String usuarioPagamento) { - this.usuarioPagamento = usuarioPagamento; - } - - public String getUsuarioLancamento() { - return usuarioLancamento; - } - - public void setUsuarioLancamento(String usuarioLancamento) { - this.usuarioLancamento = usuarioLancamento; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getNumpuntoventa() { - return numpuntoventa; - } - - public void setNumpuntoventa(String numpuntoventa) { - this.numpuntoventa = numpuntoventa; - } - - public BigDecimal getTotal() { - BigDecimal total = MoneyHelper.somar((getComissaoBpr() != null ? getComissaoBpr() : BigDecimal.ZERO), - (getReceitaExcessobagagem() != null ? getReceitaExcessobagagem() : BigDecimal.ZERO), - (getReceitaSeguroopcional() != null ? getReceitaSeguroopcional() : BigDecimal.ZERO), - (getReceitaSeguro() != null ? getReceitaSeguro() : BigDecimal.ZERO), - (getReceitaOutros() != null ? getReceitaOutros() : BigDecimal.ZERO), - (getBonificacaoMetas() != null ? getBonificacaoMetas() : BigDecimal.ZERO), - (getEntregasPassagem() != null ? getEntregasPassagem() : BigDecimal.ZERO)); - - return MoneyHelper.arredondar(total, 2); - } - - public BigDecimal getTotalLiquido() { - BigDecimal totalLiquido = getTotal(); - totalLiquido = MoneyHelper.subtrair(totalLiquido, getDescontosEventuais() != null ? getDescontosEventuais() : BigDecimal.ZERO); - totalLiquido = MoneyHelper.subtrair(totalLiquido, getDescontosFixos() != null ? getDescontosFixos() : BigDecimal.ZERO); - totalLiquido = MoneyHelper.subtrair(totalLiquido, getIssRetido() != null ? getIssRetido() : BigDecimal.ZERO); - totalLiquido = MoneyHelper.subtrair(totalLiquido, getRoyaties() != null ? getRoyaties() : BigDecimal.ZERO); - - return MoneyHelper.arredondar(totalLiquido, 2); - } - - public BigDecimal getReceitaBaseComissao() { - BigDecimal receitaBaseComissao = BigDecimal.ZERO; - receitaBaseComissao = MoneyHelper.somar(receitaBaseComissao, (getReceitaBPR() != null ? getReceitaBPR() : BigDecimal.ZERO)); - receitaBaseComissao = MoneyHelper.subtrair(receitaBaseComissao,(getDevolvidos() != null ? getDevolvidos() : BigDecimal.ZERO)); - return MoneyHelper.arredondar(receitaBaseComissao, 2); - } - - public String getSigla() { - return sigla; - } - - public void setSigla(String sigla) { - this.sigla = sigla; - } - - public String getNome() { - return nome; - } - - public void setNome(String nome) { - this.nome = nome; - } - - public String getBanco() { - return banco; - } - - public void setBanco(String banco) { - this.banco = banco; - } - - public String getConta() { - return conta; - } - - public void setConta(String conta) { - this.conta = conta; - } - - public String getAgencia() { - return agencia; - } - - public void setAgencia(String agencia) { - this.agencia = agencia; - } - - public String getCidade() { - return cidade; - } - - public void setCidade(String cidade) { - this.cidade = cidade; - } - - public String getTexto() { - return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto", - new String[]{getNombempresa(), - getCnpjFormatado(), - getTextoValor()}); - } - - public String getTexto1() { - try { - if(StringUtils.isNotBlank(getCompetencia())) { - return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto1", - new String[]{DateUtil.getStringDate(DateUtil.getDataInicialCompetencia(getCompetencia()), "dd/MM/yyyy"), - DateUtil.getStringDate(DateUtil.getDataFinalCompetencia(getCompetencia()), "dd/MM/yyyy")}); - } else { - return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto1", - new String[]{DateUtil.getStringDate(getDataInicial(), "dd/MM/yyyy"), - DateUtil.getStringDate(getDataFinal(), "dd/MM/yyyy")}); - } - } catch (ParseException e) { - log.error(e.getMessage(), e); - } - return null; - } - - public String getTexto2() { - return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto2"); - } - - private String getTextoValor() { - StringBuilder sTextoValor = new StringBuilder(); - sTextoValor.append(NF.format(getTotalLiquido().doubleValue())) - .append(" (") - .append(new RealToWords().toWords(getTotalLiquido())) - .append(") **********"); - return sTextoValor.toString(); - } - - public String getMsg() { - return Labels.getLabel("busquedaCalculoComissaoController.recibo.msg", new String[]{getNombempresa()}); - } - - public String getMsg1() { - return Labels.getLabel("busquedaCalculoComissaoController.recibo.msg1", new String[]{getNombempresa()}); - } - - public String getCnpj() { - return cnpj; - } - - public String getCnpjFormatado() { - return DocumentosUtil.formataCnpj(getCnpj()); - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public String getDescCorreo() { - return descCorreo; - } - - public void setDescCorreo(String descCorreo) { - this.descCorreo = descCorreo; - } - - @Override - public BigDecimal getComissaoBpr() { - return super.getComissaoBpr() != null ? super.getComissaoBpr() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getReceitaExcessobagagem() { - return super.getReceitaExcessobagagem() != null ? super.getReceitaExcessobagagem() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getReceitaSeguroopcional() { - return super.getReceitaSeguroopcional() != null ? super.getReceitaSeguroopcional() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getDescontosFixos() { - return super.getDescontosFixos() != null ? super.getDescontosFixos() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getDescontosEventuais() { - return super.getDescontosEventuais() != null ? super.getDescontosEventuais() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getRoyaties() { - return super.getRoyaties() != null ? super.getRoyaties() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getIssRetido() { - return super.getIssRetido() != null ? super.getIssRetido() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getBonificacaoMetas() { - return super.getBonificacaoMetas() != null ? super.getBonificacaoMetas() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getEntregasPassagem() { - return super.getEntregasPassagem() != null ? super.getEntregasPassagem() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getReceitaOutros() { - return super.getReceitaOutros() != null ? super.getReceitaOutros() : BigDecimal.ZERO; - } - - @Override - public BigDecimal getReceitaSeguro() { - return super.getReceitaSeguro() != null ? super.getReceitaSeguro() : BigDecimal.ZERO; - } - - public String getCnpjPuntoventaFormatado() { - if(!getCnpjPuntoventa().contains(".") && !getCnpjPuntoventa().contains("-") && !getCnpjPuntoventa().contains("/")) { - return DocumentosUtil.formataCnpj(getCnpjPuntoventa()); - }else { - return getCnpjPuntoventa(); - } - } - - public String getCnpjPuntoventa() { - return cnpjPuntoventa; - } - - public void setCnpjPuntoventa(String cnpjPuntoventa) { - this.cnpjPuntoventa = cnpjPuntoventa; - } - - public String getRazonsocial() { - return razonsocial; - } - - public void setRazonsocial(String razonsocial) { - this.razonsocial = razonsocial; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.text.ParseException; + +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.brazilutils.text.RealToWords; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.entidad.Comissao; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.DocumentosUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; + +public class HistoricoComissao extends Comissao { + + private static final Logger log = LogManager.getLogger(HistoricoComissao.class); + + private static final long serialVersionUID = 1L; + + private static final NumberFormat NF = NumberFormat.getCurrencyInstance(LocaleUtil.getLocale()); + + private String pagamento; + private String usuarioPagamento; + private String usuarioLancamento; + private String nombpuntoventa; + private String numpuntoventa; + private String sigla; + private String nome; + private String banco; + private String conta; + private String agencia; + private String cidade; + private String nombempresa; + private String cnpj; + private String descCorreo; + private String razonsocial; + private String cnpjPuntoventa; + + public HistoricoComissao() { + super(); + setComissaoBpr(BigDecimal.ZERO); + setReceitaExcessobagagem(BigDecimal.ZERO); + setReceitaSeguroopcional(BigDecimal.ZERO); + setReceitaSeguro(BigDecimal.ZERO); + setReceitaOutros(BigDecimal.ZERO); + setDescontosFixos(BigDecimal.ZERO); + setDescontosEventuais(BigDecimal.ZERO); + setRoyaties(BigDecimal.ZERO); + setIssRetido(BigDecimal.ZERO); + setBonificacaoMetas(BigDecimal.ZERO); + setEntregasPassagem(BigDecimal.ZERO); + setReceitaBPR(BigDecimal.ZERO); + setDevolvidos(BigDecimal.ZERO); + setReceitaGAP(BigDecimal.ZERO); + } + + public String getPagamento() { + return pagamento; + } + + public void setPagamento(String pagamento) { + this.pagamento = pagamento; + } + + public String getUsuarioPagamento() { + return usuarioPagamento; + } + + public void setUsuarioPagamento(String usuarioPagamento) { + this.usuarioPagamento = usuarioPagamento; + } + + public String getUsuarioLancamento() { + return usuarioLancamento; + } + + public void setUsuarioLancamento(String usuarioLancamento) { + this.usuarioLancamento = usuarioLancamento; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getNumpuntoventa() { + return numpuntoventa; + } + + public void setNumpuntoventa(String numpuntoventa) { + this.numpuntoventa = numpuntoventa; + } + + public BigDecimal getTotal() { + BigDecimal total = MoneyHelper.somar((getComissaoBpr() != null ? getComissaoBpr() : BigDecimal.ZERO), + (getReceitaExcessobagagem() != null ? getReceitaExcessobagagem() : BigDecimal.ZERO), + (getReceitaSeguroopcional() != null ? getReceitaSeguroopcional() : BigDecimal.ZERO), + (getReceitaSeguro() != null ? getReceitaSeguro() : BigDecimal.ZERO), + (getReceitaOutros() != null ? getReceitaOutros() : BigDecimal.ZERO), + (getBonificacaoMetas() != null ? getBonificacaoMetas() : BigDecimal.ZERO), + (getEntregasPassagem() != null ? getEntregasPassagem() : BigDecimal.ZERO)); + + return MoneyHelper.arredondar(total, 2); + } + + public BigDecimal getTotalLiquido() { + BigDecimal totalLiquido = getTotal(); + totalLiquido = MoneyHelper.subtrair(totalLiquido, getDescontosEventuais() != null ? getDescontosEventuais() : BigDecimal.ZERO); + totalLiquido = MoneyHelper.subtrair(totalLiquido, getDescontosFixos() != null ? getDescontosFixos() : BigDecimal.ZERO); + totalLiquido = MoneyHelper.subtrair(totalLiquido, getIssRetido() != null ? getIssRetido() : BigDecimal.ZERO); + totalLiquido = MoneyHelper.subtrair(totalLiquido, getRoyaties() != null ? getRoyaties() : BigDecimal.ZERO); + + return MoneyHelper.arredondar(totalLiquido, 2); + } + + public BigDecimal getReceitaBaseComissao() { + BigDecimal receitaBaseComissao = BigDecimal.ZERO; + receitaBaseComissao = MoneyHelper.somar(receitaBaseComissao, (getReceitaBPR() != null ? getReceitaBPR() : BigDecimal.ZERO)); + receitaBaseComissao = MoneyHelper.subtrair(receitaBaseComissao,(getDevolvidos() != null ? getDevolvidos() : BigDecimal.ZERO)); + return MoneyHelper.arredondar(receitaBaseComissao, 2); + } + + public String getSigla() { + return sigla; + } + + public void setSigla(String sigla) { + this.sigla = sigla; + } + + public String getNome() { + return nome; + } + + public void setNome(String nome) { + this.nome = nome; + } + + public String getBanco() { + return banco; + } + + public void setBanco(String banco) { + this.banco = banco; + } + + public String getConta() { + return conta; + } + + public void setConta(String conta) { + this.conta = conta; + } + + public String getAgencia() { + return agencia; + } + + public void setAgencia(String agencia) { + this.agencia = agencia; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getTexto() { + return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto", + new String[]{getNombempresa(), + getCnpjFormatado(), + getTextoValor()}); + } + + public String getTexto1() { + try { + if(StringUtils.isNotBlank(getCompetencia())) { + return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto1", + new String[]{DateUtil.getStringDate(DateUtil.getDataInicialCompetencia(getCompetencia()), "dd/MM/yyyy"), + DateUtil.getStringDate(DateUtil.getDataFinalCompetencia(getCompetencia()), "dd/MM/yyyy")}); + } else { + return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto1", + new String[]{DateUtil.getStringDate(getDataInicial(), "dd/MM/yyyy"), + DateUtil.getStringDate(getDataFinal(), "dd/MM/yyyy")}); + } + } catch (ParseException e) { + log.error(e.getMessage(), e); + } + return null; + } + + public String getTexto2() { + return Labels.getLabel("busquedaCalculoComissaoController.recibo.texto2"); + } + + private String getTextoValor() { + StringBuilder sTextoValor = new StringBuilder(); + sTextoValor.append(NF.format(getTotalLiquido().doubleValue())) + .append(" (") + .append(new RealToWords().toWords(getTotalLiquido())) + .append(") **********"); + return sTextoValor.toString(); + } + + public String getMsg() { + return Labels.getLabel("busquedaCalculoComissaoController.recibo.msg", new String[]{getNombempresa()}); + } + + public String getMsg1() { + return Labels.getLabel("busquedaCalculoComissaoController.recibo.msg1", new String[]{getNombempresa()}); + } + + public String getCnpj() { + return cnpj; + } + + public String getCnpjFormatado() { + return DocumentosUtil.formataCnpj(getCnpj()); + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public String getDescCorreo() { + return descCorreo; + } + + public void setDescCorreo(String descCorreo) { + this.descCorreo = descCorreo; + } + + @Override + public BigDecimal getComissaoBpr() { + return super.getComissaoBpr() != null ? super.getComissaoBpr() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getReceitaExcessobagagem() { + return super.getReceitaExcessobagagem() != null ? super.getReceitaExcessobagagem() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getReceitaSeguroopcional() { + return super.getReceitaSeguroopcional() != null ? super.getReceitaSeguroopcional() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getDescontosFixos() { + return super.getDescontosFixos() != null ? super.getDescontosFixos() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getDescontosEventuais() { + return super.getDescontosEventuais() != null ? super.getDescontosEventuais() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getRoyaties() { + return super.getRoyaties() != null ? super.getRoyaties() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getIssRetido() { + return super.getIssRetido() != null ? super.getIssRetido() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getBonificacaoMetas() { + return super.getBonificacaoMetas() != null ? super.getBonificacaoMetas() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getEntregasPassagem() { + return super.getEntregasPassagem() != null ? super.getEntregasPassagem() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getReceitaOutros() { + return super.getReceitaOutros() != null ? super.getReceitaOutros() : BigDecimal.ZERO; + } + + @Override + public BigDecimal getReceitaSeguro() { + return super.getReceitaSeguro() != null ? super.getReceitaSeguro() : BigDecimal.ZERO; + } + + public String getCnpjPuntoventaFormatado() { + if(!getCnpjPuntoventa().contains(".") && !getCnpjPuntoventa().contains("-") && !getCnpjPuntoventa().contains("/")) { + return DocumentosUtil.formataCnpj(getCnpjPuntoventa()); + }else { + return getCnpjPuntoventa(); + } + } + + public String getCnpjPuntoventa() { + return cnpjPuntoventa; + } + + public void setCnpjPuntoventa(String cnpjPuntoventa) { + this.cnpjPuntoventa = cnpjPuntoventa; + } + + public String getRazonsocial() { + return razonsocial; + } + + public void setRazonsocial(String razonsocial) { + this.razonsocial = razonsocial; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java index 88819821f..51bb7e6c5 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java @@ -1,320 +1,320 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.Date; - -import com.rjconsultores.ventaboletos.constantes.DescricaoTipoVenta; -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; -import com.rjconsultores.ventaboletos.enums.comissao.TipoLogConferencia; - -public class LogConferenciaVO { - - private Long logconferenciaId; - private String observacao; - private BigDecimal preco; - private Integer status; - private String numfoliosistema; - private Long boletoId; - private Long eventoextraId; - private Long ocdId; - private Integer tipo; - private String numoperacion; - private String desctipoevento; - private String nombusuario; - private Date fecmodif; - private Short indcredito; - private String nombempresa; - private String nombpuntoventa; - private Date datamovimento; - private String desccategoria; - private Integer tipoventa; - private String descinfoevento; - private String desctipoinformativo; - private String descpendencia; - private String descComportamentoData; - private Long cajaId; - private Conferencia conferencia; - private Integer pendenciaId; - - public LogConferenciaVO() { - super(); - } - - public LogConferenciaVO(Long logconferenciaId, String observacao, BigDecimal preco, Integer status, String numfoliosistema) { - this(); - this.logconferenciaId = logconferenciaId; - this.observacao = observacao; - this.preco = preco; - this.status = status; - this.numfoliosistema = numfoliosistema; - } - - public LogConferenciaVO(Long logconferenciaId) { - this(); - this.logconferenciaId = logconferenciaId; - } - - public Long getLogconferenciaId() { - return logconferenciaId; - } - - public void setLogconferenciaId(Long logconferenciaId) { - this.logconferenciaId = logconferenciaId; - } - - public String getObservacao() { - return observacao; - } - - public void setObservacao(String observacao) { - this.observacao = observacao; - } - - public BigDecimal getPreco() { - return preco; - } - - public void setPreco(BigDecimal preco) { - this.preco = preco; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getNumfoliosistema() { - return numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public String getStatusDescricao() { - StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); - if (statusLogConferencia != null) { - return statusLogConferencia.toString(); - } - return ""; - } - - public Long getEventoextraId() { - return eventoextraId; - } - - public void setEventoextraId(Long eventoextraId) { - this.eventoextraId = eventoextraId; - } - - public Long getOcdId() { - return ocdId; - } - - public void setOcdId(Long ocdId) { - this.ocdId = ocdId; - } - - public Integer getTipo() { - return tipo; - } - - public void setTipo(Integer tipo) { - this.tipo = tipo; - } - - public String getTipoDescricao() { - TipoLogConferencia tipoLogConferencia = TipoLogConferencia.getTipoLogConferencia(tipo); - if (tipoLogConferencia != null) { - return tipoLogConferencia.toString(); - } - return ""; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public String getDesctipoevento() { - return desctipoevento; - } - - public void setDesctipoevento(String desctipoevento) { - this.desctipoevento = desctipoevento; - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public String getNombusuario() { - return nombusuario; - } - - public void setNombusuario(String nombusuario) { - this.nombusuario = nombusuario; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - LogConferenciaVO other = (LogConferenciaVO) obj; - if (logconferenciaId == null) { - if (other.logconferenciaId != null) - return false; - } else if (!logconferenciaId.equals(other.logconferenciaId)) - return false; - return true; - } - - public Short isIndcredito() { - return indcredito; - } - - public void setIndcredito(Short indcredito) { - this.indcredito = indcredito; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public Date getDatamovimento() { - return datamovimento; - } - - public void setDatamovimento(Date datamovimento) { - this.datamovimento = datamovimento; - } - - public String getDesccategoria() { - return desccategoria; - } - - public void setDesccategoria(String desccategoria) { - this.desccategoria = desccategoria; - } - - public String getDebitoCredito() { - return isIndcredito().equals((short) 0) ? "D" : isIndcredito().equals((short) 1) ? "C" : "I"; - } - - public Integer getTipoventa() { - return tipoventa; - } - - public void setTipoventa(Integer tipoventa) { - this.tipoventa = tipoventa; - } - - public String getDescinfoevento() { - return descinfoevento; - } - - public void setDescinfoevento(String descinfoevento) { - this.descinfoevento = descinfoevento; - } - - public String getDescricaoTipoventa() { - return DescricaoTipoVenta.getDescricaoTipoVenta(getTipoventa()); - } - - public String getDescdebitocredito() { - return isIndcredito().equals((short) 0) ? "D" : isIndcredito().equals((short) 1) ? "C" : "I"; - } - - public String getDesctipoinformativo() { - return desctipoinformativo; - } - - public void setDesctipoinformativo(String desctipoinformativo) { - this.desctipoinformativo = desctipoinformativo; - } - - public String getDescpendencia() { - return descpendencia; - } - - public void setDescpendencia(String descpendencia) { - this.descpendencia = descpendencia; - } - - public String getDescComportamentoData() { - return descComportamentoData != null ? descComportamentoData.equals("0") ? "Dia posterior" : "Mesmo dia" : null; - } - - public void setDescComportamentoData(String descComportamentoData) { - this.descComportamentoData = descComportamentoData; - } - - public Long getCajaId() { - return cajaId; - } - - public void setCajaId(Long cajaId) { - this.cajaId = cajaId; - } - - public Conferencia getConferencia() { - return conferencia; - } - - public void setConferencia(Conferencia conferencia) { - this.conferencia = conferencia; - } - - public Date getOrderDataMovimento(){ - return conferencia.getDatamovimento(); - } - - public Integer getPendenciaId() { - return pendenciaId; - } - - public void setPendenciaId(Integer pendenciaId) { - this.pendenciaId = pendenciaId; - } -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.Date; + +import com.rjconsultores.ventaboletos.constantes.DescricaoTipoVenta; +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; +import com.rjconsultores.ventaboletos.enums.comissao.TipoLogConferencia; + +public class LogConferenciaVO { + + private Long logconferenciaId; + private String observacao; + private BigDecimal preco; + private Integer status; + private String numfoliosistema; + private Long boletoId; + private Long eventoextraId; + private Long ocdId; + private Integer tipo; + private String numoperacion; + private String desctipoevento; + private String nombusuario; + private Date fecmodif; + private Short indcredito; + private String nombempresa; + private String nombpuntoventa; + private Date datamovimento; + private String desccategoria; + private Integer tipoventa; + private String descinfoevento; + private String desctipoinformativo; + private String descpendencia; + private String descComportamentoData; + private Long cajaId; + private Conferencia conferencia; + private Integer pendenciaId; + + public LogConferenciaVO() { + super(); + } + + public LogConferenciaVO(Long logconferenciaId, String observacao, BigDecimal preco, Integer status, String numfoliosistema) { + this(); + this.logconferenciaId = logconferenciaId; + this.observacao = observacao; + this.preco = preco; + this.status = status; + this.numfoliosistema = numfoliosistema; + } + + public LogConferenciaVO(Long logconferenciaId) { + this(); + this.logconferenciaId = logconferenciaId; + } + + public Long getLogconferenciaId() { + return logconferenciaId; + } + + public void setLogconferenciaId(Long logconferenciaId) { + this.logconferenciaId = logconferenciaId; + } + + public String getObservacao() { + return observacao; + } + + public void setObservacao(String observacao) { + this.observacao = observacao; + } + + public BigDecimal getPreco() { + return preco; + } + + public void setPreco(BigDecimal preco) { + this.preco = preco; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getNumfoliosistema() { + return numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public String getStatusDescricao() { + StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); + if (statusLogConferencia != null) { + return statusLogConferencia.toString(); + } + return ""; + } + + public Long getEventoextraId() { + return eventoextraId; + } + + public void setEventoextraId(Long eventoextraId) { + this.eventoextraId = eventoextraId; + } + + public Long getOcdId() { + return ocdId; + } + + public void setOcdId(Long ocdId) { + this.ocdId = ocdId; + } + + public Integer getTipo() { + return tipo; + } + + public void setTipo(Integer tipo) { + this.tipo = tipo; + } + + public String getTipoDescricao() { + TipoLogConferencia tipoLogConferencia = TipoLogConferencia.getTipoLogConferencia(tipo); + if (tipoLogConferencia != null) { + return tipoLogConferencia.toString(); + } + return ""; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public String getDesctipoevento() { + return desctipoevento; + } + + public void setDesctipoevento(String desctipoevento) { + this.desctipoevento = desctipoevento; + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public String getNombusuario() { + return nombusuario; + } + + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + LogConferenciaVO other = (LogConferenciaVO) obj; + if (logconferenciaId == null) { + if (other.logconferenciaId != null) + return false; + } else if (!logconferenciaId.equals(other.logconferenciaId)) + return false; + return true; + } + + public Short isIndcredito() { + return indcredito; + } + + public void setIndcredito(Short indcredito) { + this.indcredito = indcredito; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public Date getDatamovimento() { + return datamovimento; + } + + public void setDatamovimento(Date datamovimento) { + this.datamovimento = datamovimento; + } + + public String getDesccategoria() { + return desccategoria; + } + + public void setDesccategoria(String desccategoria) { + this.desccategoria = desccategoria; + } + + public String getDebitoCredito() { + return isIndcredito().equals((short) 0) ? "D" : isIndcredito().equals((short) 1) ? "C" : "I"; + } + + public Integer getTipoventa() { + return tipoventa; + } + + public void setTipoventa(Integer tipoventa) { + this.tipoventa = tipoventa; + } + + public String getDescinfoevento() { + return descinfoevento; + } + + public void setDescinfoevento(String descinfoevento) { + this.descinfoevento = descinfoevento; + } + + public String getDescricaoTipoventa() { + return DescricaoTipoVenta.getDescricaoTipoVenta(getTipoventa()); + } + + public String getDescdebitocredito() { + return isIndcredito().equals((short) 0) ? "D" : isIndcredito().equals((short) 1) ? "C" : "I"; + } + + public String getDesctipoinformativo() { + return desctipoinformativo; + } + + public void setDesctipoinformativo(String desctipoinformativo) { + this.desctipoinformativo = desctipoinformativo; + } + + public String getDescpendencia() { + return descpendencia; + } + + public void setDescpendencia(String descpendencia) { + this.descpendencia = descpendencia; + } + + public String getDescComportamentoData() { + return descComportamentoData != null ? descComportamentoData.equals("0") ? "Dia posterior" : "Mesmo dia" : null; + } + + public void setDescComportamentoData(String descComportamentoData) { + this.descComportamentoData = descComportamentoData; + } + + public Long getCajaId() { + return cajaId; + } + + public void setCajaId(Long cajaId) { + this.cajaId = cajaId; + } + + public Conferencia getConferencia() { + return conferencia; + } + + public void setConferencia(Conferencia conferencia) { + this.conferencia = conferencia; + } + + public Date getOrderDataMovimento(){ + return conferencia.getDatamovimento(); + } + + public Integer getPendenciaId() { + return pendenciaId; + } + + public void setPendenciaId(Integer pendenciaId) { + this.pendenciaId = pendenciaId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java index e9f04cd32..78d5a038a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/MovimentosAtrasoVO.java @@ -1,236 +1,236 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Set; - -import com.rjconsultores.ventaboletos.constantes.Constantes; - -public class MovimentosAtrasoVO implements Comparable { - - private Integer puntoventaId; - private String nombpuntoventa; - private String numPuntoVenta; - private String competencia; - private Integer diasemtransito; - private Date dataMovimento; - private SituacaoDiaMovimento situacao; - private String numtelefonouno; - private String uf; - private String nombpuntoventaPadre; - private Integer intervalofechamento; - - private Set diasEmAtraso; - - public MovimentosAtrasoVO() { - super(); - } - - public MovimentosAtrasoVO(Integer puntoventaId, Date dataMovimento) { - this(); - this.puntoventaId = puntoventaId; - this.dataMovimento = dataMovimento; - } - - public MovimentosAtrasoVO(Integer puntoventaId, String nombpuntoventa, String numPuntoVenta, String competencia, Integer diasemtransito, Date dataMovimento, SituacaoDiaMovimento situacao, Integer intervalofechamento, String nombpuntoventaPadre, String uf, String numtelefonouno) { - this(); - this.puntoventaId = puntoventaId; - this.nombpuntoventa = nombpuntoventa; - this.numPuntoVenta = numPuntoVenta; - this.competencia = competencia; - this.diasemtransito = diasemtransito; - this.dataMovimento = dataMovimento; - this.situacao = situacao; - this.intervalofechamento = intervalofechamento; - this.nombpuntoventaPadre = nombpuntoventaPadre; - this.uf = uf; - this.numtelefonouno = numtelefonouno; - - /*movimentosAtrasoVO.setIntervalofechamento(rset.getInt("INTERVALOFECHAMENTO")); - movimentosAtrasoVO.setNombpuntoventaPadre(rset.getString("NOMPUNTOVENTAPADRE")); - movimentosAtrasoVO.setUf(rset.getString("UF")); - movimentosAtrasoVO.setNumtelefonouno(rset.getString("NUMTELEFONOUNO"));*/ - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - - public String getCompetencia() { - return competencia; - } - - public void setCompetencia(String competencia) { - this.competencia = competencia; - } - - public enum SituacaoDiaMovimento { - ENTREGUE("EN","Entregue"), - ATRASADO("AT","Atrasado"), - AGUARDANDO("AG","Aguardando"); - - private String shortDescricao; - private String descricao; - - private SituacaoDiaMovimento(String shortDescricao, String descricao) { - this.shortDescricao = shortDescricao; - this.descricao = descricao; - } - - public String getShortDescricao() { - return shortDescricao; - } - - @Override - public String toString() { - return this.descricao; - } - - } - - @Override - public int compareTo(MovimentosAtrasoVO o) { - return this.nombpuntoventa.compareTo(o.nombpuntoventa); - } - - public Integer getDiasemtransito() { - return diasemtransito; - } - - public void setDiasemtransito(Integer diasemtransito) { - this.diasemtransito = diasemtransito; - } - - public Date getDataMovimento() { - return dataMovimento; - } - - public void setDataMovimento(Date dataMovimento) { - this.dataMovimento = dataMovimento; - } - - public SituacaoDiaMovimento getSituacao() { - return situacao; - } - - public void setSituacao(SituacaoDiaMovimento situacao) { - this.situacao = situacao; - } - - public String getDescricaoSituacao() { - return getSituacao() != null ? getSituacao().toString() : ""; - } - - public String getShortDescricaoSituacao() { - return getSituacao() != null ? getSituacao().getShortDescricao() : ""; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((dataMovimento == null) ? 0 : dataMovimento.hashCode()); - result = prime * result + ((puntoventaId == null) ? 0 : puntoventaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - MovimentosAtrasoVO other = (MovimentosAtrasoVO) obj; - if (puntoventaId == null) { - if (other.puntoventaId != null) - return false; - } else if (!puntoventaId.equals(other.puntoventaId)) - return false; - return true; - } - - public String getNumtelefonouno() { - return numtelefonouno; - } - - public void setNumtelefonouno(String numtelefonouno) { - this.numtelefonouno = numtelefonouno; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getNombpuntoventaPadre() { - return nombpuntoventaPadre; - } - - public void setNombpuntoventaPadre(String nombpuntoventaPadre) { - this.nombpuntoventaPadre = nombpuntoventaPadre; - } - - public Integer getIntervalofechamento() { - return intervalofechamento; - } - - public void setIntervalofechamento(Integer intervalofechamento) { - this.intervalofechamento = intervalofechamento; - } - - public Set getDiasEmAtraso() { - return diasEmAtraso; - } - - public void setDiasEmAtraso(Set diasEmAtraso) { - this.diasEmAtraso = diasEmAtraso; - } - - public String getStrDiasEmAtraso() { - List dias = Arrays.asList(getDiasEmAtraso().toArray(new Integer[0])); - java.util.Collections.sort(dias); - return dias.toString().replaceAll("[^0-9,]", ""); - } - - public String getDesIntervalofechamento() { - switch (intervalofechamento) { - case Constantes.INTERVALO_FECHAMENTO_DIARIO: - return "Diário"; - case Constantes.INTERVALO_FECHAMENTO_SEMANAL: - return "Semanal"; - case Constantes.INTERVALO_FECHAMENTO_DECENDIAL: - return "Decendial"; - case Constantes.INTERVALO_FECHAMENTO_QUINZENAL: - return "Quinzenal"; - case Constantes.INTERVALO_FECHAMENTO_MENSAL: - return "Mensal"; - default: - return ""; - } - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Set; + +import com.rjconsultores.ventaboletos.constantes.Constantes; + +public class MovimentosAtrasoVO implements Comparable { + + private Integer puntoventaId; + private String nombpuntoventa; + private String numPuntoVenta; + private String competencia; + private Integer diasemtransito; + private Date dataMovimento; + private SituacaoDiaMovimento situacao; + private String numtelefonouno; + private String uf; + private String nombpuntoventaPadre; + private Integer intervalofechamento; + + private Set diasEmAtraso; + + public MovimentosAtrasoVO() { + super(); + } + + public MovimentosAtrasoVO(Integer puntoventaId, Date dataMovimento) { + this(); + this.puntoventaId = puntoventaId; + this.dataMovimento = dataMovimento; + } + + public MovimentosAtrasoVO(Integer puntoventaId, String nombpuntoventa, String numPuntoVenta, String competencia, Integer diasemtransito, Date dataMovimento, SituacaoDiaMovimento situacao, Integer intervalofechamento, String nombpuntoventaPadre, String uf, String numtelefonouno) { + this(); + this.puntoventaId = puntoventaId; + this.nombpuntoventa = nombpuntoventa; + this.numPuntoVenta = numPuntoVenta; + this.competencia = competencia; + this.diasemtransito = diasemtransito; + this.dataMovimento = dataMovimento; + this.situacao = situacao; + this.intervalofechamento = intervalofechamento; + this.nombpuntoventaPadre = nombpuntoventaPadre; + this.uf = uf; + this.numtelefonouno = numtelefonouno; + + /*movimentosAtrasoVO.setIntervalofechamento(rset.getInt("INTERVALOFECHAMENTO")); + movimentosAtrasoVO.setNombpuntoventaPadre(rset.getString("NOMPUNTOVENTAPADRE")); + movimentosAtrasoVO.setUf(rset.getString("UF")); + movimentosAtrasoVO.setNumtelefonouno(rset.getString("NUMTELEFONOUNO"));*/ + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + + public String getCompetencia() { + return competencia; + } + + public void setCompetencia(String competencia) { + this.competencia = competencia; + } + + public enum SituacaoDiaMovimento { + ENTREGUE("EN","Entregue"), + ATRASADO("AT","Atrasado"), + AGUARDANDO("AG","Aguardando"); + + private String shortDescricao; + private String descricao; + + private SituacaoDiaMovimento(String shortDescricao, String descricao) { + this.shortDescricao = shortDescricao; + this.descricao = descricao; + } + + public String getShortDescricao() { + return shortDescricao; + } + + @Override + public String toString() { + return this.descricao; + } + + } + + @Override + public int compareTo(MovimentosAtrasoVO o) { + return this.nombpuntoventa.compareTo(o.nombpuntoventa); + } + + public Integer getDiasemtransito() { + return diasemtransito; + } + + public void setDiasemtransito(Integer diasemtransito) { + this.diasemtransito = diasemtransito; + } + + public Date getDataMovimento() { + return dataMovimento; + } + + public void setDataMovimento(Date dataMovimento) { + this.dataMovimento = dataMovimento; + } + + public SituacaoDiaMovimento getSituacao() { + return situacao; + } + + public void setSituacao(SituacaoDiaMovimento situacao) { + this.situacao = situacao; + } + + public String getDescricaoSituacao() { + return getSituacao() != null ? getSituacao().toString() : ""; + } + + public String getShortDescricaoSituacao() { + return getSituacao() != null ? getSituacao().getShortDescricao() : ""; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dataMovimento == null) ? 0 : dataMovimento.hashCode()); + result = prime * result + ((puntoventaId == null) ? 0 : puntoventaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + MovimentosAtrasoVO other = (MovimentosAtrasoVO) obj; + if (puntoventaId == null) { + if (other.puntoventaId != null) + return false; + } else if (!puntoventaId.equals(other.puntoventaId)) + return false; + return true; + } + + public String getNumtelefonouno() { + return numtelefonouno; + } + + public void setNumtelefonouno(String numtelefonouno) { + this.numtelefonouno = numtelefonouno; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getNombpuntoventaPadre() { + return nombpuntoventaPadre; + } + + public void setNombpuntoventaPadre(String nombpuntoventaPadre) { + this.nombpuntoventaPadre = nombpuntoventaPadre; + } + + public Integer getIntervalofechamento() { + return intervalofechamento; + } + + public void setIntervalofechamento(Integer intervalofechamento) { + this.intervalofechamento = intervalofechamento; + } + + public Set getDiasEmAtraso() { + return diasEmAtraso; + } + + public void setDiasEmAtraso(Set diasEmAtraso) { + this.diasEmAtraso = diasEmAtraso; + } + + public String getStrDiasEmAtraso() { + List dias = Arrays.asList(getDiasEmAtraso().toArray(new Integer[0])); + java.util.Collections.sort(dias); + return dias.toString().replaceAll("[^0-9,]", ""); + } + + public String getDesIntervalofechamento() { + switch (intervalofechamento) { + case Constantes.INTERVALO_FECHAMENTO_DIARIO: + return "Diário"; + case Constantes.INTERVALO_FECHAMENTO_SEMANAL: + return "Semanal"; + case Constantes.INTERVALO_FECHAMENTO_DECENDIAL: + return "Decendial"; + case Constantes.INTERVALO_FECHAMENTO_QUINZENAL: + return "Quinzenal"; + case Constantes.INTERVALO_FECHAMENTO_MENSAL: + return "Mensal"; + default: + return ""; + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java index 160245372..90fb33e22 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java @@ -1,290 +1,290 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.Date; - -import org.apache.commons.lang.StringUtils; -import org.zkoss.util.resource.Labels; - -import com.rjconsultores.ventaboletos.entidad.Conferencia; -import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; -import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; -import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; - -public class OcdVO { - - private Long ocdId; - - private Long boletoId; - private Integer puntoventaId; - - private String numoperacion; - - private Date fecpagar; - private BigDecimal valorPagar; - private BigDecimal penalizacion; - - private Integer usuarioIncId; - private Date fecinc; - - private Boolean indpago; - private Integer usuarioPagoId; - private Date fecpago; - private Integer puntoventapagoId; - - private Date fecmodif; - private Integer usuarioId; - private Boolean activo; - private String nombusuario; - private String login; - private String numFolioSistema; - - private Integer status; - private Long logconferenciaId; - private boolean conferido; - - private boolean exigeConferenciaAba; - - private Conferencia conferencia; - - public Long getOcdId() { - return ocdId; - } - - public void setOcdId(Long ocdId) { - this.ocdId = ocdId; - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public Date getFecpagar() { - return fecpagar; - } - - public void setFecpagar(Date fecpagar) { - this.fecpagar = fecpagar; - } - - public BigDecimal getValorPagar() { - return valorPagar; - } - - public void setValorPagar(BigDecimal valorPagar) { - this.valorPagar = valorPagar; - } - - public BigDecimal getPenalizacion() { - return penalizacion; - } - - public void setPenalizacion(BigDecimal penalizacion) { - this.penalizacion = penalizacion; - } - - public Integer getUsuarioIncId() { - return usuarioIncId; - } - - public void setUsuarioIncId(Integer usuarioIncId) { - this.usuarioIncId = usuarioIncId; - } - - public Date getFecinc() { - return fecinc; - } - - public void setFecinc(Date fecinc) { - this.fecinc = fecinc; - } - - public Boolean getIndpago() { - return indpago; - } - - public void setIndpago(Boolean indpago) { - this.indpago = indpago; - } - - public Integer getUsuarioPagoId() { - return usuarioPagoId; - } - - public void setUsuarioPagoId(Integer usuarioPagoId) { - this.usuarioPagoId = usuarioPagoId; - } - - public Date getFecpago() { - return fecpago; - } - - public void setFecpago(Date fecpago) { - this.fecpago = fecpago; - } - - public Integer getPuntoventapagoId() { - return puntoventapagoId; - } - - public void setPuntoventapagoId(Integer puntoventapagoId) { - this.puntoventapagoId = puntoventapagoId; - } - - public Date getFecmodif() { - return fecmodif; - } - - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Boolean getActivo() { - return activo; - } - - public void setActivo(Boolean activo) { - this.activo = activo; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getStatusDescricao() { - StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); - if(statusLogConferencia != null) { - return statusLogConferencia.toString(); - } - return ""; - } - - public String getDescindpago() { - return getIndpago() != null && getIndpago() ? Labels.getLabel("conferenciaController.lbl.sim") : Labels.getLabel("conferenciaController.lbl.nao"); - } - - public String getNombusuario() { - return nombusuario; - } - - public void setNombusuario(String nombusuario) { - this.nombusuario = nombusuario; - } - - public String getValorPagarFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getValorPagar(), LocaleUtil.getLocale()); - } - - public String getPenalizacionFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getPenalizacion(), LocaleUtil.getLocale()); - } - - public Long getLogconferenciaId() { - return logconferenciaId; - } - - public void setLogconferenciaId(Long logconferenciaId) { - this.logconferenciaId = logconferenciaId; - } - - public boolean isConferido() { - return conferido; - } - - public void setConferido(boolean conferido) { - this.conferido = conferido; - } - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getNumFolioSistema() { - return numFolioSistema; - } - - public void setNumFolioSistema(String numFolioSistema) { - this.numFolioSistema = numFolioSistema; - } - - public String getNombusuarioLogin() { - StringBuilder nombusuarioLogin = new StringBuilder(); - - nombusuarioLogin.append(StringUtils.isNotBlank(getNombusuario()) ? getNombusuario() : ""); - - if(nombusuarioLogin.length() > 0) { - nombusuarioLogin.append(" - ") - .append(StringUtils.isNotBlank(getLogin()) ? getLogin() : ""); - } - - return nombusuarioLogin.toString(); - } - - public boolean isExigeConferenciaAba() { - return exigeConferenciaAba; - } - - public void setExigeConferenciaAba(boolean exigeConferenciaAba) { - this.exigeConferenciaAba = exigeConferenciaAba; - } - - public String getOrderExigeConferencia() { - if(isExigeConferenciaAba()) { - if(!isConferido()) { - return "A"; - } else if (isConferido()){ - return "B"; - } - } - return "C"; - } - - public Conferencia getConferencia() { - return conferencia; - } - - public void setConferencia(Conferencia conferencia) { - this.conferencia = conferencia; - } - - public Date getOrderDataMovimento(){ - return conferencia.getDatamovimento(); - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.Date; + +import org.apache.commons.lang.StringUtils; +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.entidad.Conferencia; +import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia; +import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; + +public class OcdVO { + + private Long ocdId; + + private Long boletoId; + private Integer puntoventaId; + + private String numoperacion; + + private Date fecpagar; + private BigDecimal valorPagar; + private BigDecimal penalizacion; + + private Integer usuarioIncId; + private Date fecinc; + + private Boolean indpago; + private Integer usuarioPagoId; + private Date fecpago; + private Integer puntoventapagoId; + + private Date fecmodif; + private Integer usuarioId; + private Boolean activo; + private String nombusuario; + private String login; + private String numFolioSistema; + + private Integer status; + private Long logconferenciaId; + private boolean conferido; + + private boolean exigeConferenciaAba; + + private Conferencia conferencia; + + public Long getOcdId() { + return ocdId; + } + + public void setOcdId(Long ocdId) { + this.ocdId = ocdId; + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public Date getFecpagar() { + return fecpagar; + } + + public void setFecpagar(Date fecpagar) { + this.fecpagar = fecpagar; + } + + public BigDecimal getValorPagar() { + return valorPagar; + } + + public void setValorPagar(BigDecimal valorPagar) { + this.valorPagar = valorPagar; + } + + public BigDecimal getPenalizacion() { + return penalizacion; + } + + public void setPenalizacion(BigDecimal penalizacion) { + this.penalizacion = penalizacion; + } + + public Integer getUsuarioIncId() { + return usuarioIncId; + } + + public void setUsuarioIncId(Integer usuarioIncId) { + this.usuarioIncId = usuarioIncId; + } + + public Date getFecinc() { + return fecinc; + } + + public void setFecinc(Date fecinc) { + this.fecinc = fecinc; + } + + public Boolean getIndpago() { + return indpago; + } + + public void setIndpago(Boolean indpago) { + this.indpago = indpago; + } + + public Integer getUsuarioPagoId() { + return usuarioPagoId; + } + + public void setUsuarioPagoId(Integer usuarioPagoId) { + this.usuarioPagoId = usuarioPagoId; + } + + public Date getFecpago() { + return fecpago; + } + + public void setFecpago(Date fecpago) { + this.fecpago = fecpago; + } + + public Integer getPuntoventapagoId() { + return puntoventapagoId; + } + + public void setPuntoventapagoId(Integer puntoventapagoId) { + this.puntoventapagoId = puntoventapagoId; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getStatusDescricao() { + StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status); + if(statusLogConferencia != null) { + return statusLogConferencia.toString(); + } + return ""; + } + + public String getDescindpago() { + return getIndpago() != null && getIndpago() ? Labels.getLabel("conferenciaController.lbl.sim") : Labels.getLabel("conferenciaController.lbl.nao"); + } + + public String getNombusuario() { + return nombusuario; + } + + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + + public String getValorPagarFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getValorPagar(), LocaleUtil.getLocale()); + } + + public String getPenalizacionFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getPenalizacion(), LocaleUtil.getLocale()); + } + + public Long getLogconferenciaId() { + return logconferenciaId; + } + + public void setLogconferenciaId(Long logconferenciaId) { + this.logconferenciaId = logconferenciaId; + } + + public boolean isConferido() { + return conferido; + } + + public void setConferido(boolean conferido) { + this.conferido = conferido; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getNumFolioSistema() { + return numFolioSistema; + } + + public void setNumFolioSistema(String numFolioSistema) { + this.numFolioSistema = numFolioSistema; + } + + public String getNombusuarioLogin() { + StringBuilder nombusuarioLogin = new StringBuilder(); + + nombusuarioLogin.append(StringUtils.isNotBlank(getNombusuario()) ? getNombusuario() : ""); + + if(nombusuarioLogin.length() > 0) { + nombusuarioLogin.append(" - ") + .append(StringUtils.isNotBlank(getLogin()) ? getLogin() : ""); + } + + return nombusuarioLogin.toString(); + } + + public boolean isExigeConferenciaAba() { + return exigeConferenciaAba; + } + + public void setExigeConferenciaAba(boolean exigeConferenciaAba) { + this.exigeConferenciaAba = exigeConferenciaAba; + } + + public String getOrderExigeConferencia() { + if(isExigeConferenciaAba()) { + if(!isConferido()) { + return "A"; + } else if (isConferido()){ + return "B"; + } + } + return "C"; + } + + public Conferencia getConferencia() { + return conferencia; + } + + public void setConferencia(Conferencia conferencia) { + this.conferencia = conferencia; + } + + public Date getOrderDataMovimento(){ + return conferencia.getDatamovimento(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/RegistroCalculo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/RegistroCalculo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/RegistroCalculo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/RegistroCalculo.java index 84da59456..a212d29f5 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/RegistroCalculo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/RegistroCalculo.java @@ -1,152 +1,152 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.List; - -public class RegistroCalculo { - - private BigDecimal comissaoPagar; - private BigDecimal comissaoBPR; - private BigDecimal comissaoSeguro; - private BigDecimal comissaoSegOpcional; - private BigDecimal comissaoExcessoBagagem; - private BigDecimal comissaoEntregaPassagem; - private BigDecimal comissaoOutros; - private BigDecimal comissaoBonificaoMetas; - - private BigDecimal royaties; - private BigDecimal retidoISS; - - private BigDecimal descontos; - private List lsDescontos; - private List lsReceitas; - - private String nombpuntoventa; - private String numPuntoVenta; - - public BigDecimal getComissaoPagar() { - return comissaoPagar; - } - - public void setComissaoPagar(BigDecimal comissaoPagar) { - this.comissaoPagar = comissaoPagar; - } - - public BigDecimal getComissaoBPR() { - return comissaoBPR; - } - - public void setComissaoBPR(BigDecimal comissaoBPR) { - this.comissaoBPR = comissaoBPR; - } - - public BigDecimal getComissaoSegOpcional() { - return comissaoSegOpcional; - } - - public void setComissaoSegOpcional(BigDecimal comissaoSegOpcional) { - this.comissaoSegOpcional = comissaoSegOpcional; - } - - public BigDecimal getComissaoExcessoBagagem() { - return comissaoExcessoBagagem; - } - - public void setComissaoExcessoBagagem(BigDecimal comissaoExcessoBagagem) { - this.comissaoExcessoBagagem = comissaoExcessoBagagem; - } - - public BigDecimal getComissaoEntregaPassagem() { - return comissaoEntregaPassagem; - } - - public void setComissaoEntregaPassagem(BigDecimal comissaoEntregaPassagem) { - this.comissaoEntregaPassagem = comissaoEntregaPassagem; - } - - public BigDecimal getComissaoBonificaoMetas() { - return comissaoBonificaoMetas; - } - - public void setComissaoBonificaoMetas(BigDecimal comissaoBonificaoMetas) { - this.comissaoBonificaoMetas = comissaoBonificaoMetas; - } - - public BigDecimal getRoyaties() { - return royaties; - } - - public void setRoyaties(BigDecimal royaties) { - this.royaties = royaties; - } - - public BigDecimal getRetidoISS() { - return retidoISS; - } - - public void setRetidoISS(BigDecimal retidoISS) { - this.retidoISS = retidoISS; - } - - public BigDecimal getDescontos() { - return descontos; - } - - public void setDescontos(BigDecimal descontos) { - this.descontos = descontos; - } - - public List getLsDescontos() { - return lsDescontos; - } - - public void setLsDescontos(List lsDescontos) { - this.lsDescontos = lsDescontos; - } - - public List getLsReceitas() { - return lsReceitas; - } - - public void setLsReceitas(List lsReceitas) { - this.lsReceitas = lsReceitas; - } - - public BigDecimal getComissaoOutros() { - return comissaoOutros; - } - - public void setComissaoOutros(BigDecimal comissaoOutros) { - this.comissaoOutros = comissaoOutros; - } - - @Override - public String toString() { - return "RegistroCalculo [comissaoPagar=" + comissaoPagar + ", comissaoBPR=" + comissaoBPR + ", comissaoSegOpcional=" + comissaoSegOpcional + ", comissaoExcessoBagagem=" + comissaoExcessoBagagem + ", comissaoEntregaPassagem=" + comissaoEntregaPassagem + ", comissaoBonificaoMetas=" + comissaoBonificaoMetas + ", royaties=" + royaties + ", retidoISS=" + retidoISS + ", descontos=" + descontos + ", lsDescontos=" + lsDescontos + ", lsReceitas=" + lsReceitas + "]"; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - - public BigDecimal getComissaoSeguro() { - return comissaoSeguro; - } - - public void setComissaoSeguro(BigDecimal comissaoSeguro) { - this.comissaoSeguro = comissaoSeguro; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.List; + +public class RegistroCalculo { + + private BigDecimal comissaoPagar; + private BigDecimal comissaoBPR; + private BigDecimal comissaoSeguro; + private BigDecimal comissaoSegOpcional; + private BigDecimal comissaoExcessoBagagem; + private BigDecimal comissaoEntregaPassagem; + private BigDecimal comissaoOutros; + private BigDecimal comissaoBonificaoMetas; + + private BigDecimal royaties; + private BigDecimal retidoISS; + + private BigDecimal descontos; + private List lsDescontos; + private List lsReceitas; + + private String nombpuntoventa; + private String numPuntoVenta; + + public BigDecimal getComissaoPagar() { + return comissaoPagar; + } + + public void setComissaoPagar(BigDecimal comissaoPagar) { + this.comissaoPagar = comissaoPagar; + } + + public BigDecimal getComissaoBPR() { + return comissaoBPR; + } + + public void setComissaoBPR(BigDecimal comissaoBPR) { + this.comissaoBPR = comissaoBPR; + } + + public BigDecimal getComissaoSegOpcional() { + return comissaoSegOpcional; + } + + public void setComissaoSegOpcional(BigDecimal comissaoSegOpcional) { + this.comissaoSegOpcional = comissaoSegOpcional; + } + + public BigDecimal getComissaoExcessoBagagem() { + return comissaoExcessoBagagem; + } + + public void setComissaoExcessoBagagem(BigDecimal comissaoExcessoBagagem) { + this.comissaoExcessoBagagem = comissaoExcessoBagagem; + } + + public BigDecimal getComissaoEntregaPassagem() { + return comissaoEntregaPassagem; + } + + public void setComissaoEntregaPassagem(BigDecimal comissaoEntregaPassagem) { + this.comissaoEntregaPassagem = comissaoEntregaPassagem; + } + + public BigDecimal getComissaoBonificaoMetas() { + return comissaoBonificaoMetas; + } + + public void setComissaoBonificaoMetas(BigDecimal comissaoBonificaoMetas) { + this.comissaoBonificaoMetas = comissaoBonificaoMetas; + } + + public BigDecimal getRoyaties() { + return royaties; + } + + public void setRoyaties(BigDecimal royaties) { + this.royaties = royaties; + } + + public BigDecimal getRetidoISS() { + return retidoISS; + } + + public void setRetidoISS(BigDecimal retidoISS) { + this.retidoISS = retidoISS; + } + + public BigDecimal getDescontos() { + return descontos; + } + + public void setDescontos(BigDecimal descontos) { + this.descontos = descontos; + } + + public List getLsDescontos() { + return lsDescontos; + } + + public void setLsDescontos(List lsDescontos) { + this.lsDescontos = lsDescontos; + } + + public List getLsReceitas() { + return lsReceitas; + } + + public void setLsReceitas(List lsReceitas) { + this.lsReceitas = lsReceitas; + } + + public BigDecimal getComissaoOutros() { + return comissaoOutros; + } + + public void setComissaoOutros(BigDecimal comissaoOutros) { + this.comissaoOutros = comissaoOutros; + } + + @Override + public String toString() { + return "RegistroCalculo [comissaoPagar=" + comissaoPagar + ", comissaoBPR=" + comissaoBPR + ", comissaoSegOpcional=" + comissaoSegOpcional + ", comissaoExcessoBagagem=" + comissaoExcessoBagagem + ", comissaoEntregaPassagem=" + comissaoEntregaPassagem + ", comissaoBonificaoMetas=" + comissaoBonificaoMetas + ", royaties=" + royaties + ", retidoISS=" + retidoISS + ", descontos=" + descontos + ", lsDescontos=" + lsDescontos + ", lsReceitas=" + lsReceitas + "]"; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + + public BigDecimal getComissaoSeguro() { + return comissaoSeguro; + } + + public void setComissaoSeguro(BigDecimal comissaoSeguro) { + this.comissaoSeguro = comissaoSeguro; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/ResumoComissao.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ResumoComissao.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/ResumoComissao.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ResumoComissao.java index 5801b2b7e..b9292f5fa 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/ResumoComissao.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/ResumoComissao.java @@ -1,142 +1,142 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; -import java.util.List; - -import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; -import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; - -public class ResumoComissao { - - private BigDecimal totalVendas; - private BigDecimal totalCancelados; - private BigDecimal totalDevolvidos; - private BigDecimal totalTroca; - private BigDecimal totalReceitas; - private BigDecimal totalDespesas; - private BigDecimal valorDeposito; - private List listNumSerieECF; - - private OcdVO totalOcd; - - private List totalFormapago; - - public BigDecimal getTotalVendas() { - return totalVendas; - } - - public void setTotalVendas(BigDecimal totalVendas) { - this.totalVendas = totalVendas; - } - - public BigDecimal getTotalCancelados() { - return totalCancelados; - } - - public void setTotalCancelados(BigDecimal totalCancelados) { - this.totalCancelados = totalCancelados; - } - - public BigDecimal getTotalDevolvidos() { - return totalDevolvidos; - } - - public void setTotalDevolvidos(BigDecimal totalDevolvidos) { - this.totalDevolvidos = totalDevolvidos; - } - - public BigDecimal getTotalTroca() { - return totalTroca; - } - - public void setTotalTroca(BigDecimal totalTroca) { - this.totalTroca = totalTroca; - } - - public BigDecimal getTotalReceitas() { - return totalReceitas; - } - - public void setTotalReceitas(BigDecimal totalReceitas) { - this.totalReceitas = totalReceitas; - } - - public BigDecimal getTotalDespesas() { - return totalDespesas; - } - - public void setTotalDespesas(BigDecimal totalDespesas) { - this.totalDespesas = totalDespesas; - } - - public BigDecimal getValorDeposito() { - return valorDeposito; - } - - public void setValorDeposito(BigDecimal valorDeposito) { - this.valorDeposito = valorDeposito; - } - - public List getTotalFormapago() { - return totalFormapago; - } - - public void setTotalFormapago(List totalFormapago) { - this.totalFormapago = totalFormapago; - } - - public OcdVO getTotalOcd() { - return totalOcd; - } - - public void setTotalOcd(OcdVO totalOcd) { - this.totalOcd = totalOcd; - } - - public List getListNumSerieECF() { - return listNumSerieECF; - } - - public void setListNumSerieECF(List listNumSerieECF) { - this.listNumSerieECF = listNumSerieECF; - } - - public String getTotalVendasFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalVendas(), LocaleUtil.getLocale()); - } - - public String getTotalCanceladosFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalCancelados(), LocaleUtil.getLocale()); - } - - public String getTotalDevolvidosFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalDevolvidos(), LocaleUtil.getLocale()); - } - - public String getTotalTrocaFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalTroca(), LocaleUtil.getLocale()); - } - - public String getTotalReceitasFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalReceitas(), LocaleUtil.getLocale()); - } - - public String getTotalDespesasFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalDespesas(), LocaleUtil.getLocale()); - } - - public BigDecimal getTotalDiferenca() { - return getTotalReceitas().subtract(getTotalDespesas()); - } - - public String getTotalDiferencaFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalDiferenca(), LocaleUtil.getLocale()); - } - - public String getValorDepositoFormatado() { - return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getValorDeposito(), LocaleUtil.getLocale()); - } - - - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; +import java.util.List; + +import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; +import com.rjconsultores.ventaboletos.utilerias.LocaleUtil; + +public class ResumoComissao { + + private BigDecimal totalVendas; + private BigDecimal totalCancelados; + private BigDecimal totalDevolvidos; + private BigDecimal totalTroca; + private BigDecimal totalReceitas; + private BigDecimal totalDespesas; + private BigDecimal valorDeposito; + private List listNumSerieECF; + + private OcdVO totalOcd; + + private List totalFormapago; + + public BigDecimal getTotalVendas() { + return totalVendas; + } + + public void setTotalVendas(BigDecimal totalVendas) { + this.totalVendas = totalVendas; + } + + public BigDecimal getTotalCancelados() { + return totalCancelados; + } + + public void setTotalCancelados(BigDecimal totalCancelados) { + this.totalCancelados = totalCancelados; + } + + public BigDecimal getTotalDevolvidos() { + return totalDevolvidos; + } + + public void setTotalDevolvidos(BigDecimal totalDevolvidos) { + this.totalDevolvidos = totalDevolvidos; + } + + public BigDecimal getTotalTroca() { + return totalTroca; + } + + public void setTotalTroca(BigDecimal totalTroca) { + this.totalTroca = totalTroca; + } + + public BigDecimal getTotalReceitas() { + return totalReceitas; + } + + public void setTotalReceitas(BigDecimal totalReceitas) { + this.totalReceitas = totalReceitas; + } + + public BigDecimal getTotalDespesas() { + return totalDespesas; + } + + public void setTotalDespesas(BigDecimal totalDespesas) { + this.totalDespesas = totalDespesas; + } + + public BigDecimal getValorDeposito() { + return valorDeposito; + } + + public void setValorDeposito(BigDecimal valorDeposito) { + this.valorDeposito = valorDeposito; + } + + public List getTotalFormapago() { + return totalFormapago; + } + + public void setTotalFormapago(List totalFormapago) { + this.totalFormapago = totalFormapago; + } + + public OcdVO getTotalOcd() { + return totalOcd; + } + + public void setTotalOcd(OcdVO totalOcd) { + this.totalOcd = totalOcd; + } + + public List getListNumSerieECF() { + return listNumSerieECF; + } + + public void setListNumSerieECF(List listNumSerieECF) { + this.listNumSerieECF = listNumSerieECF; + } + + public String getTotalVendasFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalVendas(), LocaleUtil.getLocale()); + } + + public String getTotalCanceladosFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalCancelados(), LocaleUtil.getLocale()); + } + + public String getTotalDevolvidosFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalDevolvidos(), LocaleUtil.getLocale()); + } + + public String getTotalTrocaFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalTroca(), LocaleUtil.getLocale()); + } + + public String getTotalReceitasFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalReceitas(), LocaleUtil.getLocale()); + } + + public String getTotalDespesasFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalDespesas(), LocaleUtil.getLocale()); + } + + public BigDecimal getTotalDiferenca() { + return getTotalReceitas().subtract(getTotalDespesas()); + } + + public String getTotalDiferencaFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getTotalDiferenca(), LocaleUtil.getLocale()); + } + + public String getValorDepositoFormatado() { + return BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(getValorDeposito(), LocaleUtil.getLocale()); + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialComComposicaoDoPedagioVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialComComposicaoDoPedagioVo.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialComComposicaoDoPedagioVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialComComposicaoDoPedagioVo.java index 7c4d18958..8545b69f9 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialComComposicaoDoPedagioVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialComComposicaoDoPedagioVo.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -public class TarifaOficialComComposicaoDoPedagioVo { - private Integer tarifaOficialId; - private String composicaoDoPedagioNaTarifa; - private String composicaoDoPedagioNaTarifaOficialComPeaje; - - public Integer getTarifaOficialId() { - return tarifaOficialId; - } - public void setTarifaOficialId(Integer tarifaOficialId) { - this.tarifaOficialId = tarifaOficialId; - } - public String getComposicaoDoPedagioNaTarifa() { - return composicaoDoPedagioNaTarifa; - } - public void setComposicaoDoPedagioNaTarifa(String composicaoDoPedagioNaTarifa) { - this.composicaoDoPedagioNaTarifa = composicaoDoPedagioNaTarifa; - } - public String getComposicaoDoPedagioNaTarifaOficialComPeaje() { - return composicaoDoPedagioNaTarifaOficialComPeaje; - } - public void setComposicaoDoPedagioNaTarifaOficialComPeaje(String composicaoDoPedagioNaTarifaOficialComPeaje) { - this.composicaoDoPedagioNaTarifaOficialComPeaje = composicaoDoPedagioNaTarifaOficialComPeaje; - } - - - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +public class TarifaOficialComComposicaoDoPedagioVo { + private Integer tarifaOficialId; + private String composicaoDoPedagioNaTarifa; + private String composicaoDoPedagioNaTarifaOficialComPeaje; + + public Integer getTarifaOficialId() { + return tarifaOficialId; + } + public void setTarifaOficialId(Integer tarifaOficialId) { + this.tarifaOficialId = tarifaOficialId; + } + public String getComposicaoDoPedagioNaTarifa() { + return composicaoDoPedagioNaTarifa; + } + public void setComposicaoDoPedagioNaTarifa(String composicaoDoPedagioNaTarifa) { + this.composicaoDoPedagioNaTarifa = composicaoDoPedagioNaTarifa; + } + public String getComposicaoDoPedagioNaTarifaOficialComPeaje() { + return composicaoDoPedagioNaTarifaOficialComPeaje; + } + public void setComposicaoDoPedagioNaTarifaOficialComPeaje(String composicaoDoPedagioNaTarifaOficialComPeaje) { + this.composicaoDoPedagioNaTarifaOficialComPeaje = composicaoDoPedagioNaTarifaOficialComPeaje; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialVO.java index e668cadc7..22fdd2cb8 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaOficialVO.java @@ -1,124 +1,124 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; - -public class TarifaOficialVO { - - private Integer tarifaoficialid; - private BigDecimal precio; - private BigDecimal preciooriginal; - private BigDecimal importepedagio; - private BigDecimal importetaxaembarque; - private BigDecimal importeseguro; - private BigDecimal importetpp; - private BigDecimal importeoutros; - private String descparadaorigem; - private String descparadadestino; - private String nomevia; - private String descmarca; - private String descorgao; - private String rutaprefixo; - private String numruta; - private String descclasse; - - - public Integer getTarifaoficialid() { - return tarifaoficialid; - } - public void setTarifaoficialid(Integer tarifaoficialid) { - this.tarifaoficialid = tarifaoficialid; - } - public BigDecimal getPrecio() { - return precio; - } - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - public BigDecimal getPreciooriginal() { - return preciooriginal; - } - public void setPreciooriginal(BigDecimal preciooriginal) { - this.preciooriginal = preciooriginal; - } - public BigDecimal getImportepedagio() { - return importepedagio; - } - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - public BigDecimal getImportetaxaembarque() { - return importetaxaembarque; - } - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - public BigDecimal getImporteseguro() { - return importeseguro; - } - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } - public BigDecimal getImportetpp() { - return importetpp; - } - public void setImportetpp(BigDecimal importetpp) { - this.importetpp = importetpp; - } - public BigDecimal getImporteoutros() { - return importeoutros; - } - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - public String getDescparadaorigem() { - return descparadaorigem; - } - public void setDescparadaorigem(String descparadaorigem) { - this.descparadaorigem = descparadaorigem; - } - public String getDescparadadestino() { - return descparadadestino; - } - public void setDescparadadestino(String descparadadestino) { - this.descparadadestino = descparadadestino; - } - public String getNomevia() { - return nomevia; - } - public void setNomevia(String nomevia) { - this.nomevia = nomevia; - } - public String getDescmarca() { - return descmarca; - } - public void setDescmarca(String descmarca) { - this.descmarca = descmarca; - } - public String getDescorgao() { - return descorgao; - } - public void setDescorgao(String descorgao) { - this.descorgao = descorgao; - } - public String getRutaprefixo() { - return rutaprefixo; - } - public void setRutaprefixo(String rutaprefixo) { - this.rutaprefixo = rutaprefixo; - } - public String getNumruta() { - return numruta; - } - public void setNumruta(String numruta) { - this.numruta = numruta; - } - public String getDescclasse() { - return descclasse; - } - public void setDescclasse(String descclasse) { - this.descclasse = descclasse; - } - - - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; + +public class TarifaOficialVO { + + private Integer tarifaoficialid; + private BigDecimal precio; + private BigDecimal preciooriginal; + private BigDecimal importepedagio; + private BigDecimal importetaxaembarque; + private BigDecimal importeseguro; + private BigDecimal importetpp; + private BigDecimal importeoutros; + private String descparadaorigem; + private String descparadadestino; + private String nomevia; + private String descmarca; + private String descorgao; + private String rutaprefixo; + private String numruta; + private String descclasse; + + + public Integer getTarifaoficialid() { + return tarifaoficialid; + } + public void setTarifaoficialid(Integer tarifaoficialid) { + this.tarifaoficialid = tarifaoficialid; + } + public BigDecimal getPrecio() { + return precio; + } + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + public BigDecimal getPreciooriginal() { + return preciooriginal; + } + public void setPreciooriginal(BigDecimal preciooriginal) { + this.preciooriginal = preciooriginal; + } + public BigDecimal getImportepedagio() { + return importepedagio; + } + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + public BigDecimal getImportetaxaembarque() { + return importetaxaembarque; + } + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + public BigDecimal getImporteseguro() { + return importeseguro; + } + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } + public BigDecimal getImportetpp() { + return importetpp; + } + public void setImportetpp(BigDecimal importetpp) { + this.importetpp = importetpp; + } + public BigDecimal getImporteoutros() { + return importeoutros; + } + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + public String getDescparadaorigem() { + return descparadaorigem; + } + public void setDescparadaorigem(String descparadaorigem) { + this.descparadaorigem = descparadaorigem; + } + public String getDescparadadestino() { + return descparadadestino; + } + public void setDescparadadestino(String descparadadestino) { + this.descparadadestino = descparadadestino; + } + public String getNomevia() { + return nomevia; + } + public void setNomevia(String nomevia) { + this.nomevia = nomevia; + } + public String getDescmarca() { + return descmarca; + } + public void setDescmarca(String descmarca) { + this.descmarca = descmarca; + } + public String getDescorgao() { + return descorgao; + } + public void setDescorgao(String descorgao) { + this.descorgao = descorgao; + } + public String getRutaprefixo() { + return rutaprefixo; + } + public void setRutaprefixo(String rutaprefixo) { + this.rutaprefixo = rutaprefixo; + } + public String getNumruta() { + return numruta; + } + public void setNumruta(String numruta) { + this.numruta = numruta; + } + public String getDescclasse() { + return descclasse; + } + public void setDescclasse(String descclasse) { + this.descclasse = descclasse; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/comissao/TarifaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaVO.java index 6f1baaf00..7c6b00932 100644 --- a/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/comissao/TarifaVO.java @@ -1,143 +1,143 @@ -package com.rjconsultores.ventaboletos.vo.comissao; - -import java.math.BigDecimal; - -public class TarifaVO { - - - - private Integer tarifaid; - private BigDecimal precio; - private BigDecimal preciooriginal; - private BigDecimal importepedagio; - private BigDecimal importetaxaembarque; - private BigDecimal importeseguro; - private BigDecimal importetpp; - private BigDecimal importeoutros; - private String statustarifa; - private String descparadaOrigem; - private String descparadaDestino; - private String nomeVia; - private String descMarca; - private java.util.Date feciniciovigencia; - private java.util.Date fecfimvigencia; - private String descorgao; - private String rutaprefixo; - private String numruta; - private String descclasse; - public Integer getTarifaid() { - return tarifaid; - } - public void setTarifaid(Integer tarifaid) { - this.tarifaid = tarifaid; - } - public BigDecimal getPrecio() { - return precio; - } - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - public BigDecimal getPreciooriginal() { - return preciooriginal; - } - public void setPreciooriginal(BigDecimal preciooriginal) { - this.preciooriginal = preciooriginal; - } - public BigDecimal getImportepedagio() { - return importepedagio; - } - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - public BigDecimal getImportetaxaembarque() { - return importetaxaembarque; - } - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - public BigDecimal getImporteseguro() { - return importeseguro; - } - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } - public BigDecimal getImportetpp() { - return importetpp; - } - public void setImportetpp(BigDecimal importetpp) { - this.importetpp = importetpp; - } - public BigDecimal getImporteoutros() { - return importeoutros; - } - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - public String getStatustarifa() { - return statustarifa; - } - public void setStatustarifa(String statustarifa) { - this.statustarifa = statustarifa; - } - public String getDescparadaOrigem() { - return descparadaOrigem; - } - public void setDescparadaOrigem(String descparadaOrigem) { - this.descparadaOrigem = descparadaOrigem; - } - public String getDescparadaDestino() { - return descparadaDestino; - } - public void setDescparadaDestino(String descparadaDestino) { - this.descparadaDestino = descparadaDestino; - } - public String getNomeVia() { - return nomeVia; - } - public void setNomeVia(String nomeVia) { - this.nomeVia = nomeVia; - } - public String getDescMarca() { - return descMarca; - } - public void setDescMarca(String descMarca) { - this.descMarca = descMarca; - } - public java.util.Date getFeciniciovigencia() { - return feciniciovigencia; - } - public void setFeciniciovigencia(java.util.Date feciniciovigencia) { - this.feciniciovigencia = feciniciovigencia; - } - public java.util.Date getFecfimvigencia() { - return fecfimvigencia; - } - public void setFecfimvigencia(java.util.Date fecfimvigencia) { - this.fecfimvigencia = fecfimvigencia; - } - public String getDescorgao() { - return descorgao; - } - public void setDescorgao(String descorgao) { - this.descorgao = descorgao; - } - public String getRutaprefixo() { - return rutaprefixo; - } - public void setRutaprefixo(String rutaprefixo) { - this.rutaprefixo = rutaprefixo; - } - public String getNumruta() { - return numruta; - } - public void setNumruta(String numruta) { - this.numruta = numruta; - } - public String getDescclasse() { - return descclasse; - } - public void setDescclasse(String descclasse) { - this.descclasse = descclasse; - } - -} +package com.rjconsultores.ventaboletos.vo.comissao; + +import java.math.BigDecimal; + +public class TarifaVO { + + + + private Integer tarifaid; + private BigDecimal precio; + private BigDecimal preciooriginal; + private BigDecimal importepedagio; + private BigDecimal importetaxaembarque; + private BigDecimal importeseguro; + private BigDecimal importetpp; + private BigDecimal importeoutros; + private String statustarifa; + private String descparadaOrigem; + private String descparadaDestino; + private String nomeVia; + private String descMarca; + private java.util.Date feciniciovigencia; + private java.util.Date fecfimvigencia; + private String descorgao; + private String rutaprefixo; + private String numruta; + private String descclasse; + public Integer getTarifaid() { + return tarifaid; + } + public void setTarifaid(Integer tarifaid) { + this.tarifaid = tarifaid; + } + public BigDecimal getPrecio() { + return precio; + } + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + public BigDecimal getPreciooriginal() { + return preciooriginal; + } + public void setPreciooriginal(BigDecimal preciooriginal) { + this.preciooriginal = preciooriginal; + } + public BigDecimal getImportepedagio() { + return importepedagio; + } + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + public BigDecimal getImportetaxaembarque() { + return importetaxaembarque; + } + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + public BigDecimal getImporteseguro() { + return importeseguro; + } + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } + public BigDecimal getImportetpp() { + return importetpp; + } + public void setImportetpp(BigDecimal importetpp) { + this.importetpp = importetpp; + } + public BigDecimal getImporteoutros() { + return importeoutros; + } + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + public String getStatustarifa() { + return statustarifa; + } + public void setStatustarifa(String statustarifa) { + this.statustarifa = statustarifa; + } + public String getDescparadaOrigem() { + return descparadaOrigem; + } + public void setDescparadaOrigem(String descparadaOrigem) { + this.descparadaOrigem = descparadaOrigem; + } + public String getDescparadaDestino() { + return descparadaDestino; + } + public void setDescparadaDestino(String descparadaDestino) { + this.descparadaDestino = descparadaDestino; + } + public String getNomeVia() { + return nomeVia; + } + public void setNomeVia(String nomeVia) { + this.nomeVia = nomeVia; + } + public String getDescMarca() { + return descMarca; + } + public void setDescMarca(String descMarca) { + this.descMarca = descMarca; + } + public java.util.Date getFeciniciovigencia() { + return feciniciovigencia; + } + public void setFeciniciovigencia(java.util.Date feciniciovigencia) { + this.feciniciovigencia = feciniciovigencia; + } + public java.util.Date getFecfimvigencia() { + return fecfimvigencia; + } + public void setFecfimvigencia(java.util.Date fecfimvigencia) { + this.fecfimvigencia = fecfimvigencia; + } + public String getDescorgao() { + return descorgao; + } + public void setDescorgao(String descorgao) { + this.descorgao = descorgao; + } + public String getRutaprefixo() { + return rutaprefixo; + } + public void setRutaprefixo(String rutaprefixo) { + this.rutaprefixo = rutaprefixo; + } + public String getNumruta() { + return numruta; + } + public void setNumruta(String numruta) { + this.numruta = numruta; + } + public String getDescclasse() { + return descclasse; + } + public void setDescclasse(String descclasse) { + this.descclasse = descclasse; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionRutaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionRutaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/conexion/ConexionRutaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionRutaVO.java index 43e8a35de..0a453a7b5 100644 --- a/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionRutaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionRutaVO.java @@ -1,152 +1,152 @@ -package com.rjconsultores.ventaboletos.vo.conexion; - -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; - -public class ConexionRutaVO { - - private Integer rutaOrigenId; - private Integer numRutaOrigen; - private String descLinhaOrigem; - private Integer numRutaDestino; - private Integer rutaDestinoId; - private String descLinhaDestino; - private String tramoOrigen; - private String tramoDestino; - private Integer conexionRutaCtrl; - private Parada parada; - private Ruta ruta; - - - public ConexionRutaVO() { - super(); - } - - - public ConexionRutaVO(Parada parada, Ruta ruta) { - super(); - this.parada = parada; - this.ruta = ruta; - } - - public Ruta getRuta() { - return ruta; - } - - public void setRuta(Ruta ruta) { - this.ruta = ruta; - } - - public Integer getRutaOrigenId() { - return rutaOrigenId; - } - - public void setRutaOrigenId(Integer rutaOrigenId) { - this.rutaOrigenId = rutaOrigenId; - } - - public Integer getNumRutaOrigen() { - return numRutaOrigen; - } - - public void setNumRutaOrigen(Integer numRutaOrigen) { - this.numRutaOrigen = numRutaOrigen; - } - - public Integer getNumRutaDestino() { - return numRutaDestino; - } - - public void setNumRutaDestino(Integer numRutaDestino) { - this.numRutaDestino = numRutaDestino; - } - - public Integer getRutaDestinoId() { - return rutaDestinoId; - } - - public void setRutaDestinoId(Integer rutaDestinoId) { - this.rutaDestinoId = rutaDestinoId; - } - - public String getDescLinhaOrigem() { - return descLinhaOrigem; - } - - public void setDescLinhaOrigem(String descLinhaOrigem) { - this.descLinhaOrigem = descLinhaOrigem; - } - - public String getDescLinhaDestino() { - return descLinhaDestino; - } - - public void setDescLinhaDestino(String descLinhaDestino) { - this.descLinhaDestino = descLinhaDestino; - } - - public String getTramoOrigen() { - return tramoOrigen; - } - - public void setTramoOrigen(String tramoOrigen) { - this.tramoOrigen = tramoOrigen; - } - - public String getTramoDestino() { - return tramoDestino; - } - - public void setTramoDestino(String tramoDestino) { - this.tramoDestino = tramoDestino; - } - - public Integer getConexionRutaCtrl() { - return conexionRutaCtrl; - } - - public void setConexionRutaCtrl(Integer conexionRutaCtrl) { - this.conexionRutaCtrl = conexionRutaCtrl; - } - - public Parada getParada() { - return parada; - } - - public void setParada(Parada parada) { - this.parada = parada; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((parada == null) ? 0 : parada.hashCode()); - return result; - } - - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConexionRutaVO other = (ConexionRutaVO) obj; - if (parada == null) { - if (other.parada != null) - return false; - } else if (!parada.equals(other.parada)) - return false; - return true; - } - - - @Override - public String toString() { - return "ConexionRutaVO [rutaOrigenId=" + rutaOrigenId + ", numRutaOrigen=" + numRutaOrigen + ", descLinhaOrigem=" + descLinhaOrigem + ", numRutaDestino=" + numRutaDestino + ", rutaDestinoId=" + rutaDestinoId + ", descLinhaDestino=" + descLinhaDestino + ", tramoOrigen=" + tramoOrigen + ", tramoDestino=" + tramoDestino + ", conexionRutaCtrl=" + conexionRutaCtrl + ", parada=" + parada + ", ruta=" + ruta + "]"; - } - -} +package com.rjconsultores.ventaboletos.vo.conexion; + +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; + +public class ConexionRutaVO { + + private Integer rutaOrigenId; + private Integer numRutaOrigen; + private String descLinhaOrigem; + private Integer numRutaDestino; + private Integer rutaDestinoId; + private String descLinhaDestino; + private String tramoOrigen; + private String tramoDestino; + private Integer conexionRutaCtrl; + private Parada parada; + private Ruta ruta; + + + public ConexionRutaVO() { + super(); + } + + + public ConexionRutaVO(Parada parada, Ruta ruta) { + super(); + this.parada = parada; + this.ruta = ruta; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Integer getRutaOrigenId() { + return rutaOrigenId; + } + + public void setRutaOrigenId(Integer rutaOrigenId) { + this.rutaOrigenId = rutaOrigenId; + } + + public Integer getNumRutaOrigen() { + return numRutaOrigen; + } + + public void setNumRutaOrigen(Integer numRutaOrigen) { + this.numRutaOrigen = numRutaOrigen; + } + + public Integer getNumRutaDestino() { + return numRutaDestino; + } + + public void setNumRutaDestino(Integer numRutaDestino) { + this.numRutaDestino = numRutaDestino; + } + + public Integer getRutaDestinoId() { + return rutaDestinoId; + } + + public void setRutaDestinoId(Integer rutaDestinoId) { + this.rutaDestinoId = rutaDestinoId; + } + + public String getDescLinhaOrigem() { + return descLinhaOrigem; + } + + public void setDescLinhaOrigem(String descLinhaOrigem) { + this.descLinhaOrigem = descLinhaOrigem; + } + + public String getDescLinhaDestino() { + return descLinhaDestino; + } + + public void setDescLinhaDestino(String descLinhaDestino) { + this.descLinhaDestino = descLinhaDestino; + } + + public String getTramoOrigen() { + return tramoOrigen; + } + + public void setTramoOrigen(String tramoOrigen) { + this.tramoOrigen = tramoOrigen; + } + + public String getTramoDestino() { + return tramoDestino; + } + + public void setTramoDestino(String tramoDestino) { + this.tramoDestino = tramoDestino; + } + + public Integer getConexionRutaCtrl() { + return conexionRutaCtrl; + } + + public void setConexionRutaCtrl(Integer conexionRutaCtrl) { + this.conexionRutaCtrl = conexionRutaCtrl; + } + + public Parada getParada() { + return parada; + } + + public void setParada(Parada parada) { + this.parada = parada; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((parada == null) ? 0 : parada.hashCode()); + return result; + } + + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConexionRutaVO other = (ConexionRutaVO) obj; + if (parada == null) { + if (other.parada != null) + return false; + } else if (!parada.equals(other.parada)) + return false; + return true; + } + + + @Override + public String toString() { + return "ConexionRutaVO [rutaOrigenId=" + rutaOrigenId + ", numRutaOrigen=" + numRutaOrigen + ", descLinhaOrigem=" + descLinhaOrigem + ", numRutaDestino=" + numRutaDestino + ", rutaDestinoId=" + rutaDestinoId + ", descLinhaDestino=" + descLinhaDestino + ", tramoOrigen=" + tramoOrigen + ", tramoDestino=" + tramoDestino + ", conexionRutaCtrl=" + conexionRutaCtrl + ", parada=" + parada + ", ruta=" + ruta + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/conexion/ConexionVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionVO.java index 297296b8a..d15f6e3d9 100644 --- a/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/ConexionVO.java @@ -1,73 +1,73 @@ -package com.rjconsultores.ventaboletos.vo.conexion; - -public class ConexionVO { - private String conOrigen; - private String conDestino; - private Integer grupo; - private String tramoOrigen; - private String tramoDestino; - private Long conexionCtrlId; - - private boolean buscaAgruapada; - - public String getConOrigen() { - return conOrigen; - } - - public void setConOrigen(String conOrigen) { - this.conOrigen = conOrigen; - } - - public String getConDestino() { - return conDestino; - } - - public void setConDestino(String conDestino) { - this.conDestino = conDestino; - } - - public Integer getGrupo() { - return grupo; - } - - public void setGrupo(Integer grupo) { - this.grupo = grupo; - } - - public String getTramoOrigen() { - return tramoOrigen; - } - - public void setTramoOrigen(String tramoOrigen) { - this.tramoOrigen = tramoOrigen; - } - - public String getTramoDestino() { - return tramoDestino; - } - - public void setTramoDestino(String tramoDestino) { - this.tramoDestino = tramoDestino; - } - - public Long getConexionCtrlId() { - return conexionCtrlId; - } - - public void setConexionCtrlId(Long conexionCtrlId) { - this.conexionCtrlId = conexionCtrlId; - } - - public boolean isBuscaAgruapada() { - return buscaAgruapada; - } - - public void setBuscaAgruapada(boolean buscaAgruapada) { - this.buscaAgruapada = buscaAgruapada; - } - - @Override - public String toString() { - return "ConexionVO [conOrigen=" + conOrigen + ", conDestino=" + conDestino + ", grupo=" + grupo + ", tramoOrigen=" + tramoOrigen + ", tramoDestino=" + tramoDestino + ", conexionCtrlId=" + conexionCtrlId + "]"; - } -} +package com.rjconsultores.ventaboletos.vo.conexion; + +public class ConexionVO { + private String conOrigen; + private String conDestino; + private Integer grupo; + private String tramoOrigen; + private String tramoDestino; + private Long conexionCtrlId; + + private boolean buscaAgruapada; + + public String getConOrigen() { + return conOrigen; + } + + public void setConOrigen(String conOrigen) { + this.conOrigen = conOrigen; + } + + public String getConDestino() { + return conDestino; + } + + public void setConDestino(String conDestino) { + this.conDestino = conDestino; + } + + public Integer getGrupo() { + return grupo; + } + + public void setGrupo(Integer grupo) { + this.grupo = grupo; + } + + public String getTramoOrigen() { + return tramoOrigen; + } + + public void setTramoOrigen(String tramoOrigen) { + this.tramoOrigen = tramoOrigen; + } + + public String getTramoDestino() { + return tramoDestino; + } + + public void setTramoDestino(String tramoDestino) { + this.tramoDestino = tramoDestino; + } + + public Long getConexionCtrlId() { + return conexionCtrlId; + } + + public void setConexionCtrlId(Long conexionCtrlId) { + this.conexionCtrlId = conexionCtrlId; + } + + public boolean isBuscaAgruapada() { + return buscaAgruapada; + } + + public void setBuscaAgruapada(boolean buscaAgruapada) { + this.buscaAgruapada = buscaAgruapada; + } + + @Override + public String toString() { + return "ConexionVO [conOrigen=" + conOrigen + ", conDestino=" + conDestino + ", grupo=" + grupo + ", tramoOrigen=" + tramoOrigen + ", tramoDestino=" + tramoDestino + ", conexionCtrlId=" + conexionCtrlId + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/conexion/OrdenarLocalidadesGeradas.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/OrdenarLocalidadesGeradas.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/conexion/OrdenarLocalidadesGeradas.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/OrdenarLocalidadesGeradas.java index f9998471e..ccbd4b5bd 100644 --- a/src/com/rjconsultores/ventaboletos/vo/conexion/OrdenarLocalidadesGeradas.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conexion/OrdenarLocalidadesGeradas.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.vo.conexion; - -import java.util.Comparator; - -import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; - -public class OrdenarLocalidadesGeradas implements Comparator { - - @Override - public int compare(ParadaVOConexionRuta o1, ParadaVOConexionRuta o2) { - int retorno = o1.getParadaOrigemTrecho().getParadaId().compareTo(o2.getParadaOrigemTrecho().getParadaId()); - if(retorno == 0) { - retorno = o1.getParadaDestinoTrecho().getParadaId().compareTo(o2.getParadaDestinoTrecho().getParadaId()); - } - if(retorno == 0) { - retorno = o1.getGrupo().compareTo(o2.getGrupo()); - } - if(retorno == 0) { - retorno = o1.getSecuencia().compareTo(o2.getSecuencia()); - } - return retorno; - } - -} +package com.rjconsultores.ventaboletos.vo.conexion; + +import java.util.Comparator; + +import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; + +public class OrdenarLocalidadesGeradas implements Comparator { + + @Override + public int compare(ParadaVOConexionRuta o1, ParadaVOConexionRuta o2) { + int retorno = o1.getParadaOrigemTrecho().getParadaId().compareTo(o2.getParadaOrigemTrecho().getParadaId()); + if(retorno == 0) { + retorno = o1.getParadaDestinoTrecho().getParadaId().compareTo(o2.getParadaDestinoTrecho().getParadaId()); + } + if(retorno == 0) { + retorno = o1.getGrupo().compareTo(o2.getGrupo()); + } + if(retorno == 0) { + retorno = o1.getSecuencia().compareTo(o2.getSecuencia()); + } + return retorno; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfLayoutContratoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfLayoutContratoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfLayoutContratoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfLayoutContratoVO.java index 1080402c1..1b6fa9cb2 100644 --- a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfLayoutContratoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfLayoutContratoVO.java @@ -1,270 +1,270 @@ -package com.rjconsultores.ventaboletos.vo.configuracioneccomerciales; - -import java.math.BigDecimal; -import java.util.Date; - -public class ConfLayoutContratoVO { - - private String nomeLocalidade; - private String CNPJ; - private Date dataAbertura; - private String razaoSocial; - private String nomeCidade; - private String email; - private String codigoPostal; - private String numero; - private BigDecimal passagemAlta; - private BigDecimal passagemBaixa; - private BigDecimal seguroObrigatorioBaixa; - private BigDecimal seguroObrigatorioAlta; - private BigDecimal valorVendaGapBaixa; - private BigDecimal valorVendaGapAlta; - private BigDecimal valorVendaGapBaixaImp; - private BigDecimal valorVendaGapAltaImp; - private BigDecimal seguroBaixa; - private BigDecimal seguroAlta; - private BigDecimal outrosBaixa; - private BigDecimal outrosAlta; - private BigDecimal excesssoBaixa; - private BigDecimal excesssoAlta; - private String nomeTitular; - private String nomeBanco; - private String numeroAgencia; - private String numeroConta; - private String tipoSocio; - private String bairro; - private String rua; - - public String getNomeLocalidade() { - return nomeLocalidade; - } - - public void setNomeLocalidade(String nomeLocalidade) { - this.nomeLocalidade = nomeLocalidade; - } - - public String getCNPJ() { - return CNPJ; - } - - public void setCNPJ(String CNPJ) { - this.CNPJ = CNPJ; - } - - public Date getDataAbertura() { - return dataAbertura; - } - - public void setDataAbertura(Date dataAbertura) { - this.dataAbertura = dataAbertura; - } - - public String getRazaoSocial() { - return razaoSocial; - } - - public void setRazaoSocial(String razaoSocial) { - this.razaoSocial = razaoSocial; - } - - public String getNomeCidade() { - return nomeCidade; - } - - public void setNomeCidade(String nomeCidade) { - this.nomeCidade = nomeCidade; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getCodigoPostal() { - return codigoPostal; - } - - public void setCodigoPostal(String codigoPostal) { - this.codigoPostal = codigoPostal; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public BigDecimal getPassagemAlta() { - return passagemAlta; - } - - public void setPassagemAlta(BigDecimal passagemAlta) { - this.passagemAlta = passagemAlta; - } - - public BigDecimal getPassagemBaixa() { - return passagemBaixa; - } - - public void setPassagemBaixa(BigDecimal passagemBaixa) { - this.passagemBaixa = passagemBaixa; - } - - public BigDecimal getSeguroObrigatorioBaixa() { - return seguroObrigatorioBaixa; - } - - public void setSeguroObrigatorioBaixa(BigDecimal seguroObrigatorioBaixa) { - this.seguroObrigatorioBaixa = seguroObrigatorioBaixa; - } - - public BigDecimal getSeguroObrigatorioAlta() { - return seguroObrigatorioAlta; - } - - public void setSeguroObrigatorioAlta(BigDecimal seguroObrigatorioAlta) { - this.seguroObrigatorioAlta = seguroObrigatorioAlta; - } - - public BigDecimal getValorVendaGapBaixa() { - return valorVendaGapBaixa; - } - - public void setValorVendaGapBaixa(BigDecimal valorVendaGapBaixa) { - this.valorVendaGapBaixa = valorVendaGapBaixa; - } - - public BigDecimal getValorVendaGapAlta() { - return valorVendaGapAlta; - } - - public void setValorVendaGapAlta(BigDecimal valorVendaGapAlta) { - this.valorVendaGapAlta = valorVendaGapAlta; - } - - public BigDecimal getValorVendaGapBaixaImp() { - return valorVendaGapBaixaImp; - } - - public void setValorVendaGapBaixaImp(BigDecimal valorVendaGapBaixaImp) { - this.valorVendaGapBaixaImp = valorVendaGapBaixaImp; - } - - public BigDecimal getValorVendaGapAltaImp() { - return valorVendaGapAltaImp; - } - - public void setValorVendaGapAltaImp(BigDecimal valorVendaGapAltaImp) { - this.valorVendaGapAltaImp = valorVendaGapAltaImp; - } - - public BigDecimal getSeguroBaixa() { - return seguroBaixa; - } - - public void setSeguroBaixa(BigDecimal seguroBaixa) { - this.seguroBaixa = seguroBaixa; - } - - public BigDecimal getSeguroAlta() { - return seguroAlta; - } - - public void setSeguroAlta(BigDecimal seguroAlta) { - this.seguroAlta = seguroAlta; - } - - public BigDecimal getOutrosBaixa() { - return outrosBaixa; - } - - public void setOutrosBaixa(BigDecimal outrosBaixa) { - this.outrosBaixa = outrosBaixa; - } - - public BigDecimal getOutrosAlta() { - return outrosAlta; - } - - public void setOutrosAlta(BigDecimal outrosAlta) { - this.outrosAlta = outrosAlta; - } - - public BigDecimal getExcesssoBaixa() { - return excesssoBaixa; - } - - public void setExcesssoBaixa(BigDecimal excesssoBaixa) { - this.excesssoBaixa = excesssoBaixa; - } - - public BigDecimal getExcesssoAlta() { - return excesssoAlta; - } - - public void setExcesssoAlta(BigDecimal excesssoAlta) { - this.excesssoAlta = excesssoAlta; - } - - public String getNomeTitular() { - return nomeTitular; - } - - public void setNomeTitular(String nomeTitular) { - this.nomeTitular = nomeTitular; - } - - public String getNomeBanco() { - return nomeBanco; - } - - public void setNomeBanco(String nomeBanco) { - this.nomeBanco = nomeBanco; - } - - public String getNumeroAgencia() { - return numeroAgencia; - } - - public void setNumeroAgencia(String numeroAgencia) { - this.numeroAgencia = numeroAgencia; - } - - public String getNumeroConta() { - return numeroConta; - } - - public void setNumeroConta(String numeroConta) { - this.numeroConta = numeroConta; - } - - public String getTipoSocio() { - return tipoSocio; - } - - public void setTipoSocio(String tipoSocio) { - this.tipoSocio = tipoSocio; - } - - public String getBairro() { - return bairro; - } - - public void setBairro(String bairro) { - this.bairro = bairro; - } - - public String getRua() { - return rua; - } - - public void setRua(String rua) { - this.rua = rua; - } - -} +package com.rjconsultores.ventaboletos.vo.configuracioneccomerciales; + +import java.math.BigDecimal; +import java.util.Date; + +public class ConfLayoutContratoVO { + + private String nomeLocalidade; + private String CNPJ; + private Date dataAbertura; + private String razaoSocial; + private String nomeCidade; + private String email; + private String codigoPostal; + private String numero; + private BigDecimal passagemAlta; + private BigDecimal passagemBaixa; + private BigDecimal seguroObrigatorioBaixa; + private BigDecimal seguroObrigatorioAlta; + private BigDecimal valorVendaGapBaixa; + private BigDecimal valorVendaGapAlta; + private BigDecimal valorVendaGapBaixaImp; + private BigDecimal valorVendaGapAltaImp; + private BigDecimal seguroBaixa; + private BigDecimal seguroAlta; + private BigDecimal outrosBaixa; + private BigDecimal outrosAlta; + private BigDecimal excesssoBaixa; + private BigDecimal excesssoAlta; + private String nomeTitular; + private String nomeBanco; + private String numeroAgencia; + private String numeroConta; + private String tipoSocio; + private String bairro; + private String rua; + + public String getNomeLocalidade() { + return nomeLocalidade; + } + + public void setNomeLocalidade(String nomeLocalidade) { + this.nomeLocalidade = nomeLocalidade; + } + + public String getCNPJ() { + return CNPJ; + } + + public void setCNPJ(String CNPJ) { + this.CNPJ = CNPJ; + } + + public Date getDataAbertura() { + return dataAbertura; + } + + public void setDataAbertura(Date dataAbertura) { + this.dataAbertura = dataAbertura; + } + + public String getRazaoSocial() { + return razaoSocial; + } + + public void setRazaoSocial(String razaoSocial) { + this.razaoSocial = razaoSocial; + } + + public String getNomeCidade() { + return nomeCidade; + } + + public void setNomeCidade(String nomeCidade) { + this.nomeCidade = nomeCidade; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getCodigoPostal() { + return codigoPostal; + } + + public void setCodigoPostal(String codigoPostal) { + this.codigoPostal = codigoPostal; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public BigDecimal getPassagemAlta() { + return passagemAlta; + } + + public void setPassagemAlta(BigDecimal passagemAlta) { + this.passagemAlta = passagemAlta; + } + + public BigDecimal getPassagemBaixa() { + return passagemBaixa; + } + + public void setPassagemBaixa(BigDecimal passagemBaixa) { + this.passagemBaixa = passagemBaixa; + } + + public BigDecimal getSeguroObrigatorioBaixa() { + return seguroObrigatorioBaixa; + } + + public void setSeguroObrigatorioBaixa(BigDecimal seguroObrigatorioBaixa) { + this.seguroObrigatorioBaixa = seguroObrigatorioBaixa; + } + + public BigDecimal getSeguroObrigatorioAlta() { + return seguroObrigatorioAlta; + } + + public void setSeguroObrigatorioAlta(BigDecimal seguroObrigatorioAlta) { + this.seguroObrigatorioAlta = seguroObrigatorioAlta; + } + + public BigDecimal getValorVendaGapBaixa() { + return valorVendaGapBaixa; + } + + public void setValorVendaGapBaixa(BigDecimal valorVendaGapBaixa) { + this.valorVendaGapBaixa = valorVendaGapBaixa; + } + + public BigDecimal getValorVendaGapAlta() { + return valorVendaGapAlta; + } + + public void setValorVendaGapAlta(BigDecimal valorVendaGapAlta) { + this.valorVendaGapAlta = valorVendaGapAlta; + } + + public BigDecimal getValorVendaGapBaixaImp() { + return valorVendaGapBaixaImp; + } + + public void setValorVendaGapBaixaImp(BigDecimal valorVendaGapBaixaImp) { + this.valorVendaGapBaixaImp = valorVendaGapBaixaImp; + } + + public BigDecimal getValorVendaGapAltaImp() { + return valorVendaGapAltaImp; + } + + public void setValorVendaGapAltaImp(BigDecimal valorVendaGapAltaImp) { + this.valorVendaGapAltaImp = valorVendaGapAltaImp; + } + + public BigDecimal getSeguroBaixa() { + return seguroBaixa; + } + + public void setSeguroBaixa(BigDecimal seguroBaixa) { + this.seguroBaixa = seguroBaixa; + } + + public BigDecimal getSeguroAlta() { + return seguroAlta; + } + + public void setSeguroAlta(BigDecimal seguroAlta) { + this.seguroAlta = seguroAlta; + } + + public BigDecimal getOutrosBaixa() { + return outrosBaixa; + } + + public void setOutrosBaixa(BigDecimal outrosBaixa) { + this.outrosBaixa = outrosBaixa; + } + + public BigDecimal getOutrosAlta() { + return outrosAlta; + } + + public void setOutrosAlta(BigDecimal outrosAlta) { + this.outrosAlta = outrosAlta; + } + + public BigDecimal getExcesssoBaixa() { + return excesssoBaixa; + } + + public void setExcesssoBaixa(BigDecimal excesssoBaixa) { + this.excesssoBaixa = excesssoBaixa; + } + + public BigDecimal getExcesssoAlta() { + return excesssoAlta; + } + + public void setExcesssoAlta(BigDecimal excesssoAlta) { + this.excesssoAlta = excesssoAlta; + } + + public String getNomeTitular() { + return nomeTitular; + } + + public void setNomeTitular(String nomeTitular) { + this.nomeTitular = nomeTitular; + } + + public String getNomeBanco() { + return nomeBanco; + } + + public void setNomeBanco(String nomeBanco) { + this.nomeBanco = nomeBanco; + } + + public String getNumeroAgencia() { + return numeroAgencia; + } + + public void setNumeroAgencia(String numeroAgencia) { + this.numeroAgencia = numeroAgencia; + } + + public String getNumeroConta() { + return numeroConta; + } + + public void setNumeroConta(String numeroConta) { + this.numeroConta = numeroConta; + } + + public String getTipoSocio() { + return tipoSocio; + } + + public void setTipoSocio(String tipoSocio) { + this.tipoSocio = tipoSocio; + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + + public String getRua() { + return rua; + } + + public void setRua(String rua) { + this.rua = rua; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfigCoordenadas.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfigCoordenadas.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfigCoordenadas.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfigCoordenadas.java index d0db0be27..57ab1b970 100644 --- a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfigCoordenadas.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/ConfigCoordenadas.java @@ -1,87 +1,87 @@ -package com.rjconsultores.ventaboletos.vo.configuracioneccomerciales; - -public class ConfigCoordenadas { - private String lbCampo; - private String campo; - private String mensagem; - private Integer linha; - private Integer coluna; - private Integer tamanho; - - public ConfigCoordenadas() { - super(); - } - - public String getLbCampo() { - return lbCampo; - } - - public void setLbCampo(String lbCampo) { - this.lbCampo = lbCampo; - } - - public String getCampo() { - return campo; - } - - public void setCampo(String campo) { - this.campo = campo; - } - - public Integer getLinha() { - return linha; - } - - public void setLinha(Integer linha) { - this.linha = linha; - } - - public Integer getColuna() { - return coluna; - } - - public void setColuna(Integer coluna) { - this.coluna = coluna; - } - - public String getMensagem() { - return mensagem; - } - - public void setMensagem(String mensagem) { - this.mensagem = mensagem; - } - - public Integer getTamanho() { - return tamanho; - } - - public void setTamanho(Integer tamanho) { - this.tamanho = tamanho; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((campo == null) ? 0 : campo.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfigCoordenadas other = (ConfigCoordenadas) obj; - if (campo == null) { - if (other.campo != null) - return false; - } else if (!campo.equals(other.campo)) - return false; - return true; - } -} +package com.rjconsultores.ventaboletos.vo.configuracioneccomerciales; + +public class ConfigCoordenadas { + private String lbCampo; + private String campo; + private String mensagem; + private Integer linha; + private Integer coluna; + private Integer tamanho; + + public ConfigCoordenadas() { + super(); + } + + public String getLbCampo() { + return lbCampo; + } + + public void setLbCampo(String lbCampo) { + this.lbCampo = lbCampo; + } + + public String getCampo() { + return campo; + } + + public void setCampo(String campo) { + this.campo = campo; + } + + public Integer getLinha() { + return linha; + } + + public void setLinha(Integer linha) { + this.linha = linha; + } + + public Integer getColuna() { + return coluna; + } + + public void setColuna(Integer coluna) { + this.coluna = coluna; + } + + public String getMensagem() { + return mensagem; + } + + public void setMensagem(String mensagem) { + this.mensagem = mensagem; + } + + public Integer getTamanho() { + return tamanho; + } + + public void setTamanho(Integer tamanho) { + this.tamanho = tamanho; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((campo == null) ? 0 : campo.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfigCoordenadas other = (ConfigCoordenadas) obj; + if (campo == null) { + if (other.campo != null) + return false; + } else if (!campo.equals(other.campo)) + return false; + return true; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/TarifaGrupoContratoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/TarifaGrupoContratoVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/TarifaGrupoContratoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/TarifaGrupoContratoVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/configuracioneccomerciales/VoucherVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/conftotem/ConfTotemVentaRapidaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conftotem/ConfTotemVentaRapidaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/conftotem/ConfTotemVentaRapidaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/conftotem/ConfTotemVentaRapidaVO.java index 6273505e2..e173d4f8e 100644 --- a/src/com/rjconsultores/ventaboletos/vo/conftotem/ConfTotemVentaRapidaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/conftotem/ConfTotemVentaRapidaVO.java @@ -1,67 +1,67 @@ -package com.rjconsultores.ventaboletos.vo.conftotem; - -import com.rjconsultores.ventaboletos.entidad.Parada; - -public class ConfTotemVentaRapidaVO { - - private Parada origem; - private Parada destino; - - public Parada getOrigem() { - return origem; - } - - public void setOrigem(Parada origem) { - this.origem = origem; - } - - public Parada getDestino() { - return destino; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - public ConfTotemVentaRapidaVO() { - super(); - } - - public ConfTotemVentaRapidaVO(Parada origem ,Parada destino) { - super(); - this.origem = origem; - this.destino = destino; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((destino == null) ? 0 : destino.hashCode()); - result = prime * result + ((origem == null) ? 0 : origem.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfTotemVentaRapidaVO other = (ConfTotemVentaRapidaVO) obj; - if (destino == null) { - if (other.destino != null) - return false; - } else if (!destino.equals(other.destino)) - return false; - if (origem == null) { - if (other.origem != null) - return false; - } else if (!origem.equals(other.origem)) - return false; - return true; - } - - -} +package com.rjconsultores.ventaboletos.vo.conftotem; + +import com.rjconsultores.ventaboletos.entidad.Parada; + +public class ConfTotemVentaRapidaVO { + + private Parada origem; + private Parada destino; + + public Parada getOrigem() { + return origem; + } + + public void setOrigem(Parada origem) { + this.origem = origem; + } + + public Parada getDestino() { + return destino; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + public ConfTotemVentaRapidaVO() { + super(); + } + + public ConfTotemVentaRapidaVO(Parada origem ,Parada destino) { + super(); + this.origem = origem; + this.destino = destino; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((destino == null) ? 0 : destino.hashCode()); + result = prime * result + ((origem == null) ? 0 : origem.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfTotemVentaRapidaVO other = (ConfTotemVentaRapidaVO) obj; + if (destino == null) { + if (other.destino != null) + return false; + } else if (!destino.equals(other.destino)) + return false; + if (origem == null) { + if (other.origem != null) + return false; + } else if (!origem.equals(other.origem)) + return false; + return true; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/corrida/ColunasConsultaCorridaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/ColunasConsultaCorridaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/corrida/ColunasConsultaCorridaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/ColunasConsultaCorridaVO.java index 14d92495c..e415e9a73 100644 --- a/src/com/rjconsultores/ventaboletos/vo/corrida/ColunasConsultaCorridaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/ColunasConsultaCorridaVO.java @@ -1,311 +1,311 @@ -package com.rjconsultores.ventaboletos.vo.corrida; - -import java.math.BigDecimal; - -public class ColunasConsultaCorridaVO { - - private Integer corridaId; - private Integer numCorrida; - private String descServico; - private String fechorsalidaAtual; - private String fechorsalidaAnterior; - private Integer tiposervicioId; - private String descservicio; - private Integer roloperativoId; - private String descroloperativo; - private Integer tramoId; - private String desctramo; - private Integer origemId; - private String descOrigem; - private Integer destinoId; - private String descDestino; - private Integer viaId; - private String nombVia; - private Integer numsecuencia; - private Integer tramoIdAtual; - private String desctramoAtual; - private Integer origemIdAtual; - private String descOrigemAtual; - private Integer destinoIdAtual; - private String descDestinoAtual; - private Integer viaIdAtual; - private String nombViaAtual; - private Integer numsecuenciaAtual; - private Integer oriestado_id; - private String orinombestado; - private Integer desestado_id; - private String desnombestado; - private Integer oriciudad_id; - private String orinombciudad; - private Integer desciudad_id; - private String desnombciudad; - private String oricveestado; - private String descveestado; - private Integer rutaId; - private BigDecimal valorTarifa = BigDecimal.ZERO; - private BigDecimal valorTaxa = BigDecimal.ZERO; - private BigDecimal valorSeguro = BigDecimal.ZERO; - private BigDecimal valorPedagio = BigDecimal.ZERO; - private BigDecimal valorOutros = BigDecimal.ZERO; - - - public Integer getCorridaId() { - return corridaId; - } - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - public Integer getNumCorrida() { - return numCorrida; - } - public void setNumCorrida(Integer numCorrida) { - this.numCorrida = numCorrida; - } - public String getDescServico() { - return descServico; - } - public void setDescServico(String descServico) { - this.descServico = descServico; - } - public String getFechorsalidaAtual() { - return fechorsalidaAtual; - } - public void setFechorsalidaAtual(String fechorsalidaAtual) { - this.fechorsalidaAtual = fechorsalidaAtual; - } - public String getFechorsalidaAnterior() { - return fechorsalidaAnterior; - } - public void setFechorsalidaAnterior(String fechorsalidaAnterior) { - this.fechorsalidaAnterior = fechorsalidaAnterior; - } - public Integer getTiposervicioId() { - return tiposervicioId; - } - public void setTiposervicioId(Integer tiposervicioId) { - this.tiposervicioId = tiposervicioId; - } - public String getDescservicio() { - return descservicio; - } - public void setDescservicio(String descservicio) { - this.descservicio = descservicio; - } - public Integer getRoloperativoId() { - return roloperativoId; - } - public void setRoloperativoId(Integer roloperativoId) { - this.roloperativoId = roloperativoId; - } - public String getDescroloperativo() { - return descroloperativo; - } - public void setDescroloperativo(String descroloperativo) { - this.descroloperativo = descroloperativo; - } - public Integer getTramoId() { - return tramoId; - } - public void setTramoId(Integer tramoId) { - this.tramoId = tramoId; - } - public String getDesctramo() { - return desctramo; - } - public void setDesctramo(String desctramo) { - this.desctramo = desctramo; - } - public Integer getOrigemId() { - return origemId; - } - public void setOrigemId(Integer origemId) { - this.origemId = origemId; - } - public String getDescOrigem() { - return descOrigem; - } - public void setDescOrigem(String descOrigem) { - this.descOrigem = descOrigem; - } - public Integer getDestinoId() { - return destinoId; - } - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - public String getDescDestino() { - return descDestino; - } - public void setDescDestino(String descDestino) { - this.descDestino = descDestino; - } - public Integer getViaId() { - return viaId; - } - public void setViaId(Integer viaId) { - this.viaId = viaId; - } - public String getNombVia() { - return nombVia; - } - public void setNombVia(String nombVia) { - this.nombVia = nombVia; - } - public Integer getNumsecuencia() { - return numsecuencia; - } - public void setNumsecuencia(Integer numsecuencia) { - this.numsecuencia = numsecuencia; - } - public Integer getTramoIdAtual() { - return tramoIdAtual; - } - public void setTramoIdAtual(Integer tramoIdAtual) { - this.tramoIdAtual = tramoIdAtual; - } - public String getDesctramoAtual() { - return desctramoAtual; - } - public void setDesctramoAtual(String desctramoAtual) { - this.desctramoAtual = desctramoAtual; - } - public Integer getOrigemIdAtual() { - return origemIdAtual; - } - public void setOrigemIdAtual(Integer origemIdAtual) { - this.origemIdAtual = origemIdAtual; - } - public String getDescOrigemAtual() { - return descOrigemAtual; - } - public void setDescOrigemAtual(String descOrigemAtual) { - this.descOrigemAtual = descOrigemAtual; - } - public Integer getDestinoIdAtual() { - return destinoIdAtual; - } - public void setDestinoIdAtual(Integer destinoIdAtual) { - this.destinoIdAtual = destinoIdAtual; - } - public String getDescDestinoAtual() { - return descDestinoAtual; - } - public void setDescDestinoAtual(String descDestinoAtual) { - this.descDestinoAtual = descDestinoAtual; - } - public Integer getViaIdAtual() { - return viaIdAtual; - } - public void setViaIdAtual(Integer viaIdAtual) { - this.viaIdAtual = viaIdAtual; - } - public String getNombViaAtual() { - return nombViaAtual; - } - public void setNombViaAtual(String nombViaAtual) { - this.nombViaAtual = nombViaAtual; - } - public Integer getNumsecuenciaAtual() { - return numsecuenciaAtual; - } - public void setNumsecuenciaAtual(Integer numsecuenciaAtual) { - this.numsecuenciaAtual = numsecuenciaAtual; - } - public Integer getOriestado_id() { - return oriestado_id; - } - public void setOriestado_id(Integer oriestado_id) { - this.oriestado_id = oriestado_id; - } - public String getOrinombestado() { - return orinombestado; - } - public void setOrinombestado(String orinombestado) { - this.orinombestado = orinombestado; - } - public Integer getDesestado_id() { - return desestado_id; - } - public void setDesestado_id(Integer desestado_id) { - this.desestado_id = desestado_id; - } - public String getDesnombestado() { - return desnombestado; - } - public void setDesnombestado(String desnombestado) { - this.desnombestado = desnombestado; - } - public Integer getOriciudad_id() { - return oriciudad_id; - } - public void setOriciudad_id(Integer oriciudad_id) { - this.oriciudad_id = oriciudad_id; - } - public String getOrinombciudad() { - return orinombciudad; - } - public void setOrinombciudad(String orinombciudad) { - this.orinombciudad = orinombciudad; - } - public Integer getDesciudad_id() { - return desciudad_id; - } - public void setDesciudad_id(Integer desciudad_id) { - this.desciudad_id = desciudad_id; - } - public String getDesnombciudad() { - return desnombciudad; - } - public void setDesnombciudad(String desnombciudad) { - this.desnombciudad = desnombciudad; - } - public String getOricveestado() { - return oricveestado; - } - public void setOricveestado(String oricveestado) { - this.oricveestado = oricveestado; - } - public String getDescveestado() { - return descveestado; - } - public void setDescveestado(String descveestado) { - this.descveestado = descveestado; - } - public Integer getRutaId() { - return rutaId; - } - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - public BigDecimal getValorTarifa() { - return valorTarifa; - } - public void setValorTarifa(BigDecimal valorTarifa) { - this.valorTarifa = valorTarifa; - } - public BigDecimal getValorTaxa() { - return valorTaxa; - } - public void setValorTaxa(BigDecimal valorTaxa) { - this.valorTaxa = valorTaxa; - } - public BigDecimal getValorSeguro() { - return valorSeguro; - } - public void setValorSeguro(BigDecimal valorSeguro) { - this.valorSeguro = valorSeguro; - } - public BigDecimal getValorPedagio() { - return valorPedagio; - } - public void setValorPedagio(BigDecimal valorPedagio) { - this.valorPedagio = valorPedagio; - } - public BigDecimal getValorOutros() { - return valorOutros; - } - public void setValorOutros(BigDecimal valorOutros) { - this.valorOutros = valorOutros; - } - -} +package com.rjconsultores.ventaboletos.vo.corrida; + +import java.math.BigDecimal; + +public class ColunasConsultaCorridaVO { + + private Integer corridaId; + private Integer numCorrida; + private String descServico; + private String fechorsalidaAtual; + private String fechorsalidaAnterior; + private Integer tiposervicioId; + private String descservicio; + private Integer roloperativoId; + private String descroloperativo; + private Integer tramoId; + private String desctramo; + private Integer origemId; + private String descOrigem; + private Integer destinoId; + private String descDestino; + private Integer viaId; + private String nombVia; + private Integer numsecuencia; + private Integer tramoIdAtual; + private String desctramoAtual; + private Integer origemIdAtual; + private String descOrigemAtual; + private Integer destinoIdAtual; + private String descDestinoAtual; + private Integer viaIdAtual; + private String nombViaAtual; + private Integer numsecuenciaAtual; + private Integer oriestado_id; + private String orinombestado; + private Integer desestado_id; + private String desnombestado; + private Integer oriciudad_id; + private String orinombciudad; + private Integer desciudad_id; + private String desnombciudad; + private String oricveestado; + private String descveestado; + private Integer rutaId; + private BigDecimal valorTarifa = BigDecimal.ZERO; + private BigDecimal valorTaxa = BigDecimal.ZERO; + private BigDecimal valorSeguro = BigDecimal.ZERO; + private BigDecimal valorPedagio = BigDecimal.ZERO; + private BigDecimal valorOutros = BigDecimal.ZERO; + + + public Integer getCorridaId() { + return corridaId; + } + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + public Integer getNumCorrida() { + return numCorrida; + } + public void setNumCorrida(Integer numCorrida) { + this.numCorrida = numCorrida; + } + public String getDescServico() { + return descServico; + } + public void setDescServico(String descServico) { + this.descServico = descServico; + } + public String getFechorsalidaAtual() { + return fechorsalidaAtual; + } + public void setFechorsalidaAtual(String fechorsalidaAtual) { + this.fechorsalidaAtual = fechorsalidaAtual; + } + public String getFechorsalidaAnterior() { + return fechorsalidaAnterior; + } + public void setFechorsalidaAnterior(String fechorsalidaAnterior) { + this.fechorsalidaAnterior = fechorsalidaAnterior; + } + public Integer getTiposervicioId() { + return tiposervicioId; + } + public void setTiposervicioId(Integer tiposervicioId) { + this.tiposervicioId = tiposervicioId; + } + public String getDescservicio() { + return descservicio; + } + public void setDescservicio(String descservicio) { + this.descservicio = descservicio; + } + public Integer getRoloperativoId() { + return roloperativoId; + } + public void setRoloperativoId(Integer roloperativoId) { + this.roloperativoId = roloperativoId; + } + public String getDescroloperativo() { + return descroloperativo; + } + public void setDescroloperativo(String descroloperativo) { + this.descroloperativo = descroloperativo; + } + public Integer getTramoId() { + return tramoId; + } + public void setTramoId(Integer tramoId) { + this.tramoId = tramoId; + } + public String getDesctramo() { + return desctramo; + } + public void setDesctramo(String desctramo) { + this.desctramo = desctramo; + } + public Integer getOrigemId() { + return origemId; + } + public void setOrigemId(Integer origemId) { + this.origemId = origemId; + } + public String getDescOrigem() { + return descOrigem; + } + public void setDescOrigem(String descOrigem) { + this.descOrigem = descOrigem; + } + public Integer getDestinoId() { + return destinoId; + } + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + public String getDescDestino() { + return descDestino; + } + public void setDescDestino(String descDestino) { + this.descDestino = descDestino; + } + public Integer getViaId() { + return viaId; + } + public void setViaId(Integer viaId) { + this.viaId = viaId; + } + public String getNombVia() { + return nombVia; + } + public void setNombVia(String nombVia) { + this.nombVia = nombVia; + } + public Integer getNumsecuencia() { + return numsecuencia; + } + public void setNumsecuencia(Integer numsecuencia) { + this.numsecuencia = numsecuencia; + } + public Integer getTramoIdAtual() { + return tramoIdAtual; + } + public void setTramoIdAtual(Integer tramoIdAtual) { + this.tramoIdAtual = tramoIdAtual; + } + public String getDesctramoAtual() { + return desctramoAtual; + } + public void setDesctramoAtual(String desctramoAtual) { + this.desctramoAtual = desctramoAtual; + } + public Integer getOrigemIdAtual() { + return origemIdAtual; + } + public void setOrigemIdAtual(Integer origemIdAtual) { + this.origemIdAtual = origemIdAtual; + } + public String getDescOrigemAtual() { + return descOrigemAtual; + } + public void setDescOrigemAtual(String descOrigemAtual) { + this.descOrigemAtual = descOrigemAtual; + } + public Integer getDestinoIdAtual() { + return destinoIdAtual; + } + public void setDestinoIdAtual(Integer destinoIdAtual) { + this.destinoIdAtual = destinoIdAtual; + } + public String getDescDestinoAtual() { + return descDestinoAtual; + } + public void setDescDestinoAtual(String descDestinoAtual) { + this.descDestinoAtual = descDestinoAtual; + } + public Integer getViaIdAtual() { + return viaIdAtual; + } + public void setViaIdAtual(Integer viaIdAtual) { + this.viaIdAtual = viaIdAtual; + } + public String getNombViaAtual() { + return nombViaAtual; + } + public void setNombViaAtual(String nombViaAtual) { + this.nombViaAtual = nombViaAtual; + } + public Integer getNumsecuenciaAtual() { + return numsecuenciaAtual; + } + public void setNumsecuenciaAtual(Integer numsecuenciaAtual) { + this.numsecuenciaAtual = numsecuenciaAtual; + } + public Integer getOriestado_id() { + return oriestado_id; + } + public void setOriestado_id(Integer oriestado_id) { + this.oriestado_id = oriestado_id; + } + public String getOrinombestado() { + return orinombestado; + } + public void setOrinombestado(String orinombestado) { + this.orinombestado = orinombestado; + } + public Integer getDesestado_id() { + return desestado_id; + } + public void setDesestado_id(Integer desestado_id) { + this.desestado_id = desestado_id; + } + public String getDesnombestado() { + return desnombestado; + } + public void setDesnombestado(String desnombestado) { + this.desnombestado = desnombestado; + } + public Integer getOriciudad_id() { + return oriciudad_id; + } + public void setOriciudad_id(Integer oriciudad_id) { + this.oriciudad_id = oriciudad_id; + } + public String getOrinombciudad() { + return orinombciudad; + } + public void setOrinombciudad(String orinombciudad) { + this.orinombciudad = orinombciudad; + } + public Integer getDesciudad_id() { + return desciudad_id; + } + public void setDesciudad_id(Integer desciudad_id) { + this.desciudad_id = desciudad_id; + } + public String getDesnombciudad() { + return desnombciudad; + } + public void setDesnombciudad(String desnombciudad) { + this.desnombciudad = desnombciudad; + } + public String getOricveestado() { + return oricveestado; + } + public void setOricveestado(String oricveestado) { + this.oricveestado = oricveestado; + } + public String getDescveestado() { + return descveestado; + } + public void setDescveestado(String descveestado) { + this.descveestado = descveestado; + } + public Integer getRutaId() { + return rutaId; + } + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + public BigDecimal getValorTarifa() { + return valorTarifa; + } + public void setValorTarifa(BigDecimal valorTarifa) { + this.valorTarifa = valorTarifa; + } + public BigDecimal getValorTaxa() { + return valorTaxa; + } + public void setValorTaxa(BigDecimal valorTaxa) { + this.valorTaxa = valorTaxa; + } + public BigDecimal getValorSeguro() { + return valorSeguro; + } + public void setValorSeguro(BigDecimal valorSeguro) { + this.valorSeguro = valorSeguro; + } + public BigDecimal getValorPedagio() { + return valorPedagio; + } + public void setValorPedagio(BigDecimal valorPedagio) { + this.valorPedagio = valorPedagio; + } + public BigDecimal getValorOutros() { + return valorOutros; + } + public void setValorOutros(BigDecimal valorOutros) { + this.valorOutros = valorOutros; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java index ee4a4c5d7..ea09b73c1 100644 --- a/src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java @@ -1,273 +1,273 @@ -package com.rjconsultores.ventaboletos.vo.corrida; - -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.vo.roloperativo.RolOperativoVO; -import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; -import com.rjconsultores.ventaboletos.vo.tiposervicio.TipoServicioVO; -import com.rjconsultores.ventaboletos.vo.tramo.TramoVO; - -public class CorridaVO { - private Integer corridaId; - private String feccorrida; - private Integer numCorrida; - private String descServico; - private String fechorsalida; - private Integer origenId; - private Integer destinoId; - private String descOrigen; - private String descDestino; - private String oricveestado; - private String descveestado; - private Integer rutaId; - private Integer claseServicioId; - private Integer marcaId; - private Integer empresaId; - private TipoServicioVO tipoServicioVO; - private RolOperativoVO rolOperativoVO; - private List lsTramoVO; - private List lsSecuenciaVO; - //campos usados nas consultas resumidas - private Integer tipoServicioId; - private Integer rolOperativoId; - private List listTramos; - private String chaveCorrida; - private boolean tarifaEmbarcada; - - public CorridaVO() { - super(); - } - - public CorridaVO( Corrida corrida ) { - super(); - this.corridaId = corrida.getId().getCorridaId(); - this.feccorrida = DateUtil.getStringDate( corrida.getId().getFeccorrida()); - this.numCorrida = corrida.getId().getCorridaId(); - this.fechorsalida = DateUtil.getStringDate(corrida.getFechorsalida(), "dd/MM/yyyy HH:mm:ss.SSS"); - this.origenId = corrida.getOrigem().getParadaId(); - this.destinoId = corrida.getDestino().getParadaId(); - this.tipoServicioId = corrida.getTipoServicio().intValue(); - this.rolOperativoId = corrida.getRolOperativo().getRoloperativoId(); - this.marcaId = corrida.getMarca().getMarcaId().intValue(); - this.claseServicioId = corrida.getClaseServicio().getClaseservicioId(); - this.empresaId = corrida.getEmpresa().getEmpresaId(); - this.rutaId = corrida.getRuta().getRutaId(); - this.tarifaEmbarcada = corrida.getEmpresa().getIndTabelaPrecoEmbarcada(); - } - - public CorridaVO(Integer corridaId, Integer numCorrida, String descServico, String fechorsalida, - Integer tiposervicioId, String descservicio, Integer roloperativoId, String descroloperativo, - List lsTramoVO, List lsSecuenciaVO, Integer rutaId, Integer origenId, - Integer destinoId, String descOrigen, String descDestino, String oricveestado, String descveestado) { - this.corridaId = corridaId; - this.numCorrida = numCorrida; - this.descServico = descServico; - this.fechorsalida = fechorsalida; - this.tipoServicioVO = new TipoServicioVO(tiposervicioId, descservicio); - this.rolOperativoVO = new RolOperativoVO(roloperativoId, descroloperativo); - this.lsTramoVO = lsTramoVO; - this.lsSecuenciaVO = lsSecuenciaVO; - this.rutaId = rutaId; - this.origenId = origenId; - this.descOrigen = descOrigen; - this.destinoId = destinoId; - this.descDestino = descDestino; - this.oricveestado = oricveestado; - this.descveestado = descveestado; - } - - public Integer getCorridaId() { - return corridaId; - } - - public void setCorridaId(Integer corridaId) { - this.corridaId = corridaId; - } - - public Integer getNumCorrida() { - return numCorrida; - } - - public void setNumCorrida(Integer numCorrida) { - this.numCorrida = numCorrida; - } - - public String getDescServico() { - return descServico; - } - - public void setDescServico(String descServico) { - this.descServico = descServico; - } - - public String getFechorsalida() { - return fechorsalida; - } - - public void setFechorsalida(String fechorsalida) { - this.fechorsalida = fechorsalida; - } - - public TipoServicioVO getTipoServicioVO() { - return tipoServicioVO; - } - - public void setTipoServicioVO(TipoServicioVO tipoServicioVO) { - this.tipoServicioVO = tipoServicioVO; - } - - public RolOperativoVO getRolOperativoVO() { - return rolOperativoVO; - } - - public void setRolOperativoVO(RolOperativoVO rolOperativoVO) { - this.rolOperativoVO = rolOperativoVO; - } - - public List getLsTramoVO() { - return lsTramoVO; - } - - public void setLsTramoVO(List lsTramoVO) { - this.lsTramoVO = lsTramoVO; - } - - public List getLsSecuenciaVO() { - return lsSecuenciaVO; - } - - public void setLsSecuenciaVO(List lsSecuenciaVO) { - this.lsSecuenciaVO = lsSecuenciaVO; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public String getDescOrigen() { - return descOrigen; - } - - public void setDescOrigen(String descOrigen) { - this.descOrigen = descOrigen; - } - - public String getDescDestino() { - return descDestino; - } - - public void setDescDestino(String descDestino) { - this.descDestino = descDestino; - } - - public String getOricveestado() { - return oricveestado; - } - - public void setOricveestado(String oricveestado) { - this.oricveestado = oricveestado; - } - - public String getDescveestado() { - return descveestado; - } - - public void setDescveestado(String descveestado) { - this.descveestado = descveestado; - } - - public Integer getClaseServicioId() { - return claseServicioId; - } - - public void setClaseServicioId(Integer claseServicioId) { - this.claseServicioId = claseServicioId; - } - - public Integer getMarcaId() { - return marcaId; - } - - public void setMarcaId(Integer marcaId) { - this.marcaId = marcaId; - } - - public String getFeccorrida() { - return feccorrida; - } - - public void setFeccorrida(String feccorrida) { - this.feccorrida = feccorrida; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Integer getTipoServicioId() { - return tipoServicioId; - } - - public void setTipoServicioId(Integer tipoServicioId) { - this.tipoServicioId = tipoServicioId; - } - - public Integer getRolOperativoId() { - return rolOperativoId; - } - - public void setRolOperativoId(Integer rolOperativoId) { - this.rolOperativoId = rolOperativoId; - } - - public List getListTramos() { - return listTramos; - } - - public void setListTramos(List listTramos) { - this.listTramos = listTramos; - } - - public String getChaveCorrida() { - return chaveCorrida; - } - - public void setChaveCorrida(String chaveCorrida) { - this.chaveCorrida = chaveCorrida; - } - - public boolean isTarifaEmbarcada() { - return tarifaEmbarcada; - } - - public void setTarifaEmbarcada(boolean tarifaEmbarcada) { - this.tarifaEmbarcada = tarifaEmbarcada; - } - -} +package com.rjconsultores.ventaboletos.vo.corrida; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.vo.roloperativo.RolOperativoVO; +import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; +import com.rjconsultores.ventaboletos.vo.tiposervicio.TipoServicioVO; +import com.rjconsultores.ventaboletos.vo.tramo.TramoVO; + +public class CorridaVO { + private Integer corridaId; + private String feccorrida; + private Integer numCorrida; + private String descServico; + private String fechorsalida; + private Integer origenId; + private Integer destinoId; + private String descOrigen; + private String descDestino; + private String oricveestado; + private String descveestado; + private Integer rutaId; + private Integer claseServicioId; + private Integer marcaId; + private Integer empresaId; + private TipoServicioVO tipoServicioVO; + private RolOperativoVO rolOperativoVO; + private List lsTramoVO; + private List lsSecuenciaVO; + //campos usados nas consultas resumidas + private Integer tipoServicioId; + private Integer rolOperativoId; + private List listTramos; + private String chaveCorrida; + private boolean tarifaEmbarcada; + + public CorridaVO() { + super(); + } + + public CorridaVO( Corrida corrida ) { + super(); + this.corridaId = corrida.getId().getCorridaId(); + this.feccorrida = DateUtil.getStringDate( corrida.getId().getFeccorrida()); + this.numCorrida = corrida.getId().getCorridaId(); + this.fechorsalida = DateUtil.getStringDate(corrida.getFechorsalida(), "dd/MM/yyyy HH:mm:ss.SSS"); + this.origenId = corrida.getOrigem().getParadaId(); + this.destinoId = corrida.getDestino().getParadaId(); + this.tipoServicioId = corrida.getTipoServicio().intValue(); + this.rolOperativoId = corrida.getRolOperativo().getRoloperativoId(); + this.marcaId = corrida.getMarca().getMarcaId().intValue(); + this.claseServicioId = corrida.getClaseServicio().getClaseservicioId(); + this.empresaId = corrida.getEmpresa().getEmpresaId(); + this.rutaId = corrida.getRuta().getRutaId(); + this.tarifaEmbarcada = corrida.getEmpresa().getIndTabelaPrecoEmbarcada(); + } + + public CorridaVO(Integer corridaId, Integer numCorrida, String descServico, String fechorsalida, + Integer tiposervicioId, String descservicio, Integer roloperativoId, String descroloperativo, + List lsTramoVO, List lsSecuenciaVO, Integer rutaId, Integer origenId, + Integer destinoId, String descOrigen, String descDestino, String oricveestado, String descveestado) { + this.corridaId = corridaId; + this.numCorrida = numCorrida; + this.descServico = descServico; + this.fechorsalida = fechorsalida; + this.tipoServicioVO = new TipoServicioVO(tiposervicioId, descservicio); + this.rolOperativoVO = new RolOperativoVO(roloperativoId, descroloperativo); + this.lsTramoVO = lsTramoVO; + this.lsSecuenciaVO = lsSecuenciaVO; + this.rutaId = rutaId; + this.origenId = origenId; + this.descOrigen = descOrigen; + this.destinoId = destinoId; + this.descDestino = descDestino; + this.oricveestado = oricveestado; + this.descveestado = descveestado; + } + + public Integer getCorridaId() { + return corridaId; + } + + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } + + public Integer getNumCorrida() { + return numCorrida; + } + + public void setNumCorrida(Integer numCorrida) { + this.numCorrida = numCorrida; + } + + public String getDescServico() { + return descServico; + } + + public void setDescServico(String descServico) { + this.descServico = descServico; + } + + public String getFechorsalida() { + return fechorsalida; + } + + public void setFechorsalida(String fechorsalida) { + this.fechorsalida = fechorsalida; + } + + public TipoServicioVO getTipoServicioVO() { + return tipoServicioVO; + } + + public void setTipoServicioVO(TipoServicioVO tipoServicioVO) { + this.tipoServicioVO = tipoServicioVO; + } + + public RolOperativoVO getRolOperativoVO() { + return rolOperativoVO; + } + + public void setRolOperativoVO(RolOperativoVO rolOperativoVO) { + this.rolOperativoVO = rolOperativoVO; + } + + public List getLsTramoVO() { + return lsTramoVO; + } + + public void setLsTramoVO(List lsTramoVO) { + this.lsTramoVO = lsTramoVO; + } + + public List getLsSecuenciaVO() { + return lsSecuenciaVO; + } + + public void setLsSecuenciaVO(List lsSecuenciaVO) { + this.lsSecuenciaVO = lsSecuenciaVO; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public String getDescOrigen() { + return descOrigen; + } + + public void setDescOrigen(String descOrigen) { + this.descOrigen = descOrigen; + } + + public String getDescDestino() { + return descDestino; + } + + public void setDescDestino(String descDestino) { + this.descDestino = descDestino; + } + + public String getOricveestado() { + return oricveestado; + } + + public void setOricveestado(String oricveestado) { + this.oricveestado = oricveestado; + } + + public String getDescveestado() { + return descveestado; + } + + public void setDescveestado(String descveestado) { + this.descveestado = descveestado; + } + + public Integer getClaseServicioId() { + return claseServicioId; + } + + public void setClaseServicioId(Integer claseServicioId) { + this.claseServicioId = claseServicioId; + } + + public Integer getMarcaId() { + return marcaId; + } + + public void setMarcaId(Integer marcaId) { + this.marcaId = marcaId; + } + + public String getFeccorrida() { + return feccorrida; + } + + public void setFeccorrida(String feccorrida) { + this.feccorrida = feccorrida; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Integer getTipoServicioId() { + return tipoServicioId; + } + + public void setTipoServicioId(Integer tipoServicioId) { + this.tipoServicioId = tipoServicioId; + } + + public Integer getRolOperativoId() { + return rolOperativoId; + } + + public void setRolOperativoId(Integer rolOperativoId) { + this.rolOperativoId = rolOperativoId; + } + + public List getListTramos() { + return listTramos; + } + + public void setListTramos(List listTramos) { + this.listTramos = listTramos; + } + + public String getChaveCorrida() { + return chaveCorrida; + } + + public void setChaveCorrida(String chaveCorrida) { + this.chaveCorrida = chaveCorrida; + } + + public boolean isTarifaEmbarcada() { + return tarifaEmbarcada; + } + + public void setTarifaEmbarcada(boolean tarifaEmbarcada) { + this.tarifaEmbarcada = tarifaEmbarcada; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java index 29fe8b72f..aa376237f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java @@ -1,236 +1,236 @@ -package com.rjconsultores.ventaboletos.vo.corrida; - -import java.math.BigDecimal; - -public class TramoSequenciaVO { - private Integer tramoId; - private String desctramo; - private Integer origemId; - private String descOrigem; - private Integer cidadeOrigemId; - private String nomeCidadeOrigem; - private Integer estadoOrigemId; - private String nomeEstadoOrigem; - private String cveEstadoOrigem; - private Integer destinoId; - private String descDestino; - private Integer cidadeDestinoId; - private String nomeCidadeDestino; - private Integer estadoDestinoId; - private String nomeEstadoDestino; - private String cveEstadoDestino; - private Integer viaId; - private String nomeVia; - private Integer sequencia; - private BigDecimal importeTaxaEmbarque; - private BigDecimal importePedagio; - private BigDecimal importeOutros; - private BigDecimal importeSeguro; - private BigDecimal precio; - private BigDecimal tarifaMinima; - - public TramoSequenciaVO() { - - } - - public Integer getTramoId() { - return tramoId; - } - - public void setTramoId(Integer tramoId) { - this.tramoId = tramoId; - } - - public String getDesctramo() { - return desctramo; - } - - public void setDesctramo(String desctramo) { - this.desctramo = desctramo; - } - - public Integer getOrigemId() { - return origemId; - } - - public void setOrigemId(Integer origemId) { - this.origemId = origemId; - } - - public String getDescOrigem() { - return descOrigem; - } - - public void setDescOrigem(String descOrigem) { - this.descOrigem = descOrigem; - } - - public Integer getCidadeOrigemId() { - return cidadeOrigemId; - } - - public void setCidadeOrigemId(Integer cidadeOrigemId) { - this.cidadeOrigemId = cidadeOrigemId; - } - - public String getNomeCidadeOrigem() { - return nomeCidadeOrigem; - } - - public void setNomeCidadeOrigem(String nomeCidadeOrigem) { - this.nomeCidadeOrigem = nomeCidadeOrigem; - } - - public Integer getEstadoOrigemId() { - return estadoOrigemId; - } - - public void setEstadoOrigemId(Integer estadoOrigemId) { - this.estadoOrigemId = estadoOrigemId; - } - - public String getNomeEstadoOrigem() { - return nomeEstadoOrigem; - } - - public void setNomeEstadoOrigem(String nomeEstadoOrigem) { - this.nomeEstadoOrigem = nomeEstadoOrigem; - } - - public String getCveEstadoOrigem() { - return cveEstadoOrigem; - } - - public void setCveEstadoOrigem(String cveEstadoOrigem) { - this.cveEstadoOrigem = cveEstadoOrigem; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public String getDescDestino() { - return descDestino; - } - - public void setDescDestino(String descDestino) { - this.descDestino = descDestino; - } - - public Integer getCidadeDestinoId() { - return cidadeDestinoId; - } - - public void setCidadeDestinoId(Integer cidadeDestinoId) { - this.cidadeDestinoId = cidadeDestinoId; - } - - public String getNomeCidadeDestino() { - return nomeCidadeDestino; - } - - public void setNomeCidadeDestino(String nomeCidadeDestino) { - this.nomeCidadeDestino = nomeCidadeDestino; - } - - public Integer getEstadoDestinoId() { - return estadoDestinoId; - } - - public void setEstadoDestinoId(Integer estadoDestinoId) { - this.estadoDestinoId = estadoDestinoId; - } - - public String getNomeEstadoDestino() { - return nomeEstadoDestino; - } - - public void setNomeEstadoDestino(String nomeEstadoDestino) { - this.nomeEstadoDestino = nomeEstadoDestino; - } - - public String getCveEstadoDestino() { - return cveEstadoDestino; - } - - public void setCveEstadoDestino(String cveEstadoDestino) { - this.cveEstadoDestino = cveEstadoDestino; - } - - public Integer getViaId() { - return viaId; - } - - public void setViaId(Integer viaId) { - this.viaId = viaId; - } - - public String getNomeVia() { - return nomeVia; - } - - public void setNomeVia(String nomeVia) { - this.nomeVia = nomeVia; - } - - public Integer getSequencia() { - return sequencia; - } - - public void setSequencia(Integer sequencia) { - this.sequencia = sequencia; - } - - public BigDecimal getImporteTaxaEmbarque() { - return importeTaxaEmbarque; - } - - public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { - this.importeTaxaEmbarque = importeTaxaEmbarque; - } - - public BigDecimal getImportePedagio() { - return importePedagio; - } - - public void setImportePedagio(BigDecimal importePedagio) { - this.importePedagio = importePedagio; - } - - public BigDecimal getImporteOutros() { - return importeOutros; - } - - public void setImporteOutros(BigDecimal importeOutros) { - this.importeOutros = importeOutros; - } - - public BigDecimal getImporteSeguro() { - return importeSeguro; - } - - public void setImporteSeguro(BigDecimal importeSeguro) { - this.importeSeguro = importeSeguro; - } - - public BigDecimal getPrecio() { - return precio; - } - - public void setPrecio(BigDecimal precio) { - this.precio = precio; - } - - public BigDecimal getTarifaMinima() { - return tarifaMinima; - } - - public void setTarifaMinima(BigDecimal tarifaMinima) { - this.tarifaMinima = tarifaMinima; - } - -} +package com.rjconsultores.ventaboletos.vo.corrida; + +import java.math.BigDecimal; + +public class TramoSequenciaVO { + private Integer tramoId; + private String desctramo; + private Integer origemId; + private String descOrigem; + private Integer cidadeOrigemId; + private String nomeCidadeOrigem; + private Integer estadoOrigemId; + private String nomeEstadoOrigem; + private String cveEstadoOrigem; + private Integer destinoId; + private String descDestino; + private Integer cidadeDestinoId; + private String nomeCidadeDestino; + private Integer estadoDestinoId; + private String nomeEstadoDestino; + private String cveEstadoDestino; + private Integer viaId; + private String nomeVia; + private Integer sequencia; + private BigDecimal importeTaxaEmbarque; + private BigDecimal importePedagio; + private BigDecimal importeOutros; + private BigDecimal importeSeguro; + private BigDecimal precio; + private BigDecimal tarifaMinima; + + public TramoSequenciaVO() { + + } + + public Integer getTramoId() { + return tramoId; + } + + public void setTramoId(Integer tramoId) { + this.tramoId = tramoId; + } + + public String getDesctramo() { + return desctramo; + } + + public void setDesctramo(String desctramo) { + this.desctramo = desctramo; + } + + public Integer getOrigemId() { + return origemId; + } + + public void setOrigemId(Integer origemId) { + this.origemId = origemId; + } + + public String getDescOrigem() { + return descOrigem; + } + + public void setDescOrigem(String descOrigem) { + this.descOrigem = descOrigem; + } + + public Integer getCidadeOrigemId() { + return cidadeOrigemId; + } + + public void setCidadeOrigemId(Integer cidadeOrigemId) { + this.cidadeOrigemId = cidadeOrigemId; + } + + public String getNomeCidadeOrigem() { + return nomeCidadeOrigem; + } + + public void setNomeCidadeOrigem(String nomeCidadeOrigem) { + this.nomeCidadeOrigem = nomeCidadeOrigem; + } + + public Integer getEstadoOrigemId() { + return estadoOrigemId; + } + + public void setEstadoOrigemId(Integer estadoOrigemId) { + this.estadoOrigemId = estadoOrigemId; + } + + public String getNomeEstadoOrigem() { + return nomeEstadoOrigem; + } + + public void setNomeEstadoOrigem(String nomeEstadoOrigem) { + this.nomeEstadoOrigem = nomeEstadoOrigem; + } + + public String getCveEstadoOrigem() { + return cveEstadoOrigem; + } + + public void setCveEstadoOrigem(String cveEstadoOrigem) { + this.cveEstadoOrigem = cveEstadoOrigem; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public String getDescDestino() { + return descDestino; + } + + public void setDescDestino(String descDestino) { + this.descDestino = descDestino; + } + + public Integer getCidadeDestinoId() { + return cidadeDestinoId; + } + + public void setCidadeDestinoId(Integer cidadeDestinoId) { + this.cidadeDestinoId = cidadeDestinoId; + } + + public String getNomeCidadeDestino() { + return nomeCidadeDestino; + } + + public void setNomeCidadeDestino(String nomeCidadeDestino) { + this.nomeCidadeDestino = nomeCidadeDestino; + } + + public Integer getEstadoDestinoId() { + return estadoDestinoId; + } + + public void setEstadoDestinoId(Integer estadoDestinoId) { + this.estadoDestinoId = estadoDestinoId; + } + + public String getNomeEstadoDestino() { + return nomeEstadoDestino; + } + + public void setNomeEstadoDestino(String nomeEstadoDestino) { + this.nomeEstadoDestino = nomeEstadoDestino; + } + + public String getCveEstadoDestino() { + return cveEstadoDestino; + } + + public void setCveEstadoDestino(String cveEstadoDestino) { + this.cveEstadoDestino = cveEstadoDestino; + } + + public Integer getViaId() { + return viaId; + } + + public void setViaId(Integer viaId) { + this.viaId = viaId; + } + + public String getNomeVia() { + return nomeVia; + } + + public void setNomeVia(String nomeVia) { + this.nomeVia = nomeVia; + } + + public Integer getSequencia() { + return sequencia; + } + + public void setSequencia(Integer sequencia) { + this.sequencia = sequencia; + } + + public BigDecimal getImporteTaxaEmbarque() { + return importeTaxaEmbarque; + } + + public void setImporteTaxaEmbarque(BigDecimal importeTaxaEmbarque) { + this.importeTaxaEmbarque = importeTaxaEmbarque; + } + + public BigDecimal getImportePedagio() { + return importePedagio; + } + + public void setImportePedagio(BigDecimal importePedagio) { + this.importePedagio = importePedagio; + } + + public BigDecimal getImporteOutros() { + return importeOutros; + } + + public void setImporteOutros(BigDecimal importeOutros) { + this.importeOutros = importeOutros; + } + + public BigDecimal getImporteSeguro() { + return importeSeguro; + } + + public void setImporteSeguro(BigDecimal importeSeguro) { + this.importeSeguro = importeSeguro; + } + + public BigDecimal getPrecio() { + return precio; + } + + public void setPrecio(BigDecimal precio) { + this.precio = precio; + } + + public BigDecimal getTarifaMinima() { + return tarifaMinima; + } + + public void setTarifaMinima(BigDecimal tarifaMinima) { + this.tarifaMinima = tarifaMinima; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/AutorizacaoUsoSerieEmbarcadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/AutorizacaoUsoSerieEmbarcadaVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/AutorizacaoUsoSerieEmbarcadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/AutorizacaoUsoSerieEmbarcadaVO.java index 57d70b506..f6c22f82c 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/AutorizacaoUsoSerieEmbarcadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/AutorizacaoUsoSerieEmbarcadaVO.java @@ -1,133 +1,133 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class AutorizacaoUsoSerieEmbarcadaVO { - private Long id; - private String empresa; - private String uf; - private String serie; - private String numero; - private String descricao; - private String registro; - private String mac; - private String bloqueado; - private String manutencao; - private String baixado; - private String agencia; - private String ultimoAcessoUsuario; - private String ultimoAcessoDataHora; - - public AutorizacaoUsoSerieEmbarcadaVO() { - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public String getUf() { - return uf; - } - - public void setUf(String uf) { - this.uf = uf; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getDescricao() { - return descricao; - } - - public void setDescricao(String descricao) { - this.descricao = descricao; - } - - public String getRegistro() { - return registro; - } - - public void setRegistro(String registro) { - this.registro = registro; - } - - public String getMac() { - return mac; - } - - public void setMac(String mac) { - this.mac = mac; - } - - public String getBloqueado() { - return bloqueado; - } - - public void setBloqueado(String bloqueado) { - this.bloqueado = bloqueado; - } - - public String getManutencao() { - return manutencao; - } - - public void setManutencao(String manutencao) { - this.manutencao = manutencao; - } - - public String getBaixado() { - return baixado; - } - - public void setBaixado(String baixado) { - this.baixado = baixado; - } - - public String getAgencia() { - return agencia; - } - - public void setAgencia(String agencia) { - this.agencia = agencia; - } - - public String getUltimoAcessoUsuario() { - return ultimoAcessoUsuario; - } - - public void setUltimoAcessoUsuario(String ultimoAcessoUsuario) { - this.ultimoAcessoUsuario = ultimoAcessoUsuario; - } - - public String getUltimoAcessoDataHora() { - return ultimoAcessoDataHora; - } - - public void setUltimoAcessoDataHora(String ultimoAcessoDataHora) { - this.ultimoAcessoDataHora = ultimoAcessoDataHora; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class AutorizacaoUsoSerieEmbarcadaVO { + private Long id; + private String empresa; + private String uf; + private String serie; + private String numero; + private String descricao; + private String registro; + private String mac; + private String bloqueado; + private String manutencao; + private String baixado; + private String agencia; + private String ultimoAcessoUsuario; + private String ultimoAcessoDataHora; + + public AutorizacaoUsoSerieEmbarcadaVO() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getUf() { + return uf; + } + + public void setUf(String uf) { + this.uf = uf; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public String getRegistro() { + return registro; + } + + public void setRegistro(String registro) { + this.registro = registro; + } + + public String getMac() { + return mac; + } + + public void setMac(String mac) { + this.mac = mac; + } + + public String getBloqueado() { + return bloqueado; + } + + public void setBloqueado(String bloqueado) { + this.bloqueado = bloqueado; + } + + public String getManutencao() { + return manutencao; + } + + public void setManutencao(String manutencao) { + this.manutencao = manutencao; + } + + public String getBaixado() { + return baixado; + } + + public void setBaixado(String baixado) { + this.baixado = baixado; + } + + public String getAgencia() { + return agencia; + } + + public void setAgencia(String agencia) { + this.agencia = agencia; + } + + public String getUltimoAcessoUsuario() { + return ultimoAcessoUsuario; + } + + public void setUltimoAcessoUsuario(String ultimoAcessoUsuario) { + this.ultimoAcessoUsuario = ultimoAcessoUsuario; + } + + public String getUltimoAcessoDataHora() { + return ultimoAcessoDataHora; + } + + public void setUltimoAcessoDataHora(String ultimoAcessoDataHora) { + this.ultimoAcessoDataHora = ultimoAcessoDataHora; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/CidadeVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/CidadeVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/CidadeVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/CidadeVO.java index 586fee51f..4cd00b288 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/CidadeVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/CidadeVO.java @@ -1,21 +1,21 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class CidadeVO { - private Integer ciudadId; - private String nombciudad; - - public Integer getCiudadId() { - return ciudadId; - } - public void setCiudadId(Integer ciudadId) { - this.ciudadId = ciudadId; - } - public String getNombciudad() { - return nombciudad; - } - public void setNombciudad(String nombciudad) { - this.nombciudad = nombciudad; - } - - -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class CidadeVO { + private Integer ciudadId; + private String nombciudad; + + public Integer getCiudadId() { + return ciudadId; + } + public void setCiudadId(Integer ciudadId) { + this.ciudadId = ciudadId; + } + public String getNombciudad() { + return nombciudad; + } + public void setNombciudad(String nombciudad) { + this.nombciudad = nombciudad; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/DetalheCorridaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/DetalheCorridaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/DetalheCorridaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/DetalheCorridaVO.java index c34ef2016..e1dbe7ab2 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/DetalheCorridaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/DetalheCorridaVO.java @@ -1,31 +1,31 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -import java.util.List; - -import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; -import com.rjconsultores.ventaboletos.vo.tramo.TramoVO; - -public class DetalheCorridaVO { - private List lsTramoVO; - private List lsSecuenciaVO; - - public DetalheCorridaVO() { - - } - - public List getLsTramoVO() { - return lsTramoVO; - } - - public void setLsTramoVO(List lsTramoVO) { - this.lsTramoVO = lsTramoVO; - } - - public List getLsSecuenciaVO() { - return lsSecuenciaVO; - } - - public void setLsSecuenciaVO(List lsSecuenciaVO) { - this.lsSecuenciaVO = lsSecuenciaVO; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +import java.util.List; + +import com.rjconsultores.ventaboletos.vo.secuencia.SecuenciaVO; +import com.rjconsultores.ventaboletos.vo.tramo.TramoVO; + +public class DetalheCorridaVO { + private List lsTramoVO; + private List lsSecuenciaVO; + + public DetalheCorridaVO() { + + } + + public List getLsTramoVO() { + return lsTramoVO; + } + + public void setLsTramoVO(List lsTramoVO) { + this.lsTramoVO = lsTramoVO; + } + + public List getLsSecuenciaVO() { + return lsSecuenciaVO; + } + + public void setLsSecuenciaVO(List lsSecuenciaVO) { + this.lsSecuenciaVO = lsSecuenciaVO; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/DispositivoEmbarcadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/DispositivoEmbarcadaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/DispositivoEmbarcadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/DispositivoEmbarcadaVO.java index ed4622a4b..82c3ea43c 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/DispositivoEmbarcadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/DispositivoEmbarcadaVO.java @@ -1,212 +1,212 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -import java.util.ArrayList; -import java.util.List; - -public class DispositivoEmbarcadaVO { - private Long dispositivoId; - private Long idAgencia; - private String descAgencia; - private String numagencia; - private String descEquipamento; - private Integer bloqueado; - private Integer manutencao; - private Integer baixado; - private Long idempresa; - private String descEmpresa; - private List estados = new ArrayList(); - private String cnpjAgencia; - private String enderecoAgencia; - private String cnpjEmpresa; - private String enderecoEmpresa; - private String msg; - private Integer estacionId; - private List empresasVenda = new ArrayList(); - private List lsFormasPagamento; - private List lsSeguroTaxaEmbarque; - private List lsTiposPassagensBloqueadas; - private Boolean indVendeNaoBpe; - private String versaoUltimaSinc; - private String dataUltimaSinc; - - - public void add(EstadoDispositivoEmbarcadaVO estado){ - estados.add(estado); - } - - public Long getIdAgencia() { - return idAgencia; - } - public void setIdAgencia(Long idAgencia) { - this.idAgencia = idAgencia; - } - public String getDescAgencia() { - return descAgencia; - } - public void setDescAgencia(String descAgencia) { - this.descAgencia = descAgencia; - } - public String getDescEquipamento() { - return descEquipamento; - } - public void setDescEquipamento(String descEquipamento) { - this.descEquipamento = descEquipamento; - } - public Integer getBloqueado() { - return bloqueado; - } - public void setBloqueado(Integer bloqueado) { - this.bloqueado = bloqueado; - } - public Integer getManutencao() { - return manutencao; - } - public void setManutencao(Integer manutencao) { - this.manutencao = manutencao; - } - public Integer getBaixado() { - return baixado; - } - public void setBaixado(Integer baixado) { - this.baixado = baixado; - } - public Long getIdempresa() { - return idempresa; - } - public void setIdempresa(Long idempresa) { - this.idempresa = idempresa; - } - public String getDescEmpresa() { - return descEmpresa; - } - public void setDescEmpresa(String descEmpresa) { - this.descEmpresa = descEmpresa; - } - public List getEstados() { - return estados; - } - public void setEstados(List estados) { - this.estados = estados; - } - - public String getCnpjAgencia() { - return cnpjAgencia; - } - - public void setCnpjAgencia(String cnpjAgencia) { - this.cnpjAgencia = cnpjAgencia; - } - - public String getEnderecoAgencia() { - return enderecoAgencia; - } - - public void setEnderecoAgencia(String enderecoAgencia) { - this.enderecoAgencia = enderecoAgencia; - } - - public String getCnpjEmpresa() { - return cnpjEmpresa; - } - - public void setCnpjEmpresa(String cnpjEmpresa) { - this.cnpjEmpresa = cnpjEmpresa; - } - - public String getEnderecoEmpresa() { - return enderecoEmpresa; - } - - public void setEnderecoEmpresa(String enderecoEmpresa) { - this.enderecoEmpresa = enderecoEmpresa; - } - - public Long getDispositivoId() { - return dispositivoId; - } - - public void setDispositivoId(Long dispositivoId) { - this.dispositivoId = dispositivoId; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Integer getEstacionId() { - return estacionId; - } - - public void setEstacionId(Integer estacionId) { - this.estacionId = estacionId; - } - - public List getEmpresasVenda() { - return empresasVenda; - } - - public void setEmpresasVenda(List empresasVenda) { - this.empresasVenda = empresasVenda; - } - - public String getNumagencia() { - return numagencia; - } - - public void setNumagencia(String numagencia) { - this.numagencia = numagencia; - } - - public Boolean getIndVendeNaoBpe() { - return indVendeNaoBpe; - } - - public void setIndVendeNaoBpe(Boolean indVendeNaoBpe) { - this.indVendeNaoBpe = indVendeNaoBpe; - } - - public String getVersaoUltimaSinc() { - return versaoUltimaSinc; - } - - public void setVersaoUltimaSinc(String versaoUltimaSinc) { - this.versaoUltimaSinc = versaoUltimaSinc; - } - - public String getDataUltimaSinc() { - return dataUltimaSinc; - } - - public void setDataUltimaSinc(String dataUltimaSinc) { - this.dataUltimaSinc = dataUltimaSinc; - } - - public List getLsFormasPagamento() { - return lsFormasPagamento; - } - - public void setLsFormasPagamento(List lsFormasPagamento) { - this.lsFormasPagamento = lsFormasPagamento; - } - - public List getLsSeguroTaxaEmbarque() { - return lsSeguroTaxaEmbarque; - } - - public void setLsSeguroTaxaEmbarque(List lsSeguroTaxaEmbarque) { - this.lsSeguroTaxaEmbarque = lsSeguroTaxaEmbarque; - } - - public List getLsTiposPassagensBloqueadas() { - return lsTiposPassagensBloqueadas; - } - - public void setLsTiposPassagensBloqueadas(List lsTiposPassagensBloqueadas) { - this.lsTiposPassagensBloqueadas = lsTiposPassagensBloqueadas; - } - -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +import java.util.ArrayList; +import java.util.List; + +public class DispositivoEmbarcadaVO { + private Long dispositivoId; + private Long idAgencia; + private String descAgencia; + private String numagencia; + private String descEquipamento; + private Integer bloqueado; + private Integer manutencao; + private Integer baixado; + private Long idempresa; + private String descEmpresa; + private List estados = new ArrayList(); + private String cnpjAgencia; + private String enderecoAgencia; + private String cnpjEmpresa; + private String enderecoEmpresa; + private String msg; + private Integer estacionId; + private List empresasVenda = new ArrayList(); + private List lsFormasPagamento; + private List lsSeguroTaxaEmbarque; + private List lsTiposPassagensBloqueadas; + private Boolean indVendeNaoBpe; + private String versaoUltimaSinc; + private String dataUltimaSinc; + + + public void add(EstadoDispositivoEmbarcadaVO estado){ + estados.add(estado); + } + + public Long getIdAgencia() { + return idAgencia; + } + public void setIdAgencia(Long idAgencia) { + this.idAgencia = idAgencia; + } + public String getDescAgencia() { + return descAgencia; + } + public void setDescAgencia(String descAgencia) { + this.descAgencia = descAgencia; + } + public String getDescEquipamento() { + return descEquipamento; + } + public void setDescEquipamento(String descEquipamento) { + this.descEquipamento = descEquipamento; + } + public Integer getBloqueado() { + return bloqueado; + } + public void setBloqueado(Integer bloqueado) { + this.bloqueado = bloqueado; + } + public Integer getManutencao() { + return manutencao; + } + public void setManutencao(Integer manutencao) { + this.manutencao = manutencao; + } + public Integer getBaixado() { + return baixado; + } + public void setBaixado(Integer baixado) { + this.baixado = baixado; + } + public Long getIdempresa() { + return idempresa; + } + public void setIdempresa(Long idempresa) { + this.idempresa = idempresa; + } + public String getDescEmpresa() { + return descEmpresa; + } + public void setDescEmpresa(String descEmpresa) { + this.descEmpresa = descEmpresa; + } + public List getEstados() { + return estados; + } + public void setEstados(List estados) { + this.estados = estados; + } + + public String getCnpjAgencia() { + return cnpjAgencia; + } + + public void setCnpjAgencia(String cnpjAgencia) { + this.cnpjAgencia = cnpjAgencia; + } + + public String getEnderecoAgencia() { + return enderecoAgencia; + } + + public void setEnderecoAgencia(String enderecoAgencia) { + this.enderecoAgencia = enderecoAgencia; + } + + public String getCnpjEmpresa() { + return cnpjEmpresa; + } + + public void setCnpjEmpresa(String cnpjEmpresa) { + this.cnpjEmpresa = cnpjEmpresa; + } + + public String getEnderecoEmpresa() { + return enderecoEmpresa; + } + + public void setEnderecoEmpresa(String enderecoEmpresa) { + this.enderecoEmpresa = enderecoEmpresa; + } + + public Long getDispositivoId() { + return dispositivoId; + } + + public void setDispositivoId(Long dispositivoId) { + this.dispositivoId = dispositivoId; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public Integer getEstacionId() { + return estacionId; + } + + public void setEstacionId(Integer estacionId) { + this.estacionId = estacionId; + } + + public List getEmpresasVenda() { + return empresasVenda; + } + + public void setEmpresasVenda(List empresasVenda) { + this.empresasVenda = empresasVenda; + } + + public String getNumagencia() { + return numagencia; + } + + public void setNumagencia(String numagencia) { + this.numagencia = numagencia; + } + + public Boolean getIndVendeNaoBpe() { + return indVendeNaoBpe; + } + + public void setIndVendeNaoBpe(Boolean indVendeNaoBpe) { + this.indVendeNaoBpe = indVendeNaoBpe; + } + + public String getVersaoUltimaSinc() { + return versaoUltimaSinc; + } + + public void setVersaoUltimaSinc(String versaoUltimaSinc) { + this.versaoUltimaSinc = versaoUltimaSinc; + } + + public String getDataUltimaSinc() { + return dataUltimaSinc; + } + + public void setDataUltimaSinc(String dataUltimaSinc) { + this.dataUltimaSinc = dataUltimaSinc; + } + + public List getLsFormasPagamento() { + return lsFormasPagamento; + } + + public void setLsFormasPagamento(List lsFormasPagamento) { + this.lsFormasPagamento = lsFormasPagamento; + } + + public List getLsSeguroTaxaEmbarque() { + return lsSeguroTaxaEmbarque; + } + + public void setLsSeguroTaxaEmbarque(List lsSeguroTaxaEmbarque) { + this.lsSeguroTaxaEmbarque = lsSeguroTaxaEmbarque; + } + + public List getLsTiposPassagensBloqueadas() { + return lsTiposPassagensBloqueadas; + } + + public void setLsTiposPassagensBloqueadas(List lsTiposPassagensBloqueadas) { + this.lsTiposPassagensBloqueadas = lsTiposPassagensBloqueadas; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/EmpresaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/EmpresaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/EmpresaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/EmpresaVO.java index 733828dbc..7438b2d97 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/EmpresaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/EmpresaVO.java @@ -1,82 +1,82 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -import java.util.ArrayList; -import java.util.List; - -public class EmpresaVO { - private Long empresaId; - private String nombempresa; - private String cnpj; - private Boolean indImprimeRelFechamentoViagemDetalhadoEmarcada; - private Boolean indImprimeLogoBilheteVendaEmbarcada; - private Boolean indImpressaoCanhotoEmbarcada; - private Boolean indSegundaViaFechamentoCaixa; - - private List inscricoesEstaduais = new ArrayList(); - - public Long getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Long empresaId) { - this.empresaId = empresaId; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public List getInscricoesEstaduais() { - return inscricoesEstaduais; - } - - public void setInscricoesEstaduais(List inscricoesEstaduais) { - this.inscricoesEstaduais = inscricoesEstaduais; - } - - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - public Boolean getIndImprimeRelFechamentoViagemDetalhadoEmarcada() { - return indImprimeRelFechamentoViagemDetalhadoEmarcada; - } - - public void setIndImprimeRelFechamentoViagemDetalhadoEmarcada(Boolean indImprimeRelFechamentoViagemDetalhadoEmarcada) { - this.indImprimeRelFechamentoViagemDetalhadoEmarcada = indImprimeRelFechamentoViagemDetalhadoEmarcada; - } - - public Boolean getIndImprimeLogoBilheteVendaEmbarcada() { - return indImprimeLogoBilheteVendaEmbarcada; - } - - public void setIndImprimeLogoBilheteVendaEmbarcada(Boolean indImprimeLogoBilheteVendaEmbarcada) { - this.indImprimeLogoBilheteVendaEmbarcada = indImprimeLogoBilheteVendaEmbarcada; - } - - public Boolean getIndImpressaoCanhotoEmbarcada() { - return indImpressaoCanhotoEmbarcada; - } - - public void setIndImpressaoCanhotoEmbarcada(Boolean indImpressaoCanhotoEmbarcada) { - this.indImpressaoCanhotoEmbarcada = indImpressaoCanhotoEmbarcada; - } - - public Boolean getIndSegundaViaFechamentoCaixa() { - return indSegundaViaFechamentoCaixa ==null ? Boolean.FALSE : indSegundaViaFechamentoCaixa; - } - - public void setIndSegundaViaFechamentoCaixa(Boolean indSegundaViaFechamentoCaixa) { - this.indSegundaViaFechamentoCaixa = indSegundaViaFechamentoCaixa; - } - - -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +import java.util.ArrayList; +import java.util.List; + +public class EmpresaVO { + private Long empresaId; + private String nombempresa; + private String cnpj; + private Boolean indImprimeRelFechamentoViagemDetalhadoEmarcada; + private Boolean indImprimeLogoBilheteVendaEmbarcada; + private Boolean indImpressaoCanhotoEmbarcada; + private Boolean indSegundaViaFechamentoCaixa; + + private List inscricoesEstaduais = new ArrayList(); + + public Long getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Long empresaId) { + this.empresaId = empresaId; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public List getInscricoesEstaduais() { + return inscricoesEstaduais; + } + + public void setInscricoesEstaduais(List inscricoesEstaduais) { + this.inscricoesEstaduais = inscricoesEstaduais; + } + + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + public Boolean getIndImprimeRelFechamentoViagemDetalhadoEmarcada() { + return indImprimeRelFechamentoViagemDetalhadoEmarcada; + } + + public void setIndImprimeRelFechamentoViagemDetalhadoEmarcada(Boolean indImprimeRelFechamentoViagemDetalhadoEmarcada) { + this.indImprimeRelFechamentoViagemDetalhadoEmarcada = indImprimeRelFechamentoViagemDetalhadoEmarcada; + } + + public Boolean getIndImprimeLogoBilheteVendaEmbarcada() { + return indImprimeLogoBilheteVendaEmbarcada; + } + + public void setIndImprimeLogoBilheteVendaEmbarcada(Boolean indImprimeLogoBilheteVendaEmbarcada) { + this.indImprimeLogoBilheteVendaEmbarcada = indImprimeLogoBilheteVendaEmbarcada; + } + + public Boolean getIndImpressaoCanhotoEmbarcada() { + return indImpressaoCanhotoEmbarcada; + } + + public void setIndImpressaoCanhotoEmbarcada(Boolean indImpressaoCanhotoEmbarcada) { + this.indImpressaoCanhotoEmbarcada = indImpressaoCanhotoEmbarcada; + } + + public Boolean getIndSegundaViaFechamentoCaixa() { + return indSegundaViaFechamentoCaixa ==null ? Boolean.FALSE : indSegundaViaFechamentoCaixa; + } + + public void setIndSegundaViaFechamentoCaixa(Boolean indSegundaViaFechamentoCaixa) { + this.indSegundaViaFechamentoCaixa = indSegundaViaFechamentoCaixa; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/EstadoDispositivoEmbarcadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/EstadoDispositivoEmbarcadaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/EstadoDispositivoEmbarcadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/EstadoDispositivoEmbarcadaVO.java index 047bfcf63..7e7d4163b 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/EstadoDispositivoEmbarcadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/EstadoDispositivoEmbarcadaVO.java @@ -1,40 +1,40 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class EstadoDispositivoEmbarcadaVO { - private Long idUf; - private String descUf; - private String serie; - private String numBpe; - private Long empresaId; - - public Long getIdUf() { - return idUf; - } - public void setIdUf(Long idUf) { - this.idUf = idUf; - } - public String getDescUf() { - return descUf; - } - public void setDescUf(String descUf) { - this.descUf = descUf; - } - public String getSerie() { - return serie; - } - public void setSerie(String serie) { - this.serie = serie; - } - public String getNumBpe() { - return numBpe; - } - public void setNumBpe(String numBpe) { - this.numBpe = numBpe; - } - public Long getEmpresaId() { - return empresaId; - } - public void setEmpresaId(Long empresaId) { - this.empresaId = empresaId; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class EstadoDispositivoEmbarcadaVO { + private Long idUf; + private String descUf; + private String serie; + private String numBpe; + private Long empresaId; + + public Long getIdUf() { + return idUf; + } + public void setIdUf(Long idUf) { + this.idUf = idUf; + } + public String getDescUf() { + return descUf; + } + public void setDescUf(String descUf) { + this.descUf = descUf; + } + public String getSerie() { + return serie; + } + public void setSerie(String serie) { + this.serie = serie; + } + public String getNumBpe() { + return numBpe; + } + public void setNumBpe(String numBpe) { + this.numBpe = numBpe; + } + public Long getEmpresaId() { + return empresaId; + } + public void setEmpresaId(Long empresaId) { + this.empresaId = empresaId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/FormaPagamentoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/FormaPagamentoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/FormaPagamentoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/FormaPagamentoVO.java index 95508e2e7..0f5c91cb6 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/FormaPagamentoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/FormaPagamentoVO.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class FormaPagamentoVO { - private Integer empresaId; - private String nombempresa; - private Integer formapagoId; - private String descpago; - private String descTipoFormaPago; - - - public FormaPagamentoVO() { - - } - - public FormaPagamentoVO(Integer empresaId, String nombempresa, Integer formapagoId, String descpago, String descTipoFormaPago) { - super(); - this.empresaId = empresaId; - this.nombempresa = nombempresa; - this.formapagoId = formapagoId; - this.descpago = descpago; - this.descTipoFormaPago = descTipoFormaPago; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public Integer getFormapagoId() { - return formapagoId; - } - - public void setFormapagoId(Integer formapagoId) { - this.formapagoId = formapagoId; - } - - public String getDescpago() { - return descpago; - } - - public void setDescpago(String descpago) { - this.descpago = descpago; - } - - public String getDescTipoFormaPago() { - return descTipoFormaPago; - } - - public void setDescTipoFormaPago(String descTipoFormaPago) { - this.descTipoFormaPago = descTipoFormaPago; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class FormaPagamentoVO { + private Integer empresaId; + private String nombempresa; + private Integer formapagoId; + private String descpago; + private String descTipoFormaPago; + + + public FormaPagamentoVO() { + + } + + public FormaPagamentoVO(Integer empresaId, String nombempresa, Integer formapagoId, String descpago, String descTipoFormaPago) { + super(); + this.empresaId = empresaId; + this.nombempresa = nombempresa; + this.formapagoId = formapagoId; + this.descpago = descpago; + this.descTipoFormaPago = descTipoFormaPago; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public Integer getFormapagoId() { + return formapagoId; + } + + public void setFormapagoId(Integer formapagoId) { + this.formapagoId = formapagoId; + } + + public String getDescpago() { + return descpago; + } + + public void setDescpago(String descpago) { + this.descpago = descpago; + } + + public String getDescTipoFormaPago() { + return descTipoFormaPago; + } + + public void setDescTipoFormaPago(String descTipoFormaPago) { + this.descTipoFormaPago = descTipoFormaPago; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/InscricaoEstadualVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/InscricaoEstadualVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/InscricaoEstadualVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/InscricaoEstadualVO.java index 9d2c3a414..d0d9f2689 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/InscricaoEstadualVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/InscricaoEstadualVO.java @@ -1,175 +1,175 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -import java.math.BigDecimal; -import java.util.Date; - -import com.rjconsultores.ventaboletos.entidad.InscricaoEstadual; - -public class InscricaoEstadualVO { - private Long inscricaoestadualId; - - private EstadoDispositivoEmbarcadaVO estado; - private Boolean activo; - private Date fecmodif; - private Integer usuarioId; - private String numInscricaoEstadual; - private String logradouro; - private String numero; - private String complemento; - private String cep; - private String bairro; - private CidadeVO cidade; - private String cnpj; - private String equivalenciaAG; - private Boolean isBPe; - private BigDecimal porctributo; - private BigDecimal tributacaoImportacao; - private BigDecimal tributacaoImportacaoIM; - - public InscricaoEstadualVO(){} - - public InscricaoEstadualVO(InscricaoEstadual insc){ - this.activo = insc.getActivo(); - this.bairro = insc.getBairro(); - this.cep = insc.getCep(); - this.cidade = new CidadeVO(); - if (insc.getCidade() != null){ - this.cidade.setCiudadId(insc.getCidade().getCiudadId()); - this.cidade.setNombciudad(insc.getCidade().getNombciudad()); - } - this.cnpj = insc.getCnpj(); - this.complemento = insc.getComplemento(); - this.equivalenciaAG = insc.getEquivalenciaAG(); - this.estado = new EstadoDispositivoEmbarcadaVO(); - if (insc.getEstado() != null){ - this.estado.setDescUf(insc.getEstado().getNombestado()); - this.estado.setIdUf(insc.getEstado().getEstadoId().longValue()); - } - this.fecmodif = insc.getFecmodif(); - this.inscricaoestadualId = insc.getInscricaoestadualId(); - this.isBPe = insc.getIsBPe(); - this.logradouro = insc.getLogradouro(); - this.numero = insc.getNumero(); - this.numInscricaoEstadual = insc.getNumInscricaoEstadual(); - this.usuarioId = insc.getUsuarioId(); - } - - public Long getInscricaoestadualId() { - return inscricaoestadualId; - } - public void setInscricaoestadualId(Long inscricaoestadualId) { - this.inscricaoestadualId = inscricaoestadualId; - } - - public EstadoDispositivoEmbarcadaVO getEstado() { - return estado; - } - - public void setEstado(EstadoDispositivoEmbarcadaVO estado) { - this.estado = estado; - } - - public Boolean getActivo() { - return activo; - } - public void setActivo(Boolean activo) { - this.activo = activo; - } - public Date getFecmodif() { - return fecmodif; - } - public void setFecmodif(Date fecmodif) { - this.fecmodif = fecmodif; - } - public Integer getUsuarioId() { - return usuarioId; - } - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - public String getNumInscricaoEstadual() { - return numInscricaoEstadual; - } - public void setNumInscricaoEstadual(String numInscricaoEstadual) { - this.numInscricaoEstadual = numInscricaoEstadual; - } - public String getLogradouro() { - return logradouro; - } - public void setLogradouro(String logradouro) { - this.logradouro = logradouro; - } - public String getNumero() { - return numero; - } - public void setNumero(String numero) { - this.numero = numero; - } - public String getComplemento() { - return complemento; - } - public void setComplemento(String complemento) { - this.complemento = complemento; - } - public String getCep() { - return cep; - } - public void setCep(String cep) { - this.cep = cep; - } - public String getBairro() { - return bairro; - } - public void setBairro(String bairro) { - this.bairro = bairro; - } - public CidadeVO getCidade() { - return cidade; - } - public void setCidade(CidadeVO cidade) { - this.cidade = cidade; - } - public String getCnpj() { - return cnpj; - } - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - public String getEquivalenciaAG() { - return equivalenciaAG; - } - public void setEquivalenciaAG(String equivalenciaAG) { - this.equivalenciaAG = equivalenciaAG; - } - public Boolean getIsBPe() { - return isBPe; - } - public void setIsBPe(Boolean isBPe) { - this.isBPe = isBPe; - } - - public BigDecimal getPorctributo() { - return porctributo; - } - - public void setPorctributo(BigDecimal porctributo) { - this.porctributo = porctributo; - } - - public BigDecimal getTributacaoImportacao() { - return tributacaoImportacao; - } - - public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { - this.tributacaoImportacao = tributacaoImportacao; - } - - public BigDecimal getTributacaoImportacaoIM() { - return tributacaoImportacaoIM; - } - - public void setTributacaoImportacaoIM(BigDecimal tributacaoImportacaoIM) { - this.tributacaoImportacaoIM = tributacaoImportacaoIM; - } - -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +import java.math.BigDecimal; +import java.util.Date; + +import com.rjconsultores.ventaboletos.entidad.InscricaoEstadual; + +public class InscricaoEstadualVO { + private Long inscricaoestadualId; + + private EstadoDispositivoEmbarcadaVO estado; + private Boolean activo; + private Date fecmodif; + private Integer usuarioId; + private String numInscricaoEstadual; + private String logradouro; + private String numero; + private String complemento; + private String cep; + private String bairro; + private CidadeVO cidade; + private String cnpj; + private String equivalenciaAG; + private Boolean isBPe; + private BigDecimal porctributo; + private BigDecimal tributacaoImportacao; + private BigDecimal tributacaoImportacaoIM; + + public InscricaoEstadualVO(){} + + public InscricaoEstadualVO(InscricaoEstadual insc){ + this.activo = insc.getActivo(); + this.bairro = insc.getBairro(); + this.cep = insc.getCep(); + this.cidade = new CidadeVO(); + if (insc.getCidade() != null){ + this.cidade.setCiudadId(insc.getCidade().getCiudadId()); + this.cidade.setNombciudad(insc.getCidade().getNombciudad()); + } + this.cnpj = insc.getCnpj(); + this.complemento = insc.getComplemento(); + this.equivalenciaAG = insc.getEquivalenciaAG(); + this.estado = new EstadoDispositivoEmbarcadaVO(); + if (insc.getEstado() != null){ + this.estado.setDescUf(insc.getEstado().getNombestado()); + this.estado.setIdUf(insc.getEstado().getEstadoId().longValue()); + } + this.fecmodif = insc.getFecmodif(); + this.inscricaoestadualId = insc.getInscricaoestadualId(); + this.isBPe = insc.getIsBPe(); + this.logradouro = insc.getLogradouro(); + this.numero = insc.getNumero(); + this.numInscricaoEstadual = insc.getNumInscricaoEstadual(); + this.usuarioId = insc.getUsuarioId(); + } + + public Long getInscricaoestadualId() { + return inscricaoestadualId; + } + public void setInscricaoestadualId(Long inscricaoestadualId) { + this.inscricaoestadualId = inscricaoestadualId; + } + + public EstadoDispositivoEmbarcadaVO getEstado() { + return estado; + } + + public void setEstado(EstadoDispositivoEmbarcadaVO estado) { + this.estado = estado; + } + + public Boolean getActivo() { + return activo; + } + public void setActivo(Boolean activo) { + this.activo = activo; + } + public Date getFecmodif() { + return fecmodif; + } + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + public Integer getUsuarioId() { + return usuarioId; + } + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + public String getNumInscricaoEstadual() { + return numInscricaoEstadual; + } + public void setNumInscricaoEstadual(String numInscricaoEstadual) { + this.numInscricaoEstadual = numInscricaoEstadual; + } + public String getLogradouro() { + return logradouro; + } + public void setLogradouro(String logradouro) { + this.logradouro = logradouro; + } + public String getNumero() { + return numero; + } + public void setNumero(String numero) { + this.numero = numero; + } + public String getComplemento() { + return complemento; + } + public void setComplemento(String complemento) { + this.complemento = complemento; + } + public String getCep() { + return cep; + } + public void setCep(String cep) { + this.cep = cep; + } + public String getBairro() { + return bairro; + } + public void setBairro(String bairro) { + this.bairro = bairro; + } + public CidadeVO getCidade() { + return cidade; + } + public void setCidade(CidadeVO cidade) { + this.cidade = cidade; + } + public String getCnpj() { + return cnpj; + } + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + public String getEquivalenciaAG() { + return equivalenciaAG; + } + public void setEquivalenciaAG(String equivalenciaAG) { + this.equivalenciaAG = equivalenciaAG; + } + public Boolean getIsBPe() { + return isBPe; + } + public void setIsBPe(Boolean isBPe) { + this.isBPe = isBPe; + } + + public BigDecimal getPorctributo() { + return porctributo; + } + + public void setPorctributo(BigDecimal porctributo) { + this.porctributo = porctributo; + } + + public BigDecimal getTributacaoImportacao() { + return tributacaoImportacao; + } + + public void setTributacaoImportacao(BigDecimal tributacaoImportacao) { + this.tributacaoImportacao = tributacaoImportacao; + } + + public BigDecimal getTributacaoImportacaoIM() { + return tributacaoImportacaoIM; + } + + public void setTributacaoImportacaoIM(BigDecimal tributacaoImportacaoIM) { + this.tributacaoImportacaoIM = tributacaoImportacaoIM; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/OperadorEmbarcadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/OperadorEmbarcadaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/OperadorEmbarcadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/OperadorEmbarcadaVO.java index 742479678..4d6078c94 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/OperadorEmbarcadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/OperadorEmbarcadaVO.java @@ -1,115 +1,115 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -import java.util.List; - -import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; -import com.rjconsultores.ventaboletos.vo.ruta.RutaVO; - -public class OperadorEmbarcadaVO { - private Integer idOperador; - private String operador; - private String descOperador; - private Integer idAgencia; - private String descAgencia; - private Boolean indcorteautomatico; - private ListlsRutas; - private ListlsCorridas; - private List lsFormasPagamento; - private List lsSeguroTaxaEmbarque; - private List lsTiposPassagensBloqueadas; - //lista usadas nas consultas resumidas - private ListlistRutas; - private ListlistCorridas; - - public Integer getIdOperador() { - return idOperador; - } - public void setIdOperador(Integer idOperador) { - this.idOperador = idOperador; - } - public String getOperador() { - return operador; - } - public void setOperador(String operador) { - this.operador = operador; - } - public String getDescOperador() { - return descOperador; - } - public void setDescOperador(String descOperador) { - this.descOperador = descOperador; - } - public Integer getIdAgencia() { - return idAgencia; - } - public void setIdAgencia(Integer idAgencia) { - this.idAgencia = idAgencia; - } - public String getDescAgencia() { - return descAgencia; - } - public void setDescAgencia(String descAgencia) { - this.descAgencia = descAgencia; - } - public List getLsRutas() { - return lsRutas; - } - public void setLsRutas(List lsRutas) { - this.lsRutas = lsRutas; - } - public List getLsCorridas() { - return lsCorridas; - } - public void setLsCorridas(List lsCorridas) { - this.lsCorridas = lsCorridas; - } - - public Boolean getIndcorteautomatico() { - return indcorteautomatico; - } - - public void setIndcorteautomatico(Boolean indcorteautomatico) { - this.indcorteautomatico = indcorteautomatico; - } - - public List getListCorridas() { - return listCorridas; - } - - public void setListCorridas(List listCorridas) { - this.listCorridas = listCorridas; - } - - public List getListRutas() { - return listRutas; - } - - public void setListRutas(List listRutas) { - this.listRutas = listRutas; - } - - public List getLsFormasPagamento() { - return lsFormasPagamento; - } - - public void setLsFormasPagamento(List lsFormasPagamento) { - this.lsFormasPagamento = lsFormasPagamento; - } - - public List getLsSeguroTaxaEmbarque() { - return lsSeguroTaxaEmbarque; - } - - public void setLsSeguroTaxaEmbarque(List lsSeguroTaxaEmbarque) { - this.lsSeguroTaxaEmbarque = lsSeguroTaxaEmbarque; - } - - public List getLsTiposPassagensBloqueadas() { - return lsTiposPassagensBloqueadas; - } - - public void setLsTiposPassagensBloqueadas(List lsTiposPassagensBloqueadas) { - this.lsTiposPassagensBloqueadas = lsTiposPassagensBloqueadas; - } - -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +import java.util.List; + +import com.rjconsultores.ventaboletos.vo.corrida.CorridaVO; +import com.rjconsultores.ventaboletos.vo.ruta.RutaVO; + +public class OperadorEmbarcadaVO { + private Integer idOperador; + private String operador; + private String descOperador; + private Integer idAgencia; + private String descAgencia; + private Boolean indcorteautomatico; + private ListlsRutas; + private ListlsCorridas; + private List lsFormasPagamento; + private List lsSeguroTaxaEmbarque; + private List lsTiposPassagensBloqueadas; + //lista usadas nas consultas resumidas + private ListlistRutas; + private ListlistCorridas; + + public Integer getIdOperador() { + return idOperador; + } + public void setIdOperador(Integer idOperador) { + this.idOperador = idOperador; + } + public String getOperador() { + return operador; + } + public void setOperador(String operador) { + this.operador = operador; + } + public String getDescOperador() { + return descOperador; + } + public void setDescOperador(String descOperador) { + this.descOperador = descOperador; + } + public Integer getIdAgencia() { + return idAgencia; + } + public void setIdAgencia(Integer idAgencia) { + this.idAgencia = idAgencia; + } + public String getDescAgencia() { + return descAgencia; + } + public void setDescAgencia(String descAgencia) { + this.descAgencia = descAgencia; + } + public List getLsRutas() { + return lsRutas; + } + public void setLsRutas(List lsRutas) { + this.lsRutas = lsRutas; + } + public List getLsCorridas() { + return lsCorridas; + } + public void setLsCorridas(List lsCorridas) { + this.lsCorridas = lsCorridas; + } + + public Boolean getIndcorteautomatico() { + return indcorteautomatico; + } + + public void setIndcorteautomatico(Boolean indcorteautomatico) { + this.indcorteautomatico = indcorteautomatico; + } + + public List getListCorridas() { + return listCorridas; + } + + public void setListCorridas(List listCorridas) { + this.listCorridas = listCorridas; + } + + public List getListRutas() { + return listRutas; + } + + public void setListRutas(List listRutas) { + this.listRutas = listRutas; + } + + public List getLsFormasPagamento() { + return lsFormasPagamento; + } + + public void setLsFormasPagamento(List lsFormasPagamento) { + this.lsFormasPagamento = lsFormasPagamento; + } + + public List getLsSeguroTaxaEmbarque() { + return lsSeguroTaxaEmbarque; + } + + public void setLsSeguroTaxaEmbarque(List lsSeguroTaxaEmbarque) { + this.lsSeguroTaxaEmbarque = lsSeguroTaxaEmbarque; + } + + public List getLsTiposPassagensBloqueadas() { + return lsTiposPassagensBloqueadas; + } + + public void setLsTiposPassagensBloqueadas(List lsTiposPassagensBloqueadas) { + this.lsTiposPassagensBloqueadas = lsTiposPassagensBloqueadas; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/PtoVtaUsuarioUltimaVendaDispositivoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/PtoVtaUsuarioUltimaVendaDispositivoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/PtoVtaUsuarioUltimaVendaDispositivoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/PtoVtaUsuarioUltimaVendaDispositivoVO.java index 9490e4c62..5f160c183 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/PtoVtaUsuarioUltimaVendaDispositivoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/PtoVtaUsuarioUltimaVendaDispositivoVO.java @@ -1,55 +1,55 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class PtoVtaUsuarioUltimaVendaDispositivoVO { - private Long puntoventaId; - private Long usuarioId; - private String nombusuario; - private String nombpuntoventa; - private String imei; - - public PtoVtaUsuarioUltimaVendaDispositivoVO(){} - - public PtoVtaUsuarioUltimaVendaDispositivoVO(Long puntoventaId, Long usuarioId, String nombusuario, String nombpuntoventa, String imei) { - super(); - this.puntoventaId = puntoventaId; - this.usuarioId = usuarioId; - this.nombusuario = nombusuario; - this.nombpuntoventa = nombpuntoventa; - this.imei = imei; - } - - public Long getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Long puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public Long getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Long usuarioId) { - this.usuarioId = usuarioId; - } - - public String getNombusuario() { - return nombusuario; - } - public void setNombusuario(String nombusuario) { - this.nombusuario = nombusuario; - } - public String getNombpuntoventa() { - return nombpuntoventa; - } - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - public String getImei() { - return imei; - } - public void setImei(String imei) { - this.imei = imei; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class PtoVtaUsuarioUltimaVendaDispositivoVO { + private Long puntoventaId; + private Long usuarioId; + private String nombusuario; + private String nombpuntoventa; + private String imei; + + public PtoVtaUsuarioUltimaVendaDispositivoVO(){} + + public PtoVtaUsuarioUltimaVendaDispositivoVO(Long puntoventaId, Long usuarioId, String nombusuario, String nombpuntoventa, String imei) { + super(); + this.puntoventaId = puntoventaId; + this.usuarioId = usuarioId; + this.nombusuario = nombusuario; + this.nombpuntoventa = nombpuntoventa; + this.imei = imei; + } + + public Long getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Long puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Long getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Long usuarioId) { + this.usuarioId = usuarioId; + } + + public String getNombusuario() { + return nombusuario; + } + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + public String getNombpuntoventa() { + return nombpuntoventa; + } + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + public String getImei() { + return imei; + } + public void setImei(String imei) { + this.imei = imei; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/SeguroTaxaEmbarqueVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/SeguroTaxaEmbarqueVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/SeguroTaxaEmbarqueVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/SeguroTaxaEmbarqueVO.java index 74d7fa65c..553dd977c 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/SeguroTaxaEmbarqueVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/SeguroTaxaEmbarqueVO.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class SeguroTaxaEmbarqueVO { - private Integer empresaId; - private Boolean indVendeSeguroOpcEmbarcada; - private Boolean indVendeSeguroTabelaEmbarcada; - private Boolean indTaxaEmbarqueEmbarcada; - - public SeguroTaxaEmbarqueVO() { - - } - - public SeguroTaxaEmbarqueVO(Integer empresaId, Boolean indVendeSeguroOpcEmbarcada, Boolean indVendeSeguroTabelaEmbarcada, Boolean indTaxaEmbarqueEmbarcada) { - super(); - this.empresaId = empresaId; - this.indVendeSeguroOpcEmbarcada = indVendeSeguroOpcEmbarcada; - this.indVendeSeguroTabelaEmbarcada = indVendeSeguroTabelaEmbarcada; - this.indTaxaEmbarqueEmbarcada = indTaxaEmbarqueEmbarcada; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Boolean getIndVendeSeguroOpcEmbarcada() { - return indVendeSeguroOpcEmbarcada; - } - - public void setIndVendeSeguroOpcEmbarcada(Boolean indVendeSeguroOpcEmbarcada) { - this.indVendeSeguroOpcEmbarcada = indVendeSeguroOpcEmbarcada; - } - - public Boolean getIndVendeSeguroTabelaEmbarcada() { - return indVendeSeguroTabelaEmbarcada; - } - - public void setIndVendeSeguroTabelaEmbarcada(Boolean indVendeSeguroTabelaEmbarcada) { - this.indVendeSeguroTabelaEmbarcada = indVendeSeguroTabelaEmbarcada; - } - - public Boolean getIndTaxaEmbarqueEmbarcada() { - return indTaxaEmbarqueEmbarcada; - } - - public void setIndTaxaEmbarqueEmbarcada(Boolean indTaxaEmbarqueEmbarcada) { - this.indTaxaEmbarqueEmbarcada = indTaxaEmbarqueEmbarcada; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class SeguroTaxaEmbarqueVO { + private Integer empresaId; + private Boolean indVendeSeguroOpcEmbarcada; + private Boolean indVendeSeguroTabelaEmbarcada; + private Boolean indTaxaEmbarqueEmbarcada; + + public SeguroTaxaEmbarqueVO() { + + } + + public SeguroTaxaEmbarqueVO(Integer empresaId, Boolean indVendeSeguroOpcEmbarcada, Boolean indVendeSeguroTabelaEmbarcada, Boolean indTaxaEmbarqueEmbarcada) { + super(); + this.empresaId = empresaId; + this.indVendeSeguroOpcEmbarcada = indVendeSeguroOpcEmbarcada; + this.indVendeSeguroTabelaEmbarcada = indVendeSeguroTabelaEmbarcada; + this.indTaxaEmbarqueEmbarcada = indTaxaEmbarqueEmbarcada; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Boolean getIndVendeSeguroOpcEmbarcada() { + return indVendeSeguroOpcEmbarcada; + } + + public void setIndVendeSeguroOpcEmbarcada(Boolean indVendeSeguroOpcEmbarcada) { + this.indVendeSeguroOpcEmbarcada = indVendeSeguroOpcEmbarcada; + } + + public Boolean getIndVendeSeguroTabelaEmbarcada() { + return indVendeSeguroTabelaEmbarcada; + } + + public void setIndVendeSeguroTabelaEmbarcada(Boolean indVendeSeguroTabelaEmbarcada) { + this.indVendeSeguroTabelaEmbarcada = indVendeSeguroTabelaEmbarcada; + } + + public Boolean getIndTaxaEmbarqueEmbarcada() { + return indTaxaEmbarqueEmbarcada; + } + + public void setIndTaxaEmbarqueEmbarcada(Boolean indTaxaEmbarqueEmbarcada) { + this.indTaxaEmbarqueEmbarcada = indTaxaEmbarqueEmbarcada; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/SerieEmbarcada.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/SerieEmbarcada.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/SerieEmbarcada.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/SerieEmbarcada.java index 9d2bb471e..3545a2046 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/SerieEmbarcada.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/SerieEmbarcada.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; - -public class SerieEmbarcada { - private CtrlSerieEmbarcada ctrlSerieEmbarcada; - private String serie; - private String numero; - - public SerieEmbarcada() { - - } - - public CtrlSerieEmbarcada getCtrlSerieEmbarcada() { - return ctrlSerieEmbarcada; - } - - public void setCtrlSerieEmbarcada(CtrlSerieEmbarcada ctrlSerieEmbarcada) { - this.ctrlSerieEmbarcada = ctrlSerieEmbarcada; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - @Override - public String toString() { - return "SerieEmbarcada [ctrlSerieEmbarcadaId=" + (ctrlSerieEmbarcada == null ? "null" : ctrlSerieEmbarcada.getCtrlSerieEmbarcadaId()) + ", serie=" + serie + ", numero=" + numero + "]"; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +import com.rjconsultores.ventaboletos.entidad.CtrlSerieEmbarcada; + +public class SerieEmbarcada { + private CtrlSerieEmbarcada ctrlSerieEmbarcada; + private String serie; + private String numero; + + public SerieEmbarcada() { + + } + + public CtrlSerieEmbarcada getCtrlSerieEmbarcada() { + return ctrlSerieEmbarcada; + } + + public void setCtrlSerieEmbarcada(CtrlSerieEmbarcada ctrlSerieEmbarcada) { + this.ctrlSerieEmbarcada = ctrlSerieEmbarcada; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + @Override + public String toString() { + return "SerieEmbarcada [ctrlSerieEmbarcadaId=" + (ctrlSerieEmbarcada == null ? "null" : ctrlSerieEmbarcada.getCtrlSerieEmbarcadaId()) + ", serie=" + serie + ", numero=" + numero + "]"; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/TiposPassagensBloqueadasVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/TiposPassagensBloqueadasVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/TiposPassagensBloqueadasVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/TiposPassagensBloqueadasVO.java index 4d2479c24..5bd13eb11 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/TiposPassagensBloqueadasVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/TiposPassagensBloqueadasVO.java @@ -1,42 +1,42 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class TiposPassagensBloqueadasVO { - private Integer categoriaId; - private Integer usuarioId; - private Integer empresaId; - - public TiposPassagensBloqueadasVO() { - - } - - public TiposPassagensBloqueadasVO(Integer categoriaId, Integer usuarioId, Integer empresaId) { - super(); - this.categoriaId = categoriaId; - this.usuarioId = usuarioId; - this.empresaId = empresaId; - } - - public Integer getCategoriaId() { - return categoriaId; - } - - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - - public Integer getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Integer usuarioId) { - this.usuarioId = usuarioId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class TiposPassagensBloqueadasVO { + private Integer categoriaId; + private Integer usuarioId; + private Integer empresaId; + + public TiposPassagensBloqueadasVO() { + + } + + public TiposPassagensBloqueadasVO(Integer categoriaId, Integer usuarioId, Integer empresaId) { + super(); + this.categoriaId = categoriaId; + this.usuarioId = usuarioId; + this.empresaId = empresaId; + } + + public Integer getCategoriaId() { + return categoriaId; + } + + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/embarcada/UsuarioEmbarcadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/UsuarioEmbarcadaVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/embarcada/UsuarioEmbarcadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/UsuarioEmbarcadaVO.java index 8bc66b944..f43a6ca44 100644 --- a/src/com/rjconsultores/ventaboletos/vo/embarcada/UsuarioEmbarcadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/embarcada/UsuarioEmbarcadaVO.java @@ -1,71 +1,71 @@ -package com.rjconsultores.ventaboletos.vo.embarcada; - -public class UsuarioEmbarcadaVO { - private Long usuarioId; - private String nome; - private String cveusuario; - private String senha; - private String email; - - public UsuarioEmbarcadaVO() { - } - - public UsuarioEmbarcadaVO(Long usuarioId, String nome, String cveusuario, String senha, String email) { - super(); - this.usuarioId = usuarioId; - this.nome = nome; - this.cveusuario = cveusuario; - this.senha = senha; - this.email = email; - } - - public Long getUsuarioId() { - return usuarioId; - } - - public void setUsuarioId(Long usuarioId) { - this.usuarioId = usuarioId; - } - - public String getNome() { - return nome; - } - - public void setNome(String nome) { - this.nome = nome; - } - - public String getCveusuario() { - return cveusuario; - } - - public void setCveusuario(String cveusuario) { - this.cveusuario = cveusuario; - } - - public String getSenha() { - return senha; - } - - public void setSenha(String senha) { - this.senha = senha; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - @Override - public boolean equals(Object obj) { - if (((UsuarioEmbarcadaVO) obj).usuarioId != null && usuarioId != null && - ((UsuarioEmbarcadaVO) obj).usuarioId.intValue() == usuarioId.intValue()) { - return true; - } - - return false; - } -} +package com.rjconsultores.ventaboletos.vo.embarcada; + +public class UsuarioEmbarcadaVO { + private Long usuarioId; + private String nome; + private String cveusuario; + private String senha; + private String email; + + public UsuarioEmbarcadaVO() { + } + + public UsuarioEmbarcadaVO(Long usuarioId, String nome, String cveusuario, String senha, String email) { + super(); + this.usuarioId = usuarioId; + this.nome = nome; + this.cveusuario = cveusuario; + this.senha = senha; + this.email = email; + } + + public Long getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Long usuarioId) { + this.usuarioId = usuarioId; + } + + public String getNome() { + return nome; + } + + public void setNome(String nome) { + this.nome = nome; + } + + public String getCveusuario() { + return cveusuario; + } + + public void setCveusuario(String cveusuario) { + this.cveusuario = cveusuario; + } + + public String getSenha() { + return senha; + } + + public void setSenha(String senha) { + this.senha = senha; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public boolean equals(Object obj) { + if (((UsuarioEmbarcadaVO) obj).usuarioId != null && usuarioId != null && + ((UsuarioEmbarcadaVO) obj).usuarioId.intValue() == usuarioId.intValue()) { + return true; + } + + return false; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/RutaTramoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/RutaTramoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/RutaTramoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/RutaTramoVO.java index 02ee5c066..c8c58afd2 100644 --- a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/RutaTramoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/RutaTramoVO.java @@ -1,192 +1,192 @@ -package com.rjconsultores.ventaboletos.vo.esquemaoperacional; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.ParadaSecuenciaCombinacaoLinha; - -public class RutaTramoVO { - - private Boolean ventaHandHeld; - private Boolean solicitaNombrePasajero; - private ClaseServicio claseServicio; - private ClaseServicio claseServicioRutaOrigem; - private OrgaoConcedente orgaoConcedente; - private List lsSecuenciaRutaTramoVO; - private List lsCombinacionRutaTramoVO; - private List lsEmpresa; - private CoeficienteTarifa coeficienteDefault1; - private CoeficienteTarifa coeficienteDefault2; - private CoeficienteTarifa coeficienteDefault3; - private String prefixo; - private String descRuta; - private Boolean indSentidoIda; - private String numRuta; - private List lsParadaSecuenciaCombinacaoLinhas; - - public RutaTramoVO() { - lsSecuenciaRutaTramoVO = new ArrayList(); - lsEmpresa = new ArrayList(); - lsCombinacionRutaTramoVO = new ArrayList(); - } - - public Boolean getVentaHandHeld() { - return ventaHandHeld; - } - - public void setVentaHandHeld(Boolean ventaHandHeld) { - this.ventaHandHeld = ventaHandHeld; - } - - public Boolean getSolicitaNombrePasajero() { - return solicitaNombrePasajero; - } - - public void setSolicitaNombrePasajero(Boolean solicitaNombrePasajero) { - this.solicitaNombrePasajero = solicitaNombrePasajero; - } - - public ClaseServicio getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(ClaseServicio claseServicio) { - this.claseServicio = claseServicio; - } - - public OrgaoConcedente getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - - public String getNumRuta() { - return numRuta; - } - - public void setNumRuta(String numRuta) { - this.numRuta = numRuta; - } - - /** - * Regresa una unmodifiable list - * - * @return - */ - public List getLsSecuenciaRutaTramoVO() { - return Collections.unmodifiableList(lsSecuenciaRutaTramoVO); - } - - public void setLsSecuenciaRutaTramoVO(List lsSecuenciaRutaTramoVO) { - this.lsSecuenciaRutaTramoVO = lsSecuenciaRutaTramoVO; - } - - /** - * Regresa una unmodifiable list - * - * @return - */ - public List getLsCombinacionRutaTramoVO() { - return Collections.unmodifiableList(lsCombinacionRutaTramoVO); - } - - public void setLsCombinacionRutaTramoVO(List lsCombinacionRutaTramoVO) { - this.lsCombinacionRutaTramoVO = lsCombinacionRutaTramoVO; - } - - public List getLsEmpresa() { - return lsEmpresa; - } - - public void setLsEmpresa(List lsEmpresa) { - this.lsEmpresa = lsEmpresa; - } - - public String getPrefixo() { - return prefixo; - } - - public void setPrefixo(String prefixo) { - this.prefixo = prefixo; - } - - public String getDescRuta() { - return descRuta; - } - - public void setDescRuta(String descRuta) { - this.descRuta = descRuta; - } - - public Boolean getIndSentidoIda() { - return indSentidoIda; - } - - public void setIndSentidoIda(Boolean indSentidoIda) { - this.indSentidoIda = indSentidoIda; - } - - public CoeficienteTarifa getCoeficienteDefault1() { - return coeficienteDefault1; - } - - public void setCoeficienteDefaul1(CoeficienteTarifa coeficienteDefault1) { - this.coeficienteDefault1 = coeficienteDefault1; - } - - public CoeficienteTarifa getCoeficienteDefault2() { - return coeficienteDefault2; - } - - public void setCoeficienteDefaul2(CoeficienteTarifa coeficienteDefault2) { - this.coeficienteDefault2 = coeficienteDefault2; - } - - public CoeficienteTarifa getCoeficienteDefault3() { - return coeficienteDefault3; - } - - public void setCoeficienteDefaul3(CoeficienteTarifa coeficienteDefault3) { - this.coeficienteDefault3 = coeficienteDefault3; - } - - public List getLsParadaSecuenciaCombinacaoLinhas() { - return lsParadaSecuenciaCombinacaoLinhas; - } - - public void setLsParadaSecuenciaCombinacaoLinhas(List lsParadaSecuenciaCombinacaoLinhas) { - this.lsParadaSecuenciaCombinacaoLinhas = lsParadaSecuenciaCombinacaoLinhas; - } - - - - public ClaseServicio getClaseServicioRutaOrigem() { - return claseServicioRutaOrigem; - } - - public void setClaseServicioRutaOrigem(ClaseServicio claseServicioRutaOrigem) { - this.claseServicioRutaOrigem = claseServicioRutaOrigem; - } - - public Map getParadasComKmEntradaSaida(){ - Map kmEntradaSaida = new HashMap(); - for (SecuenciaRutaTramoVO s : getLsSecuenciaRutaTramoVO()){ - if (s.getKmSaidaOrigen() != null && s.getKmSaidaOrigen().compareTo(BigDecimal.ZERO) == 1){ - kmEntradaSaida.put(s.getOrigen(), s.getKmSaidaOrigen()); - } - } - return kmEntradaSaida; - } -} +package com.rjconsultores.ventaboletos.vo.esquemaoperacional; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.ParadaSecuenciaCombinacaoLinha; + +public class RutaTramoVO { + + private Boolean ventaHandHeld; + private Boolean solicitaNombrePasajero; + private ClaseServicio claseServicio; + private ClaseServicio claseServicioRutaOrigem; + private OrgaoConcedente orgaoConcedente; + private List lsSecuenciaRutaTramoVO; + private List lsCombinacionRutaTramoVO; + private List lsEmpresa; + private CoeficienteTarifa coeficienteDefault1; + private CoeficienteTarifa coeficienteDefault2; + private CoeficienteTarifa coeficienteDefault3; + private String prefixo; + private String descRuta; + private Boolean indSentidoIda; + private String numRuta; + private List lsParadaSecuenciaCombinacaoLinhas; + + public RutaTramoVO() { + lsSecuenciaRutaTramoVO = new ArrayList(); + lsEmpresa = new ArrayList(); + lsCombinacionRutaTramoVO = new ArrayList(); + } + + public Boolean getVentaHandHeld() { + return ventaHandHeld; + } + + public void setVentaHandHeld(Boolean ventaHandHeld) { + this.ventaHandHeld = ventaHandHeld; + } + + public Boolean getSolicitaNombrePasajero() { + return solicitaNombrePasajero; + } + + public void setSolicitaNombrePasajero(Boolean solicitaNombrePasajero) { + this.solicitaNombrePasajero = solicitaNombrePasajero; + } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + + public String getNumRuta() { + return numRuta; + } + + public void setNumRuta(String numRuta) { + this.numRuta = numRuta; + } + + /** + * Regresa una unmodifiable list + * + * @return + */ + public List getLsSecuenciaRutaTramoVO() { + return Collections.unmodifiableList(lsSecuenciaRutaTramoVO); + } + + public void setLsSecuenciaRutaTramoVO(List lsSecuenciaRutaTramoVO) { + this.lsSecuenciaRutaTramoVO = lsSecuenciaRutaTramoVO; + } + + /** + * Regresa una unmodifiable list + * + * @return + */ + public List getLsCombinacionRutaTramoVO() { + return Collections.unmodifiableList(lsCombinacionRutaTramoVO); + } + + public void setLsCombinacionRutaTramoVO(List lsCombinacionRutaTramoVO) { + this.lsCombinacionRutaTramoVO = lsCombinacionRutaTramoVO; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public String getPrefixo() { + return prefixo; + } + + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } + + public String getDescRuta() { + return descRuta; + } + + public void setDescRuta(String descRuta) { + this.descRuta = descRuta; + } + + public Boolean getIndSentidoIda() { + return indSentidoIda; + } + + public void setIndSentidoIda(Boolean indSentidoIda) { + this.indSentidoIda = indSentidoIda; + } + + public CoeficienteTarifa getCoeficienteDefault1() { + return coeficienteDefault1; + } + + public void setCoeficienteDefaul1(CoeficienteTarifa coeficienteDefault1) { + this.coeficienteDefault1 = coeficienteDefault1; + } + + public CoeficienteTarifa getCoeficienteDefault2() { + return coeficienteDefault2; + } + + public void setCoeficienteDefaul2(CoeficienteTarifa coeficienteDefault2) { + this.coeficienteDefault2 = coeficienteDefault2; + } + + public CoeficienteTarifa getCoeficienteDefault3() { + return coeficienteDefault3; + } + + public void setCoeficienteDefaul3(CoeficienteTarifa coeficienteDefault3) { + this.coeficienteDefault3 = coeficienteDefault3; + } + + public List getLsParadaSecuenciaCombinacaoLinhas() { + return lsParadaSecuenciaCombinacaoLinhas; + } + + public void setLsParadaSecuenciaCombinacaoLinhas(List lsParadaSecuenciaCombinacaoLinhas) { + this.lsParadaSecuenciaCombinacaoLinhas = lsParadaSecuenciaCombinacaoLinhas; + } + + + + public ClaseServicio getClaseServicioRutaOrigem() { + return claseServicioRutaOrigem; + } + + public void setClaseServicioRutaOrigem(ClaseServicio claseServicioRutaOrigem) { + this.claseServicioRutaOrigem = claseServicioRutaOrigem; + } + + public Map getParadasComKmEntradaSaida(){ + Map kmEntradaSaida = new HashMap(); + for (SecuenciaRutaTramoVO s : getLsSecuenciaRutaTramoVO()){ + if (s.getKmSaidaOrigen() != null && s.getKmSaidaOrigen().compareTo(BigDecimal.ZERO) == 1){ + kmEntradaSaida.put(s.getOrigen(), s.getKmSaidaOrigen()); + } + } + return kmEntradaSaida; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoCoeficienteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoCoeficienteVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoCoeficienteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoCoeficienteVO.java index c0a961028..a9507206b 100644 --- a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoCoeficienteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoCoeficienteVO.java @@ -1,273 +1,273 @@ -package com.rjconsultores.ventaboletos.vo.esquemaoperacional; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Via; -import com.rjconsultores.ventaboletos.utilerias.HoraSistema; - -public class SecuenciaRutaTramoCoeficienteVO { - - private Parada origen; - private Parada destino; - private Via via; - private Integer secuencia; - private BigDecimal kmReal; - private BigDecimal kmSaidaOrigen; - private BigDecimal kmEntradaDestino; - private HoraSistema tiempoRecorrido; - private Integer tramoId; - private Integer tramoServicioId; - private String numRuta; - private Integer orgaoTramoId; - private CoeficienteTarifa coeficienteTarifa1; - private BigDecimal kmCoeficiente1; - private CoeficienteTarifa coeficienteTarifa2; - private BigDecimal kmCoeficiente2; - private CoeficienteTarifa coeficienteTarifa3; - private BigDecimal kmCoeficiente3; - private Boolean permiteVenda; - private Boolean claseServicioRutaOrigemUtilizadaNaPesquisa; - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido) { - super(); - this.origen = origen; - this.destino = destino; - this.via = via; - this.secuencia = secuencia; - this.kmReal = kmReal; - this.setTiempoRecorrido(tiempoRecorrido); - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); - this.numRuta = numruta; - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta, BigDecimal kmSaidaOrigen) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); - this.numRuta = numruta; - this.kmSaidaOrigen = kmSaidaOrigen; - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Integer secuencia, Via via) { - super(); - this.origen = origen; - this.destino = destino; - this.secuencia = secuencia; - this.via = via; - this.setTiempoRecorrido(null); - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Integer secuencia, Via via, String numruta) { - this(origen, destino, secuencia, via); - this.numRuta = numruta; - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, - HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId) { - super(); - this.origen = origen; - this.destino = destino; - this.via = via; - this.secuencia = secuencia; - this.kmReal = kmReal; - this.setTiempoRecorrido(tiempoRecorrido); - this.tramoId = tramoId; - this.tramoServicioId = tramoId; - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, - HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); - this.numRuta = numruta; - } - - public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, - HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta, BigDecimal kmSaidaOrigen) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); - this.numRuta = numruta; - this.kmSaidaOrigen = kmSaidaOrigen; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public HoraSistema getTiempoRecorrido() { - return tiempoRecorrido; - } - - public void setTiempoRecorrido(HoraSistema tiempoRecorrido) { - if (tiempoRecorrido == null) { - tiempoRecorrido = new HoraSistema(); - } - this.tiempoRecorrido = tiempoRecorrido; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Via getVia() { - return via; - } - - public void setVia(Via via) { - this.via = via; - } - - public Integer getSecuencia() { - return secuencia; - } - - public void setSecuencia(Integer secuencia) { - this.secuencia = secuencia; - } - - public BigDecimal getKmReal() { - return kmReal; - } - - public void setKmReal(BigDecimal kmReal) { - this.kmReal = kmReal; - } - - public Integer getTramoId() { - return tramoId; - } - - public void setTramoId(Integer tramoId) { - this.tramoId = tramoId; - } - - public Integer getTramoServicioId() { - return tramoServicioId; - } - - public void setTramoServicioId(Integer tramoServicioId) { - this.tramoServicioId = tramoServicioId; - } - - public String getNumRuta() { - return numRuta; - } - - public void setNumRuta(String numRuta) { - this.numRuta = numRuta; - } - - @Override - public String toString() { - HoraSistema hora = getTiempoRecorrido(); - - return secuencia + ";" + origen + ";" + destino + ";" + via + ";" + kmReal + ";" - + ((hora != null) ? hora.getHora() : "-") + ";" + ((hora != null) ? hora.getMinuto() : "-"); - } - - public Integer getOrgaoTramoId() { - return orgaoTramoId; - } - - public void setOrgaoTramoId(Integer orgaoTramoId) { - this.orgaoTramoId = orgaoTramoId; - } - - public CoeficienteTarifa getCoeficienteTarifa1() { - return coeficienteTarifa1; - } - - public void setCoeficienteTarifa1(CoeficienteTarifa coeficienteTarifa1) { - this.coeficienteTarifa1 = coeficienteTarifa1; - } - - public BigDecimal getKmCoeficiente1() { - return kmCoeficiente1; - } - - public void setKmCoeficiente1(BigDecimal kmCoeficiente1) { - this.kmCoeficiente1 = kmCoeficiente1; - } - - public CoeficienteTarifa getCoeficienteTarifa2() { - return coeficienteTarifa2; - } - - public void setCoeficienteTarifa2(CoeficienteTarifa coeficienteTarifa2) { - this.coeficienteTarifa2 = coeficienteTarifa2; - } - - public BigDecimal getKmCoeficiente2() { - return kmCoeficiente2; - } - - public void setKmCoeficiente2(BigDecimal kmCoeficiente2) { - this.kmCoeficiente2 = kmCoeficiente2; - } - - public CoeficienteTarifa getCoeficienteTarifa3() { - return coeficienteTarifa3; - } - - public void setCoeficienteTarifa3(CoeficienteTarifa coeficienteTarifa3) { - this.coeficienteTarifa3 = coeficienteTarifa3; - } - - public BigDecimal getKmCoeficiente3() { - return kmCoeficiente3; - } - - public void setKmCoeficiente3(BigDecimal kmCoeficiente3) { - this.kmCoeficiente3 = kmCoeficiente3; - } - - public Boolean getPermiteVenda() { - return permiteVenda; - } - - public void setPermiteVenda(Boolean permiteVenda) { - this.permiteVenda = permiteVenda; - } - - public BigDecimal getKmSaidaOrigen() { - return kmSaidaOrigen; - } - - public void setKmSaidaOrigen(BigDecimal kmSaidaOrigen) { - this.kmSaidaOrigen = kmSaidaOrigen; - } - - /** - * @return the kmEntradaDestino - */ - public BigDecimal getKmEntradaDestino() { - return kmEntradaDestino; - } - - /** - * @param kmEntradaDestino the kmEntradaDestino to set - */ - public void setKmEntradaDestino(BigDecimal kmEntradaDestino) { - this.kmEntradaDestino = kmEntradaDestino; - } - - public Boolean getClaseServicioRutaOrigemUtilizadaNaPesquisa() { - return claseServicioRutaOrigemUtilizadaNaPesquisa==null?false:claseServicioRutaOrigemUtilizadaNaPesquisa; - } - - public void setClaseServicioRutaOrigemUtilizadaNaPesquisa(Boolean claseServicioRutaOrigemUtilizadaNaPesquisa) { - this.claseServicioRutaOrigemUtilizadaNaPesquisa = claseServicioRutaOrigemUtilizadaNaPesquisa; - } - - - -} +package com.rjconsultores.ventaboletos.vo.esquemaoperacional; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.entidad.CoeficienteTarifa; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Via; +import com.rjconsultores.ventaboletos.utilerias.HoraSistema; + +public class SecuenciaRutaTramoCoeficienteVO { + + private Parada origen; + private Parada destino; + private Via via; + private Integer secuencia; + private BigDecimal kmReal; + private BigDecimal kmSaidaOrigen; + private BigDecimal kmEntradaDestino; + private HoraSistema tiempoRecorrido; + private Integer tramoId; + private Integer tramoServicioId; + private String numRuta; + private Integer orgaoTramoId; + private CoeficienteTarifa coeficienteTarifa1; + private BigDecimal kmCoeficiente1; + private CoeficienteTarifa coeficienteTarifa2; + private BigDecimal kmCoeficiente2; + private CoeficienteTarifa coeficienteTarifa3; + private BigDecimal kmCoeficiente3; + private Boolean permiteVenda; + private Boolean claseServicioRutaOrigemUtilizadaNaPesquisa; + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido) { + super(); + this.origen = origen; + this.destino = destino; + this.via = via; + this.secuencia = secuencia; + this.kmReal = kmReal; + this.setTiempoRecorrido(tiempoRecorrido); + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); + this.numRuta = numruta; + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta, BigDecimal kmSaidaOrigen) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); + this.numRuta = numruta; + this.kmSaidaOrigen = kmSaidaOrigen; + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Integer secuencia, Via via) { + super(); + this.origen = origen; + this.destino = destino; + this.secuencia = secuencia; + this.via = via; + this.setTiempoRecorrido(null); + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Integer secuencia, Via via, String numruta) { + this(origen, destino, secuencia, via); + this.numRuta = numruta; + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, + HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId) { + super(); + this.origen = origen; + this.destino = destino; + this.via = via; + this.secuencia = secuencia; + this.kmReal = kmReal; + this.setTiempoRecorrido(tiempoRecorrido); + this.tramoId = tramoId; + this.tramoServicioId = tramoId; + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, + HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); + this.numRuta = numruta; + } + + public SecuenciaRutaTramoCoeficienteVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, + HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta, BigDecimal kmSaidaOrigen) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); + this.numRuta = numruta; + this.kmSaidaOrigen = kmSaidaOrigen; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public HoraSistema getTiempoRecorrido() { + return tiempoRecorrido; + } + + public void setTiempoRecorrido(HoraSistema tiempoRecorrido) { + if (tiempoRecorrido == null) { + tiempoRecorrido = new HoraSistema(); + } + this.tiempoRecorrido = tiempoRecorrido; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Via getVia() { + return via; + } + + public void setVia(Via via) { + this.via = via; + } + + public Integer getSecuencia() { + return secuencia; + } + + public void setSecuencia(Integer secuencia) { + this.secuencia = secuencia; + } + + public BigDecimal getKmReal() { + return kmReal; + } + + public void setKmReal(BigDecimal kmReal) { + this.kmReal = kmReal; + } + + public Integer getTramoId() { + return tramoId; + } + + public void setTramoId(Integer tramoId) { + this.tramoId = tramoId; + } + + public Integer getTramoServicioId() { + return tramoServicioId; + } + + public void setTramoServicioId(Integer tramoServicioId) { + this.tramoServicioId = tramoServicioId; + } + + public String getNumRuta() { + return numRuta; + } + + public void setNumRuta(String numRuta) { + this.numRuta = numRuta; + } + + @Override + public String toString() { + HoraSistema hora = getTiempoRecorrido(); + + return secuencia + ";" + origen + ";" + destino + ";" + via + ";" + kmReal + ";" + + ((hora != null) ? hora.getHora() : "-") + ";" + ((hora != null) ? hora.getMinuto() : "-"); + } + + public Integer getOrgaoTramoId() { + return orgaoTramoId; + } + + public void setOrgaoTramoId(Integer orgaoTramoId) { + this.orgaoTramoId = orgaoTramoId; + } + + public CoeficienteTarifa getCoeficienteTarifa1() { + return coeficienteTarifa1; + } + + public void setCoeficienteTarifa1(CoeficienteTarifa coeficienteTarifa1) { + this.coeficienteTarifa1 = coeficienteTarifa1; + } + + public BigDecimal getKmCoeficiente1() { + return kmCoeficiente1; + } + + public void setKmCoeficiente1(BigDecimal kmCoeficiente1) { + this.kmCoeficiente1 = kmCoeficiente1; + } + + public CoeficienteTarifa getCoeficienteTarifa2() { + return coeficienteTarifa2; + } + + public void setCoeficienteTarifa2(CoeficienteTarifa coeficienteTarifa2) { + this.coeficienteTarifa2 = coeficienteTarifa2; + } + + public BigDecimal getKmCoeficiente2() { + return kmCoeficiente2; + } + + public void setKmCoeficiente2(BigDecimal kmCoeficiente2) { + this.kmCoeficiente2 = kmCoeficiente2; + } + + public CoeficienteTarifa getCoeficienteTarifa3() { + return coeficienteTarifa3; + } + + public void setCoeficienteTarifa3(CoeficienteTarifa coeficienteTarifa3) { + this.coeficienteTarifa3 = coeficienteTarifa3; + } + + public BigDecimal getKmCoeficiente3() { + return kmCoeficiente3; + } + + public void setKmCoeficiente3(BigDecimal kmCoeficiente3) { + this.kmCoeficiente3 = kmCoeficiente3; + } + + public Boolean getPermiteVenda() { + return permiteVenda; + } + + public void setPermiteVenda(Boolean permiteVenda) { + this.permiteVenda = permiteVenda; + } + + public BigDecimal getKmSaidaOrigen() { + return kmSaidaOrigen; + } + + public void setKmSaidaOrigen(BigDecimal kmSaidaOrigen) { + this.kmSaidaOrigen = kmSaidaOrigen; + } + + /** + * @return the kmEntradaDestino + */ + public BigDecimal getKmEntradaDestino() { + return kmEntradaDestino; + } + + /** + * @param kmEntradaDestino the kmEntradaDestino to set + */ + public void setKmEntradaDestino(BigDecimal kmEntradaDestino) { + this.kmEntradaDestino = kmEntradaDestino; + } + + public Boolean getClaseServicioRutaOrigemUtilizadaNaPesquisa() { + return claseServicioRutaOrigemUtilizadaNaPesquisa==null?false:claseServicioRutaOrigemUtilizadaNaPesquisa; + } + + public void setClaseServicioRutaOrigemUtilizadaNaPesquisa(Boolean claseServicioRutaOrigemUtilizadaNaPesquisa) { + this.claseServicioRutaOrigemUtilizadaNaPesquisa = claseServicioRutaOrigemUtilizadaNaPesquisa; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoVO.java index f1fafe05c..bbbc2645c 100644 --- a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/SecuenciaRutaTramoVO.java @@ -1,225 +1,225 @@ -package com.rjconsultores.ventaboletos.vo.esquemaoperacional; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Via; -import com.rjconsultores.ventaboletos.utilerias.HoraSistema; - -public class SecuenciaRutaTramoVO implements Comparable{ - - private Parada origen; - private Parada destino; - private Via via; - private Integer secuencia; - private BigDecimal kmReal; - private BigDecimal kmSaidaOrigen; - private BigDecimal kmEntradaDestino; - private HoraSistema tiempoRecorrido; - private Integer tramoId; - private Integer tramoServicioId; - private Boolean indSentidoIda; - private String numRuta; - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido) { - super(); - this.origen = origen; - this.destino = destino; - this.via = via; - this.secuencia = secuencia; - this.kmReal = kmReal; - this.setTiempoRecorrido(tiempoRecorrido); - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta, Boolean indSentidoIda) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); - this.numRuta = numruta; - this.indSentidoIda = indSentidoIda; - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta, Boolean indSentidoIda, BigDecimal kmSaidaOrigen) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); - this.numRuta = numruta; - this.indSentidoIda = indSentidoIda; - this.kmSaidaOrigen = kmSaidaOrigen; - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Integer secuencia, Via via) { - super(); - this.origen = origen; - this.destino = destino; - this.secuencia = secuencia; - this.via = via; - this.setTiempoRecorrido(null); - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Integer secuencia, Via via, String numruta, Boolean indSentidoIda) { - this(origen, destino, secuencia, via); - this.numRuta = numruta; - this.indSentidoIda = indSentidoIda; - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, - HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId) { - super(); - this.origen = origen; - this.destino = destino; - this.via = via; - this.secuencia = secuencia; - this.kmReal = kmReal; - this.setTiempoRecorrido(tiempoRecorrido); - this.tramoId = tramoId; - this.tramoServicioId = tramoId; - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, - HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta, Boolean indSentidoIda) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); - this.numRuta = numruta; - this.indSentidoIda = indSentidoIda; - } - - public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, - HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta, Boolean indSentidoIda, BigDecimal kmSaidaOrigen) { - this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); - this.numRuta = numruta; - this.indSentidoIda = indSentidoIda; - this.kmSaidaOrigen = kmSaidaOrigen; - } - - public Parada getOrigen() { - return origen; - } - - public void setOrigen(Parada origen) { - this.origen = origen; - } - - public Parada getDestino() { - return destino; - } - - public HoraSistema getTiempoRecorrido() { - return tiempoRecorrido; - } - - public void setTiempoRecorrido(HoraSistema tiempoRecorrido) { - if (tiempoRecorrido == null) { - tiempoRecorrido = new HoraSistema(); - } - this.tiempoRecorrido = tiempoRecorrido; - } - - public void setDestino(Parada destino) { - this.destino = destino; - } - - public Via getVia() { - return via; - } - - public void setVia(Via via) { - this.via = via; - } - - public Integer getSecuencia() { - return secuencia; - } - - public void setSecuencia(Integer secuencia) { - this.secuencia = secuencia; - } - - public BigDecimal getKmReal() { - return kmReal; - } - - public void setKmReal(BigDecimal kmReal) { - this.kmReal = kmReal; - } - - public Integer getTramoId() { - return tramoId; - } - - public void setTramoId(Integer tramoId) { - this.tramoId = tramoId; - } - - public Integer getTramoServicioId() { - return tramoServicioId; - } - - public void setTramoServicioId(Integer tramoServicioId) { - this.tramoServicioId = tramoServicioId; - } - - public Boolean getIndSentidoIda() { - return indSentidoIda; - } - - public void setIndSentidoIda(Boolean indSentidoIda) { - this.indSentidoIda = indSentidoIda; - } - - public String getNumRuta() { - return numRuta; - } - - public void setNumRuta(String numRuta) { - this.numRuta = numRuta; - } - - public BigDecimal getKmSaidaOrigen() { - return kmSaidaOrigen; - } - - public void setKmSaidaOrigen(BigDecimal kmSaidaOrigen) { - this.kmSaidaOrigen = kmSaidaOrigen; - } - - @Override - public String toString() { - HoraSistema hora = getTiempoRecorrido(); - - return secuencia + ";" + origen + ";" + destino + ";" + via + ";" + kmReal + ";" - + ((hora != null) ? hora.getHora() : "-") + ";" + ((hora != null) ? hora.getMinuto() : "-"); - } - - @Override - public int compareTo(SecuenciaRutaTramoVO o) { - return this.getSecuencia().compareTo(o.getSecuencia()); - } - - /** - * @return the kmEntradaDestino - */ - public BigDecimal getKmEntradaDestino() { - return kmEntradaDestino; - } - - /** - * método retorna valor de km sem considerar a distancia de entrada e saída da localidade. - * - * @return - */ - public BigDecimal getKmOriginal() { - return kmReal.subtract(kmEntradaDestino == null ? BigDecimal.ZERO : kmEntradaDestino).subtract(kmSaidaOrigen == null ? BigDecimal.ZERO : kmSaidaOrigen); - } - - /** - * método retorna valor de km sem considerar a distancia de entrada e saída da localidade. - * - * @return - */ - public BigDecimal getKmEntradaSaida() { - return (kmEntradaDestino == null ? BigDecimal.ZERO : kmEntradaDestino).add(kmSaidaOrigen == null ? BigDecimal.ZERO : kmSaidaOrigen); - } - - /** - * @param kmEntradaDestino the kmEntradaDestino to set - */ - public void setKmEntradaDestino(BigDecimal kmEntradaDestino) { - this.kmEntradaDestino = kmEntradaDestino; - } -} +package com.rjconsultores.ventaboletos.vo.esquemaoperacional; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Via; +import com.rjconsultores.ventaboletos.utilerias.HoraSistema; + +public class SecuenciaRutaTramoVO implements Comparable{ + + private Parada origen; + private Parada destino; + private Via via; + private Integer secuencia; + private BigDecimal kmReal; + private BigDecimal kmSaidaOrigen; + private BigDecimal kmEntradaDestino; + private HoraSistema tiempoRecorrido; + private Integer tramoId; + private Integer tramoServicioId; + private Boolean indSentidoIda; + private String numRuta; + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido) { + super(); + this.origen = origen; + this.destino = destino; + this.via = via; + this.secuencia = secuencia; + this.kmReal = kmReal; + this.setTiempoRecorrido(tiempoRecorrido); + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta, Boolean indSentidoIda) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); + this.numRuta = numruta; + this.indSentidoIda = indSentidoIda; + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, HoraSistema tiempoRecorrido, String numruta, Boolean indSentidoIda, BigDecimal kmSaidaOrigen) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido); + this.numRuta = numruta; + this.indSentidoIda = indSentidoIda; + this.kmSaidaOrigen = kmSaidaOrigen; + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Integer secuencia, Via via) { + super(); + this.origen = origen; + this.destino = destino; + this.secuencia = secuencia; + this.via = via; + this.setTiempoRecorrido(null); + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Integer secuencia, Via via, String numruta, Boolean indSentidoIda) { + this(origen, destino, secuencia, via); + this.numRuta = numruta; + this.indSentidoIda = indSentidoIda; + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, + HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId) { + super(); + this.origen = origen; + this.destino = destino; + this.via = via; + this.secuencia = secuencia; + this.kmReal = kmReal; + this.setTiempoRecorrido(tiempoRecorrido); + this.tramoId = tramoId; + this.tramoServicioId = tramoId; + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, + HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta, Boolean indSentidoIda) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); + this.numRuta = numruta; + this.indSentidoIda = indSentidoIda; + } + + public SecuenciaRutaTramoVO(Parada origen, Parada destino, Via via, Integer secuencia, BigDecimal kmReal, + HoraSistema tiempoRecorrido, Integer tramoId, Integer tramoServicioId, String numruta, Boolean indSentidoIda, BigDecimal kmSaidaOrigen) { + this(origen, destino, via, secuencia, kmReal, tiempoRecorrido, tramoId, tramoServicioId); + this.numRuta = numruta; + this.indSentidoIda = indSentidoIda; + this.kmSaidaOrigen = kmSaidaOrigen; + } + + public Parada getOrigen() { + return origen; + } + + public void setOrigen(Parada origen) { + this.origen = origen; + } + + public Parada getDestino() { + return destino; + } + + public HoraSistema getTiempoRecorrido() { + return tiempoRecorrido; + } + + public void setTiempoRecorrido(HoraSistema tiempoRecorrido) { + if (tiempoRecorrido == null) { + tiempoRecorrido = new HoraSistema(); + } + this.tiempoRecorrido = tiempoRecorrido; + } + + public void setDestino(Parada destino) { + this.destino = destino; + } + + public Via getVia() { + return via; + } + + public void setVia(Via via) { + this.via = via; + } + + public Integer getSecuencia() { + return secuencia; + } + + public void setSecuencia(Integer secuencia) { + this.secuencia = secuencia; + } + + public BigDecimal getKmReal() { + return kmReal; + } + + public void setKmReal(BigDecimal kmReal) { + this.kmReal = kmReal; + } + + public Integer getTramoId() { + return tramoId; + } + + public void setTramoId(Integer tramoId) { + this.tramoId = tramoId; + } + + public Integer getTramoServicioId() { + return tramoServicioId; + } + + public void setTramoServicioId(Integer tramoServicioId) { + this.tramoServicioId = tramoServicioId; + } + + public Boolean getIndSentidoIda() { + return indSentidoIda; + } + + public void setIndSentidoIda(Boolean indSentidoIda) { + this.indSentidoIda = indSentidoIda; + } + + public String getNumRuta() { + return numRuta; + } + + public void setNumRuta(String numRuta) { + this.numRuta = numRuta; + } + + public BigDecimal getKmSaidaOrigen() { + return kmSaidaOrigen; + } + + public void setKmSaidaOrigen(BigDecimal kmSaidaOrigen) { + this.kmSaidaOrigen = kmSaidaOrigen; + } + + @Override + public String toString() { + HoraSistema hora = getTiempoRecorrido(); + + return secuencia + ";" + origen + ";" + destino + ";" + via + ";" + kmReal + ";" + + ((hora != null) ? hora.getHora() : "-") + ";" + ((hora != null) ? hora.getMinuto() : "-"); + } + + @Override + public int compareTo(SecuenciaRutaTramoVO o) { + return this.getSecuencia().compareTo(o.getSecuencia()); + } + + /** + * @return the kmEntradaDestino + */ + public BigDecimal getKmEntradaDestino() { + return kmEntradaDestino; + } + + /** + * método retorna valor de km sem considerar a distancia de entrada e saída da localidade. + * + * @return + */ + public BigDecimal getKmOriginal() { + return kmReal.subtract(kmEntradaDestino == null ? BigDecimal.ZERO : kmEntradaDestino).subtract(kmSaidaOrigen == null ? BigDecimal.ZERO : kmSaidaOrigen); + } + + /** + * método retorna valor de km sem considerar a distancia de entrada e saída da localidade. + * + * @return + */ + public BigDecimal getKmEntradaSaida() { + return (kmEntradaDestino == null ? BigDecimal.ZERO : kmEntradaDestino).add(kmSaidaOrigen == null ? BigDecimal.ZERO : kmSaidaOrigen); + } + + /** + * @param kmEntradaDestino the kmEntradaDestino to set + */ + public void setKmEntradaDestino(BigDecimal kmEntradaDestino) { + this.kmEntradaDestino = kmEntradaDestino; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TarefaGeracaoCorridaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TarefaGeracaoCorridaVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TarefaGeracaoCorridaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TarefaGeracaoCorridaVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TaxaEmbarqueW2i.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TaxaEmbarqueW2i.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TaxaEmbarqueW2i.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TaxaEmbarqueW2i.java index 65c52f07d..d6b76f55a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TaxaEmbarqueW2i.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/esquemaoperacional/TaxaEmbarqueW2i.java @@ -1,68 +1,68 @@ -package com.rjconsultores.ventaboletos.vo.esquemaoperacional; - -public class TaxaEmbarqueW2i { - - private long taxpolc_id; - private String nomeEmpresa; - private String categoria; - private String cveParada; - private String orgaoConcedente; - private long km; - private long quantidadeEstoque; - - public long getTaxpolc_id() { - return taxpolc_id; - } - - public void setTaxpolc_id(long taxpolc_id) { - this.taxpolc_id = taxpolc_id; - } - - public String getNomeEmpresa() { - return nomeEmpresa; - } - - public void setNomeEmpresa(String nomeEmpresa) { - this.nomeEmpresa = nomeEmpresa; - } - - public String getCategoria() { - return categoria; - } - - public void setCategoria(String categoria) { - this.categoria = categoria; - } - - public String getCveParada() { - return cveParada; - } - - public void setCveParada(String cveParada) { - this.cveParada = cveParada; - } - - public long getKm() { - return km; - } - - public void setKm(long km) { - this.km = km; - } - - public long getQuantidadeEstoque() { - return quantidadeEstoque; - } - - public void setQuantidadeEstoque(long quantidadeEstoque) { - this.quantidadeEstoque = quantidadeEstoque; - } - - public String getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(String orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } -} +package com.rjconsultores.ventaboletos.vo.esquemaoperacional; + +public class TaxaEmbarqueW2i { + + private long taxpolc_id; + private String nomeEmpresa; + private String categoria; + private String cveParada; + private String orgaoConcedente; + private long km; + private long quantidadeEstoque; + + public long getTaxpolc_id() { + return taxpolc_id; + } + + public void setTaxpolc_id(long taxpolc_id) { + this.taxpolc_id = taxpolc_id; + } + + public String getNomeEmpresa() { + return nomeEmpresa; + } + + public void setNomeEmpresa(String nomeEmpresa) { + this.nomeEmpresa = nomeEmpresa; + } + + public String getCategoria() { + return categoria; + } + + public void setCategoria(String categoria) { + this.categoria = categoria; + } + + public String getCveParada() { + return cveParada; + } + + public void setCveParada(String cveParada) { + this.cveParada = cveParada; + } + + public long getKm() { + return km; + } + + public void setKm(long km) { + this.km = km; + } + + public long getQuantidadeEstoque() { + return quantidadeEstoque; + } + + public void setQuantidadeEstoque(long quantidadeEstoque) { + this.quantidadeEstoque = quantidadeEstoque; + } + + public String getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(String orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerCabecaVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerCabecaVo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerCabecaVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerCabecaVo.java index 1c9213b81..8c74e3f88 100644 --- a/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerCabecaVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerCabecaVo.java @@ -1,168 +1,168 @@ -package com.rjconsultores.ventaboletos.vo.exportacao; - -import java.util.Calendar; - -import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.StringHelper; - -public class QdmpDerCabecaVo { - - private Integer codEmp; - private String linha; - private String secao; - private Integer digVer; - private Integer viagOrd; - private Integer lugOrd; - private Integer viagMul; - private Integer lugMul; - private Integer viagRft; - private Integer lugRft; - private Integer viagRfp; - private Integer lugRfp; - private Integer totViag; - private Integer totLug; - private Calendar dataHora; - private String codOper; - - public QdmpDerCabecaVo(Object[] obj) { - this.codEmp = obj[0]==null?0:(Integer)obj[0]; - this.linha = obj[1]==null?"":(String)obj[1]; - this.viagOrd = obj[2]==null?0:(Integer)obj[2]; - this.lugOrd = obj[3]==null?0:(Integer)obj[3]; - this.viagRft = obj[4]==null?0:(Integer)obj[4]; - this.lugRft = obj[5]==null?0:(Integer)obj[5]; - this.viagRfp = obj[6]==null?0:(Integer)obj[6]; - this.lugRfp = obj[7]==null?0:(Integer)obj[7]; - this.viagMul = 0; - this.lugMul = 0; - this.totViag = viagOrd+viagMul+viagRft+viagRfp; - this.totLug = lugOrd+lugMul+lugRft+lugRfp; - this.secao = "0000"; - this.digVer = 0; - this.codOper = "I"; - - } - - @Override - public String toString() { - StringBuilder retorno = new StringBuilder(); - retorno.append("J") - .append(codEmp) - .append(StringHelper.preencherStringEspacoEsquerda(linha, 10)) - .append(secao) - .append(digVer) - .append( StringHelper.preencherZeroEsquerda(viagOrd, 5) ) - .append( StringHelper.preencherZeroEsquerda(lugOrd, 7) ) - .append( StringHelper.preencherZeroEsquerda(viagMul, 5) ) - .append( StringHelper.preencherZeroEsquerda(lugMul, 7) ) - .append( StringHelper.preencherZeroEsquerda(viagRft, 5) ) - .append( StringHelper.preencherZeroEsquerda(lugRft, 7) ) - .append( StringHelper.preencherZeroEsquerda(viagRfp, 5) ) - .append( StringHelper.preencherZeroEsquerda(lugRfp, 7) ) - .append( StringHelper.preencherZeroEsquerda(totViag, 6) ) - .append( StringHelper.preencherZeroEsquerda(totLug, 8) ) - .append( DateUtil.getStringCurrentDate("yyyyMMddHHmm") ) - .append(codOper); - - return retorno.toString(); - } - - public Integer getCodEmp() { - return codEmp; - } - public void setCodEmp(Integer codEmp) { - this.codEmp = codEmp; - } - public String getLinha() { - return linha; - } - public void setLinha(String linha) { - this.linha = linha; - } - public String getSecao() { - return secao; - } - public void setSecao(String secao) { - this.secao = secao; - } - public Integer getDigVer() { - return digVer; - } - public void setDigVer(Integer digVer) { - this.digVer = digVer; - } - public Integer getViagOrd() { - return viagOrd; - } - public void setViagOrd(Integer viagOrd) { - this.viagOrd = viagOrd; - } - public Integer getLugOrd() { - return lugOrd; - } - public void setLugOrd(Integer lugOrd) { - this.lugOrd = lugOrd; - } - public Integer getViagMul() { - return viagMul; - } - public void setViagMul(Integer viagMul) { - this.viagMul = viagMul; - } - public Integer getLugMul() { - return lugMul; - } - public void setLugMul(Integer lugMul) { - this.lugMul = lugMul; - } - public Integer getViagRft() { - return viagRft; - } - public void setViagRft(Integer viagRft) { - this.viagRft = viagRft; - } - public Integer getLugRft() { - return lugRft; - } - public void setLugRft(Integer lugRft) { - this.lugRft = lugRft; - } - public Integer getViagRfp() { - return viagRfp; - } - public void setViagRfp(Integer viagRfp) { - this.viagRfp = viagRfp; - } - public Integer getLugRfp() { - return lugRfp; - } - public void setLugRfp(Integer lugRfp) { - this.lugRfp = lugRfp; - } - public Integer getTotViag() { - return totViag; - } - - public void setTotViag(Integer totViag) { - this.totViag = totViag; - } - - public Integer getTotLug() { - return totLug; - } - public void setTotLug(Integer totLug) { - this.totLug = totLug; - } - public Calendar getDataHora() { - return dataHora; - } - public void setDataHora(Calendar dataHora) { - this.dataHora = dataHora; - } - public String getCodOper() { - return codOper; - } - public void setCodOper(String codOper) { - this.codOper = codOper; - } -} +package com.rjconsultores.ventaboletos.vo.exportacao; + +import java.util.Calendar; + +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.StringHelper; + +public class QdmpDerCabecaVo { + + private Integer codEmp; + private String linha; + private String secao; + private Integer digVer; + private Integer viagOrd; + private Integer lugOrd; + private Integer viagMul; + private Integer lugMul; + private Integer viagRft; + private Integer lugRft; + private Integer viagRfp; + private Integer lugRfp; + private Integer totViag; + private Integer totLug; + private Calendar dataHora; + private String codOper; + + public QdmpDerCabecaVo(Object[] obj) { + this.codEmp = obj[0]==null?0:(Integer)obj[0]; + this.linha = obj[1]==null?"":(String)obj[1]; + this.viagOrd = obj[2]==null?0:(Integer)obj[2]; + this.lugOrd = obj[3]==null?0:(Integer)obj[3]; + this.viagRft = obj[4]==null?0:(Integer)obj[4]; + this.lugRft = obj[5]==null?0:(Integer)obj[5]; + this.viagRfp = obj[6]==null?0:(Integer)obj[6]; + this.lugRfp = obj[7]==null?0:(Integer)obj[7]; + this.viagMul = 0; + this.lugMul = 0; + this.totViag = viagOrd+viagMul+viagRft+viagRfp; + this.totLug = lugOrd+lugMul+lugRft+lugRfp; + this.secao = "0000"; + this.digVer = 0; + this.codOper = "I"; + + } + + @Override + public String toString() { + StringBuilder retorno = new StringBuilder(); + retorno.append("J") + .append(codEmp) + .append(StringHelper.preencherStringEspacoEsquerda(linha, 10)) + .append(secao) + .append(digVer) + .append( StringHelper.preencherZeroEsquerda(viagOrd, 5) ) + .append( StringHelper.preencherZeroEsquerda(lugOrd, 7) ) + .append( StringHelper.preencherZeroEsquerda(viagMul, 5) ) + .append( StringHelper.preencherZeroEsquerda(lugMul, 7) ) + .append( StringHelper.preencherZeroEsquerda(viagRft, 5) ) + .append( StringHelper.preencherZeroEsquerda(lugRft, 7) ) + .append( StringHelper.preencherZeroEsquerda(viagRfp, 5) ) + .append( StringHelper.preencherZeroEsquerda(lugRfp, 7) ) + .append( StringHelper.preencherZeroEsquerda(totViag, 6) ) + .append( StringHelper.preencherZeroEsquerda(totLug, 8) ) + .append( DateUtil.getStringCurrentDate("yyyyMMddHHmm") ) + .append(codOper); + + return retorno.toString(); + } + + public Integer getCodEmp() { + return codEmp; + } + public void setCodEmp(Integer codEmp) { + this.codEmp = codEmp; + } + public String getLinha() { + return linha; + } + public void setLinha(String linha) { + this.linha = linha; + } + public String getSecao() { + return secao; + } + public void setSecao(String secao) { + this.secao = secao; + } + public Integer getDigVer() { + return digVer; + } + public void setDigVer(Integer digVer) { + this.digVer = digVer; + } + public Integer getViagOrd() { + return viagOrd; + } + public void setViagOrd(Integer viagOrd) { + this.viagOrd = viagOrd; + } + public Integer getLugOrd() { + return lugOrd; + } + public void setLugOrd(Integer lugOrd) { + this.lugOrd = lugOrd; + } + public Integer getViagMul() { + return viagMul; + } + public void setViagMul(Integer viagMul) { + this.viagMul = viagMul; + } + public Integer getLugMul() { + return lugMul; + } + public void setLugMul(Integer lugMul) { + this.lugMul = lugMul; + } + public Integer getViagRft() { + return viagRft; + } + public void setViagRft(Integer viagRft) { + this.viagRft = viagRft; + } + public Integer getLugRft() { + return lugRft; + } + public void setLugRft(Integer lugRft) { + this.lugRft = lugRft; + } + public Integer getViagRfp() { + return viagRfp; + } + public void setViagRfp(Integer viagRfp) { + this.viagRfp = viagRfp; + } + public Integer getLugRfp() { + return lugRfp; + } + public void setLugRfp(Integer lugRfp) { + this.lugRfp = lugRfp; + } + public Integer getTotViag() { + return totViag; + } + + public void setTotViag(Integer totViag) { + this.totViag = totViag; + } + + public Integer getTotLug() { + return totLug; + } + public void setTotLug(Integer totLug) { + this.totLug = totLug; + } + public Calendar getDataHora() { + return dataHora; + } + public void setDataHora(Calendar dataHora) { + this.dataHora = dataHora; + } + public String getCodOper() { + return codOper; + } + public void setCodOper(String codOper) { + this.codOper = codOper; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerLinhaVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerLinhaVo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerLinhaVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerLinhaVo.java index 17b476937..be27b4a18 100644 --- a/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerLinhaVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerLinhaVo.java @@ -1,173 +1,173 @@ -package com.rjconsultores.ventaboletos.vo.exportacao; - -import com.rjconsultores.ventaboletos.utilerias.StringHelper; - -public class QdmpDerLinhaVo { - - private Integer codEmp; - private String linha; - private String secao; - private Integer digVer; - private Integer idaOrd; - private Integer volOrd; - private Integer idaMul; - private Integer volMul; - private Integer idaRft; - private Integer volRft; - private Integer idaRfp; - private Integer volRfp; - private Integer viagRfp; - private Integer totMov1; - private Integer totMov2; - private Integer totMov3; - private String codOper; - - public QdmpDerLinhaVo(Object[] obj) { - this.codEmp = obj[0]==null?0:(Integer)obj[0]; - this.linha = obj[1]==null?"":(String)obj[1]; - this.secao = obj[2]==null?"":(String)obj[2]; - this.totMov1 = obj[3]==null?0:(Integer)obj[3]; - this.totMov1 += obj[4]==null?0:(Integer)obj[4]; - this.idaOrd = obj[5]==null?0:(Integer)obj[5]; - this.volOrd = obj[6]==null?0:(Integer)obj[6]; - this.idaRft = obj[7]==null?0:(Integer)obj[7]; - this.viagRfp = obj[8]==null?0:(Integer)obj[8]; - this.idaRfp = obj[9]==null?0:(Integer)obj[9]; - this.volRfp = obj[10]==null?0:(Integer)obj[10]; - this.viagRfp = obj[11]==null?0:(Integer)obj[11]; - this.totMov2 = 0; - this.totMov3 = 0; - this.digVer = 0; - this.codOper = "I"; - - } - - public Integer getCodEmp() { - return codEmp; - } - public void setCodEmp(Integer codEmp) { - this.codEmp = codEmp; - } - public String getLinha() { - return linha; - } - public void setLinha(String linha) { - this.linha = linha; - } - public String getSecao() { - return secao; - } - public void setSecao(String secao) { - this.secao = secao; - } - public Integer getDigVer() { - return digVer; - } - public void setDigVer(Integer digVer) { - this.digVer = digVer; - } - public Integer getIdaOrd() { - return idaOrd; - } - public void setIdaOrd(Integer idaOrd) { - this.idaOrd = idaOrd; - } - public Integer getVolOrd() { - return volOrd; - } - public void setVolOrd(Integer volOrd) { - this.volOrd = volOrd; - } - public Integer getIdaMul() { - return idaMul; - } - public void setIdaMul(Integer idaMul) { - this.idaMul = idaMul; - } - public Integer getVolMul() { - return volMul; - } - public void setVolMul(Integer volMul) { - this.volMul = volMul; - } - public Integer getIdaRft() { - return idaRft; - } - public void setIdaRft(Integer idaRft) { - this.idaRft = idaRft; - } - public Integer getVolRft() { - return volRft; - } - public void setVolRft(Integer volRft) { - this.volRft = volRft; - } - public Integer getViagRfp() { - return viagRfp; - } - public void setViagRfp(Integer viagRfp) { - this.viagRfp = viagRfp; - } - public Integer getIdaRftPar() { - return idaRfp; - } - public void setIdaRftPar(Integer idaRftPar) { - this.idaRfp = idaRftPar; - } - public Integer getVolRftPar() { - return volRfp; - } - public void setVolRftPar(Integer volRftPar) { - this.volRfp = volRftPar; - } - public Integer getTotMov1() { - return totMov1; - } - public void setTotMov1(Integer totMov1) { - this.totMov1 = totMov1; - } - public Integer getTotMov2() { - return totMov2; - } - public void setTotMov2(Integer totMov2) { - this.totMov2 = totMov2; - } - public Integer getTotMov3() { - return totMov3; - } - public void setTotMov3(Integer totMov3) { - this.totMov3 = totMov3; - } - public String getCodOper() { - return codOper; - } - public void setCodOper(String codOper) { - this.codOper = codOper; - } - - @Override - public String toString() { - StringBuilder retorno = new StringBuilder(); - retorno.append("P") - .append(codEmp) - .append(StringHelper.preencherStringEspacoEsquerda(linha, 10)) - .append(secao) - .append(digVer) - .append( StringHelper.preencherZeroEsquerda(idaOrd, 6) ) - .append( StringHelper.preencherZeroEsquerda(volOrd, 6) ) - .append( StringHelper.preencherZeroEsquerda(idaMul, 6) ) - .append( StringHelper.preencherZeroEsquerda(volMul, 6) ) - .append( StringHelper.preencherZeroEsquerda(idaRft, 6) ) - .append( StringHelper.preencherZeroEsquerda(volRft, 6) ) - .append( StringHelper.preencherZeroEsquerda(idaRfp, 6) ) - .append( StringHelper.preencherZeroEsquerda(volRfp, 6) ) - .append( StringHelper.preencherZeroEsquerda(viagRfp, 5) ) - .append( StringHelper.preencherZeroEsquerda(totMov1, 7) ) - .append( StringHelper.preencherZeroEsquerda(totMov2, 7) ) - .append( StringHelper.preencherZeroEsquerda(totMov3, 7) ) - .append(codOper); - - return retorno.toString(); - } - -} +package com.rjconsultores.ventaboletos.vo.exportacao; + +import com.rjconsultores.ventaboletos.utilerias.StringHelper; + +public class QdmpDerLinhaVo { + + private Integer codEmp; + private String linha; + private String secao; + private Integer digVer; + private Integer idaOrd; + private Integer volOrd; + private Integer idaMul; + private Integer volMul; + private Integer idaRft; + private Integer volRft; + private Integer idaRfp; + private Integer volRfp; + private Integer viagRfp; + private Integer totMov1; + private Integer totMov2; + private Integer totMov3; + private String codOper; + + public QdmpDerLinhaVo(Object[] obj) { + this.codEmp = obj[0]==null?0:(Integer)obj[0]; + this.linha = obj[1]==null?"":(String)obj[1]; + this.secao = obj[2]==null?"":(String)obj[2]; + this.totMov1 = obj[3]==null?0:(Integer)obj[3]; + this.totMov1 += obj[4]==null?0:(Integer)obj[4]; + this.idaOrd = obj[5]==null?0:(Integer)obj[5]; + this.volOrd = obj[6]==null?0:(Integer)obj[6]; + this.idaRft = obj[7]==null?0:(Integer)obj[7]; + this.viagRfp = obj[8]==null?0:(Integer)obj[8]; + this.idaRfp = obj[9]==null?0:(Integer)obj[9]; + this.volRfp = obj[10]==null?0:(Integer)obj[10]; + this.viagRfp = obj[11]==null?0:(Integer)obj[11]; + this.totMov2 = 0; + this.totMov3 = 0; + this.digVer = 0; + this.codOper = "I"; + + } + + public Integer getCodEmp() { + return codEmp; + } + public void setCodEmp(Integer codEmp) { + this.codEmp = codEmp; + } + public String getLinha() { + return linha; + } + public void setLinha(String linha) { + this.linha = linha; + } + public String getSecao() { + return secao; + } + public void setSecao(String secao) { + this.secao = secao; + } + public Integer getDigVer() { + return digVer; + } + public void setDigVer(Integer digVer) { + this.digVer = digVer; + } + public Integer getIdaOrd() { + return idaOrd; + } + public void setIdaOrd(Integer idaOrd) { + this.idaOrd = idaOrd; + } + public Integer getVolOrd() { + return volOrd; + } + public void setVolOrd(Integer volOrd) { + this.volOrd = volOrd; + } + public Integer getIdaMul() { + return idaMul; + } + public void setIdaMul(Integer idaMul) { + this.idaMul = idaMul; + } + public Integer getVolMul() { + return volMul; + } + public void setVolMul(Integer volMul) { + this.volMul = volMul; + } + public Integer getIdaRft() { + return idaRft; + } + public void setIdaRft(Integer idaRft) { + this.idaRft = idaRft; + } + public Integer getVolRft() { + return volRft; + } + public void setVolRft(Integer volRft) { + this.volRft = volRft; + } + public Integer getViagRfp() { + return viagRfp; + } + public void setViagRfp(Integer viagRfp) { + this.viagRfp = viagRfp; + } + public Integer getIdaRftPar() { + return idaRfp; + } + public void setIdaRftPar(Integer idaRftPar) { + this.idaRfp = idaRftPar; + } + public Integer getVolRftPar() { + return volRfp; + } + public void setVolRftPar(Integer volRftPar) { + this.volRfp = volRftPar; + } + public Integer getTotMov1() { + return totMov1; + } + public void setTotMov1(Integer totMov1) { + this.totMov1 = totMov1; + } + public Integer getTotMov2() { + return totMov2; + } + public void setTotMov2(Integer totMov2) { + this.totMov2 = totMov2; + } + public Integer getTotMov3() { + return totMov3; + } + public void setTotMov3(Integer totMov3) { + this.totMov3 = totMov3; + } + public String getCodOper() { + return codOper; + } + public void setCodOper(String codOper) { + this.codOper = codOper; + } + + @Override + public String toString() { + StringBuilder retorno = new StringBuilder(); + retorno.append("P") + .append(codEmp) + .append(StringHelper.preencherStringEspacoEsquerda(linha, 10)) + .append(secao) + .append(digVer) + .append( StringHelper.preencherZeroEsquerda(idaOrd, 6) ) + .append( StringHelper.preencherZeroEsquerda(volOrd, 6) ) + .append( StringHelper.preencherZeroEsquerda(idaMul, 6) ) + .append( StringHelper.preencherZeroEsquerda(volMul, 6) ) + .append( StringHelper.preencherZeroEsquerda(idaRft, 6) ) + .append( StringHelper.preencherZeroEsquerda(volRft, 6) ) + .append( StringHelper.preencherZeroEsquerda(idaRfp, 6) ) + .append( StringHelper.preencherZeroEsquerda(volRfp, 6) ) + .append( StringHelper.preencherZeroEsquerda(viagRfp, 5) ) + .append( StringHelper.preencherZeroEsquerda(totMov1, 7) ) + .append( StringHelper.preencherZeroEsquerda(totMov2, 7) ) + .append( StringHelper.preencherZeroEsquerda(totMov3, 7) ) + .append(codOper); + + return retorno.toString(); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerRodapeVo.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerRodapeVo.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerRodapeVo.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerRodapeVo.java index 235005921..a0d9787d4 100644 --- a/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerRodapeVo.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/exportacao/QdmpDerRodapeVo.java @@ -1,126 +1,126 @@ -package com.rjconsultores.ventaboletos.vo.exportacao; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.utilerias.StringHelper; - -public class QdmpDerRodapeVo { - - private Integer codEmp; - private String linha; - private String secao; - private Integer digVer; - private Integer totMov1; - private Integer totMov2; - private Integer totMov3; - private BigDecimal receita; - private BigDecimal icms; - private BigDecimal iasp; - private String codOper; - - public QdmpDerRodapeVo(Object[] obj) { - this.codEmp = obj[0]==null?0:(Integer)obj[0]; - this.linha = obj[1]==null?"":(String)obj[1]; - this.totMov1 = obj[2]==null?0:(Integer)obj[2]; - this.receita = obj[3]==null?BigDecimal.ZERO:(BigDecimal)obj[3]; - this.icms = obj[4]==null?BigDecimal.ZERO:(BigDecimal)obj[4]; - this.iasp = obj[5]==null?BigDecimal.ZERO:(BigDecimal)obj[5]; - this.secao = "9999"; - this.totMov2 = 0; - this.totMov3 = 0; - this.digVer = 9; - this.codOper = "I"; - - } - - @Override - public String toString() { - this.receita= this.receita.setScale(2, BigDecimal.ROUND_CEILING); - this.icms = this.icms.setScale(2, BigDecimal.ROUND_CEILING); - this.iasp = this.iasp.setScale(2, BigDecimal.ROUND_CEILING); - - StringBuilder retorno = new StringBuilder(); - retorno.append("P") - .append(codEmp) - .append(StringHelper.preencherStringEspacoEsquerda(linha, 10)) - .append(secao) - .append(digVer) - .append( StringHelper.preencherStringEspacoEsquerda("", 20) ) - .append( StringHelper.preencherZeroEsquerda(totMov1, 7) ) - .append( StringHelper.preencherZeroEsquerda(totMov2, 7) ) - .append( StringHelper.preencherZeroEsquerda(totMov3, 7) ) - .append( StringHelper.preencherZeroEsquerda(receita.toString().replace(".", ""), 11) ) - .append( StringHelper.preencherZeroEsquerda(icms.toString().replace(".", ""), 11) ) - .append( StringHelper.preencherZeroEsquerda(iasp.toString().replace(".", ""), 11) ) - .append(codOper); - - return retorno.toString(); - } - - public Integer getCodEmp() { - return codEmp; - } - public void setCodEmp(Integer codEmp) { - this.codEmp = codEmp; - } - public String getLinha() { - return linha; - } - public void setLinha(String linha) { - this.linha = linha; - } - public String getSecao() { - return secao; - } - public void setSecao(String secao) { - this.secao = secao; - } - public Integer getDigVer() { - return digVer; - } - public void setDigVer(Integer digVer) { - this.digVer = digVer; - } - public Integer getTotMov1() { - return totMov1; - } - public void setTotMov1(Integer totMov1) { - this.totMov1 = totMov1; - } - public Integer getTotMov2() { - return totMov2; - } - public void setTotMov2(Integer totMov2) { - this.totMov2 = totMov2; - } - public Integer getTotMov3() { - return totMov3; - } - public void setTotMov3(Integer totMov3) { - this.totMov3 = totMov3; - } - public BigDecimal getReceita() { - return receita; - } - public void setReceita(BigDecimal receita) { - this.receita = receita; - } - public BigDecimal getIcms() { - return icms; - } - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - public BigDecimal getIasp() { - return iasp; - } - public void setIasp(BigDecimal iasp) { - this.iasp = iasp; - } - public String getCodOper() { - return codOper; - } - public void setCodOper(String codOper) { - this.codOper = codOper; - } -} +package com.rjconsultores.ventaboletos.vo.exportacao; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.utilerias.StringHelper; + +public class QdmpDerRodapeVo { + + private Integer codEmp; + private String linha; + private String secao; + private Integer digVer; + private Integer totMov1; + private Integer totMov2; + private Integer totMov3; + private BigDecimal receita; + private BigDecimal icms; + private BigDecimal iasp; + private String codOper; + + public QdmpDerRodapeVo(Object[] obj) { + this.codEmp = obj[0]==null?0:(Integer)obj[0]; + this.linha = obj[1]==null?"":(String)obj[1]; + this.totMov1 = obj[2]==null?0:(Integer)obj[2]; + this.receita = obj[3]==null?BigDecimal.ZERO:(BigDecimal)obj[3]; + this.icms = obj[4]==null?BigDecimal.ZERO:(BigDecimal)obj[4]; + this.iasp = obj[5]==null?BigDecimal.ZERO:(BigDecimal)obj[5]; + this.secao = "9999"; + this.totMov2 = 0; + this.totMov3 = 0; + this.digVer = 9; + this.codOper = "I"; + + } + + @Override + public String toString() { + this.receita= this.receita.setScale(2, BigDecimal.ROUND_CEILING); + this.icms = this.icms.setScale(2, BigDecimal.ROUND_CEILING); + this.iasp = this.iasp.setScale(2, BigDecimal.ROUND_CEILING); + + StringBuilder retorno = new StringBuilder(); + retorno.append("P") + .append(codEmp) + .append(StringHelper.preencherStringEspacoEsquerda(linha, 10)) + .append(secao) + .append(digVer) + .append( StringHelper.preencherStringEspacoEsquerda("", 20) ) + .append( StringHelper.preencherZeroEsquerda(totMov1, 7) ) + .append( StringHelper.preencherZeroEsquerda(totMov2, 7) ) + .append( StringHelper.preencherZeroEsquerda(totMov3, 7) ) + .append( StringHelper.preencherZeroEsquerda(receita.toString().replace(".", ""), 11) ) + .append( StringHelper.preencherZeroEsquerda(icms.toString().replace(".", ""), 11) ) + .append( StringHelper.preencherZeroEsquerda(iasp.toString().replace(".", ""), 11) ) + .append(codOper); + + return retorno.toString(); + } + + public Integer getCodEmp() { + return codEmp; + } + public void setCodEmp(Integer codEmp) { + this.codEmp = codEmp; + } + public String getLinha() { + return linha; + } + public void setLinha(String linha) { + this.linha = linha; + } + public String getSecao() { + return secao; + } + public void setSecao(String secao) { + this.secao = secao; + } + public Integer getDigVer() { + return digVer; + } + public void setDigVer(Integer digVer) { + this.digVer = digVer; + } + public Integer getTotMov1() { + return totMov1; + } + public void setTotMov1(Integer totMov1) { + this.totMov1 = totMov1; + } + public Integer getTotMov2() { + return totMov2; + } + public void setTotMov2(Integer totMov2) { + this.totMov2 = totMov2; + } + public Integer getTotMov3() { + return totMov3; + } + public void setTotMov3(Integer totMov3) { + this.totMov3 = totMov3; + } + public BigDecimal getReceita() { + return receita; + } + public void setReceita(BigDecimal receita) { + this.receita = receita; + } + public BigDecimal getIcms() { + return icms; + } + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + public BigDecimal getIasp() { + return iasp; + } + public void setIasp(BigDecimal iasp) { + this.iasp = iasp; + } + public String getCodOper() { + return codOper; + } + public void setCodOper(String codOper) { + this.codOper = codOper; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraEcfVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraEcfVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraEcfVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraEcfVO.java index 9aece703b..9b9dc7323 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraEcfVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraEcfVO.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.util.ArrayList; -import java.util.List; - -public class AgpImpressoraEcfVO { - - private String numImpressora; - private String dataEmissao; - - private List itens; - - public AgpImpressoraEcfVO() { - } - - public AgpImpressoraEcfVO(String numImpressora, String dataEmissao) { - super(); - this.numImpressora = numImpressora; - this.dataEmissao = dataEmissao; - this.itens = new ArrayList(); - } - - public String getNumImpressora() { - return numImpressora; - } - - public void setNumImpressora(String numImpressora) { - this.numImpressora = numImpressora; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public List getItens() { - return itens; - } - - public void setItens(List itens) { - this.itens = itens; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((dataEmissao == null) ? 0 : dataEmissao.hashCode()); - result = prime * result + ((numImpressora == null) ? 0 : numImpressora.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AgpImpressoraEcfVO other = (AgpImpressoraEcfVO) obj; - if (dataEmissao == null) { - if (other.dataEmissao != null) - return false; - } else if (!dataEmissao.equals(other.dataEmissao)) - return false; - if (numImpressora == null) { - if (other.numImpressora != null) - return false; - } else if (!numImpressora.equals(other.numImpressora)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.util.ArrayList; +import java.util.List; + +public class AgpImpressoraEcfVO { + + private String numImpressora; + private String dataEmissao; + + private List itens; + + public AgpImpressoraEcfVO() { + } + + public AgpImpressoraEcfVO(String numImpressora, String dataEmissao) { + super(); + this.numImpressora = numImpressora; + this.dataEmissao = dataEmissao; + this.itens = new ArrayList(); + } + + public String getNumImpressora() { + return numImpressora; + } + + public void setNumImpressora(String numImpressora) { + this.numImpressora = numImpressora; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public List getItens() { + return itens; + } + + public void setItens(List itens) { + this.itens = itens; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dataEmissao == null) ? 0 : dataEmissao.hashCode()); + result = prime * result + ((numImpressora == null) ? 0 : numImpressora.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AgpImpressoraEcfVO other = (AgpImpressoraEcfVO) obj; + if (dataEmissao == null) { + if (other.dataEmissao != null) + return false; + } else if (!dataEmissao.equals(other.dataEmissao)) + return false; + if (numImpressora == null) { + if (other.numImpressora != null) + return false; + } else if (!numImpressora.equals(other.numImpressora)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraReducaoZVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraReducaoZVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraReducaoZVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraReducaoZVO.java index eb9b53ef5..084b941f8 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraReducaoZVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/AgpImpressoraReducaoZVO.java @@ -1,78 +1,78 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.util.ArrayList; -import java.util.List; - -public class AgpImpressoraReducaoZVO { - - private String numserie20; - private String datamov; - - private List itens; - - public AgpImpressoraReducaoZVO() { - } - - public AgpImpressoraReducaoZVO(String numserie20, String datamov) { - super(); - this.numserie20 = numserie20; - this.datamov = datamov; - this.itens = new ArrayList(); - } - - public String getNumserie20() { - return numserie20; - } - - public void setNumserie20(String numserie20) { - this.numserie20 = numserie20; - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public List getItens() { - return itens; - } - - public void setItens(List itens) { - this.itens = itens; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); - result = prime * result + ((numserie20 == null) ? 0 : numserie20.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AgpImpressoraReducaoZVO other = (AgpImpressoraReducaoZVO) obj; - if (datamov == null) { - if (other.datamov != null) - return false; - } else if (!datamov.equals(other.datamov)) - return false; - if (numserie20 == null) { - if (other.numserie20 != null) - return false; - } else if (!numserie20.equals(other.numserie20)) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.util.ArrayList; +import java.util.List; + +public class AgpImpressoraReducaoZVO { + + private String numserie20; + private String datamov; + + private List itens; + + public AgpImpressoraReducaoZVO() { + } + + public AgpImpressoraReducaoZVO(String numserie20, String datamov) { + super(); + this.numserie20 = numserie20; + this.datamov = datamov; + this.itens = new ArrayList(); + } + + public String getNumserie20() { + return numserie20; + } + + public void setNumserie20(String numserie20) { + this.numserie20 = numserie20; + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public List getItens() { + return itens; + } + + public void setItens(List itens) { + this.itens = itens; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); + result = prime * result + ((numserie20 == null) ? 0 : numserie20.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AgpImpressoraReducaoZVO other = (AgpImpressoraReducaoZVO) obj; + if (datamov == null) { + if (other.datamov != null) + return false; + } else if (!datamov.equals(other.datamov)) + return false; + if (numserie20 == null) { + if (other.numserie20 != null) + return false; + } else if (!numserie20.equals(other.numserie20)) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java index 29ae656e0..089a73465 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalReducaoZVO.java @@ -1,272 +1,272 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class ImportacionFiscalReducaoZVO { - - private String datamov; - private String cnpj; - private String numreducoes; - private String crz; - private String numserie20; - private String coo; - private String cro; - private String cooinicial; - private String coofinal; - private BigDecimal vendabrutadiaria; - private String datareducao; - private String horareducao; - private String aliquota; - private BigDecimal imposto; - private BigDecimal valorNaoTributado; - private String numpdv; - private BigDecimal gtFinal; - private BigDecimal gtInicial; - private BigDecimal valorNaoIncluido; - private String status; - private boolean inconsistente; - - public ImportacionFiscalReducaoZVO() { - } - - public ImportacionFiscalReducaoZVO(ImportacionFiscalReducaoZVO item) { - this.datamov = item.getDatamov(); - this.cnpj = item.getCnpj(); - this.numreducoes = item.getNumreducoes(); - this.crz = item.getCrz(); - this.numserie20 = item.getNumserie20(); - this.coo = item.getCoo(); - this.cro = item.getCro(); - this.cooinicial = item.getCooinicial(); - this.coofinal = item.getCoofinal(); - this.vendabrutadiaria = item.getVendabrutadiaria(); - this.datareducao = item.getDatareducao(); - this.horareducao = item.getHorareducao(); - this.aliquota = item.getAliquota(); - this.imposto = item.getImposto(); - this.valorNaoTributado = item.getValorNaoTributado(); - this.numpdv = item.getNumpdv(); - this.gtFinal = item.getGtFinal(); - this.gtInicial = item.getGtInicial(); - this.valorNaoIncluido = item.getValorNaoIncluido(); - this.status = item.getStatus(); - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - public String getNumreducoes() { - return numreducoes; - } - - public void setNumreducoes(String numreducoes) { - this.numreducoes = numreducoes; - } - - public String getCrz() { - return crz; - } - - public void setCrz(String crz) { - this.crz = crz; - } - - public String getNumserie20() { - return numserie20; - } - - public void setNumserie20(String numserie20) { - this.numserie20 = numserie20; - } - - public String getCoo() { - return coo; - } - - public void setCoo(String coo) { - this.coo = coo; - } - - public String getCooinicial() { - return cooinicial; - } - - public void setCooinicial(String cooinicial) { - this.cooinicial = cooinicial; - } - - public String getCoofinal() { - return coofinal; - } - - public void setCoofinal(String coofinal) { - this.coofinal = coofinal; - } - - public BigDecimal getVendabrutadiaria() { - return vendabrutadiaria; - } - - public void setVendabrutadiaria(BigDecimal vendabrutadiaria) { - this.vendabrutadiaria = vendabrutadiaria; - } - - public String getDatareducao() { - return datareducao; - } - - public void setDatareducao(String datareducao) { - this.datareducao = datareducao; - } - - public String getHorareducao() { - return horareducao; - } - - public void setHorareducao(String horareducao) { - this.horareducao = horareducao; - } - - public String getAliquota() { - return aliquota; - } - - public void setAliquota(String aliquota) { - this.aliquota = aliquota; - } - - public BigDecimal getImposto() { - return imposto; - } - - public void setImposto(BigDecimal imposto) { - this.imposto = imposto; - } - - public BigDecimal getValorNaoTributado() { - return valorNaoTributado; - } - - public void setValorNaoTributado(BigDecimal valorNaoTributado) { - this.valorNaoTributado = valorNaoTributado; - } - - public String getNumpdv() { - return numpdv; - } - - public void setNumpdv(String numpdv) { - this.numpdv = numpdv; - } - - public BigDecimal getGtFinal() { - return gtFinal; - } - - public void setGtFinal(BigDecimal gtFinal) { - this.gtFinal = gtFinal; - } - - public BigDecimal getGtInicial() { - return gtInicial; - } - - public void setGtInicial(BigDecimal gtInicial) { - this.gtInicial = gtInicial; - } - - public BigDecimal getValorNaoIncluido() { - return valorNaoIncluido; - } - - public void setValorNaoIncluido(BigDecimal valorNaoIncluido) { - this.valorNaoIncluido = valorNaoIncluido; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((coofinal == null) ? 0 : coofinal.hashCode()); - result = prime * result + ((cooinicial == null) ? 0 : cooinicial.hashCode()); - result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); - result = prime * result + ((datareducao == null) ? 0 : datareducao.hashCode()); - result = prime * result + ((numserie20 == null) ? 0 : numserie20.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ImportacionFiscalReducaoZVO other = (ImportacionFiscalReducaoZVO) obj; - if (coofinal == null) { - if (other.coofinal != null) - return false; - } else if (!coofinal.equals(other.coofinal)) - return false; - if (cooinicial == null) { - if (other.cooinicial != null) - return false; - } else if (!cooinicial.equals(other.cooinicial)) - return false; - if (datamov == null) { - if (other.datamov != null) - return false; - } else if (!datamov.equals(other.datamov)) - return false; - if (datareducao == null) { - if (other.datareducao != null) - return false; - } else if (!datareducao.equals(other.datareducao)) - return false; - if (numserie20 == null) { - if (other.numserie20 != null) - return false; - } else if (!numserie20.equals(other.numserie20)) - return false; - return true; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public boolean isInconsistente() { - return inconsistente; - } - - public void setInconsistente(boolean inconsistente) { - this.inconsistente = inconsistente; - } - - public String getCro() { - return cro; - } - - public void setCro(String cro) { - this.cro = cro; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class ImportacionFiscalReducaoZVO { + + private String datamov; + private String cnpj; + private String numreducoes; + private String crz; + private String numserie20; + private String coo; + private String cro; + private String cooinicial; + private String coofinal; + private BigDecimal vendabrutadiaria; + private String datareducao; + private String horareducao; + private String aliquota; + private BigDecimal imposto; + private BigDecimal valorNaoTributado; + private String numpdv; + private BigDecimal gtFinal; + private BigDecimal gtInicial; + private BigDecimal valorNaoIncluido; + private String status; + private boolean inconsistente; + + public ImportacionFiscalReducaoZVO() { + } + + public ImportacionFiscalReducaoZVO(ImportacionFiscalReducaoZVO item) { + this.datamov = item.getDatamov(); + this.cnpj = item.getCnpj(); + this.numreducoes = item.getNumreducoes(); + this.crz = item.getCrz(); + this.numserie20 = item.getNumserie20(); + this.coo = item.getCoo(); + this.cro = item.getCro(); + this.cooinicial = item.getCooinicial(); + this.coofinal = item.getCoofinal(); + this.vendabrutadiaria = item.getVendabrutadiaria(); + this.datareducao = item.getDatareducao(); + this.horareducao = item.getHorareducao(); + this.aliquota = item.getAliquota(); + this.imposto = item.getImposto(); + this.valorNaoTributado = item.getValorNaoTributado(); + this.numpdv = item.getNumpdv(); + this.gtFinal = item.getGtFinal(); + this.gtInicial = item.getGtInicial(); + this.valorNaoIncluido = item.getValorNaoIncluido(); + this.status = item.getStatus(); + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + public String getNumreducoes() { + return numreducoes; + } + + public void setNumreducoes(String numreducoes) { + this.numreducoes = numreducoes; + } + + public String getCrz() { + return crz; + } + + public void setCrz(String crz) { + this.crz = crz; + } + + public String getNumserie20() { + return numserie20; + } + + public void setNumserie20(String numserie20) { + this.numserie20 = numserie20; + } + + public String getCoo() { + return coo; + } + + public void setCoo(String coo) { + this.coo = coo; + } + + public String getCooinicial() { + return cooinicial; + } + + public void setCooinicial(String cooinicial) { + this.cooinicial = cooinicial; + } + + public String getCoofinal() { + return coofinal; + } + + public void setCoofinal(String coofinal) { + this.coofinal = coofinal; + } + + public BigDecimal getVendabrutadiaria() { + return vendabrutadiaria; + } + + public void setVendabrutadiaria(BigDecimal vendabrutadiaria) { + this.vendabrutadiaria = vendabrutadiaria; + } + + public String getDatareducao() { + return datareducao; + } + + public void setDatareducao(String datareducao) { + this.datareducao = datareducao; + } + + public String getHorareducao() { + return horareducao; + } + + public void setHorareducao(String horareducao) { + this.horareducao = horareducao; + } + + public String getAliquota() { + return aliquota; + } + + public void setAliquota(String aliquota) { + this.aliquota = aliquota; + } + + public BigDecimal getImposto() { + return imposto; + } + + public void setImposto(BigDecimal imposto) { + this.imposto = imposto; + } + + public BigDecimal getValorNaoTributado() { + return valorNaoTributado; + } + + public void setValorNaoTributado(BigDecimal valorNaoTributado) { + this.valorNaoTributado = valorNaoTributado; + } + + public String getNumpdv() { + return numpdv; + } + + public void setNumpdv(String numpdv) { + this.numpdv = numpdv; + } + + public BigDecimal getGtFinal() { + return gtFinal; + } + + public void setGtFinal(BigDecimal gtFinal) { + this.gtFinal = gtFinal; + } + + public BigDecimal getGtInicial() { + return gtInicial; + } + + public void setGtInicial(BigDecimal gtInicial) { + this.gtInicial = gtInicial; + } + + public BigDecimal getValorNaoIncluido() { + return valorNaoIncluido; + } + + public void setValorNaoIncluido(BigDecimal valorNaoIncluido) { + this.valorNaoIncluido = valorNaoIncluido; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((coofinal == null) ? 0 : coofinal.hashCode()); + result = prime * result + ((cooinicial == null) ? 0 : cooinicial.hashCode()); + result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); + result = prime * result + ((datareducao == null) ? 0 : datareducao.hashCode()); + result = prime * result + ((numserie20 == null) ? 0 : numserie20.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ImportacionFiscalReducaoZVO other = (ImportacionFiscalReducaoZVO) obj; + if (coofinal == null) { + if (other.coofinal != null) + return false; + } else if (!coofinal.equals(other.coofinal)) + return false; + if (cooinicial == null) { + if (other.cooinicial != null) + return false; + } else if (!cooinicial.equals(other.cooinicial)) + return false; + if (datamov == null) { + if (other.datamov != null) + return false; + } else if (!datamov.equals(other.datamov)) + return false; + if (datareducao == null) { + if (other.datareducao != null) + return false; + } else if (!datareducao.equals(other.datareducao)) + return false; + if (numserie20 == null) { + if (other.numserie20 != null) + return false; + } else if (!numserie20.equals(other.numserie20)) + return false; + return true; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public boolean isInconsistente() { + return inconsistente; + } + + public void setInconsistente(boolean inconsistente) { + this.inconsistente = inconsistente; + } + + public String getCro() { + return cro; + } + + public void setCro(String cro) { + this.cro = cro; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java index 4d496a25d..08c6b2cc1 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java @@ -1,342 +1,342 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -public class ImportacionFiscalVO { - - private String numImpressora; - private String coo; - private Long boletoId; - private Integer empresaId; - private String dataEmissao; - private String cnpjCliente; - private String cnpjImpressora; - private Integer origenId; - private String origenUf; - private Integer destinoId; - private String destinoUf; - private String numpdv; - private String modeloImpressora; - private String numCaixa; - private String status; - private String claseServicio; - private String descmotivocancelamento; - private Integer motivocancelacion; - private BigDecimal valorMulta; - private BigDecimal valorTarifa; - private BigDecimal valorPedagio; - private BigDecimal valorEmbarque; - private BigDecimal valorSeguro; - private String cnpjEcf; - private BigDecimal impostoEstado; - private BigDecimal desconto; - private String indcancelamento; - private boolean inconsistente; - - private List itensFiscais; - - public ImportacionFiscalVO() { - super(); - } - - public ImportacionFiscalVO(String numImpressora, String coo, Long boletoId, Integer empresaId, String dataEmissao, String cnpjCliente, String cnpjImpressora, Integer origenId, String origenUf, Integer destinoId, String destinoUf, String numpdv, String modeloImpressora, String numCaixa, String status, Integer motivocancelacion, BigDecimal valorMulta, BigDecimal valorTarifa, BigDecimal valorPedagio, BigDecimal valorEmbarque, BigDecimal valorSeguro, String claseServicio) { - super(); - this.numImpressora = numImpressora; - this.coo = coo; - this.boletoId = boletoId; - this.empresaId = empresaId; - this.dataEmissao = dataEmissao; - this.cnpjCliente = cnpjCliente; - this.cnpjImpressora = cnpjImpressora; - this.origenId = origenId; - this.origenUf = origenUf; - this.destinoId = destinoId; - this.destinoUf = destinoUf; - this.numpdv = numpdv; - this.modeloImpressora = modeloImpressora; - this.numCaixa = numCaixa; - this.status = status; - this.claseServicio = claseServicio; - this.motivocancelacion = motivocancelacion; - this.valorMulta = valorMulta; - this.valorTarifa = valorTarifa; - this.valorPedagio = valorPedagio; - this.valorEmbarque = valorEmbarque; - this.valorSeguro = valorSeguro; - } - - public String getNumImpressora() { - return numImpressora; - } - - public void setNumImpressora(String numImpressora) { - this.numImpressora = numImpressora; - } - - public String getCoo() { - return coo; - } - - public void setCoo(String coo) { - this.coo = coo; - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public String getCnpjCliente() { - return cnpjCliente; - } - - public void setCnpjCliente(String cnpjCliente) { - this.cnpjCliente = cnpjCliente; - } - - public String getCnpjImpressora() { - return cnpjImpressora; - } - - public void setCnpjImpressora(String cnpjImpressora) { - this.cnpjImpressora = cnpjImpressora; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public List getItensFiscais() { - if (itensFiscais == null) { - itensFiscais = new ArrayList(); - } - return itensFiscais; - } - - public void setItensFiscais(List itensFiscais) { - this.itensFiscais = itensFiscais; - } - - public String getNumpdv() { - return numpdv; - } - - public void setNumpdv(String numpdv) { - this.numpdv = numpdv; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public String getNumCaixa() { - return numCaixa; - } - - public void setNumCaixa(String numCaixa) { - this.numCaixa = numCaixa; - } - - public String getModeloImpressora() { - return modeloImpressora; - } - - public void setModeloImpressora(String modeloImpressora) { - this.modeloImpressora = modeloImpressora; - } - - public String getOrigenUf() { - return origenUf; - } - - public void setOrigenUf(String origenUf) { - this.origenUf = origenUf; - } - - public String getDestinoUf() { - return destinoUf; - } - - public void setDestinoUf(String destinoUf) { - this.destinoUf = destinoUf; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Integer getMotivocancelacion() { - return motivocancelacion; - } - - public void setMotivocancelacion(Integer motivocancelacion) { - this.motivocancelacion = motivocancelacion; - } - - public BigDecimal getValorMulta() { - return valorMulta; - } - - public void setValorMulta(BigDecimal valorMulta) { - this.valorMulta = valorMulta; - } - - public BigDecimal getValorTarifa() { - return valorTarifa; - } - - public void setValorTarifa(BigDecimal valorTarifa) { - this.valorTarifa = valorTarifa; - } - - public BigDecimal getValorPedagio() { - return valorPedagio; - } - - public void setValorPedagio(BigDecimal valorPedagio) { - this.valorPedagio = valorPedagio; - } - - public BigDecimal getValorEmbarque() { - return valorEmbarque; - } - - public void setValorEmbarque(BigDecimal valorEmbarque) { - this.valorEmbarque = valorEmbarque; - } - - public BigDecimal getValorSeguro() { - return valorSeguro; - } - - public void setValorSeguro(BigDecimal valorSeguro) { - this.valorSeguro = valorSeguro; - } - - public String getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(String claseServicio) { - this.claseServicio = claseServicio; - } - - public String getDescmotivocancelamento() { - return descmotivocancelamento; - } - - public void setDescmotivocancelamento(String descmotivocancelamento) { - this.descmotivocancelamento = descmotivocancelamento; - } - - public String getCnpjEcf() { - return cnpjEcf; - } - - public void setCnpjEcf(String cnpjEcf) { - this.cnpjEcf = cnpjEcf; - } - - public BigDecimal getImpostoEstado() { - return impostoEstado; - } - - public void setImpostoEstado(BigDecimal impostoEstado) { - this.impostoEstado = impostoEstado; - } - - public BigDecimal getDesconto() { - return desconto; - } - - public void setDesconto(BigDecimal desconto) { - this.desconto = desconto; - } - - public String getIndcancelamento() { - return indcancelamento; - } - - public void setIndcancelamento(String indcancelamento) { - this.indcancelamento = indcancelamento; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((boletoId == null) ? 0 : boletoId.hashCode()); - result = prime * result + ((coo == null) ? 0 : coo.hashCode()); - result = prime * result + ((numImpressora == null) ? 0 : numImpressora.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ImportacionFiscalVO other = (ImportacionFiscalVO) obj; - if (boletoId == null) { - if (other.boletoId != null) - return false; - } else if (!boletoId.equals(other.boletoId)) - return false; - if (coo == null) { - if (other.coo != null) - return false; - } else if (!coo.equals(other.coo)) - return false; - if (numImpressora == null) { - if (other.numImpressora != null) - return false; - } else if (!numImpressora.equals(other.numImpressora)) - return false; - return true; - } - - public boolean isInconsistente() { - return inconsistente; - } - - public void setInconsistente(boolean inconsistente) { - this.inconsistente = inconsistente; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class ImportacionFiscalVO { + + private String numImpressora; + private String coo; + private Long boletoId; + private Integer empresaId; + private String dataEmissao; + private String cnpjCliente; + private String cnpjImpressora; + private Integer origenId; + private String origenUf; + private Integer destinoId; + private String destinoUf; + private String numpdv; + private String modeloImpressora; + private String numCaixa; + private String status; + private String claseServicio; + private String descmotivocancelamento; + private Integer motivocancelacion; + private BigDecimal valorMulta; + private BigDecimal valorTarifa; + private BigDecimal valorPedagio; + private BigDecimal valorEmbarque; + private BigDecimal valorSeguro; + private String cnpjEcf; + private BigDecimal impostoEstado; + private BigDecimal desconto; + private String indcancelamento; + private boolean inconsistente; + + private List itensFiscais; + + public ImportacionFiscalVO() { + super(); + } + + public ImportacionFiscalVO(String numImpressora, String coo, Long boletoId, Integer empresaId, String dataEmissao, String cnpjCliente, String cnpjImpressora, Integer origenId, String origenUf, Integer destinoId, String destinoUf, String numpdv, String modeloImpressora, String numCaixa, String status, Integer motivocancelacion, BigDecimal valorMulta, BigDecimal valorTarifa, BigDecimal valorPedagio, BigDecimal valorEmbarque, BigDecimal valorSeguro, String claseServicio) { + super(); + this.numImpressora = numImpressora; + this.coo = coo; + this.boletoId = boletoId; + this.empresaId = empresaId; + this.dataEmissao = dataEmissao; + this.cnpjCliente = cnpjCliente; + this.cnpjImpressora = cnpjImpressora; + this.origenId = origenId; + this.origenUf = origenUf; + this.destinoId = destinoId; + this.destinoUf = destinoUf; + this.numpdv = numpdv; + this.modeloImpressora = modeloImpressora; + this.numCaixa = numCaixa; + this.status = status; + this.claseServicio = claseServicio; + this.motivocancelacion = motivocancelacion; + this.valorMulta = valorMulta; + this.valorTarifa = valorTarifa; + this.valorPedagio = valorPedagio; + this.valorEmbarque = valorEmbarque; + this.valorSeguro = valorSeguro; + } + + public String getNumImpressora() { + return numImpressora; + } + + public void setNumImpressora(String numImpressora) { + this.numImpressora = numImpressora; + } + + public String getCoo() { + return coo; + } + + public void setCoo(String coo) { + this.coo = coo; + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public String getCnpjCliente() { + return cnpjCliente; + } + + public void setCnpjCliente(String cnpjCliente) { + this.cnpjCliente = cnpjCliente; + } + + public String getCnpjImpressora() { + return cnpjImpressora; + } + + public void setCnpjImpressora(String cnpjImpressora) { + this.cnpjImpressora = cnpjImpressora; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public List getItensFiscais() { + if (itensFiscais == null) { + itensFiscais = new ArrayList(); + } + return itensFiscais; + } + + public void setItensFiscais(List itensFiscais) { + this.itensFiscais = itensFiscais; + } + + public String getNumpdv() { + return numpdv; + } + + public void setNumpdv(String numpdv) { + this.numpdv = numpdv; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public String getNumCaixa() { + return numCaixa; + } + + public void setNumCaixa(String numCaixa) { + this.numCaixa = numCaixa; + } + + public String getModeloImpressora() { + return modeloImpressora; + } + + public void setModeloImpressora(String modeloImpressora) { + this.modeloImpressora = modeloImpressora; + } + + public String getOrigenUf() { + return origenUf; + } + + public void setOrigenUf(String origenUf) { + this.origenUf = origenUf; + } + + public String getDestinoUf() { + return destinoUf; + } + + public void setDestinoUf(String destinoUf) { + this.destinoUf = destinoUf; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Integer getMotivocancelacion() { + return motivocancelacion; + } + + public void setMotivocancelacion(Integer motivocancelacion) { + this.motivocancelacion = motivocancelacion; + } + + public BigDecimal getValorMulta() { + return valorMulta; + } + + public void setValorMulta(BigDecimal valorMulta) { + this.valorMulta = valorMulta; + } + + public BigDecimal getValorTarifa() { + return valorTarifa; + } + + public void setValorTarifa(BigDecimal valorTarifa) { + this.valorTarifa = valorTarifa; + } + + public BigDecimal getValorPedagio() { + return valorPedagio; + } + + public void setValorPedagio(BigDecimal valorPedagio) { + this.valorPedagio = valorPedagio; + } + + public BigDecimal getValorEmbarque() { + return valorEmbarque; + } + + public void setValorEmbarque(BigDecimal valorEmbarque) { + this.valorEmbarque = valorEmbarque; + } + + public BigDecimal getValorSeguro() { + return valorSeguro; + } + + public void setValorSeguro(BigDecimal valorSeguro) { + this.valorSeguro = valorSeguro; + } + + public String getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(String claseServicio) { + this.claseServicio = claseServicio; + } + + public String getDescmotivocancelamento() { + return descmotivocancelamento; + } + + public void setDescmotivocancelamento(String descmotivocancelamento) { + this.descmotivocancelamento = descmotivocancelamento; + } + + public String getCnpjEcf() { + return cnpjEcf; + } + + public void setCnpjEcf(String cnpjEcf) { + this.cnpjEcf = cnpjEcf; + } + + public BigDecimal getImpostoEstado() { + return impostoEstado; + } + + public void setImpostoEstado(BigDecimal impostoEstado) { + this.impostoEstado = impostoEstado; + } + + public BigDecimal getDesconto() { + return desconto; + } + + public void setDesconto(BigDecimal desconto) { + this.desconto = desconto; + } + + public String getIndcancelamento() { + return indcancelamento; + } + + public void setIndcancelamento(String indcancelamento) { + this.indcancelamento = indcancelamento; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((boletoId == null) ? 0 : boletoId.hashCode()); + result = prime * result + ((coo == null) ? 0 : coo.hashCode()); + result = prime * result + ((numImpressora == null) ? 0 : numImpressora.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ImportacionFiscalVO other = (ImportacionFiscalVO) obj; + if (boletoId == null) { + if (other.boletoId != null) + return false; + } else if (!boletoId.equals(other.boletoId)) + return false; + if (coo == null) { + if (other.coo != null) + return false; + } else if (!coo.equals(other.coo)) + return false; + if (numImpressora == null) { + if (other.numImpressora != null) + return false; + } else if (!numImpressora.equals(other.numImpressora)) + return false; + return true; + } + + public boolean isInconsistente() { + return inconsistente; + } + + public void setInconsistente(boolean inconsistente) { + this.inconsistente = inconsistente; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java index ca518d80b..82f5e17f6 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java @@ -1,307 +1,307 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; -import java.util.List; - -public class ImportacionManualFiscalVO { - - private String numImpressora; - private String coo; - private Long boletoId; - private Integer empresaId; - private String empresa; - private String dataEmissao; - private BigDecimal valorTotal; - private Integer origenId; - private String origenUf; - private Integer destinoId; - private String destinoUf; - private String repTributado; - private BigDecimal valorItem; - private String tipoPassagem; - private String numItem; - private String codProduto; - private String serie; - private BigDecimal icms; - private BigDecimal porctributo; - private Integer estadoIdOrigen; - private Integer estadoIdDestino; - private BigDecimal importetaxaembarque; - private BigDecimal importepedagio; - private BigDecimal importeoutros; - private BigDecimal importeseguro; - private String subSerie; - private String aidf; - private String numpdv; - private String modeloImpressora; - private String numCaixa; - private String status; - private String claseServicio; - - List subItens; - - public String getNumImpressora() { - return numImpressora; - } - - public void setNumImpressora(String numImpressora) { - this.numImpressora = numImpressora; - } - - public String getCoo() { - return coo; - } - - public void setCoo(String coo) { - this.coo = coo; - } - - public Long getBoletoId() { - return boletoId; - } - - public void setBoletoId(Long boletoId) { - this.boletoId = boletoId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public String getDataEmissao() { - return dataEmissao; - } - - public void setDataEmissao(String dataEmissao) { - this.dataEmissao = dataEmissao; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public String getRepTributado() { - return repTributado; - } - - public void setRepTributado(String repTributado) { - this.repTributado = repTributado; - } - - public BigDecimal getValorItem() { - return valorItem; - } - - public void setValorItem(BigDecimal valorItem) { - this.valorItem = valorItem; - } - - public String getTipoPassagem() { - return tipoPassagem; - } - - public void setTipoPassagem(String tipoPassagem) { - this.tipoPassagem = tipoPassagem; - } - - public String getNumItem() { - return numItem; - } - - public void setNumItem(String numItem) { - this.numItem = numItem; - } - - public String getCodProduto() { - return codProduto; - } - - public void setCodProduto(String codProduto) { - this.codProduto = codProduto; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - public BigDecimal getIcms() { - return icms; - } - - public void setIcms(BigDecimal icms) { - this.icms = icms; - } - - public BigDecimal getPorctributo() { - return porctributo; - } - - public void setPorctributo(BigDecimal porctributo) { - this.porctributo = porctributo; - } - - public BigDecimal getImportetaxaembarque() { - return importetaxaembarque; - } - - public void setImportetaxaembarque(BigDecimal importetaxaembarque) { - this.importetaxaembarque = importetaxaembarque; - } - - public BigDecimal getImportepedagio() { - return importepedagio; - } - - public void setImportepedagio(BigDecimal importepedagio) { - this.importepedagio = importepedagio; - } - - public BigDecimal getImporteoutros() { - return importeoutros; - } - - public void setImporteoutros(BigDecimal importeoutros) { - this.importeoutros = importeoutros; - } - - public BigDecimal getImporteseguro() { - return importeseguro; - } - - public void setImporteseguro(BigDecimal importeseguro) { - this.importeseguro = importeseguro; - } - - public List getSubItens() { - return subItens; - } - - public void setSubItens(List subItens) { - this.subItens = subItens; - } - - public Integer getEstadoIdOrigen() { - return estadoIdOrigen; - } - - public void setEstadoIdOrigen(Integer estadoIdOrigen) { - this.estadoIdOrigen = estadoIdOrigen; - } - - public Integer getEstadoIdDestino() { - return estadoIdDestino; - } - - public void setEstadoIdDestino(Integer estadoIdDestino) { - this.estadoIdDestino = estadoIdDestino; - } - - public String getSubSerie() { - return subSerie; - } - - public void setSubSerie(String subSerie) { - this.subSerie = subSerie; - } - - public String getAidf() { - return aidf; - } - - public void setAidf(String aidf) { - this.aidf = aidf; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public String getNumpdv() { - return numpdv; - } - - public void setNumpdv(String numpdv) { - this.numpdv = numpdv; - } - - public String getModeloImpressora() { - return modeloImpressora; - } - - public void setModeloImpressora(String modeloImpressora) { - this.modeloImpressora = modeloImpressora; - } - - public String getNumCaixa() { - return numCaixa; - } - - public void setNumCaixa(String numCaixa) { - this.numCaixa = numCaixa; - } - - public String getOrigenUf() { - return origenUf; - } - - public void setOrigenUf(String origenUf) { - this.origenUf = origenUf; - } - - public String getDestinoUf() { - return destinoUf; - } - - public void setDestinoUf(String destinoUf) { - this.destinoUf = destinoUf; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getClaseServicio() { - return claseServicio; - } - - public void setClaseServicio(String claseServicio) { - this.claseServicio = claseServicio; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; +import java.util.List; + +public class ImportacionManualFiscalVO { + + private String numImpressora; + private String coo; + private Long boletoId; + private Integer empresaId; + private String empresa; + private String dataEmissao; + private BigDecimal valorTotal; + private Integer origenId; + private String origenUf; + private Integer destinoId; + private String destinoUf; + private String repTributado; + private BigDecimal valorItem; + private String tipoPassagem; + private String numItem; + private String codProduto; + private String serie; + private BigDecimal icms; + private BigDecimal porctributo; + private Integer estadoIdOrigen; + private Integer estadoIdDestino; + private BigDecimal importetaxaembarque; + private BigDecimal importepedagio; + private BigDecimal importeoutros; + private BigDecimal importeseguro; + private String subSerie; + private String aidf; + private String numpdv; + private String modeloImpressora; + private String numCaixa; + private String status; + private String claseServicio; + + List subItens; + + public String getNumImpressora() { + return numImpressora; + } + + public void setNumImpressora(String numImpressora) { + this.numImpressora = numImpressora; + } + + public String getCoo() { + return coo; + } + + public void setCoo(String coo) { + this.coo = coo; + } + + public Long getBoletoId() { + return boletoId; + } + + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public String getDataEmissao() { + return dataEmissao; + } + + public void setDataEmissao(String dataEmissao) { + this.dataEmissao = dataEmissao; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public String getRepTributado() { + return repTributado; + } + + public void setRepTributado(String repTributado) { + this.repTributado = repTributado; + } + + public BigDecimal getValorItem() { + return valorItem; + } + + public void setValorItem(BigDecimal valorItem) { + this.valorItem = valorItem; + } + + public String getTipoPassagem() { + return tipoPassagem; + } + + public void setTipoPassagem(String tipoPassagem) { + this.tipoPassagem = tipoPassagem; + } + + public String getNumItem() { + return numItem; + } + + public void setNumItem(String numItem) { + this.numItem = numItem; + } + + public String getCodProduto() { + return codProduto; + } + + public void setCodProduto(String codProduto) { + this.codProduto = codProduto; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public BigDecimal getIcms() { + return icms; + } + + public void setIcms(BigDecimal icms) { + this.icms = icms; + } + + public BigDecimal getPorctributo() { + return porctributo; + } + + public void setPorctributo(BigDecimal porctributo) { + this.porctributo = porctributo; + } + + public BigDecimal getImportetaxaembarque() { + return importetaxaembarque; + } + + public void setImportetaxaembarque(BigDecimal importetaxaembarque) { + this.importetaxaembarque = importetaxaembarque; + } + + public BigDecimal getImportepedagio() { + return importepedagio; + } + + public void setImportepedagio(BigDecimal importepedagio) { + this.importepedagio = importepedagio; + } + + public BigDecimal getImporteoutros() { + return importeoutros; + } + + public void setImporteoutros(BigDecimal importeoutros) { + this.importeoutros = importeoutros; + } + + public BigDecimal getImporteseguro() { + return importeseguro; + } + + public void setImporteseguro(BigDecimal importeseguro) { + this.importeseguro = importeseguro; + } + + public List getSubItens() { + return subItens; + } + + public void setSubItens(List subItens) { + this.subItens = subItens; + } + + public Integer getEstadoIdOrigen() { + return estadoIdOrigen; + } + + public void setEstadoIdOrigen(Integer estadoIdOrigen) { + this.estadoIdOrigen = estadoIdOrigen; + } + + public Integer getEstadoIdDestino() { + return estadoIdDestino; + } + + public void setEstadoIdDestino(Integer estadoIdDestino) { + this.estadoIdDestino = estadoIdDestino; + } + + public String getSubSerie() { + return subSerie; + } + + public void setSubSerie(String subSerie) { + this.subSerie = subSerie; + } + + public String getAidf() { + return aidf; + } + + public void setAidf(String aidf) { + this.aidf = aidf; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public String getNumpdv() { + return numpdv; + } + + public void setNumpdv(String numpdv) { + this.numpdv = numpdv; + } + + public String getModeloImpressora() { + return modeloImpressora; + } + + public void setModeloImpressora(String modeloImpressora) { + this.modeloImpressora = modeloImpressora; + } + + public String getNumCaixa() { + return numCaixa; + } + + public void setNumCaixa(String numCaixa) { + this.numCaixa = numCaixa; + } + + public String getOrigenUf() { + return origenUf; + } + + public void setOrigenUf(String origenUf) { + this.origenUf = origenUf; + } + + public String getDestinoUf() { + return destinoUf; + } + + public void setDestinoUf(String destinoUf) { + this.destinoUf = destinoUf; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(String claseServicio) { + this.claseServicio = claseServicio; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionNaoFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionNaoFiscalVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionNaoFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionNaoFiscalVO.java index 2beaa2b7f..4b99817ab 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionNaoFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionNaoFiscalVO.java @@ -1,51 +1,51 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; -import java.util.Date; - -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -public class ImportacionNaoFiscalVO { - - private Integer tipoeventoextraId; - private String desctipoevento; - private BigDecimal total; - private Date fechorvta; - - public Integer getTipoeventoextraId() { - return tipoeventoextraId; - } - - public void setTipoeventoextraId(Integer tipoeventoextraId) { - this.tipoeventoextraId = tipoeventoextraId; - } - - public String getDesctipoevento() { - return desctipoevento; - } - - public void setDesctipoevento(String desctipoevento) { - this.desctipoevento = desctipoevento; - } - - public BigDecimal getTotal() { - return total; - } - - public void setTotal(BigDecimal total) { - this.total = total; - } - - public Date getFechorvta() { - return fechorvta; - } - - public void setFechorvta(Date fechorvta) { - this.fechorvta = fechorvta; - } - - public String getNumeroDocumento() { - return getTipoeventoextraId() + DateUtil.getStringDate(getFechorvta(), "ddMMyy"); - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; +import java.util.Date; + +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +public class ImportacionNaoFiscalVO { + + private Integer tipoeventoextraId; + private String desctipoevento; + private BigDecimal total; + private Date fechorvta; + + public Integer getTipoeventoextraId() { + return tipoeventoextraId; + } + + public void setTipoeventoextraId(Integer tipoeventoextraId) { + this.tipoeventoextraId = tipoeventoextraId; + } + + public String getDesctipoevento() { + return desctipoevento; + } + + public void setDesctipoevento(String desctipoevento) { + this.desctipoevento = desctipoevento; + } + + public BigDecimal getTotal() { + return total; + } + + public void setTotal(BigDecimal total) { + this.total = total; + } + + public Date getFechorvta() { + return fechorvta; + } + + public void setFechorvta(Date fechorvta) { + this.fechorvta = fechorvta; + } + + public String getNumeroDocumento() { + return getTipoeventoextraId() + DateUtil.getStringDate(getFechorvta(), "ddMMyy"); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemFiscalVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemFiscalVO.java index 6d59c3d7a..72d25e519 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemFiscalVO.java @@ -1,120 +1,120 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class ItemFiscalVO extends ImportacionFiscalVO { - - private String numItem; - private String codProduto; - private String repTributado; - private BigDecimal valorItem; - private String tipoPassagem; - private Boolean inconsistencia; - - public ItemFiscalVO() { - super(); - } - - public ItemFiscalVO(ImportacionFiscalVO item) { - super(item.getNumImpressora(), item.getCoo(), item.getBoletoId(), item.getEmpresaId(), item.getDataEmissao(), - item.getCnpjCliente(), item.getCnpjImpressora(), item.getOrigenId(), item.getOrigenUf(), item.getDestinoId(), - item.getDestinoUf(), item.getNumpdv(), item.getModeloImpressora(), item.getNumCaixa(), item.getStatus(), - item.getMotivocancelacion(), item.getValorMulta(), item.getValorTarifa(), item.getValorPedagio(), - item.getValorEmbarque(), item.getValorSeguro(), item.getClaseServicio()); - super.setImpostoEstado(item.getImpostoEstado()); - } - - public String getNumItem() { - return numItem; - } - - public void setNumItem(String numItem) { - this.numItem = numItem; - } - - public String getCodProduto() { - return codProduto; - } - - public void setCodProduto(String codProduto) { - this.codProduto = codProduto; - } - - public String getRepTributado() { - return repTributado; - } - - public void setRepTributado(String repTributado) { - this.repTributado = repTributado; - } - - public BigDecimal getValorItem() { - return valorItem; - } - - public void setValorItem(BigDecimal valorItem) { - this.valorItem = valorItem; - } - - public String getTipoPassagem() { - return tipoPassagem; - } - - public void setTipoPassagem(String tipoPassagem) { - this.tipoPassagem = tipoPassagem; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((super.getBoletoId() == null) ? 0 : super.getBoletoId().hashCode()); - result = prime * result + ((super.getCoo() == null) ? 0 : super.getCoo().hashCode()); - result = prime * result + ((super.getNumImpressora() == null) ? 0 : super.getNumImpressora().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ImportacionFiscalVO other = (ImportacionFiscalVO) obj; - if (super.getBoletoId() == null) { - if (other.getBoletoId() != null) - return false; - } else if (!super.getBoletoId().equals(other.getBoletoId())) - return false; - if (super.getCoo() == null) { - if (other.getCoo() != null) - return false; - } else if (!super.getCoo().equals(other.getCoo())) - return false; - if (super.getNumImpressora() == null) { - if (other.getNumImpressora() != null) - return false; - } else if (!super.getNumImpressora().equals(other.getNumImpressora())) - return false; - return true; - } - - @Override - public String toString() { - return "ItemFiscalVO [numItem=" + numItem + ", codProduto=" + codProduto + ", repTributado=" + repTributado + ", valorItem=" + valorItem + ", tipoPassagem=" + tipoPassagem + ", getNumImpressora()=" + getNumImpressora() + ", getCoo()=" + getCoo() + ", getBoletoId()=" + getBoletoId() + ", getEmpresaId()=" + getEmpresaId() + ", getDataEmissao()=" + getDataEmissao() + ", getCnpjCliente()=" + getCnpjCliente() + ", getCnpjImpressora()=" + getCnpjImpressora() + ", getOrigenId()=" + getOrigenId() + ", getItensFiscais()=" + getItensFiscais().size() + ", getNumpdv()=" + getNumpdv() + "]"; - } - - public Boolean getInconsistencia() { - return inconsistencia; - } - - public void setInconsistencia(Boolean inconsistencia) { - if (inconsistencia == null) - this.inconsistencia = Boolean.FALSE; - else - this.inconsistencia = inconsistencia; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class ItemFiscalVO extends ImportacionFiscalVO { + + private String numItem; + private String codProduto; + private String repTributado; + private BigDecimal valorItem; + private String tipoPassagem; + private Boolean inconsistencia; + + public ItemFiscalVO() { + super(); + } + + public ItemFiscalVO(ImportacionFiscalVO item) { + super(item.getNumImpressora(), item.getCoo(), item.getBoletoId(), item.getEmpresaId(), item.getDataEmissao(), + item.getCnpjCliente(), item.getCnpjImpressora(), item.getOrigenId(), item.getOrigenUf(), item.getDestinoId(), + item.getDestinoUf(), item.getNumpdv(), item.getModeloImpressora(), item.getNumCaixa(), item.getStatus(), + item.getMotivocancelacion(), item.getValorMulta(), item.getValorTarifa(), item.getValorPedagio(), + item.getValorEmbarque(), item.getValorSeguro(), item.getClaseServicio()); + super.setImpostoEstado(item.getImpostoEstado()); + } + + public String getNumItem() { + return numItem; + } + + public void setNumItem(String numItem) { + this.numItem = numItem; + } + + public String getCodProduto() { + return codProduto; + } + + public void setCodProduto(String codProduto) { + this.codProduto = codProduto; + } + + public String getRepTributado() { + return repTributado; + } + + public void setRepTributado(String repTributado) { + this.repTributado = repTributado; + } + + public BigDecimal getValorItem() { + return valorItem; + } + + public void setValorItem(BigDecimal valorItem) { + this.valorItem = valorItem; + } + + public String getTipoPassagem() { + return tipoPassagem; + } + + public void setTipoPassagem(String tipoPassagem) { + this.tipoPassagem = tipoPassagem; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((super.getBoletoId() == null) ? 0 : super.getBoletoId().hashCode()); + result = prime * result + ((super.getCoo() == null) ? 0 : super.getCoo().hashCode()); + result = prime * result + ((super.getNumImpressora() == null) ? 0 : super.getNumImpressora().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ImportacionFiscalVO other = (ImportacionFiscalVO) obj; + if (super.getBoletoId() == null) { + if (other.getBoletoId() != null) + return false; + } else if (!super.getBoletoId().equals(other.getBoletoId())) + return false; + if (super.getCoo() == null) { + if (other.getCoo() != null) + return false; + } else if (!super.getCoo().equals(other.getCoo())) + return false; + if (super.getNumImpressora() == null) { + if (other.getNumImpressora() != null) + return false; + } else if (!super.getNumImpressora().equals(other.getNumImpressora())) + return false; + return true; + } + + @Override + public String toString() { + return "ItemFiscalVO [numItem=" + numItem + ", codProduto=" + codProduto + ", repTributado=" + repTributado + ", valorItem=" + valorItem + ", tipoPassagem=" + tipoPassagem + ", getNumImpressora()=" + getNumImpressora() + ", getCoo()=" + getCoo() + ", getBoletoId()=" + getBoletoId() + ", getEmpresaId()=" + getEmpresaId() + ", getDataEmissao()=" + getDataEmissao() + ", getCnpjCliente()=" + getCnpjCliente() + ", getCnpjImpressora()=" + getCnpjImpressora() + ", getOrigenId()=" + getOrigenId() + ", getItensFiscais()=" + getItensFiscais().size() + ", getNumpdv()=" + getNumpdv() + "]"; + } + + public Boolean getInconsistencia() { + return inconsistencia; + } + + public void setInconsistencia(Boolean inconsistencia) { + if (inconsistencia == null) + this.inconsistencia = Boolean.FALSE; + else + this.inconsistencia = inconsistencia; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioFinanceiro.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioFinanceiro.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioFinanceiro.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioFinanceiro.java index 19ea62feb..84e850c12 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioFinanceiro.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioFinanceiro.java @@ -1,44 +1,44 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class ItemRelatorioFinanceiro { - - private String movimentacao; - private String empresa; - private BigDecimal valorEnCaja; - private String tipoVenta; - - public String getMovimentacao() { - return movimentacao; - } - - public void setMovimentacao(String movimentacao) { - this.movimentacao = movimentacao; - } - - public String getEmpresa() { - return empresa; - } - - public void setEmpresa(String empresa) { - this.empresa = empresa; - } - - public BigDecimal getValorEnCaja() { - return valorEnCaja; - } - - public void setValorEnCaja(BigDecimal valorEnCaja) { - this.valorEnCaja = valorEnCaja; - } - - public String getTipoVenta() { - return tipoVenta; - } - - public void setTipoVenta(String tipoVenta) { - this.tipoVenta = tipoVenta; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class ItemRelatorioFinanceiro { + + private String movimentacao; + private String empresa; + private BigDecimal valorEnCaja; + private String tipoVenta; + + public String getMovimentacao() { + return movimentacao; + } + + public void setMovimentacao(String movimentacao) { + this.movimentacao = movimentacao; + } + + public String getEmpresa() { + return empresa; + } + + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + + public BigDecimal getValorEnCaja() { + return valorEnCaja; + } + + public void setValorEnCaja(BigDecimal valorEnCaja) { + this.valorEnCaja = valorEnCaja; + } + + public String getTipoVenta() { + return tipoVenta; + } + + public void setTipoVenta(String tipoVenta) { + this.tipoVenta = tipoVenta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioVoucher.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioVoucher.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioVoucher.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioVoucher.java index 0bf97dca1..c8971e50a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioVoucher.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ItemRelatorioVoucher.java @@ -1,98 +1,98 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class ItemRelatorioVoucher { - - private String situacao; - private String competenciaEntrega; - private String competenciaVenda; - private String competenciaCancelamento; - private BigDecimal tarifa; - private BigDecimal pedagio; - private BigDecimal embarque; - private BigDecimal seguro; - private Integer qtde; - - public String getSituacao() { - return situacao; - } - - public void setSituacao(String situacao) { - this.situacao = situacao; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getEmbarque() { - return embarque; - } - - public void setEmbarque(BigDecimal embarque) { - this.embarque = embarque; - } - - public BigDecimal getSeguro() { - return seguro; - } - - public void setSeguro(BigDecimal seguro) { - this.seguro = seguro; - } - - public Integer getQtde() { - return qtde; - } - - public void setQtde(Integer qtde) { - this.qtde = qtde; - } - - public BigDecimal getTotal() { - BigDecimal total = BigDecimal.ZERO; - total = total.add(getEmbarque()) - .add(getPedagio()) - .add(getSeguro()) - .add(getTarifa()); - return total; - } - - public String getCompetenciaEntrega() { - return competenciaEntrega; - } - - public void setCompetenciaEntrega(String competenciaEntrega) { - this.competenciaEntrega = competenciaEntrega; - } - - public String getCompetenciaVenda() { - return competenciaVenda; - } - - public void setCompetenciaVenda(String competenciaVenda) { - this.competenciaVenda = competenciaVenda; - } - - public String getCompetenciaCancelamento() { - return competenciaCancelamento; - } - - public void setCompetenciaCancelamento(String competenciaCancelamento) { - this.competenciaCancelamento = competenciaCancelamento; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class ItemRelatorioVoucher { + + private String situacao; + private String competenciaEntrega; + private String competenciaVenda; + private String competenciaCancelamento; + private BigDecimal tarifa; + private BigDecimal pedagio; + private BigDecimal embarque; + private BigDecimal seguro; + private Integer qtde; + + public String getSituacao() { + return situacao; + } + + public void setSituacao(String situacao) { + this.situacao = situacao; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getEmbarque() { + return embarque; + } + + public void setEmbarque(BigDecimal embarque) { + this.embarque = embarque; + } + + public BigDecimal getSeguro() { + return seguro; + } + + public void setSeguro(BigDecimal seguro) { + this.seguro = seguro; + } + + public Integer getQtde() { + return qtde; + } + + public void setQtde(Integer qtde) { + this.qtde = qtde; + } + + public BigDecimal getTotal() { + BigDecimal total = BigDecimal.ZERO; + total = total.add(getEmbarque()) + .add(getPedagio()) + .add(getSeguro()) + .add(getTarifa()); + return total; + } + + public String getCompetenciaEntrega() { + return competenciaEntrega; + } + + public void setCompetenciaEntrega(String competenciaEntrega) { + this.competenciaEntrega = competenciaEntrega; + } + + public String getCompetenciaVenda() { + return competenciaVenda; + } + + public void setCompetenciaVenda(String competenciaVenda) { + this.competenciaVenda = competenciaVenda; + } + + public String getCompetenciaCancelamento() { + return competenciaCancelamento; + } + + public void setCompetenciaCancelamento(String competenciaCancelamento) { + this.competenciaCancelamento = competenciaCancelamento; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalReducaoZVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalReducaoZVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalReducaoZVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalReducaoZVO.java index a85c2bfaf..379c88fae 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalReducaoZVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalReducaoZVO.java @@ -1,149 +1,149 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class LeitorFiscalReducaoZVO implements Comparable { - - private Integer empresaId; - private String nombempresa; - private String cnpj; - private String datamov; - private BigDecimal aliquota; - private BigDecimal imposto; - private BigDecimal valorNaoTributado; - private BigDecimal vendabrutadiaria; - - public LeitorFiscalReducaoZVO() { - super(); - setAliquota(BigDecimal.ZERO); - setImposto(BigDecimal.ZERO); - setValorNaoTributado(BigDecimal.ZERO); - setVendabrutadiaria(BigDecimal.ZERO); - } - - @Override - public int compareTo(LeitorFiscalReducaoZVO o) { - int retorno = getDatamov().compareTo(o.getDatamov()); - if(retorno == 0) { - retorno = getNombempresa().compareTo(o.getNombempresa()); - } - if(retorno == 0) { - retorno = getCnpj().compareTo(o.getCnpj()); - } - if(retorno == 0) { - retorno = getAliquota().compareTo(o.getAliquota()); - } - return retorno; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getEmpresaId() == null) ? 0 : getEmpresaId().hashCode()); - result = prime * result + ((getDatamov() == null) ? 0 : getDatamov().hashCode()); - result = prime * result + ((getCnpj() == null) ? 0 : getCnpj().hashCode()); - result = prime * result + ((getAliquota() == null) ? 0 : getAliquota().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - LeitorFiscalReducaoZVO other = (LeitorFiscalReducaoZVO) obj; - if (getEmpresaId() == null) { - if (other.getEmpresaId() != null) - return false; - } else if (!getEmpresaId().equals(other.getEmpresaId())) - return false; - if (getDatamov() == null) { - if (other.getDatamov() != null) - return false; - } else if (!getDatamov().equals(other.getDatamov())) - return false; - if (getCnpj() == null) { - if (other.getCnpj() != null) - return false; - } else if (!getCnpj().equals(other.getCnpj())) - return false; - if (getAliquota() == null) { - if (other.getAliquota() != null) - return false; - } else if (!getAliquota().equals(other.getAliquota())) - return false; - return true; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public BigDecimal getAliquota() { - return aliquota; - } - - public void setAliquota(BigDecimal aliquota) { - this.aliquota = aliquota; - } - - public BigDecimal getImposto() { - return imposto; - } - - public void setImposto(BigDecimal imposto) { - this.imposto = imposto; - } - - public BigDecimal getValorNaoTributado() { - return valorNaoTributado; - } - - public void setValorNaoTributado(BigDecimal valorNaoTributado) { - this.valorNaoTributado = valorNaoTributado; - } - - public BigDecimal getVendabrutadiaria() { - return vendabrutadiaria; - } - - public void setVendabrutadiaria(BigDecimal vendabrutadiaria) { - this.vendabrutadiaria = vendabrutadiaria; - } - - public String getCnpj() { - return cnpj; - } - - public void setCnpj(String cnpj) { - this.cnpj = cnpj; - } - - @Override - public String toString() { - return "LeitorFiscalReducaoZVO [empresaId=" + empresaId + ", nombempresa=" + nombempresa + ", cnpj=" + cnpj + ", datamov=" + datamov + ", aliquota=" + aliquota + ", imposto=" + imposto + ", valorNaoTributado=" + valorNaoTributado + ", vendabrutadiaria=" + vendabrutadiaria + "]"; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class LeitorFiscalReducaoZVO implements Comparable { + + private Integer empresaId; + private String nombempresa; + private String cnpj; + private String datamov; + private BigDecimal aliquota; + private BigDecimal imposto; + private BigDecimal valorNaoTributado; + private BigDecimal vendabrutadiaria; + + public LeitorFiscalReducaoZVO() { + super(); + setAliquota(BigDecimal.ZERO); + setImposto(BigDecimal.ZERO); + setValorNaoTributado(BigDecimal.ZERO); + setVendabrutadiaria(BigDecimal.ZERO); + } + + @Override + public int compareTo(LeitorFiscalReducaoZVO o) { + int retorno = getDatamov().compareTo(o.getDatamov()); + if(retorno == 0) { + retorno = getNombempresa().compareTo(o.getNombempresa()); + } + if(retorno == 0) { + retorno = getCnpj().compareTo(o.getCnpj()); + } + if(retorno == 0) { + retorno = getAliquota().compareTo(o.getAliquota()); + } + return retorno; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getEmpresaId() == null) ? 0 : getEmpresaId().hashCode()); + result = prime * result + ((getDatamov() == null) ? 0 : getDatamov().hashCode()); + result = prime * result + ((getCnpj() == null) ? 0 : getCnpj().hashCode()); + result = prime * result + ((getAliquota() == null) ? 0 : getAliquota().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + LeitorFiscalReducaoZVO other = (LeitorFiscalReducaoZVO) obj; + if (getEmpresaId() == null) { + if (other.getEmpresaId() != null) + return false; + } else if (!getEmpresaId().equals(other.getEmpresaId())) + return false; + if (getDatamov() == null) { + if (other.getDatamov() != null) + return false; + } else if (!getDatamov().equals(other.getDatamov())) + return false; + if (getCnpj() == null) { + if (other.getCnpj() != null) + return false; + } else if (!getCnpj().equals(other.getCnpj())) + return false; + if (getAliquota() == null) { + if (other.getAliquota() != null) + return false; + } else if (!getAliquota().equals(other.getAliquota())) + return false; + return true; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public BigDecimal getAliquota() { + return aliquota; + } + + public void setAliquota(BigDecimal aliquota) { + this.aliquota = aliquota; + } + + public BigDecimal getImposto() { + return imposto; + } + + public void setImposto(BigDecimal imposto) { + this.imposto = imposto; + } + + public BigDecimal getValorNaoTributado() { + return valorNaoTributado; + } + + public void setValorNaoTributado(BigDecimal valorNaoTributado) { + this.valorNaoTributado = valorNaoTributado; + } + + public BigDecimal getVendabrutadiaria() { + return vendabrutadiaria; + } + + public void setVendabrutadiaria(BigDecimal vendabrutadiaria) { + this.vendabrutadiaria = vendabrutadiaria; + } + + public String getCnpj() { + return cnpj; + } + + public void setCnpj(String cnpj) { + this.cnpj = cnpj; + } + + @Override + public String toString() { + return "LeitorFiscalReducaoZVO [empresaId=" + empresaId + ", nombempresa=" + nombempresa + ", cnpj=" + cnpj + ", datamov=" + datamov + ", aliquota=" + aliquota + ", imposto=" + imposto + ", valorNaoTributado=" + valorNaoTributado + ", vendabrutadiaria=" + vendabrutadiaria + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalVO.java index 5dbb80e97..3d0c56594 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorFiscalVO.java @@ -1,145 +1,145 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; - -public class LeitorFiscalVO extends ImportacionFiscalVO implements Comparable { - - private static BigDecimal CEM = new BigDecimal(100); - - private String nombempresa; - private Integer qtdeItens; - private BigDecimal aliquota; - - public LeitorFiscalVO() { - super(); - qtdeItens = 0; - setValorEmbarque(BigDecimal.ZERO); - setValorMulta(BigDecimal.ZERO); - setValorPedagio(BigDecimal.ZERO); - setValorSeguro(BigDecimal.ZERO); - setValorTarifa(BigDecimal.ZERO); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getDataEmissao() == null) ? 0 : getDataEmissao().hashCode()); - result = prime * result + ((getEmpresaId() == null) ? 0 : getEmpresaId().hashCode()); - result = prime * result + ((getOrigenUf() == null) ? 0 : getOrigenUf().hashCode()); - result = prime * result + ((getDestinoUf() == null) ? 0 : getDestinoUf().hashCode()); - result = prime * result + ((getClaseServicio() == null) ? 0 : getClaseServicio().hashCode()); - result = prime * result + ((getDescmotivocancelamento() == null) ? 0 : getDescmotivocancelamento().hashCode()); - result = prime * result + ((getAliquota() == null) ? 0 : getAliquota().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof LeitorFiscalVO)) - return false; - LeitorFiscalVO other = (LeitorFiscalVO) obj; - if (getDataEmissao() == null) { - if (other.getDataEmissao() != null) - return false; - } else if (!getDataEmissao().equals(other.getDataEmissao())) - return false; - if (getEmpresaId() == null) { - if (other.getEmpresaId() != null) - return false; - } else if (!getEmpresaId().equals(other.getEmpresaId())) - return false; - if (getOrigenUf() == null) { - if (other.getOrigenUf() != null) - return false; - } else if (!getOrigenUf().equals(other.getOrigenUf())) - return false; - if (getDestinoUf() == null) { - if (other.getDestinoUf() != null) - return false; - } else if (!getDestinoUf().equals(other.getDestinoUf())) - return false; - if (getClaseServicio() == null) { - if (other.getClaseServicio() != null) - return false; - } else if (!getClaseServicio().equals(other.getClaseServicio())) - return false; - if (getDescmotivocancelamento() == null) { - if (other.getDescmotivocancelamento() != null) - return false; - } else if (!getDescmotivocancelamento().equals(other.getDescmotivocancelamento())) - return false; - if (getAliquota() == null) { - if (other.getAliquota() != null) - return false; - } else if (!getAliquota().equals(other.getAliquota())) - return false; - return true; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public Integer getQtdeItens() { - return qtdeItens; - } - - public void setQtdeItens(Integer qtdeItens) { - this.qtdeItens = qtdeItens; - } - - public BigDecimal getAliquota() { - return aliquota; - } - - public void setAliquota(BigDecimal aliquota) { - this.aliquota = aliquota; - } - - public BigDecimal getTotal() { - BigDecimal total = BigDecimal.ZERO; - total = total.add(getValorEmbarque()) - .add(getValorMulta()) - .add(getValorPedagio()) - .add(getValorTarifa()) - .add(getValorSeguro()); - return total; - } - - @Override - public int compareTo(LeitorFiscalVO o) { - int retorno = getDataEmissao().compareTo(o.getDataEmissao()); - if(retorno == 0) { - retorno = getNombempresa().compareTo(o.getNombempresa()); - } - if(retorno == 0) { - retorno = getOrigenUf().compareTo(o.getOrigenUf()); - } - if(retorno == 0) { - retorno = getDestinoUf().compareTo(o.getDestinoUf()); - } - if(retorno == 0) { - retorno = getClaseServicio().compareTo(o.getClaseServicio()); - } - if(retorno == 0) { - retorno = getDescmotivocancelamento().compareTo(o.getDescmotivocancelamento()); - } - return retorno; - } - - public BigDecimal getValorIcms() { - return UtiliteriasFiscal.arredondar(getValorTarifa().multiply(getAliquota().divide(CEM))); - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; + +public class LeitorFiscalVO extends ImportacionFiscalVO implements Comparable { + + private static BigDecimal CEM = new BigDecimal(100); + + private String nombempresa; + private Integer qtdeItens; + private BigDecimal aliquota; + + public LeitorFiscalVO() { + super(); + qtdeItens = 0; + setValorEmbarque(BigDecimal.ZERO); + setValorMulta(BigDecimal.ZERO); + setValorPedagio(BigDecimal.ZERO); + setValorSeguro(BigDecimal.ZERO); + setValorTarifa(BigDecimal.ZERO); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getDataEmissao() == null) ? 0 : getDataEmissao().hashCode()); + result = prime * result + ((getEmpresaId() == null) ? 0 : getEmpresaId().hashCode()); + result = prime * result + ((getOrigenUf() == null) ? 0 : getOrigenUf().hashCode()); + result = prime * result + ((getDestinoUf() == null) ? 0 : getDestinoUf().hashCode()); + result = prime * result + ((getClaseServicio() == null) ? 0 : getClaseServicio().hashCode()); + result = prime * result + ((getDescmotivocancelamento() == null) ? 0 : getDescmotivocancelamento().hashCode()); + result = prime * result + ((getAliquota() == null) ? 0 : getAliquota().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof LeitorFiscalVO)) + return false; + LeitorFiscalVO other = (LeitorFiscalVO) obj; + if (getDataEmissao() == null) { + if (other.getDataEmissao() != null) + return false; + } else if (!getDataEmissao().equals(other.getDataEmissao())) + return false; + if (getEmpresaId() == null) { + if (other.getEmpresaId() != null) + return false; + } else if (!getEmpresaId().equals(other.getEmpresaId())) + return false; + if (getOrigenUf() == null) { + if (other.getOrigenUf() != null) + return false; + } else if (!getOrigenUf().equals(other.getOrigenUf())) + return false; + if (getDestinoUf() == null) { + if (other.getDestinoUf() != null) + return false; + } else if (!getDestinoUf().equals(other.getDestinoUf())) + return false; + if (getClaseServicio() == null) { + if (other.getClaseServicio() != null) + return false; + } else if (!getClaseServicio().equals(other.getClaseServicio())) + return false; + if (getDescmotivocancelamento() == null) { + if (other.getDescmotivocancelamento() != null) + return false; + } else if (!getDescmotivocancelamento().equals(other.getDescmotivocancelamento())) + return false; + if (getAliquota() == null) { + if (other.getAliquota() != null) + return false; + } else if (!getAliquota().equals(other.getAliquota())) + return false; + return true; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public Integer getQtdeItens() { + return qtdeItens; + } + + public void setQtdeItens(Integer qtdeItens) { + this.qtdeItens = qtdeItens; + } + + public BigDecimal getAliquota() { + return aliquota; + } + + public void setAliquota(BigDecimal aliquota) { + this.aliquota = aliquota; + } + + public BigDecimal getTotal() { + BigDecimal total = BigDecimal.ZERO; + total = total.add(getValorEmbarque()) + .add(getValorMulta()) + .add(getValorPedagio()) + .add(getValorTarifa()) + .add(getValorSeguro()); + return total; + } + + @Override + public int compareTo(LeitorFiscalVO o) { + int retorno = getDataEmissao().compareTo(o.getDataEmissao()); + if(retorno == 0) { + retorno = getNombempresa().compareTo(o.getNombempresa()); + } + if(retorno == 0) { + retorno = getOrigenUf().compareTo(o.getOrigenUf()); + } + if(retorno == 0) { + retorno = getDestinoUf().compareTo(o.getDestinoUf()); + } + if(retorno == 0) { + retorno = getClaseServicio().compareTo(o.getClaseServicio()); + } + if(retorno == 0) { + retorno = getDescmotivocancelamento().compareTo(o.getDescmotivocancelamento()); + } + return retorno; + } + + public BigDecimal getValorIcms() { + return UtiliteriasFiscal.arredondar(getValorTarifa().multiply(getAliquota().divide(CEM))); + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorManualFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorManualFiscalVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorManualFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorManualFiscalVO.java index a8ae8374d..ab7500bbf 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorManualFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorManualFiscalVO.java @@ -1,129 +1,129 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class LeitorManualFiscalVO extends ImportacionManualFiscalVO implements Comparable { - - private String nombempresa; - private Integer qtdeItens; - private BigDecimal valorIcms; - - public LeitorManualFiscalVO() { - super(); - qtdeItens = 0; - setImportetaxaembarque(BigDecimal.ZERO); - setImporteoutros(BigDecimal.ZERO); - setImportepedagio(BigDecimal.ZERO); - setImporteseguro(BigDecimal.ZERO); - setValorItem(BigDecimal.ZERO); - setValorIcms(BigDecimal.ZERO); - setValorTotal(BigDecimal.ZERO); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getDataEmissao() == null) ? 0 : getDataEmissao().hashCode()); - result = prime * result + ((getEmpresaId() == null) ? 0 : getEmpresaId().hashCode()); - result = prime * result + ((getOrigenUf() == null) ? 0 : getOrigenUf().hashCode()); - result = prime * result + ((getDestinoUf() == null) ? 0 : getDestinoUf().hashCode()); - result = prime * result + ((getClaseServicio() == null) ? 0 : getClaseServicio().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getIcms() == null) ? 0 : getIcms().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof LeitorManualFiscalVO)) - return false; - LeitorManualFiscalVO other = (LeitorManualFiscalVO) obj; - if (getDataEmissao() == null) { - if (other.getDataEmissao() != null) - return false; - } else if (!getDataEmissao().equals(other.getDataEmissao())) - return false; - if (getEmpresaId() == null) { - if (other.getEmpresaId() != null) - return false; - } else if (!getEmpresaId().equals(other.getEmpresaId())) - return false; - if (getOrigenUf() == null) { - if (other.getOrigenUf() != null) - return false; - } else if (!getOrigenUf().equals(other.getOrigenUf())) - return false; - if (getDestinoUf() == null) { - if (other.getDestinoUf() != null) - return false; - } else if (!getDestinoUf().equals(other.getDestinoUf())) - return false; - if (getClaseServicio() == null) { - if (other.getClaseServicio() != null) - return false; - } else if (!getClaseServicio().equals(other.getClaseServicio())) - return false; - if (getStatus() == null) { - if (other.getStatus() != null) - return false; - } else if (!getStatus().equals(other.getStatus())) - return false; - if (getIcms() == null) { - if (other.getIcms() != null) - return false; - } else if (!getIcms().equals(other.getIcms())) - return false; - return true; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public Integer getQtdeItens() { - return qtdeItens; - } - - public void setQtdeItens(Integer qtdeItens) { - this.qtdeItens = qtdeItens; - } - - @Override - public int compareTo(LeitorManualFiscalVO o) { - int retorno = getDataEmissao().compareTo(o.getDataEmissao()); - if(retorno == 0) { - retorno = getNombempresa().compareTo(o.getNombempresa()); - } - if(retorno == 0) { - retorno = getOrigenUf().compareTo(o.getOrigenUf()); - } - if(retorno == 0) { - retorno = getDestinoUf().compareTo(o.getDestinoUf()); - } - if(retorno == 0) { - retorno = getClaseServicio().compareTo(o.getClaseServicio()); - } - if(retorno == 0) { - retorno = getStatus().compareTo(o.getStatus()); - } - return retorno; - } - - public BigDecimal getValorIcms() { - return this.valorIcms; - } - - public void setValorIcms(BigDecimal valorIcms) { - this.valorIcms = valorIcms; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class LeitorManualFiscalVO extends ImportacionManualFiscalVO implements Comparable { + + private String nombempresa; + private Integer qtdeItens; + private BigDecimal valorIcms; + + public LeitorManualFiscalVO() { + super(); + qtdeItens = 0; + setImportetaxaembarque(BigDecimal.ZERO); + setImporteoutros(BigDecimal.ZERO); + setImportepedagio(BigDecimal.ZERO); + setImporteseguro(BigDecimal.ZERO); + setValorItem(BigDecimal.ZERO); + setValorIcms(BigDecimal.ZERO); + setValorTotal(BigDecimal.ZERO); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getDataEmissao() == null) ? 0 : getDataEmissao().hashCode()); + result = prime * result + ((getEmpresaId() == null) ? 0 : getEmpresaId().hashCode()); + result = prime * result + ((getOrigenUf() == null) ? 0 : getOrigenUf().hashCode()); + result = prime * result + ((getDestinoUf() == null) ? 0 : getDestinoUf().hashCode()); + result = prime * result + ((getClaseServicio() == null) ? 0 : getClaseServicio().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getIcms() == null) ? 0 : getIcms().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof LeitorManualFiscalVO)) + return false; + LeitorManualFiscalVO other = (LeitorManualFiscalVO) obj; + if (getDataEmissao() == null) { + if (other.getDataEmissao() != null) + return false; + } else if (!getDataEmissao().equals(other.getDataEmissao())) + return false; + if (getEmpresaId() == null) { + if (other.getEmpresaId() != null) + return false; + } else if (!getEmpresaId().equals(other.getEmpresaId())) + return false; + if (getOrigenUf() == null) { + if (other.getOrigenUf() != null) + return false; + } else if (!getOrigenUf().equals(other.getOrigenUf())) + return false; + if (getDestinoUf() == null) { + if (other.getDestinoUf() != null) + return false; + } else if (!getDestinoUf().equals(other.getDestinoUf())) + return false; + if (getClaseServicio() == null) { + if (other.getClaseServicio() != null) + return false; + } else if (!getClaseServicio().equals(other.getClaseServicio())) + return false; + if (getStatus() == null) { + if (other.getStatus() != null) + return false; + } else if (!getStatus().equals(other.getStatus())) + return false; + if (getIcms() == null) { + if (other.getIcms() != null) + return false; + } else if (!getIcms().equals(other.getIcms())) + return false; + return true; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public Integer getQtdeItens() { + return qtdeItens; + } + + public void setQtdeItens(Integer qtdeItens) { + this.qtdeItens = qtdeItens; + } + + @Override + public int compareTo(LeitorManualFiscalVO o) { + int retorno = getDataEmissao().compareTo(o.getDataEmissao()); + if(retorno == 0) { + retorno = getNombempresa().compareTo(o.getNombempresa()); + } + if(retorno == 0) { + retorno = getOrigenUf().compareTo(o.getOrigenUf()); + } + if(retorno == 0) { + retorno = getDestinoUf().compareTo(o.getDestinoUf()); + } + if(retorno == 0) { + retorno = getClaseServicio().compareTo(o.getClaseServicio()); + } + if(retorno == 0) { + retorno = getStatus().compareTo(o.getStatus()); + } + return retorno; + } + + public BigDecimal getValorIcms() { + return this.valorIcms; + } + + public void setValorIcms(BigDecimal valorIcms) { + this.valorIcms = valorIcms; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorNaoFiscalVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorNaoFiscalVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorNaoFiscalVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorNaoFiscalVO.java index 278a41384..5fb09552a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorNaoFiscalVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/LeitorNaoFiscalVO.java @@ -1,116 +1,116 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class LeitorNaoFiscalVO implements Comparable { - - private Integer empresaId; - private String nombempresa; - private String datamov; - private Integer tipoeventoextraId; - private String desctipoevento; - private BigDecimal valorTotal; - - public LeitorNaoFiscalVO() { - super(); - setValorTotal(BigDecimal.ZERO); - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getNombempresa() { - return nombempresa; - } - - public void setNombempresa(String nombempresa) { - this.nombempresa = nombempresa; - } - - public String getDatamov() { - return datamov; - } - - public void setDatamov(String datamov) { - this.datamov = datamov; - } - - public Integer getTipoeventoextraId() { - return tipoeventoextraId; - } - - public void setTipoeventoextraId(Integer tipoeventoextraId) { - this.tipoeventoextraId = tipoeventoextraId; - } - - public String getDesctipoevento() { - return desctipoevento; - } - - public void setDesctipoevento(String desctipoevento) { - this.desctipoevento = desctipoevento; - } - - public BigDecimal getValorTotal() { - return valorTotal; - } - - public void setValorTotal(BigDecimal valorTotal) { - this.valorTotal = valorTotal; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); - result = prime * result + ((empresaId == null) ? 0 : empresaId.hashCode()); - result = prime * result + ((tipoeventoextraId == null) ? 0 : tipoeventoextraId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - LeitorNaoFiscalVO other = (LeitorNaoFiscalVO) obj; - if (datamov == null) { - if (other.datamov != null) - return false; - } else if (!datamov.equals(other.datamov)) - return false; - if (empresaId == null) { - if (other.empresaId != null) - return false; - } else if (!empresaId.equals(other.empresaId)) - return false; - if (tipoeventoextraId == null) { - if (other.tipoeventoextraId != null) - return false; - } else if (!tipoeventoextraId.equals(other.tipoeventoextraId)) - return false; - return true; - } - - @Override - public int compareTo(LeitorNaoFiscalVO o) { - int retorno = getDatamov().compareTo(o.getDatamov()); - if (retorno == 0) { - retorno = getNombempresa().compareTo(o.getNombempresa()); - } - if (retorno == 0) { - retorno = getDesctipoevento().compareTo(o.getDesctipoevento()); - } - return retorno; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class LeitorNaoFiscalVO implements Comparable { + + private Integer empresaId; + private String nombempresa; + private String datamov; + private Integer tipoeventoextraId; + private String desctipoevento; + private BigDecimal valorTotal; + + public LeitorNaoFiscalVO() { + super(); + setValorTotal(BigDecimal.ZERO); + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getNombempresa() { + return nombempresa; + } + + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } + + public String getDatamov() { + return datamov; + } + + public void setDatamov(String datamov) { + this.datamov = datamov; + } + + public Integer getTipoeventoextraId() { + return tipoeventoextraId; + } + + public void setTipoeventoextraId(Integer tipoeventoextraId) { + this.tipoeventoextraId = tipoeventoextraId; + } + + public String getDesctipoevento() { + return desctipoevento; + } + + public void setDesctipoevento(String desctipoevento) { + this.desctipoevento = desctipoevento; + } + + public BigDecimal getValorTotal() { + return valorTotal; + } + + public void setValorTotal(BigDecimal valorTotal) { + this.valorTotal = valorTotal; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((datamov == null) ? 0 : datamov.hashCode()); + result = prime * result + ((empresaId == null) ? 0 : empresaId.hashCode()); + result = prime * result + ((tipoeventoextraId == null) ? 0 : tipoeventoextraId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + LeitorNaoFiscalVO other = (LeitorNaoFiscalVO) obj; + if (datamov == null) { + if (other.datamov != null) + return false; + } else if (!datamov.equals(other.datamov)) + return false; + if (empresaId == null) { + if (other.empresaId != null) + return false; + } else if (!empresaId.equals(other.empresaId)) + return false; + if (tipoeventoextraId == null) { + if (other.tipoeventoextraId != null) + return false; + } else if (!tipoeventoextraId.equals(other.tipoeventoextraId)) + return false; + return true; + } + + @Override + public int compareTo(LeitorNaoFiscalVO o) { + int retorno = getDatamov().compareTo(o.getDatamov()); + if (retorno == 0) { + retorno = getNombempresa().compareTo(o.getNombempresa()); + } + if (retorno == 0) { + retorno = getDesctipoevento().compareTo(o.getDesctipoevento()); + } + return retorno; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/RelatorioFinanceiro.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/RelatorioFinanceiro.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/RelatorioFinanceiro.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/RelatorioFinanceiro.java index 5c9c85bc6..2040553f6 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/RelatorioFinanceiro.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/RelatorioFinanceiro.java @@ -1,63 +1,63 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.util.Date; - -public class RelatorioFinanceiro { - - private Date data; - private String agencia; - private String formaPagamento; - private Double tarifa; - private Double pedagio; - private Double seguro; - private Double taxas; - private Double total; - public Date getData() { - return data; - } - public void setData(Date data) { - this.data = data; - } - public String getAgencia() { - return agencia; - } - public void setAgencia(String agencia) { - this.agencia = agencia; - } - public String getFormaPagamento() { - return formaPagamento; - } - public void setFormaPagamento(String formaPagamento) { - this.formaPagamento = formaPagamento; - } - public Double getTarifa() { - return tarifa; - } - public void setTarifa(Double tarifa) { - this.tarifa = tarifa; - } - public Double getPedagio() { - return pedagio; - } - public void setPedagio(Double pedagio) { - this.pedagio = pedagio; - } - public Double getSeguro() { - return seguro; - } - public void setSeguro(Double seguro) { - this.seguro = seguro; - } - public Double getTaxas() { - return taxas; - } - public void setTaxas(Double taxas) { - this.taxas = taxas; - } - public Double getTotal() { - return total; - } - public void setTotal(Double total) { - this.total = total; - } -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.util.Date; + +public class RelatorioFinanceiro { + + private Date data; + private String agencia; + private String formaPagamento; + private Double tarifa; + private Double pedagio; + private Double seguro; + private Double taxas; + private Double total; + public Date getData() { + return data; + } + public void setData(Date data) { + this.data = data; + } + public String getAgencia() { + return agencia; + } + public void setAgencia(String agencia) { + this.agencia = agencia; + } + public String getFormaPagamento() { + return formaPagamento; + } + public void setFormaPagamento(String formaPagamento) { + this.formaPagamento = formaPagamento; + } + public Double getTarifa() { + return tarifa; + } + public void setTarifa(Double tarifa) { + this.tarifa = tarifa; + } + public Double getPedagio() { + return pedagio; + } + public void setPedagio(Double pedagio) { + this.pedagio = pedagio; + } + public Double getSeguro() { + return seguro; + } + public void setSeguro(Double seguro) { + this.seguro = seguro; + } + public Double getTaxas() { + return taxas; + } + public void setTaxas(Double taxas) { + this.taxas = taxas; + } + public Double getTotal() { + return total; + } + public void setTotal(Double total) { + this.total = total; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SiglaMotivoCancelacion.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SiglaMotivoCancelacion.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SiglaMotivoCancelacion.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SiglaMotivoCancelacion.java index fe4cfbb96..79c335541 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SiglaMotivoCancelacion.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SiglaMotivoCancelacion.java @@ -1,29 +1,29 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -public enum SiglaMotivoCancelacion { - - DEVOLUCAO, CANCELAMENTO, CHECKIN, TROCA, TRANSFERENCIA; - - public static SiglaMotivoCancelacion valueOf(Integer motivocancelacionId) { - switch (motivocancelacionId) { - case 31: - return CANCELAMENTO; - - case 32: - return DEVOLUCAO; - - case 10: - return TROCA; - - case 23: - return TRANSFERENCIA; - - case 27: - return CHECKIN; - - default: - return CANCELAMENTO; - } - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +public enum SiglaMotivoCancelacion { + + DEVOLUCAO, CANCELAMENTO, CHECKIN, TROCA, TRANSFERENCIA; + + public static SiglaMotivoCancelacion valueOf(Integer motivocancelacionId) { + switch (motivocancelacionId) { + case 31: + return CANCELAMENTO; + + case 32: + return DEVOLUCAO; + + case 10: + return TROCA; + + case 23: + return TRANSFERENCIA; + + case 27: + return CHECKIN; + + default: + return CANCELAMENTO; + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SituacaoTributaria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SituacaoTributaria.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SituacaoTributaria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SituacaoTributaria.java index db836e0ec..4dae14cdd 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SituacaoTributaria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SituacaoTributaria.java @@ -1,16 +1,16 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -public enum SituacaoTributaria { - TRIBUTADO("T"), NAO_TRIBUTADO("N1"), CANCELADO("Can-T"), DESCONTO("DT"), NAO_FISCAL("OPNF"); - - private String value; - - private SituacaoTributaria(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +public enum SituacaoTributaria { + TRIBUTADO("T"), NAO_TRIBUTADO("N1"), CANCELADO("Can-T"), DESCONTO("DT"), NAO_FISCAL("OPNF"); + + private String value; + + private SituacaoTributaria(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SubItens.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SubItens.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SubItens.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SubItens.java index b0763ac82..42fbb3b2a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SubItens.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/SubItens.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class SubItens { - public SubItens(BigDecimal valor, String codProduto) { - super(); - this.valor = valor; - this.codProduto = codProduto; - } - - private BigDecimal valor; - private String codProduto; - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public String getCodProduto() { - return codProduto; - } - - public void setCodProduto(String codProduto) { - this.codProduto = codProduto; - } -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class SubItens { + public SubItens(BigDecimal valor, String codProduto) { + super(); + this.valor = valor; + this.codProduto = codProduto; + } + + private BigDecimal valor; + private String codProduto; + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public String getCodProduto() { + return codProduto; + } + + public void setCodProduto(String codProduto) { + this.codProduto = codProduto; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TipoPendencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TipoPendencia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TipoPendencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TipoPendencia.java index 12934e26c..f4b26b2af 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TipoPendencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TipoPendencia.java @@ -1,5 +1,5 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -public enum TipoPendencia { - DIF_RED_Z, DIF_ECF -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +public enum TipoPendencia { + DIF_RED_Z, DIF_ECF +} diff --git a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TotalRelatorioVoucher.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TotalRelatorioVoucher.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TotalRelatorioVoucher.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TotalRelatorioVoucher.java index d4786f5e2..ad6c58c1f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TotalRelatorioVoucher.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/impressaofiscal/TotalRelatorioVoucher.java @@ -1,104 +1,104 @@ -package com.rjconsultores.ventaboletos.vo.impressaofiscal; - -import java.math.BigDecimal; - -public class TotalRelatorioVoucher { - - private String status; - private BigDecimal tarifa; - private BigDecimal pedagio; - private BigDecimal embarque; - private BigDecimal seguro; - - public TotalRelatorioVoucher() { - super(); - this.tarifa = BigDecimal.ZERO; - this.pedagio = BigDecimal.ZERO; - this.embarque = BigDecimal.ZERO; - this.seguro = BigDecimal.ZERO; - } - - public TotalRelatorioVoucher(String status, BigDecimal tarifa, BigDecimal pedagio, BigDecimal embarque, BigDecimal seguro) { - this(); - this.status = status; - this.tarifa = tarifa; - this.pedagio = pedagio; - this.embarque = embarque; - this.seguro = seguro; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public BigDecimal getTarifa() { - return tarifa; - } - - public void setTarifa(BigDecimal tarifa) { - this.tarifa = tarifa; - } - - public BigDecimal getPedagio() { - return pedagio; - } - - public void setPedagio(BigDecimal pedagio) { - this.pedagio = pedagio; - } - - public BigDecimal getEmbarque() { - return embarque; - } - - public void setEmbarque(BigDecimal embarque) { - this.embarque = embarque; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((status == null) ? 0 : status.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TotalRelatorioVoucher other = (TotalRelatorioVoucher) obj; - if (status == null) { - if (other.status != null) - return false; - } else if (!status.equals(other.status)) - return false; - return true; - } - - public BigDecimal getTotal() { - BigDecimal total = BigDecimal.ZERO; - total = total.add(getTarifa()) - .add(getEmbarque()) - .add(getPedagio()); - - return total; - } - - public BigDecimal getSeguro() { - return seguro; - } - - public void setSeguro(BigDecimal seguro) { - this.seguro = seguro; - } - -} +package com.rjconsultores.ventaboletos.vo.impressaofiscal; + +import java.math.BigDecimal; + +public class TotalRelatorioVoucher { + + private String status; + private BigDecimal tarifa; + private BigDecimal pedagio; + private BigDecimal embarque; + private BigDecimal seguro; + + public TotalRelatorioVoucher() { + super(); + this.tarifa = BigDecimal.ZERO; + this.pedagio = BigDecimal.ZERO; + this.embarque = BigDecimal.ZERO; + this.seguro = BigDecimal.ZERO; + } + + public TotalRelatorioVoucher(String status, BigDecimal tarifa, BigDecimal pedagio, BigDecimal embarque, BigDecimal seguro) { + this(); + this.status = status; + this.tarifa = tarifa; + this.pedagio = pedagio; + this.embarque = embarque; + this.seguro = seguro; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + public BigDecimal getPedagio() { + return pedagio; + } + + public void setPedagio(BigDecimal pedagio) { + this.pedagio = pedagio; + } + + public BigDecimal getEmbarque() { + return embarque; + } + + public void setEmbarque(BigDecimal embarque) { + this.embarque = embarque; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((status == null) ? 0 : status.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TotalRelatorioVoucher other = (TotalRelatorioVoucher) obj; + if (status == null) { + if (other.status != null) + return false; + } else if (!status.equals(other.status)) + return false; + return true; + } + + public BigDecimal getTotal() { + BigDecimal total = BigDecimal.ZERO; + total = total.add(getTarifa()) + .add(getEmbarque()) + .add(getPedagio()); + + return total; + } + + public BigDecimal getSeguro() { + return seguro; + } + + public void setSeguro(BigDecimal seguro) { + this.seguro = seguro; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/integracao/FechamentoCntCorrenteVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/integracao/FechamentoCntCorrenteVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/integracao/FechamentoCntCorrenteVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/integracao/FechamentoCntCorrenteVO.java index 3906c91ca..796630ac2 100644 --- a/src/com/rjconsultores/ventaboletos/vo/integracao/FechamentoCntCorrenteVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/integracao/FechamentoCntCorrenteVO.java @@ -1,157 +1,157 @@ -package com.rjconsultores.ventaboletos.vo.integracao; - -import java.math.BigDecimal; - -import com.rjconsultores.ventaboletos.enums.StatusIntegracaoSap; - -public class FechamentoCntCorrenteVO { - - public FechamentoCntCorrenteVO() { - super(); - // TODO Auto-generated constructor stub - } - - private Long fechamentocntcorrenteId; - private String fecfechamento; - private String feclancamento; - private String anofechamento; - private String mesfechamento; - private BigDecimal total; - private String nombpuntoventa; - private String cnpjPuntoVenta; - private String numPuntoVenta; - private Integer empresaId; - private String nombEmpresa; - private String ufEmpresa; - private StatusIntegracaoSap integradoSap; - private boolean enviar; - - public FechamentoCntCorrenteVO(Long fechamentocntcorrenteId, String fecfechamento, String feclancamento, String anofechamento, String mesfechamento, BigDecimal total, String nombpuntoventa, String cnpjPuntoVenta, Integer empresaId, String nombEmpresa, String ufEmpresa, StatusIntegracaoSap integradoSap) { - super(); - this.fechamentocntcorrenteId = fechamentocntcorrenteId; - this.fecfechamento = fecfechamento; - this.feclancamento = feclancamento; - this.anofechamento = anofechamento; - this.mesfechamento = mesfechamento; - this.total = total; - this.nombpuntoventa = nombpuntoventa; - this.cnpjPuntoVenta = cnpjPuntoVenta; - this.empresaId = empresaId; - this.nombEmpresa = nombEmpresa; - this.ufEmpresa = ufEmpresa; - this.integradoSap = integradoSap; - } - - public Long getFechamentocntcorrenteId() { - return fechamentocntcorrenteId; - } - - public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { - this.fechamentocntcorrenteId = fechamentocntcorrenteId; - } - - public String getFecfechamento() { - return fecfechamento; - } - - public void setFecfechamento(String fecfechamento) { - this.fecfechamento = fecfechamento; - } - - public BigDecimal getTotal() { - return total; - } - - public void setTotal(BigDecimal total) { - this.total = total; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - - public String getCnpjPuntoVenta() { - return cnpjPuntoVenta; - } - - public void setCnpjPuntoVenta(String cnpjPuntoVenta) { - this.cnpjPuntoVenta = cnpjPuntoVenta; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public String getNombEmpresa() { - return nombEmpresa; - } - - public void setNombEmpresa(String nombEmpresa) { - this.nombEmpresa = nombEmpresa; - } - - public String getUfEmpresa() { - return ufEmpresa; - } - - public void setUfEmpresa(String ufEmpresa) { - this.ufEmpresa = ufEmpresa; - } - - public StatusIntegracaoSap getIntegradoSap() { - return integradoSap; - } - - public void setIntegradoSap(StatusIntegracaoSap integradoSap) { - this.integradoSap = integradoSap; - } - - public String getFeclancamento() { - return feclancamento; - } - - public void setFeclancamento(String feclancamento) { - this.feclancamento = feclancamento; - } - - public String getMesfechamento() { - return mesfechamento; - } - - public void setMesfechamento(String mesfechamento) { - this.mesfechamento = mesfechamento; - } - - public String getAnofechamento() { - return anofechamento; - } - - public void setAnofechamento(String anofechamento) { - this.anofechamento = anofechamento; - } - - public boolean isEnviar() { - return enviar; - } - - public void setEnviar(Boolean enviar) { - this.enviar = enviar; - } - - public String getNumPuntoVenta() { - return numPuntoVenta; - } - - public void setNumPuntoVenta(String numPuntoVenta) { - this.numPuntoVenta = numPuntoVenta; - } - -} +package com.rjconsultores.ventaboletos.vo.integracao; + +import java.math.BigDecimal; + +import com.rjconsultores.ventaboletos.enums.StatusIntegracaoSap; + +public class FechamentoCntCorrenteVO { + + public FechamentoCntCorrenteVO() { + super(); + // TODO Auto-generated constructor stub + } + + private Long fechamentocntcorrenteId; + private String fecfechamento; + private String feclancamento; + private String anofechamento; + private String mesfechamento; + private BigDecimal total; + private String nombpuntoventa; + private String cnpjPuntoVenta; + private String numPuntoVenta; + private Integer empresaId; + private String nombEmpresa; + private String ufEmpresa; + private StatusIntegracaoSap integradoSap; + private boolean enviar; + + public FechamentoCntCorrenteVO(Long fechamentocntcorrenteId, String fecfechamento, String feclancamento, String anofechamento, String mesfechamento, BigDecimal total, String nombpuntoventa, String cnpjPuntoVenta, Integer empresaId, String nombEmpresa, String ufEmpresa, StatusIntegracaoSap integradoSap) { + super(); + this.fechamentocntcorrenteId = fechamentocntcorrenteId; + this.fecfechamento = fecfechamento; + this.feclancamento = feclancamento; + this.anofechamento = anofechamento; + this.mesfechamento = mesfechamento; + this.total = total; + this.nombpuntoventa = nombpuntoventa; + this.cnpjPuntoVenta = cnpjPuntoVenta; + this.empresaId = empresaId; + this.nombEmpresa = nombEmpresa; + this.ufEmpresa = ufEmpresa; + this.integradoSap = integradoSap; + } + + public Long getFechamentocntcorrenteId() { + return fechamentocntcorrenteId; + } + + public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { + this.fechamentocntcorrenteId = fechamentocntcorrenteId; + } + + public String getFecfechamento() { + return fecfechamento; + } + + public void setFecfechamento(String fecfechamento) { + this.fecfechamento = fecfechamento; + } + + public BigDecimal getTotal() { + return total; + } + + public void setTotal(BigDecimal total) { + this.total = total; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + + public String getCnpjPuntoVenta() { + return cnpjPuntoVenta; + } + + public void setCnpjPuntoVenta(String cnpjPuntoVenta) { + this.cnpjPuntoVenta = cnpjPuntoVenta; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public String getNombEmpresa() { + return nombEmpresa; + } + + public void setNombEmpresa(String nombEmpresa) { + this.nombEmpresa = nombEmpresa; + } + + public String getUfEmpresa() { + return ufEmpresa; + } + + public void setUfEmpresa(String ufEmpresa) { + this.ufEmpresa = ufEmpresa; + } + + public StatusIntegracaoSap getIntegradoSap() { + return integradoSap; + } + + public void setIntegradoSap(StatusIntegracaoSap integradoSap) { + this.integradoSap = integradoSap; + } + + public String getFeclancamento() { + return feclancamento; + } + + public void setFeclancamento(String feclancamento) { + this.feclancamento = feclancamento; + } + + public String getMesfechamento() { + return mesfechamento; + } + + public void setMesfechamento(String mesfechamento) { + this.mesfechamento = mesfechamento; + } + + public String getAnofechamento() { + return anofechamento; + } + + public void setAnofechamento(String anofechamento) { + this.anofechamento = anofechamento; + } + + public boolean isEnviar() { + return enviar; + } + + public void setEnviar(Boolean enviar) { + this.enviar = enviar; + } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/layout/DiagramaPoltronas.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/layout/DiagramaPoltronas.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/layout/DiagramaPoltronas.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/layout/DiagramaPoltronas.java index b9e3f9c16..12d0508e7 100644 --- a/src/com/rjconsultores/ventaboletos/vo/layout/DiagramaPoltronas.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/layout/DiagramaPoltronas.java @@ -1,345 +1,345 @@ -package com.rjconsultores.ventaboletos.vo.layout; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.entidad.DetDiagramaAutobus; - -public class DiagramaPoltronas implements Comparable { - - private static Integer TOTAL_FILAS = 12; - private static Integer TOTAL_COLUNAS = 21; - - private Integer fila; - - private List colunas; - - public DiagramaPoltronas() { - super(); - } - - public DiagramaPoltronas(Integer fila) { - this(); - this.fila = fila; - } - - public DiagramaPoltronas(Short fila) { - this(); - this.fila = fila.intValue(); - } - - public class Coluna implements Comparable { - - private Integer coluna; - - private DiagramaPoltronas fila; - - private List poltronas; - - public Coluna() { - super(); - } - - public Coluna(Integer coluna, DiagramaPoltronas fila) { - this(); - this.fila = fila; - this.coluna = coluna; - } - - public Coluna(Short coluna, DiagramaPoltronas fila) { - this(); - this.fila = fila; - this.coluna = coluna.intValue(); - } - - public Integer getColuna() { - return coluna; - } - - public void setColuna(Integer coluna) { - this.coluna = coluna; - } - - @Override - public int compareTo(Coluna o) { - return this.getColuna().compareTo(o.getColuna()); - } - - public List getPoltronas() { - return poltronas; - } - - public DiagramaPoltronas getFila() { - return fila; - } - - public void setFila(DiagramaPoltronas fila) { - this.fila = fila; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((coluna == null) ? 0 : coluna.hashCode()); - result = prime * result + ((fila == null) ? 0 : fila.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Coluna other = (Coluna) obj; - if (coluna == null) { - if (other.coluna != null) - return false; - } else if (!coluna.equals(other.coluna)) - return false; - if (fila == null) { - if (other.fila != null) - return false; - } else if (!fila.equals(other.fila)) - return false; - return true; - } - - public void adicionarPoltrona(String asiento, Boolean vendible) { - Poltrona poltrona = new Poltrona(getFila(), this, asiento, vendible); - if(poltronas == null) { - poltronas = new ArrayList(); - poltronas.add(poltrona); - } else { - int index = poltronas.indexOf(poltrona); - if(index > -1) { - poltronas.set(index, poltrona); - } else { - poltronas.add(poltrona); - } - } - } - - } - - public class Poltrona { - - private static final String CLASS_GREEN = "myGreen"; - private static final String CLASS_GREY = "myGrey"; - private static final String CLASS_WHITE = "myWhite"; - - private DiagramaPoltronas fila; - private Coluna coluna; - private String asiento; - - private String sClass; - private Boolean vendible; - - public Poltrona(DiagramaPoltronas fila, Coluna coluna, String asiento, Boolean vendible) { - this.fila = fila; - this.coluna = coluna; - this.asiento = asiento; - this.vendible = vendible; - sClass = CLASS_GREY; - if(StringUtils.isBlank(asiento)) { - sClass = CLASS_WHITE; - } else if(vendible != null && vendible) { - sClass = CLASS_GREEN; - } - } - - public DiagramaPoltronas getFila() { - return fila; - } - - public void setFila(DiagramaPoltronas fila) { - this.fila = fila; - } - - public Coluna getColuna() { - return coluna; - } - - public void setColuna(Coluna coluna) { - this.coluna = coluna; - } - - public String getAsiento() { - return asiento; - } - - public void setAsiento(String asiento) { - this.asiento = asiento; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + getOuterType().hashCode(); - result = prime * result + ((asiento == null) ? 0 : asiento.hashCode()); - result = prime * result + ((coluna == null) ? 0 : coluna.hashCode()); - result = prime * result + ((fila == null) ? 0 : fila.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Poltrona other = (Poltrona) obj; - if (!getOuterType().equals(other.getOuterType())) - return false; - if (asiento == null) { - if (other.asiento != null) - return false; - } else if (!asiento.equals(other.asiento)) - return false; - if (coluna == null) { - if (other.coluna != null) - return false; - } else if (!coluna.equals(other.coluna)) - return false; - if (fila == null) { - if (other.fila != null) - return false; - } else if (!fila.equals(other.fila)) - return false; - return true; - } - - private DiagramaPoltronas getOuterType() { - return DiagramaPoltronas.this; - } - - @Override - public String toString() { - return "bbtn_" + fila.getFila() + "_" + coluna.getColuna(); - } - - public String getsClass() { - return sClass; - } - - public void setsClass(String sClass) { - this.sClass = sClass; - } - - public Boolean getNotVendible() { - return !getVendible(); - } - - public Boolean getVendible() { - return vendible; - } - - public void setVendible(Boolean vendible) { - this.vendible = vendible; - } - - } - - public Integer getFila() { - return fila; - } - - public void setFila(Integer fila) { - this.fila = fila; - } - - public List getColunas() { - return colunas; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + fila; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DiagramaPoltronas other = (DiagramaPoltronas) obj; - if (fila != other.fila) - return false; - return true; - } - - @Override - public int compareTo(DiagramaPoltronas o) { - return this.getFila().compareTo(o.getFila()); - } - - public static List getLayoutVazio() { - List layout = new ArrayList(); - for (int i = 1; i <= TOTAL_FILAS; i++) { - DiagramaPoltronas fila = new DiagramaPoltronas(i); - for (int j = 1; j <= TOTAL_COLUNAS; j++) { - Coluna coluna = fila.new Coluna(j, fila); - coluna.adicionarPoltrona("",false); - fila.adicionarColuna(coluna); - } - layout.add(fila); - } - Collections.sort(layout); - for (DiagramaPoltronas fila : layout) { - Collections.sort(fila.getColunas()); - } - return layout; - } - - private void adicionarColuna(Coluna coluna) { - if(colunas == null) { - colunas = new ArrayList(); - colunas.add(coluna); - } else { - int index = colunas.indexOf(coluna); - if(index > -1) { - colunas.set(index, coluna); - } else { - colunas.add(coluna); - } - } - } - - public static List carregarLayoutExistente(List detDiagramaAutobus) { - List layout = getLayoutVazio(); - for (DetDiagramaAutobus diagramaAutobus : detDiagramaAutobus) { - DiagramaPoltronas fila = new DiagramaPoltronas(diagramaAutobus.getNumefila()); - int index = layout.indexOf(fila); - if(index > -1) { - fila = layout.get(index); - } - - Coluna coluna = fila.new Coluna(diagramaAutobus.getNumecolumna(), fila); - fila.adicionarColuna(coluna); - - coluna.adicionarPoltrona(diagramaAutobus.getAsiento(), diagramaAutobus.getVendible()); - - if(index == -1) { - layout.add(fila); - } - - } - return layout; - } - +package com.rjconsultores.ventaboletos.vo.layout; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.entidad.DetDiagramaAutobus; + +public class DiagramaPoltronas implements Comparable { + + private static Integer TOTAL_FILAS = 12; + private static Integer TOTAL_COLUNAS = 21; + + private Integer fila; + + private List colunas; + + public DiagramaPoltronas() { + super(); + } + + public DiagramaPoltronas(Integer fila) { + this(); + this.fila = fila; + } + + public DiagramaPoltronas(Short fila) { + this(); + this.fila = fila.intValue(); + } + + public class Coluna implements Comparable { + + private Integer coluna; + + private DiagramaPoltronas fila; + + private List poltronas; + + public Coluna() { + super(); + } + + public Coluna(Integer coluna, DiagramaPoltronas fila) { + this(); + this.fila = fila; + this.coluna = coluna; + } + + public Coluna(Short coluna, DiagramaPoltronas fila) { + this(); + this.fila = fila; + this.coluna = coluna.intValue(); + } + + public Integer getColuna() { + return coluna; + } + + public void setColuna(Integer coluna) { + this.coluna = coluna; + } + + @Override + public int compareTo(Coluna o) { + return this.getColuna().compareTo(o.getColuna()); + } + + public List getPoltronas() { + return poltronas; + } + + public DiagramaPoltronas getFila() { + return fila; + } + + public void setFila(DiagramaPoltronas fila) { + this.fila = fila; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((coluna == null) ? 0 : coluna.hashCode()); + result = prime * result + ((fila == null) ? 0 : fila.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Coluna other = (Coluna) obj; + if (coluna == null) { + if (other.coluna != null) + return false; + } else if (!coluna.equals(other.coluna)) + return false; + if (fila == null) { + if (other.fila != null) + return false; + } else if (!fila.equals(other.fila)) + return false; + return true; + } + + public void adicionarPoltrona(String asiento, Boolean vendible) { + Poltrona poltrona = new Poltrona(getFila(), this, asiento, vendible); + if(poltronas == null) { + poltronas = new ArrayList(); + poltronas.add(poltrona); + } else { + int index = poltronas.indexOf(poltrona); + if(index > -1) { + poltronas.set(index, poltrona); + } else { + poltronas.add(poltrona); + } + } + } + + } + + public class Poltrona { + + private static final String CLASS_GREEN = "myGreen"; + private static final String CLASS_GREY = "myGrey"; + private static final String CLASS_WHITE = "myWhite"; + + private DiagramaPoltronas fila; + private Coluna coluna; + private String asiento; + + private String sClass; + private Boolean vendible; + + public Poltrona(DiagramaPoltronas fila, Coluna coluna, String asiento, Boolean vendible) { + this.fila = fila; + this.coluna = coluna; + this.asiento = asiento; + this.vendible = vendible; + sClass = CLASS_GREY; + if(StringUtils.isBlank(asiento)) { + sClass = CLASS_WHITE; + } else if(vendible != null && vendible) { + sClass = CLASS_GREEN; + } + } + + public DiagramaPoltronas getFila() { + return fila; + } + + public void setFila(DiagramaPoltronas fila) { + this.fila = fila; + } + + public Coluna getColuna() { + return coluna; + } + + public void setColuna(Coluna coluna) { + this.coluna = coluna; + } + + public String getAsiento() { + return asiento; + } + + public void setAsiento(String asiento) { + this.asiento = asiento; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + getOuterType().hashCode(); + result = prime * result + ((asiento == null) ? 0 : asiento.hashCode()); + result = prime * result + ((coluna == null) ? 0 : coluna.hashCode()); + result = prime * result + ((fila == null) ? 0 : fila.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Poltrona other = (Poltrona) obj; + if (!getOuterType().equals(other.getOuterType())) + return false; + if (asiento == null) { + if (other.asiento != null) + return false; + } else if (!asiento.equals(other.asiento)) + return false; + if (coluna == null) { + if (other.coluna != null) + return false; + } else if (!coluna.equals(other.coluna)) + return false; + if (fila == null) { + if (other.fila != null) + return false; + } else if (!fila.equals(other.fila)) + return false; + return true; + } + + private DiagramaPoltronas getOuterType() { + return DiagramaPoltronas.this; + } + + @Override + public String toString() { + return "bbtn_" + fila.getFila() + "_" + coluna.getColuna(); + } + + public String getsClass() { + return sClass; + } + + public void setsClass(String sClass) { + this.sClass = sClass; + } + + public Boolean getNotVendible() { + return !getVendible(); + } + + public Boolean getVendible() { + return vendible; + } + + public void setVendible(Boolean vendible) { + this.vendible = vendible; + } + + } + + public Integer getFila() { + return fila; + } + + public void setFila(Integer fila) { + this.fila = fila; + } + + public List getColunas() { + return colunas; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + fila; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DiagramaPoltronas other = (DiagramaPoltronas) obj; + if (fila != other.fila) + return false; + return true; + } + + @Override + public int compareTo(DiagramaPoltronas o) { + return this.getFila().compareTo(o.getFila()); + } + + public static List getLayoutVazio() { + List layout = new ArrayList(); + for (int i = 1; i <= TOTAL_FILAS; i++) { + DiagramaPoltronas fila = new DiagramaPoltronas(i); + for (int j = 1; j <= TOTAL_COLUNAS; j++) { + Coluna coluna = fila.new Coluna(j, fila); + coluna.adicionarPoltrona("",false); + fila.adicionarColuna(coluna); + } + layout.add(fila); + } + Collections.sort(layout); + for (DiagramaPoltronas fila : layout) { + Collections.sort(fila.getColunas()); + } + return layout; + } + + private void adicionarColuna(Coluna coluna) { + if(colunas == null) { + colunas = new ArrayList(); + colunas.add(coluna); + } else { + int index = colunas.indexOf(coluna); + if(index > -1) { + colunas.set(index, coluna); + } else { + colunas.add(coluna); + } + } + } + + public static List carregarLayoutExistente(List detDiagramaAutobus) { + List layout = getLayoutVazio(); + for (DetDiagramaAutobus diagramaAutobus : detDiagramaAutobus) { + DiagramaPoltronas fila = new DiagramaPoltronas(diagramaAutobus.getNumefila()); + int index = layout.indexOf(fila); + if(index > -1) { + fila = layout.get(index); + } + + Coluna coluna = fila.new Coluna(diagramaAutobus.getNumecolumna(), fila); + fila.adicionarColuna(coluna); + + coluna.adicionarPoltrona(diagramaAutobus.getAsiento(), diagramaAutobus.getVendible()); + + if(index == -1) { + layout.add(fila); + } + + } + return layout; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/vo/mercadopago/PosVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/PosVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/mercadopago/PosVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/PosVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoErro.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoErro.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoErro.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoErro.java diff --git a/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoPosVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoPosVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoPosVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoPosVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoStoreVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoStoreVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoStoreVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/RetornoStoreVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/mercadopago/StoreVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/StoreVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/mercadopago/StoreVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/mercadopago/StoreVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/parada/ConexionCtrlVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionCtrlVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/parada/ConexionCtrlVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionCtrlVO.java index bad925c7b..a80ee8b48 100644 --- a/src/com/rjconsultores/ventaboletos/vo/parada/ConexionCtrlVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionCtrlVO.java @@ -1,117 +1,117 @@ -package com.rjconsultores.ventaboletos.vo.parada; - -public class ConexionCtrlVO { - - private Long conexionctrlId; - private Integer origenId; - private Integer destinoId; - private Integer grupo; - private boolean valida; - - private Boolean indPricing; - - public ConexionCtrlVO(Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { - this.grupo = 0; - this.origenId = origemConexaoCtrl; - this.destinoId = destinoConexaoCtrl; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((destinoId == null) ? 0 : destinoId.hashCode()); - result = prime * result + ((origenId == null) ? 0 : origenId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ConexionCtrlVO)) - return false; - ConexionCtrlVO other = (ConexionCtrlVO) obj; - if (getDestinoId() == null) { - if (other.getDestinoId() != null) - return false; - } else if (!getDestinoId().equals(other.getDestinoId())) - return false; - if (getOrigenId() == null) { - if (other.getOrigenId() != null) - return false; - } else if (!getOrigenId().equals(other.getOrigenId())) - return false; - return true; - } - - public void incrementarGrupo() { - grupo++; - } - - public void decrementarGrupo() { - grupo--; - } - - public Integer getGrupo() { - return grupo; - } - - public boolean isOrigemDestinoIgual(Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { - return getOrigenId() != null && getOrigenId().equals(origemConexaoCtrl) && - getDestinoId() !=null && getDestinoId().equals(destinoConexaoCtrl); - } - - public boolean isOrigemDestinoGrupoIgual(Integer origemConexaoCtrl, Integer destinoConexaoCtrl, Integer grupo) { - return getOrigenId() != null && getOrigenId().equals(origemConexaoCtrl) && - getDestinoId() !=null && getDestinoId().equals(destinoConexaoCtrl) && - getGrupo() !=null && getGrupo().equals(grupo); - } - - public boolean isValida() { - return valida; - } - - public void setValida(boolean valida) { - this.valida = valida; - } - - public Long getConexionctrlId() { - return conexionctrlId; - } - - public void setConexionctrlId(Long conexionctrlId) { - this.conexionctrlId = conexionctrlId; - } - - public Boolean getIndPricing() { - return indPricing == null ? false : indPricing; - } - - public void setIndPricing(Boolean indPricing) { - this.indPricing = indPricing; - } - - public void setGrupo(Integer grupo) { - this.grupo = grupo; - } - -} +package com.rjconsultores.ventaboletos.vo.parada; + +public class ConexionCtrlVO { + + private Long conexionctrlId; + private Integer origenId; + private Integer destinoId; + private Integer grupo; + private boolean valida; + + private Boolean indPricing; + + public ConexionCtrlVO(Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { + this.grupo = 0; + this.origenId = origemConexaoCtrl; + this.destinoId = destinoConexaoCtrl; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((destinoId == null) ? 0 : destinoId.hashCode()); + result = prime * result + ((origenId == null) ? 0 : origenId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ConexionCtrlVO)) + return false; + ConexionCtrlVO other = (ConexionCtrlVO) obj; + if (getDestinoId() == null) { + if (other.getDestinoId() != null) + return false; + } else if (!getDestinoId().equals(other.getDestinoId())) + return false; + if (getOrigenId() == null) { + if (other.getOrigenId() != null) + return false; + } else if (!getOrigenId().equals(other.getOrigenId())) + return false; + return true; + } + + public void incrementarGrupo() { + grupo++; + } + + public void decrementarGrupo() { + grupo--; + } + + public Integer getGrupo() { + return grupo; + } + + public boolean isOrigemDestinoIgual(Integer origemConexaoCtrl, Integer destinoConexaoCtrl) { + return getOrigenId() != null && getOrigenId().equals(origemConexaoCtrl) && + getDestinoId() !=null && getDestinoId().equals(destinoConexaoCtrl); + } + + public boolean isOrigemDestinoGrupoIgual(Integer origemConexaoCtrl, Integer destinoConexaoCtrl, Integer grupo) { + return getOrigenId() != null && getOrigenId().equals(origemConexaoCtrl) && + getDestinoId() !=null && getDestinoId().equals(destinoConexaoCtrl) && + getGrupo() !=null && getGrupo().equals(grupo); + } + + public boolean isValida() { + return valida; + } + + public void setValida(boolean valida) { + this.valida = valida; + } + + public Long getConexionctrlId() { + return conexionctrlId; + } + + public void setConexionctrlId(Long conexionctrlId) { + this.conexionctrlId = conexionctrlId; + } + + public Boolean getIndPricing() { + return indPricing == null ? false : indPricing; + } + + public void setIndPricing(Boolean indPricing) { + this.indPricing = indPricing; + } + + public void setGrupo(Integer grupo) { + this.grupo = grupo; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaConfVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaConfVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaConfVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaConfVO.java index f276fe9a4..922537d4f 100644 --- a/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaConfVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaConfVO.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.vo.parada; - -import java.util.ArrayList; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; - -public class ConexionRutaConfVO { - - private List localidadesCombinadas; - private List listConexionCtrl; - - public ConexionRutaConfVO() { - localidadesCombinadas = new ArrayList(); - listConexionCtrl = new ArrayList(); - } - - public List getLocalidadesCombinadas() { - return localidadesCombinadas; - } - - public void setLocalidadesCombinadas(List localidadesCombinadas) { - this.localidadesCombinadas = localidadesCombinadas; - } - - public List getListConexionCtrl() { - return listConexionCtrl; - } - - public void setListConexionCtrl(List listConexionCtrl) { - this.listConexionCtrl = listConexionCtrl; - } - -} +package com.rjconsultores.ventaboletos.vo.parada; + +import java.util.ArrayList; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.ConexionCtrl; + +public class ConexionRutaConfVO { + + private List localidadesCombinadas; + private List listConexionCtrl; + + public ConexionRutaConfVO() { + localidadesCombinadas = new ArrayList(); + listConexionCtrl = new ArrayList(); + } + + public List getLocalidadesCombinadas() { + return localidadesCombinadas; + } + + public void setLocalidadesCombinadas(List localidadesCombinadas) { + this.localidadesCombinadas = localidadesCombinadas; + } + + public List getListConexionCtrl() { + return listConexionCtrl; + } + + public void setListConexionCtrl(List listConexionCtrl) { + this.listConexionCtrl = listConexionCtrl; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaCtrlVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaCtrlVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaCtrlVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaCtrlVO.java index 9cffdaa5f..5395921e6 100644 --- a/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaCtrlVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ConexionRutaCtrlVO.java @@ -1,76 +1,76 @@ -package com.rjconsultores.ventaboletos.vo.parada; - -public class ConexionRutaCtrlVO { - - private Integer rutaIdA; - private Integer rutaIdB; - private Integer rutaIdC; - - public ConexionRutaCtrlVO(Integer rutaIdA, Integer rutaIdB, Integer rutaIdC) { - this.rutaIdA = rutaIdA; - this.rutaIdB = rutaIdB; - this.rutaIdC = rutaIdC; - } - - public Integer getRutaIdA() { - return rutaIdA; - } - - public void setRutaIdA(Integer rutaIdA) { - this.rutaIdA = rutaIdA; - } - - public Integer getRutaIdB() { - return rutaIdB; - } - - public void setRutaIdB(Integer rutaIdB) { - this.rutaIdB = rutaIdB; - } - - public Integer getRutaIdC() { - return rutaIdC; - } - - public void setRutaIdC(Integer rutaIdC) { - this.rutaIdC = rutaIdC; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getRutaIdA() == null) ? 0 : getRutaIdA().hashCode()); - result = prime * result + ((getRutaIdB() == null) ? 0 : getRutaIdB().hashCode()); - result = prime * result + ((getRutaIdC() == null) ? 0 : getRutaIdC().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ConexionRutaCtrlVO)) - return false; - ConexionRutaCtrlVO other = (ConexionRutaCtrlVO) obj; - if (getRutaIdA() == null) { - if (other.getRutaIdA() != null) - return false; - } else if (!getRutaIdA().equals(other.getRutaIdA())) - return false; - if (getRutaIdB() == null) { - if (other.getRutaIdB() != null) - return false; - } else if (!getRutaIdB().equals(other.getRutaIdB())) - return false; - if (getRutaIdC() == null) { - if (other.getRutaIdC() != null) - return false; - } else if (!getRutaIdC().equals(other.getRutaIdC())) - return false; - return true; - } - -} +package com.rjconsultores.ventaboletos.vo.parada; + +public class ConexionRutaCtrlVO { + + private Integer rutaIdA; + private Integer rutaIdB; + private Integer rutaIdC; + + public ConexionRutaCtrlVO(Integer rutaIdA, Integer rutaIdB, Integer rutaIdC) { + this.rutaIdA = rutaIdA; + this.rutaIdB = rutaIdB; + this.rutaIdC = rutaIdC; + } + + public Integer getRutaIdA() { + return rutaIdA; + } + + public void setRutaIdA(Integer rutaIdA) { + this.rutaIdA = rutaIdA; + } + + public Integer getRutaIdB() { + return rutaIdB; + } + + public void setRutaIdB(Integer rutaIdB) { + this.rutaIdB = rutaIdB; + } + + public Integer getRutaIdC() { + return rutaIdC; + } + + public void setRutaIdC(Integer rutaIdC) { + this.rutaIdC = rutaIdC; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getRutaIdA() == null) ? 0 : getRutaIdA().hashCode()); + result = prime * result + ((getRutaIdB() == null) ? 0 : getRutaIdB().hashCode()); + result = prime * result + ((getRutaIdC() == null) ? 0 : getRutaIdC().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ConexionRutaCtrlVO)) + return false; + ConexionRutaCtrlVO other = (ConexionRutaCtrlVO) obj; + if (getRutaIdA() == null) { + if (other.getRutaIdA() != null) + return false; + } else if (!getRutaIdA().equals(other.getRutaIdA())) + return false; + if (getRutaIdB() == null) { + if (other.getRutaIdB() != null) + return false; + } else if (!getRutaIdB().equals(other.getRutaIdB())) + return false; + if (getRutaIdC() == null) { + if (other.getRutaIdC() != null) + return false; + } else if (!getRutaIdC().equals(other.getRutaIdC())) + return false; + return true; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/parada/ParadaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVO.java index 19fcf445d..6a805768a 100644 --- a/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVO.java @@ -1,113 +1,113 @@ -package com.rjconsultores.ventaboletos.vo.parada; - -import com.rjconsultores.ventaboletos.entidad.Parada; - -public class ParadaVO { - - private Integer paradaId; - private String descparada; - private Integer ciudadId; - private String nombciudad; - private Integer estadoId; - private String nombestado; - private String cveestado; - private Integer rutaId; - - public ParadaVO(Integer paradaId, String descparada, Integer ciudadId, String nombciudad, Integer estadoId, String nombestado, String cveestado) { - super(); - this.paradaId = paradaId; - this.descparada = descparada; - this.ciudadId = ciudadId; - this.nombciudad = nombciudad; - this.estadoId = estadoId; - this.nombestado = nombestado; - this.cveestado = cveestado; - } - - public ParadaVO(Parada parada) { - super(); - this.paradaId = parada.getParadaId(); - this.descparada = parada.getDescparada(); - this.ciudadId = parada.getCiudad().getCiudadId(); - this.nombciudad = parada.getCiudad().getNombciudad(); - this.estadoId = parada.getCiudad().getEstado().getEstadoId(); - this.nombestado = parada.getCiudad().getEstado().getNombestado(); - this.cveestado = parada.getCiudad().getEstado().getCveestado(); - } - - public ParadaVO(Integer paradaId) { - super(); - this.paradaId = paradaId; - } - - public ParadaVO(Integer paradaId, Integer rutaId) { - super(); - this.paradaId = paradaId; - this.rutaId = rutaId; - } - - public Integer getParadaId() { - return paradaId; - } - - public void setParadaId(Integer paradaId) { - this.paradaId = paradaId; - } - - public String getDescparada() { - return descparada; - } - - public void setDescparada(String descparada) { - this.descparada = descparada; - } - - public Integer getCiudadId() { - return ciudadId; - } - - public void setCiudadId(Integer ciudadId) { - this.ciudadId = ciudadId; - } - - public String getNombciudad() { - return nombciudad; - } - - public void setNombciudad(String nombciudad) { - this.nombciudad = nombciudad; - } - - public Integer getEstadoId() { - return estadoId; - } - - public void setEstadoId(Integer estadoId) { - this.estadoId = estadoId; - } - - public String getNombestado() { - return nombestado; - } - - public void setNombestado(String nombestado) { - this.nombestado = nombestado; - } - - public String getCveestado() { - return cveestado; - } - - public void setCveestado(String cveestado) { - this.cveestado = cveestado; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - -} +package com.rjconsultores.ventaboletos.vo.parada; + +import com.rjconsultores.ventaboletos.entidad.Parada; + +public class ParadaVO { + + private Integer paradaId; + private String descparada; + private Integer ciudadId; + private String nombciudad; + private Integer estadoId; + private String nombestado; + private String cveestado; + private Integer rutaId; + + public ParadaVO(Integer paradaId, String descparada, Integer ciudadId, String nombciudad, Integer estadoId, String nombestado, String cveestado) { + super(); + this.paradaId = paradaId; + this.descparada = descparada; + this.ciudadId = ciudadId; + this.nombciudad = nombciudad; + this.estadoId = estadoId; + this.nombestado = nombestado; + this.cveestado = cveestado; + } + + public ParadaVO(Parada parada) { + super(); + this.paradaId = parada.getParadaId(); + this.descparada = parada.getDescparada(); + this.ciudadId = parada.getCiudad().getCiudadId(); + this.nombciudad = parada.getCiudad().getNombciudad(); + this.estadoId = parada.getCiudad().getEstado().getEstadoId(); + this.nombestado = parada.getCiudad().getEstado().getNombestado(); + this.cveestado = parada.getCiudad().getEstado().getCveestado(); + } + + public ParadaVO(Integer paradaId) { + super(); + this.paradaId = paradaId; + } + + public ParadaVO(Integer paradaId, Integer rutaId) { + super(); + this.paradaId = paradaId; + this.rutaId = rutaId; + } + + public Integer getParadaId() { + return paradaId; + } + + public void setParadaId(Integer paradaId) { + this.paradaId = paradaId; + } + + public String getDescparada() { + return descparada; + } + + public void setDescparada(String descparada) { + this.descparada = descparada; + } + + public Integer getCiudadId() { + return ciudadId; + } + + public void setCiudadId(Integer ciudadId) { + this.ciudadId = ciudadId; + } + + public String getNombciudad() { + return nombciudad; + } + + public void setNombciudad(String nombciudad) { + this.nombciudad = nombciudad; + } + + public Integer getEstadoId() { + return estadoId; + } + + public void setEstadoId(Integer estadoId) { + this.estadoId = estadoId; + } + + public String getNombestado() { + return nombestado; + } + + public void setNombestado(String nombestado) { + this.nombestado = nombestado; + } + + public String getCveestado() { + return cveestado; + } + + public void setCveestado(String cveestado) { + this.cveestado = cveestado; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVOConexionRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVOConexionRuta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/parada/ParadaVOConexionRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVOConexionRuta.java index 4e61a9df7..28195800b 100644 --- a/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVOConexionRuta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/parada/ParadaVOConexionRuta.java @@ -1,204 +1,204 @@ -package com.rjconsultores.ventaboletos.vo.parada; - -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.PricingConexao; - -public class ParadaVOConexionRuta { - - private Long conexionRutaTramoId; - private Parada paradaOrigem; - private Parada paradaDestino; - private Parada paradaOrigemTrecho; - private Parada paradaDestinoTrecho; - private Integer rutaId; - private String numRuta; - private Short secuencia; - private boolean valido; - private Integer grupo; - private String sentido; - - private ConexionCtrlVO conexionCtrl; - private ConexionRutaCtrlVO conexionRutaCtrl; - - private PricingConexao pricingConexao; - - public ParadaVOConexionRuta() { - super(); - } - - public ParadaVOConexionRuta(int grupo, Parada paradaOrigem, Parada paradaDestino, Integer rutaId, String numRuta, Short secuencia, - boolean valido, Parada paradaOrigemTrecho, Parada paradaDestinoTrecho, ConexionCtrlVO conexionCtrl, - ConexionRutaCtrlVO conexionRutaCtrl, String sentido) { - super(); - this.grupo = grupo; - this.paradaOrigem = paradaOrigem; - this.paradaDestino = paradaDestino; - this.rutaId = rutaId; - this.numRuta = numRuta; - this.secuencia = secuencia; - this.valido = valido; - this.paradaOrigemTrecho = paradaOrigemTrecho; - this.paradaDestinoTrecho = paradaDestinoTrecho; - this.conexionCtrl = conexionCtrl; - this.conexionRutaCtrl = conexionRutaCtrl; - this.sentido = sentido; - } - - public Parada getParadaOrigem() { - return paradaOrigem; - } - - public void setParadaOrigem(Parada paradaOrigem) { - this.paradaOrigem = paradaOrigem; - } - - public Parada getParadaDestino() { - return paradaDestino; - } - - public void setParadaDestino(Parada paradaDestino) { - this.paradaDestino = paradaDestino; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public Short getSecuencia() { - return secuencia; - } - - public void setSecuencia(Short secuencia) { - this.secuencia = secuencia; - } - - public boolean isValido() { - return valido; - } - - public void setValido(boolean valido) { - this.valido = valido; - } - - public Parada getParadaOrigemTrecho() { - return paradaOrigemTrecho; - } - - public void setParadaOrigemTrecho(Parada paradaOrigemTrecho) { - this.paradaOrigemTrecho = paradaOrigemTrecho; - } - - public Parada getParadaDestinoTrecho() { - return paradaDestinoTrecho; - } - - public void setParadaDestinoTrecho(Parada paradaDestinoTrecho) { - this.paradaDestinoTrecho = paradaDestinoTrecho; - } - - public String getNumRuta() { - return numRuta; - } - - public void setNumRuta(String numRuta) { - this.numRuta = numRuta; - } - - public Integer getGrupo() { - return grupo; - } - - public void setGrupo(Integer grupo) { - this.grupo = grupo; - } - - @Override - public String toString() { - return "ParadaVOConexionRuta [paradaOrigem=" + paradaOrigem + ", paradaDestino=" + paradaDestino + ", paradaOrigemTrecho=" + paradaOrigemTrecho + ", paradaDestinoTrecho=" + paradaDestinoTrecho + ", rutaId=" + rutaId + ", numRuta=" + numRuta + ", secuencia=" + secuencia + ", valido=" + valido + "]"; - } - - public ConexionCtrlVO getConexionCtrl() { - return conexionCtrl; - } - - public void setConexionCtrl(ConexionCtrlVO conexionCtrl) { - this.conexionCtrl = conexionCtrl; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getParadaDestino() == null) ? 0 : getParadaDestino().hashCode()); - result = prime * result + ((getParadaOrigem() == null) ? 0 : getParadaOrigem().hashCode()); - result = prime * result + ((getRutaId() == null) ? 0 : getRutaId().hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ParadaVOConexionRuta)) - return false; - ParadaVOConexionRuta other = (ParadaVOConexionRuta) obj; - if (getParadaDestino() == null) { - if (other.getParadaDestino() != null) - return false; - } else if (!getParadaDestino().equals(other.getParadaDestino())) - return false; - if (getParadaOrigem() == null) { - if (other.getParadaOrigem() != null) - return false; - } else if (!getParadaOrigem().equals(other.getParadaOrigem())) - return false; - if (getRutaId() == null) { - if (other.getRutaId() != null) - return false; - } else if (!getRutaId().equals(other.getRutaId())) - return false; - return true; - } - - public ConexionRutaCtrlVO getConexionRutaCtrl() { - return conexionRutaCtrl; - } - - public void setConexionRutaCtrl(ConexionRutaCtrlVO conexionRutaCtrl) { - this.conexionRutaCtrl = conexionRutaCtrl; - } - - public Long getConexionRutaTramoId() { - return conexionRutaTramoId; - } - - public void setConexionRutaTramoId(Long conexionRutaTramoId) { - this.conexionRutaTramoId = conexionRutaTramoId; - } - - public String getSentido() { - return sentido; - } - - public void setSentido(String sentido) { - this.sentido = sentido; - } - - public String getNumRutaSentido() { - return numRuta + " - " + sentido; - } - - public PricingConexao getPricingConexao() { - return pricingConexao; - } - - public void setPricingConexao(PricingConexao pricingConexao) { - this.pricingConexao = pricingConexao; - } +package com.rjconsultores.ventaboletos.vo.parada; + +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.PricingConexao; + +public class ParadaVOConexionRuta { + + private Long conexionRutaTramoId; + private Parada paradaOrigem; + private Parada paradaDestino; + private Parada paradaOrigemTrecho; + private Parada paradaDestinoTrecho; + private Integer rutaId; + private String numRuta; + private Short secuencia; + private boolean valido; + private Integer grupo; + private String sentido; + + private ConexionCtrlVO conexionCtrl; + private ConexionRutaCtrlVO conexionRutaCtrl; + + private PricingConexao pricingConexao; + + public ParadaVOConexionRuta() { + super(); + } + + public ParadaVOConexionRuta(int grupo, Parada paradaOrigem, Parada paradaDestino, Integer rutaId, String numRuta, Short secuencia, + boolean valido, Parada paradaOrigemTrecho, Parada paradaDestinoTrecho, ConexionCtrlVO conexionCtrl, + ConexionRutaCtrlVO conexionRutaCtrl, String sentido) { + super(); + this.grupo = grupo; + this.paradaOrigem = paradaOrigem; + this.paradaDestino = paradaDestino; + this.rutaId = rutaId; + this.numRuta = numRuta; + this.secuencia = secuencia; + this.valido = valido; + this.paradaOrigemTrecho = paradaOrigemTrecho; + this.paradaDestinoTrecho = paradaDestinoTrecho; + this.conexionCtrl = conexionCtrl; + this.conexionRutaCtrl = conexionRutaCtrl; + this.sentido = sentido; + } + + public Parada getParadaOrigem() { + return paradaOrigem; + } + + public void setParadaOrigem(Parada paradaOrigem) { + this.paradaOrigem = paradaOrigem; + } + + public Parada getParadaDestino() { + return paradaDestino; + } + + public void setParadaDestino(Parada paradaDestino) { + this.paradaDestino = paradaDestino; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public Short getSecuencia() { + return secuencia; + } + + public void setSecuencia(Short secuencia) { + this.secuencia = secuencia; + } + + public boolean isValido() { + return valido; + } + + public void setValido(boolean valido) { + this.valido = valido; + } + + public Parada getParadaOrigemTrecho() { + return paradaOrigemTrecho; + } + + public void setParadaOrigemTrecho(Parada paradaOrigemTrecho) { + this.paradaOrigemTrecho = paradaOrigemTrecho; + } + + public Parada getParadaDestinoTrecho() { + return paradaDestinoTrecho; + } + + public void setParadaDestinoTrecho(Parada paradaDestinoTrecho) { + this.paradaDestinoTrecho = paradaDestinoTrecho; + } + + public String getNumRuta() { + return numRuta; + } + + public void setNumRuta(String numRuta) { + this.numRuta = numRuta; + } + + public Integer getGrupo() { + return grupo; + } + + public void setGrupo(Integer grupo) { + this.grupo = grupo; + } + + @Override + public String toString() { + return "ParadaVOConexionRuta [paradaOrigem=" + paradaOrigem + ", paradaDestino=" + paradaDestino + ", paradaOrigemTrecho=" + paradaOrigemTrecho + ", paradaDestinoTrecho=" + paradaDestinoTrecho + ", rutaId=" + rutaId + ", numRuta=" + numRuta + ", secuencia=" + secuencia + ", valido=" + valido + "]"; + } + + public ConexionCtrlVO getConexionCtrl() { + return conexionCtrl; + } + + public void setConexionCtrl(ConexionCtrlVO conexionCtrl) { + this.conexionCtrl = conexionCtrl; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getParadaDestino() == null) ? 0 : getParadaDestino().hashCode()); + result = prime * result + ((getParadaOrigem() == null) ? 0 : getParadaOrigem().hashCode()); + result = prime * result + ((getRutaId() == null) ? 0 : getRutaId().hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof ParadaVOConexionRuta)) + return false; + ParadaVOConexionRuta other = (ParadaVOConexionRuta) obj; + if (getParadaDestino() == null) { + if (other.getParadaDestino() != null) + return false; + } else if (!getParadaDestino().equals(other.getParadaDestino())) + return false; + if (getParadaOrigem() == null) { + if (other.getParadaOrigem() != null) + return false; + } else if (!getParadaOrigem().equals(other.getParadaOrigem())) + return false; + if (getRutaId() == null) { + if (other.getRutaId() != null) + return false; + } else if (!getRutaId().equals(other.getRutaId())) + return false; + return true; + } + + public ConexionRutaCtrlVO getConexionRutaCtrl() { + return conexionRutaCtrl; + } + + public void setConexionRutaCtrl(ConexionRutaCtrlVO conexionRutaCtrl) { + this.conexionRutaCtrl = conexionRutaCtrl; + } + + public Long getConexionRutaTramoId() { + return conexionRutaTramoId; + } + + public void setConexionRutaTramoId(Long conexionRutaTramoId) { + this.conexionRutaTramoId = conexionRutaTramoId; + } + + public String getSentido() { + return sentido; + } + + public void setSentido(String sentido) { + this.sentido = sentido; + } + + public String getNumRutaSentido() { + return numRuta + " - " + sentido; + } + + public PricingConexao getPricingConexao() { + return pricingConexao; + } + + public void setPricingConexao(PricingConexao pricingConexao) { + this.pricingConexao = pricingConexao; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaLegendaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaLegendaVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaLegendaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaLegendaVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaPoltronasVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaPoltronasVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaPoltronasVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaPoltronasVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingOcupaAntecipaVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingRevisaoValoresVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingRevisaoValoresVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingRevisaoValoresVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/GP_PricingRevisaoValoresVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/Pricing.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/Pricing.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/pricing/Pricing.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/Pricing.java index 291095af4..8aa543fce 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/Pricing.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/Pricing.java @@ -1,381 +1,381 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import com.rjconsultores.ventaboletos.entidad.PricingClase; -import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; -import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; - -public class Pricing implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer pricingId; - private String nomePricing; - private String aplicaFeriadoDtViagem; - private String aplicaFeriadoDtVenda; - private Integer empresaId; - private Integer qtdePoltronas; - private Integer tipoPricingPorcentagem; - private BigDecimal porcentagemIda; - private BigDecimal porcentagemIdaVolta; - private Integer podeTransferir; - private Integer podeCancelar; - private Integer podeReservar; - private Integer diasAtencipacao; - private Integer exibirVenda; - private BigDecimal valor; - - private String pricingoperacao; - - private List poltronas; // - private List canalvendas; // - private List categorias; // - private List classes; // - private List servicos; // - private List dias; // - private List ocupacoes; // - private List puntoventas; // - private List linhas; // - private List tiposervicos; // - private List mercados; // - private List vigencias; // - private List marcas; // - - public Pricing() { - super(); - } - - public Pricing(com.rjconsultores.ventaboletos.entidad.Pricing pricing) { - this(); - pricingId = pricing.getPricingId(); - nomePricing = pricing.getNombPricing(); - aplicaFeriadoDtViagem = pricing.getIndGeneraFeriadoViaje(); - aplicaFeriadoDtVenda = pricing.getIndGeneraFeriadoVenta(); - empresaId = pricing.getEmpresa().getEmpresaId(); - qtdePoltronas = pricing.getCantboleto() != null ? pricing.getCantboleto().intValue() : null; - tipoPricingPorcentagem = pricing.getDescuentoporcentaje() != null ? 1 : 0; - porcentagemIda = pricing.getDescuentoporcentaje(); - porcentagemIdaVolta = pricing.getDescuentoporcredondo(); - podeTransferir = pricing.getIndtransferible() ? 1 : 0; - podeCancelar = pricing.getIndcancelable() ? 1 : 0; - podeReservar = pricing.getIndreservable() ? 1 : 0; - diasAtencipacao = pricing.getCantdiasanticipacion(); - exibirVenda = pricing.getExibeVenda() ? 1 : 0; - - poltronas = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingAsiento pricingAsiento : pricing.getPricingAsientoList()) { - PricingAsiento pricingasientoVO = new PricingAsiento(pricingAsiento); - poltronas.add(pricingasientoVO); - } - - canalvendas = new ArrayList(0); - for (PricingTipoPtoVta pricingTipoPtoVta : pricing.getPricingTipoptovtaList()) { - PricingCanalVenta pricingCanalVenta = new PricingCanalVenta(pricingTipoPtoVta); - canalvendas.add(pricingCanalVenta); - } - - categorias = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria : pricing.getPricingCategoriaList()) { - PricingCategoria pricingCategoriaVO = new PricingCategoria(pricingCategoria); - categorias.add(pricingCategoriaVO); - } - - classes = new ArrayList(0); - for (PricingClase pricingClase : pricing.getPricingClaseList()) { - PricingClasse pricingClasse = new PricingClasse(pricingClase); - classes.add(pricingClasse); - } - - servicos = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingCorrida pricingCorrida : pricing.getPricingCorridaList()) { - PricingCorrida pricingCorridaVO = new PricingCorrida(pricingCorrida); - servicos.add(pricingCorridaVO); - } - - dias = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingDia pricingDia : pricing.getPricingDiaList()) { - PricingDia pricingDiaVO = new PricingDia(pricingDia); - dias.add(pricingDiaVO); - } - - ocupacoes = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa pricingOcupaAntecipa : pricing.getPricingOcupaAntecipaList()) { - PricingOcupaAntecipa pricingOcupaAntecipaVO = new PricingOcupaAntecipa(pricingOcupaAntecipa); - ocupacoes.add(pricingOcupaAntecipaVO); - } - - puntoventas = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta : pricing.getPricingPuntoventaList()) { - PricingPuntoVenta pricingPuntoVentaVO = new PricingPuntoVenta(pricingPuntoVenta); - puntoventas.add(pricingPuntoVentaVO); - } - - linhas = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta : pricing.getPricingRutaList()) { - PricingRuta pricingRutaVO = new PricingRuta(pricingRuta); - linhas.add(pricingRutaVO); - } - - tiposervicos = new ArrayList(0); - for (PricingTipoServicio pricingTipoServicio: pricing.getPricingTipoServicioList()) { - PricingTipoCorrida pricingTipoCorrida = new PricingTipoCorrida(pricingTipoServicio); - tiposervicos.add(pricingTipoCorrida); - } - - mercados = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingMercado pricingMercado : pricing.getPricingMercadoList()) { - PricingMercado pricingMercadoVO = new PricingMercado(pricingMercado); - mercados.add(pricingMercadoVO); - } - - vigencias = new ArrayList(0); - for (com.rjconsultores.ventaboletos.entidad.PricingVigencia pricingVigencia : pricing.getPricingVigenciaList()) { - PricingVigencia pricingVigenciaVO = new PricingVigencia(pricingVigencia); - vigencias.add(pricingVigenciaVO); - } - - marcas = new ArrayList(); - for (com.rjconsultores.ventaboletos.entidad.PricingMarca pricingMarca : pricing.getPricingMarcaList()) { - PricingMarca pricingMarcaVO = new PricingMarca(pricingMarca); - marcas.add(pricingMarcaVO); - } - - } - - public Integer getPricingId() { - return pricingId; - } - - public void setPricingId(Integer pricingId) { - this.pricingId = pricingId; - } - - public String getNomePricing() { - return nomePricing; - } - - public void setNomePricing(String nomePricing) { - this.nomePricing = nomePricing; - } - - public String getAplicaFeriadoDtViagem() { - return aplicaFeriadoDtViagem; - } - - public void setAplicaFeriadoDtViagem(String aplicaFeriadoDtViagem) { - this.aplicaFeriadoDtViagem = aplicaFeriadoDtViagem; - } - - public String getAplicaFeriadoDtVenda() { - return aplicaFeriadoDtVenda; - } - - public void setAplicaFeriadoDtVenda(String aplicaFeriadoDtVenda) { - this.aplicaFeriadoDtVenda = aplicaFeriadoDtVenda; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - - public Integer getQtdePoltronas() { - return qtdePoltronas; - } - - public void setQtdePoltronas(Integer qtdePoltronas) { - this.qtdePoltronas = qtdePoltronas; - } - - public Integer getTipoPricingPorcentagem() { - return tipoPricingPorcentagem; - } - - public void setTipoPricingPorcentagem(Integer tipoPricingPorcentagem) { - this.tipoPricingPorcentagem = tipoPricingPorcentagem; - } - - public BigDecimal getPorcentagemIda() { - return porcentagemIda; - } - - public void setPorcentagemIda(BigDecimal porcentagemIda) { - this.porcentagemIda = porcentagemIda; - } - - public BigDecimal getPorcentagemIdaVolta() { - return porcentagemIdaVolta; - } - - public void setPorcentagemIdaVolta(BigDecimal porcentagemIdaVolta) { - this.porcentagemIdaVolta = porcentagemIdaVolta; - } - - public Integer getPodeTransferir() { - return podeTransferir; - } - - public void setPodeTransferir(Integer podeTransferir) { - this.podeTransferir = podeTransferir; - } - - public Integer getPodeCancelar() { - return podeCancelar; - } - - public void setPodeCancelar(Integer podeCancelar) { - this.podeCancelar = podeCancelar; - } - - public Integer getPodeReservar() { - return podeReservar; - } - - public void setPodeReservar(Integer podeReservar) { - this.podeReservar = podeReservar; - } - - public Integer getDiasAtencipacao() { - return diasAtencipacao; - } - - public void setDiasAtencipacao(Integer diasAtencipacao) { - this.diasAtencipacao = diasAtencipacao; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - public String getPricingoperacao() { - return pricingoperacao; - } - - public void setPricingoperacao(String pricingoperacao) { - this.pricingoperacao = pricingoperacao; - } - - public List getPoltronas() { - return poltronas; - } - - public void setPoltronas(List poltronas) { - this.poltronas = poltronas; - } - - public List getCanalvendas() { - return canalvendas; - } - - public void setCanalvendas(List canalvendas) { - this.canalvendas = canalvendas; - } - - public List getCategorias() { - return categorias; - } - - public void setCategorias(List categorias) { - this.categorias = categorias; - } - - public List getClasses() { - return classes; - } - - public void setClasses(List classes) { - this.classes = classes; - } - - public List getServicos() { - return servicos; - } - - public void setServicos(List servicos) { - this.servicos = servicos; - } - - public List getDias() { - return dias; - } - - public void setDias(List dias) { - this.dias = dias; - } - - public List getOcupacoes() { - return ocupacoes; - } - - public void setOcupacoes(List ocupacoes) { - this.ocupacoes = ocupacoes; - } - - public List getPuntoventas() { - return puntoventas; - } - - public void setPuntoventas(List puntoventas) { - this.puntoventas = puntoventas; - } - - public List getLinhas() { - return linhas; - } - - public void setLinhas(List linhas) { - this.linhas = linhas; - } - - public List getTiposervicos() { - return tiposervicos; - } - - public void setTiposervicos(List tiposervicos) { - this.tiposervicos = tiposervicos; - } - - public Integer getExibirVenda() { - return exibirVenda; - } - - public void setExibirVenda(Integer exibirVenda) { - this.exibirVenda = exibirVenda; - } - - public List getMercados() { - return mercados; - } - - public void setMercados(List mercados) { - this.mercados = mercados; - } - - public List getVigencias() { - return vigencias; - } - - public void setVigencias(List vigencias) { - this.vigencias = vigencias; - } - - public List getMarcas() { - return marcas; - } - - public void setMarcas(List marcas) { - this.marcas = marcas; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.PricingClase; +import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; +import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; + +public class Pricing implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pricingId; + private String nomePricing; + private String aplicaFeriadoDtViagem; + private String aplicaFeriadoDtVenda; + private Integer empresaId; + private Integer qtdePoltronas; + private Integer tipoPricingPorcentagem; + private BigDecimal porcentagemIda; + private BigDecimal porcentagemIdaVolta; + private Integer podeTransferir; + private Integer podeCancelar; + private Integer podeReservar; + private Integer diasAtencipacao; + private Integer exibirVenda; + private BigDecimal valor; + + private String pricingoperacao; + + private List poltronas; // + private List canalvendas; // + private List categorias; // + private List classes; // + private List servicos; // + private List dias; // + private List ocupacoes; // + private List puntoventas; // + private List linhas; // + private List tiposervicos; // + private List mercados; // + private List vigencias; // + private List marcas; // + + public Pricing() { + super(); + } + + public Pricing(com.rjconsultores.ventaboletos.entidad.Pricing pricing) { + this(); + pricingId = pricing.getPricingId(); + nomePricing = pricing.getNombPricing(); + aplicaFeriadoDtViagem = pricing.getIndGeneraFeriadoViaje(); + aplicaFeriadoDtVenda = pricing.getIndGeneraFeriadoVenta(); + empresaId = pricing.getEmpresa().getEmpresaId(); + qtdePoltronas = pricing.getCantboleto() != null ? pricing.getCantboleto().intValue() : null; + tipoPricingPorcentagem = pricing.getDescuentoporcentaje() != null ? 1 : 0; + porcentagemIda = pricing.getDescuentoporcentaje(); + porcentagemIdaVolta = pricing.getDescuentoporcredondo(); + podeTransferir = pricing.getIndtransferible() ? 1 : 0; + podeCancelar = pricing.getIndcancelable() ? 1 : 0; + podeReservar = pricing.getIndreservable() ? 1 : 0; + diasAtencipacao = pricing.getCantdiasanticipacion(); + exibirVenda = pricing.getExibeVenda() ? 1 : 0; + + poltronas = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingAsiento pricingAsiento : pricing.getPricingAsientoList()) { + PricingAsiento pricingasientoVO = new PricingAsiento(pricingAsiento); + poltronas.add(pricingasientoVO); + } + + canalvendas = new ArrayList(0); + for (PricingTipoPtoVta pricingTipoPtoVta : pricing.getPricingTipoptovtaList()) { + PricingCanalVenta pricingCanalVenta = new PricingCanalVenta(pricingTipoPtoVta); + canalvendas.add(pricingCanalVenta); + } + + categorias = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria : pricing.getPricingCategoriaList()) { + PricingCategoria pricingCategoriaVO = new PricingCategoria(pricingCategoria); + categorias.add(pricingCategoriaVO); + } + + classes = new ArrayList(0); + for (PricingClase pricingClase : pricing.getPricingClaseList()) { + PricingClasse pricingClasse = new PricingClasse(pricingClase); + classes.add(pricingClasse); + } + + servicos = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingCorrida pricingCorrida : pricing.getPricingCorridaList()) { + PricingCorrida pricingCorridaVO = new PricingCorrida(pricingCorrida); + servicos.add(pricingCorridaVO); + } + + dias = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingDia pricingDia : pricing.getPricingDiaList()) { + PricingDia pricingDiaVO = new PricingDia(pricingDia); + dias.add(pricingDiaVO); + } + + ocupacoes = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa pricingOcupaAntecipa : pricing.getPricingOcupaAntecipaList()) { + PricingOcupaAntecipa pricingOcupaAntecipaVO = new PricingOcupaAntecipa(pricingOcupaAntecipa); + ocupacoes.add(pricingOcupaAntecipaVO); + } + + puntoventas = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta : pricing.getPricingPuntoventaList()) { + PricingPuntoVenta pricingPuntoVentaVO = new PricingPuntoVenta(pricingPuntoVenta); + puntoventas.add(pricingPuntoVentaVO); + } + + linhas = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta : pricing.getPricingRutaList()) { + PricingRuta pricingRutaVO = new PricingRuta(pricingRuta); + linhas.add(pricingRutaVO); + } + + tiposervicos = new ArrayList(0); + for (PricingTipoServicio pricingTipoServicio: pricing.getPricingTipoServicioList()) { + PricingTipoCorrida pricingTipoCorrida = new PricingTipoCorrida(pricingTipoServicio); + tiposervicos.add(pricingTipoCorrida); + } + + mercados = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingMercado pricingMercado : pricing.getPricingMercadoList()) { + PricingMercado pricingMercadoVO = new PricingMercado(pricingMercado); + mercados.add(pricingMercadoVO); + } + + vigencias = new ArrayList(0); + for (com.rjconsultores.ventaboletos.entidad.PricingVigencia pricingVigencia : pricing.getPricingVigenciaList()) { + PricingVigencia pricingVigenciaVO = new PricingVigencia(pricingVigencia); + vigencias.add(pricingVigenciaVO); + } + + marcas = new ArrayList(); + for (com.rjconsultores.ventaboletos.entidad.PricingMarca pricingMarca : pricing.getPricingMarcaList()) { + PricingMarca pricingMarcaVO = new PricingMarca(pricingMarca); + marcas.add(pricingMarcaVO); + } + + } + + public Integer getPricingId() { + return pricingId; + } + + public void setPricingId(Integer pricingId) { + this.pricingId = pricingId; + } + + public String getNomePricing() { + return nomePricing; + } + + public void setNomePricing(String nomePricing) { + this.nomePricing = nomePricing; + } + + public String getAplicaFeriadoDtViagem() { + return aplicaFeriadoDtViagem; + } + + public void setAplicaFeriadoDtViagem(String aplicaFeriadoDtViagem) { + this.aplicaFeriadoDtViagem = aplicaFeriadoDtViagem; + } + + public String getAplicaFeriadoDtVenda() { + return aplicaFeriadoDtVenda; + } + + public void setAplicaFeriadoDtVenda(String aplicaFeriadoDtVenda) { + this.aplicaFeriadoDtVenda = aplicaFeriadoDtVenda; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + + public Integer getQtdePoltronas() { + return qtdePoltronas; + } + + public void setQtdePoltronas(Integer qtdePoltronas) { + this.qtdePoltronas = qtdePoltronas; + } + + public Integer getTipoPricingPorcentagem() { + return tipoPricingPorcentagem; + } + + public void setTipoPricingPorcentagem(Integer tipoPricingPorcentagem) { + this.tipoPricingPorcentagem = tipoPricingPorcentagem; + } + + public BigDecimal getPorcentagemIda() { + return porcentagemIda; + } + + public void setPorcentagemIda(BigDecimal porcentagemIda) { + this.porcentagemIda = porcentagemIda; + } + + public BigDecimal getPorcentagemIdaVolta() { + return porcentagemIdaVolta; + } + + public void setPorcentagemIdaVolta(BigDecimal porcentagemIdaVolta) { + this.porcentagemIdaVolta = porcentagemIdaVolta; + } + + public Integer getPodeTransferir() { + return podeTransferir; + } + + public void setPodeTransferir(Integer podeTransferir) { + this.podeTransferir = podeTransferir; + } + + public Integer getPodeCancelar() { + return podeCancelar; + } + + public void setPodeCancelar(Integer podeCancelar) { + this.podeCancelar = podeCancelar; + } + + public Integer getPodeReservar() { + return podeReservar; + } + + public void setPodeReservar(Integer podeReservar) { + this.podeReservar = podeReservar; + } + + public Integer getDiasAtencipacao() { + return diasAtencipacao; + } + + public void setDiasAtencipacao(Integer diasAtencipacao) { + this.diasAtencipacao = diasAtencipacao; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + public String getPricingoperacao() { + return pricingoperacao; + } + + public void setPricingoperacao(String pricingoperacao) { + this.pricingoperacao = pricingoperacao; + } + + public List getPoltronas() { + return poltronas; + } + + public void setPoltronas(List poltronas) { + this.poltronas = poltronas; + } + + public List getCanalvendas() { + return canalvendas; + } + + public void setCanalvendas(List canalvendas) { + this.canalvendas = canalvendas; + } + + public List getCategorias() { + return categorias; + } + + public void setCategorias(List categorias) { + this.categorias = categorias; + } + + public List getClasses() { + return classes; + } + + public void setClasses(List classes) { + this.classes = classes; + } + + public List getServicos() { + return servicos; + } + + public void setServicos(List servicos) { + this.servicos = servicos; + } + + public List getDias() { + return dias; + } + + public void setDias(List dias) { + this.dias = dias; + } + + public List getOcupacoes() { + return ocupacoes; + } + + public void setOcupacoes(List ocupacoes) { + this.ocupacoes = ocupacoes; + } + + public List getPuntoventas() { + return puntoventas; + } + + public void setPuntoventas(List puntoventas) { + this.puntoventas = puntoventas; + } + + public List getLinhas() { + return linhas; + } + + public void setLinhas(List linhas) { + this.linhas = linhas; + } + + public List getTiposervicos() { + return tiposervicos; + } + + public void setTiposervicos(List tiposervicos) { + this.tiposervicos = tiposervicos; + } + + public Integer getExibirVenda() { + return exibirVenda; + } + + public void setExibirVenda(Integer exibirVenda) { + this.exibirVenda = exibirVenda; + } + + public List getMercados() { + return mercados; + } + + public void setMercados(List mercados) { + this.mercados = mercados; + } + + public List getVigencias() { + return vigencias; + } + + public void setVigencias(List vigencias) { + this.vigencias = vigencias; + } + + public List getMarcas() { + return marcas; + } + + public void setMarcas(List marcas) { + this.marcas = marcas; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingAsiento.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingAsiento.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingAsiento.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingAsiento.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCanalVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCanalVenta.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingCanalVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCanalVenta.java index f020f2a42..4ce5e9171 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCanalVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCanalVenta.java @@ -1,37 +1,37 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; - -import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; - -public class PricingCanalVenta implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer canalventaId; - private String desccanalventa; - - public PricingCanalVenta() { - super(); - } - - public PricingCanalVenta(PricingTipoPtoVta pricingTipoPtoVta) { - this(); - - this.canalventaId = pricingTipoPtoVta.getTipoPtovta().getTipoptovtaId().intValue(); - this.desccanalventa = pricingTipoPtoVta.getTipoPtovta().getDesctipo(); - } - public Integer getCanalventaId() { - return canalventaId; - } - public void setCanalventaId(Integer canalventaId) { - this.canalventaId = canalventaId; - } - public String getDesccanalventa() { - return desccanalventa; - } - public void setDesccanalventa(String desccanalventa) { - this.desccanalventa = desccanalventa; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; + +import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; + +public class PricingCanalVenta implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer canalventaId; + private String desccanalventa; + + public PricingCanalVenta() { + super(); + } + + public PricingCanalVenta(PricingTipoPtoVta pricingTipoPtoVta) { + this(); + + this.canalventaId = pricingTipoPtoVta.getTipoPtovta().getTipoptovtaId().intValue(); + this.desccanalventa = pricingTipoPtoVta.getTipoPtovta().getDesctipo(); + } + public Integer getCanalventaId() { + return canalventaId; + } + public void setCanalventaId(Integer canalventaId) { + this.canalventaId = canalventaId; + } + public String getDesccanalventa() { + return desccanalventa; + } + public void setDesccanalventa(String desccanalventa) { + this.desccanalventa = desccanalventa; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCategoria.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCategoria.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingCategoria.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCategoria.java index 131e23bb5..04d68ea91 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCategoria.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCategoria.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; - -public class PricingCategoria implements Serializable{ - - private static final long serialVersionUID = 1L; - - private Integer categoriaId; - private String desccategoria; - - public PricingCategoria() { - super(); - } - - public PricingCategoria(com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria) { - this(); - - this.categoriaId = pricingCategoria.getCategoria().getCategoriaId(); - this.desccategoria = pricingCategoria.getCategoria().getDesccategoria(); - } - - public Integer getCategoriaId() { - return categoriaId; - } - - public void setCategoriaId(Integer categoriaId) { - this.categoriaId = categoriaId; - } - - public String getDesccategoria() { - return desccategoria; - } - - public void setDesccategoria(String desccategoria) { - this.desccategoria = desccategoria; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; + +public class PricingCategoria implements Serializable{ + + private static final long serialVersionUID = 1L; + + private Integer categoriaId; + private String desccategoria; + + public PricingCategoria() { + super(); + } + + public PricingCategoria(com.rjconsultores.ventaboletos.entidad.PricingCategoria pricingCategoria) { + this(); + + this.categoriaId = pricingCategoria.getCategoria().getCategoriaId(); + this.desccategoria = pricingCategoria.getCategoria().getDesccategoria(); + } + + public Integer getCategoriaId() { + return categoriaId; + } + + public void setCategoriaId(Integer categoriaId) { + this.categoriaId = categoriaId; + } + + public String getDesccategoria() { + return desccategoria; + } + + public void setDesccategoria(String desccategoria) { + this.desccategoria = desccategoria; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingClasse.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingClasse.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingClasse.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingClasse.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCorrida.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingCorrida.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingDia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingDia.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingDia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingDia.java diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMarca.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMarca.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingMarca.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMarca.java index 278edd779..06dbfe843 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMarca.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMarca.java @@ -1,34 +1,34 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -public class PricingMarca { - - private Integer marcaId; - private String descmarca; - - public PricingMarca() { - super(); - } - - public PricingMarca(com.rjconsultores.ventaboletos.entidad.PricingMarca pricingMarca) { - this(); - this.marcaId = pricingMarca.getMarca().getMarcaId().intValue(); - this.descmarca = pricingMarca.getMarca().getDescmarca(); - } - - public Integer getMarcaId() { - return marcaId; - } - - public void setMarcaId(Integer marcaId) { - this.marcaId = marcaId; - } - - public String getDescmarca() { - return descmarca; - } - - public void setDescmarca(String descmarca) { - this.descmarca = descmarca; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +public class PricingMarca { + + private Integer marcaId; + private String descmarca; + + public PricingMarca() { + super(); + } + + public PricingMarca(com.rjconsultores.ventaboletos.entidad.PricingMarca pricingMarca) { + this(); + this.marcaId = pricingMarca.getMarca().getMarcaId().intValue(); + this.descmarca = pricingMarca.getMarca().getDescmarca(); + } + + public Integer getMarcaId() { + return marcaId; + } + + public void setMarcaId(Integer marcaId) { + this.marcaId = marcaId; + } + + public String getDescmarca() { + return descmarca; + } + + public void setDescmarca(String descmarca) { + this.descmarca = descmarca; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMercado.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMercado.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingMercado.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMercado.java index afa8508ee..7e5a52eab 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMercado.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingMercado.java @@ -1,57 +1,57 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -public class PricingMercado { - - private String descorigem; - private Integer origemId; - - private String descdestino; - private Integer destinoId; - - public PricingMercado() { - super(); - } - - public PricingMercado(com.rjconsultores.ventaboletos.entidad.PricingMercado pricingMercado) { - this(); - - this.origemId = pricingMercado.getOrigen() != null ? pricingMercado.getOrigen().getParadaId() : null; - this.descorigem = pricingMercado.getOrigen() != null ? pricingMercado.getOrigen().getDescparada() : null; - - this.destinoId = pricingMercado.getDestino() != null ? pricingMercado.getDestino().getParadaId() : null; - this.descdestino = pricingMercado.getDestino() != null ? pricingMercado.getDestino().getDescparada() : null; - } - - public String getDescorigem() { - return descorigem; - } - - public void setDescorigem(String descorigem) { - this.descorigem = descorigem; - } - - public Integer getOrigemId() { - return origemId; - } - - public void setOrigemId(Integer origemId) { - this.origemId = origemId; - } - - public String getDescdestino() { - return descdestino; - } - - public void setDescdestino(String descdestino) { - this.descdestino = descdestino; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +public class PricingMercado { + + private String descorigem; + private Integer origemId; + + private String descdestino; + private Integer destinoId; + + public PricingMercado() { + super(); + } + + public PricingMercado(com.rjconsultores.ventaboletos.entidad.PricingMercado pricingMercado) { + this(); + + this.origemId = pricingMercado.getOrigen() != null ? pricingMercado.getOrigen().getParadaId() : null; + this.descorigem = pricingMercado.getOrigen() != null ? pricingMercado.getOrigen().getDescparada() : null; + + this.destinoId = pricingMercado.getDestino() != null ? pricingMercado.getDestino().getParadaId() : null; + this.descdestino = pricingMercado.getDestino() != null ? pricingMercado.getDestino().getDescparada() : null; + } + + public String getDescorigem() { + return descorigem; + } + + public void setDescorigem(String descorigem) { + this.descorigem = descorigem; + } + + public Integer getOrigemId() { + return origemId; + } + + public void setOrigemId(Integer origemId) { + this.origemId = origemId; + } + + public String getDescdestino() { + return descdestino; + } + + public void setDescdestino(String descdestino) { + this.descdestino = descdestino; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingOcupaAntecipa.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingOcupaAntecipa.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingOcupaAntecipa.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingOcupaAntecipa.java index 6136f9f51..18b351170 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingOcupaAntecipa.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingOcupaAntecipa.java @@ -1,121 +1,121 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class PricingOcupaAntecipa implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer cantdiasmin; - private Integer cantdiasmax; - private Integer cantasientosmin; - private Integer cantasientosmax; - private BigDecimal porcentaje; - private BigDecimal ocupacioninicial; - private BigDecimal ocupacionfinal; - private BigDecimal importe; - - private Integer classeId; - private String descclasse; - - public PricingOcupaAntecipa() { - super(); - } - - public PricingOcupaAntecipa(com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa pricingOcupaAntecipa) { - this(); - - cantdiasmin = pricingOcupaAntecipa.getCantdiasmin(); - cantdiasmax = pricingOcupaAntecipa.getCantdiasmax(); - cantasientosmin = pricingOcupaAntecipa.getCantasientosmin(); - cantasientosmax = pricingOcupaAntecipa.getCantasientosmax(); - porcentaje = pricingOcupaAntecipa.getPorcentaje(); - ocupacioninicial = pricingOcupaAntecipa.getOcupacioninicial(); - ocupacionfinal = pricingOcupaAntecipa.getOcupacionfinal(); - importe = pricingOcupaAntecipa.getImporte(); - classeId = pricingOcupaAntecipa.getPricingClasseTarifaria() != null ? pricingOcupaAntecipa.getPricingClasseTarifaria().getPricingClasseTarifariaId() : null; - descclasse = pricingOcupaAntecipa.getPricingClasseTarifaria() != null ? pricingOcupaAntecipa.getPricingClasseTarifaria().getDescClasseTarifaria() : null; - } - - public Integer getCantdiasmin() { - return cantdiasmin; - } - - public void setCantdiasmin(Integer cantdiasmin) { - this.cantdiasmin = cantdiasmin; - } - - public Integer getCantdiasmax() { - return cantdiasmax; - } - - public void setCantdiasmax(Integer cantdiasmax) { - this.cantdiasmax = cantdiasmax; - } - - public Integer getCantasientosmin() { - return cantasientosmin; - } - - public void setCantasientosmin(Integer cantasientosmin) { - this.cantasientosmin = cantasientosmin; - } - - public Integer getCantasientosmax() { - return cantasientosmax; - } - - public void setCantasientosmax(Integer cantasientosmax) { - this.cantasientosmax = cantasientosmax; - } - - public BigDecimal getPorcentaje() { - return porcentaje; - } - - public void setPorcentaje(BigDecimal porcentaje) { - this.porcentaje = porcentaje; - } - - public BigDecimal getOcupacioninicial() { - return ocupacioninicial; - } - - public void setOcupacioninicial(BigDecimal ocupacioninicial) { - this.ocupacioninicial = ocupacioninicial; - } - - public BigDecimal getOcupacionfinal() { - return ocupacionfinal; - } - - public void setOcupacionfinal(BigDecimal ocupacionfinal) { - this.ocupacionfinal = ocupacionfinal; - } - - public BigDecimal getImporte() { - return importe; - } - - public void setImporte(BigDecimal importe) { - this.importe = importe; - } - - public Integer getClasseId() { - return classeId; - } - - public void setClasseId(Integer classeId) { - this.classeId = classeId; - } - - public String getDescclasse() { - return descclasse; - } - - public void setDescclasse(String descclasse) { - this.descclasse = descclasse; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; +import java.math.BigDecimal; + +public class PricingOcupaAntecipa implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer cantdiasmin; + private Integer cantdiasmax; + private Integer cantasientosmin; + private Integer cantasientosmax; + private BigDecimal porcentaje; + private BigDecimal ocupacioninicial; + private BigDecimal ocupacionfinal; + private BigDecimal importe; + + private Integer classeId; + private String descclasse; + + public PricingOcupaAntecipa() { + super(); + } + + public PricingOcupaAntecipa(com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa pricingOcupaAntecipa) { + this(); + + cantdiasmin = pricingOcupaAntecipa.getCantdiasmin(); + cantdiasmax = pricingOcupaAntecipa.getCantdiasmax(); + cantasientosmin = pricingOcupaAntecipa.getCantasientosmin(); + cantasientosmax = pricingOcupaAntecipa.getCantasientosmax(); + porcentaje = pricingOcupaAntecipa.getPorcentaje(); + ocupacioninicial = pricingOcupaAntecipa.getOcupacioninicial(); + ocupacionfinal = pricingOcupaAntecipa.getOcupacionfinal(); + importe = pricingOcupaAntecipa.getImporte(); + classeId = pricingOcupaAntecipa.getPricingClasseTarifaria() != null ? pricingOcupaAntecipa.getPricingClasseTarifaria().getPricingClasseTarifariaId() : null; + descclasse = pricingOcupaAntecipa.getPricingClasseTarifaria() != null ? pricingOcupaAntecipa.getPricingClasseTarifaria().getDescClasseTarifaria() : null; + } + + public Integer getCantdiasmin() { + return cantdiasmin; + } + + public void setCantdiasmin(Integer cantdiasmin) { + this.cantdiasmin = cantdiasmin; + } + + public Integer getCantdiasmax() { + return cantdiasmax; + } + + public void setCantdiasmax(Integer cantdiasmax) { + this.cantdiasmax = cantdiasmax; + } + + public Integer getCantasientosmin() { + return cantasientosmin; + } + + public void setCantasientosmin(Integer cantasientosmin) { + this.cantasientosmin = cantasientosmin; + } + + public Integer getCantasientosmax() { + return cantasientosmax; + } + + public void setCantasientosmax(Integer cantasientosmax) { + this.cantasientosmax = cantasientosmax; + } + + public BigDecimal getPorcentaje() { + return porcentaje; + } + + public void setPorcentaje(BigDecimal porcentaje) { + this.porcentaje = porcentaje; + } + + public BigDecimal getOcupacioninicial() { + return ocupacioninicial; + } + + public void setOcupacioninicial(BigDecimal ocupacioninicial) { + this.ocupacioninicial = ocupacioninicial; + } + + public BigDecimal getOcupacionfinal() { + return ocupacionfinal; + } + + public void setOcupacionfinal(BigDecimal ocupacionfinal) { + this.ocupacionfinal = ocupacionfinal; + } + + public BigDecimal getImporte() { + return importe; + } + + public void setImporte(BigDecimal importe) { + this.importe = importe; + } + + public Integer getClasseId() { + return classeId; + } + + public void setClasseId(Integer classeId) { + this.classeId = classeId; + } + + public String getDescclasse() { + return descclasse; + } + + public void setDescclasse(String descclasse) { + this.descclasse = descclasse; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingPuntoVenta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingPuntoVenta.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingPuntoVenta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingPuntoVenta.java index b51e95807..cd0c9e905 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingPuntoVenta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingPuntoVenta.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; - -public class PricingPuntoVenta implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer puntoventaId; - private String nombpuntoventa; - - public PricingPuntoVenta() { - super(); - } - - public PricingPuntoVenta(com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta) { - this(); - - this.puntoventaId = pricingPuntoVenta.getPuntoVenta().getPuntoventaId(); - this.nombpuntoventa = pricingPuntoVenta.getPuntoVenta().getNombpuntoventa(); - } - - public Integer getPuntoventaId() { - return puntoventaId; - } - - public void setPuntoventaId(Integer puntoventaId) { - this.puntoventaId = puntoventaId; - } - - public String getNombpuntoventa() { - return nombpuntoventa; - } - - public void setNombpuntoventa(String nombpuntoventa) { - this.nombpuntoventa = nombpuntoventa; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; + +public class PricingPuntoVenta implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer puntoventaId; + private String nombpuntoventa; + + public PricingPuntoVenta() { + super(); + } + + public PricingPuntoVenta(com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta pricingPuntoVenta) { + this(); + + this.puntoventaId = pricingPuntoVenta.getPuntoVenta().getPuntoventaId(); + this.nombpuntoventa = pricingPuntoVenta.getPuntoVenta().getNombpuntoventa(); + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public String getNombpuntoventa() { + return nombpuntoventa; + } + + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingRuta.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingRuta.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingRuta.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingRuta.java index 8daaf5ead..d74460622 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingRuta.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingRuta.java @@ -1,39 +1,39 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; - -public class PricingRuta implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer rutaId; - private String descruta; - - public PricingRuta() { - super(); - } - - public PricingRuta(com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta) { - this(); - - this.rutaId = pricingRuta.getRuta().getRutaId(); - this.descruta = pricingRuta.getRuta().getDescruta(); - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public String getDescruta() { - return descruta; - } - - public void setDescruta(String descruta) { - this.descruta = descruta; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; + +public class PricingRuta implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer rutaId; + private String descruta; + + public PricingRuta() { + super(); + } + + public PricingRuta(com.rjconsultores.ventaboletos.entidad.PricingRuta pricingRuta) { + this(); + + this.rutaId = pricingRuta.getRuta().getRutaId(); + this.descruta = pricingRuta.getRuta().getDescruta(); + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public String getDescruta() { + return descruta; + } + + public void setDescruta(String descruta) { + this.descruta = descruta; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingTipoCorrida.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingTipoCorrida.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingTipoCorrida.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingTipoCorrida.java index c9e843dfc..829734044 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingTipoCorrida.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingTipoCorrida.java @@ -1,41 +1,41 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import java.io.Serializable; - -import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; - -public class PricingTipoCorrida implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer tipocorridaId; - private String desctipocorrida; - - public PricingTipoCorrida() { - super(); - } - - public PricingTipoCorrida(PricingTipoServicio pricingTipoServicio) { - this(); - - this.tipocorridaId = pricingTipoServicio.getTipoServicio().getTiposervicioId(); - this.desctipocorrida = pricingTipoServicio.getTipoServicio().getDescservicio(); - } - - public Integer getTipocorridaId() { - return tipocorridaId; - } - - public void setTipocorridaId(Integer tipocorridaId) { - this.tipocorridaId = tipocorridaId; - } - - public String getDesctipocorrida() { - return desctipocorrida; - } - - public void setDesctipocorrida(String desctipocorrida) { - this.desctipocorrida = desctipocorrida; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import java.io.Serializable; + +import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; + +public class PricingTipoCorrida implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer tipocorridaId; + private String desctipocorrida; + + public PricingTipoCorrida() { + super(); + } + + public PricingTipoCorrida(PricingTipoServicio pricingTipoServicio) { + this(); + + this.tipocorridaId = pricingTipoServicio.getTipoServicio().getTiposervicioId(); + this.desctipocorrida = pricingTipoServicio.getTipoServicio().getDescservicio(); + } + + public Integer getTipocorridaId() { + return tipocorridaId; + } + + public void setTipocorridaId(Integer tipocorridaId) { + this.tipocorridaId = tipocorridaId; + } + + public String getDesctipocorrida() { + return desctipocorrida; + } + + public void setDesctipocorrida(String desctipocorrida) { + this.desctipocorrida = desctipocorrida; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingVigencia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingVigencia.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/pricing/PricingVigencia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingVigencia.java index daa7eabba..d3cf39f7c 100644 --- a/src/com/rjconsultores/ventaboletos/vo/pricing/PricingVigencia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/pricing/PricingVigencia.java @@ -1,56 +1,56 @@ -package com.rjconsultores.ventaboletos.vo.pricing; - -import com.rjconsultores.ventaboletos.utilerias.DateUtil; - -public class PricingVigencia { - - private String inicioDataViagem; - private String fimDataViagem; - private String inicioDataVenda; - private String fimDataVenda; - - public PricingVigencia() { - super(); - } - - public PricingVigencia(com.rjconsultores.ventaboletos.entidad.PricingVigencia pricingVigencia) { - this(); - this.inicioDataVenda = pricingVigencia.getFecinicioventa() != null ? DateUtil.getStringDate(pricingVigencia.getFecinicioventa(), "dd/MM/yyyy HH:mm") : null; - this.fimDataVenda = pricingVigencia.getFecfinventa() != null ? DateUtil.getStringDate(pricingVigencia.getFecfinventa(), "dd/MM/yyyy HH:mm") : null; - this.inicioDataViagem = pricingVigencia.getFecinicioviaje() != null ? DateUtil.getStringDate(pricingVigencia.getFecinicioviaje(), "dd/MM/yyyy HH:mm") : null; - this.fimDataViagem = pricingVigencia.getFecfinviaje() != null ? DateUtil.getStringDate(pricingVigencia.getFecfinviaje(), "dd/MM/yyyy HH:mm") : null; - } - - public String getInicioDataViagem() { - return inicioDataViagem; - } - - public void setInicioDataViagem(String inicioDataViagem) { - this.inicioDataViagem = inicioDataViagem; - } - - public String getFimDataViagem() { - return fimDataViagem; - } - - public void setFimDataViagem(String fimDataViagem) { - this.fimDataViagem = fimDataViagem; - } - - public String getInicioDataVenda() { - return inicioDataVenda; - } - - public void setInicioDataVenda(String inicioDataVenda) { - this.inicioDataVenda = inicioDataVenda; - } - - public String getFimDataVenda() { - return fimDataVenda; - } - - public void setFimDataVenda(String fimDataVenda) { - this.fimDataVenda = fimDataVenda; - } - -} +package com.rjconsultores.ventaboletos.vo.pricing; + +import com.rjconsultores.ventaboletos.utilerias.DateUtil; + +public class PricingVigencia { + + private String inicioDataViagem; + private String fimDataViagem; + private String inicioDataVenda; + private String fimDataVenda; + + public PricingVigencia() { + super(); + } + + public PricingVigencia(com.rjconsultores.ventaboletos.entidad.PricingVigencia pricingVigencia) { + this(); + this.inicioDataVenda = pricingVigencia.getFecinicioventa() != null ? DateUtil.getStringDate(pricingVigencia.getFecinicioventa(), "dd/MM/yyyy HH:mm") : null; + this.fimDataVenda = pricingVigencia.getFecfinventa() != null ? DateUtil.getStringDate(pricingVigencia.getFecfinventa(), "dd/MM/yyyy HH:mm") : null; + this.inicioDataViagem = pricingVigencia.getFecinicioviaje() != null ? DateUtil.getStringDate(pricingVigencia.getFecinicioviaje(), "dd/MM/yyyy HH:mm") : null; + this.fimDataViagem = pricingVigencia.getFecfinviaje() != null ? DateUtil.getStringDate(pricingVigencia.getFecfinviaje(), "dd/MM/yyyy HH:mm") : null; + } + + public String getInicioDataViagem() { + return inicioDataViagem; + } + + public void setInicioDataViagem(String inicioDataViagem) { + this.inicioDataViagem = inicioDataViagem; + } + + public String getFimDataViagem() { + return fimDataViagem; + } + + public void setFimDataViagem(String fimDataViagem) { + this.fimDataViagem = fimDataViagem; + } + + public String getInicioDataVenda() { + return inicioDataVenda; + } + + public void setInicioDataVenda(String inicioDataVenda) { + this.inicioDataVenda = inicioDataVenda; + } + + public String getFimDataVenda() { + return fimDataVenda; + } + + public void setFimDataVenda(String fimDataVenda) { + this.fimDataVenda = fimDataVenda; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/reembolsoocdnotacredito/ReembolsoOcdNotaCreditoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/reembolsoocdnotacredito/ReembolsoOcdNotaCreditoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/reembolsoocdnotacredito/ReembolsoOcdNotaCreditoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/reembolsoocdnotacredito/ReembolsoOcdNotaCreditoVO.java index 2c3ff2615..c0dc8a312 100644 --- a/src/com/rjconsultores/ventaboletos/vo/reembolsoocdnotacredito/ReembolsoOcdNotaCreditoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/reembolsoocdnotacredito/ReembolsoOcdNotaCreditoVO.java @@ -1,388 +1,388 @@ -package com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.entidad.Boleto; -import com.rjconsultores.ventaboletos.entidad.CajaTarjeta; -import com.rjconsultores.ventaboletos.entidad.NotaCreditoVendaPacote; -import com.rjconsultores.ventaboletos.entidad.OCD; -import com.rjconsultores.ventaboletos.entidad.OCDDatosPagamento; -import com.rjconsultores.ventaboletos.enums.SituacaoNotaCreditoVendaPacote; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.OcdUtil; - -@XmlRootElement(name = "ocdNotaCredito") -public class ReembolsoOcdNotaCreditoVO { - - private String numfoliosistema; - private String numoperacion; - private String localizador; - private Date data; - private Date dataPagamento; - private BigDecimal valor; - - private Set datosPagamento; - - private Set tarjetas; - - public ReembolsoOcdNotaCreditoVO() { } - - public static Builder builder() { - return new ReembolsoOcdNotaCreditoVO.Builder(); - } - - public String getLocalizador() { - return localizador; - } - - public void setLocalizador(String localizador) { - this.localizador = localizador; - } - - public Date getData() { - return data; - } - - public void setData(Date data) { - this.data = data; - } - - public Date getDataPagamento() { - return dataPagamento; - } - - public void setDataPagamento(Date dataPagamento) { - this.dataPagamento = dataPagamento; - } - - public BigDecimal getValor() { - return valor; - } - - public void setValor(BigDecimal valor) { - this.valor = valor; - } - - @XmlElementWrapper - @XmlElement(name = "datoPagamento", type = ReembolsoOcdNotaCreditoDatosPagamentoVO.class) - public Set getDatosPagamento() { - return datosPagamento; - } - - public void setDatosPagamento(Set datosPagamento) { - this.datosPagamento = datosPagamento; - } - - @XmlElementWrapper - @XmlElement(name = "tarjeta", type = ReembolsoOcdNotaCreditoTarjetaVO.class) - public Set getTarjetas() { - return tarjetas; - } - - public void setTarjetas(Set tarjetas) { - this.tarjetas = tarjetas; - } - - public String getNumfoliosistema() { - return numfoliosistema; - } - - public void setNumfoliosistema(String numfoliosistema) { - this.numfoliosistema = numfoliosistema; - } - - public String getNumoperacion() { - return numoperacion; - } - - public void setNumoperacion(String numoperacion) { - this.numoperacion = numoperacion; - } - - public static class ReembolsoOcdNotaCreditoTarjetaVO { - - private String numtarjeta; - private String numautorizacion; - private String nsu; - - public ReembolsoOcdNotaCreditoTarjetaVO() { } - - public ReembolsoOcdNotaCreditoTarjetaVO(CajaTarjeta cajaTarjeta) { - this.numtarjeta = cajaTarjeta.getNumtarjeta(); - this.numautorizacion = cajaTarjeta.getNumautorizacion(); - this.nsu = cajaTarjeta.getNsu(); - } - - public ReembolsoOcdNotaCreditoTarjetaVO(OCD ocd) { - this.numtarjeta = ocd.getNumtarjeta(); - this.numautorizacion = ocd.getNumautorizacion(); - this.nsu = ocd.getNsu(); - } - - public String getNumtarjeta() { - return numtarjeta; - } - public void setNumtarjeta(String numtarjeta) { - this.numtarjeta = numtarjeta; - } - public String getNumautorizacion() { - return numautorizacion; - } - public void setNumautorizacion(String numautorizacion) { - this.numautorizacion = numautorizacion; - } - public String getNsu() { - return nsu; - } - public void setNsu(String nsu) { - this.nsu = nsu; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((nsu == null) ? 0 : nsu.hashCode()); - result = prime * result + ((numautorizacion == null) ? 0 : numautorizacion.hashCode()); - result = prime * result + ((numtarjeta == null) ? 0 : numtarjeta.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ReembolsoOcdNotaCreditoTarjetaVO other = (ReembolsoOcdNotaCreditoTarjetaVO) obj; - if (nsu == null) { - if (other.nsu != null) - return false; - } else if (!nsu.equals(other.nsu)) - return false; - if (numautorizacion == null) { - if (other.numautorizacion != null) - return false; - } else if (!numautorizacion.equals(other.numautorizacion)) - return false; - if (numtarjeta == null) { - if (other.numtarjeta != null) - return false; - } else if (!numtarjeta.equals(other.numtarjeta)) - return false; - return true; - } - - } - - public static class ReembolsoOcdNotaCreditoDatosPagamentoVO { - - private String titularcuenta; - private String identificacion; - private String banco; - private String cuentabanco; - private String agencia; - private String email; - private String telefono; - - public ReembolsoOcdNotaCreditoDatosPagamentoVO() { } - - public ReembolsoOcdNotaCreditoDatosPagamentoVO(OCDDatosPagamento datosPagamento) { - this.titularcuenta = datosPagamento.getTitularcuenta(); - this.identificacion = datosPagamento.getIdentificacion(); - this.banco = datosPagamento.getBanco(); - this.cuentabanco = datosPagamento.getCuentabanco(); - this.agencia = datosPagamento.getAgencia(); - this.email = datosPagamento.getEmail(); - this.telefono = datosPagamento.getTelefono(); - } - - public String getTitularcuenta() { - return titularcuenta; - } - public void setTitularcuenta(String titularcuenta) { - this.titularcuenta = titularcuenta; - } - public String getIdentificacion() { - return identificacion; - } - public void setIdentificacion(String identificacion) { - this.identificacion = identificacion; - } - public String getBanco() { - return banco; - } - public void setBanco(String banco) { - this.banco = banco; - } - public String getCuentabanco() { - return cuentabanco; - } - public void setCuentabanco(String cuentabanco) { - this.cuentabanco = cuentabanco; - } - public String getAgencia() { - return agencia; - } - public void setAgencia(String agencia) { - this.agencia = agencia; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public String getTelefono() { - return telefono; - } - public void setTelefono(String telefono) { - this.telefono = telefono; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((agencia == null) ? 0 : agencia.hashCode()); - result = prime * result + ((banco == null) ? 0 : banco.hashCode()); - result = prime * result + ((cuentabanco == null) ? 0 : cuentabanco.hashCode()); - result = prime * result + ((email == null) ? 0 : email.hashCode()); - result = prime * result + ((identificacion == null) ? 0 : identificacion.hashCode()); - result = prime * result + ((telefono == null) ? 0 : telefono.hashCode()); - result = prime * result + ((titularcuenta == null) ? 0 : titularcuenta.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ReembolsoOcdNotaCreditoDatosPagamentoVO other = (ReembolsoOcdNotaCreditoDatosPagamentoVO) obj; - if (agencia == null) { - if (other.agencia != null) - return false; - } else if (!agencia.equals(other.agencia)) - return false; - if (banco == null) { - if (other.banco != null) - return false; - } else if (!banco.equals(other.banco)) - return false; - if (cuentabanco == null) { - if (other.cuentabanco != null) - return false; - } else if (!cuentabanco.equals(other.cuentabanco)) - return false; - if (email == null) { - if (other.email != null) - return false; - } else if (!email.equals(other.email)) - return false; - if (identificacion == null) { - if (other.identificacion != null) - return false; - } else if (!identificacion.equals(other.identificacion)) - return false; - if (telefono == null) { - if (other.telefono != null) - return false; - } else if (!telefono.equals(other.telefono)) - return false; - if (titularcuenta == null) { - if (other.titularcuenta != null) - return false; - } else if (!titularcuenta.equals(other.titularcuenta)) - return false; - return true; - } - - } - - public static class Builder { - - private ReembolsoOcdNotaCreditoVO vo; - - public Builder() { - vo = new ReembolsoOcdNotaCreditoVO(); - } - - public Builder datosPagamento(List listDatosPagamento) { - vo.datosPagamento = new HashSet(); - for (OCDDatosPagamento datosPagamento : listDatosPagamento) { - vo.datosPagamento.add(new ReembolsoOcdNotaCreditoDatosPagamentoVO(datosPagamento)); - } - return this; - } - - public Builder cajaTarjeta(List listCajaTarjeta) { - vo.tarjetas = new HashSet(); - for (CajaTarjeta cajaTarjeta : listCajaTarjeta) { - vo.tarjetas.add(new ReembolsoOcdNotaCreditoTarjetaVO(cajaTarjeta)); - } - return this; - } - - public Builder ocd(OCD ocd) { - vo.localizador = OcdUtil.generaLocalizadorOCD(ocd); - vo.data = ocd.getFecinc(); - vo.dataPagamento = ocd.getFecpagar(); - - if(ocd.getIndpago() != null && ocd.getIndpago()) { - vo.valor = MoneyHelper.somar(ocd.getValorPagar(), ocd.getValorTarjeta()); - } else { - vo.valor = ocd.getSaldoPagar(); - } - vo.tarjetas = new HashSet(); - if (StringUtils.isNotEmpty(ocd.getNumtarjeta())) { - vo.tarjetas.add(new ReembolsoOcdNotaCreditoTarjetaVO(ocd)); - } - - return this; - } - - public Builder notaCredito(NotaCreditoVendaPacote notaCredito) { - vo.localizador = String.valueOf(notaCredito.getNotaCreditoVendaPacoteId()); - vo.data = notaCredito.getDatanotacredito(); - vo.dataPagamento = notaCredito.getDatapagamento(); - vo.numoperacion = notaCredito.getVendapacotecancelamento().getNumoperacion(); - - if(notaCredito.getSituacao().equals(SituacaoNotaCreditoVendaPacote.UTILIZADA.getValue())) { - vo.valor = notaCredito.getValor(); - } else { - vo.valor = notaCredito.getSaldoPagar(); - } - return this; - } - - public Builder boleto(Boleto boleto) { - vo.numfoliosistema = boleto.getNumfoliosistema(); - vo.numoperacion = boleto.getNumoperacion(); - return this; - } - - public ReembolsoOcdNotaCreditoVO build() { - ReembolsoOcdNotaCreditoVO build = vo; - vo = new ReembolsoOcdNotaCreditoVO(); - return build; - } - - } - -} +package com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.entidad.Boleto; +import com.rjconsultores.ventaboletos.entidad.CajaTarjeta; +import com.rjconsultores.ventaboletos.entidad.NotaCreditoVendaPacote; +import com.rjconsultores.ventaboletos.entidad.OCD; +import com.rjconsultores.ventaboletos.entidad.OCDDatosPagamento; +import com.rjconsultores.ventaboletos.enums.SituacaoNotaCreditoVendaPacote; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; +import com.rjconsultores.ventaboletos.utilerias.OcdUtil; + +@XmlRootElement(name = "ocdNotaCredito") +public class ReembolsoOcdNotaCreditoVO { + + private String numfoliosistema; + private String numoperacion; + private String localizador; + private Date data; + private Date dataPagamento; + private BigDecimal valor; + + private Set datosPagamento; + + private Set tarjetas; + + public ReembolsoOcdNotaCreditoVO() { } + + public static Builder builder() { + return new ReembolsoOcdNotaCreditoVO.Builder(); + } + + public String getLocalizador() { + return localizador; + } + + public void setLocalizador(String localizador) { + this.localizador = localizador; + } + + public Date getData() { + return data; + } + + public void setData(Date data) { + this.data = data; + } + + public Date getDataPagamento() { + return dataPagamento; + } + + public void setDataPagamento(Date dataPagamento) { + this.dataPagamento = dataPagamento; + } + + public BigDecimal getValor() { + return valor; + } + + public void setValor(BigDecimal valor) { + this.valor = valor; + } + + @XmlElementWrapper + @XmlElement(name = "datoPagamento", type = ReembolsoOcdNotaCreditoDatosPagamentoVO.class) + public Set getDatosPagamento() { + return datosPagamento; + } + + public void setDatosPagamento(Set datosPagamento) { + this.datosPagamento = datosPagamento; + } + + @XmlElementWrapper + @XmlElement(name = "tarjeta", type = ReembolsoOcdNotaCreditoTarjetaVO.class) + public Set getTarjetas() { + return tarjetas; + } + + public void setTarjetas(Set tarjetas) { + this.tarjetas = tarjetas; + } + + public String getNumfoliosistema() { + return numfoliosistema; + } + + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; + } + + public String getNumoperacion() { + return numoperacion; + } + + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + + public static class ReembolsoOcdNotaCreditoTarjetaVO { + + private String numtarjeta; + private String numautorizacion; + private String nsu; + + public ReembolsoOcdNotaCreditoTarjetaVO() { } + + public ReembolsoOcdNotaCreditoTarjetaVO(CajaTarjeta cajaTarjeta) { + this.numtarjeta = cajaTarjeta.getNumtarjeta(); + this.numautorizacion = cajaTarjeta.getNumautorizacion(); + this.nsu = cajaTarjeta.getNsu(); + } + + public ReembolsoOcdNotaCreditoTarjetaVO(OCD ocd) { + this.numtarjeta = ocd.getNumtarjeta(); + this.numautorizacion = ocd.getNumautorizacion(); + this.nsu = ocd.getNsu(); + } + + public String getNumtarjeta() { + return numtarjeta; + } + public void setNumtarjeta(String numtarjeta) { + this.numtarjeta = numtarjeta; + } + public String getNumautorizacion() { + return numautorizacion; + } + public void setNumautorizacion(String numautorizacion) { + this.numautorizacion = numautorizacion; + } + public String getNsu() { + return nsu; + } + public void setNsu(String nsu) { + this.nsu = nsu; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((nsu == null) ? 0 : nsu.hashCode()); + result = prime * result + ((numautorizacion == null) ? 0 : numautorizacion.hashCode()); + result = prime * result + ((numtarjeta == null) ? 0 : numtarjeta.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ReembolsoOcdNotaCreditoTarjetaVO other = (ReembolsoOcdNotaCreditoTarjetaVO) obj; + if (nsu == null) { + if (other.nsu != null) + return false; + } else if (!nsu.equals(other.nsu)) + return false; + if (numautorizacion == null) { + if (other.numautorizacion != null) + return false; + } else if (!numautorizacion.equals(other.numautorizacion)) + return false; + if (numtarjeta == null) { + if (other.numtarjeta != null) + return false; + } else if (!numtarjeta.equals(other.numtarjeta)) + return false; + return true; + } + + } + + public static class ReembolsoOcdNotaCreditoDatosPagamentoVO { + + private String titularcuenta; + private String identificacion; + private String banco; + private String cuentabanco; + private String agencia; + private String email; + private String telefono; + + public ReembolsoOcdNotaCreditoDatosPagamentoVO() { } + + public ReembolsoOcdNotaCreditoDatosPagamentoVO(OCDDatosPagamento datosPagamento) { + this.titularcuenta = datosPagamento.getTitularcuenta(); + this.identificacion = datosPagamento.getIdentificacion(); + this.banco = datosPagamento.getBanco(); + this.cuentabanco = datosPagamento.getCuentabanco(); + this.agencia = datosPagamento.getAgencia(); + this.email = datosPagamento.getEmail(); + this.telefono = datosPagamento.getTelefono(); + } + + public String getTitularcuenta() { + return titularcuenta; + } + public void setTitularcuenta(String titularcuenta) { + this.titularcuenta = titularcuenta; + } + public String getIdentificacion() { + return identificacion; + } + public void setIdentificacion(String identificacion) { + this.identificacion = identificacion; + } + public String getBanco() { + return banco; + } + public void setBanco(String banco) { + this.banco = banco; + } + public String getCuentabanco() { + return cuentabanco; + } + public void setCuentabanco(String cuentabanco) { + this.cuentabanco = cuentabanco; + } + public String getAgencia() { + return agencia; + } + public void setAgencia(String agencia) { + this.agencia = agencia; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getTelefono() { + return telefono; + } + public void setTelefono(String telefono) { + this.telefono = telefono; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((agencia == null) ? 0 : agencia.hashCode()); + result = prime * result + ((banco == null) ? 0 : banco.hashCode()); + result = prime * result + ((cuentabanco == null) ? 0 : cuentabanco.hashCode()); + result = prime * result + ((email == null) ? 0 : email.hashCode()); + result = prime * result + ((identificacion == null) ? 0 : identificacion.hashCode()); + result = prime * result + ((telefono == null) ? 0 : telefono.hashCode()); + result = prime * result + ((titularcuenta == null) ? 0 : titularcuenta.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ReembolsoOcdNotaCreditoDatosPagamentoVO other = (ReembolsoOcdNotaCreditoDatosPagamentoVO) obj; + if (agencia == null) { + if (other.agencia != null) + return false; + } else if (!agencia.equals(other.agencia)) + return false; + if (banco == null) { + if (other.banco != null) + return false; + } else if (!banco.equals(other.banco)) + return false; + if (cuentabanco == null) { + if (other.cuentabanco != null) + return false; + } else if (!cuentabanco.equals(other.cuentabanco)) + return false; + if (email == null) { + if (other.email != null) + return false; + } else if (!email.equals(other.email)) + return false; + if (identificacion == null) { + if (other.identificacion != null) + return false; + } else if (!identificacion.equals(other.identificacion)) + return false; + if (telefono == null) { + if (other.telefono != null) + return false; + } else if (!telefono.equals(other.telefono)) + return false; + if (titularcuenta == null) { + if (other.titularcuenta != null) + return false; + } else if (!titularcuenta.equals(other.titularcuenta)) + return false; + return true; + } + + } + + public static class Builder { + + private ReembolsoOcdNotaCreditoVO vo; + + public Builder() { + vo = new ReembolsoOcdNotaCreditoVO(); + } + + public Builder datosPagamento(List listDatosPagamento) { + vo.datosPagamento = new HashSet(); + for (OCDDatosPagamento datosPagamento : listDatosPagamento) { + vo.datosPagamento.add(new ReembolsoOcdNotaCreditoDatosPagamentoVO(datosPagamento)); + } + return this; + } + + public Builder cajaTarjeta(List listCajaTarjeta) { + vo.tarjetas = new HashSet(); + for (CajaTarjeta cajaTarjeta : listCajaTarjeta) { + vo.tarjetas.add(new ReembolsoOcdNotaCreditoTarjetaVO(cajaTarjeta)); + } + return this; + } + + public Builder ocd(OCD ocd) { + vo.localizador = OcdUtil.generaLocalizadorOCD(ocd); + vo.data = ocd.getFecinc(); + vo.dataPagamento = ocd.getFecpagar(); + + if(ocd.getIndpago() != null && ocd.getIndpago()) { + vo.valor = MoneyHelper.somar(ocd.getValorPagar(), ocd.getValorTarjeta()); + } else { + vo.valor = ocd.getSaldoPagar(); + } + vo.tarjetas = new HashSet(); + if (StringUtils.isNotEmpty(ocd.getNumtarjeta())) { + vo.tarjetas.add(new ReembolsoOcdNotaCreditoTarjetaVO(ocd)); + } + + return this; + } + + public Builder notaCredito(NotaCreditoVendaPacote notaCredito) { + vo.localizador = String.valueOf(notaCredito.getNotaCreditoVendaPacoteId()); + vo.data = notaCredito.getDatanotacredito(); + vo.dataPagamento = notaCredito.getDatapagamento(); + vo.numoperacion = notaCredito.getVendapacotecancelamento().getNumoperacion(); + + if(notaCredito.getSituacao().equals(SituacaoNotaCreditoVendaPacote.UTILIZADA.getValue())) { + vo.valor = notaCredito.getValor(); + } else { + vo.valor = notaCredito.getSaldoPagar(); + } + return this; + } + + public Builder boleto(Boleto boleto) { + vo.numfoliosistema = boleto.getNumfoliosistema(); + vo.numoperacion = boleto.getNumoperacion(); + return this; + } + + public ReembolsoOcdNotaCreditoVO build() { + ReembolsoOcdNotaCreditoVO build = vo; + vo = new ReembolsoOcdNotaCreditoVO(); + return build; + } + + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/revenue/RevenueGeoloc.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/revenue/RevenueGeoloc.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/revenue/RevenueGeoloc.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/revenue/RevenueGeoloc.java diff --git a/src/com/rjconsultores/ventaboletos/vo/roloperativo/RolOperativoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/roloperativo/RolOperativoVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/roloperativo/RolOperativoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/roloperativo/RolOperativoVO.java index 3150a6884..bbca672a5 100644 --- a/src/com/rjconsultores/ventaboletos/vo/roloperativo/RolOperativoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/roloperativo/RolOperativoVO.java @@ -1,37 +1,37 @@ -package com.rjconsultores.ventaboletos.vo.roloperativo; - -import com.rjconsultores.ventaboletos.entidad.RolOperativo; - -public class RolOperativoVO { - - private Integer roloperativoId; - private String descroloperativo; - - public RolOperativoVO(Integer roloperativoId, String descroloperativo) { - super(); - this.roloperativoId = roloperativoId; - this.descroloperativo = descroloperativo; - } - - public RolOperativoVO( RolOperativo rolOperativo) { - this.roloperativoId = rolOperativo.getRoloperativoId(); - this.descroloperativo = rolOperativo.getDescroloperativo(); - } - - public Integer getRoloperativoId() { - return roloperativoId; - } - - public void setRoloperativoId(Integer roloperativoId) { - this.roloperativoId = roloperativoId; - } - - public String getDescroloperativo() { - return descroloperativo; - } - - public void setDescroloperativo(String descroloperativo) { - this.descroloperativo = descroloperativo; - } - -} +package com.rjconsultores.ventaboletos.vo.roloperativo; + +import com.rjconsultores.ventaboletos.entidad.RolOperativo; + +public class RolOperativoVO { + + private Integer roloperativoId; + private String descroloperativo; + + public RolOperativoVO(Integer roloperativoId, String descroloperativo) { + super(); + this.roloperativoId = roloperativoId; + this.descroloperativo = descroloperativo; + } + + public RolOperativoVO( RolOperativo rolOperativo) { + this.roloperativoId = rolOperativo.getRoloperativoId(); + this.descroloperativo = rolOperativo.getDescroloperativo(); + } + + public Integer getRoloperativoId() { + return roloperativoId; + } + + public void setRoloperativoId(Integer roloperativoId) { + this.roloperativoId = roloperativoId; + } + + public String getDescroloperativo() { + return descroloperativo; + } + + public void setDescroloperativo(String descroloperativo) { + this.descroloperativo = descroloperativo; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java index 325fceafa..309f82d8b 100644 --- a/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java @@ -1,271 +1,271 @@ -package com.rjconsultores.ventaboletos.vo.ruta; - -import javax.xml.bind.annotation.XmlRootElement; - -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.OrgaoConcedenteVO; -import com.rjconsultores.ventaboletos.vo.clase.ClaseVO; - -@XmlRootElement -public class RutaVO { - - private Long rutaId; - private String numRuta; - private String prefixo; - private String descruta; - private String orgaoConcedente; - private Boolean sentido; - private ClaseVO claseVO; - private Boolean indTribTarifa; - private Boolean indTribTaxaEmbarque; - private Boolean indTribPedagio; - private OrgaoConcedenteVO orgaoConcedenteVO; - //campos usados nas consultas resumidas - private Integer claseId; - private Integer orgaoConcedenteId; - private Integer origenId; - private Integer destinoId; - private String descParada; - private Integer numSecuencia; - private String descOrigem; - private String descDestino; - - public RutaVO() { - } - - public RutaVO(Integer rutaId) { - super(); - this.rutaId = Long.valueOf(rutaId); - } - - public RutaVO(Long rutaId, String numRuta, String prefixo, String descruta, String orgaoConcedente) { - super(); - this.rutaId = rutaId; - this.numRuta = numRuta; - this.prefixo = prefixo; - this.descruta = descruta; - this.orgaoConcedente = orgaoConcedente; - } - - public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean sentido, Integer claseId, String descClase) { - super(); - this.rutaId = rutaId.longValue(); - this.numRuta = numRuta; - this.prefixo = prefixo; - this.descruta = descruta; - this.orgaoConcedente = descOrgao; - this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao); - this.sentido = sentido; - this.claseVO = new ClaseVO(claseId, descClase); - } - - public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada, Boolean sentido, Integer claseId, String descClase) { - super(); - this.rutaId = rutaId.longValue(); - this.numRuta = numRuta; - this.prefixo = prefixo; - this.descruta = descruta; - this.orgaoConcedente = descOrgao; - this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao, indValDocObligatorioEmbarcada); - this.sentido = sentido; - this.claseVO = new ClaseVO(claseId, descClase); - } - - public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada, Boolean sentido, Integer claseId, String descClase, Boolean indTribTarifa, Boolean indTribTaxaEmbarque, Boolean indTribPedagio){ - super(); - this.rutaId = rutaId.longValue(); - this.numRuta = numRuta; - this.prefixo = prefixo; - this.descruta = descruta; - this.orgaoConcedente = descOrgao; - this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao, indValDocObligatorioEmbarcada); - this.sentido = sentido; - this.claseVO = new ClaseVO(claseId, descClase); - this.indTribTarifa = indTribTarifa; - this.indTribTaxaEmbarque = indTribTaxaEmbarque; - this.indTribPedagio = indTribPedagio; - } - - public RutaVO(Ruta ruta){ - super(); - this.rutaId = ruta.getRutaId().longValue(); - this.numRuta = ruta.getNumRuta(); - this.prefixo = ruta.getPrefixo(); - this.descruta = ruta.getDescruta(); - this.sentido = ruta.getIndSentidoIda(); - this.indTribTarifa = ruta.getIndTribTarifa(); - this.indTribTaxaEmbarque = ruta.getIndTribTaxaEmbarque(); - this.indTribPedagio = ruta.getIndTribPedagio(); - this.claseId = ruta.getClaseServicio().getClaseservicioId(); - this.orgaoConcedenteId = ruta.getOrgaoConcedente().getOrgaoConcedenteId(); - } - - public RutaVO(Long rutaId, String numRuta, String prefixo, String descruta, String descParada, - Integer numSequencia, Integer origenId, Integer destinoId ) { - super(); - this.rutaId = rutaId; - this.numRuta = numRuta; - this.prefixo = prefixo; - this.descruta = descruta; - this.descParada = descParada; - this.numSecuencia = numSequencia; - this.origenId = origenId; - this.destinoId = destinoId; - - } - - public Long getRutaId() { - return rutaId; - } - - public void setRutaId(Long rutaId) { - this.rutaId = rutaId; - } - - public String getNumRuta() { - return numRuta; - } - - public void setNumRuta(String numRuta) { - this.numRuta = numRuta; - } - - public String getPrefixo() { - return prefixo; - } - - public void setPrefixo(String prefixo) { - this.prefixo = prefixo; - } - - public String getDescruta() { - return descruta; - } - - public void setDescruta(String descruta) { - this.descruta = descruta; - } - - public String getOrgaoConcedente() { - return orgaoConcedente; - } - - public void setOrgaoConcedente(String orgaoConcedente) { - this.orgaoConcedente = orgaoConcedente; - } - - public Boolean isSentido() { - return sentido; - } - - public void setSentido(Boolean sentido) { - this.sentido = sentido; - } - - public ClaseVO getClaseVO() { - return claseVO; - } - - public void setClaseVO(ClaseVO claseVO) { - this.claseVO = claseVO; - } - - public OrgaoConcedenteVO getOrgaoConcedenteVO() { - return orgaoConcedenteVO; - } - - public void setOrgaoConcedenteVO(OrgaoConcedenteVO orgaoConcedenteVO) { - this.orgaoConcedenteVO = orgaoConcedenteVO; - } - - public Boolean getIndTribTarifa() { - return indTribTarifa; - } - - public void setIndTribTarifa(Boolean indTribTarifa) { - this.indTribTarifa = indTribTarifa; - } - - public Boolean getIndTribTaxaEmbarque() { - return indTribTaxaEmbarque; - } - - public void setIndTribTaxaEmbarque(Boolean indTribTaxaEmbarque) { - this.indTribTaxaEmbarque = indTribTaxaEmbarque; - } - - public Boolean getIndTribPedagio() { - return indTribPedagio; - } - - public void setIndTribPedagio(Boolean indTribPedagio) { - this.indTribPedagio = indTribPedagio; - } - - public Integer getOrgaoConcedenteId() { - return orgaoConcedenteId; - } - - public void setOrgaoConcedenteId(Integer orgaoConcedenteId) { - this.orgaoConcedenteId = orgaoConcedenteId; - } - - public Integer getClaseId() { - return claseId; - } - - public void setClaseId(Integer claseId) { - this.claseId = claseId; - } - - public Integer getOrigenId() { - return origenId; - } - - public void setOrigenId(Integer origenId) { - this.origenId = origenId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public String getDescParada() { - return descParada; - } - - public void setDescParada(String descParada) { - this.descParada = descParada; - } - - public Integer getNumSecuencia() { - return numSecuencia; - } - - public void setNumSecuencia(Integer numSecuencia) { - this.numSecuencia = numSecuencia; - } - - public String getDescOrigem() { - return descOrigem; - } - - public void setDescOrigem(String descOrigem) { - this.descOrigem = descOrigem; - } - - public String getDescDestino() { - return descDestino; - } - - public void setDescDestino(String descDestino) { - this.descDestino = descDestino; - } - - - -} +package com.rjconsultores.ventaboletos.vo.ruta; + +import javax.xml.bind.annotation.XmlRootElement; + +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.OrgaoConcedenteVO; +import com.rjconsultores.ventaboletos.vo.clase.ClaseVO; + +@XmlRootElement +public class RutaVO { + + private Long rutaId; + private String numRuta; + private String prefixo; + private String descruta; + private String orgaoConcedente; + private Boolean sentido; + private ClaseVO claseVO; + private Boolean indTribTarifa; + private Boolean indTribTaxaEmbarque; + private Boolean indTribPedagio; + private OrgaoConcedenteVO orgaoConcedenteVO; + //campos usados nas consultas resumidas + private Integer claseId; + private Integer orgaoConcedenteId; + private Integer origenId; + private Integer destinoId; + private String descParada; + private Integer numSecuencia; + private String descOrigem; + private String descDestino; + + public RutaVO() { + } + + public RutaVO(Integer rutaId) { + super(); + this.rutaId = Long.valueOf(rutaId); + } + + public RutaVO(Long rutaId, String numRuta, String prefixo, String descruta, String orgaoConcedente) { + super(); + this.rutaId = rutaId; + this.numRuta = numRuta; + this.prefixo = prefixo; + this.descruta = descruta; + this.orgaoConcedente = orgaoConcedente; + } + + public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean sentido, Integer claseId, String descClase) { + super(); + this.rutaId = rutaId.longValue(); + this.numRuta = numRuta; + this.prefixo = prefixo; + this.descruta = descruta; + this.orgaoConcedente = descOrgao; + this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao); + this.sentido = sentido; + this.claseVO = new ClaseVO(claseId, descClase); + } + + public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada, Boolean sentido, Integer claseId, String descClase) { + super(); + this.rutaId = rutaId.longValue(); + this.numRuta = numRuta; + this.prefixo = prefixo; + this.descruta = descruta; + this.orgaoConcedente = descOrgao; + this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao, indValDocObligatorioEmbarcada); + this.sentido = sentido; + this.claseVO = new ClaseVO(claseId, descClase); + } + + public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada, Boolean sentido, Integer claseId, String descClase, Boolean indTribTarifa, Boolean indTribTaxaEmbarque, Boolean indTribPedagio){ + super(); + this.rutaId = rutaId.longValue(); + this.numRuta = numRuta; + this.prefixo = prefixo; + this.descruta = descruta; + this.orgaoConcedente = descOrgao; + this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao, indValDocObligatorioEmbarcada); + this.sentido = sentido; + this.claseVO = new ClaseVO(claseId, descClase); + this.indTribTarifa = indTribTarifa; + this.indTribTaxaEmbarque = indTribTaxaEmbarque; + this.indTribPedagio = indTribPedagio; + } + + public RutaVO(Ruta ruta){ + super(); + this.rutaId = ruta.getRutaId().longValue(); + this.numRuta = ruta.getNumRuta(); + this.prefixo = ruta.getPrefixo(); + this.descruta = ruta.getDescruta(); + this.sentido = ruta.getIndSentidoIda(); + this.indTribTarifa = ruta.getIndTribTarifa(); + this.indTribTaxaEmbarque = ruta.getIndTribTaxaEmbarque(); + this.indTribPedagio = ruta.getIndTribPedagio(); + this.claseId = ruta.getClaseServicio().getClaseservicioId(); + this.orgaoConcedenteId = ruta.getOrgaoConcedente().getOrgaoConcedenteId(); + } + + public RutaVO(Long rutaId, String numRuta, String prefixo, String descruta, String descParada, + Integer numSequencia, Integer origenId, Integer destinoId ) { + super(); + this.rutaId = rutaId; + this.numRuta = numRuta; + this.prefixo = prefixo; + this.descruta = descruta; + this.descParada = descParada; + this.numSecuencia = numSequencia; + this.origenId = origenId; + this.destinoId = destinoId; + + } + + public Long getRutaId() { + return rutaId; + } + + public void setRutaId(Long rutaId) { + this.rutaId = rutaId; + } + + public String getNumRuta() { + return numRuta; + } + + public void setNumRuta(String numRuta) { + this.numRuta = numRuta; + } + + public String getPrefixo() { + return prefixo; + } + + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } + + public String getDescruta() { + return descruta; + } + + public void setDescruta(String descruta) { + this.descruta = descruta; + } + + public String getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(String orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public Boolean isSentido() { + return sentido; + } + + public void setSentido(Boolean sentido) { + this.sentido = sentido; + } + + public ClaseVO getClaseVO() { + return claseVO; + } + + public void setClaseVO(ClaseVO claseVO) { + this.claseVO = claseVO; + } + + public OrgaoConcedenteVO getOrgaoConcedenteVO() { + return orgaoConcedenteVO; + } + + public void setOrgaoConcedenteVO(OrgaoConcedenteVO orgaoConcedenteVO) { + this.orgaoConcedenteVO = orgaoConcedenteVO; + } + + public Boolean getIndTribTarifa() { + return indTribTarifa; + } + + public void setIndTribTarifa(Boolean indTribTarifa) { + this.indTribTarifa = indTribTarifa; + } + + public Boolean getIndTribTaxaEmbarque() { + return indTribTaxaEmbarque; + } + + public void setIndTribTaxaEmbarque(Boolean indTribTaxaEmbarque) { + this.indTribTaxaEmbarque = indTribTaxaEmbarque; + } + + public Boolean getIndTribPedagio() { + return indTribPedagio; + } + + public void setIndTribPedagio(Boolean indTribPedagio) { + this.indTribPedagio = indTribPedagio; + } + + public Integer getOrgaoConcedenteId() { + return orgaoConcedenteId; + } + + public void setOrgaoConcedenteId(Integer orgaoConcedenteId) { + this.orgaoConcedenteId = orgaoConcedenteId; + } + + public Integer getClaseId() { + return claseId; + } + + public void setClaseId(Integer claseId) { + this.claseId = claseId; + } + + public Integer getOrigenId() { + return origenId; + } + + public void setOrigenId(Integer origenId) { + this.origenId = origenId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public String getDescParada() { + return descParada; + } + + public void setDescParada(String descParada) { + this.descParada = descParada; + } + + public Integer getNumSecuencia() { + return numSecuencia; + } + + public void setNumSecuencia(Integer numSecuencia) { + this.numSecuencia = numSecuencia; + } + + public String getDescOrigem() { + return descOrigem; + } + + public void setDescOrigem(String descOrigem) { + this.descOrigem = descOrigem; + } + + public String getDescDestino() { + return descDestino; + } + + public void setDescDestino(String descDestino) { + this.descDestino = descDestino; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/secuencia/SecuenciaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/secuencia/SecuenciaVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/secuencia/SecuenciaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/secuencia/SecuenciaVO.java index c0e3f54f3..bd02683cb 100644 --- a/src/com/rjconsultores/ventaboletos/vo/secuencia/SecuenciaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/secuencia/SecuenciaVO.java @@ -1,43 +1,43 @@ -package com.rjconsultores.ventaboletos.vo.secuencia; - -import com.rjconsultores.ventaboletos.vo.parada.ParadaVO; - -public class SecuenciaVO { - private Integer secuencia; - private ParadaVO localidade; - //campos usados nas consultas resumidas - private Integer localidadeId; - - public SecuenciaVO() { - - } - - public SecuenciaVO(Integer secuencia, ParadaVO localidade) { - this.secuencia = secuencia; - this.localidade = localidade; - } - - public Integer getSecuencia() { - return secuencia; - } - - public void setSecuencia(Integer secuencia) { - this.secuencia = secuencia; - } - - public ParadaVO getLocalidade() { - return localidade; - } - - public void setLocalidade(ParadaVO localidade) { - this.localidade = localidade; - } - - public Integer getLocalidadeId() { - return localidadeId; - } - - public void setLocalidadeId(Integer localidadeId) { - this.localidadeId = localidadeId; - } -} +package com.rjconsultores.ventaboletos.vo.secuencia; + +import com.rjconsultores.ventaboletos.vo.parada.ParadaVO; + +public class SecuenciaVO { + private Integer secuencia; + private ParadaVO localidade; + //campos usados nas consultas resumidas + private Integer localidadeId; + + public SecuenciaVO() { + + } + + public SecuenciaVO(Integer secuencia, ParadaVO localidade) { + this.secuencia = secuencia; + this.localidade = localidade; + } + + public Integer getSecuencia() { + return secuencia; + } + + public void setSecuencia(Integer secuencia) { + this.secuencia = secuencia; + } + + public ParadaVO getLocalidade() { + return localidade; + } + + public void setLocalidade(ParadaVO localidade) { + this.localidade = localidade; + } + + public Integer getLocalidadeId() { + return localidadeId; + } + + public void setLocalidadeId(Integer localidadeId) { + this.localidadeId = localidadeId; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/segurida/PerfilJerarquia.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/segurida/PerfilJerarquia.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/segurida/PerfilJerarquia.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/segurida/PerfilJerarquia.java index f67e95f20..65633aa81 100644 --- a/src/com/rjconsultores/ventaboletos/vo/segurida/PerfilJerarquia.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/segurida/PerfilJerarquia.java @@ -1,49 +1,49 @@ -package com.rjconsultores.ventaboletos.vo.segurida; - -public enum PerfilJerarquia { - - NORMAL(0), ADMIN(1), JERARQUIA_2(2), JERARQUIA_3(3), JERARQUIA_4(4), ADMINISTRADORES("ADMINISTRADORES"); - - private Integer valor; - private String valorCaracter; - - private PerfilJerarquia(Integer valor) { - this.valor = valor; - } - private PerfilJerarquia(String valorCaracter) { - this.valorCaracter = valorCaracter; - } - - public Integer getValor() { - return valor; - } - public String getValorCaracter() { - return valorCaracter; - } - - - public static PerfilJerarquia buscar(Integer valor) { - - if (valor == null) - return NORMAL; - - for (PerfilJerarquia jerarquia : PerfilJerarquia.values()) { - if (jerarquia.getValor().equals(valor)) { - return jerarquia; - } - } - return null; - } - public static PerfilJerarquia buscar(String valorCaracter) { - - if (valorCaracter == null) - return NORMAL; - - for (PerfilJerarquia jerarquia : PerfilJerarquia.values()) { - if (jerarquia.getValor().equals(valorCaracter)) { - return jerarquia; - } - } - return null; - } -} +package com.rjconsultores.ventaboletos.vo.segurida; + +public enum PerfilJerarquia { + + NORMAL(0), ADMIN(1), JERARQUIA_2(2), JERARQUIA_3(3), JERARQUIA_4(4), ADMINISTRADORES("ADMINISTRADORES"); + + private Integer valor; + private String valorCaracter; + + private PerfilJerarquia(Integer valor) { + this.valor = valor; + } + private PerfilJerarquia(String valorCaracter) { + this.valorCaracter = valorCaracter; + } + + public Integer getValor() { + return valor; + } + public String getValorCaracter() { + return valorCaracter; + } + + + public static PerfilJerarquia buscar(Integer valor) { + + if (valor == null) + return NORMAL; + + for (PerfilJerarquia jerarquia : PerfilJerarquia.values()) { + if (jerarquia.getValor().equals(valor)) { + return jerarquia; + } + } + return null; + } + public static PerfilJerarquia buscar(String valorCaracter) { + + if (valorCaracter == null) + return NORMAL; + + for (PerfilJerarquia jerarquia : PerfilJerarquia.values()) { + if (jerarquia.getValor().equals(valorCaracter)) { + return jerarquia; + } + } + return null; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaGroupVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaGroupVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaGroupVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaGroupVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaEscalaVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaGroupVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaGroupVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaGroupVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaGroupVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaVO.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tarifa/TarifaOficialEscalaVO.java diff --git a/src/com/rjconsultores/ventaboletos/vo/tiposervicio/TipoServicioVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tiposervicio/TipoServicioVO.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/vo/tiposervicio/TipoServicioVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tiposervicio/TipoServicioVO.java index e77b9e40b..b138bd9c3 100644 --- a/src/com/rjconsultores/ventaboletos/vo/tiposervicio/TipoServicioVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tiposervicio/TipoServicioVO.java @@ -1,33 +1,33 @@ -package com.rjconsultores.ventaboletos.vo.tiposervicio; - -import com.rjconsultores.ventaboletos.entidad.TipoServicio; - -public class TipoServicioVO { - - private Integer tiposervicioId; - private String descservicio; - - public TipoServicioVO(Integer tiposervicioId, String descservicio) { - super(); - this.tiposervicioId = tiposervicioId; - this.descservicio = descservicio; - } - - public TipoServicioVO(TipoServicio tipoServicio) { - this.tiposervicioId = tipoServicio.getTiposervicioId(); - this.descservicio = tipoServicio.getDescservicio(); - } - - public Integer getTiposervicioId() { - return tiposervicioId; - } - public void setTiposervicioId(Integer tiposervicioId) { - this.tiposervicioId = tiposervicioId; - } - public String getDescservicio() { - return descservicio; - } - public void setDescservicio(String descservicio) { - this.descservicio = descservicio; - } -} +package com.rjconsultores.ventaboletos.vo.tiposervicio; + +import com.rjconsultores.ventaboletos.entidad.TipoServicio; + +public class TipoServicioVO { + + private Integer tiposervicioId; + private String descservicio; + + public TipoServicioVO(Integer tiposervicioId, String descservicio) { + super(); + this.tiposervicioId = tiposervicioId; + this.descservicio = descservicio; + } + + public TipoServicioVO(TipoServicio tipoServicio) { + this.tiposervicioId = tipoServicio.getTiposervicioId(); + this.descservicio = tipoServicio.getDescservicio(); + } + + public Integer getTiposervicioId() { + return tiposervicioId; + } + public void setTiposervicioId(Integer tiposervicioId) { + this.tiposervicioId = tiposervicioId; + } + public String getDescservicio() { + return descservicio; + } + public void setDescservicio(String descservicio) { + this.descservicio = descservicio; + } +} diff --git a/src/com/rjconsultores/ventaboletos/vo/tramo/TramoTarifaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tramo/TramoTarifaVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/tramo/TramoTarifaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tramo/TramoTarifaVO.java index 796ac443e..a196dd408 100644 --- a/src/com/rjconsultores/ventaboletos/vo/tramo/TramoTarifaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tramo/TramoTarifaVO.java @@ -1,48 +1,48 @@ -package com.rjconsultores.ventaboletos.vo.tramo; - -import java.util.List; - -public class TramoTarifaVO { - - private Integer rutaId; - private String chaveCorrida; - private List listTramos; - - public TramoTarifaVO() { - //construtor default - } - - public TramoTarifaVO(String chaveCorrida, Integer rutaId, List listTramos) { - super(); - this.chaveCorrida = chaveCorrida; - this.rutaId = rutaId; - this.listTramos = listTramos; - } - - public String getChaveCorrida() { - return chaveCorrida; - } - - public void setChaveCorrida(String chaveCorrida) { - this.chaveCorrida = chaveCorrida; - } - - public List getListTramos() { - return listTramos; - } - - public void setListTramos(List listTramos) { - this.listTramos = listTramos; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - - -} +package com.rjconsultores.ventaboletos.vo.tramo; + +import java.util.List; + +public class TramoTarifaVO { + + private Integer rutaId; + private String chaveCorrida; + private List listTramos; + + public TramoTarifaVO() { + //construtor default + } + + public TramoTarifaVO(String chaveCorrida, Integer rutaId, List listTramos) { + super(); + this.chaveCorrida = chaveCorrida; + this.rutaId = rutaId; + this.listTramos = listTramos; + } + + public String getChaveCorrida() { + return chaveCorrida; + } + + public void setChaveCorrida(String chaveCorrida) { + this.chaveCorrida = chaveCorrida; + } + + public List getListTramos() { + return listTramos; + } + + public void setListTramos(List listTramos) { + this.listTramos = listTramos; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java similarity index 95% rename from src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java index 9a4ae82a8..109e257cc 100644 --- a/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java @@ -1,272 +1,272 @@ -package com.rjconsultores.ventaboletos.vo.tramo; - -import java.io.Serializable; -import java.math.BigDecimal; - -import org.hibernate.type.IntegerType; - -import com.rjconsultores.ventaboletos.entidad.Tramo; -import com.rjconsultores.ventaboletos.vo.parada.ParadaVO; -import com.rjconsultores.ventaboletos.vo.via.ViaVO; - -public class TramoVO implements Serializable{ - private static final long serialVersionUID = -8840675316985686236L; - private Integer tramoId; - private String desctramo; - private ParadaVO origem; - private ParadaVO destino; - private ViaVO via; - private Integer numsecuencia; - private BigDecimal valorTarifa; - private BigDecimal valorTaxa; - private BigDecimal valorSeguro; - private BigDecimal valorPedagio; - private BigDecimal valorOutros; - private BigDecimal tarifaMinima; - private Integer aliasorigenId; - private Integer aliasdestinoId; - private String descAliasorigen; - private String descAliasdestino; - //campos usados nas consultas resumidas - private Integer origemId; - private Integer destinoId; - private Integer rutaId; - private Integer monedaId; - private Integer empresaId; - - public TramoVO() { - //construtor default - } - - public TramoVO(Integer tramoId) { - super(); - this.tramoId = tramoId; - } - - public TramoVO(Integer tramoId, String desctramo, ParadaVO origem, ParadaVO destino, ViaVO via, Integer numsecuencia, - BigDecimal valorTarifa, BigDecimal valorTaxa, BigDecimal valorSeguro, BigDecimal valorPedagio, - BigDecimal valorOutros) { - super(); - this.tramoId = tramoId; - this.desctramo = desctramo; - this.origem = origem; - this.destino = destino; - this.via = via; - this.numsecuencia = numsecuencia; - this.valorTarifa = valorTarifa; - this.valorTaxa = valorTaxa; - this.valorSeguro = valorSeguro; - this.valorPedagio = valorPedagio; - this.valorOutros = valorOutros; - } - - public TramoVO(Integer tramoId, String desctramo, ParadaVO origem, ParadaVO destino, ViaVO via, Integer numsecuencia, BigDecimal valorTarifa, BigDecimal valorTaxa, BigDecimal valorSeguro, BigDecimal valorPedagio, BigDecimal valorOutros, BigDecimal tarifaMinima, Integer aliasorigenId, Integer aliasdestinoId, String descAliasorigen, String descAliasdestino, Integer origemId, Integer destinoId, Integer rutaId, Integer monedaId, Integer empresaId) { - super(); - this.tramoId = tramoId; - this.desctramo = desctramo; - this.origem = origem; - this.destino = destino; - this.via = via; - this.numsecuencia = numsecuencia; - this.valorTarifa = valorTarifa; - this.valorTaxa = valorTaxa; - this.valorSeguro = valorSeguro; - this.valorPedagio = valorPedagio; - this.valorOutros = valorOutros; - this.tarifaMinima = tarifaMinima; - this.aliasorigenId = aliasorigenId; - this.aliasdestinoId = aliasdestinoId; - this.descAliasorigen = descAliasorigen; - this.descAliasdestino = descAliasdestino; - this.origemId = origemId; - this.destinoId = destinoId; - this.rutaId = rutaId; - this.monedaId = monedaId; - this.empresaId = empresaId; - } - - public TramoVO( Tramo tramo ) { - super(); - this.tramoId = tramo.getTramoId(); - this.desctramo = tramo.getDesctramo(); - this.origemId = tramo.getOrigem().getParadaId(); - this.destinoId = tramo.getDestino().getParadaId(); - - } - - public TramoVO( Integer origenId, Integer destinoId ) { - super(); - this.origemId =origenId; - this.destinoId =destinoId; - - } - - public Integer getTramoId() { - return tramoId; - } - - public void setTramoId(Integer tramoId) { - this.tramoId = tramoId; - } - - public String getDesctramo() { - return desctramo; - } - - public void setDesctramo(String desctramo) { - this.desctramo = desctramo; - } - - public ParadaVO getOrigem() { - return origem; - } - - public void setOrigem(ParadaVO origem) { - this.origem = origem; - } - - public ParadaVO getDestino() { - return destino; - } - - public void setDestino(ParadaVO destino) { - this.destino = destino; - } - - public ViaVO getVia() { - return via; - } - - public void setVia(ViaVO via) { - this.via = via; - } - - public Integer getNumsecuencia() { - return numsecuencia; - } - - public void setNumsecuencia(Integer numsecuencia) { - this.numsecuencia = numsecuencia; - } - - public BigDecimal getValorTarifa() { - return valorTarifa; - } - - public void setValorTarifa(BigDecimal valorTarifa) { - this.valorTarifa = valorTarifa; - } - - public BigDecimal getValorTaxa() { - return valorTaxa; - } - - public void setValorTaxa(BigDecimal valorTaxa) { - this.valorTaxa = valorTaxa; - } - - public BigDecimal getValorSeguro() { - return valorSeguro; - } - - public void setValorSeguro(BigDecimal valorSeguro) { - this.valorSeguro = valorSeguro; - } - - public BigDecimal getValorPedagio() { - return valorPedagio; - } - - public void setValorPedagio(BigDecimal valorPedagio) { - this.valorPedagio = valorPedagio; - } - - public BigDecimal getValorOutros() { - return valorOutros; - } - - public void setValorOutros(BigDecimal valorOutros) { - this.valorOutros = valorOutros; - } - - public Integer getAliasorigenId() { - return aliasorigenId; - } - - public void setAliasorigenId(Integer aliasorigenId) { - this.aliasorigenId = aliasorigenId; - } - - public Integer getAliasdestinoId() { - return aliasdestinoId; - } - - public void setAliasdestinoId(Integer aliasdestinoId) { - this.aliasdestinoId = aliasdestinoId; - } - - public String getDescAliasorigen() { - return descAliasorigen; - } - - public void setDescAliasorigen(String descAliasorigen) { - this.descAliasorigen = descAliasorigen; - } - - public String getDescAliasdestino() { - return descAliasdestino; - } - - public void setDescAliasdestino(String descAliasdestino) { - this.descAliasdestino = descAliasdestino; - } - - public Integer getOrigemId() { - return origemId; - } - - public void setOrigemId(Integer origemId) { - this.origemId = origemId; - } - - public Integer getDestinoId() { - return destinoId; - } - - public void setDestinoId(Integer destinoId) { - this.destinoId = destinoId; - } - - public Integer getRutaId() { - return rutaId; - } - - public void setRutaId(Integer rutaId) { - this.rutaId = rutaId; - } - - public BigDecimal getTarifaMinima() { - return tarifaMinima; - } - - public void setTarifaMinima(BigDecimal tarifaMinima) { - this.tarifaMinima = tarifaMinima; - } - - public Integer getMonedaId() { - return monedaId; - } - - public void setMonedaId(Integer monedaId) { - this.monedaId = monedaId; - } - - public Integer getEmpresaId() { - return empresaId; - } - - public void setEmpresaId(Integer empresaId) { - this.empresaId = empresaId; - } - -} +package com.rjconsultores.ventaboletos.vo.tramo; + +import java.io.Serializable; +import java.math.BigDecimal; + +import org.hibernate.type.IntegerType; + +import com.rjconsultores.ventaboletos.entidad.Tramo; +import com.rjconsultores.ventaboletos.vo.parada.ParadaVO; +import com.rjconsultores.ventaboletos.vo.via.ViaVO; + +public class TramoVO implements Serializable{ + private static final long serialVersionUID = -8840675316985686236L; + private Integer tramoId; + private String desctramo; + private ParadaVO origem; + private ParadaVO destino; + private ViaVO via; + private Integer numsecuencia; + private BigDecimal valorTarifa; + private BigDecimal valorTaxa; + private BigDecimal valorSeguro; + private BigDecimal valorPedagio; + private BigDecimal valorOutros; + private BigDecimal tarifaMinima; + private Integer aliasorigenId; + private Integer aliasdestinoId; + private String descAliasorigen; + private String descAliasdestino; + //campos usados nas consultas resumidas + private Integer origemId; + private Integer destinoId; + private Integer rutaId; + private Integer monedaId; + private Integer empresaId; + + public TramoVO() { + //construtor default + } + + public TramoVO(Integer tramoId) { + super(); + this.tramoId = tramoId; + } + + public TramoVO(Integer tramoId, String desctramo, ParadaVO origem, ParadaVO destino, ViaVO via, Integer numsecuencia, + BigDecimal valorTarifa, BigDecimal valorTaxa, BigDecimal valorSeguro, BigDecimal valorPedagio, + BigDecimal valorOutros) { + super(); + this.tramoId = tramoId; + this.desctramo = desctramo; + this.origem = origem; + this.destino = destino; + this.via = via; + this.numsecuencia = numsecuencia; + this.valorTarifa = valorTarifa; + this.valorTaxa = valorTaxa; + this.valorSeguro = valorSeguro; + this.valorPedagio = valorPedagio; + this.valorOutros = valorOutros; + } + + public TramoVO(Integer tramoId, String desctramo, ParadaVO origem, ParadaVO destino, ViaVO via, Integer numsecuencia, BigDecimal valorTarifa, BigDecimal valorTaxa, BigDecimal valorSeguro, BigDecimal valorPedagio, BigDecimal valorOutros, BigDecimal tarifaMinima, Integer aliasorigenId, Integer aliasdestinoId, String descAliasorigen, String descAliasdestino, Integer origemId, Integer destinoId, Integer rutaId, Integer monedaId, Integer empresaId) { + super(); + this.tramoId = tramoId; + this.desctramo = desctramo; + this.origem = origem; + this.destino = destino; + this.via = via; + this.numsecuencia = numsecuencia; + this.valorTarifa = valorTarifa; + this.valorTaxa = valorTaxa; + this.valorSeguro = valorSeguro; + this.valorPedagio = valorPedagio; + this.valorOutros = valorOutros; + this.tarifaMinima = tarifaMinima; + this.aliasorigenId = aliasorigenId; + this.aliasdestinoId = aliasdestinoId; + this.descAliasorigen = descAliasorigen; + this.descAliasdestino = descAliasdestino; + this.origemId = origemId; + this.destinoId = destinoId; + this.rutaId = rutaId; + this.monedaId = monedaId; + this.empresaId = empresaId; + } + + public TramoVO( Tramo tramo ) { + super(); + this.tramoId = tramo.getTramoId(); + this.desctramo = tramo.getDesctramo(); + this.origemId = tramo.getOrigem().getParadaId(); + this.destinoId = tramo.getDestino().getParadaId(); + + } + + public TramoVO( Integer origenId, Integer destinoId ) { + super(); + this.origemId =origenId; + this.destinoId =destinoId; + + } + + public Integer getTramoId() { + return tramoId; + } + + public void setTramoId(Integer tramoId) { + this.tramoId = tramoId; + } + + public String getDesctramo() { + return desctramo; + } + + public void setDesctramo(String desctramo) { + this.desctramo = desctramo; + } + + public ParadaVO getOrigem() { + return origem; + } + + public void setOrigem(ParadaVO origem) { + this.origem = origem; + } + + public ParadaVO getDestino() { + return destino; + } + + public void setDestino(ParadaVO destino) { + this.destino = destino; + } + + public ViaVO getVia() { + return via; + } + + public void setVia(ViaVO via) { + this.via = via; + } + + public Integer getNumsecuencia() { + return numsecuencia; + } + + public void setNumsecuencia(Integer numsecuencia) { + this.numsecuencia = numsecuencia; + } + + public BigDecimal getValorTarifa() { + return valorTarifa; + } + + public void setValorTarifa(BigDecimal valorTarifa) { + this.valorTarifa = valorTarifa; + } + + public BigDecimal getValorTaxa() { + return valorTaxa; + } + + public void setValorTaxa(BigDecimal valorTaxa) { + this.valorTaxa = valorTaxa; + } + + public BigDecimal getValorSeguro() { + return valorSeguro; + } + + public void setValorSeguro(BigDecimal valorSeguro) { + this.valorSeguro = valorSeguro; + } + + public BigDecimal getValorPedagio() { + return valorPedagio; + } + + public void setValorPedagio(BigDecimal valorPedagio) { + this.valorPedagio = valorPedagio; + } + + public BigDecimal getValorOutros() { + return valorOutros; + } + + public void setValorOutros(BigDecimal valorOutros) { + this.valorOutros = valorOutros; + } + + public Integer getAliasorigenId() { + return aliasorigenId; + } + + public void setAliasorigenId(Integer aliasorigenId) { + this.aliasorigenId = aliasorigenId; + } + + public Integer getAliasdestinoId() { + return aliasdestinoId; + } + + public void setAliasdestinoId(Integer aliasdestinoId) { + this.aliasdestinoId = aliasdestinoId; + } + + public String getDescAliasorigen() { + return descAliasorigen; + } + + public void setDescAliasorigen(String descAliasorigen) { + this.descAliasorigen = descAliasorigen; + } + + public String getDescAliasdestino() { + return descAliasdestino; + } + + public void setDescAliasdestino(String descAliasdestino) { + this.descAliasdestino = descAliasdestino; + } + + public Integer getOrigemId() { + return origemId; + } + + public void setOrigemId(Integer origemId) { + this.origemId = origemId; + } + + public Integer getDestinoId() { + return destinoId; + } + + public void setDestinoId(Integer destinoId) { + this.destinoId = destinoId; + } + + public Integer getRutaId() { + return rutaId; + } + + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + + public BigDecimal getTarifaMinima() { + return tarifaMinima; + } + + public void setTarifaMinima(BigDecimal tarifaMinima) { + this.tarifaMinima = tarifaMinima; + } + + public Integer getMonedaId() { + return monedaId; + } + + public void setMonedaId(Integer monedaId) { + this.monedaId = monedaId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/vo/via/ViaVO.java b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/via/ViaVO.java similarity index 94% rename from src/com/rjconsultores/ventaboletos/vo/via/ViaVO.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/vo/via/ViaVO.java index 74bee3dbb..e8f1aab83 100644 --- a/src/com/rjconsultores/ventaboletos/vo/via/ViaVO.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/vo/via/ViaVO.java @@ -1,30 +1,30 @@ -package com.rjconsultores.ventaboletos.vo.via; - -public class ViaVO { - - private Integer viaId; - private String nombvia; - - public ViaVO(Integer viaId, String nombvia) { - super(); - this.viaId = viaId; - this.nombvia = nombvia; - } - - public Integer getViaId() { - return viaId; - } - - public void setViaId(Integer viaId) { - this.viaId = viaId; - } - - public String getNombvia() { - return nombvia; - } - - public void setNombvia(String nombvia) { - this.nombvia = nombvia; - } - -} +package com.rjconsultores.ventaboletos.vo.via; + +public class ViaVO { + + private Integer viaId; + private String nombvia; + + public ViaVO(Integer viaId, String nombvia) { + super(); + this.viaId = viaId; + this.nombvia = nombvia; + } + + public Integer getViaId() { + return viaId; + } + + public void setViaId(Integer viaId) { + this.viaId = viaId; + } + + public String getNombvia() { + return nombvia; + } + + public void setNombvia(String nombvia) { + this.nombvia = nombvia; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/web/utilerias/NamedParameterStatement.java b/ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/NamedParameterStatement.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/web/utilerias/NamedParameterStatement.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/NamedParameterStatement.java index 76d5d5947..23184dee7 100644 --- a/src/com/rjconsultores/ventaboletos/web/utilerias/NamedParameterStatement.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/NamedParameterStatement.java @@ -1,357 +1,357 @@ -/** - * - */ -package com.rjconsultores.ventaboletos.web.utilerias; - -import java.sql.Connection; -import java.sql.Date; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -@SuppressWarnings({"rawtypes", "unchecked"}) -public class NamedParameterStatement { - /** The statement this object is wrapping. */ - private final PreparedStatement statement; - - /** Maps parameter names to arrays of ints which are the parameter indices. */ - - private final Map indexMap; - - /** - * Creates a NamedParameterStatement. Wraps a call to c.{@link Connection#prepareStatement(java.lang.String) prepareStatement}. - * - * @param connection - * the database connection - * @param query - * the parameterized query - * @throws SQLException - * if the statement could not be created - */ - public NamedParameterStatement(Connection connection, String query) throws - SQLException { - this(connection, query, ResultSet.TYPE_FORWARD_ONLY); - } - - /** - * Creates a NamedParameterStatement. Wraps a call to c.{@link Connection#prepareStatement(java.lang.String) prepareStatement}. - * - * @param connection the database connection - * @param query the parameterized query - * @throws SQLException if the statement could not be created - * @param resultSetType type of resultSet - */ - public NamedParameterStatement(Connection connection, String query, int resultSetType) throws - SQLException { - indexMap = new HashMap(); - String parsedQuery = parse(query, indexMap); - statement = connection.prepareStatement(parsedQuery, resultSetType, ResultSet.CONCUR_READ_ONLY); - statement.setFetchSize(1000); - } - - /** - * Parses a query with named parameters. The parameter-index mappings are put into the map, and the parsed query is returned. DO NOT CALL FROM CLIENT CODE. This method is non-private so JUnit code can test it. - * - * @param query - * query to parse - * @param paramMap - * map to hold parameter-index mappings - * @return the parsed query - */ - static final String parse(String query, Map paramMap) { - // I was originally using regular expressions, but they didn't work well for ignoring - // parameter-like strings inside quotes. - int length = query.length(); - StringBuffer parsedQuery = new StringBuffer(length); - boolean inSingleQuote = false; - boolean inDoubleQuote = false; - int index = 1; - - for (int i = 0; i < length; i++) { - char c = query.charAt(i); - if (inSingleQuote) { - if (c == '\'') { - inSingleQuote = false; - } - } else if (inDoubleQuote) { - if (c == '"') { - inDoubleQuote = false; - } - } else { - if (c == '\'') { - inSingleQuote = true; - } else if (c == '"') { - inDoubleQuote = true; - } else if (c == ':' && i + 1 < length && - Character.isJavaIdentifierStart(query.charAt(i + 1))) { - int j = i + 2; - while (j < length && Character.isJavaIdentifierPart(query.charAt(j))) { - j++; - } - String name = query.substring(i + 1, j); - c = '?'; // replace the parameter with a question mark - i += name.length(); // skip past the end if the parameter - - List indexList = (List) paramMap.get(name); - if (indexList == null) { - indexList = new LinkedList(); - paramMap.put(name, indexList); - } - indexList.add(new Integer(index)); - - index++; - } - } - parsedQuery.append(c); - } - - // replace the lists of Integer objects with arrays of ints - for (Iterator itr = paramMap.entrySet().iterator(); itr.hasNext();) { - Map.Entry entry = (Map.Entry) itr.next(); - List list = (List) entry.getValue(); - int[] indexes = new int[list.size()]; - int i = 0; - for (Iterator itr2 = list.iterator(); itr2.hasNext();) { - Integer x = (Integer) itr2.next(); - indexes[i++] = x.intValue(); - } - entry.setValue(indexes); - } - - return parsedQuery.toString(); - } - - /** - * Returns the indexes for a parameter. - * - * @param name - * parameter name - * @return parameter indexes - * @throws IllegalArgumentException - * if the parameter does not exist - */ - private int[] getIndexes(String name) { - int[] indexes = (int[]) indexMap.get(name); - if (indexes == null) { - throw new IllegalArgumentException("Parameter not found: " + name); - } - return indexes; - } - - /** - * Sets a parameter. - * - * @param name - * parameter name - * @param value - * parameter value - * @throws SQLException - * if an error occurred - * @throws IllegalArgumentException - * if the parameter does not exist - * @see PreparedStatement#setObject(int, java.lang.Object) - */ - public void setObject(String name, Object value) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setObject(indexes[i], value); - } - } - - /** - * Sets a parameter. - * - * @param name - * parameter name - * @param value - * parameter value - * @throws SQLException - * if an error occurred - * @throws IllegalArgumentException - * if the parameter does not exist - * @see PreparedStatement#setString(int, java.lang.String) - */ - public void setString(String name, String value) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setString(indexes[i], value); - } - } - - /** - * Sets a parameter. - * - * @param name - * parameter name - * @param value - * parameter value - * @throws SQLException - * if an error occurred - * @throws IllegalArgumentException - * if the parameter does not exist - * @see PreparedStatement#setInt(int, int) - */ - public void setInt(String name, int value) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setInt(indexes[i], value); - } - } - - /** - * Sets a parameter. - * - * @param name - * parameter name - * @param value - * parameter value - * @throws SQLException - * if an error occurred - * @throws IllegalArgumentException - * if the parameter does not exist - * @see PreparedStatement#setInt(int, int) - */ - public void setLong(String name, long value) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setLong(indexes[i], value); - } - } - - public void setDate(String name, Date value) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setDate(indexes[i], value); - } - } - - - public void setNull(String name, int sqlType) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setNull(indexes[i], sqlType); - } - } - - public void setBoolean(String name, Boolean value) throws SQLException { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setBoolean(indexes[i], value); - } - } - - /** - * Sets a parameter. - * - * @param name - * parameter name - * @param value - * parameter value - * @throws SQLException - * if an error occurred - * @throws IllegalArgumentException - * if the parameter does not exist - * @see PreparedStatement#setTimestamp(int, java.sql.Timestamp) - */ - public void setTimestamp(String name, Timestamp value) throws SQLException - { - int[] indexes = getIndexes(name); - for (int i = 0; i < indexes.length; i++) { - statement.setTimestamp(indexes[i], value); - } - } - - /** - * Returns the underlying statement. - * - * @return the statement - */ - public PreparedStatement getStatement() { - return statement; - } - - /** - * Executes the statement. - * - * @return true if the first result is a {@link ResultSet} - * @throws SQLException - * if an error occurred - * @see PreparedStatement#execute() - */ - public boolean execute() throws SQLException { - return statement.execute(); - } - - /** - * Executes the statement, which must be a query. - * - * @return the query results - * @throws SQLException - * if an error occurred - * @see PreparedStatement#executeQuery() - */ - public ResultSet executeQuery() throws SQLException { - return statement.executeQuery(); - } - - /** - * Executes the statement, which must be an SQL INSERT, UPDATE or DELETE statement; or an SQL statement that returns nothing, such as a DDL statement. - * - * @return number of rows affected - * @throws SQLException - * if an error occurred - * @see PreparedStatement#executeUpdate() - */ - public int executeUpdate() throws SQLException { - return statement.executeUpdate(); - } - - /** - * Closes the statement. - * - * @throws SQLException - * if an error occurred - * @see Statement#close() - */ - public void close() throws SQLException { - statement.close(); - } - - public Boolean isClosed() throws SQLException { - return statement.isClosed(); - } - - public void setFetchSize(int rows) throws SQLException { - statement.setFetchSize(rows); - } - - /** - * Adds the current set of parameters as a batch entry. - * - * @throws SQLException - * if something went wrong - */ - public void addBatch() throws SQLException { - statement.addBatch(); - } - - /** - * Executes all of the batched statements. - * - * See {@link Statement#executeBatch()} for details. - * - * @return update counts for each statement - * @throws SQLException - * if something went wrong - */ - public int[] executeBatch() throws SQLException { - return statement.executeBatch(); - } -} +/** + * + */ +package com.rjconsultores.ventaboletos.web.utilerias; + +import java.sql.Connection; +import java.sql.Date; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +@SuppressWarnings({"rawtypes", "unchecked"}) +public class NamedParameterStatement { + /** The statement this object is wrapping. */ + private final PreparedStatement statement; + + /** Maps parameter names to arrays of ints which are the parameter indices. */ + + private final Map indexMap; + + /** + * Creates a NamedParameterStatement. Wraps a call to c.{@link Connection#prepareStatement(java.lang.String) prepareStatement}. + * + * @param connection + * the database connection + * @param query + * the parameterized query + * @throws SQLException + * if the statement could not be created + */ + public NamedParameterStatement(Connection connection, String query) throws + SQLException { + this(connection, query, ResultSet.TYPE_FORWARD_ONLY); + } + + /** + * Creates a NamedParameterStatement. Wraps a call to c.{@link Connection#prepareStatement(java.lang.String) prepareStatement}. + * + * @param connection the database connection + * @param query the parameterized query + * @throws SQLException if the statement could not be created + * @param resultSetType type of resultSet + */ + public NamedParameterStatement(Connection connection, String query, int resultSetType) throws + SQLException { + indexMap = new HashMap(); + String parsedQuery = parse(query, indexMap); + statement = connection.prepareStatement(parsedQuery, resultSetType, ResultSet.CONCUR_READ_ONLY); + statement.setFetchSize(1000); + } + + /** + * Parses a query with named parameters. The parameter-index mappings are put into the map, and the parsed query is returned. DO NOT CALL FROM CLIENT CODE. This method is non-private so JUnit code can test it. + * + * @param query + * query to parse + * @param paramMap + * map to hold parameter-index mappings + * @return the parsed query + */ + static final String parse(String query, Map paramMap) { + // I was originally using regular expressions, but they didn't work well for ignoring + // parameter-like strings inside quotes. + int length = query.length(); + StringBuffer parsedQuery = new StringBuffer(length); + boolean inSingleQuote = false; + boolean inDoubleQuote = false; + int index = 1; + + for (int i = 0; i < length; i++) { + char c = query.charAt(i); + if (inSingleQuote) { + if (c == '\'') { + inSingleQuote = false; + } + } else if (inDoubleQuote) { + if (c == '"') { + inDoubleQuote = false; + } + } else { + if (c == '\'') { + inSingleQuote = true; + } else if (c == '"') { + inDoubleQuote = true; + } else if (c == ':' && i + 1 < length && + Character.isJavaIdentifierStart(query.charAt(i + 1))) { + int j = i + 2; + while (j < length && Character.isJavaIdentifierPart(query.charAt(j))) { + j++; + } + String name = query.substring(i + 1, j); + c = '?'; // replace the parameter with a question mark + i += name.length(); // skip past the end if the parameter + + List indexList = (List) paramMap.get(name); + if (indexList == null) { + indexList = new LinkedList(); + paramMap.put(name, indexList); + } + indexList.add(new Integer(index)); + + index++; + } + } + parsedQuery.append(c); + } + + // replace the lists of Integer objects with arrays of ints + for (Iterator itr = paramMap.entrySet().iterator(); itr.hasNext();) { + Map.Entry entry = (Map.Entry) itr.next(); + List list = (List) entry.getValue(); + int[] indexes = new int[list.size()]; + int i = 0; + for (Iterator itr2 = list.iterator(); itr2.hasNext();) { + Integer x = (Integer) itr2.next(); + indexes[i++] = x.intValue(); + } + entry.setValue(indexes); + } + + return parsedQuery.toString(); + } + + /** + * Returns the indexes for a parameter. + * + * @param name + * parameter name + * @return parameter indexes + * @throws IllegalArgumentException + * if the parameter does not exist + */ + private int[] getIndexes(String name) { + int[] indexes = (int[]) indexMap.get(name); + if (indexes == null) { + throw new IllegalArgumentException("Parameter not found: " + name); + } + return indexes; + } + + /** + * Sets a parameter. + * + * @param name + * parameter name + * @param value + * parameter value + * @throws SQLException + * if an error occurred + * @throws IllegalArgumentException + * if the parameter does not exist + * @see PreparedStatement#setObject(int, java.lang.Object) + */ + public void setObject(String name, Object value) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setObject(indexes[i], value); + } + } + + /** + * Sets a parameter. + * + * @param name + * parameter name + * @param value + * parameter value + * @throws SQLException + * if an error occurred + * @throws IllegalArgumentException + * if the parameter does not exist + * @see PreparedStatement#setString(int, java.lang.String) + */ + public void setString(String name, String value) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setString(indexes[i], value); + } + } + + /** + * Sets a parameter. + * + * @param name + * parameter name + * @param value + * parameter value + * @throws SQLException + * if an error occurred + * @throws IllegalArgumentException + * if the parameter does not exist + * @see PreparedStatement#setInt(int, int) + */ + public void setInt(String name, int value) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setInt(indexes[i], value); + } + } + + /** + * Sets a parameter. + * + * @param name + * parameter name + * @param value + * parameter value + * @throws SQLException + * if an error occurred + * @throws IllegalArgumentException + * if the parameter does not exist + * @see PreparedStatement#setInt(int, int) + */ + public void setLong(String name, long value) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setLong(indexes[i], value); + } + } + + public void setDate(String name, Date value) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setDate(indexes[i], value); + } + } + + + public void setNull(String name, int sqlType) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setNull(indexes[i], sqlType); + } + } + + public void setBoolean(String name, Boolean value) throws SQLException { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setBoolean(indexes[i], value); + } + } + + /** + * Sets a parameter. + * + * @param name + * parameter name + * @param value + * parameter value + * @throws SQLException + * if an error occurred + * @throws IllegalArgumentException + * if the parameter does not exist + * @see PreparedStatement#setTimestamp(int, java.sql.Timestamp) + */ + public void setTimestamp(String name, Timestamp value) throws SQLException + { + int[] indexes = getIndexes(name); + for (int i = 0; i < indexes.length; i++) { + statement.setTimestamp(indexes[i], value); + } + } + + /** + * Returns the underlying statement. + * + * @return the statement + */ + public PreparedStatement getStatement() { + return statement; + } + + /** + * Executes the statement. + * + * @return true if the first result is a {@link ResultSet} + * @throws SQLException + * if an error occurred + * @see PreparedStatement#execute() + */ + public boolean execute() throws SQLException { + return statement.execute(); + } + + /** + * Executes the statement, which must be a query. + * + * @return the query results + * @throws SQLException + * if an error occurred + * @see PreparedStatement#executeQuery() + */ + public ResultSet executeQuery() throws SQLException { + return statement.executeQuery(); + } + + /** + * Executes the statement, which must be an SQL INSERT, UPDATE or DELETE statement; or an SQL statement that returns nothing, such as a DDL statement. + * + * @return number of rows affected + * @throws SQLException + * if an error occurred + * @see PreparedStatement#executeUpdate() + */ + public int executeUpdate() throws SQLException { + return statement.executeUpdate(); + } + + /** + * Closes the statement. + * + * @throws SQLException + * if an error occurred + * @see Statement#close() + */ + public void close() throws SQLException { + statement.close(); + } + + public Boolean isClosed() throws SQLException { + return statement.isClosed(); + } + + public void setFetchSize(int rows) throws SQLException { + statement.setFetchSize(rows); + } + + /** + * Adds the current set of parameters as a batch entry. + * + * @throws SQLException + * if something went wrong + */ + public void addBatch() throws SQLException { + statement.addBatch(); + } + + /** + * Executes all of the batched statements. + * + * See {@link Statement#executeBatch()} for details. + * + * @return update counts for each statement + * @throws SQLException + * if something went wrong + */ + public int[] executeBatch() throws SQLException { + return statement.executeBatch(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/web/utilerias/security/AESGSMHelper.java b/ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/security/AESGSMHelper.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/web/utilerias/security/AESGSMHelper.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/security/AESGSMHelper.java diff --git a/src/com/rjconsultores/ventaboletos/web/utilerias/security/SecurityEmpresaToken.java b/ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/security/SecurityEmpresaToken.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/web/utilerias/security/SecurityEmpresaToken.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/security/SecurityEmpresaToken.java diff --git a/src/com/rjconsultores/ventaboletos/web/utilerias/spring/AppContext.java b/ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/spring/AppContext.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/web/utilerias/spring/AppContext.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/spring/AppContext.java diff --git a/src/com/rjconsultores/ventaboletos/web/utilerias/spring/ApplicationContextProvider.java b/ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/spring/ApplicationContextProvider.java similarity index 100% rename from src/com/rjconsultores/ventaboletos/web/utilerias/spring/ApplicationContextProvider.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/web/utilerias/spring/ApplicationContextProvider.java diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosClientePacoteRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosClientePacoteRS.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosClientePacoteRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosClientePacoteRS.java index c2e946b8a..58223f2f0 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosClientePacoteRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosClientePacoteRS.java @@ -1,36 +1,36 @@ -package com.rjconsultores.ventaboletos.ws.rs; - -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.dao.ClientePacoteDAO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("") -public class BusquedaDatosClientePacoteRS { - - private static Logger log = LogManager.getLogger(BusquedaDatosClientePacoteRS.class); - - @GET - @Path("/busquedadatosclientepacote") - @Produces({ MediaType.APPLICATION_XML }) - public List busquedaDatosClientePacote(@QueryParam("cpfcnpj") String cpfCnpjParam) { - try { - ClientePacoteDAO clientePacoteDao = (ClientePacoteDAO)AppContext.getApplicationContext().getBean("clientePacoteDAO"); - return clientePacoteDao.busquedaDatosClientePacote(cpfCnpjParam); - } catch (Exception e) { - log.error(e.getMessage(), e.getCause()); - } - return null; - } - -} +package com.rjconsultores.ventaboletos.ws.rs; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.dao.ClientePacoteDAO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.ClientePacoteVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("") +public class BusquedaDatosClientePacoteRS { + + private static Logger log = LogManager.getLogger(BusquedaDatosClientePacoteRS.class); + + @GET + @Path("/busquedadatosclientepacote") + @Produces({ MediaType.APPLICATION_XML }) + public List busquedaDatosClientePacote(@QueryParam("cpfcnpj") String cpfCnpjParam) { + try { + ClientePacoteDAO clientePacoteDao = (ClientePacoteDAO)AppContext.getApplicationContext().getBean("clientePacoteDAO"); + return clientePacoteDao.busquedaDatosClientePacote(cpfCnpjParam); + } catch (Exception e) { + log.error(e.getMessage(), e.getCause()); + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java index 563756d18..2288de14c 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java @@ -1,59 +1,59 @@ -package com.rjconsultores.ventaboletos.ws.rs; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.dao.BusquedaDatosTicketDAO; -import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("") -public class BusquedaDatosTicketsRS { - - @GET - @Path("/busquedadatostickets") - @Produces({ MediaType.APPLICATION_XML }) - public List busquedaDatosTickets(@QueryParam("fecinicial") String fechaIniParam, @QueryParam("fecfinal") String fechaFinParam, - @QueryParam("fecventainicial") String fechaVentaIniParam, @QueryParam("fecventafinal") String fechaVentaFinParam, - @QueryParam("fecalteracaoinicial") String fechaAlteracaoIniParam, @QueryParam("fecalteracaofinal") String fechaAlteracaoFinParam) throws ParseException{ - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - - Date fecInicial = StringUtils.isNotBlank(fechaIniParam) ? sdf.parse(fechaIniParam) : null; - Date fecFinal = StringUtils.isNotBlank(fechaFinParam) ? sdf.parse(fechaFinParam) : null; - Date fecVentaInicial = StringUtils.isNotBlank(fechaVentaIniParam) ? sdf.parse(fechaVentaIniParam) : null; - Date fecVentaFinal = StringUtils.isNotBlank(fechaVentaFinParam) ? sdf.parse(fechaVentaFinParam) : null; - Date fecAlteracaoInicial = StringUtils.isNotBlank(fechaAlteracaoIniParam) ? sdf.parse(fechaAlteracaoIniParam) : null; - Date fecAlteracaoFinal = StringUtils.isNotBlank(fechaAlteracaoFinParam) ? sdf.parse(fechaAlteracaoFinParam) : null; - - List pacotes = null; - - if(isParametrosInformado(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal)) { - BusquedaDatosTicketDAO pacoteDao = (BusquedaDatosTicketDAO)AppContext.getApplicationContext().getBean("busquedaDatosTicketDAO"); - pacotes = pacoteDao.buscaDatosTickets(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); - } - - return pacotes; - } - - private boolean isParametrosInformado(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { - return fecInicial != null || - fecFinal != null || - fecVentaInicial != null || - fecVentaFinal != null || - fecAlteracaoInicial != null || - fecAlteracaoFinal != null; - } - - -} +package com.rjconsultores.ventaboletos.ws.rs; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.dao.BusquedaDatosTicketDAO; +import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("") +public class BusquedaDatosTicketsRS { + + @GET + @Path("/busquedadatostickets") + @Produces({ MediaType.APPLICATION_XML }) + public List busquedaDatosTickets(@QueryParam("fecinicial") String fechaIniParam, @QueryParam("fecfinal") String fechaFinParam, + @QueryParam("fecventainicial") String fechaVentaIniParam, @QueryParam("fecventafinal") String fechaVentaFinParam, + @QueryParam("fecalteracaoinicial") String fechaAlteracaoIniParam, @QueryParam("fecalteracaofinal") String fechaAlteracaoFinParam) throws ParseException{ + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + + Date fecInicial = StringUtils.isNotBlank(fechaIniParam) ? sdf.parse(fechaIniParam) : null; + Date fecFinal = StringUtils.isNotBlank(fechaFinParam) ? sdf.parse(fechaFinParam) : null; + Date fecVentaInicial = StringUtils.isNotBlank(fechaVentaIniParam) ? sdf.parse(fechaVentaIniParam) : null; + Date fecVentaFinal = StringUtils.isNotBlank(fechaVentaFinParam) ? sdf.parse(fechaVentaFinParam) : null; + Date fecAlteracaoInicial = StringUtils.isNotBlank(fechaAlteracaoIniParam) ? sdf.parse(fechaAlteracaoIniParam) : null; + Date fecAlteracaoFinal = StringUtils.isNotBlank(fechaAlteracaoFinParam) ? sdf.parse(fechaAlteracaoFinParam) : null; + + List pacotes = null; + + if(isParametrosInformado(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal)) { + BusquedaDatosTicketDAO pacoteDao = (BusquedaDatosTicketDAO)AppContext.getApplicationContext().getBean("busquedaDatosTicketDAO"); + pacotes = pacoteDao.buscaDatosTickets(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal, fecAlteracaoInicial, fecAlteracaoFinal); + } + + return pacotes; + } + + private boolean isParametrosInformado(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) { + return fecInicial != null || + fecFinal != null || + fecVentaInicial != null || + fecVentaFinal != null || + fecAlteracaoInicial != null || + fecAlteracaoFinal != null; + } + + +} diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/CajaCerradoRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/CajaCerradoRS.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/ws/rs/CajaCerradoRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/CajaCerradoRS.java index f70511e0c..63c9509bc 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/CajaCerradoRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/CajaCerradoRS.java @@ -1,65 +1,65 @@ -package com.rjconsultores.ventaboletos.ws.rs; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.dao.CajaDAO; -import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("/cajas") -public class CajaCerradoRS { - @GET - @Path("/cerrados") - @Produces({ MediaType.APPLICATION_XML }) - public List buscarCajaCerrado(@QueryParam("fecha") String fecha, @QueryParam("cveusuario") String cveusuario, @QueryParam("turnoid") String turnoid) { - SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); - - Date fec = new Date(); - - try { - fec = StringUtils.isBlank(fecha) ? new Date() : sdf.parse(fecha); - } catch (Exception e) { - } - - if (cveusuario == null) { - cveusuario = "*"; - } - - if (turnoid == null) { - turnoid = "*"; - } - - CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); - List list = cajaDAO.buscarCajaCerrado(fec, cveusuario, turnoid); - - return list; - } - @GET - @Path("/usuarios") - @Produces({ MediaType.APPLICATION_XML }) - public List buscarUsuarioCerrado(@QueryParam("fecha") String fecha) { - SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); - - Date fec = new Date(); - - try { - fec = StringUtils.isBlank(fecha) ? new Date() : sdf.parse(fecha); - } catch (Exception e) { - } - - CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); - List list = cajaDAO.buscarUsuarioCerrado(fec); - - return list; - } -} +package com.rjconsultores.ventaboletos.ws.rs; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.dao.CajaDAO; +import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("/cajas") +public class CajaCerradoRS { + @GET + @Path("/cerrados") + @Produces({ MediaType.APPLICATION_XML }) + public List buscarCajaCerrado(@QueryParam("fecha") String fecha, @QueryParam("cveusuario") String cveusuario, @QueryParam("turnoid") String turnoid) { + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + Date fec = new Date(); + + try { + fec = StringUtils.isBlank(fecha) ? new Date() : sdf.parse(fecha); + } catch (Exception e) { + } + + if (cveusuario == null) { + cveusuario = "*"; + } + + if (turnoid == null) { + turnoid = "*"; + } + + CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); + List list = cajaDAO.buscarCajaCerrado(fec, cveusuario, turnoid); + + return list; + } + @GET + @Path("/usuarios") + @Produces({ MediaType.APPLICATION_XML }) + public List buscarUsuarioCerrado(@QueryParam("fecha") String fecha) { + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + Date fec = new Date(); + + try { + fec = StringUtils.isBlank(fecha) ? new Date() : sdf.parse(fecha); + } catch (Exception e) { + } + + CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); + List list = cajaDAO.buscarUsuarioCerrado(fec); + + return list; + } +} diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java index 7e3d5fbbb..50cc577e0 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/CajaRS.java @@ -1,81 +1,81 @@ -package com.rjconsultores.ventaboletos.ws.rs; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import org.apache.commons.lang.StringUtils; - -import com.rjconsultores.ventaboletos.dao.CajaDAO; -import com.rjconsultores.ventaboletos.vo.caja.CajaDetalleVO; -import com.rjconsultores.ventaboletos.vo.caja.CajaVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("/") -public class CajaRS { - @Path("/cajas") - @GET - @Produces({ MediaType.APPLICATION_XML }) - public List buscarCaja(@QueryParam("yaCerrado") boolean yaCerrado, @QueryParam("fecDesde") String fecDesde, @QueryParam("fecHasta") String fecHasta) { - - SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); - - Date fecDesdeD = new Date(); - Date fecHastaD = new Date(); - - try { - fecDesdeD = StringUtils.isBlank(fecDesde) ? new Date() : sdf.parse(fecDesde); - } catch (Exception e) { - - } - try { - fecHastaD = StringUtils.isBlank(fecHasta) ? new Date() : sdf.parse(fecHasta); - } catch (Exception e) { - - } - - CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); - List list = cajaDAO.buscarCajaFecha(yaCerrado, fecDesdeD, fecHastaD); - - return list; - } - @Path("/detalleCajas") - @GET - @Produces({ MediaType.APPLICATION_XML }) - public List buscarDetalleCaja(@QueryParam("fecDesde") String fecDesde, @QueryParam("fecHasta") String fecHasta, @QueryParam("sembilhetesPacote") String sembilhetesPacote) { - - SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); - - Date fecDesdeD = new Date(); - Date fecHastaD = new Date(); - Boolean bSembilhetesPacote = Boolean.FALSE; - - try { - fecDesdeD = StringUtils.isBlank(fecDesde) ? new Date() : sdf.parse(fecDesde); - } catch (Exception e) { - - } - try { - fecHastaD = StringUtils.isBlank(fecHasta) ? new Date() : sdf.parse(fecHasta); - } catch (Exception e) { - - } - try { - bSembilhetesPacote = StringUtils.isBlank(sembilhetesPacote) ? Boolean.FALSE : Boolean.valueOf(sembilhetesPacote); - } catch (Exception e) { - - } - - CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); - List list = cajaDAO.buscarDetalleCaja(fecDesdeD, fecHastaD, bSembilhetesPacote); - - return list; - } - -} +package com.rjconsultores.ventaboletos.ws.rs; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.dao.CajaDAO; +import com.rjconsultores.ventaboletos.vo.caja.CajaDetalleVO; +import com.rjconsultores.ventaboletos.vo.caja.CajaVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("/") +public class CajaRS { + @Path("/cajas") + @GET + @Produces({ MediaType.APPLICATION_XML }) + public List buscarCaja(@QueryParam("yaCerrado") boolean yaCerrado, @QueryParam("fecDesde") String fecDesde, @QueryParam("fecHasta") String fecHasta) { + + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + Date fecDesdeD = new Date(); + Date fecHastaD = new Date(); + + try { + fecDesdeD = StringUtils.isBlank(fecDesde) ? new Date() : sdf.parse(fecDesde); + } catch (Exception e) { + + } + try { + fecHastaD = StringUtils.isBlank(fecHasta) ? new Date() : sdf.parse(fecHasta); + } catch (Exception e) { + + } + + CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); + List list = cajaDAO.buscarCajaFecha(yaCerrado, fecDesdeD, fecHastaD); + + return list; + } + @Path("/detalleCajas") + @GET + @Produces({ MediaType.APPLICATION_XML }) + public List buscarDetalleCaja(@QueryParam("fecDesde") String fecDesde, @QueryParam("fecHasta") String fecHasta, @QueryParam("sembilhetesPacote") String sembilhetesPacote) { + + SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); + + Date fecDesdeD = new Date(); + Date fecHastaD = new Date(); + Boolean bSembilhetesPacote = Boolean.FALSE; + + try { + fecDesdeD = StringUtils.isBlank(fecDesde) ? new Date() : sdf.parse(fecDesde); + } catch (Exception e) { + + } + try { + fecHastaD = StringUtils.isBlank(fecHasta) ? new Date() : sdf.parse(fecHasta); + } catch (Exception e) { + + } + try { + bSembilhetesPacote = StringUtils.isBlank(sembilhetesPacote) ? Boolean.FALSE : Boolean.valueOf(sembilhetesPacote); + } catch (Exception e) { + + } + + CajaDAO cajaDAO = (CajaDAO) AppContext.getApplicationContext().getBean("cajaDAO"); + List list = cajaDAO.buscarDetalleCaja(fecDesdeD, fecHastaD, bSembilhetesPacote); + + return list; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/ReembolsoOcdNotaCreditoRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/ReembolsoOcdNotaCreditoRS.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/ws/rs/ReembolsoOcdNotaCreditoRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/ReembolsoOcdNotaCreditoRS.java index 016129c33..c65ba463c 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/ReembolsoOcdNotaCreditoRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/ReembolsoOcdNotaCreditoRS.java @@ -1,52 +1,52 @@ -package com.rjconsultores.ventaboletos.ws.rs; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import com.rjconsultores.ventaboletos.service.NotaCreditoVendaPacoteService; -import com.rjconsultores.ventaboletos.service.OCDService; -import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("/reembolsoocdnotacredito") -public class ReembolsoOcdNotaCreditoRS { - - private static SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - - @GET - @Produces({ MediaType.APPLICATION_XML }) - public List busquedaDatosReembolsoOcdNotaCreditoRS(@QueryParam("fecinicial") String fecInicialParam, - @QueryParam("fecfinal") String fecFinalParam, @QueryParam("fecpagamentoinicial") String fecPagamentoInicialParam, - @QueryParam("fecpagamentofinal") String fecPagamentoFinalParam, @QueryParam("pago") Boolean indPago) { - - Date fecInicial = getDateFromString(fecInicialParam); - Date fecFinal = getDateFromString(fecFinalParam); - Date fecPagamentoInicial = getDateFromString(fecPagamentoInicialParam); - Date fecPagamentoFinal = getDateFromString(fecPagamentoFinalParam); - - OCDService ocdService = (OCDService) AppContext.getApplicationContext().getBean(OCDService.class); - List result = ocdService.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago); - - NotaCreditoVendaPacoteService notaCreditoVendaPacoteService = (NotaCreditoVendaPacoteService) AppContext.getApplicationContext().getBean(NotaCreditoVendaPacoteService.class); - result.addAll(notaCreditoVendaPacoteService.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago)); - - return result; - - } - - private Date getDateFromString(String dateString) { - try { - return dateFormat.parse(dateString); - } catch (Exception e) { - return null; - } - } - -} +package com.rjconsultores.ventaboletos.ws.rs; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import com.rjconsultores.ventaboletos.service.NotaCreditoVendaPacoteService; +import com.rjconsultores.ventaboletos.service.OCDService; +import com.rjconsultores.ventaboletos.vo.reembolsoocdnotacredito.ReembolsoOcdNotaCreditoVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("/reembolsoocdnotacredito") +public class ReembolsoOcdNotaCreditoRS { + + private static SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + + @GET + @Produces({ MediaType.APPLICATION_XML }) + public List busquedaDatosReembolsoOcdNotaCreditoRS(@QueryParam("fecinicial") String fecInicialParam, + @QueryParam("fecfinal") String fecFinalParam, @QueryParam("fecpagamentoinicial") String fecPagamentoInicialParam, + @QueryParam("fecpagamentofinal") String fecPagamentoFinalParam, @QueryParam("pago") Boolean indPago) { + + Date fecInicial = getDateFromString(fecInicialParam); + Date fecFinal = getDateFromString(fecFinalParam); + Date fecPagamentoInicial = getDateFromString(fecPagamentoInicialParam); + Date fecPagamentoFinal = getDateFromString(fecPagamentoFinalParam); + + OCDService ocdService = (OCDService) AppContext.getApplicationContext().getBean(OCDService.class); + List result = ocdService.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago); + + NotaCreditoVendaPacoteService notaCreditoVendaPacoteService = (NotaCreditoVendaPacoteService) AppContext.getApplicationContext().getBean(NotaCreditoVendaPacoteService.class); + result.addAll(notaCreditoVendaPacoteService.busquedaDatosReembolsoOcdNotaCreditoRS(fecInicial, fecFinal, fecPagamentoInicial, fecPagamentoFinal, indPago)); + + return result; + + } + + private Date getDateFromString(String dateString) { + try { + return dateFormat.parse(dateString); + } catch (Exception e) { + return null; + } + } + +} diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/UsuarioRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/UsuarioRS.java similarity index 96% rename from src/com/rjconsultores/ventaboletos/ws/rs/UsuarioRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/UsuarioRS.java index 74572daa6..7fb1c26b2 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/UsuarioRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/UsuarioRS.java @@ -1,24 +1,24 @@ -package com.rjconsultores.ventaboletos.ws.rs; - -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import com.rjconsultores.ventaboletos.dao.UsuarioDAO; -import com.rjconsultores.ventaboletos.vo.caja.UsuarioActivoVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("/usuarios") -public class UsuarioRS { - @GET - @Produces({ MediaType.APPLICATION_XML }) - public List buscarUsuarios() { - UsuarioDAO dao = (UsuarioDAO) AppContext.getApplicationContext().getBean("usuarioDAO"); - List retorno = dao.buscarUsuariosActivo(); - - return retorno; - } -} +package com.rjconsultores.ventaboletos.ws.rs; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import com.rjconsultores.ventaboletos.dao.UsuarioDAO; +import com.rjconsultores.ventaboletos.vo.caja.UsuarioActivoVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("/usuarios") +public class UsuarioRS { + @GET + @Produces({ MediaType.APPLICATION_XML }) + public List buscarUsuarios() { + UsuarioDAO dao = (UsuarioDAO) AppContext.getApplicationContext().getBean("usuarioDAO"); + List retorno = dao.buscarUsuariosActivo(); + + return retorno; + } +} diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/VendaEmbarcadaRS.java b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/VendaEmbarcadaRS.java similarity index 97% rename from src/com/rjconsultores/ventaboletos/ws/rs/VendaEmbarcadaRS.java rename to ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/VendaEmbarcadaRS.java index 1ed8f01c7..b686b460f 100644 --- a/src/com/rjconsultores/ventaboletos/ws/rs/VendaEmbarcadaRS.java +++ b/ModelWeb/src/com/rjconsultores/ventaboletos/ws/rs/VendaEmbarcadaRS.java @@ -1,104 +1,104 @@ -package com.rjconsultores.ventaboletos.ws.rs; - - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Date; -import java.text.ParseException; -import java.text.SimpleDateFormat; - -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.rjconsultores.ventaboletos.service.VendaEmbarcadaService; -import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; -import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; - -@Path("vendaEmbarcada") -public class VendaEmbarcadaRS { - - private static Logger log = LogManager.getLogger(VendaEmbarcadaRS.class); - - private final int CATEGORIA_NAO_SUPORTADA = 5; - private final int DATA_COM_FORMATO_INVALIDO = 6; - private final int ERROR_NAO_SUPORTADO_INVALIDO = 7; - - @POST - @Path("/gerarVenda/{numeroAssento}/{categoria}/{origemId}/{destinoId}/{servicoId}/{dataCorrida}/{dataVenda}/{preco}/{tipoVendaId}/{pontoVendaId}/{empresaCorridaId}/{estacaoId}/{usuarioId}/{empresaId}/{taxaEmbarque}/{pedagio}/{outros}/{seguro}/{rutaId}/{formaPagoId}/{classeServicoId}/{numFolioPreImpresso}/{serieImpFiscal}") - @Produces({MediaType.APPLICATION_JSON}) - public String gerarVenda(@PathParam("numeroAssento") String numeroAssento, @PathParam("categoria") String categoria, @PathParam("origemId") Integer origemId, - @PathParam("destinoId") Integer destinoId, @PathParam("servicoId") Integer servicoId, @PathParam("dataCorrida") String dataCorrida, @PathParam("dataVenda") String dataVenda, - @PathParam("preco") BigDecimal preco, @PathParam("tipoVendaId") Integer tipoVendaId, @PathParam("pontoVendaId") Integer pontoVendaId, - @PathParam("empresaCorridaId") Integer empresaCorridaId, @PathParam("estacaoId") Integer estacaoId, @PathParam("usuarioId") Integer usuarioId, - @PathParam("empresaId") BigInteger empresaId, @PathParam("taxaEmbarque") BigDecimal importeTaxaEmbarque, @PathParam("pedagio") BigDecimal importePedagio, - @PathParam("outros") BigDecimal importeOutros, @PathParam("seguro") BigDecimal importeSeguro, @PathParam("rutaId") Integer rutaId, @PathParam("formaPagoId") Integer formaPagoId, - @PathParam("classeServicoId") Integer classeServicoId, @PathParam("numFolioPreImpresso") String numFolioPreImpresso, @PathParam("serieImpFiscal") String serieImpFiscal ){ - - - String retornoJson = "{'response':'"; - - try { - - int categoriaId = 1; - - if (!categoria.equalsIgnoreCase("normal")){ - return retornoJson.concat(CATEGORIA_NAO_SUPORTADA + "'}"); - } - - VendaEmbarcadaVO vendaEmbarcada = new VendaEmbarcadaVO(); - vendaEmbarcada.setUsuarioId(usuarioId); - vendaEmbarcada.setClienteId(vendaEmbarcada.getUsuarioId()); - vendaEmbarcada.setCategoriaId(categoriaId); - vendaEmbarcada.setCorridaId(servicoId); - vendaEmbarcada.setDestinoId(destinoId); - vendaEmbarcada.setOrigemId(origemId); - vendaEmbarcada.setEmpresaCorridaId(empresaCorridaId); - vendaEmbarcada.setTipoVentaId(tipoVendaId); - vendaEmbarcada.setEmpresaId(empresaId); - vendaEmbarcada.setPrecio(preco); - vendaEmbarcada.setNumAsiento(numeroAssento); - vendaEmbarcada.setPuntoVentaId(pontoVendaId); - vendaEmbarcada.setEmpresaPuntoVentaId(empresaId.intValue()); - vendaEmbarcada.setEstacionId(estacaoId); - vendaEmbarcada.setRutaId(rutaId); - vendaEmbarcada.setClaseServicioId(classeServicoId); - vendaEmbarcada.setFormaPagoId(formaPagoId); - - String data[] = dataCorrida.split("__"); - - if (data.length != 2){ - return retornoJson.concat(DATA_COM_FORMATO_INVALIDO + "'}"); - } - - vendaEmbarcada.setFecCorrida(new Date(new SimpleDateFormat("dd/MM/yyyy hh:mm:ss").parse(data[0].replace("_", "/").concat(" ").concat(data[1].replace("_", ":"))).getTime())); - - vendaEmbarcada.setFechorViaje(vendaEmbarcada.getFecCorrida()); - vendaEmbarcada.setFechorVenta(vendaEmbarcada.getFecCorrida()); - vendaEmbarcada.setMarcaId(empresaId.intValue()); - vendaEmbarcada.setImporteTaxaEmbarque(importeTaxaEmbarque); - vendaEmbarcada.setImportePedagio(importePedagio); - vendaEmbarcada.setImporteOutros(importeOutros); - vendaEmbarcada.setImporteSeguro(importeSeguro); - vendaEmbarcada.setNumFolioPreimpresso(numFolioPreImpresso); - vendaEmbarcada.setSerieImpFiscal(serieImpFiscal); - - VendaEmbarcadaService vendaEmbarcadaService = (VendaEmbarcadaService) AppContext.getApplicationContext().getBean("VendaEmbarcadaService"); - - int retornoVenda = vendaEmbarcadaService.gerarVendaEmbarcada(vendaEmbarcada); - - return retornoJson.concat(retornoVenda + "'}"); - } catch (ParseException e) { - log.error(e.getMessage(), e); - return retornoJson.concat(DATA_COM_FORMATO_INVALIDO + "'}"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return retornoJson.concat(ERROR_NAO_SUPORTADO_INVALIDO + "'}"); - } - } +package com.rjconsultores.ventaboletos.ws.rs; + + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Date; +import java.text.ParseException; +import java.text.SimpleDateFormat; + +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.rjconsultores.ventaboletos.service.VendaEmbarcadaService; +import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; + +@Path("vendaEmbarcada") +public class VendaEmbarcadaRS { + + private static Logger log = LogManager.getLogger(VendaEmbarcadaRS.class); + + private final int CATEGORIA_NAO_SUPORTADA = 5; + private final int DATA_COM_FORMATO_INVALIDO = 6; + private final int ERROR_NAO_SUPORTADO_INVALIDO = 7; + + @POST + @Path("/gerarVenda/{numeroAssento}/{categoria}/{origemId}/{destinoId}/{servicoId}/{dataCorrida}/{dataVenda}/{preco}/{tipoVendaId}/{pontoVendaId}/{empresaCorridaId}/{estacaoId}/{usuarioId}/{empresaId}/{taxaEmbarque}/{pedagio}/{outros}/{seguro}/{rutaId}/{formaPagoId}/{classeServicoId}/{numFolioPreImpresso}/{serieImpFiscal}") + @Produces({MediaType.APPLICATION_JSON}) + public String gerarVenda(@PathParam("numeroAssento") String numeroAssento, @PathParam("categoria") String categoria, @PathParam("origemId") Integer origemId, + @PathParam("destinoId") Integer destinoId, @PathParam("servicoId") Integer servicoId, @PathParam("dataCorrida") String dataCorrida, @PathParam("dataVenda") String dataVenda, + @PathParam("preco") BigDecimal preco, @PathParam("tipoVendaId") Integer tipoVendaId, @PathParam("pontoVendaId") Integer pontoVendaId, + @PathParam("empresaCorridaId") Integer empresaCorridaId, @PathParam("estacaoId") Integer estacaoId, @PathParam("usuarioId") Integer usuarioId, + @PathParam("empresaId") BigInteger empresaId, @PathParam("taxaEmbarque") BigDecimal importeTaxaEmbarque, @PathParam("pedagio") BigDecimal importePedagio, + @PathParam("outros") BigDecimal importeOutros, @PathParam("seguro") BigDecimal importeSeguro, @PathParam("rutaId") Integer rutaId, @PathParam("formaPagoId") Integer formaPagoId, + @PathParam("classeServicoId") Integer classeServicoId, @PathParam("numFolioPreImpresso") String numFolioPreImpresso, @PathParam("serieImpFiscal") String serieImpFiscal ){ + + + String retornoJson = "{'response':'"; + + try { + + int categoriaId = 1; + + if (!categoria.equalsIgnoreCase("normal")){ + return retornoJson.concat(CATEGORIA_NAO_SUPORTADA + "'}"); + } + + VendaEmbarcadaVO vendaEmbarcada = new VendaEmbarcadaVO(); + vendaEmbarcada.setUsuarioId(usuarioId); + vendaEmbarcada.setClienteId(vendaEmbarcada.getUsuarioId()); + vendaEmbarcada.setCategoriaId(categoriaId); + vendaEmbarcada.setCorridaId(servicoId); + vendaEmbarcada.setDestinoId(destinoId); + vendaEmbarcada.setOrigemId(origemId); + vendaEmbarcada.setEmpresaCorridaId(empresaCorridaId); + vendaEmbarcada.setTipoVentaId(tipoVendaId); + vendaEmbarcada.setEmpresaId(empresaId); + vendaEmbarcada.setPrecio(preco); + vendaEmbarcada.setNumAsiento(numeroAssento); + vendaEmbarcada.setPuntoVentaId(pontoVendaId); + vendaEmbarcada.setEmpresaPuntoVentaId(empresaId.intValue()); + vendaEmbarcada.setEstacionId(estacaoId); + vendaEmbarcada.setRutaId(rutaId); + vendaEmbarcada.setClaseServicioId(classeServicoId); + vendaEmbarcada.setFormaPagoId(formaPagoId); + + String data[] = dataCorrida.split("__"); + + if (data.length != 2){ + return retornoJson.concat(DATA_COM_FORMATO_INVALIDO + "'}"); + } + + vendaEmbarcada.setFecCorrida(new Date(new SimpleDateFormat("dd/MM/yyyy hh:mm:ss").parse(data[0].replace("_", "/").concat(" ").concat(data[1].replace("_", ":"))).getTime())); + + vendaEmbarcada.setFechorViaje(vendaEmbarcada.getFecCorrida()); + vendaEmbarcada.setFechorVenta(vendaEmbarcada.getFecCorrida()); + vendaEmbarcada.setMarcaId(empresaId.intValue()); + vendaEmbarcada.setImporteTaxaEmbarque(importeTaxaEmbarque); + vendaEmbarcada.setImportePedagio(importePedagio); + vendaEmbarcada.setImporteOutros(importeOutros); + vendaEmbarcada.setImporteSeguro(importeSeguro); + vendaEmbarcada.setNumFolioPreimpresso(numFolioPreImpresso); + vendaEmbarcada.setSerieImpFiscal(serieImpFiscal); + + VendaEmbarcadaService vendaEmbarcadaService = (VendaEmbarcadaService) AppContext.getApplicationContext().getBean("VendaEmbarcadaService"); + + int retornoVenda = vendaEmbarcadaService.gerarVendaEmbarcada(vendaEmbarcada); + + return retornoJson.concat(retornoVenda + "'}"); + } catch (ParseException e) { + log.error(e.getMessage(), e); + return retornoJson.concat(DATA_COM_FORMATO_INVALIDO + "'}"); + } catch (Exception e) { + log.error(e.getMessage(), e); + return retornoJson.concat(ERROR_NAO_SUPORTADO_INVALIDO + "'}"); + } + } } \ No newline at end of file diff --git a/src/org/w3/_2000/_09/xmldsig_/KeyInfoType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/KeyInfoType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/KeyInfoType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/KeyInfoType.java index 21e279167..d8495304a 100644 --- a/src/org/w3/_2000/_09/xmldsig_/KeyInfoType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/KeyInfoType.java @@ -1,104 +1,104 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Classe Java de KeyInfoType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KeyInfoType", propOrder = { - "x509Data" -}) -public class KeyInfoType { - - @XmlElement(name = "X509Data", required = true) - protected X509DataType x509Data; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Obtém o valor da propriedade x509Data. - * - * @return - * possible object is - * {@link X509DataType } - * - */ - public X509DataType getX509Data() { - return x509Data; - } - - /** - * Define o valor da propriedade x509Data. - * - * @param value - * allowed object is - * {@link X509DataType } - * - */ - public void setX509Data(X509DataType value) { - this.x509Data = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Classe Java de KeyInfoType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509Data" type="{http://www.w3.org/2000/09/xmldsig#}X509DataType"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "KeyInfoType", propOrder = { + "x509Data" +}) +public class KeyInfoType { + + @XmlElement(name = "X509Data", required = true) + protected X509DataType x509Data; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Obtém o valor da propriedade x509Data. + * + * @return + * possible object is + * {@link X509DataType } + * + */ + public X509DataType getX509Data() { + return x509Data; + } + + /** + * Define o valor da propriedade x509Data. + * + * @param value + * allowed object is + * {@link X509DataType } + * + */ + public void setX509Data(X509DataType value) { + this.x509Data = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/ObjectFactory.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/ObjectFactory.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/ObjectFactory.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/ObjectFactory.java index 4d6f2c7a9..d86a782fe 100644 --- a/src/org/w3/_2000/_09/xmldsig_/ObjectFactory.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/ObjectFactory.java @@ -1,140 +1,140 @@ -//// -//// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -//// Consulte http://java.sun.com/xml/jaxb -//// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -//// Gerado em: 2017.08.14 às 03:08:29 PM BRT -//// -// -// -//package org.w3._2000._09.xmldsig_; -// -//import javax.xml.bind.JAXBElement; -//import javax.xml.bind.annotation.XmlElementDecl; -//import javax.xml.bind.annotation.XmlRegistry; -//import javax.xml.namespace.QName; -// -// -///** -// * This object contains factory methods for each -// * Java content interface and Java element interface -// * generated in the org.w3._2000._09.xmldsig_ package. -// *

An ObjectFactory allows you to programatically -// * construct new instances of the Java representation -// * for XML content. The Java representation of XML -// * content can consist of schema derived interfaces -// * and classes representing the binding of schema -// * type definitions, element declarations and model -// * groups. Factory methods for each of these are -// * provided in this class. -// * -// */ -//@XmlRegistry -//public class ObjectFactory { -// -// private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); -// -// /** -// * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig_ -// * -// */ -// public ObjectFactory() { -// } -// -// /** -// * Create an instance of {@link ReferenceType } -// * -// */ -// public ReferenceType createReferenceType() { -// return new ReferenceType(); -// } -// -// /** -// * Create an instance of {@link SignedInfoType } -// * -// */ -// public SignedInfoType createSignedInfoType() { -// return new SignedInfoType(); -// } -// -// /** -// * Create an instance of {@link SignatureType } -// * -// */ -// public SignatureType createSignatureType() { -// return new SignatureType(); -// } -// -// /** -// * Create an instance of {@link X509DataType } -// * -// */ -// public X509DataType createX509DataType() { -// return new X509DataType(); -// } -// -// /** -// * Create an instance of {@link SignatureValueType } -// * -// */ -// public SignatureValueType createSignatureValueType() { -// return new SignatureValueType(); -// } -// -// /** -// * Create an instance of {@link TransformsType } -// * -// */ -// public TransformsType createTransformsType() { -// return new TransformsType(); -// } -// -// /** -// * Create an instance of {@link TransformType } -// * -// */ -// public TransformType createTransformType() { -// return new TransformType(); -// } -// -// /** -// * Create an instance of {@link KeyInfoType } -// * -// */ -// public KeyInfoType createKeyInfoType() { -// return new KeyInfoType(); -// } -// -// /** -// * Create an instance of {@link ReferenceType.DigestMethod } -// * -// */ -// public ReferenceType.DigestMethod createReferenceTypeDigestMethod() { -// return new ReferenceType.DigestMethod(); -// } -// -// /** -// * Create an instance of {@link SignedInfoType.CanonicalizationMethod } -// * -// */ -// public SignedInfoType.CanonicalizationMethod createSignedInfoTypeCanonicalizationMethod() { -// return new SignedInfoType.CanonicalizationMethod(); -// } -// -// /** -// * Create an instance of {@link SignedInfoType.SignatureMethod } -// * -// */ -// public SignedInfoType.SignatureMethod createSignedInfoTypeSignatureMethod() { -// return new SignedInfoType.SignatureMethod(); -// } -// -// /** -// * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} -// * -// */ -// @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") -// public JAXBElement createSignature(SignatureType value) { -// return new JAXBElement(_Signature_QNAME, SignatureType.class, null, value); -// } -// -//} +//// +//// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +//// Consulte http://java.sun.com/xml/jaxb +//// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +//// Gerado em: 2017.08.14 às 03:08:29 PM BRT +//// +// +// +//package org.w3._2000._09.xmldsig_; +// +//import javax.xml.bind.JAXBElement; +//import javax.xml.bind.annotation.XmlElementDecl; +//import javax.xml.bind.annotation.XmlRegistry; +//import javax.xml.namespace.QName; +// +// +///** +// * This object contains factory methods for each +// * Java content interface and Java element interface +// * generated in the org.w3._2000._09.xmldsig_ package. +// *

An ObjectFactory allows you to programatically +// * construct new instances of the Java representation +// * for XML content. The Java representation of XML +// * content can consist of schema derived interfaces +// * and classes representing the binding of schema +// * type definitions, element declarations and model +// * groups. Factory methods for each of these are +// * provided in this class. +// * +// */ +//@XmlRegistry +//public class ObjectFactory { +// +// private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); +// +// /** +// * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig_ +// * +// */ +// public ObjectFactory() { +// } +// +// /** +// * Create an instance of {@link ReferenceType } +// * +// */ +// public ReferenceType createReferenceType() { +// return new ReferenceType(); +// } +// +// /** +// * Create an instance of {@link SignedInfoType } +// * +// */ +// public SignedInfoType createSignedInfoType() { +// return new SignedInfoType(); +// } +// +// /** +// * Create an instance of {@link SignatureType } +// * +// */ +// public SignatureType createSignatureType() { +// return new SignatureType(); +// } +// +// /** +// * Create an instance of {@link X509DataType } +// * +// */ +// public X509DataType createX509DataType() { +// return new X509DataType(); +// } +// +// /** +// * Create an instance of {@link SignatureValueType } +// * +// */ +// public SignatureValueType createSignatureValueType() { +// return new SignatureValueType(); +// } +// +// /** +// * Create an instance of {@link TransformsType } +// * +// */ +// public TransformsType createTransformsType() { +// return new TransformsType(); +// } +// +// /** +// * Create an instance of {@link TransformType } +// * +// */ +// public TransformType createTransformType() { +// return new TransformType(); +// } +// +// /** +// * Create an instance of {@link KeyInfoType } +// * +// */ +// public KeyInfoType createKeyInfoType() { +// return new KeyInfoType(); +// } +// +// /** +// * Create an instance of {@link ReferenceType.DigestMethod } +// * +// */ +// public ReferenceType.DigestMethod createReferenceTypeDigestMethod() { +// return new ReferenceType.DigestMethod(); +// } +// +// /** +// * Create an instance of {@link SignedInfoType.CanonicalizationMethod } +// * +// */ +// public SignedInfoType.CanonicalizationMethod createSignedInfoTypeCanonicalizationMethod() { +// return new SignedInfoType.CanonicalizationMethod(); +// } +// +// /** +// * Create an instance of {@link SignedInfoType.SignatureMethod } +// * +// */ +// public SignedInfoType.SignatureMethod createSignedInfoTypeSignatureMethod() { +// return new SignedInfoType.SignatureMethod(); +// } +// +// /** +// * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} +// * +// */ +// @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") +// public JAXBElement createSignature(SignatureType value) { +// return new JAXBElement(_Signature_QNAME, SignatureType.class, null, value); +// } +// +//} diff --git a/src/org/w3/_2000/_09/xmldsig_/ReferenceType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/ReferenceType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/ReferenceType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/ReferenceType.java index 14b40c43c..030d10462 100644 --- a/src/org/w3/_2000/_09/xmldsig_/ReferenceType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/ReferenceType.java @@ -1,283 +1,283 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Classe Java de ReferenceType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
- *         <element name="DigestMethod">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#sha1" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}anyURI">
- *             <minLength value="2"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReferenceType", propOrder = { - "transforms", - "digestMethod", - "digestValue" -}) -public class ReferenceType { - - @XmlElement(name = "Transforms", required = true) - protected TransformsType transforms; - @XmlElement(name = "DigestMethod", required = true) - protected ReferenceType.DigestMethod digestMethod; - @XmlElement(name = "DigestValue", required = true) - protected byte[] digestValue; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAttribute(name = "URI", required = true) - protected String uri; - @XmlAttribute(name = "Type") - @XmlSchemaType(name = "anyURI") - protected String type; - - /** - * Obtém o valor da propriedade transforms. - * - * @return - * possible object is - * {@link TransformsType } - * - */ - public TransformsType getTransforms() { - return transforms; - } - - /** - * Define o valor da propriedade transforms. - * - * @param value - * allowed object is - * {@link TransformsType } - * - */ - public void setTransforms(TransformsType value) { - this.transforms = value; - } - - /** - * Obtém o valor da propriedade digestMethod. - * - * @return - * possible object is - * {@link ReferenceType.DigestMethod } - * - */ - public ReferenceType.DigestMethod getDigestMethod() { - return digestMethod; - } - - /** - * Define o valor da propriedade digestMethod. - * - * @param value - * allowed object is - * {@link ReferenceType.DigestMethod } - * - */ - public void setDigestMethod(ReferenceType.DigestMethod value) { - this.digestMethod = value; - } - - /** - * Obtém o valor da propriedade digestValue. - * - * @return - * possible object is - * byte[] - */ - public byte[] getDigestValue() { - return digestValue; - } - - /** - * Define o valor da propriedade digestValue. - * - * @param value - * allowed object is - * byte[] - */ - public void setDigestValue(byte[] value) { - this.digestValue = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Obtém o valor da propriedade uri. - * - * @return - * possible object is - * {@link String } - * - */ - public String getURI() { - return uri; - } - - /** - * Define o valor da propriedade uri. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setURI(String value) { - this.uri = value; - } - - /** - * Obtém o valor da propriedade type. - * - * @return - * possible object is - * {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Define o valor da propriedade type. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#sha1" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class DigestMethod { - - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Obtém o valor da propriedade algorithm. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - if (algorithm == null) { - return "http://www.w3.org/2000/09/xmldsig#sha1"; - } else { - return algorithm; - } - } - - /** - * Define o valor da propriedade algorithm. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Classe Java de ReferenceType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType"/>
+ *         <element name="DigestMethod">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#sha1" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="URI" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}anyURI">
+ *             <minLength value="2"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ReferenceType", propOrder = { + "transforms", + "digestMethod", + "digestValue" +}) +public class ReferenceType { + + @XmlElement(name = "Transforms", required = true) + protected TransformsType transforms; + @XmlElement(name = "DigestMethod", required = true) + protected ReferenceType.DigestMethod digestMethod; + @XmlElement(name = "DigestValue", required = true) + protected byte[] digestValue; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "URI", required = true) + protected String uri; + @XmlAttribute(name = "Type") + @XmlSchemaType(name = "anyURI") + protected String type; + + /** + * Obtém o valor da propriedade transforms. + * + * @return + * possible object is + * {@link TransformsType } + * + */ + public TransformsType getTransforms() { + return transforms; + } + + /** + * Define o valor da propriedade transforms. + * + * @param value + * allowed object is + * {@link TransformsType } + * + */ + public void setTransforms(TransformsType value) { + this.transforms = value; + } + + /** + * Obtém o valor da propriedade digestMethod. + * + * @return + * possible object is + * {@link ReferenceType.DigestMethod } + * + */ + public ReferenceType.DigestMethod getDigestMethod() { + return digestMethod; + } + + /** + * Define o valor da propriedade digestMethod. + * + * @param value + * allowed object is + * {@link ReferenceType.DigestMethod } + * + */ + public void setDigestMethod(ReferenceType.DigestMethod value) { + this.digestMethod = value; + } + + /** + * Obtém o valor da propriedade digestValue. + * + * @return + * possible object is + * byte[] + */ + public byte[] getDigestValue() { + return digestValue; + } + + /** + * Define o valor da propriedade digestValue. + * + * @param value + * allowed object is + * byte[] + */ + public void setDigestValue(byte[] value) { + this.digestValue = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + /** + * Obtém o valor da propriedade uri. + * + * @return + * possible object is + * {@link String } + * + */ + public String getURI() { + return uri; + } + + /** + * Define o valor da propriedade uri. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setURI(String value) { + this.uri = value; + } + + /** + * Obtém o valor da propriedade type. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Define o valor da propriedade type. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#sha1" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class DigestMethod { + + @XmlAttribute(name = "Algorithm", required = true) + @XmlSchemaType(name = "anyURI") + protected String algorithm; + + /** + * Obtém o valor da propriedade algorithm. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAlgorithm() { + if (algorithm == null) { + return "http://www.w3.org/2000/09/xmldsig#sha1"; + } else { + return algorithm; + } + } + + /** + * Define o valor da propriedade algorithm. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } + + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/SignatureType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignatureType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/SignatureType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignatureType.java index e0940cb43..0f7af8ca3 100644 --- a/src/org/w3/_2000/_09/xmldsig_/SignatureType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignatureType.java @@ -1,160 +1,160 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Classe Java de SignatureType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
- *         <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
- *         <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureType", propOrder = { - "signedInfo", - "signatureValue", - "keyInfo" -}) -public class SignatureType { - - @XmlElement(name = "SignedInfo", required = true) - protected SignedInfoType signedInfo; - @XmlElement(name = "SignatureValue", required = true) - protected SignatureValueType signatureValue; - @XmlElement(name = "KeyInfo", required = true) - protected KeyInfoType keyInfo; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Obtém o valor da propriedade signedInfo. - * - * @return - * possible object is - * {@link SignedInfoType } - * - */ - public SignedInfoType getSignedInfo() { - return signedInfo; - } - - /** - * Define o valor da propriedade signedInfo. - * - * @param value - * allowed object is - * {@link SignedInfoType } - * - */ - public void setSignedInfo(SignedInfoType value) { - this.signedInfo = value; - } - - /** - * Obtém o valor da propriedade signatureValue. - * - * @return - * possible object is - * {@link SignatureValueType } - * - */ - public SignatureValueType getSignatureValue() { - return signatureValue; - } - - /** - * Define o valor da propriedade signatureValue. - * - * @param value - * allowed object is - * {@link SignatureValueType } - * - */ - public void setSignatureValue(SignatureValueType value) { - this.signatureValue = value; - } - - /** - * Obtém o valor da propriedade keyInfo. - * - * @return - * possible object is - * {@link KeyInfoType } - * - */ - public KeyInfoType getKeyInfo() { - return keyInfo; - } - - /** - * Define o valor da propriedade keyInfo. - * - * @param value - * allowed object is - * {@link KeyInfoType } - * - */ - public void setKeyInfo(KeyInfoType value) { - this.keyInfo = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Classe Java de SignatureType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="SignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignedInfo" type="{http://www.w3.org/2000/09/xmldsig#}SignedInfoType"/>
+ *         <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}SignatureValueType"/>
+ *         <element name="KeyInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SignatureType", propOrder = { + "signedInfo", + "signatureValue", + "keyInfo" +}) +public class SignatureType { + + @XmlElement(name = "SignedInfo", required = true) + protected SignedInfoType signedInfo; + @XmlElement(name = "SignatureValue", required = true) + protected SignatureValueType signatureValue; + @XmlElement(name = "KeyInfo", required = true) + protected KeyInfoType keyInfo; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Obtém o valor da propriedade signedInfo. + * + * @return + * possible object is + * {@link SignedInfoType } + * + */ + public SignedInfoType getSignedInfo() { + return signedInfo; + } + + /** + * Define o valor da propriedade signedInfo. + * + * @param value + * allowed object is + * {@link SignedInfoType } + * + */ + public void setSignedInfo(SignedInfoType value) { + this.signedInfo = value; + } + + /** + * Obtém o valor da propriedade signatureValue. + * + * @return + * possible object is + * {@link SignatureValueType } + * + */ + public SignatureValueType getSignatureValue() { + return signatureValue; + } + + /** + * Define o valor da propriedade signatureValue. + * + * @param value + * allowed object is + * {@link SignatureValueType } + * + */ + public void setSignatureValue(SignatureValueType value) { + this.signatureValue = value; + } + + /** + * Obtém o valor da propriedade keyInfo. + * + * @return + * possible object is + * {@link KeyInfoType } + * + */ + public KeyInfoType getKeyInfo() { + return keyInfo; + } + + /** + * Define o valor da propriedade keyInfo. + * + * @param value + * allowed object is + * {@link KeyInfoType } + * + */ + public void setKeyInfo(KeyInfoType value) { + this.keyInfo = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/SignatureValueType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignatureValueType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/SignatureValueType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignatureValueType.java index 62923a271..d198bd614 100644 --- a/src/org/w3/_2000/_09/xmldsig_/SignatureValueType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignatureValueType.java @@ -1,99 +1,99 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Classe Java de SignatureValueType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureValueType", propOrder = { - "value" -}) -public class SignatureValueType { - - @XmlValue - protected byte[] value; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Obtém o valor da propriedade value. - * - * @return - * possible object is - * byte[] - */ - public byte[] getValue() { - return value; - } - - /** - * Define o valor da propriedade value. - * - * @param value - * allowed object is - * byte[] - */ - public void setValue(byte[] value) { - this.value = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Classe Java de SignatureValueType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="SignatureValueType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SignatureValueType", propOrder = { + "value" +}) +public class SignatureValueType { + + @XmlValue + protected byte[] value; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Obtém o valor da propriedade value. + * + * @return + * possible object is + * byte[] + */ + public byte[] getValue() { + return value; + } + + /** + * Define o valor da propriedade value. + * + * @param value + * allowed object is + * byte[] + */ + public void setValue(byte[] value) { + this.value = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/SignedInfoType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignedInfoType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/SignedInfoType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignedInfoType.java index 61dcd0dbc..f1788216f 100644 --- a/src/org/w3/_2000/_09/xmldsig_/SignedInfoType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/SignedInfoType.java @@ -1,288 +1,288 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Classe Java de SignedInfoType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CanonicalizationMethod">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="SignatureMethod">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignedInfoType", propOrder = { - "canonicalizationMethod", - "signatureMethod", - "reference" -}) -public class SignedInfoType { - - @XmlElement(name = "CanonicalizationMethod", required = true) - protected SignedInfoType.CanonicalizationMethod canonicalizationMethod; - @XmlElement(name = "SignatureMethod", required = true) - protected SignedInfoType.SignatureMethod signatureMethod; - @XmlElement(name = "Reference", required = true) - protected ReferenceType reference; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Obtém o valor da propriedade canonicalizationMethod. - * - * @return - * possible object is - * {@link SignedInfoType.CanonicalizationMethod } - * - */ - public SignedInfoType.CanonicalizationMethod getCanonicalizationMethod() { - return canonicalizationMethod; - } - - /** - * Define o valor da propriedade canonicalizationMethod. - * - * @param value - * allowed object is - * {@link SignedInfoType.CanonicalizationMethod } - * - */ - public void setCanonicalizationMethod(SignedInfoType.CanonicalizationMethod value) { - this.canonicalizationMethod = value; - } - - /** - * Obtém o valor da propriedade signatureMethod. - * - * @return - * possible object is - * {@link SignedInfoType.SignatureMethod } - * - */ - public SignedInfoType.SignatureMethod getSignatureMethod() { - return signatureMethod; - } - - /** - * Define o valor da propriedade signatureMethod. - * - * @param value - * allowed object is - * {@link SignedInfoType.SignatureMethod } - * - */ - public void setSignatureMethod(SignedInfoType.SignatureMethod value) { - this.signatureMethod = value; - } - - /** - * Obtém o valor da propriedade reference. - * - * @return - * possible object is - * {@link ReferenceType } - * - */ - public ReferenceType getReference() { - return reference; - } - - /** - * Define o valor da propriedade reference. - * - * @param value - * allowed object is - * {@link ReferenceType } - * - */ - public void setReference(ReferenceType value) { - this.reference = value; - } - - /** - * Obtém o valor da propriedade id. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Define o valor da propriedade id. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class CanonicalizationMethod { - - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Obtém o valor da propriedade algorithm. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - if (algorithm == null) { - return "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"; - } else { - return algorithm; - } - } - - /** - * Define o valor da propriedade algorithm. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - - } - - - /** - *

Classe Java de anonymous complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class SignatureMethod { - - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Obtém o valor da propriedade algorithm. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - if (algorithm == null) { - return "http://www.w3.org/2000/09/xmldsig#rsa-sha1"; - } else { - return algorithm; - } - } - - /** - * Define o valor da propriedade algorithm. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + *

Classe Java de SignedInfoType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CanonicalizationMethod">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="SignatureMethod">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Reference" type="{http://www.w3.org/2000/09/xmldsig#}ReferenceType"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SignedInfoType", propOrder = { + "canonicalizationMethod", + "signatureMethod", + "reference" +}) +public class SignedInfoType { + + @XmlElement(name = "CanonicalizationMethod", required = true) + protected SignedInfoType.CanonicalizationMethod canonicalizationMethod; + @XmlElement(name = "SignatureMethod", required = true) + protected SignedInfoType.SignatureMethod signatureMethod; + @XmlElement(name = "Reference", required = true) + protected ReferenceType reference; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Obtém o valor da propriedade canonicalizationMethod. + * + * @return + * possible object is + * {@link SignedInfoType.CanonicalizationMethod } + * + */ + public SignedInfoType.CanonicalizationMethod getCanonicalizationMethod() { + return canonicalizationMethod; + } + + /** + * Define o valor da propriedade canonicalizationMethod. + * + * @param value + * allowed object is + * {@link SignedInfoType.CanonicalizationMethod } + * + */ + public void setCanonicalizationMethod(SignedInfoType.CanonicalizationMethod value) { + this.canonicalizationMethod = value; + } + + /** + * Obtém o valor da propriedade signatureMethod. + * + * @return + * possible object is + * {@link SignedInfoType.SignatureMethod } + * + */ + public SignedInfoType.SignatureMethod getSignatureMethod() { + return signatureMethod; + } + + /** + * Define o valor da propriedade signatureMethod. + * + * @param value + * allowed object is + * {@link SignedInfoType.SignatureMethod } + * + */ + public void setSignatureMethod(SignedInfoType.SignatureMethod value) { + this.signatureMethod = value; + } + + /** + * Obtém o valor da propriedade reference. + * + * @return + * possible object is + * {@link ReferenceType } + * + */ + public ReferenceType getReference() { + return reference; + } + + /** + * Define o valor da propriedade reference. + * + * @param value + * allowed object is + * {@link ReferenceType } + * + */ + public void setReference(ReferenceType value) { + this.reference = value; + } + + /** + * Obtém o valor da propriedade id. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Define o valor da propriedade id. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class CanonicalizationMethod { + + @XmlAttribute(name = "Algorithm", required = true) + @XmlSchemaType(name = "anyURI") + protected String algorithm; + + /** + * Obtém o valor da propriedade algorithm. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAlgorithm() { + if (algorithm == null) { + return "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"; + } else { + return algorithm; + } + } + + /** + * Define o valor da propriedade algorithm. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } + + } + + + /** + *

Classe Java de anonymous complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" fixed="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
+     * 
+ * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class SignatureMethod { + + @XmlAttribute(name = "Algorithm", required = true) + @XmlSchemaType(name = "anyURI") + protected String algorithm; + + /** + * Obtém o valor da propriedade algorithm. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAlgorithm() { + if (algorithm == null) { + return "http://www.w3.org/2000/09/xmldsig#rsa-sha1"; + } else { + return algorithm; + } + } + + /** + * Define o valor da propriedade algorithm. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } + + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/TransformType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/TransformType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/TransformType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/TransformType.java index 26b65fc65..3299cbbf4 100644 --- a/src/org/w3/_2000/_09/xmldsig_/TransformType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/TransformType.java @@ -1,104 +1,104 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Classe Java de TransformType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2000/09/xmldsig#}TTransformURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformType", propOrder = { - "xPath" -}) -public class TransformType { - - @XmlElement(name = "XPath") - protected List xPath; - @XmlAttribute(name = "Algorithm", required = true) - protected String algorithm; - - /** - * Gets the value of the xPath property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the xPath property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getXPath().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getXPath() { - if (xPath == null) { - xPath = new ArrayList(); - } - return this.xPath; - } - - /** - * Obtém o valor da propriedade algorithm. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * Define o valor da propriedade algorithm. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Classe Java de TransformType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TransformType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2000/09/xmldsig#}TTransformURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TransformType", propOrder = { + "xPath" +}) +public class TransformType { + + @XmlElement(name = "XPath") + protected List xPath; + @XmlAttribute(name = "Algorithm", required = true) + protected String algorithm; + + /** + * Gets the value of the xPath property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the xPath property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getXPath().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getXPath() { + if (xPath == null) { + xPath = new ArrayList(); + } + return this.xPath; + } + + /** + * Obtém o valor da propriedade algorithm. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } + + /** + * Define o valor da propriedade algorithm. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/TransformsType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/TransformsType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/TransformsType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/TransformsType.java index 6a616e6d5..6ce805a08 100644 --- a/src/org/w3/_2000/_09/xmldsig_/TransformsType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/TransformsType.java @@ -1,76 +1,76 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Classe Java de TransformsType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType" maxOccurs="2" minOccurs="2"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformsType", propOrder = { - "transform" -}) -public class TransformsType { - - @XmlElement(name = "Transform", required = true) - protected List transform; - - /** - * Gets the value of the transform property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the transform property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getTransform().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link TransformType } - * - * - */ - public List getTransform() { - if (transform == null) { - transform = new ArrayList(); - } - return this.transform; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Classe Java de TransformsType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Transform" type="{http://www.w3.org/2000/09/xmldsig#}TransformType" maxOccurs="2" minOccurs="2"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TransformsType", propOrder = { + "transform" +}) +public class TransformsType { + + @XmlElement(name = "Transform", required = true) + protected List transform; + + /** + * Gets the value of the transform property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the transform property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getTransform().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link TransformType } + * + * + */ + public List getTransform() { + if (transform == null) { + transform = new ArrayList(); + } + return this.transform; + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/X509DataType.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/X509DataType.java similarity index 96% rename from src/org/w3/_2000/_09/xmldsig_/X509DataType.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/X509DataType.java index 87e971947..a7c47212f 100644 --- a/src/org/w3/_2000/_09/xmldsig_/X509DataType.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/X509DataType.java @@ -1,67 +1,67 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - - -package org.w3._2000._09.xmldsig_; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Classe Java de X509DataType complex type. - * - *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. - * - *

- * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "X509DataType", propOrder = { - "x509Certificate" -}) -public class X509DataType { - - @XmlElement(name = "X509Certificate", required = true) - protected byte[] x509Certificate; - - /** - * Obtém o valor da propriedade x509Certificate. - * - * @return - * possible object is - * byte[] - */ - public byte[] getX509Certificate() { - return x509Certificate; - } - - /** - * Define o valor da propriedade x509Certificate. - * - * @param value - * allowed object is - * byte[] - */ - public void setX509Certificate(byte[] value) { - this.x509Certificate = value; - } - -} +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + + +package org.w3._2000._09.xmldsig_; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Classe Java de X509DataType complex type. + * + *

O seguinte fragmento do esquema especifica o conteúdo esperado contido dentro desta classe. + * + *

+ * <complexType name="X509DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "X509DataType", propOrder = { + "x509Certificate" +}) +public class X509DataType { + + @XmlElement(name = "X509Certificate", required = true) + protected byte[] x509Certificate; + + /** + * Obtém o valor da propriedade x509Certificate. + * + * @return + * possible object is + * byte[] + */ + public byte[] getX509Certificate() { + return x509Certificate; + } + + /** + * Define o valor da propriedade x509Certificate. + * + * @param value + * allowed object is + * byte[] + */ + public void setX509Certificate(byte[] value) { + this.x509Certificate = value; + } + +} diff --git a/src/org/w3/_2000/_09/xmldsig_/package-info.java b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/package-info.java similarity index 98% rename from src/org/w3/_2000/_09/xmldsig_/package-info.java rename to ModelWeb/src/org/w3/_2000/_09/xmldsig_/package-info.java index 3a4caf0c5..027f29400 100644 --- a/src/org/w3/_2000/_09/xmldsig_/package-info.java +++ b/ModelWeb/src/org/w3/_2000/_09/xmldsig_/package-info.java @@ -1,9 +1,9 @@ -// -// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 -// Consulte http://java.sun.com/xml/jaxb -// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. -// Gerado em: 2017.08.14 às 03:08:29 PM BRT -// - -//@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.w3._2000._09.xmldsig_; +// +// Este arquivo foi gerado pela Arquitetura JavaTM para Implementação de Referência (JAXB) de Bind XML, v2.2.8-b130911.1802 +// Consulte http://java.sun.com/xml/jaxb +// Todas as modificações neste arquivo serão perdidas após a recompilação do esquema de origem. +// Gerado em: 2017.08.14 às 03:08:29 PM BRT +// + +//@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.w3._2000._09.xmldsig_;